diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6d901cc..c9663dc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ on:
 env:
   BUILD_SUFFIX: -build-${{ github.run_id }}_${{ github.run_attempt }}
   DOCKER_METADATA_SET_OUTPUT_ENV: 'true'
-  ARCHIVESSPACE_RESOURCE_TOOLBAR_DIFF_SHA256: 5122e9837c25fefe58d64ff499e570b5120f527f3654de4bb0acac22d5cfc1ed
+  ARCHIVESSPACE_RESOURCE_TOOLBAR_DIFF_SHA256: 130c992dded062cd478569a1cd6c4cc45d79b06c62fd63402dd560669c29df25 
 
 jobs:
   build:
diff --git a/files/plugins/local/frontend/views/resources/_toolbar.html.erb b/files/plugins/local/frontend/views/resources/_toolbar.html.erb
index 8e218f7..d3b1cce 100644
--- a/files/plugins/local/frontend/views/resources/_toolbar.html.erb
+++ b/files/plugins/local/frontend/views/resources/_toolbar.html.erb
@@ -23,24 +23,24 @@
             <input type="hidden" name="id", value="<%= @resource.id %>" />
             <label class="checkbox" for="include-unpublished">
               <input type="checkbox" id="include-unpublished" name="include_unpublished" <% if pref_include_unpublished %> checked="checked" <% end %>/>
-              <%= t("export_options.include_unpublished") %>
+              <%= t("export_options.include_unpublished") %>&#160;
             </label>
             <label class="checkbox" for="include-daos">
               <input type="checkbox" id="include-daos" name="include_daos" checked="checked"/>
-              <%= t("export_options.include_daos") %>
+              <%= t("export_options.include_daos") %>&#160;
             </label>
             <label class="checkbox" for="include-uris">
               <input type="checkbox" id="include-uris" name="include_uris" checked="checked"/>
-              <%= t("export_options.include_uris") %>
+              <%= t("export_options.include_uris") %>&#160;
             </label>
             <label class="checkbox" for="numbered-cs">
               <input type="checkbox" id="numbered-cs" name="numbered_cs" checked="checked"/>
-              <%= t("export_options.numbered_cs") %>
+              <%= t("export_options.numbered_cs") %>&#160;
             </label>
             <%# EAD3 %>
             <label class="checkbox" for="ead3">
               <input type="checkbox" id="ead3" name="ead3" />
-              <%= t("export_options.ead3") %>
+              <%= t("export_options.ead3") %>&#160;
             </label>
             <%# END - EAD3 %>
           </fieldset>
@@ -53,8 +53,8 @@
           <fieldset>
             <input type="hidden" name="id", value="<%= @resource.id %>" />
             <label class="checkbox" for="include-unpublished-marc">
-              <input type="checkbox" id="include-unpublished-marc" name="include_unpublished_marc" <% if pref_include_unpublished %> checked="checked" <% end %>/>
-              <%= t("export_options.include_unpublished") %>
+                <input type="checkbox" id="include-unpublished-marc" name="include_unpublished_marc" <% if pref_include_unpublished %> checked="checked" <% end %>/>
+              <%= t("export_options.include_unpublished") %>&#160;
             </label>
             <%# END - MARC %>
           </fieldset>
@@ -67,17 +67,13 @@
       <% if user_can?('create_job') %>
         <% if job_types['print_to_pdf_job']['create_permissions'].reject{|perm| user_can?(perm)}.empty? %>
 
-          <li class="dropdown-item p-0 dropdown-submenu" id="print-to-pdf-dropdown" data-print-to-pdf-url="<%= url_for(:controller => :exports, :action => :print_to_pdf, :id => @resource.id, :include_unpublished => "${include_unpublished}", :include_uris => "${include_uris}")%>">
-            <a href="#" data-toggle="dropdown" data-display="static" class="py-1 px-4 d-block text-decoration-none menu-with-options print-to-pdf-action" title="<%= t("actions.print_to_pdf") %>"><%= t("actions.print_to_pdf") %></a>
-            <div class="dropdown-menu" id="form_print_to_pdf">
-              <fieldset class="d-flex flex-column">
+          <li class="dropdown-item p-0 dropdown-submenu">
+            <%= link_to t("actions.print_to_pdf"), {:controller => :exports,  :action => :print_to_pdf, :id => @resource.id, :include_unpublished => false }, :id => 'print-to-pdf-link', :target => "_blank", :class => "py-1 px-4 d-block text-decoration-none" %>
+            <div class="dropdown-menu">
+              <fieldset>
                 <label class="checkbox" for="include-unpublished-pdf">
-                  <input type="checkbox" id="include-unpublished-pdf" <% if pref_include_unpublished %> checked="checked" <% end %> />
-                  <%= t("export_options.include_unpublished") %>
-                </label>
-                <label class="checkbox" for="include-uris-pdf">
-                  <input type="checkbox" id="include-uris-pdf" />
-                  <%= t("export_options.include_uris") %>
+                    <input type="checkbox" id="include-unpublished-pdf" onchange="$('#print-to-pdf-link').attr('href', '<%= url_for :controller => :exports,  :action => :print_to_pdf, :id => @resource.id %>?include_unpublished=' + $(this).prop('checked'))" <% if pref_include_unpublished %> checked="checked" <% end %> />
+                  <%= t("export_options.include_unpublished") %>&#160;
                 </label>
               </fieldset>
             </div>
@@ -94,12 +90,4 @@
               :record => @resource,
              })
   %>
-<% elsif user_can_view_only?('resource') %>
-  <%= render_aspace_partial(:partial => '/shared/resource_toolbar',
-             :locals => {
-              :record_type => 'resource',
-              :record => @resource,
-              :view_only => true,
-             })
-  %>
 <% end %>