diff --git a/src/main/webapp/file-configure-dropdown-fragment.xhtml b/src/main/webapp/file-configure-dropdown-fragment.xhtml
index 9e9ed33e46d..4ad43a90bc0 100644
--- a/src/main/webapp/file-configure-dropdown-fragment.xhtml
+++ b/src/main/webapp/file-configure-dropdown-fragment.xhtml
@@ -44,11 +44,12 @@
         </li>
         <!-- END: FILE PG -->
         <!-- DATASET PG -->
-        <div class="btn-group" jsf:rendered="#{!isFilePg}">
-            <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
-                <span class="glyphicon glyphicon-cog"/> #{bundle['dataset.configureBtn']} <span class="caret"></span>
-            </button>
-            <ul class="dropdown-menu pull-right text-left" role="menu">
+        <div class="btn-group dropdown" jsf:rendered="#{!isFilePg}">
+            <a style="font-size:2em !important;" type="button" class="btn-configure btn-accessXXX btn btn-link bootstrap-button-tooltip dropdown-toggle" 
+                    title="#{bundle['dataset.configureBtn']}" id="configureBtn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <span class="glyphicon glyphicon-cog"/><span class="caret"></span>
+            </a>
+            <ul class="dropdown-menu pull-right text-left" aria-labelledby="configureBtn">
                 <!-- Worldmap unpublished -->
                 <li jsf:rendered="#{worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata)}">
                     <p:commandLink onclick="PF('mapDataDialog').show()">
diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index 57fc4524abe..24b2236b597 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -78,18 +78,20 @@
         <!-- END: FILE PG -->
         
         <!-- DATASET PG -->
-        <div class="btn-group" jsf:rendered="#{!isFilePg}">
+        <div class="btn-group dropdown" jsf:rendered="#{!isFilePg}">
             <ui:fragment rendered="#{(exploreTools.size()==1 and !worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata)) or (exploreTools.size()==0 and worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))}">
-                <button type="button" class="btn btn-default btn-explore" onclick="$(this).parent().find( 'li > a' ).trigger( 'click' );">
-                    <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore}
-                </button>
+                <a style="font-size:2em !important;" class="btn-explore btn btn-link bootstrap-button-tooltip" 
+                               title="#{bundle.explore}" id="exploreBtn" onclick="$(this).parent().find( 'li > a' ).trigger( 'click' );">
+                    <span class="glyphicon glyphicon-equalizer"/>
+                </a>
             </ui:fragment>
             <ui:fragment rendered="#{exploreTools.size()>1 or (exploreTools.size()>=1 and worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))}">
-                <button type="button" class="btn btn-default btn-explore dropdown-toggle" data-toggle="dropdown">
-                    <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore} <span class="caret"/>
-                </button>
+                <a style="font-size:2em !important;" class="btn-explore btn btn-link bootstrap-button-tooltip dropdown-toggle" 
+                               title="#{bundle.explore}" id="exploreBtn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <span class="glyphicon glyphicon-equalizer"/><span class="caret"/>
+                </a>
             </ui:fragment>
-            <ul class="dropdown-menu multi-level pull-right text-left" role="menu">
+            <ul class="dropdown-menu multi-level pull-right text-left" aria-labelledby="exploreBtn">
                 <!--external tools-->
                 <ui:repeat var="tool" value="#{exploreTools}">
                     <li>
@@ -137,15 +139,15 @@
     
     <!-- Compute Button *FILE PG only*: -->
     <li jsf:rendered="#{isFilePg and FilePage.showComputeButton() and fileDownloadHelper.canDownloadFile(fileMetadata)}">
-        <h:outputLink value="#{FilePage.computeUrl}" class="btn-compute" target="_blank">
+        <h:outputLink value="#{FilePage.computeUrl}" styleClass="btn-compute" target="_blank">
             #{bundle['file.compute']}
         </h:outputLink>
     </li>
     <!-- END: Compute Button *FILE PG only*: -->
  
     <!-- Compute Button *DATASET PG only*: -->
-    <h:outputLink value="#{DatasetPage.getComputeUrl(fileMetadata)}" class="btn btn-default btn-compute" target="_blank" rendered="#{!isFilePg and DatasetPage.showComputeButton(fileMetadata) and fileDownloadHelper.canDownloadFile(fileMetadata)}"> 
-        <span class="glyphicon glyphicon-flash"/> #{bundle['file.compute']}
+    <h:outputLink style="font-size:2em !important;" value="#{DatasetPage.getComputeUrl(fileMetadata)}" styleClass="btn-compute btn btn-link bootstrap-button-tooltip" title="#{bundle['file.compute']}" target="_blank" rendered="#{!isFilePg and DatasetPage.showComputeButton(fileMetadata) and fileDownloadHelper.canDownloadFile(fileMetadata)}"> 
+        <span class="glyphicon glyphicon-flash"/>
     </h:outputLink>
     <!-- END: Compute Button *DATASET PG only*: -->
  
@@ -329,55 +331,61 @@
         <!-- DUPLICATE LINKS -->
         <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) 
                                   and fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}"
-                       styleClass="btn btn-default btn-download" process="@this"
+                       styleClass="btn-download btn btn-link bootstrap-button-tooltip" 
+                       style="font-size:2em !important;"
+                       title="#{bundle.download}"
                        disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
-                       update="@widgetVar(downloadPackagePopup)" oncomplete="PF('downloadPackagePopup').show();handleResizeDialog('downloadPackagePopup');">
+                       process="@this" update="@widgetVar(downloadPackagePopup)" oncomplete="PF('downloadPackagePopup').show();handleResizeDialog('downloadPackagePopup');">
             <f:actionListener binding="#{packagePopupFragmentBean.setFileMetadata(fileMetadata)}" />
             <f:actionListener binding="#{fileDownloadService.writeGuestbookResponseRecord(guestbookResponse, fileMetadata, 'package')}" />
             <!-- package data file: -->
             <!-- no guest book/terms of use/etc. - straight package popup -->
-            <span class="glyphicon glyphicon-download-alt"/> #{bundle.download}
+            <span class="glyphicon glyphicon-download-alt"/>
         </p:commandLink>
         <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and (downloadPopupRequired) 
                                   and fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}"
-                       styleClass="btn btn-default btn-download"
-                       process="@this"
+                       styleClass="btn-download btn btn-link bootstrap-button-tooltip" 
+                       style="font-size:2em !important;"
+                       title="#{bundle.download}"
                        disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
                        action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'package')}"
-                       update="@widgetVar(downloadPopup)" oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+                       process="@this" update="@widgetVar(downloadPopup)" oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
             <f:actionListener binding="#{packagePopupFragmentBean.setFileMetadata(fileMetadata)}" /> 
             <!-- package data file: -->
             <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
-            <span class="glyphicon glyphicon-download-alt"/> #{bundle.download}
+            <span class="glyphicon glyphicon-download-alt"/>
         </p:commandLink>
         <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) 
                                     and !(fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}"
-                       styleClass="btn btn-default btn-download"
-                       process="@this"
+                       styleClass="btn-download btn btn-link bootstrap-button-tooltip" 
+                       style="font-size:2em !important;"
+                       title="#{bundle.download}"
                        disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
-                       actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'Download')}">
+                       process="@this" actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'Download')}">
             <!-- non-tabular data file: -->
             <!-- no guest book/terms of use/etc. - straight to the download API url: -->
-            <span class="glyphicon glyphicon-download-alt"/> #{bundle.download}
+            <span class="glyphicon glyphicon-download-alt"/>
         </p:commandLink>
         <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and downloadPopupRequired 
                                     and !(fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}"
-                       styleClass="btn btn-default btn-download"
-                       process="@this"
+                       styleClass="btn-download btn btn-link bootstrap-button-tooltip" 
+                       style="font-size:2em !important;"
+                       title="#{bundle.download}"
                        disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
                        action="#{guestbookResponseService.modifyDatafile(guestbookResponse, fileMetadata)}"
-                       update="@widgetVar(downloadPopup)" oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+                       process="@this" update="@widgetVar(downloadPopup)" oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
             <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
-            <span class="glyphicon glyphicon-download-alt"/> #{bundle.download}
+            <span class="glyphicon glyphicon-download-alt"/>
         </p:commandLink>
         <!-- END:DUPLICATE LINKS -->
         <!-- DUP SUBMENU LINK -->
-        <div class="btn-group" jsf:rendered="#{fileMetadata.dataFile.tabularData}">
+        <div class="btn-group dropdown" jsf:rendered="#{fileMetadata.dataFile.tabularData}">
             <!-- Download Dropdown -->
-            <button type="button" class="btn btn-default btn-download dropdown-toggle" data-toggle="dropdown">
-                <span class="glyphicon glyphicon-download-alt"/> #{bundle.download} <span class="caret"/>
-            </button>
-            <ul class="dropdown-menu multi-level pull-right text-left" role="menu">
+            <a style="font-size:2em !important;" type="button" class="btn-download btn btn-link bootstrap-button-tooltip dropdown-toggle" 
+                          title="#{bundle.download}" id="downloadBtn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <span class="glyphicon glyphicon-download-alt"/><span class="caret"/>
+            </a>
+            <ul class="dropdown-menu multi-level pull-right text-left" aria-labelledby="downloadBtn">
                 <ui:remove>
                     <li>
                         <p:commandLink styleClass="highlightBold" rendered="#{!(downloadPopupRequired)}"
@@ -533,28 +541,34 @@
         <!-- END: FILE PG -->
         <ui:fragment rendered="#{!isFilePg}">
         <!-- DATASET PG -->
-        <p:commandLink styleClass="btn btn-default btn-request" rendered="#{fileDownloadHelper.session.user.authenticated 
+        
+        <!-- TODO - FIX UX INDICATOR YOUR REQUEST WAS SUBMITTED SINCE BTN LABEL IS NOW HIDDEN IN TITLE TOOLTIP -->
+        
+        <p:commandLink style="font-size:2em !important;" styleClass="btn-request btn btn-link bootstrap-button-tooltip" rendered="#{fileDownloadHelper.session.user.authenticated 
                                                                               and !requestAccessPopupRequired}"
+                       title="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}"
                        process="@this"
                        actionListener="#{fileDownloadHelper.requestAccess(fileMetadata.dataFile)}"
                        update="@this"
                        disabled="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user)}">
-            <span class="glyphicon glyphicon-bullhorn"/> #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
+            <span class="glyphicon glyphicon-bullhorn"/>
         </p:commandLink>
-        <p:commandLink styleClass="btn btn-default btn-request" rendered="#{fileDownloadHelper.session.user.authenticated 
+        <p:commandLink style="font-size:2em !important;" styleClass="btn-request btn btn-link bootstrap-button-tooltip" rendered="#{fileDownloadHelper.session.user.authenticated 
                                                                               and requestAccessPopupRequired}"
+                       title="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}"
                        process="@this"
                        actionListener="#{fileDownloadHelper.addFileForRequestAccess(fileMetadata.dataFile)}"
                        onclick="PF('requestAccessPopup').show()"
                        id="requestAccessPopupButton"
                        disabled="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user)}">
-            <span class="glyphicon glyphicon-bullhorn"/> #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
+            <span class="glyphicon glyphicon-bullhorn"/>
         </p:commandLink>
-        <p:commandLink styleClass="btn btn-default btn-request" rendered="#{!fileDownloadHelper.session.user.authenticated}"
+        <p:commandLink style="font-size:2em !important;" styleClass="btn-request btn btn-link bootstrap-button-tooltip" rendered="#{!fileDownloadHelper.session.user.authenticated}"
+                       title="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}"
                        process="@this"
                        onclick="PF('accessSignUpLogIn_popup').show()">
             <!-- 4.2.1 - TODO: retest this on a dataset with fileRequest enabled and with some files restricted to the user -->
-            <span class="glyphicon glyphicon-bullhorn"/> #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
+            <span class="glyphicon glyphicon-bullhorn"/>
         </p:commandLink>
         <!-- END: DATASET PG -->
         </ui:fragment>
diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
index 31e53a0d69e..8537a4cd080 100644
--- a/src/main/webapp/filesFragment.xhtml
+++ b/src/main/webapp/filesFragment.xhtml
@@ -577,44 +577,8 @@
                                 disabled="#{DatasetPage.locked}">
                     <span class="glyphicon glyphicon-bullhorn"/> #{bundle['file.requestAccess']}
                 </p:commandLink>
-            </f:facet>          
-            <div id="txtInprogess" class="bg-info text-info text-center margin-bottom-half" jsf:rendered="#{fileMetadata.dataFile.ingestInProgress}">
-                <!-- Ingest in progress... -->
-                #{bundle['file.ingestInProgress']}
-            </div>
+            </f:facet>
             
-            <!---Modular configure-->
-            <ui:fragment rendered="#{!widgetWrapper.widgetView and DatasetPage.sessionUserAuthenticated and DatasetPage.canUpdateDataset() and (DatasetPage.getConfigureToolsForDataFile(fileMetadata.dataFile.id).size() > 0 or worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata))}">
-                <ui:include src="file-configure-dropdown-fragment.xhtml">
-                    <ui:param name="configureTools" value="#{DatasetPage.getConfigureToolsForDataFile(fileMetadata.dataFile.id)}"/>
-                    <ui:param name="isFilePg" value="false"/>
-                    <ui:param name="fileId" value="#{fileMetadata.dataFile.id}"/>
-                    <ui:param name="canUpdateDataset" value="#{DatasetPage.canUpdateDataset()}"/>
-                </ui:include>
-            </ui:fragment>
-
-            <div class="btn-group" jsf:rendered="#{!fileMetadata.dataFile.filePackage or
-                fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}">
-                
-                <ui:fragment rendered="#{fileMetadata.dataFile.ingestProblem and DatasetPage.canUpdateDataset()}">
-                    <!-- Ingest Problem - this is the infamous "red triangle" error. As of 4.2, we only want to show it to the owner of the dataset: -->
-                    <span class="ingest-warning" data-toggle="popover" data-container="body" data-trigger="hover" data-placement="left" data-html="true" data-title="&lt;span class='text-danger h5'&gt;#{bundle['file.ingestFailed.header']}&lt;/span&gt;" data-content="&lt;span class='text-danger'&gt;#{bundle['file.ingestFailed.message']} #{fileMetadata.dataFile.ingestReportMessage}&lt;/span&gt;">
-                        <span class="glyphicon glyphicon-warning-sign text-danger"/>
-                    </span>
-                </ui:fragment>
-                
-                <ui:include src="file-download-button-fragment.xhtml">
-                    <ui:param name="fileMetadata" value="#{fileMetadata}"/>
-                    
-                    <ui:param name="downloadPopupRequired" value="#{DatasetPage.downloadPopupRequired}"/>
-                    <ui:param name="requestAccessPopupRequired" value="#{DatasetPage.requestAccessPopupRequired}"/>
-                    <ui:param name="guestbookResponse" value="#{DatasetPage.guestbookResponse}"/>
-                    <ui:param name="guestbookResponseService" value="#{DatasetPage.guestbookResponseService}"/>
-                    <ui:param name="fileDownloadService" value="#{DatasetPage.fileDownloadService}"/>
-                    <ui:param name="lockedFromDownload" value="#{DatasetPage.lockedFromDownload}"/>
-                    <ui:param name="exploreTools" value="#{DatasetPage.getExploreToolsForDataFile(fileMetadata.dataFile.id)}"/>
-                </ui:include>
-            </div>
             <div class="col-xs-12 text-left small" jsf:rendered="#{fileMetadata.dataFile.filePackage and systemConfig.rsyncDownload 
                 and !DatasetPage.workingVersion.getDataset().getStorageIdentifier().startsWith('s3://') 
                 }">
@@ -625,6 +589,56 @@
                     <ui:param name="fileDownloadService" value="#{DatasetPage.fileDownloadService}"/>
                 </ui:include>
             </div>
+            
+            <!-- FILE LEVEL INLINE INDICATORS, MSG, ICON, ET AL -->
+            <div id="txtInprogess" class="bg-info text-info text-center margin-bottom-half" jsf:rendered="#{fileMetadata.dataFile.ingestInProgress}">
+                <!-- Ingest in progress... -->
+                #{bundle['file.ingestInProgress']}
+            </div>
+            <ui:fragment rendered="#{fileMetadata.dataFile.ingestProblem and DatasetPage.canUpdateDataset()}">
+                <!-- Ingest Problem - this is the infamous "red triangle" error. As of 4.2, we only want to show it to the owner of the dataset: -->
+                <span class="ingest-warning" data-toggle="popover" data-container="body" data-trigger="hover" data-placement="left" data-html="true" data-title="&lt;span class='text-danger h5'&gt;#{bundle['file.ingestFailed.header']}&lt;/span&gt;" data-content="&lt;span class='text-danger'&gt;#{bundle['file.ingestFailed.message']} #{fileMetadata.dataFile.ingestReportMessage}&lt;/span&gt;">
+                    <span class="glyphicon glyphicon-warning-sign text-danger"/>
+                </span>
+            </ui:fragment>
+            <!-- END: FILE LEVEL INLINE INDICATORS, MSG, ICON, ET AL -->
+            
+            
+            <div class="btn-group" role="group" aria-label="TODO: ACCESSIBILITY LABEL FILE LEVEL ACTIONS">
+            
+                <!---Modular configure-->
+                <ui:fragment rendered="#{!widgetWrapper.widgetView 
+                                         and DatasetPage.sessionUserAuthenticated 
+                                         and DatasetPage.canUpdateDataset() 
+                                         and (DatasetPage.getConfigureToolsForDataFile(fileMetadata.dataFile.id).size() > 0 
+                                                or worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata) 
+                                                or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata))}">
+                    <ui:include src="file-configure-dropdown-fragment.xhtml">
+                        <ui:param name="configureTools" value="#{DatasetPage.getConfigureToolsForDataFile(fileMetadata.dataFile.id)}"/>
+                        <ui:param name="isFilePg" value="false"/>
+                        <ui:param name="fileId" value="#{fileMetadata.dataFile.id}"/>
+                        <ui:param name="canUpdateDataset" value="#{DatasetPage.canUpdateDataset()}"/>
+                    </ui:include>
+                </ui:fragment>
+
+                <ui:fragment rendered="#{!fileMetadata.dataFile.filePackage or
+                    fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}">
+
+                    <ui:include src="file-download-button-fragment.xhtml">
+                        <ui:param name="fileMetadata" value="#{fileMetadata}"/>
+
+                        <ui:param name="downloadPopupRequired" value="#{DatasetPage.downloadPopupRequired}"/>
+                        <ui:param name="requestAccessPopupRequired" value="#{DatasetPage.requestAccessPopupRequired}"/>
+                        <ui:param name="guestbookResponse" value="#{DatasetPage.guestbookResponse}"/>
+                        <ui:param name="guestbookResponseService" value="#{DatasetPage.guestbookResponseService}"/>
+                        <ui:param name="fileDownloadService" value="#{DatasetPage.fileDownloadService}"/>
+                        <ui:param name="lockedFromDownload" value="#{DatasetPage.lockedFromDownload}"/>
+                        <ui:param name="exploreTools" value="#{DatasetPage.getExploreToolsForDataFile(fileMetadata.dataFile.id)}"/>
+                    </ui:include>
+                </ui:fragment>
+            
+            </div>
+            
         </p:column>
     </p:dataTable>