From d13349dd92195e3bddc6d1d1d3a0d07d608e4078 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Thu, 21 Feb 2019 15:08:23 -0500
Subject: [PATCH 01/22] Converted label tooltips to icons on create account pg
 [ref #3925]

---
 src/main/webapp/dataverseuser.xhtml | 62 ++++++++++++++---------------
 src/main/webapp/termsofuse.xhtml    |  6 +--
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index 87409fcf727..c5533fa8890 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -497,9 +497,9 @@
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
                                 <!-- Username -->
                                     <label for="userNameEmail" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['user.username.illegal.tip']}">
-                                            #{bundle['user.username']} <span class="glyphicon glyphicon-asterisk text-danger"/>
-                                        </span>
+                                        #{bundle['user.username']} <span class="glyphicon glyphicon-asterisk text-danger"/>
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.username.illegal.tip']}"></span>
                                     </label>
                                     <div class="col-sm-9">
                                         <p class="help-block">#{bundle['user.username.valid']}</p>
@@ -516,9 +516,9 @@
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == DataverseUserPage.changePasswordMode}">
                                 <!-- Current Password -->
                                     <label for="currentPassword" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['user.currentPasswd.tip']}">
-                                            #{bundle['user.currentPasswd']} <span class="glyphicon glyphicon-asterisk text-danger"/>
-                                        </span>
+                                        #{bundle['user.currentPasswd']} <span class="glyphicon glyphicon-asterisk text-danger"/>
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.currentPasswd.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
                                         <p:password id="currentPassword" label="#{bundle['user.currentPasswd']}" styleClass="form-control" value="#{DataverseUserPage.currentPassword}" autocomplete="off"/><!-- browsers will in general not respect autocomplete="foo", but scanners will still flag it as a potential problem -->
@@ -528,10 +528,10 @@
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == DataverseUserPage.changePasswordMode}">
                                 <!-- Password -->
                                     <label for="inputPassword" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['user.passwd.illegal.tip']}">
-                                            <h:outputText value="#{DataverseUserPage.editMode == 'CREATE' ? bundle['user.password'] : bundle['user.newPassword']}" />
-                                            <span class="glyphicon glyphicon-asterisk text-danger"></span>
-                                        </span>
+                                        <h:outputText value="#{DataverseUserPage.editMode == 'CREATE' ? bundle['user.password'] : bundle['user.newPassword']}" />
+                                        <span class="glyphicon glyphicon-asterisk text-danger"></span>
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.passwd.illegal.tip']}"></span>
                                     </label>
                                     <div class="col-sm-9">
                                         <div class="help-block">
@@ -548,9 +548,9 @@
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == DataverseUserPage.changePasswordMode}">
                                     <!-- Retype Password -->
                                     <label for="retypePassword" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['user.rePasswd.tip']}">
-                                            #{bundle['user.rePasswd']} <span class="glyphicon glyphicon-asterisk text-danger"/>
-                                        </span>
+                                        #{bundle['user.rePasswd']} <span class="glyphicon glyphicon-asterisk text-danger"/>
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.rePasswd.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
                                         <p:password id="retypePassword" label="#{bundle['user.rePasswd']}" styleClass="form-control" value="#{DataverseUserPage.inputPassword}" autocomplete="off"/><!-- browsers will in general not respect autocomplete="foo", but scanners will still flag it as a potential problem -->
@@ -560,9 +560,9 @@
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
                                 <!-- First Name -->
                                     <label for="firstName" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['user.firstName.tip']}">
-                                            #{bundle['user.firstName']} <span class="glyphicon glyphicon-asterisk text-danger"/>
-                                        </span>
+                                        #{bundle['user.firstName']} <span class="glyphicon glyphicon-asterisk text-danger"/>
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.firstName.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
                                         <p:inputText id="firstName" styleClass="form-control" value="#{DataverseUserPage.userDisplayInfo.firstName}" />
@@ -572,9 +572,9 @@
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
                                     <!-- Last Name -->
                                     <label for="lastName" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['user.lastName.tip']}">
-                                            #{bundle['user.lastName']} <span class="glyphicon glyphicon-asterisk text-danger"/>
-                                        </span>
+                                        #{bundle['user.lastName']} <span class="glyphicon glyphicon-asterisk text-danger"/>
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.lastName.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
                                         <p:inputText id="lastName" styleClass="form-control" value="#{DataverseUserPage.userDisplayInfo.lastName}" />
@@ -584,9 +584,9 @@
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
                                     <!-- Email -->
                                     <label for="email" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{user.email.tip}">
-                                            #{bundle.email} <span class="glyphicon glyphicon-asterisk text-danger"/>
-                                        </span>
+                                        #{bundle.email} <span class="glyphicon glyphicon-asterisk text-danger"/>
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.email.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
                                         <p:inputText id="email" styleClass="form-control"
@@ -599,9 +599,9 @@
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'EDIT' and DataverseUserPage.userAuthProvider.displayIdentifier}">
                                     <!-- ORCID iD, for example -->
                                     <label for="userPersistentId" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{DataverseUserPage.userAuthProvider.persistentIdDescription}">
-                                            #{DataverseUserPage.userAuthProvider.persistentIdName}
-                                        </span>
+                                        #{DataverseUserPage.userAuthProvider.persistentIdName}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{DataverseUserPage.userAuthProvider.persistentIdDescription}"></span>
                                     </label>
                                     <div class="col-sm-4">
                                         <p class="form-control-static">
@@ -615,9 +615,9 @@
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
                                     <!-- Affiliation -->
                                     <label for="affiliation" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['user.affiliation.tip']}">
-                                            #{bundle.affiliation}
-                                        </span>
+                                        #{bundle.affiliation}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.affiliation.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
                                         <p:inputText id="affiliation" styleClass="form-control" value="#{DataverseUserPage.userDisplayInfo.affiliation}" />
@@ -627,9 +627,9 @@
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
                                 <!-- Position -->
                                     <label for="position" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['user.position.tip']}">
-                                            #{bundle['user.position']}
-                                        </span>
+                                        #{bundle['user.position']}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.position.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
                                         <p:inputText id="position" styleClass="form-control" value="#{DataverseUserPage.userDisplayInfo.position}" />
diff --git a/src/main/webapp/termsofuse.xhtml b/src/main/webapp/termsofuse.xhtml
index 7b1c036337d..d4252869bfd 100644
--- a/src/main/webapp/termsofuse.xhtml
+++ b/src/main/webapp/termsofuse.xhtml
@@ -6,9 +6,9 @@
     
     <div class="form-group">
         <label for="position" class="col-sm-3 control-label">
-            <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['user.acccountterms.tip']}">
-                #{bundle['user.acccountterms']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-            </span>
+            #{bundle['user.acccountterms']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
+            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.acccountterms.tip']}"></span>
         </label>
         <div class="col-sm-9">
             <div id="terms-agreement-block" class="well">

From c7f4e4c87d19075c66c3a5ac2dec7b8f472aa33e Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Thu, 21 Feb 2019 17:57:03 -0500
Subject: [PATCH 02/22] Converted label tooltips to icons on dataverse, dataset
 and adv search pgs [ref #3925]

---
 src/main/webapp/dataverse.xhtml        | 42 ++++++-------
 src/main/webapp/metadataFragment.xhtml | 34 ++++++-----
 src/main/webapp/search/advanced.xhtml  | 84 +++++++++++++-------------
 3 files changed, 81 insertions(+), 79 deletions(-)

diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index c05b48adc0f..041eb000f25 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -53,9 +53,9 @@
                         <div class="row">
                             <div class="col-xs-6 form-group form-col-container">
                                 <label class="col-sm-3 control-label" for="name">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.title']}">
-                                        #{bundle.dataverse} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    </span>
+                                    #{bundle.dataverse} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.title']}"></span>
                                 </label>
                                 <div class="col-sm-9 form-col-container">
                                     <p:inputText id="name" tabindex="1" styleClass="form-control" value="#{DataversePage.dataverse.name}"/>
@@ -63,9 +63,9 @@
                             </div>
                             <div class="col-xs-6 form-group form-col-container">
                                 <label class="col-sm-3 control-label" for="affiliation">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.affiliation.title']}">
-                                        #{bundle.affiliation}
-                                    </span>
+                                    #{bundle.affiliation}
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.affiliation.title']}"></span>
                                 </label>
                                 <div class="col-sm-9 form-col-container">
                                     <p:inputText id="affiliation" tabindex="2" styleClass="form-control" value="#{DataversePage.dataverse.affiliation}"/>
@@ -76,9 +76,9 @@
                         <div class="row">
                             <div class="col-xs-6 form-group form-col-container">
                                 <label class="col-sm-3 control-label" for="identifier">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.identifier.title']}">
-                                        #{bundle.identifier} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    </span>
+                                    #{bundle.identifier} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.identifier.title']}"></span>
                                 </label>
                                 <div class="col-sm-9 form-col-container">
                                     <div class="input-group">
@@ -90,9 +90,9 @@
                             </div>
                             <div class="col-xs-6 form-group" jsf:rendered="#{DataversePage.ownerId != null}">
                                 <label class="col-sm-3 control-label" for="hostDataverse">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.host.title']}">
-                                        #{bundle.hostDataverse}
-                                    </span>
+                                    #{bundle.hostDataverse}
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.host.title']}"></span>
                                 </label>
                                 <div class="col-sm-9 form-col-container">
                                     <p class="form-control-static">#{DataversePage.dataverse.getOwner().name}</p>
@@ -110,9 +110,9 @@
                             <div class="col-xs-6 form-group form-col-container">
                                 <div class="form-group clearfix">
                                     <label class="col-sm-3 control-label" for="dataverseCategory">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.category.title']}">
-                                            #{bundle['dataverse.category']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                        </span>
+                                        #{bundle['dataverse.category']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.category.title']}"></span>
                                     </label>
                                     <div class="col-sm-9 form-col-container">
                                         <h:selectOneMenu id="dataverseCategory" tabindex="5" styleClass="form-control" value="#{DataversePage.dataverse.dataverseType}">
@@ -134,9 +134,9 @@
                                     <p:fragment>
                                        <p:autoUpdate />
                                         <label class="col-sm-3 control-label" for="contactEmail">
-                                            <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.email.title']}">
-                                                #{bundle['dataverse.email']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                            </span>
+                                            #{bundle['dataverse.email']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
+                                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.email.title']}"></span>
                                         </label>
                                         <div class="col-sm-9 form-col-container edit-compound-field">
                                             <ui:repeat value="#{DataversePage.dataverse.dataverseContacts}" var="contacts" varStatus="valCount">
@@ -171,9 +171,9 @@
                             </div>
                             <div class="col-xs-6 form-group form-col-container">
                                 <label class="col-sm-3 control-label" for="description">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.description.title']}">
-                                        #{bundle.description}
-                                    </span>
+                                    #{bundle.description}
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.description.title']}"></span>
                                 </label>
                                 <div class="col-sm-9 form-col-container">
                                     <p class="help-block">
diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index 1c5beec28d8..a33baedc9f0 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -20,9 +20,9 @@
                         <ui:fragment rendered="#{block.index == '0' and datasetPage}">
                             <div class="form-group">
                                 <label for="metadata_persistentId" class="col-sm-3 control-label">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataset.metadata.persistentId.tip']}">
-                                        #{bundle['dataset.metadata.persistentId']}
-                                    </span>
+                                    #{bundle['dataset.metadata.persistentId']}
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.metadata.persistentId.tip']}"></span>
                                 </label>
                                 <div class="col-sm-9">
                                     #{globalId}
@@ -31,9 +31,9 @@
                             <ui:fragment rendered="#{!empty altPID}">
                             <div class="form-group">
                                 <label for="metadata_persistentId" class="col-sm-3 control-label">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataset.metadata.alternativePersistentId.tip']}">
-                                        #{bundle['dataset.metadata.alternativePersistentId']}
-                                    </span>
+                                    #{bundle['dataset.metadata.alternativePersistentId']}
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.metadata.alternativePersistentId.tip']}"></span>
                                 </label>
                                 <div class="col-sm-9">
                                     #{altPID}
@@ -42,9 +42,9 @@
                             </ui:fragment>
                             <div class="form-group" jsf:rendered="#{!empty publicationDate}">
                                 <label for="metadata_publicationDate" class="col-sm-3 control-label">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataset.metadata.publicationDate.tip']}">
-                                        #{bundle['dataset.metadata.publicationDate']}
-                                    </span>
+                                    #{bundle['dataset.metadata.publicationDate']}
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.metadata.publicationDate.tip']}"></span>
                                 </label>
                                 <div class="col-sm-9">
                                     #{publicationDate}
@@ -54,9 +54,9 @@
                         <ui:repeat value="#{metadataBlockVal.value}" var="dsf">
                             <div class="form-group">
                                 <label for="metadata_#{dsf.datasetFieldType.name}" class="col-sm-3 control-label">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{dsf.datasetFieldType.localeDescription}">
-                                        #{dsf.datasetFieldType.localeTitle}
-                                    </span>
+                                    #{dsf.datasetFieldType.localeTitle}
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
                                 </label>
                                 <!-- Primitive datasetFields -->
                                 <div class="col-sm-9" jsf:rendered="#{dsf.datasetFieldType.primitive}">   
@@ -111,10 +111,10 @@
                                                          or (!datasetPage and dsf.include)}">
                                     <div class="form-group">
                                         <label for="metadata_#{dsf.datasetFieldType.name}" class="col-sm-3 control-label">
-                                            <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{dsf.datasetFieldType.localeDescription}">
-                                                #{dsf.datasetFieldType.localeTitle}
-                                            </span>
+                                            #{dsf.datasetFieldType.localeTitle}
                                             <h:outputText styleClass="glyphicon glyphicon-asterisk text-danger" value="" rendered="#{dsf.required  or dsf.datasetFieldType.hasRequiredChildren }" />
+                                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
                                         </label>
                                         <!-- Primitive fields -->
                                         <p:fragment id="editPrimitiveValueFragment" rendered="#{dsf.datasetFieldType.primitive}">
@@ -193,8 +193,10 @@
                                                                     </p>
                                                                 </ui:fragment>
                                                                 <label class="control-label" for="metadata_#{subdsf.datasetFieldType.name}">
-                                                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{subdsf.datasetFieldType.localeDescription}">#{subdsf.datasetFieldType.localeTitle}</span>
+                                                                    #{subdsf.datasetFieldType.localeTitle}
                                                                     <h:outputText styleClass="glyphicon glyphicon-asterisk text-danger" value="" rendered="#{subdsf.required}" />
+                                                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{subdsf.datasetFieldType.localeDescription}"></span>
                                                                 </label>
                                                                 <ui:fragment rendered="#{!subdsf.datasetFieldType.controlledVocabulary}">
                                                                     <ui:include src="datasetFieldForEditFragment.xhtml">
diff --git a/src/main/webapp/search/advanced.xhtml b/src/main/webapp/search/advanced.xhtml
index 30ac62e2809..3e51dcf5d86 100644
--- a/src/main/webapp/search/advanced.xhtml
+++ b/src/main/webapp/search/advanced.xhtml
@@ -35,9 +35,9 @@
                             <div id="panelCollapseDataversesFieldList" class="panel-body form-horizontal collapse in">
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['advanced.search.dataverses.name.tip']}">
-                                            #{bundle.name}
-                                        </span>
+                                        #{bundle.name}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.dataverses.name.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
                                         <p:inputText id="dvFieldName" styleClass="form-control" value="#{AdvancedSearchPage.dvFieldName}"/>
@@ -45,9 +45,9 @@
                                 </div>
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.identifier.title']}">
-                                            #{bundle.identifier}
-                                        </span>
+                                        #{bundle.identifier}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.identifier.title']}"></span>
                                     </label>
                                     <div class="col-sm-6">
                                         <p:inputText id="dvFieldAlias" styleClass="form-control" value="#{AdvancedSearchPage.dvFieldAlias}"/>
@@ -55,9 +55,9 @@
                                 </div>
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['advanced.search.dataverses.affiliation.tip']}">
-                                            #{bundle.affiliation}
-                                        </span>
+                                        #{bundle.affiliation}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.dataverses.affiliation.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
                                         <p:inputText id="dvFieldAffiliation" styleClass="form-control" value="#{AdvancedSearchPage.dvFieldAffiliation}"/>
@@ -65,9 +65,9 @@
                                 </div>
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['advanced.search.dataverses.description.tip']}">
-                                            #{bundle.description}
-                                        </span>
+                                        #{bundle.description}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.dataverses.description.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
                                         <p:inputText id="dvFieldDescription" styleClass="form-control" value="#{AdvancedSearchPage.dvFieldDescription}"/>
@@ -75,9 +75,9 @@
                                 </div>
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['advanced.search.dataverses.subject.tip']}">
-                                            #{bundle.subject}
-                                        </span>
+                                        #{bundle.subject}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.dataverses.subject.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
                                         <div class="ui-inputfield form-control select-scroll-block">
@@ -100,9 +100,9 @@
                                     <ui:repeat value="#{AdvancedSearchPage.metadataFieldMap.get(mdb.getId())}" var="item">
                                         <div class="form-group">
                                             <label class="col-sm-4 control-label">
-                                                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{item.localeDescription}">
-                                                    #{item.displayName}
-                                                </span>
+                                                #{item.displayName}
+                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{item.localeDescription}"></span>
                                             </label>
                                             <div class="col-sm-6">
                                                 <p:inputText id="searchValue" styleClass="form-control" value="#{item.searchValue}" rendered="#{empty item.controlledVocabularyValues}"/>
@@ -118,9 +118,9 @@
                                     <ui:fragment rendered="#{mdb.id == '1'}">
                                         <div class="form-group">
                                             <label class="col-sm-4 control-label">
-                                                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataset.metadata.publicationYear.tip']}">
-                                                    #{bundle['dataset.metadata.publicationYear']}
-                                                </span>
+                                                #{bundle['dataset.metadata.publicationYear']}
+                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.metadata.publicationYear.tip']}"></span>
                                             </label>
                                             <div class="col-sm-6">
                                                 <p:inputText id="dvFieldNamez" styleClass="form-control" value="#{AdvancedSearchPage.dsPublicationDate}"/>
@@ -128,9 +128,9 @@
                                         </div>
                                         <div class="form-group">
                                             <label class="col-sm-4 control-label">
-                                                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataset.metadata.persistentId.tip']}">
-                                                    #{bundle['dataset.metadata.persistentId']}
-                                                </span>
+                                                #{bundle['dataset.metadata.persistentId']}
+                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.metadata.persistentId.tip']}"></span>
                                             </label>
                                             <div class="col-sm-6">
                                                 <p:inputText id="dsPersistentIdentifier" styleClass="form-control" value="#{AdvancedSearchPage.dsPersistentId}"/>
@@ -148,9 +148,9 @@
                             <div id="panelCollapseFilesFieldList" class="panel-body form-horizontal collapse in">
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['advanced.search.files.name.tip']}">
-                                            #{bundle.name}
-                                        </span>
+                                        #{bundle.name}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.name.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
                                         <p:inputText id="fileFieldName" styleClass="form-control" value="#{AdvancedSearchPage.fileFieldName}"/>
@@ -158,9 +158,9 @@
                                 </div>
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['advanced.search.files.description.tip']}">
-                                            #{bundle.description}
-                                        </span>
+                                        #{bundle.description}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.description.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
                                         <p:inputText id="fileFieldDescription" styleClass="form-control" value="#{AdvancedSearchPage.fileFieldDescription}"/>
@@ -168,9 +168,9 @@
                                 </div>
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['advanced.search.files.fileType.tip']}">
-                                            #{bundle['advanced.search.files.fileType']}
-                                        </span>
+                                        #{bundle['advanced.search.files.fileType']}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.fileType.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
                                         <p:inputText id="fileFieldFiletype" styleClass="form-control" value="#{AdvancedSearchPage.fileFieldFiletype}"/>
@@ -178,9 +178,9 @@
                                 </div>
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['advanced.search.files.persistentId.tip']}">
-                                            #{bundle['advanced.search.files.persistentId']}
-                                        </span>
+                                        #{bundle['advanced.search.files.persistentId']}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.persistentId.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
                                         <p:inputText id="fileFieldPersistentId" styleClass="form-control" value="#{AdvancedSearchPage.filePersistentId}"/>
@@ -188,9 +188,9 @@
                                 </div>
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['advanced.search.files.variableName.tip']}">
-                                            #{bundle['advanced.search.files.variableName']}
-                                        </span>
+                                        #{bundle['advanced.search.files.variableName']}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.variableName.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
                                         <p:inputText id="fileFieldVariableName" styleClass="form-control" value="#{AdvancedSearchPage.fileFieldVariableName}"/>
@@ -198,9 +198,9 @@
                                 </div>
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['advanced.search.files.variableLabel.tip']}">
-                                            #{bundle['advanced.search.files.variableLabel']}
-                                        </span>
+                                        #{bundle['advanced.search.files.variableLabel']}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.variableLabel.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
                                         <p:inputText id="fileFieldVariableLabel" styleClass="form-control" value="#{AdvancedSearchPage.fileFieldVariableLabel}"/>

From 8ed616c0c65bf2a713da68b72980e70fa964a4df Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Fri, 22 Feb 2019 14:54:05 -0500
Subject: [PATCH 03/22] Converted label tooltips to icons on file, terms,
 guestbook pgs [ref #3925]

---
 src/main/webapp/dataset-license-terms.xhtml   | 210 +++++++++---------
 src/main/webapp/editFilesFragment.xhtml       |  12 +-
 .../webapp/file-data-access-fragment.xhtml    |  18 +-
 src/main/webapp/file.xhtml                    |  12 +-
 src/main/webapp/filesFragment.xhtml           |   6 +-
 src/main/webapp/guestbook.xhtml               |  16 +-
 src/main/webapp/manage-guestbooks.xhtml       |   6 +-
 7 files changed, 140 insertions(+), 140 deletions(-)

diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index 6ad515f23c4..463a6e514d1 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -28,9 +28,9 @@
                    <div class="panel-body">
                        <div class="form-group">
                            <label for="metadata_Terms" class="col-sm-3 control-label">
-                               <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.title']}">
-                                   #{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver']}
-                               </span>
+                               #{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver']}
+                               <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                     data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.title']}"></span>
                            </label>
                            <div class="col-sm-9">
                                <ui:fragment rendered="#{empty editMode}">
@@ -56,9 +56,9 @@
                        </div>
                        <div class="form-group" jsf:rendered="#{termsOfUseAndAccess.license != 'CC0'}">
                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                               <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse.title']}">
-                                   #{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']}
-                               </span>
+                               #{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']}
+                               <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                     data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse.title']}"></span>
                            </label>
                            <div class="col-sm-9">
                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.termsOfUse)}" escape="false" rendered="#{empty editMode}"/>
@@ -78,9 +78,9 @@
                            <ui:fragment rendered="#{empty editMode}">
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.confidentialityDeclaration}">
                                    <label for="confidentialityDeclaration" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.confidentialityDeclaration)}" escape="false"/>
@@ -88,9 +88,9 @@
                                </div>
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.specialPermissions}">
                                    <label for="specialPermissions" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.specialPermissions)}" escape="false"/>
@@ -98,9 +98,9 @@
                                </div>
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.restrictions}">
                                    <label for="restrictions" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.restrictions)}" escape="false"/>
@@ -108,9 +108,9 @@
                                </div>
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.citationRequirements}">
                                    <label for="citationRequirements" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.citationRequirements)}" escape="false"/>
@@ -118,9 +118,9 @@
                                </div>
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.depositorRequirements}">
                                    <label for="depositorRequirements" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.depositorRequirements)}" escape="false"/>
@@ -128,9 +128,9 @@
                                </div>
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.conditions}">
                                    <label for="conditions" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.conditions)}" escape="false"/>
@@ -138,9 +138,9 @@
                                </div>
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.disclaimer}">
                                    <label for="disclaimer" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.disclaimer)}" escape="false"/>
@@ -150,9 +150,9 @@
                            <ui:fragment rendered="#{!empty editMode}">
                                <div class="form-group">
                                    <label for="confidentialityDeclaration" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <p:inputTextarea id="confidentialityDeclaration" value="#{termsOfUseAndAccess.confidentialityDeclaration}" rows="5" cols="60" styleClass="form-control" />
@@ -160,9 +160,9 @@
                                </div>
                                <div class="form-group">
                                    <label for="specialPermissions" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <p:inputTextarea id="specialPermissions" value="#{termsOfUseAndAccess.specialPermissions}" rows="5" cols="60" styleClass="form-control" />
@@ -170,9 +170,9 @@
                                </div>
                                <div class="form-group">
                                    <label for="restrictions" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <p:inputTextarea id="restrictions" value="#{termsOfUseAndAccess.restrictions}" rows="5" cols="60" styleClass="form-control" />
@@ -180,9 +180,9 @@
                                </div>
                                <div class="form-group">
                                    <label for="citationRequirements" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <p:inputTextarea id="citationRequirements" value="#{termsOfUseAndAccess.citationRequirements}" rows="5" cols="60" styleClass="form-control" />
@@ -190,9 +190,9 @@
                                </div>
                                <div class="form-group">
                                    <label for="depositorRequirements" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <p:inputTextarea id="depositorRequirements" value="#{termsOfUseAndAccess.depositorRequirements}" rows="5" cols="60" styleClass="form-control" />
@@ -200,9 +200,9 @@
                                </div>
                                <div class="form-group">
                                    <label for="conditions" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <p:inputTextarea id="conditions" value="#{termsOfUseAndAccess.conditions}" rows="5" cols="60" styleClass="form-control" />
@@ -210,9 +210,9 @@
                                </div>
                                <div class="form-group">
                                    <label for="disclaimer" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <p:inputTextarea id="disclaimer" value="#{termsOfUseAndAccess.disclaimer}" rows="5" cols="60" styleClass="form-control" />
@@ -241,9 +241,9 @@
                    <ui:fragment rendered="#{empty editMode}">
                        <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall}">
                            <label for="metadata_RestrictedFiles" class="col-sm-3 control-label">
-                               <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.title']}">
-                                   #{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles']}
-                               </span>
+                               #{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles']}
+                               <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                     data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.title']}"></span>
                            </label>
                            <div class="col-sm-9">
                                <p>
@@ -255,9 +255,9 @@
                        </div>
                        <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.termsOfAccess}">
                            <label for="metadata_TermsAccess" class="col-sm-3 control-label">
-                               <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}">
-                                   #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                               </span>
+                               #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
+                               <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                     data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                            </label>
                            <div class="col-sm-9">
                                <p><h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.termsOfAccess)}" escape="false"/></p>
@@ -265,9 +265,9 @@
                        </div>
                        <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall and (DatasetPage.restrictedFileCount > 0)}">
                            <label for="metadata_RequestAccess" class="col-sm-3 control-label">
-                               <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}">
-                                   #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
-                               </span>
+                               #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
+                               <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                     data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
                            </label>
                            <div class="col-sm-9">
                                <p jsf:rendered="#{!DatasetPage.workingVersion.draft}">
@@ -284,9 +284,9 @@
                    <ui:fragment rendered="#{!empty editMode}">
                        <div class="form-group">
                            <label for="metadata_TermsAccess" class="col-sm-3 control-label">
-                               <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}">
-                                   #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                               </span>
+                               #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
+                               <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                     data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                            </label>
                            <div class="col-sm-9">
                                <p:inputTextarea value="#{termsOfUseAndAccess.termsOfAccess}" rows="5" styleClass="form-control" />
@@ -294,9 +294,9 @@
                        </div>
                        <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall}">
                            <label for="metadata_RequestAccess" class="col-sm-3 control-label">
-                               <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}">
-                                   #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
-                               </span>
+                               #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
+                               <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                     data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
                            </label>
                            <div class="col-sm-9">
                                <p:selectBooleanCheckbox id="requestAccess" itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}" value="#{termsOfUseAndAccess.fileAccessRequest}"/>
@@ -314,9 +314,9 @@
                            <ui:fragment rendered="#{empty editMode}">
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.dataAccessPlace}">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.title']}#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.dataAccessPlace)}" escape="false"/>
@@ -324,9 +324,9 @@
                                </div>
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.originalArchive}">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.originalArchive)}" escape="false"/>
@@ -334,9 +334,9 @@
                                </div>
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.availabilityStatus}">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.availabilityStatus)}" escape="false"/>
@@ -344,9 +344,9 @@
                                </div>
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.contactForAccess}">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.contactForAccess)}" escape="false"/>
@@ -354,9 +354,9 @@
                                </div>
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.sizeOfCollection}">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection.tip']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection.tip']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.sizeOfCollection)}" escape="false"/>
@@ -364,9 +364,9 @@
                                </div>
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.studyCompletion}">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.studyCompletion)}" escape="false"/>
@@ -376,9 +376,9 @@
                            <ui:fragment rendered="#{!empty editMode}">
                                <div class="form-group">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <p:inputTextarea value="#{termsOfUseAndAccess.dataAccessPlace}" rows="5" cols="60" styleClass="form-control" />
@@ -386,9 +386,9 @@
                                </div>
                                <div class="form-group">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <p:inputTextarea value="#{termsOfUseAndAccess.originalArchive}" rows="5" cols="60" styleClass="form-control" />
@@ -396,9 +396,9 @@
                                </div>
                                <div class="form-group">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <p:inputTextarea value="#{termsOfUseAndAccess.availabilityStatus}" rows="5" cols="60" styleClass="form-control" />
@@ -406,9 +406,9 @@
                                </div>
                                <div class="form-group">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <p:inputTextarea value="#{termsOfUseAndAccess.contactForAccess}" rows="5" cols="60" styleClass="form-control" />
@@ -416,9 +416,9 @@
                                </div>
                                <div class="form-group">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection.tip']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection.tip']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <p:inputTextarea value="#{termsOfUseAndAccess.sizeOfCollection}" rows="5" cols="60" styleClass="form-control" />
@@ -426,9 +426,9 @@
                                </div>
                                <div class="form-group">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion.title']}">
-                                           #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion']}
-                                       </span>
+                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion']}
+                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <p:inputTextarea value="#{termsOfUseAndAccess.studyCompletion}" rows="5" cols="60" styleClass="form-control" />
@@ -450,9 +450,9 @@
                <div class="panel-body">
                    <div class="form-group">
                        <label for="metadata_Guestbook" class="col-sm-3 control-label">
-                           <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.guestbook.title']}">
-                               #{bundle['file.dataFilesTab.terms.list.guestbook']}
-                           </span>
+                           #{bundle['file.dataFilesTab.terms.list.guestbook']}
+                           <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                 data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.guestbook.title']}"></span>
                        </label>
                        <div class="col-sm-9">
                            <ui:fragment rendered="#{empty editMode}">
@@ -544,9 +544,9 @@
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">
-                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData.title']}">
-                       #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData']}
-                    </span>
+                    #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData']}
+                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData.title']}"></span>
                 </label>
                 <div class="col-sm-8">
                     <p class="form-control-static">
diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index 010a829290b..8469037b6e6 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -547,9 +547,9 @@
         <div class="form-horizontal">
             <div class="form-group">
                 <label for="metadata_TermsAccess" class="col-sm-3 control-label">
-                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}">
-                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                    </span>
+                    #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
+                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                          data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                 </label>
                 <ui:fragment rendered="#{!datasetPage}">
                 <div class="col-sm-9" jsf:rendered="#{!empty version.termsOfUseAndAccess}">
@@ -564,9 +564,9 @@
             </div>
             <div class="form-group">
                 <label for="metadata_RequestAccess" class="col-sm-3 control-label">
-                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}">
-                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
-                    </span>
+                    #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
+                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                          data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
                 </label>
                 <ui:fragment rendered="#{!datasetPage}">
                 <div class="col-sm-9" jsf:rendered="#{!empty version.termsOfUseAndAccess}">
diff --git a/src/main/webapp/file-data-access-fragment.xhtml b/src/main/webapp/file-data-access-fragment.xhtml
index b429f76112b..1351f16dc70 100644
--- a/src/main/webapp/file-data-access-fragment.xhtml
+++ b/src/main/webapp/file-data-access-fragment.xhtml
@@ -30,9 +30,9 @@
         </div>
         <div class="form-group row">
             <label class="col-xs-12 col-lg-3 control-label" data-original-title="#{bundle['file.dataFilesTab.dataAccess.local.tooltip']}">
-                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.dataAccess.local.tooltip']}">
-                    #{bundle['file.dataFilesTab.dataAccess.local.label']}
-                </span>
+                #{bundle['file.dataFilesTab.dataAccess.local.label']}
+                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.dataAccess.local.tooltip']}"></span>
             </label>
             <div class="col-sm-9">
                 <code>
@@ -42,9 +42,9 @@
         </div>
         <div class="form-group row">
             <label class="col-xs-12 col-lg-3 control-label">
-                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.dataAccess.download.tooltip']}">
-                    #{bundle['file.dataFilesTab.dataAccess.download.label']}
-                </span>
+                #{bundle['file.dataFilesTab.dataAccess.download.label']}
+                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.dataAccess.download.tooltip']}"></span>
             </label>
             <div class="col-xs-12 col-lg-9 row">
                 <ui:repeat value="#{repositoryStorageAbstractionLayerPage.getRsyncSites(datasetVersion)}" var="site">
@@ -57,9 +57,9 @@
         </div>
         <div class="form-group row">
             <label class="col-xs-12 col-lg-3 control-label">
-                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.dataAccess.verify.tooltip']}">
-                    #{bundle['file.dataFilesTab.dataAccess.verify.label']}
-                </span>
+                #{bundle['file.dataFilesTab.dataAccess.verify.label']}
+                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.dataAccess.verify.tooltip']}"></span>
             </label>
             <div class="col-sm-9">
                 <code>
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index d1939a0431d..18d44b35ad5 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -611,9 +611,9 @@
                             <div class="form-horizontal">
                                 <div class="form-group">
                                     <label for="metadata_TermsAccess" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}">
-                                            #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                                        </span>
+                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                                     </label>
                                     <div class="col-sm-9">
                                         <p:inputTextarea value="#{FilePage.fileMetadata.datasetVersion.termsOfUseAndAccess.termsOfAccess}" autoResize="false" rows="5" styleClass="form-control" widgetVar="inputtoa" />
@@ -621,9 +621,9 @@
                                 </div>
                                 <div class="form-group">
                                     <label for="metadata_RequestAccess" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}">
-                                            #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
-                                        </span>
+                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
                                     </label>
                                     <div class="col-sm-9">
                                         <p:selectBooleanCheckbox id="requestAccess" itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}"
diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
index 1762f887881..86062fa7747 100644
--- a/src/main/webapp/filesFragment.xhtml
+++ b/src/main/webapp/filesFragment.xhtml
@@ -45,9 +45,9 @@
                         </p>
                     </div>
                     <label class="col-sm-3 control-label">
-                        <span data-toggle="tooltip" data-placement="auto top" class="tooltiplabel text-info" data-original-title="#{bundle['file.cloudStorageAccess.tip']}">
-                            #{bundle['file.cloudStorageAccess']}
-                        </span>
+                        #{bundle['file.cloudStorageAccess']}
+                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                              data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['file.cloudStorageAccess.tip']}"></span>
                     </label>
                     <div class="col-md-4 col-sm-5 col-xs-6 input-group">
                         <div id="copy-input" class="form-control">#{DatasetPage.swiftContainerName}</div>
diff --git a/src/main/webapp/guestbook.xhtml b/src/main/webapp/guestbook.xhtml
index 349f8654f8d..a46ad0ba831 100644
--- a/src/main/webapp/guestbook.xhtml
+++ b/src/main/webapp/guestbook.xhtml
@@ -33,9 +33,9 @@
                         <div class="row form-horizontal">
                             <div class="col-xs-6 form-group">
                                 <label class="col-sm-3 control-label" for="guestbookNameStatic">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataset.manageGuestbooks.guestbook.name.tip']}">
-                                        #{bundle['dataset.manageGuestbooks.guestbook.name']}
-                                    </span>
+                                    #{bundle['dataset.manageGuestbooks.guestbook.name']}
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageGuestbooks.guestbook.name.tip']}"></span>
                                 </label>
                                 <div class="col-sm-9">
                                     <p class="form-control-static">
@@ -50,9 +50,10 @@
                     <div class="form-horizontal" jsf:rendered="#{!empty GuestbookPage.editMode}">
                         <div class="form-group">
                             <label class="col-sm-3 control-label" for="guestbookName">
-                                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataset.manageGuestbooks.guestbook.name.tip']}">
-                                    #{bundle['dataset.manageGuestbooks.guestbook.name']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"></span>
-                                </span>
+                                #{bundle['dataset.manageGuestbooks.guestbook.name']} 
+                                <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"></span>
+                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageGuestbooks.guestbook.name.tip']}"></span>
                             </label>
                             <div class="col-sm-6">
                                 <p:inputText id="guestbookName" styleClass="form-control" value="#{GuestbookPage.guestbook.name}"/>
@@ -199,5 +200,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</html>
-
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/manage-guestbooks.xhtml b/src/main/webapp/manage-guestbooks.xhtml
index 0f3c9e72cbf..42b1338c018 100644
--- a/src/main/webapp/manage-guestbooks.xhtml
+++ b/src/main/webapp/manage-guestbooks.xhtml
@@ -178,9 +178,9 @@
                             </div>
                             <div class="form-group">
                                 <label class="col-sm-3 control-label">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData.title']}">
-                                        #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData']}
-                                    </span>
+                                    #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData']}
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData.title']}"></span>
                                 </label>
                                 <div class="col-sm-8">
                                     <p class="form-control-static">

From 938eb9b7afec7a8c6e2cb7ce63705dec48fbf8d4 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Fri, 22 Feb 2019 17:52:17 -0500
Subject: [PATCH 04/22] Converted label tooltips to icons on dataset,
 harvesting, and other misc pgs [ref #3925]

---
 src/main/webapp/dataset-widgets.xhtml         | 18 ++---
 src/main/webapp/dataset.xhtml                 | 38 ++++++-----
 .../webapp/explicitGroup-new-dialog.xhtml     |  6 +-
 src/main/webapp/harvestclients.xhtml          | 51 +++++++-------
 src/main/webapp/harvestsets.xhtml             | 27 ++++----
 src/main/webapp/manage-templates.xhtml        |  4 +-
 src/main/webapp/oauth2/firstLogin.xhtml       | 48 ++++++++------
 src/main/webapp/roles-edit.xhtml              | 18 ++---
 src/main/webapp/template.xhtml                | 17 +++--
 src/main/webapp/themeAndWidgetsFragment.xhtml | 66 +++++++++----------
 10 files changed, 153 insertions(+), 140 deletions(-)

diff --git a/src/main/webapp/dataset-widgets.xhtml b/src/main/webapp/dataset-widgets.xhtml
index c4b1753cd6d..802a190b9f7 100644
--- a/src/main/webapp/dataset-widgets.xhtml
+++ b/src/main/webapp/dataset-widgets.xhtml
@@ -27,9 +27,9 @@
                         <h:form id="themeWidgetsForm" styleClass="row form-horizontal">
                             <div class="form-group" jsf:rendered="#{true or themeWidgetFragment.editDv.themeRoot}">
                                 <label class="col-sm-3 control-label" for="logoFormat">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.title']}">
-                                        #{bundle['dataset.thumbnailsAndWidget.thumbnailImage']}
-                                    </span>
+                                    #{bundle['dataset.thumbnailsAndWidget.thumbnailImage']}
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.title']}"></span>
                                 </label>
                                 <div class="col-sm-9">
                                     <p class="help-block"><span class="glyphicon glyphicon-info-sign"/>               
@@ -51,9 +51,9 @@
                                     <div class="col-sm-8">
                                         <div class="form-group" jsf:rendered="#{not empty DatasetWidgetsPage.datasetThumbnails}">
                                             <label for="selectThumbnail" class="control-label">
-                                                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.selectAvailable.title']}">
-                                                    #{bundle['dataset.thumbnailsAndWidget.thumbnailImage.selectAvailable']}
-                                                </span>
+                                                #{bundle['dataset.thumbnailsAndWidget.thumbnailImage.selectAvailable']}
+                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.selectAvailable.title']}"></span>
                                             </label>
                                             <div>
                                                 <button type="button" class="btn btn-default" onclick="PF('selectFileThumbnail').show()">#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.selectThumbnail']}</button>
@@ -61,9 +61,9 @@
                                         </div>
                                         <div class="form-group">
                                             <label for="uploadThumbnail" class="control-label">
-                                                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.uploadNew.title']}">
-                                                    #{bundle['dataset.thumbnailsAndWidget.thumbnailImage.uploadNew']}
-                                                </span>
+                                                #{bundle['dataset.thumbnailsAndWidget.thumbnailImage.uploadNew']}
+                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.uploadNew.title']}"></span>
                                             </label>
                                             <p:fileUpload invalidFileMessage="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.upload.invalidMsg']}" id="changelogo" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update="@all" 
                                                           sizeLimit="#{systemConfig.uploadLogoSizeLimit}" 
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 7c9f3e9aac1..b5d355c7dbb 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -375,13 +375,17 @@
                                         
                                         <div id="keywords" class="form-group" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.keywordDisplay and dsf.datasetFieldType.id==DatasetPage.datasetVersionUI.keyword.datasetFieldType.id}">
                                             <label class="col-sm-3 control-label">
-                                                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{DatasetPage.datasetVersionUI.keyword.datasetFieldType.localeDescription}">#{bundle['dataset.keywordDisplay.title']}</span>
+                                                #{bundle['dataset.keywordDisplay.title']}
+                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.keyword.datasetFieldType.localeDescription}"></span>
                                             </label>
                                             <div class="col-sm-9">#{DatasetPage.datasetVersionUI.keywordDisplay}</div>
                                         </div>
                                         <div id="publication" class="form-group" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.relPublicationCitation and dsf.datasetFieldType.name=='publication'}">
                                             <label class="col-sm-3 control-label">
-                                                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).description}">#{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).title}</span>
+                                                #{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).title}
+                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).description}"></span>
                                             </label>
                                             <div class="col-sm-9">
                                                 <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.datasetVersionUI.relPublicationCitation)}" escape="false"/>
@@ -391,9 +395,9 @@
                                      
                                         <div class="form-group" jsf:rendered="#{dsf.datasetFieldType.name!='publication' and dsf.datasetFieldType.name!='keyword'  }">
                                             <label for="metadata_#{dsf.datasetFieldType.name}" class="col-sm-3 control-label">
-                                                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{dsf.datasetFieldType.localeDescription}">
-                                                        #{dsf.datasetFieldType.localeTitle}
-                                                </span>
+                                                #{dsf.datasetFieldType.localeTitle}
+                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
                                             </label>
                                             <!-- Primitive datasetFields -->
                                             <div class="col-sm-9" jsf:rendered="#{dsf.datasetFieldType.primitive}">
@@ -436,9 +440,9 @@
                     <ui:fragment rendered="#{DatasetPage.editMode == 'METADATA' or DatasetPage.editMode == 'CREATE'}">
                         <div class="form-group">
                             <label for="select_HostDataverse" class="col-sm-2 control-label">
-                                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.host.title']}">
-                                    #{bundle.hostDataverse}
-                                </span>
+                                #{bundle.hostDataverse}
+                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.host.title']}"></span>
                             </label>
                             <div class="col-sm-10">
                                 <h:outputText styleClass="highlightBold" value="#{DatasetPage.dataset.owner.name}"/>
@@ -452,9 +456,9 @@
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty DatasetPage.dataverseTemplates and DatasetPage.editMode == 'CREATE'}">
                             <label for="select_DatasetTemplate" class="col-sm-2 control-label">
-                                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataset.manageTemplates.tab.action.btn.view.dialog.datasetTemplate.title']}">
-                                    #{bundle['dataset.manageTemplates.tab.action.btn.view.dialog.datasetTemplate']}
-                                </span>
+                                #{bundle['dataset.manageTemplates.tab.action.btn.view.dialog.datasetTemplate']}
+                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageTemplates.tab.action.btn.view.dialog.datasetTemplate.title']}"></span>
                             </label>
                             <div class="col-sm-6">
                                 <p class="help-block">
@@ -1305,9 +1309,9 @@
                             <div class="form-horizontal">
                                 <div class="form-group">
                                     <label for="metadata_TermsAccess" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}">
-                                            #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                                        </span>
+                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                                     </label>
                                     <div class="col-sm-9">
                                         <p:inputTextarea value="#{DatasetPage.workingVersion.termsOfUseAndAccess.termsOfAccess}" autoResize="false" rows="5" styleClass="form-control" widgetVar="inputtoa" />
@@ -1315,9 +1319,9 @@
                                 </div>
                                 <div class="form-group">
                                     <label for="metadata_RequestAccess" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}">
-                                            #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
-                                        </span>
+                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
                                     </label>
                                     <div class="col-sm-9">
                                         <p:selectBooleanCheckbox id="requestAccess" itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}"
diff --git a/src/main/webapp/explicitGroup-new-dialog.xhtml b/src/main/webapp/explicitGroup-new-dialog.xhtml
index 785d36b517b..d31721aad63 100644
--- a/src/main/webapp/explicitGroup-new-dialog.xhtml
+++ b/src/main/webapp/explicitGroup-new-dialog.xhtml
@@ -28,10 +28,10 @@
                 </div>
                 <div class="form-group">
                     <label for="explicitGroupIdentifier" class="col-sm-3 control-label">
-                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.permissions.explicitGroupEditDialog.groupIdentifier.tip']}">
-                            #{bundle['dataverse.permissions.explicitGroupEditDialog.groupIdentifier']}
-                        </span>
+                        #{bundle['dataverse.permissions.explicitGroupEditDialog.groupIdentifier']}
                         <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
+                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.permissions.explicitGroupEditDialog.groupIdentifier.tip']}"></span>
                     </label>
                     <div class="col-sm-9">
                         <p:panelGrid columns="2" styleClass="noBorders">
diff --git a/src/main/webapp/harvestclients.xhtml b/src/main/webapp/harvestclients.xhtml
index 07a72168bc6..e040dd1dd60 100644
--- a/src/main/webapp/harvestclients.xhtml
+++ b/src/main/webapp/harvestclients.xhtml
@@ -225,9 +225,10 @@
                                 <!-- harvest url/server address: -->
                                 <div class="form-group">
                                     <label for="serverUrl" class="col-sm-2 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['harvestclients.newClientDialog.url.tip']}">
-                                            #{bundle['harvestclients.newClientDialog.url']} <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{!harvestingClientsPage.initialSettingsValidated}" title="#{bundle.requiredField}"/>
-                                        </span>
+                                        #{bundle['harvestclients.newClientDialog.url']} 
+                                        <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{!harvestingClientsPage.initialSettingsValidated}" title="#{bundle.requiredField}"/>
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.newClientDialog.url.tip']}"></span>
                                     </label>
                                     <div class="col-sm-9">
                                         <p:inputText id="serverUrl" styleClass="form-control"
@@ -242,9 +243,10 @@
                                 <!-- dataverse to which the harvesting configuration is being added: -->
                                 <div class="form-group" jsf:rendered="#{harvestingClientsPage.createMode}">
                                     <label for="destinationDataverse" class="col-sm-2 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['harvestclients.newClientDialog.dataverse.tip']}">
-                                            #{bundle['harvestclients.newClientDialog.dataverse']} <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{harvestingClientsPage.createMode}" title="#{bundle.requiredField}"/>
-                                        </span>
+                                        #{bundle['harvestclients.newClientDialog.dataverse']} 
+                                        <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{harvestingClientsPage.createMode}" title="#{bundle.requiredField}"/>
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.newClientDialog.dataverse.tip']}"></span>
                                     </label>
                                     <div class="col-sm-9">
                                         <p:autoComplete id="destinationDataverseMenu"
@@ -302,9 +304,9 @@
                                 <!-- harvesting sets (if available): these are obtained from the oai server response: -->
                                 <div class="form-group">
                                     <label for="serverOaiSets" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['harvestclients.newClientDialog.oaiSets.tip']}">
-                                            #{bundle['harvestclients.newClientDialog.oaiSets']}
-                                        </span>
+                                        #{bundle['harvestclients.newClientDialog.oaiSets']}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.newClientDialog.oaiSets.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
                                         <!-- select menu, in "create new client" mode, after the server has been contacted and we got the list of sets: -->
@@ -329,9 +331,10 @@
                                 <!-- metadata formats offered. this is also obtained from the oai server response: -->
                                 <div class="form-group">
                                     <label for="oaiMetadataFormat" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['harvestclients.newClientDialog.oaiMetadataFormat.tip']}">
-                                            #{bundle['harvestclients.newClientDialog.oaiMetadataFormat']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}" jsf:rendered="#{harvestingClientsPage.initialSettingsValidated and harvestingClientsPage.createMode}"/>
-                                        </span>
+                                        #{bundle['harvestclients.newClientDialog.oaiMetadataFormat']} 
+                                        <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}" jsf:rendered="#{harvestingClientsPage.initialSettingsValidated and harvestingClientsPage.createMode}"/>
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.newClientDialog.oaiMetadataFormat.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
                                         <!-- select menu, shown in "create new client" mode, after the server has been contacted and we got the list of available metadata formats: -->
@@ -385,9 +388,9 @@
                                 <!-- scheduling; can be enabled, can be left unscheduled; harvesting can be scheduled daily or weekly -->
                                 <div class="form-group">
                                     <label for="harvestingSchedule" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['harvestclients.newClientDialog.schedule.tip']}">
-                                            #{bundle['harvestclients.newClientDialog.schedule']}
-                                        </span>
+                                        #{bundle['harvestclients.newClientDialog.schedule']}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.newClientDialog.schedule.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
                                         <p:panelGrid columns="2" style="width:100%;" styleClass="noBorders">
@@ -480,9 +483,9 @@
                                 <!-- harvesting "styles" - these define different rules used to format and display metadata harvested from different archives  -->
                                 <div class="form-group">
                                     <label for="harvestingStyle" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['harvestclients.newClientDialog.harvestingStyle.tip']}">
-                                            #{bundle['harvestclients.newClientDialog.harvestingStyle']}
-                                        </span>
+                                        #{bundle['harvestclients.newClientDialog.harvestingStyle']}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.newClientDialog.harvestingStyle.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
                                         <p:selectOneMenu id="harvestingStyle"
@@ -498,9 +501,9 @@
                                 <!-- archive url - used in search results to render links back to the archive (in case the hostname is different from the harvesting url) -->
                                 <div class="form-group" jsf:rendered="#{harvestingClientsPage.editMode}">
                                     <label for="archiveUrl" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['harvestclients.viewEditDialog.archiveUrl.tip']}">
-                                            #{bundle['harvestclients.viewEditDialog.archiveUrl']}
-                                        </span>
+                                        #{bundle['harvestclients.viewEditDialog.archiveUrl']}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.viewEditDialog.archiveUrl.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
                                         <p:inputText id="archiveUrl"
@@ -513,9 +516,9 @@
                                 <!-- archive description - used to display harvested metadata in search results: -->
                                 <div class="form-group" jsf:rendered="#{harvestingClientsPage.editMode}">
                                     <label for="archiveDescription" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['harvestclients.viewEditDialog.archiveDescription.tip']}">
-                                            #{bundle['harvestclients.viewEditDialog.archiveDescription']}
-                                        </span>
+                                        #{bundle['harvestclients.viewEditDialog.archiveDescription']}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.viewEditDialog.archiveDescription.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
                                         <p:inputTextarea id="archiveDescription" rows="3" cols="45" styleClass="form-control"
diff --git a/src/main/webapp/harvestsets.xhtml b/src/main/webapp/harvestsets.xhtml
index a8fce25716a..695c6a1592c 100644
--- a/src/main/webapp/harvestsets.xhtml
+++ b/src/main/webapp/harvestsets.xhtml
@@ -203,9 +203,10 @@
                             <div class="form-horizontal">
                                 <div class="form-group">
                                     <label for="setquery" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['harvestserver.newSetDialog.setquery.tip']}">
-                                            #{bundle['harvestserver.newSetDialog.setquery']} <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{!harvestingSetsPage.setQueryValidated}" title="#{bundle.requiredField}"/>
-                                        </span>
+                                        #{bundle['harvestserver.newSetDialog.setquery']} 
+                                        <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{!harvestingSetsPage.setQueryValidated}" title="#{bundle.requiredField}"/>
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestserver.newSetDialog.setquery.tip']}"></span>
                                     </label>
                                     <div class="col-sm-8">
                                         <p:inputText id="setquery" styleClass="form-control"
@@ -232,9 +233,9 @@
                                 <!-- the set spec is not editable in "edit existing set" mode; so we just show it here as a label: -->
                                 <div class="form-group" jsf:rendered="#{harvestingSetsPage.editMode}">
                                     <label for="setspec" class="col-sm-3 control-label">
-                                        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['harvestserver.newSetDialog.setspec.tip']}">
-                                            #{bundle['harvestserver.newSetDialog.setspec']}
-                                        </span>
+                                        #{bundle['harvestserver.newSetDialog.setspec']}
+                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestserver.newSetDialog.setspec.tip']}"></span>
                                     </label>
                                     <div class="col-sm-8">
                                         <p class="form-control-static" jsf:rendered="#{!harvestingSetsPage.selectedSet.defaultSet}"><h:outputText rendered="#{!harvestingSetsPage.selectedSet.defaultSet}" value="#{harvestingSetsPage.newSetSpec}"/></p>
@@ -267,9 +268,10 @@
                                     <!-- the set spec is only editable in "create" mode; in the "edit existing set" mode the set spec name is shown as a label in the first step popup. -->
                                     <div class="form-group" jsf:rendered="#{harvestingSetsPage.createMode}">
                                         <label for="setspec" class="col-sm-3 control-label">
-                                            <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['harvestserver.newSetDialog.setspec.tip']}">
-                                                #{bundle['harvestserver.newSetDialog.setspec']} <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{harvestingSetsPage.setQueryValidated}" title="#{bundle.requiredField}"/>
-                                            </span>
+                                            #{bundle['harvestserver.newSetDialog.setspec']} 
+                                            <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{harvestingSetsPage.setQueryValidated}" title="#{bundle.requiredField}"/>
+                                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestserver.newSetDialog.setspec.tip']}"></span>
                                         </label>
                                         <div class="col-sm-8">
                                             <p:inputText id="setspec" styleClass="form-control"
@@ -282,9 +284,10 @@
                                     
                                     <div class="form-group">
                                         <label for="setdescription" class="col-sm-3 control-label">
-                                            <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['harvestserver.newSetDialog.setdescription.tip']}">
-                                                #{bundle['harvestserver.newSetDialog.setdescription']} <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{harvestingSetsPage.setSpecValidated}" title="#{bundle.requiredField}"/>
-                                            </span>
+                                            #{bundle['harvestserver.newSetDialog.setdescription']} 
+                                            <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{harvestingSetsPage.setSpecValidated}" title="#{bundle.requiredField}"/>
+                                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestserver.newSetDialog.setdescription.tip']}"></span>
                                         </label>
                                         <div class="col-sm-8">
                                             <p:inputText id="setdescription" styleClass="form-control"
diff --git a/src/main/webapp/manage-templates.xhtml b/src/main/webapp/manage-templates.xhtml
index 5df6294f570..dbbfd31daee 100644
--- a/src/main/webapp/manage-templates.xhtml
+++ b/src/main/webapp/manage-templates.xhtml
@@ -166,9 +166,7 @@
                         <div class="form-horizontal">
                             <div class="form-group">
                                 <label for="select_DatasetTemplate" class="col-sm-3 control-label">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel right" data-original-title="test">
-                                        #{bundle['dataset.manageTemplates.tab.action.btn.view.dialog.datasetTemplate']}
-                                    </span>
+                                    #{bundle['dataset.manageTemplates.tab.action.btn.view.dialog.datasetTemplate']}
                                 </label>
                                 <div class="col-sm-7">
                                     <p class="form-control-static">
diff --git a/src/main/webapp/oauth2/firstLogin.xhtml b/src/main/webapp/oauth2/firstLogin.xhtml
index 78b9d15d618..29c669ce385 100644
--- a/src/main/webapp/oauth2/firstLogin.xhtml
+++ b/src/main/webapp/oauth2/firstLogin.xhtml
@@ -34,9 +34,10 @@
                         <h:form id="newAccountForm" styleClass="form-horizontal">
                             <div class="form-group">
                                 <label for="position" class="col-sm-3 control-label">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['user.username.illegal.tip']}">
-                                        #{bundle['user.username']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    </span>
+                                    #{bundle['user.username']} 
+                                    <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.username.illegal.tip']}"></span>
                                 </label>
                                 <div class="col-sm-4">
                                     <p:inputText id="username" styleClass="form-control" value="#{OAuth2FirstLoginPage.username}" validator="#{OAuth2FirstLoginPage.validateUserName}"/>
@@ -50,9 +51,10 @@
                             </div>
                             <div class="form-group">
                                 <label for="givenName" class="col-sm-3 control-label">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['user.firstName.tip']}">
-                                        #{bundle['user.firstName']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    </span>
+                                    #{bundle['user.firstName']} 
+                                    <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.firstName.tip']}"></span>
                                 </label>
                                 <div class="col-sm-4">
                                     <p:inputText id="givenName" styleClass="form-control" value="#{OAuth2FirstLoginPage.newUser.displayInfo.firstName}"/>
@@ -61,9 +63,10 @@
                             </div>
                             <div class="form-group">
                                 <label for="familyName" class="col-sm-3 control-label">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['user.lastName.tip']}">
-                                        #{bundle['user.lastName']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    </span>
+                                    #{bundle['user.lastName']} 
+                                    <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.lastName.tip']}"></span>
                                 </label>
                                 <div class="col-sm-4">
                                     <p:inputText id="familyName" styleClass="form-control" value="#{OAuth2FirstLoginPage.newUser.displayInfo.lastName}"/>
@@ -72,9 +75,10 @@
                             </div>
                             <div class="form-group">
                                 <label for="selectedEmail" class="col-sm-3 control-label">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['user.email.tip']}">
-                                        #{bundle['email']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    </span>
+                                    #{bundle['email']} 
+                                    <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.email.tip']}"></span>
                                 </label>
                                 <div class="col-sm-4" jsf:rendered="#{OAuth2FirstLoginPage.getEmailsToPickFrom().size() lt 2}">
                                     <p:inputText id="selectedEmailZeroOrOneToPickFrom" styleClass="form-control" value="#{OAuth2FirstLoginPage.selectedEmail}" validator="#{OAuth2FirstLoginPage.validateUserEmail}"/>
@@ -92,9 +96,9 @@
                             </div>
                             <div class="form-group" jsf:rendered="#{OAuth2FirstLoginPage.authProvider.displayIdentifier}">
                                 <label for="persistentUserId" class="col-sm-3 control-label">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{OAuth2FirstLoginPage.authProvider.persistentIdDescription}">
-                                        #{OAuth2FirstLoginPage.authProvider.persistentIdName}
-                                    </span>
+                                    #{OAuth2FirstLoginPage.authProvider.persistentIdName}
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{OAuth2FirstLoginPage.authProvider.persistentIdDescription}"></span>
                                 </label>
                                 <div class="col-sm-4">
                                     <p class="form-control-static">
@@ -108,9 +112,10 @@
                             </div>
                             <div class="form-group">
                                 <label for="affiliation" class="col-sm-3 control-label">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['user.affiliation.tip']}">
-                                        #{bundle['affiliation']} <span class="glyphicon text-danger" title="#{bundle.requiredField}"/>
-                                    </span>
+                                    #{bundle['affiliation']} 
+                                    <span class="glyphicon text-danger" title="#{bundle.requiredField}"/>
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.affiliation.tip']}"></span>
                                 </label>
                                 <div class="col-sm-4">
                                     <p:inputText id="affiliation" styleClass="form-control" value="#{OAuth2FirstLoginPage.newUser.displayInfo.affiliation}"/>
@@ -118,9 +123,10 @@
                             </div>
                             <div class="form-group">
                                 <label for="position" class="col-sm-3 control-label">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['user.position.tip']}">
-                                        #{bundle['user.position']} <span class="glyphicon text-danger" title="#{bundle.requiredField}"/>
-                                    </span>
+                                    #{bundle['user.position']} 
+                                    <span class="glyphicon text-danger" title="#{bundle.requiredField}"/>
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.position.tip']}"></span>
                                 </label>
                                 <div class="col-sm-4">
                                     <p:inputText id="position" styleClass="form-control" value="#{OAuth2FirstLoginPage.newUser.displayInfo.position}"/>
diff --git a/src/main/webapp/roles-edit.xhtml b/src/main/webapp/roles-edit.xhtml
index d7d0f9f53bf..18d73e77a2a 100644
--- a/src/main/webapp/roles-edit.xhtml
+++ b/src/main/webapp/roles-edit.xhtml
@@ -9,9 +9,9 @@
                 <div class="row form-horizontal">
                     <div class="col-xs-6 form-group">
                         <label class="col-sm-3 control-label" for="roleName">
-                            <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-container="body" data-original-title="#{bundle['dataverse.permissions.roles.name.title']}">
-                                #{bundle['dataverse.permissions.roles.name']}
-                            </span>
+                            #{bundle['dataverse.permissions.roles.name']}
+                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                  data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataverse.permissions.roles.name.title']}"></span>
                         </label>
                         <div class="col-sm-9">
                             <p:panelGrid columns="2" styleClass="noBorders">
@@ -22,9 +22,9 @@
                     </div>
                     <div class="col-xs-6 form-group">
                         <label class="col-sm-3 control-label" for="roleName">
-                            <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-container="body" data-original-title="#{bundle['dataverse.permissions.roles.id.title']}">
-                                #{bundle['dataverse.permissions.roles.id']}
-                            </span>
+                            #{bundle['dataverse.permissions.roles.id']}
+                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                  data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataverse.permissions.roles.id.title']}"></span>
                         </label>
                         <div class="col-sm-9">
                             <p:panelGrid columns="2" styleClass="noBorders">
@@ -35,9 +35,9 @@
                     </div>
                     <div class="col-xs-6 form-group">
                         <label class="col-sm-3 control-label" for="roleName">
-                           <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-container="body" data-original-title="#{bundle['dataverse.permissions.roles.description.title']}">
-                                #{bundle.description}
-                            </span>
+                           #{bundle.description}
+                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                  data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataverse.permissions.roles.description.title']}"></span>
                         </label>
                         <div class="col-sm-9">
                             <p:panelGrid columns="2" styleClass="noBorders" style="width:100%;">
diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml
index 5781b5080bf..c03870fe08c 100644
--- a/src/main/webapp/template.xhtml
+++ b/src/main/webapp/template.xhtml
@@ -31,9 +31,9 @@
                         <div class="form-horizontal">
                             <div class="form-group">
                                 <label class="col-sm-2 control-label" for="templateNameStatic">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataset.template.name.tip']}">
-                                         #{bundle['dataset.template.name.tip']}
-                                    </span>
+                                    #{bundle['dataset.template.name.tip']}
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataset.template.name.tip']}"></span>
                                 </label>
                                 <div class="col-sm-5">
                                     <p class="form-control-static">
@@ -73,9 +73,10 @@
                         <div class="form-horizontal">
                             <div class="form-group">
                                 <label class="col-sm-2 control-label" for="templateName">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataset.template.name.title']}">
-                                        #{bundle['dataset.manageTemplates.tab.header.templte']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    </span>
+                                    #{bundle['dataset.manageTemplates.tab.header.templte']} 
+                                    <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataset.template.name.title']}"></span>
                                 </label>
                                 <div class="col-sm-5">
                                     <p:inputText id="templateName" styleClass="form-control" value="#{TemplatePage.template.name}"/>
@@ -102,7 +103,6 @@
                         
                         <ui:fragment rendered="#{TemplatePage.editMode == 'LICENSE' or TemplatePage.editMode == 'LICENSEADD'}">
                             <ui:include src="dataset-license-terms.xhtml" >
-
                                 <ui:param name="datasetPage" value="false"/>
                                 <ui:param name="templatePage" value="true"/>
                                 <ui:param name="editMode" value="#{!empty TemplatePage.editMode ? 'LICENSE' : ''}"/>
@@ -137,5 +137,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</html>
-
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/themeAndWidgetsFragment.xhtml b/src/main/webapp/themeAndWidgetsFragment.xhtml
index b1931ae7e5a..ea7cf6a51bf 100644
--- a/src/main/webapp/themeAndWidgetsFragment.xhtml
+++ b/src/main/webapp/themeAndWidgetsFragment.xhtml
@@ -13,9 +13,9 @@
                     <div class="row form-horizontal">
                         <div class="form-group" jsf:rendered="#{themeWidgetFragment.editDv.owner!=null}">
                             <label class="col-sm-3 control-label" for="inheritCustomization">
-                                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.theme.inheritCustomization.title']}">
-                                    #{bundle['dataverse.theme.inheritCustomization.label']}
-                                </span>
+                                #{bundle['dataverse.theme.inheritCustomization.label']}
+                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.inheritCustomization.title']}"></span>
                             </label>
                             <div class="col-sm-9">
                                 <div class="checkbox">
@@ -34,9 +34,9 @@
                         </div>
                         <div class="form-group" jsf:rendered="#{themeWidgetFragment.editDv.themeRoot}">
                             <label class="col-sm-3 control-label" for="logoFormat">
-                                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.theme.logo.image.title']}">
-                                    #{bundle['dataverse.theme.logo.image']}
-                                </span>
+                                #{bundle['dataverse.theme.logo.image']}
+                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.logo.image.title']}"></span>
                             </label>
                             <div class="col-sm-9">
                                 <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.theme.logo.tip']}</p>
@@ -58,9 +58,9 @@
                                 <ui:fragment rendered="#{not empty themeWidgetFragment.editDv.dataverseTheme.logo}">
                                     <div class="form-col-container col-sm-4">
                                         <label for="logoFormat" class="control-label">
-                                            <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.theme.logo.format.title']}">
-                                                #{bundle['dataverse.theme.logo.format']}
-                                            </span>
+                                            #{bundle['dataverse.theme.logo.format']}
+                                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.logo.format.title']}"></span>
                                         </label>
                                         <div>
                                             <p:selectOneRadio id="logoFormat" value="#{themeWidgetFragment.editDv.dataverseTheme.logoFormat}">
@@ -74,9 +74,9 @@
                                     <ui:fragment rendered="#{themeWidgetFragment.editDv.dataverseTheme.logoFormat=='RECTANGLE'}">
                                         <div class="form-col-container col-sm-3">
                                             <label for="logoAlignment" class="control-label">
-                                                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.theme.logo.alignment.title']}">
-                                                    #{bundle['dataverse.theme.logo.alignment']}
-                                                </span>
+                                                #{bundle['dataverse.theme.logo.alignment']}
+                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.logo.alignment.title']}"></span>
                                             </label>
                                             <div>
                                                 <p:selectOneMenu id="logoAlignment" styleClass="form-control" value="#{themeWidgetFragment.editDv.dataverseTheme.logoAlignment}">
@@ -89,9 +89,9 @@
                                         </div>
                                         <div class="form-col-container col-sm-4">
                                             <label for="logoBackgroundColor" class="control-label">
-                                                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.theme.logo.backColor.title']}">
-                                                    #{bundle['dataverse.theme.logo.backColor']}
-                                                </span>
+                                                #{bundle['dataverse.theme.logo.backColor']}
+                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.logo.backColor.title']}"></span>
                                             </label>
                                             <div>
                                                 <p:colorPicker id="logoBackgroundColor" value="#{themeWidgetFragment.editDv.dataverseTheme.logoBackgroundColor}"/>
@@ -107,16 +107,16 @@
                         <div class="row form-horizontal">
                             <div class="form-group">
                                 <label class="col-sm-3 control-label">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.theme.headerColor.tip']}">
-                                        #{bundle['dataverse.theme.headerColor']}
-                                    </span>
+                                    #{bundle['dataverse.theme.headerColor']}
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.headerColor.tip']}"></span>
                                 </label>
                                 <div class="form-group col-sm-9">
                                     <div class="form-col-container col-sm-4">
                                         <label for="backgroundColor" class="control-label">
-                                            <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.theme.backColor.title']}">
-                                                #{bundle['dataverse.theme.backColor']}
-                                            </span>
+                                            #{bundle['dataverse.theme.backColor']}
+                                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.backColor.title']}"></span>
                                         </label>
                                         <div>
                                             <p:colorPicker id="backgroundColor" value="#{themeWidgetFragment.editDv.dataverseTheme.backgroundColor}"/>
@@ -125,9 +125,9 @@
                                     </div>
                                     <div class="form-col-container col-sm-4">
                                         <label for="linkColor" class="control-label">
-                                            <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.theme.linkColor.title']}">
-                                                #{bundle['dataverse.theme.linkColor']}
-                                            </span>
+                                            #{bundle['dataverse.theme.linkColor']}
+                                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.linkColor.title']}"></span>
                                         </label>
                                         <div>
                                             <p:colorPicker id="linkColor" value="#{themeWidgetFragment.editDv.dataverseTheme.linkColor}"/>
@@ -136,9 +136,9 @@
                                     </div>
                                     <div class="form-col-container col-sm-4">
                                         <label for="textColor" class="control-label">
-                                            <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.theme.txtColor.title']}">
-                                                #{bundle['dataverse.theme.txtColor']}
-                                            </span>
+                                            #{bundle['dataverse.theme.txtColor']}
+                                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.txtColor.title']}"></span>
                                         </label>
                                         <div>
                                             <p:colorPicker id="textColor" value="#{themeWidgetFragment.editDv.dataverseTheme.textColor}"/>
@@ -149,9 +149,9 @@
                             </div>
                             <div class="form-group">
                                 <label class="col-sm-3 control-label" for="tagline">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.theme.tagline.title']}">
-                                        #{bundle['dataverse.theme.tagline']}
-                                    </span>
+                                    #{bundle['dataverse.theme.tagline']}
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.tagline.title']}"></span>
                                 </label>
                                 <h:inputHidden id="linkAndUrl" value="true">
                                     <f:validator validatorId="linkValidator"/>
@@ -166,9 +166,9 @@
                             </div>
                             <div class="form-group">
                                 <label class="col-sm-3 control-label" for="website">
-                                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.theme.website.title']}">
-                                        #{bundle['dataverse.theme.website']}
-                                    </span>
+                                    #{bundle['dataverse.theme.website']}
+                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.website.title']}"></span>
                                 </label>
                                 <div class="col-sm-6">
                                     <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.theme.website.tip']}</p>

From abd45732d5a81f6ca00eddfa89bfcffd8bb22b85 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Mon, 25 Feb 2019 17:25:37 -0500
Subject: [PATCH 05/22] Fixed popover display bug in dialog popup, removed misc
 old js functions [ref #3925, #2586]

---
 src/main/webapp/dataverse.xhtml               | 17 +-----
 .../webapp/file-data-access-fragment.xhtml    |  2 +-
 .../file-download-button-fragment.xhtml       |  2 +-
 src/main/webapp/resources/css/structure.css   |  2 +-
 .../resources/js/dv_rebind_bootstrap_ui.js    | 53 ++-----------------
 src/main/webapp/subset/gui_subset.xhtml       | 16 ++----
 6 files changed, 12 insertions(+), 80 deletions(-)

diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 041eb000f25..ed6487b0d47 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -404,7 +404,7 @@
                                             </li>
                                             <li class="divider" role="presentation"></li>
                                             <li>
-                                                <p:commandLink id="editInfo" actionListener="#{DataversePage.edit('INFO')}" update="@form,:dataverseForm,:searchResults,:messagePanel" oncomplete="javascript:post_edit_dv_general_info();initPopover();">
+                                                <p:commandLink id="editInfo" actionListener="#{DataversePage.edit('INFO')}" update="@form,:dataverseForm,:searchResults,:messagePanel" oncomplete="javascript:post_edit_dv_general_info();">
                                                     <h:outputText value="#{bundle['dataverse.option.generalInfo']}" />
                                                 </p:commandLink>
                                             </li>
@@ -748,7 +748,6 @@
                     var scrollPos=0;
 
                     $(document).ready(function () {
-                        initPopover();
                         initCarousel();
                         popoverHTML('#{bundle.htmlAllowedTitle}');
                     });
@@ -785,20 +784,6 @@
                         window.scrollTo(0, 0);
                     }
 
-                    function initPopover() {
-                        $('[data-toggle="tooltip"]').tooltip({container: 'body'});
-                        $('[data-toggle="popover"]').popover();
-                        $('body').on('click', function (e) {
-                            $('label[data-toggle="popover"]').each(function () {
-                                //the 'is' for buttons that trigger popups
-                                //the 'has' for icons within a button that triggers a popup
-                                if (!$(this).is(e.target) && $(this).has(e.target).length === 0 && $('.popover').has(e.target).length === 0) {
-                                    $(this).popover('hide');
-                                }
-                            });
-                        });
-                    }
-
                     function updateInclude() {
                         $('button[id$="hiddenRefresh"]').trigger('click');
                     }
diff --git a/src/main/webapp/file-data-access-fragment.xhtml b/src/main/webapp/file-data-access-fragment.xhtml
index 1351f16dc70..b659c541abc 100644
--- a/src/main/webapp/file-data-access-fragment.xhtml
+++ b/src/main/webapp/file-data-access-fragment.xhtml
@@ -29,7 +29,7 @@
             </div>
         </div>
         <div class="form-group row">
-            <label class="col-xs-12 col-lg-3 control-label" data-original-title="#{bundle['file.dataFilesTab.dataAccess.local.tooltip']}">
+            <label class="col-xs-12 col-lg-3 control-label">
                 #{bundle['file.dataFilesTab.dataAccess.local.label']}
                 <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.dataAccess.local.tooltip']}"></span>
diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index b6ef0916d0a..20530f723af 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -258,7 +258,7 @@
                                disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload or empty fileMetadata.dataFile.id) ? 'disabled' : ''}" 
                                actionListener="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse,fileMetadata, 'subset')}"
                                update="@widgetVar(downloadDataSubsetPopup)"
-                               oncomplete="PF('downloadDataSubsetPopup').show()"
+                               oncomplete="PF('downloadDataSubsetPopup').show();bind_bsui_components();"
                                value="#{bundle['file.downloadBtn.format.datasubset']}"
                                />
                 <p:commandLink id="fileDowloadDataSubsetButtonPopupReq" rendered="#{downloadPopupRequired}"
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 7a0f8b05400..d7ee54e0084 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -845,7 +845,7 @@ div.ui-dialog.ui-widget-content {z-index:100001 !important;}
 
 /* POPUP DROPDOWN MENUS + TOOLTIPS + BLOCK UI */
 div.ui-selectcheckboxmenu-panel, div.ui-selectonemenu-panel, div.ui-autocomplete-panel,
-.ui-selectonemenu-list, .ui-selectcheckboxmenu-list, div.tooltip {z-index:100002 !important;}
+.ui-selectonemenu-list, .ui-selectcheckboxmenu-list, div.tooltip, div.popover {z-index:100002 !important;}
 
 /* Overwrite Primefaces */
 .ui-tabs.ui-widget-content .ui-tabs-nav li.ui-tabs-selected a {color: #555555;}
diff --git a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
index fba070e9cf3..e5dc58f5308 100644
--- a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
+++ b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
@@ -31,10 +31,6 @@ function bind_bsui_components(){
     // Custom Popover with HTML code snippet -- from dataverse_template
     popoverHTML();
     
-    //Metrics
-    //DISABLED TOGGLE UNTIL FURTHER DEVELOPMENT ON METRICS IS COMPLETED
-    //metricsTabs();
-    
     // Dialog Listener For Calling handleResizeDialog
     PrimeFaces.widget.Dialog.prototype.postShow = function() {
         var dialog_id = this.jq.attr('id').split(/[:]+/).pop();
@@ -60,8 +56,8 @@ function dataverseuser_page_rebind(){
 
 function bind_tooltip_popover(){
     // rebind tooltips and popover to all necessary elements
-    $(".bootstrap-button-tooltip, [data-toggle='tooltip'], #citation span.glyphicon").tooltip({container: 'body'});
-    $("span[data-toggle='popover']").popover();
+    $(".bootstrap-button-tooltip, [data-toggle='tooltip']").tooltip({container: 'body'});
+    $("[data-toggle='popover']").popover({container: 'body'});
 }
 
 function toggle_dropdown(){
@@ -104,8 +100,6 @@ function show_info_msg(mtitle, mtext){
  * Called after "Edit Dataverse" - "General Information"
  */
 function post_edit_dv_general_info(){
-    // show_info_msg('Edit Dataverse', 'Edit your dataverse and click Save Changes. Asterisks indicate required fields.');
-    // hide_search_panels();
     bind_bsui_components();
 }
 
@@ -113,39 +107,10 @@ function post_edit_dv_general_info(){
  * Used after cancelling "Edit Dataverse"
  */
 function post_cancel_edit_dv(){
-   // show_search_panels()
-   // hide_info_msg();
    bind_bsui_components();
    initCarousel();
 }
 
-/*
- * Hide search panels when editing a dv
- * NO LONGER IN USE, INSTEAD ADDED p:fragment TO DV PG
- */
-//function hide_search_panels(){
-//    if($(".panelSearchForm").length>0){
-//       $(".panelSearchForm").hide();
-//        if($(".panelSearchForm").next().length>0){
-//            $(".panelSearchForm").next().hide();
-//        }
-//   }
-//}
-
-/*
- * Show search panels when cancel a dv edit
- * NO LONGER IN USE, INSTEAD ADDED p:fragment TO DV PG
- */
-//function show_search_panels(){
-//    if($(".panelSearchForm").length>0){
-//        if($(".panelSearchForm").next().length>0){
-//            $(".panelSearchForm").next().show();
-//        }
-//       $(".panelSearchForm").show();
-//   }
-//}
-
-
 /*
  * Called after "Upload + Edit Files"
  */
@@ -251,20 +216,8 @@ function sharrre(){
 }
 
 /*
- * Metrics Tabs
- * DISABLED TOGGLE UNTIL FURTHER DEVELOPMENT ON METRICS IS COMPLETED
+ * Select dataset/file citation onclick event
  */
-// function metricsTabs() {
-    // $('#metrics-tabs a[data-toggle="tab"]').on('shown', function (e) {
-        // e.target // activated tab
-        // e.relatedTarget // previous tab
-    // });
-    // $('#metrics-tabs a[data-toggle="tab"]').mouseover(function(){
-        // $(this).click();
-    // });
-    // $('#metrics-tabs a.first[data-toggle="tab"]').tab('show');
-// }
-
 function selectText(ele) {
     try {
         var div = document.createRange();
diff --git a/src/main/webapp/subset/gui_subset.xhtml b/src/main/webapp/subset/gui_subset.xhtml
index 9ec5b76c4ec..c338bf67a85 100755
--- a/src/main/webapp/subset/gui_subset.xhtml
+++ b/src/main/webapp/subset/gui_subset.xhtml
@@ -9,6 +9,7 @@
     <link rel="stylesheet" href="/subset/css/app.css"/>
     <script type="text/javascript" src="/subset/javascript/d3.v3.min.js"></script>
     <script type="text/javascript" src="/subset/javascript/plots.js"></script>
+    <script type="text/javascript" src="/subset/javascript/app_subset.js"></script>
     
     <div id="leftpanel" class="sidepanel clearfix">
         <div class="panel-heading text-center" id="leftpaneltitle">
@@ -45,13 +46,10 @@
     </div>
     
     <!--Note that this aboutTwoRavens" business has to do with subset functionality, not TwoRavens itself. It is believed to only work when Rserve and friends are installed. -->
-    <a href="#" id="aboutTwoRavens" data-toggle="popover" data-trigger="hover" data-container="body" data-content="The Norse god Odin had two talking ravens as advisors, who would fly out into the world and report back all they observed. In the Norse, their names were &#34;Thought&#34; and &#34;Memory&#34;. In our coming release, our thought-raven automatically advises on statistical model selection, while our memory-raven accumulates previous statistical models from Dataverse, to provide cummulative guidance and meta-analysis.">
+    <span id="aboutTwoRavens" data-container="body" data-toggle="tooltip" data-placement="top" data-trigger="hover" 
+          data-original-title="The Norse god Odin had two talking ravens as advisors, who would fly out into the world and report back all they observed. In the Norse, their names were &#34;Thought&#34; and &#34;Memory&#34;. In our coming release, our thought-raven automatically advises on statistical model selection, while our memory-raven accumulates previous statistical models from Dataverse, to provide cummulative guidance and meta-analysis.">
         <p:graphicImage value="/subset/images/tworavens.png" alt="TwoRavens" width="100"/>
-    </a>
-    <div class="hidden" id="aboutTwoRavensText">
-        <p>The Norse god Odin had two talking ravens as advisors, who would fly out into the world and report back all they observed. In the Norse, their names were &#34;Thought&#34; and &#34;Memory&#34;.</p>
-        <p>In our coming release, our thought-raven automatically advises on statistical model selection, while our memory-raven accumulates previous statistical models from Dataverse, to provide cummulative guidance and meta-analysis.</p>
-    </div>
+    </span>
 
     <script>
         var hostname = "localhost:8080"; // default host url
@@ -64,8 +62,4 @@
         };
         var fileid = #{!empty dataFile  ? dataFile.id : 0};
     </script>
-
-    <script src="/subset/javascript/app_subset.js">
-        $('#aboutTwoRavens').popover();
-    </script>
-</ui:composition>
+</ui:composition>
\ No newline at end of file

From ed3005e00be5b0b6f8238997620c4e16c981c01f Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Tue, 26 Feb 2019 15:29:31 -0500
Subject: [PATCH 06/22] Misc js refactoring and removing old, unused code [ref
 #3925]

---
 .../resources/js/dv_rebind_bootstrap_ui.js    | 29 ++-----------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
index e5dc58f5308..03eee5eb19c 100644
--- a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
+++ b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
@@ -16,8 +16,9 @@ function bind_bsui_components(){
       $(this).siblings('div.panel-heading').children('span.glyphicon').removeClass("glyphicon-chevron-up").addClass("glyphicon-chevron-down");
     });
     
-    // Hide open tooltips
-    $('div.tooltip').hide();
+    // Hide open tooltips + popovers
+    $('.bootstrap-button-tooltip, [data-toggle="tooltip"]').tooltip("hide");
+    $("[data-toggle='popover']").popover("hide");
 
     // Tooltip + popover functionality
     bind_tooltip_popover();
@@ -72,30 +73,6 @@ function disabledLinks(){
     });
 }
 
-/*
- * Hide notification message
- */
-function hide_info_msg(){
-    if ($('div.messagePanel').length > 0){
-        $('div.messagePanel').html('');
-    }
-}
-
-/*
- * Show notification message
- */
-function show_info_msg(mtitle, mtext){
-   if ($('div.messagePanel').length > 0){
-       edit_msg = '<div class="alert alert-dismissable alert-info"><button type="button" class="close" data-dismiss="alert" aria-hidden="true">x</button>'
-                       + '<span class="glyphicon glyphicon-info-sign"/>'
-                       + '<strong> ' + mtitle + '</strong> &#150; ' + mtext + '</div>';
-       $('div.messagePanel').html(edit_msg );
-   }else{
-     //console.log('message panel does not exist');
-   }
-}
-
-
 /*
  * Called after "Edit Dataverse" - "General Information"
  */

From a9f626bf2c1da35e44a7028c1a0a9a803f84f7ac Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Wed, 27 Feb 2019 11:57:54 -0500
Subject: [PATCH 07/22] Javascript attempt to fix tooltips actions in mobile
 [ref #3925]

---
 src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
index 03eee5eb19c..70eef266d9b 100644
--- a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
+++ b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
@@ -59,6 +59,10 @@ function bind_tooltip_popover(){
     // rebind tooltips and popover to all necessary elements
     $(".bootstrap-button-tooltip, [data-toggle='tooltip']").tooltip({container: 'body'});
     $("[data-toggle='popover']").popover({container: 'body'});
+    
+    $(".bootstrap-button-tooltip, [data-toggle='tooltip']").on('click', function () {
+        $(this).blur();
+    });
 }
 
 function toggle_dropdown(){

From 01358f942182c124b789cf110c98267a33417f72 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Wed, 27 Feb 2019 13:06:00 -0500
Subject: [PATCH 08/22] Added some debug js code to fix tooltips actions in
 mobile [ref #3925]

---
 .../webapp/resources/js/dv_rebind_bootstrap_ui.js     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
index 70eef266d9b..7dcb99ce95a 100644
--- a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
+++ b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
@@ -2,6 +2,12 @@
  * Rebind bootstrap UI components after Primefaces ajax calls
  */
 function bind_bsui_components(){
+    
+    
+    // DEBIG CODE
+    alert('DEBUG MODE');
+    
+    
     // Breadcrumb Tree Keep Open
     $(document).on('click', '.dropdown-menu', function (e) {
         $(this).hasClass('keep-open'),
@@ -60,6 +66,11 @@ function bind_tooltip_popover(){
     $(".bootstrap-button-tooltip, [data-toggle='tooltip']").tooltip({container: 'body'});
     $("[data-toggle='popover']").popover({container: 'body'});
     
+    // DEBUG CODE
+    var iconcount = $("span.text-muted[data-toggle='tooltip']").length;
+    alert('bind_tooltip_popover() ' + iconcount);
+    $("span.text-muted[data-toggle='tooltip']").css({"color":"#800080"});
+    
     $(".bootstrap-button-tooltip, [data-toggle='tooltip']").on('click', function () {
         $(this).blur();
     });

From abc4eb9fe6b7b7c1538218c681e95136ef9e0993 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Wed, 27 Feb 2019 14:59:00 -0500
Subject: [PATCH 09/22] Revised js attempt to fix tooltips actions in mobile
 [ref #3925]

---
 src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
index 7dcb99ce95a..29c0320bc03 100644
--- a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
+++ b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
@@ -63,17 +63,13 @@ function dataverseuser_page_rebind(){
 
 function bind_tooltip_popover(){
     // rebind tooltips and popover to all necessary elements
-    $(".bootstrap-button-tooltip, [data-toggle='tooltip']").tooltip({container: 'body'});
+    $(".bootstrap-button-tooltip, [data-toggle='tooltip']").tooltip({container: 'body', trigger : 'hover'});
     $("[data-toggle='popover']").popover({container: 'body'});
     
     // DEBUG CODE
     var iconcount = $("span.text-muted[data-toggle='tooltip']").length;
     alert('bind_tooltip_popover() ' + iconcount);
-    $("span.text-muted[data-toggle='tooltip']").css({"color":"#800080"});
-    
-    $(".bootstrap-button-tooltip, [data-toggle='tooltip']").on('click', function () {
-        $(this).blur();
-    });
+    $("span.text-muted[data-toggle='tooltip']").css({"color":"#FFD700"});
 }
 
 function toggle_dropdown(){

From 79b2b12a65bfc01593579331fc8ff8959587569b Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Wed, 27 Feb 2019 15:53:31 -0500
Subject: [PATCH 10/22] Another reviewd js attempt to fix tooltips actions in
 mobile [ref #3925]

---
 .../resources/js/dv_rebind_bootstrap_ui.js    | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
index 29c0320bc03..0c809239bb2 100644
--- a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
+++ b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
@@ -2,12 +2,6 @@
  * Rebind bootstrap UI components after Primefaces ajax calls
  */
 function bind_bsui_components(){
-    
-    
-    // DEBIG CODE
-    alert('DEBUG MODE');
-    
-    
     // Breadcrumb Tree Keep Open
     $(document).on('click', '.dropdown-menu', function (e) {
         $(this).hasClass('keep-open'),
@@ -63,13 +57,21 @@ function dataverseuser_page_rebind(){
 
 function bind_tooltip_popover(){
     // rebind tooltips and popover to all necessary elements
-    $(".bootstrap-button-tooltip, [data-toggle='tooltip']").tooltip({container: 'body', trigger : 'hover'});
+    $(".bootstrap-button-tooltip, [data-toggle='tooltip']").tooltip({container: 'body'});
     $("[data-toggle='popover']").popover({container: 'body'});
     
     // DEBUG CODE
-    var iconcount = $("span.text-muted[data-toggle='tooltip']").length;
-    alert('bind_tooltip_popover() ' + iconcount);
-    $("span.text-muted[data-toggle='tooltip']").css({"color":"#FFD700"});
+    $("span.text-muted[data-toggle='tooltip']").css({"color":"#800080"});
+    
+    // CLOSE OPEN TOOLTIPS ON CLICKS
+    $('body').on("touchstart", function(e){
+        $(".bootstrap-button-tooltip, [data-toggle='tooltip']").each(function () {
+            // hide any open tooltips when the anywhere else in the body is clicked
+            if (!$(this).is(e.target) && $(this).has(e.target).length === 0 && $('div.tooltip').has(e.target).length === 0) {
+                $(this).tooltip('hide');
+            }////end if
+        });
+    });
 }
 
 function toggle_dropdown(){

From 4bede7f000587113a7d3ae91a007e051bd04d576 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Wed, 27 Feb 2019 16:39:31 -0500
Subject: [PATCH 11/22] Fixed tooltips actions in mobile, removed debug code
 [ref #3925]

---
 .../webapp/resources/js/dv_rebind_bootstrap_ui.js    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
index 0c809239bb2..d10d1b9c580 100644
--- a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
+++ b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
@@ -60,18 +60,20 @@ function bind_tooltip_popover(){
     $(".bootstrap-button-tooltip, [data-toggle='tooltip']").tooltip({container: 'body'});
     $("[data-toggle='popover']").popover({container: 'body'});
     
-    // DEBUG CODE
-    $("span.text-muted[data-toggle='tooltip']").css({"color":"#800080"});
-    
-    // CLOSE OPEN TOOLTIPS ON CLICKS
+    // CLOSE OPEN TOOLTIPS ON BODY CLICKS
     $('body').on("touchstart", function(e){
         $(".bootstrap-button-tooltip, [data-toggle='tooltip']").each(function () {
-            // hide any open tooltips when the anywhere else in the body is clicked
+            // hide any open tooltips when anywhere else in body is clicked
             if (!$(this).is(e.target) && $(this).has(e.target).length === 0 && $('div.tooltip').has(e.target).length === 0) {
                 $(this).tooltip('hide');
             }////end if
         });
     });
+    
+    // CLOSE OPEN TOOLTIPS ON BUTTON CLICKS
+    $('.bootstrap-button-tooltip').on('click', function () {
+        $(this).tooltip('hide');
+    });
 }
 
 function toggle_dropdown(){

From 9d0b2ad9b8258e4bcd4981bc12ab934596361d41 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Thu, 28 Feb 2019 15:20:40 -0500
Subject: [PATCH 12/22] Fixed HTML Tags popover on edit dataverse/dataset pgs
 on mobile [ref #3925]

---
 src/main/java/Bundle.properties                    |  2 +-
 src/main/webapp/dataset-license-terms.xhtml        |  2 +-
 src/main/webapp/dataverse.xhtml                    | 13 +++++++++----
 src/main/webapp/resources/css/structure.css        |  2 +-
 .../webapp/resources/js/dv_rebind_bootstrap_ui.js  | 14 ++++++++++----
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
index 56688b31a1d..2e8e4530c5d 100755
--- a/src/main/java/Bundle.properties
+++ b/src/main/java/Bundle.properties
@@ -64,7 +64,7 @@ less=Less...
 select=Select...
 selectedFiles=Selected Files
 htmlAllowedTitle=Allowed HTML Tags
-htmlAllowedMsg=This field supports only certain <span class="text-info popoverHTML">HTML tags</span>.
+htmlAllowedMsg=This field supports only certain <a class="popoverHTML" tabindex="0" role="button">HTML tags</a>.
 htmlAllowedTags=<a>, <b>, <blockquote>, <br>, <code>, <del>, <dd>, <dl>, <dt>, <em>, <hr>, <h1>-<h3>, <i>, <img>, <kbd>, <li>, <ol>, <p>, <pre>, <s>, <sup>, <sub>, <strong>, <strike>, <ul>
 toggleNavigation=Toggle navigation
 defaultBody=Default Body
diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index 463a6e514d1..8fbe09603e1 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -316,7 +316,7 @@
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace']}
                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.title']}#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace.title']}"></span>
+                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
                                        <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.dataAccessPlace)}" escape="false"/>
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index ed6487b0d47..32c237d94eb 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -112,7 +112,7 @@
                                     <label class="col-sm-3 control-label" for="dataverseCategory">
                                         #{bundle['dataverse.category']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                                         <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
-                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.category.title']}"></span>
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.category.title']}"></span>
                                     </label>
                                     <div class="col-sm-9 form-col-container">
                                         <h:selectOneMenu id="dataverseCategory" tabindex="5" styleClass="form-control" value="#{DataversePage.dataverse.dataverseType}">
@@ -246,14 +246,16 @@
                                                                    update="@widgetVar(optionBlock)"
                                                                    process="@this"
                                                                    rendered="#{!mdb.showDatasetFieldTypes and (mdb.selected or mdb.required) and !DataversePage.openMetadataBlock and !DataversePage.inheritMetadataBlockFromParent}"
-                                                                    actionListener="#{DataversePage.showDatasetFieldTypes(mdb.id)}">
+                                                                   actionListener="#{DataversePage.showDatasetFieldTypes(mdb.id)}"
+                                                                   oncomplete="javascript:bind_bsui_components();">
                                                          <h:outputText value="#{bundle['dataverse.field.set.tip']}" />
                                                      </p:commandLink>
                                                      <p:commandLink id="viewDSFT" style="margin-left:1em;"
                                                                     update="@widgetVar(optionBlock)"
                                                                     process="@this"
                                                                     rendered="#{!mdb.showDatasetFieldTypes and (!mdb.selected or DataversePage.inheritMetadataBlockFromParent)   and !DataversePage.openMetadataBlock}"
-                                                                    actionListener="#{DataversePage.showDatasetFieldTypes(mdb.id, false)}">
+                                                                    actionListener="#{DataversePage.showDatasetFieldTypes(mdb.id, false)}"
+                                                                    oncomplete="javascript:bind_bsui_components();">
                                                          <h:outputText value="#{bundle['dataverse.field.set.view']}" />
                                                      </p:commandLink>
                                                 </label>
@@ -294,7 +296,10 @@
                                                         </table>
                                                     </div>
                                                 </div>
-                                                <p:commandLink id="hideDSFT" styleClass="btn btn-default"  update="@widgetVar(optionBlock)" actionListener="#{DataversePage.hideDatasetFieldTypes(mdb.id)}" rendered="#{mdb.showDatasetFieldTypes}">
+                                                <p:commandLink id="hideDSFT" styleClass="btn btn-default" 
+                                                               update="@widgetVar(optionBlock)" actionListener="#{DataversePage.hideDatasetFieldTypes(mdb.id)}" 
+                                                               oncomplete="javascript:bind_bsui_components();"
+                                                               rendered="#{mdb.showDatasetFieldTypes}">
                                                     <h:outputText value="#{bundle.done}" />
                                                 </p:commandLink>
                                             </div>
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index d7ee54e0084..da1e861a3fd 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -685,7 +685,7 @@ div.panel-heading.text-info[data-toggle="collapse"] {color: #31708F;}
 
 div.popover.fade.top.in {max-width: none;}
 div.popover.fade.top.in div.popover-content {text-align:center; vertical-align: middle; display:table-cell; width:428px; height:418px;}
-span.text-info.popoverHTML {display:inline-block;}
+a.popoverHTML {display:inline-block;}
 
 /*div[id$="filesTable"] .ui-datatable-tablewrapper thead {display:none;}*/
 /*div[id$="versionsTable"] .ui-datatable-tablewrapper thead {display:none;}*/
diff --git a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
index d10d1b9c580..6247741b1f6 100644
--- a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
+++ b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
@@ -18,7 +18,7 @@ function bind_bsui_components(){
     
     // Hide open tooltips + popovers
     $('.bootstrap-button-tooltip, [data-toggle="tooltip"]').tooltip("hide");
-    $("[data-toggle='popover']").popover("hide");
+    // $("[data-toggle='popover']").popover("hide");
 
     // Tooltip + popover functionality
     bind_tooltip_popover();
@@ -60,7 +60,7 @@ function bind_tooltip_popover(){
     $(".bootstrap-button-tooltip, [data-toggle='tooltip']").tooltip({container: 'body'});
     $("[data-toggle='popover']").popover({container: 'body'});
     
-    // CLOSE OPEN TOOLTIPS ON BODY CLICKS
+    // CLOSE OPEN TOOLTIPS + POPOVERS ON BODY CLICKS
     $('body').on("touchstart", function(e){
         $(".bootstrap-button-tooltip, [data-toggle='tooltip']").each(function () {
             // hide any open tooltips when anywhere else in body is clicked
@@ -68,6 +68,13 @@ function bind_tooltip_popover(){
                 $(this).tooltip('hide');
             }////end if
         });
+        $("a.popoverHTML, [data-toggle='popover']").each(function () {
+            //the 'is' for buttons that trigger popups
+            //the 'has' for icons within a button that triggers a popup
+            if (!$(this).is(e.target) && $(this).has(e.target).length === 0 && $('div.popover').has(e.target).length === 0) {
+                $(this).popover('hide');
+            }
+        });
     });
     
     // CLOSE OPEN TOOLTIPS ON BUTTON CLICKS
@@ -136,7 +143,6 @@ function post_cancel_edit_files_or_metadata(){
 * Custom Popover with HTML code snippet
 */
 function popoverHTML(popoverTitleHTML) {
-
    var popoverTemplateHTML = ['<div class="popover">',
        '<div class="arrow"></div>',
        '<h3 class="popover-title"></h3>',
@@ -149,7 +155,7 @@ function popoverHTML(popoverTitleHTML) {
        '</code>'].join('');
 
    $('body').popover({
-       selector: 'span.popoverHTML',
+       selector: 'a.popoverHTML',
        title: popoverTitleHTML,
        trigger: 'hover',
        content: popoverContentHTML,

From 3f09cba032bd6146770df47f4e399f475cc234b0 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Thu, 28 Feb 2019 15:43:16 -0500
Subject: [PATCH 13/22] Removed unnecessary tooltips from view modes [ref
 #3925]

---
 src/main/webapp/guestbook.xhtml   | 2 --
 src/main/webapp/harvestsets.xhtml | 2 --
 src/main/webapp/template.xhtml    | 2 --
 3 files changed, 6 deletions(-)

diff --git a/src/main/webapp/guestbook.xhtml b/src/main/webapp/guestbook.xhtml
index a46ad0ba831..32d6ecb08da 100644
--- a/src/main/webapp/guestbook.xhtml
+++ b/src/main/webapp/guestbook.xhtml
@@ -34,8 +34,6 @@
                             <div class="col-xs-6 form-group">
                                 <label class="col-sm-3 control-label" for="guestbookNameStatic">
                                     #{bundle['dataset.manageGuestbooks.guestbook.name']}
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
-                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageGuestbooks.guestbook.name.tip']}"></span>
                                 </label>
                                 <div class="col-sm-9">
                                     <p class="form-control-static">
diff --git a/src/main/webapp/harvestsets.xhtml b/src/main/webapp/harvestsets.xhtml
index 695c6a1592c..7d7cfa60f0f 100644
--- a/src/main/webapp/harvestsets.xhtml
+++ b/src/main/webapp/harvestsets.xhtml
@@ -234,8 +234,6 @@
                                 <div class="form-group" jsf:rendered="#{harvestingSetsPage.editMode}">
                                     <label for="setspec" class="col-sm-3 control-label">
                                         #{bundle['harvestserver.newSetDialog.setspec']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
-                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestserver.newSetDialog.setspec.tip']}"></span>
                                     </label>
                                     <div class="col-sm-8">
                                         <p class="form-control-static" jsf:rendered="#{!harvestingSetsPage.selectedSet.defaultSet}"><h:outputText rendered="#{!harvestingSetsPage.selectedSet.defaultSet}" value="#{harvestingSetsPage.newSetSpec}"/></p>
diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml
index c03870fe08c..fc34f95682f 100644
--- a/src/main/webapp/template.xhtml
+++ b/src/main/webapp/template.xhtml
@@ -32,8 +32,6 @@
                             <div class="form-group">
                                 <label class="col-sm-2 control-label" for="templateNameStatic">
                                     #{bundle['dataset.template.name.tip']}
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
-                                          data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataset.template.name.tip']}"></span>
                                 </label>
                                 <div class="col-sm-5">
                                     <p class="form-control-static">

From 1e8311853c68d0ea6cf0eff5b40c37a00215c457 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Fri, 1 Mar 2019 09:49:28 -0500
Subject: [PATCH 14/22] Swapped out various post action js functions for
 general function [ref #3925]

---
 src/main/webapp/dataset-license-terms.xhtml   |  4 +-
 src/main/webapp/dataset.xhtml                 | 10 +--
 src/main/webapp/dataverse.xhtml               |  4 +-
 src/main/webapp/dataverseuser.xhtml           |  2 +-
 src/main/webapp/editFilesFragment.xhtml       |  2 +-
 src/main/webapp/editdatafiles.xhtml           |  4 +-
 .../resources/js/dv_rebind_bootstrap_ui.js    | 65 ++-----------------
 src/main/webapp/themeAndWidgetsFragment.xhtml |  4 +-
 8 files changed, 19 insertions(+), 76 deletions(-)

diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index 8fbe09603e1..f563dc6ec4f 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -11,7 +11,7 @@
         jsf:rendered="#{dataverseSession.user.authenticated and empty editMode and !widgetWrapper.widgetView
                         and permissionsWrapper.canIssueUpdateDatasetCommand(DatasetPage.dataset)}">
        <p:commandLink type="button" styleClass="btn btn-default btn-access" actionListener="#{DatasetPage.edit('LICENSE')}" 
-                      update="@form,:messagePanel" oncomplete="javascript:post_edit_terms()" disabled="#{DatasetPage.lockedFromEdits}">
+                      update="@form,:messagePanel" oncomplete="javascript:bind_bsui_components();" disabled="#{DatasetPage.lockedFromEdits}">
            <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
            <span class="glyphicon glyphicon-briefcase"/> #{bundle['file.dataFilesTab.terms.editTermsBtn']}
        </p:commandLink>
@@ -46,7 +46,7 @@
                                    <p:selectOneRadio id="options" value="#{termsOfUseAndAccess.license}">
                                        <f:selectItem itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.select.CCO']}" itemValue="CC0" />
                                        <f:selectItem itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.select.notCCO']}" itemValue="NONE" />
-                                       <p:ajax update="touFragment" oncomplete="javascript:dataverseuser_page_rebind();" />
+                                       <p:ajax update="touFragment" oncomplete="javascript:bind_bsui_components();" />
                                    </p:selectOneRadio>
                                </ui:fragment>
                                <ui:fragment rendered="#{termsOfUseAndAccess.license == 'CC0'}">
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index b5d355c7dbb..f1fb480d358 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -206,13 +206,13 @@
                                             </h:outputLink>
                                         </li>
                                         <li>
-                                            <p:commandLink id="editMetadata" actionListener="#{DatasetPage.edit('METADATA')}" update="@form,:datasetForm,:messagePanel" oncomplete="javascript:post_edit_metadata()">
+                                            <p:commandLink id="editMetadata" actionListener="#{DatasetPage.edit('METADATA')}" update="@form,:datasetForm,:messagePanel" oncomplete="javascript:bind_bsui_components();">
                                                 <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
                                                 <h:outputText value="#{bundle['dataset.editBtn.itemLabel.metadata']}" />
                                             </p:commandLink>
                                         </li>
                                         <li>
-                                            <p:commandLink id="editTerms" actionListener="#{DatasetPage.edit('LICENSE')}" update="@form,:datasetForm,:messagePanel" oncomplete="javascript:post_edit_terms()">
+                                            <p:commandLink id="editTerms" actionListener="#{DatasetPage.edit('LICENSE')}" update="@form,:datasetForm,:messagePanel" oncomplete="javascript:bind_bsui_components();">
                                                 <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
                                                 <h:outputText value="#{bundle['dataset.editBtn.itemLabel.terms']}" />
                                             </p:commandLink>
@@ -499,7 +499,7 @@
                     <!-- Edit editMode -->
                     <div class="button-block form-top" jsf:rendered="#{DatasetPage.editMode == 'METADATA' or DatasetPage.editMode == 'LICENSE'}">
                         <p:commandButton id="saveTop" value="#{bundle.saveChanges}" onclick="checkNewlyRestricted();PF('blockDatasetForm').show();" />
-                        <p:commandButton id="cancelTop" value="#{bundle.cancel}" action="#{DatasetPage.cancel}" process="@this" update="@form" oncomplete="javascript:post_cancel_edit_files_or_metadata()">
+                        <p:commandButton id="cancelTop" value="#{bundle.cancel}" action="#{DatasetPage.cancel}" process="@this" update="@form" oncomplete="javascript:bind_bsui_components();">
                             <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="#{DatasetPage.editMode == 'METADATA' ? 1 : DatasetPage.selectedTabIndex}"/>
                         </p:commandButton>
                     </div>
@@ -596,7 +596,7 @@
                                              and (empty DatasetPage.editMode or DatasetPage.editMode == 'METADATA')}">
 
                                 <div class="button-block tab-header margin-bottom text-right" jsf:rendered="#{empty DatasetPage.editMode}">
-                                    <p:commandLink type="button" styleClass="btn btn-default btn-access" actionListener="#{DatasetPage.edit('METADATA')}" update="@form,:messagePanel" oncomplete="javascript:post_edit_metadata()" 
+                                    <p:commandLink type="button" styleClass="btn btn-default btn-access" actionListener="#{DatasetPage.edit('METADATA')}" update="@form,:messagePanel" oncomplete="javascript:bind_bsui_components();" 
                                                    disabled="#{DatasetPage.locked}" rendered="#{!widgetWrapper.widgetView and (DatasetPage.sessionUserAuthenticated and empty DatasetPage.editMode and !widgetWrapper.widgetView
                                                                and DatasetPage.canUpdateDataset() and !DatasetPage.dataset.deaccessioned)}">
                                         <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
@@ -651,7 +651,7 @@
                     <!-- Create/Save Dataset Button Panel -->
                     <div class="button-block" jsf:rendered="#{!empty DatasetPage.editMode}">
                         <p:commandButton tabindex="1000" id="save" value="#{DatasetPage.editMode == 'CREATE' ? bundle['file.addBtn'] : bundle.saveChanges}" onclick="checkNewlyRestricted();PF('blockDatasetForm').show();" />
-                        <p:commandButton tabindex="1000" id="cancel" value="#{bundle.cancel}" action="#{DatasetPage.cancel}" process="@this" update="@form" rendered="#{DatasetPage.editMode != 'CREATE'}" oncomplete="javascript:post_cancel_edit_files_or_metadata()">
+                        <p:commandButton tabindex="1000" id="cancel" value="#{bundle.cancel}" action="#{DatasetPage.cancel}" process="@this" update="@form" rendered="#{DatasetPage.editMode != 'CREATE'}" oncomplete="javascript:bind_bsui_components();">
                             <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="#{DatasetPage.editMode == 'METADATA' ? 1 : DatasetPage.selectedTabIndex}"/>
                         </p:commandButton>
                         <p:button id="cancelCreate" value="#{bundle.cancel}" outcome="/dataverse.xhtml?alias=#{DatasetPage.dataset.owner.alias}" rendered="#{DatasetPage.editMode == 'CREATE'}" />
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 32c237d94eb..a9a6c76c475 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -409,7 +409,7 @@
                                             </li>
                                             <li class="divider" role="presentation"></li>
                                             <li>
-                                                <p:commandLink id="editInfo" actionListener="#{DataversePage.edit('INFO')}" update="@form,:dataverseForm,:searchResults,:messagePanel" oncomplete="javascript:post_edit_dv_general_info();">
+                                                <p:commandLink id="editInfo" actionListener="#{DataversePage.edit('INFO')}" update="@form,:dataverseForm,:searchResults,:messagePanel" oncomplete="javascript:bind_bsui_components();">
                                                     <h:outputText value="#{bundle['dataverse.option.generalInfo']}" />
                                                 </p:commandLink>
                                             </li>
@@ -572,7 +572,7 @@
                         <p:commandButton id="save" tabindex="9" value="#{DataversePage.dataverse.id == null ? bundle.createDataverse : bundle.saveChanges}" action="#{DataversePage.save}" update="@all">
                             <f:ajax onerror="window.scrollTo(0, 0)" />
                         </p:commandButton>
-                        <p:commandButton id="cancel" tabindex="10" value="#{bundle.cancel}" actionListener="#{DataversePage.cancel}" process="@this" update="@form,:searchResults,:messagePanel" rendered="#{DataversePage.dataverse.id != null}" oncomplete="javascript:post_cancel_edit_dv()" />
+                        <p:commandButton id="cancel" tabindex="10" value="#{bundle.cancel}" actionListener="#{DataversePage.cancel}" process="@this" update="@form,:searchResults,:messagePanel" rendered="#{DataversePage.dataverse.id != null}" oncomplete="javascript:bind_bsui_components();initCarousel();" />
                         <p:button tabindex="10" value="#{bundle.cancel}" outcome="/dataverse.xhtml?alias=#{DataversePage.dataverse.owner.alias}" rendered="#{DataversePage.dataverse.id == null and DataversePage.ownerId != null}"/>
                     </div>
 
diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index c5533fa8890..b3d538f8d96 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -69,7 +69,7 @@
                     </p:panel>
 
                     <p:tabView id="dataRelatedToMeView" activeIndex="#{DataverseUserPage.activeIndex}" dynamic="true" rendered="#{empty DataverseUserPage.editMode}">
-                        <p:ajax event="tabChange" listener="#{DataverseUserPage.onTabChange}" update="@all" oncomplete="javascript:dataverseuser_page_rebind();" />
+                        <p:ajax event="tabChange" listener="#{DataverseUserPage.onTabChange}" update="@all" oncomplete="javascript:bind_bsui_components();" />
                         <p:tab id="myData" title="#{bundle['user.dataRelatedToMe']}">
                             <ui:include src="mydata_fragment.xhtml"></ui:include>
                         </p:tab>
diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index 8469037b6e6..daa426f6e37 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -129,7 +129,7 @@
                                   process="filesTable" 
                                   update=":datasetForm:filesTable, @([id$=filesButtons])"
                                   label="#{bundle['file.selectToAddBtn']}"
-                                  oncomplete="javascript:dataset_fileupload_rebind();uploadFinished(PF('fileUploadWidget'));"
+                                  oncomplete="javascript:bind_bsui_components();uploadFinished(PF('fileUploadWidget'));"
                                   onstart="javascript:uploadWidgetDropRemoveMsg();uploadStarted();"
                                   onerror="javascript:uploadFailure();"
                                   sizeLimit="#{EditDatafilesPage.getMaxFileUploadSizeInBytes()}"
diff --git a/src/main/webapp/editdatafiles.xhtml b/src/main/webapp/editdatafiles.xhtml
index f900b0e10c6..2d851060177 100644
--- a/src/main/webapp/editdatafiles.xhtml
+++ b/src/main/webapp/editdatafiles.xhtml
@@ -70,7 +70,7 @@
                             <p:outputPanel id="filesButtons" >
                                 <div jsf:rendered="#{!(empty EditDatafilesPage.fileMetadatas and (datasetPage || EditDatafilesPage.showFileUploadFragment()))}">
                                     <p:commandButton tabindex="1000" id="save" value="#{bundle.saveChanges}" onclick="checkNewlyRestricted();PF('blockFileForm').show();" />
-                                    <p:commandButton tabindex="1000" id="cancel" value="#{bundle.cancel}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="javascript:post_cancel_edit_files_or_metadata()">
+                                    <p:commandButton tabindex="1000" id="cancel" value="#{bundle.cancel}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="javascript:bind_bsui_components();">
                                     </p:commandButton>
                                     <p:commandButton value="Direct" id="datasetSave"
                                                      style="display:none"
@@ -79,7 +79,7 @@
                                                      action="#{EditDatafilesPage.save}" />
                                 </div>
                                 <div jsf:rendered="#{empty EditDatafilesPage.fileMetadatas and (datasetPage || EditDatafilesPage.showFileUploadFragment())}">
-                                    <p:commandButton tabindex="1000" id="doneFilesButton" value="#{bundle.done}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="javascript:post_cancel_edit_files_or_metadata()">
+                                    <p:commandButton tabindex="1000" id="doneFilesButton" value="#{bundle.done}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="javascript:bind_bsui_components();">
                                     </p:commandButton>
 
                                 </div>
diff --git a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
index 6247741b1f6..a261db90ec8 100644
--- a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
+++ b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
@@ -16,9 +16,12 @@ function bind_bsui_components(){
       $(this).siblings('div.panel-heading').children('span.glyphicon').removeClass("glyphicon-chevron-up").addClass("glyphicon-chevron-down");
     });
     
+    // rebind for dropdown menus on restrict button
+    $('.dropdown-toggle').dropdown();
+    
     // Hide open tooltips + popovers
     $('.bootstrap-button-tooltip, [data-toggle="tooltip"]').tooltip("hide");
-    // $("[data-toggle='popover']").popover("hide");
+    $("[data-toggle='popover']").popover("hide");
 
     // Tooltip + popover functionality
     bind_tooltip_popover();
@@ -37,22 +40,6 @@ function bind_bsui_components(){
         var dialog_id = this.jq.attr('id').split(/[:]+/).pop();
         handleResizeDialog(dialog_id);
     }
-
-}
-
-function dataset_fileupload_rebind(){
-    //console.log('dataset_fileupload_rebind');
-    bind_bsui_components();
-    // rebind for dropdown menus on restrict button
-    $('.dropdown-toggle').dropdown();
-
-}
-
-function dataverseuser_page_rebind(){
-    bind_bsui_components();
-    // rebind for dropdown menus on dataverseuser.xhtml
-    $('.dropdown-toggle').dropdown();
-
 }
 
 function bind_tooltip_popover(){
@@ -95,50 +82,6 @@ function disabledLinks(){
     });
 }
 
-/*
- * Called after "Edit Dataverse" - "General Information"
- */
-function post_edit_dv_general_info(){
-    bind_bsui_components();
-}
-
-/*
- * Used after cancelling "Edit Dataverse"
- */
-function post_cancel_edit_dv(){
-   bind_bsui_components();
-   initCarousel();
-}
-
-/*
- * Called after "Upload + Edit Files"
- */
-function post_edit_files(){
-   bind_bsui_components();
-}
-
-/*
- * Called after "Edit Metadta"
- */
-function post_edit_metadata(){
-   bind_bsui_components();
-}
-
-/*
- * Called after "Edit Terms"
- */
-
-function post_edit_terms(){
-   bind_bsui_components();
-}
-
-/*
- *  Used when cancelling either "Upload + Edit Files" or "Edit Metadata"
- */
-function post_cancel_edit_files_or_metadata(){
-   bind_bsui_components();
-}
-
 /*
 * Custom Popover with HTML code snippet
 */
diff --git a/src/main/webapp/themeAndWidgetsFragment.xhtml b/src/main/webapp/themeAndWidgetsFragment.xhtml
index ea7cf6a51bf..21086660219 100644
--- a/src/main/webapp/themeAndWidgetsFragment.xhtml
+++ b/src/main/webapp/themeAndWidgetsFragment.xhtml
@@ -23,7 +23,7 @@
                                         <h:selectBooleanCheckbox id="themeRoot" tabindex="7" styleClass="metadata-blocks-default" 
                                                                  rendered="#{themeWidgetFragment.editDv.owner != null}"
                                                                  value="#{themeWidgetFragment.inheritCustomization}" >
-                                            <p:ajax update="@widgetVar(content)" oncomplete="javascript:dataverseuser_page_rebind();" listener="#{themeWidgetFragment.checkboxListener()}"/>
+                                            <p:ajax update="@widgetVar(content)" oncomplete="javascript:bind_bsui_components();" listener="#{themeWidgetFragment.checkboxListener()}"/>
                                         </h:selectBooleanCheckbox>
                                         <h:outputFormat value="#{bundle['dataverse.theme.inheritCustomization.checkbox']}">
                                             <f:param value="#{themeWidgetFragment.editDv.themeRootDataverseName}"/>
@@ -66,7 +66,7 @@
                                             <p:selectOneRadio id="logoFormat" value="#{themeWidgetFragment.editDv.dataverseTheme.logoFormat}">
                                                 <f:selectItem itemLabel="#{bundle['dataverse.theme.logo.format.selectTab.square2']}" itemValue="SQUARE"/>
                                                 <f:selectItem itemLabel="#{bundle['dataverse.theme.logo.format.selectTab.rectangle2']}" itemValue="RECTANGLE"/>
-                                                <p:ajax update="@widgetVar(content)" oncomplete="dataverseuser_page_rebind();" />
+                                                <p:ajax update="@widgetVar(content)" oncomplete="bind_bsui_components();" />
                                             </p:selectOneRadio>
                                             <p:message for="logoFormat" display="text"/>
                                         </div>

From dc2c3b8cfb7e32f25745f705ee0d6e72b5364c68 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Fri, 1 Mar 2019 12:22:26 -0500
Subject: [PATCH 15/22] Removed unused style class from tooltips, improved
 mobile layout of citation blocks [ref #3925]

---
 src/main/webapp/dataset-citation.xhtml        | 11 +--
 src/main/webapp/dataset-license-terms.xhtml   | 70 +++++++++----------
 src/main/webapp/dataset-widgets.xhtml         |  6 +-
 src/main/webapp/dataset.xhtml                 | 14 ++--
 src/main/webapp/dataverse.xhtml               | 14 ++--
 src/main/webapp/dataverseuser.xhtml           | 20 +++---
 src/main/webapp/editFilesFragment.xhtml       |  4 +-
 .../webapp/explicitGroup-new-dialog.xhtml     |  2 +-
 .../webapp/file-data-access-fragment.xhtml    |  6 +-
 src/main/webapp/file.xhtml                    | 27 ++++---
 src/main/webapp/filesFragment.xhtml           |  2 +-
 src/main/webapp/guestbook.xhtml               |  2 +-
 src/main/webapp/harvestclients.xhtml          | 16 ++---
 src/main/webapp/harvestsets.xhtml             |  6 +-
 src/main/webapp/manage-guestbooks.xhtml       |  2 +-
 src/main/webapp/metadataFragment.xhtml        | 12 ++--
 src/main/webapp/oauth2/firstLogin.xhtml       | 14 ++--
 .../resources/js/dv_rebind_bootstrap_ui.js    | 11 ++-
 src/main/webapp/roles-edit.xhtml              |  6 +-
 src/main/webapp/search/advanced.xhtml         | 28 ++++----
 src/main/webapp/template.xhtml                |  2 +-
 src/main/webapp/termsofuse.xhtml              |  2 +-
 src/main/webapp/themeAndWidgetsFragment.xhtml | 22 +++---
 23 files changed, 153 insertions(+), 146 deletions(-)

diff --git a/src/main/webapp/dataset-citation.xhtml b/src/main/webapp/dataset-citation.xhtml
index 3ba8205f97d..2d1fac390c9 100644
--- a/src/main/webapp/dataset-citation.xhtml
+++ b/src/main/webapp/dataset-citation.xhtml
@@ -14,11 +14,14 @@
                     <span class="citation-select" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
                         <h:outputText value="#{DatasetPage.displayCitation}" escape="false"/>
                     </span>
-                    <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!DatasetPage.dataset.released}" data-toggle="tooltip" data-trigger="hover" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
-                    <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{DatasetPage.dataset.released and DatasetPage.workingVersion.draft}" data-toggle="tooltip" data-trigger="hover" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
-                    <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{DatasetPage.workingVersion.deaccessioned}" data-toggle="tooltip" data-trigger="hover" data-placement="top" data-original-title="#{bundle['dataset.cite.title.deassessioned']}"/>
+                    <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!DatasetPage.dataset.released}" 
+                          data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
+                    <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{DatasetPage.dataset.released and DatasetPage.workingVersion.draft}" 
+                          data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
+                    <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{DatasetPage.workingVersion.deaccessioned}" 
+                          data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.deassessioned']}"/>
                 </div>
-                <div class="col-sm-5 col-md-4 text-right citation-download" jsf:rendered="#{!DatasetPage.workingVersion.deaccessioned}">
+                <div class="col-xs-5 col-md-4 text-right citation-download" jsf:rendered="#{!DatasetPage.workingVersion.deaccessioned}">
                     <div class="dropdown">
                         <button type="button" class="btn btn-default dropdown-toggle downloadCitation" data-toggle="dropdown">
                             <span class="glyphicon glyphicon-list"/> #{bundle['dataset.cite.downloadBtn']} <span class="caret"></span>
diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index f563dc6ec4f..4062a1eaa71 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -29,7 +29,7 @@
                        <div class="form-group">
                            <label for="metadata_Terms" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver']}
-                               <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                               <span class="glyphicon glyphicon-question-sign text-muted"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.title']}"></span>
                            </label>
                            <div class="col-sm-9">
@@ -57,7 +57,7 @@
                        <div class="form-group" jsf:rendered="#{termsOfUseAndAccess.license != 'CC0'}">
                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']}
-                               <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                               <span class="glyphicon glyphicon-question-sign text-muted"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse.title']}"></span>
                            </label>
                            <div class="col-sm-9">
@@ -79,7 +79,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.confidentialityDeclaration}">
                                    <label for="confidentialityDeclaration" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -89,7 +89,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.specialPermissions}">
                                    <label for="specialPermissions" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -99,7 +99,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.restrictions}">
                                    <label for="restrictions" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -109,7 +109,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.citationRequirements}">
                                    <label for="citationRequirements" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -119,7 +119,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.depositorRequirements}">
                                    <label for="depositorRequirements" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -129,7 +129,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.conditions}">
                                    <label for="conditions" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -139,7 +139,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.disclaimer}">
                                    <label for="disclaimer" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -151,7 +151,7 @@
                                <div class="form-group">
                                    <label for="confidentialityDeclaration" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -161,7 +161,7 @@
                                <div class="form-group">
                                    <label for="specialPermissions" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -171,7 +171,7 @@
                                <div class="form-group">
                                    <label for="restrictions" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -181,7 +181,7 @@
                                <div class="form-group">
                                    <label for="citationRequirements" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -191,7 +191,7 @@
                                <div class="form-group">
                                    <label for="depositorRequirements" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -201,7 +201,7 @@
                                <div class="form-group">
                                    <label for="conditions" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -211,7 +211,7 @@
                                <div class="form-group">
                                    <label for="disclaimer" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -242,7 +242,7 @@
                        <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall}">
                            <label for="metadata_RestrictedFiles" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles']}
-                               <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                               <span class="glyphicon glyphicon-question-sign text-muted"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.title']}"></span>
                            </label>
                            <div class="col-sm-9">
@@ -256,7 +256,7 @@
                        <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.termsOfAccess}">
                            <label for="metadata_TermsAccess" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                               <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                               <span class="glyphicon glyphicon-question-sign text-muted"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                            </label>
                            <div class="col-sm-9">
@@ -266,7 +266,7 @@
                        <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall and (DatasetPage.restrictedFileCount > 0)}">
                            <label for="metadata_RequestAccess" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
-                               <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                               <span class="glyphicon glyphicon-question-sign text-muted"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
                            </label>
                            <div class="col-sm-9">
@@ -285,7 +285,7 @@
                        <div class="form-group">
                            <label for="metadata_TermsAccess" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                               <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                               <span class="glyphicon glyphicon-question-sign text-muted"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                            </label>
                            <div class="col-sm-9">
@@ -295,7 +295,7 @@
                        <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall}">
                            <label for="metadata_RequestAccess" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
-                               <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                               <span class="glyphicon glyphicon-question-sign text-muted"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
                            </label>
                            <div class="col-sm-9">
@@ -315,7 +315,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.dataAccessPlace}">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -325,7 +325,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.originalArchive}">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -335,7 +335,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.availabilityStatus}">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -345,7 +345,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.contactForAccess}">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -355,7 +355,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.sizeOfCollection}">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection.tip']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -365,7 +365,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.studyCompletion}">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -377,7 +377,7 @@
                                <div class="form-group">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -387,7 +387,7 @@
                                <div class="form-group">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -397,7 +397,7 @@
                                <div class="form-group">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -407,7 +407,7 @@
                                <div class="form-group">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -417,7 +417,7 @@
                                <div class="form-group">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection.tip']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -427,7 +427,7 @@
                                <div class="form-group">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                       <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -451,7 +451,7 @@
                    <div class="form-group">
                        <label for="metadata_Guestbook" class="col-sm-3 control-label">
                            #{bundle['file.dataFilesTab.terms.list.guestbook']}
-                           <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                           <span class="glyphicon glyphicon-question-sign text-muted"
                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.guestbook.title']}"></span>
                        </label>
                        <div class="col-sm-9">
@@ -545,7 +545,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">
                     #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData']}
-                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                    <span class="glyphicon glyphicon-question-sign text-muted"
                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData.title']}"></span>
                 </label>
                 <div class="col-sm-8">
diff --git a/src/main/webapp/dataset-widgets.xhtml b/src/main/webapp/dataset-widgets.xhtml
index 802a190b9f7..bdbff04cb42 100644
--- a/src/main/webapp/dataset-widgets.xhtml
+++ b/src/main/webapp/dataset-widgets.xhtml
@@ -28,7 +28,7 @@
                             <div class="form-group" jsf:rendered="#{true or themeWidgetFragment.editDv.themeRoot}">
                                 <label class="col-sm-3 control-label" for="logoFormat">
                                     #{bundle['dataset.thumbnailsAndWidget.thumbnailImage']}
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.title']}"></span>
                                 </label>
                                 <div class="col-sm-9">
@@ -52,7 +52,7 @@
                                         <div class="form-group" jsf:rendered="#{not empty DatasetWidgetsPage.datasetThumbnails}">
                                             <label for="selectThumbnail" class="control-label">
                                                 #{bundle['dataset.thumbnailsAndWidget.thumbnailImage.selectAvailable']}
-                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                <span class="glyphicon glyphicon-question-sign text-muted"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.selectAvailable.title']}"></span>
                                             </label>
                                             <div>
@@ -62,7 +62,7 @@
                                         <div class="form-group">
                                             <label for="uploadThumbnail" class="control-label">
                                                 #{bundle['dataset.thumbnailsAndWidget.thumbnailImage.uploadNew']}
-                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                <span class="glyphicon glyphicon-question-sign text-muted"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.uploadNew.title']}"></span>
                                             </label>
                                             <p:fileUpload invalidFileMessage="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.upload.invalidMsg']}" id="changelogo" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update="@all" 
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index f1fb480d358..a983e5526cb 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -376,7 +376,7 @@
                                         <div id="keywords" class="form-group" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.keywordDisplay and dsf.datasetFieldType.id==DatasetPage.datasetVersionUI.keyword.datasetFieldType.id}">
                                             <label class="col-sm-3 control-label">
                                                 #{bundle['dataset.keywordDisplay.title']}
-                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                <span class="glyphicon glyphicon-question-sign text-muted"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.keyword.datasetFieldType.localeDescription}"></span>
                                             </label>
                                             <div class="col-sm-9">#{DatasetPage.datasetVersionUI.keywordDisplay}</div>
@@ -384,7 +384,7 @@
                                         <div id="publication" class="form-group" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.relPublicationCitation and dsf.datasetFieldType.name=='publication'}">
                                             <label class="col-sm-3 control-label">
                                                 #{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).title}
-                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                <span class="glyphicon glyphicon-question-sign text-muted"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).description}"></span>
                                             </label>
                                             <div class="col-sm-9">
@@ -396,7 +396,7 @@
                                         <div class="form-group" jsf:rendered="#{dsf.datasetFieldType.name!='publication' and dsf.datasetFieldType.name!='keyword'  }">
                                             <label for="metadata_#{dsf.datasetFieldType.name}" class="col-sm-3 control-label">
                                                 #{dsf.datasetFieldType.localeTitle}
-                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                <span class="glyphicon glyphicon-question-sign text-muted"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
                                             </label>
                                             <!-- Primitive datasetFields -->
@@ -441,7 +441,7 @@
                         <div class="form-group">
                             <label for="select_HostDataverse" class="col-sm-2 control-label">
                                 #{bundle.hostDataverse}
-                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                <span class="glyphicon glyphicon-question-sign text-muted"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.host.title']}"></span>
                             </label>
                             <div class="col-sm-10">
@@ -457,7 +457,7 @@
                         <div class="form-group" jsf:rendered="#{!empty DatasetPage.dataverseTemplates and DatasetPage.editMode == 'CREATE'}">
                             <label for="select_DatasetTemplate" class="col-sm-2 control-label">
                                 #{bundle['dataset.manageTemplates.tab.action.btn.view.dialog.datasetTemplate']}
-                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                <span class="glyphicon glyphicon-question-sign text-muted"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageTemplates.tab.action.btn.view.dialog.datasetTemplate.title']}"></span>
                             </label>
                             <div class="col-sm-6">
@@ -1310,7 +1310,7 @@
                                 <div class="form-group">
                                     <label for="metadata_TermsAccess" class="col-sm-3 control-label">
                                         #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                                     </label>
                                     <div class="col-sm-9">
@@ -1320,7 +1320,7 @@
                                 <div class="form-group">
                                     <label for="metadata_RequestAccess" class="col-sm-3 control-label">
                                         #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
                                     </label>
                                     <div class="col-sm-9">
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index a9a6c76c475..94b861ba999 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -54,7 +54,7 @@
                             <div class="col-xs-6 form-group form-col-container">
                                 <label class="col-sm-3 control-label" for="name">
                                     #{bundle.dataverse} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.title']}"></span>
                                 </label>
                                 <div class="col-sm-9 form-col-container">
@@ -64,7 +64,7 @@
                             <div class="col-xs-6 form-group form-col-container">
                                 <label class="col-sm-3 control-label" for="affiliation">
                                     #{bundle.affiliation}
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.affiliation.title']}"></span>
                                 </label>
                                 <div class="col-sm-9 form-col-container">
@@ -77,7 +77,7 @@
                             <div class="col-xs-6 form-group form-col-container">
                                 <label class="col-sm-3 control-label" for="identifier">
                                     #{bundle.identifier} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.identifier.title']}"></span>
                                 </label>
                                 <div class="col-sm-9 form-col-container">
@@ -91,7 +91,7 @@
                             <div class="col-xs-6 form-group" jsf:rendered="#{DataversePage.ownerId != null}">
                                 <label class="col-sm-3 control-label" for="hostDataverse">
                                     #{bundle.hostDataverse}
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.host.title']}"></span>
                                 </label>
                                 <div class="col-sm-9 form-col-container">
@@ -111,7 +111,7 @@
                                 <div class="form-group clearfix">
                                     <label class="col-sm-3 control-label" for="dataverseCategory">
                                         #{bundle['dataverse.category']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.category.title']}"></span>
                                     </label>
                                     <div class="col-sm-9 form-col-container">
@@ -135,7 +135,7 @@
                                        <p:autoUpdate />
                                         <label class="col-sm-3 control-label" for="contactEmail">
                                             #{bundle['dataverse.email']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                            <span class="glyphicon glyphicon-question-sign text-muted"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.email.title']}"></span>
                                         </label>
                                         <div class="col-sm-9 form-col-container edit-compound-field">
@@ -172,7 +172,7 @@
                             <div class="col-xs-6 form-group form-col-container">
                                 <label class="col-sm-3 control-label" for="description">
                                     #{bundle.description}
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.description.title']}"></span>
                                 </label>
                                 <div class="col-sm-9 form-col-container">
diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index b3d538f8d96..abea53f3baf 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -498,7 +498,7 @@
                                 <!-- Username -->
                                     <label for="userNameEmail" class="col-sm-3 control-label">
                                         #{bundle['user.username']} <span class="glyphicon glyphicon-asterisk text-danger"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.username.illegal.tip']}"></span>
                                     </label>
                                     <div class="col-sm-9">
@@ -517,7 +517,7 @@
                                 <!-- Current Password -->
                                     <label for="currentPassword" class="col-sm-3 control-label">
                                         #{bundle['user.currentPasswd']} <span class="glyphicon glyphicon-asterisk text-danger"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.currentPasswd.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
@@ -530,7 +530,7 @@
                                     <label for="inputPassword" class="col-sm-3 control-label">
                                         <h:outputText value="#{DataverseUserPage.editMode == 'CREATE' ? bundle['user.password'] : bundle['user.newPassword']}" />
                                         <span class="glyphicon glyphicon-asterisk text-danger"></span>
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.passwd.illegal.tip']}"></span>
                                     </label>
                                     <div class="col-sm-9">
@@ -549,7 +549,7 @@
                                     <!-- Retype Password -->
                                     <label for="retypePassword" class="col-sm-3 control-label">
                                         #{bundle['user.rePasswd']} <span class="glyphicon glyphicon-asterisk text-danger"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.rePasswd.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
@@ -561,7 +561,7 @@
                                 <!-- First Name -->
                                     <label for="firstName" class="col-sm-3 control-label">
                                         #{bundle['user.firstName']} <span class="glyphicon glyphicon-asterisk text-danger"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.firstName.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
@@ -573,7 +573,7 @@
                                     <!-- Last Name -->
                                     <label for="lastName" class="col-sm-3 control-label">
                                         #{bundle['user.lastName']} <span class="glyphicon glyphicon-asterisk text-danger"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.lastName.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
@@ -585,7 +585,7 @@
                                     <!-- Email -->
                                     <label for="email" class="col-sm-3 control-label">
                                         #{bundle.email} <span class="glyphicon glyphicon-asterisk text-danger"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.email.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
@@ -600,7 +600,7 @@
                                     <!-- ORCID iD, for example -->
                                     <label for="userPersistentId" class="col-sm-3 control-label">
                                         #{DataverseUserPage.userAuthProvider.persistentIdName}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{DataverseUserPage.userAuthProvider.persistentIdDescription}"></span>
                                     </label>
                                     <div class="col-sm-4">
@@ -616,7 +616,7 @@
                                     <!-- Affiliation -->
                                     <label for="affiliation" class="col-sm-3 control-label">
                                         #{bundle.affiliation}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.affiliation.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
@@ -628,7 +628,7 @@
                                 <!-- Position -->
                                     <label for="position" class="col-sm-3 control-label">
                                         #{bundle['user.position']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.position.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index daa426f6e37..e338f1f68a5 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -548,7 +548,7 @@
             <div class="form-group">
                 <label for="metadata_TermsAccess" class="col-sm-3 control-label">
                     #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                    <span class="glyphicon glyphicon-question-sign text-muted"
                           data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                 </label>
                 <ui:fragment rendered="#{!datasetPage}">
@@ -565,7 +565,7 @@
             <div class="form-group">
                 <label for="metadata_RequestAccess" class="col-sm-3 control-label">
                     #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
-                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                    <span class="glyphicon glyphicon-question-sign text-muted"
                           data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
                 </label>
                 <ui:fragment rendered="#{!datasetPage}">
diff --git a/src/main/webapp/explicitGroup-new-dialog.xhtml b/src/main/webapp/explicitGroup-new-dialog.xhtml
index d31721aad63..845693d69f3 100644
--- a/src/main/webapp/explicitGroup-new-dialog.xhtml
+++ b/src/main/webapp/explicitGroup-new-dialog.xhtml
@@ -30,7 +30,7 @@
                     <label for="explicitGroupIdentifier" class="col-sm-3 control-label">
                         #{bundle['dataverse.permissions.explicitGroupEditDialog.groupIdentifier']}
                         <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                        <span class="glyphicon glyphicon-question-sign text-muted"
                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.permissions.explicitGroupEditDialog.groupIdentifier.tip']}"></span>
                     </label>
                     <div class="col-sm-9">
diff --git a/src/main/webapp/file-data-access-fragment.xhtml b/src/main/webapp/file-data-access-fragment.xhtml
index b659c541abc..4f3fb047c61 100644
--- a/src/main/webapp/file-data-access-fragment.xhtml
+++ b/src/main/webapp/file-data-access-fragment.xhtml
@@ -31,7 +31,7 @@
         <div class="form-group row">
             <label class="col-xs-12 col-lg-3 control-label">
                 #{bundle['file.dataFilesTab.dataAccess.local.label']}
-                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                <span class="glyphicon glyphicon-question-sign text-muted"
                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.dataAccess.local.tooltip']}"></span>
             </label>
             <div class="col-sm-9">
@@ -43,7 +43,7 @@
         <div class="form-group row">
             <label class="col-xs-12 col-lg-3 control-label">
                 #{bundle['file.dataFilesTab.dataAccess.download.label']}
-                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                <span class="glyphicon glyphicon-question-sign text-muted"
                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.dataAccess.download.tooltip']}"></span>
             </label>
             <div class="col-xs-12 col-lg-9 row">
@@ -58,7 +58,7 @@
         <div class="form-group row">
             <label class="col-xs-12 col-lg-3 control-label">
                 #{bundle['file.dataFilesTab.dataAccess.verify.label']}
-                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                <span class="glyphicon glyphicon-question-sign text-muted"
                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.dataAccess.verify.tooltip']}"></span>
             </label>
             <div class="col-sm-9">
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 18d44b35ad5..ad8aba129d6 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -236,15 +236,18 @@
                                 <div class="col-xs-12 citation-block no-margin-bottom">
                                     <div class="col-xs-12 #{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation'}">
                                         <div class="row">
-                                            <div class="#{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'col-xs-12' : 'col-xs-6 col-md-7'} citation">
+                                            <div class="#{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'col-xs-12' : 'col-xs-12 col-md-7'} citation">
                                                 <span class="citation-select" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
                                                     <h:outputText value="#{FilePage.fileMetadata.datasetVersion.getCitation(true)}" escape="false"/>
                                                 </span>
-                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}" data-toggle="tooltip" data-trigger="hover" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
-                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.dataset.released and FilePage.fileMetadata.datasetVersion.draft}" data-toggle="tooltip" data-trigger="hover" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
-                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}" data-toggle="tooltip" data-trigger="hover" data-placement="top" data-original-title="#{bundle['dataset.cite.title.deassessioned']}"/>
+                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}" 
+                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
+                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.dataset.released and FilePage.fileMetadata.datasetVersion.draft}" 
+                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
+                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}" 
+                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.deassessioned']}"/>
                                             </div>
-                                            <div class="col-sm-6 col-md-5 text-right citation-download" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                            <div class="col-xs-12 col-md-5 text-right citation-download" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
                                                 <div class="dropdown">
                                                     <button type="button" class="btn btn-default dropdown-toggle downloadCitation" data-toggle="dropdown">
                                                         <span class="glyphicon glyphicon-list"/> #{bundle['dataset.cite.downloadBtn']} <span class="caret"></span>
@@ -280,14 +283,16 @@
                                 <div class="col-xs-12 citation-block">
                                      <div class="col-xs-12 #{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation bg-citation-file'}">
                                         <div class="row">
-                                            <div class="#{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'col-xs-12' : 'col-xs-6 col-md-7'} citation">
+                                            <div class="#{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'col-xs-12' : 'col-xs-12 col-md-7'} citation">
                                                 <span id="citation-select-2" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
                                                     <h:outputText value="#{FilePage.fileMetadata.dataFile.isIdentifierRegistered() ? FilePage.fileMetadata.getDirectFileCitation(true) : FilePage.fileMetadata.getFileCitation(true)}" escape="false"/>
                                                 </span>
-                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}" data-toggle="tooltip" data-trigger="hover" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
-                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.dataset.released and FilePage.fileMetadata.datasetVersion.draft}" data-toggle="tooltip" data-trigger="hover" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
+                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}" 
+                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
+                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.dataset.released and FilePage.fileMetadata.datasetVersion.draft}" 
+                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
                                             </div>
-                                            <div class="col-sm-6 col-md-5 text-right citation-download" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                            <div class="col-xs-12 col-md-5 text-right citation-download" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
                                                 <div class="dropdown">
                                                     <button type="button" class="btn btn-default dropdown-toggle downloadCitation" data-toggle="dropdown">
                                                         <span class="glyphicon glyphicon-list"/> #{bundle['file.cite.file.downloadBtn']} <span class="caret"></span>
@@ -612,7 +617,7 @@
                                 <div class="form-group">
                                     <label for="metadata_TermsAccess" class="col-sm-3 control-label">
                                         #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                                     </label>
                                     <div class="col-sm-9">
@@ -622,7 +627,7 @@
                                 <div class="form-group">
                                     <label for="metadata_RequestAccess" class="col-sm-3 control-label">
                                         #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
                                     </label>
                                     <div class="col-sm-9">
diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
index 86062fa7747..9912cb27e3a 100644
--- a/src/main/webapp/filesFragment.xhtml
+++ b/src/main/webapp/filesFragment.xhtml
@@ -46,7 +46,7 @@
                     </div>
                     <label class="col-sm-3 control-label">
                         #{bundle['file.cloudStorageAccess']}
-                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                        <span class="glyphicon glyphicon-question-sign text-muted"
                               data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['file.cloudStorageAccess.tip']}"></span>
                     </label>
                     <div class="col-md-4 col-sm-5 col-xs-6 input-group">
diff --git a/src/main/webapp/guestbook.xhtml b/src/main/webapp/guestbook.xhtml
index 32d6ecb08da..0dcfdf668b0 100644
--- a/src/main/webapp/guestbook.xhtml
+++ b/src/main/webapp/guestbook.xhtml
@@ -50,7 +50,7 @@
                             <label class="col-sm-3 control-label" for="guestbookName">
                                 #{bundle['dataset.manageGuestbooks.guestbook.name']} 
                                 <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"></span>
-                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                <span class="glyphicon glyphicon-question-sign text-muted"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageGuestbooks.guestbook.name.tip']}"></span>
                             </label>
                             <div class="col-sm-6">
diff --git a/src/main/webapp/harvestclients.xhtml b/src/main/webapp/harvestclients.xhtml
index e040dd1dd60..7b8bd94d6e8 100644
--- a/src/main/webapp/harvestclients.xhtml
+++ b/src/main/webapp/harvestclients.xhtml
@@ -227,7 +227,7 @@
                                     <label for="serverUrl" class="col-sm-2 control-label">
                                         #{bundle['harvestclients.newClientDialog.url']} 
                                         <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{!harvestingClientsPage.initialSettingsValidated}" title="#{bundle.requiredField}"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.newClientDialog.url.tip']}"></span>
                                     </label>
                                     <div class="col-sm-9">
@@ -245,7 +245,7 @@
                                     <label for="destinationDataverse" class="col-sm-2 control-label">
                                         #{bundle['harvestclients.newClientDialog.dataverse']} 
                                         <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{harvestingClientsPage.createMode}" title="#{bundle.requiredField}"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.newClientDialog.dataverse.tip']}"></span>
                                     </label>
                                     <div class="col-sm-9">
@@ -305,7 +305,7 @@
                                 <div class="form-group">
                                     <label for="serverOaiSets" class="col-sm-3 control-label">
                                         #{bundle['harvestclients.newClientDialog.oaiSets']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.newClientDialog.oaiSets.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -333,7 +333,7 @@
                                     <label for="oaiMetadataFormat" class="col-sm-3 control-label">
                                         #{bundle['harvestclients.newClientDialog.oaiMetadataFormat']} 
                                         <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}" jsf:rendered="#{harvestingClientsPage.initialSettingsValidated and harvestingClientsPage.createMode}"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.newClientDialog.oaiMetadataFormat.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -389,7 +389,7 @@
                                 <div class="form-group">
                                     <label for="harvestingSchedule" class="col-sm-3 control-label">
                                         #{bundle['harvestclients.newClientDialog.schedule']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.newClientDialog.schedule.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -484,7 +484,7 @@
                                 <div class="form-group">
                                     <label for="harvestingStyle" class="col-sm-3 control-label">
                                         #{bundle['harvestclients.newClientDialog.harvestingStyle']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.newClientDialog.harvestingStyle.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -502,7 +502,7 @@
                                 <div class="form-group" jsf:rendered="#{harvestingClientsPage.editMode}">
                                     <label for="archiveUrl" class="col-sm-3 control-label">
                                         #{bundle['harvestclients.viewEditDialog.archiveUrl']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.viewEditDialog.archiveUrl.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -517,7 +517,7 @@
                                 <div class="form-group" jsf:rendered="#{harvestingClientsPage.editMode}">
                                     <label for="archiveDescription" class="col-sm-3 control-label">
                                         #{bundle['harvestclients.viewEditDialog.archiveDescription']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.viewEditDialog.archiveDescription.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
diff --git a/src/main/webapp/harvestsets.xhtml b/src/main/webapp/harvestsets.xhtml
index 7d7cfa60f0f..53422e94f44 100644
--- a/src/main/webapp/harvestsets.xhtml
+++ b/src/main/webapp/harvestsets.xhtml
@@ -205,7 +205,7 @@
                                     <label for="setquery" class="col-sm-3 control-label">
                                         #{bundle['harvestserver.newSetDialog.setquery']} 
                                         <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{!harvestingSetsPage.setQueryValidated}" title="#{bundle.requiredField}"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestserver.newSetDialog.setquery.tip']}"></span>
                                     </label>
                                     <div class="col-sm-8">
@@ -268,7 +268,7 @@
                                         <label for="setspec" class="col-sm-3 control-label">
                                             #{bundle['harvestserver.newSetDialog.setspec']} 
                                             <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{harvestingSetsPage.setQueryValidated}" title="#{bundle.requiredField}"/>
-                                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                            <span class="glyphicon glyphicon-question-sign text-muted"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestserver.newSetDialog.setspec.tip']}"></span>
                                         </label>
                                         <div class="col-sm-8">
@@ -284,7 +284,7 @@
                                         <label for="setdescription" class="col-sm-3 control-label">
                                             #{bundle['harvestserver.newSetDialog.setdescription']} 
                                             <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{harvestingSetsPage.setSpecValidated}" title="#{bundle.requiredField}"/>
-                                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                            <span class="glyphicon glyphicon-question-sign text-muted"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestserver.newSetDialog.setdescription.tip']}"></span>
                                         </label>
                                         <div class="col-sm-8">
diff --git a/src/main/webapp/manage-guestbooks.xhtml b/src/main/webapp/manage-guestbooks.xhtml
index 42b1338c018..55f9058058a 100644
--- a/src/main/webapp/manage-guestbooks.xhtml
+++ b/src/main/webapp/manage-guestbooks.xhtml
@@ -179,7 +179,7 @@
                             <div class="form-group">
                                 <label class="col-sm-3 control-label">
                                     #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData']}
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData.title']}"></span>
                                 </label>
                                 <div class="col-sm-8">
diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index a33baedc9f0..6fc6bf870e0 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -21,7 +21,7 @@
                             <div class="form-group">
                                 <label for="metadata_persistentId" class="col-sm-3 control-label">
                                     #{bundle['dataset.metadata.persistentId']}
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.metadata.persistentId.tip']}"></span>
                                 </label>
                                 <div class="col-sm-9">
@@ -32,7 +32,7 @@
                             <div class="form-group">
                                 <label for="metadata_persistentId" class="col-sm-3 control-label">
                                     #{bundle['dataset.metadata.alternativePersistentId']}
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.metadata.alternativePersistentId.tip']}"></span>
                                 </label>
                                 <div class="col-sm-9">
@@ -43,7 +43,7 @@
                             <div class="form-group" jsf:rendered="#{!empty publicationDate}">
                                 <label for="metadata_publicationDate" class="col-sm-3 control-label">
                                     #{bundle['dataset.metadata.publicationDate']}
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.metadata.publicationDate.tip']}"></span>
                                 </label>
                                 <div class="col-sm-9">
@@ -55,7 +55,7 @@
                             <div class="form-group">
                                 <label for="metadata_#{dsf.datasetFieldType.name}" class="col-sm-3 control-label">
                                     #{dsf.datasetFieldType.localeTitle}
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
                                 </label>
                                 <!-- Primitive datasetFields -->
@@ -113,7 +113,7 @@
                                         <label for="metadata_#{dsf.datasetFieldType.name}" class="col-sm-3 control-label">
                                             #{dsf.datasetFieldType.localeTitle}
                                             <h:outputText styleClass="glyphicon glyphicon-asterisk text-danger" value="" rendered="#{dsf.required  or dsf.datasetFieldType.hasRequiredChildren }" />
-                                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                            <span class="glyphicon glyphicon-question-sign text-muted"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
                                         </label>
                                         <!-- Primitive fields -->
@@ -195,7 +195,7 @@
                                                                 <label class="control-label" for="metadata_#{subdsf.datasetFieldType.name}">
                                                                     #{subdsf.datasetFieldType.localeTitle}
                                                                     <h:outputText styleClass="glyphicon glyphicon-asterisk text-danger" value="" rendered="#{subdsf.required}" />
-                                                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{subdsf.datasetFieldType.localeDescription}"></span>
                                                                 </label>
                                                                 <ui:fragment rendered="#{!subdsf.datasetFieldType.controlledVocabulary}">
diff --git a/src/main/webapp/oauth2/firstLogin.xhtml b/src/main/webapp/oauth2/firstLogin.xhtml
index 29c669ce385..f8163c98681 100644
--- a/src/main/webapp/oauth2/firstLogin.xhtml
+++ b/src/main/webapp/oauth2/firstLogin.xhtml
@@ -36,7 +36,7 @@
                                 <label for="position" class="col-sm-3 control-label">
                                     #{bundle['user.username']} 
                                     <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.username.illegal.tip']}"></span>
                                 </label>
                                 <div class="col-sm-4">
@@ -53,7 +53,7 @@
                                 <label for="givenName" class="col-sm-3 control-label">
                                     #{bundle['user.firstName']} 
                                     <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.firstName.tip']}"></span>
                                 </label>
                                 <div class="col-sm-4">
@@ -65,7 +65,7 @@
                                 <label for="familyName" class="col-sm-3 control-label">
                                     #{bundle['user.lastName']} 
                                     <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.lastName.tip']}"></span>
                                 </label>
                                 <div class="col-sm-4">
@@ -77,7 +77,7 @@
                                 <label for="selectedEmail" class="col-sm-3 control-label">
                                     #{bundle['email']} 
                                     <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.email.tip']}"></span>
                                 </label>
                                 <div class="col-sm-4" jsf:rendered="#{OAuth2FirstLoginPage.getEmailsToPickFrom().size() lt 2}">
@@ -97,7 +97,7 @@
                             <div class="form-group" jsf:rendered="#{OAuth2FirstLoginPage.authProvider.displayIdentifier}">
                                 <label for="persistentUserId" class="col-sm-3 control-label">
                                     #{OAuth2FirstLoginPage.authProvider.persistentIdName}
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{OAuth2FirstLoginPage.authProvider.persistentIdDescription}"></span>
                                 </label>
                                 <div class="col-sm-4">
@@ -114,7 +114,7 @@
                                 <label for="affiliation" class="col-sm-3 control-label">
                                     #{bundle['affiliation']} 
                                     <span class="glyphicon text-danger" title="#{bundle.requiredField}"/>
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.affiliation.tip']}"></span>
                                 </label>
                                 <div class="col-sm-4">
@@ -125,7 +125,7 @@
                                 <label for="position" class="col-sm-3 control-label">
                                     #{bundle['user.position']} 
                                     <span class="glyphicon text-danger" title="#{bundle.requiredField}"/>
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.position.tip']}"></span>
                                 </label>
                                 <div class="col-sm-4">
diff --git a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
index a261db90ec8..7a130ede634 100644
--- a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
+++ b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
@@ -7,6 +7,7 @@ function bind_bsui_components(){
         $(this).hasClass('keep-open'),
         e.stopPropagation();
     });
+    
     // Collapse Header Icons
     $('div[id^="panelCollapse"]').on('shown.bs.collapse', function () {
       $(this).siblings('div.panel-heading').children('span.glyphicon').removeClass("glyphicon-chevron-down").addClass("glyphicon-chevron-up");
@@ -16,23 +17,23 @@ function bind_bsui_components(){
       $(this).siblings('div.panel-heading').children('span.glyphicon').removeClass("glyphicon-chevron-up").addClass("glyphicon-chevron-down");
     });
     
-    // rebind for dropdown menus on restrict button
+    // Button dropdown menus 
     $('.dropdown-toggle').dropdown();
     
     // Hide open tooltips + popovers
     $('.bootstrap-button-tooltip, [data-toggle="tooltip"]').tooltip("hide");
     $("[data-toggle='popover']").popover("hide");
 
-    // Tooltip + popover functionality
+    // Tooltips + popovers
     bind_tooltip_popover();
 
-    // Disabled
+    // Disabled pagination links
     disabledLinks();
     
     // Sharrre
     sharrre();
     
-    // Custom Popover with HTML code snippet -- from dataverse_template
+    // Custom Popover with HTML content
     popoverHTML();
     
     // Dialog Listener For Calling handleResizeDialog
@@ -184,7 +185,6 @@ function handleResizeDialog(dialog) {
         
         function calculateResize() {
             var overlay = $('#' + dialog + '_modal');
-            
             var bodyHeight = '';
             var bodyWidth = '';
         
@@ -201,7 +201,6 @@ function handleResizeDialog(dialog) {
             doc.css('width', bodyWidth);
             doc.css('height', bodyHeight);
             
-            
             var pos = el.offset();
             if (pos.top + el.height() > doc.height()) {
                     pos.top = doc.height() - el.height();
diff --git a/src/main/webapp/roles-edit.xhtml b/src/main/webapp/roles-edit.xhtml
index 18d73e77a2a..8386a9492d7 100644
--- a/src/main/webapp/roles-edit.xhtml
+++ b/src/main/webapp/roles-edit.xhtml
@@ -10,7 +10,7 @@
                     <div class="col-xs-6 form-group">
                         <label class="col-sm-3 control-label" for="roleName">
                             #{bundle['dataverse.permissions.roles.name']}
-                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                            <span class="glyphicon glyphicon-question-sign text-muted"
                                   data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataverse.permissions.roles.name.title']}"></span>
                         </label>
                         <div class="col-sm-9">
@@ -23,7 +23,7 @@
                     <div class="col-xs-6 form-group">
                         <label class="col-sm-3 control-label" for="roleName">
                             #{bundle['dataverse.permissions.roles.id']}
-                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                            <span class="glyphicon glyphicon-question-sign text-muted"
                                   data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataverse.permissions.roles.id.title']}"></span>
                         </label>
                         <div class="col-sm-9">
@@ -36,7 +36,7 @@
                     <div class="col-xs-6 form-group">
                         <label class="col-sm-3 control-label" for="roleName">
                            #{bundle.description}
-                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                            <span class="glyphicon glyphicon-question-sign text-muted"
                                   data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataverse.permissions.roles.description.title']}"></span>
                         </label>
                         <div class="col-sm-9">
diff --git a/src/main/webapp/search/advanced.xhtml b/src/main/webapp/search/advanced.xhtml
index 3e51dcf5d86..5ba1aa8e4fd 100644
--- a/src/main/webapp/search/advanced.xhtml
+++ b/src/main/webapp/search/advanced.xhtml
@@ -36,7 +36,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle.name}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.dataverses.name.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -46,7 +46,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle.identifier}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.identifier.title']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -56,7 +56,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle.affiliation}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.dataverses.affiliation.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -66,7 +66,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle.description}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.dataverses.description.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -76,7 +76,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle.subject}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.dataverses.subject.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -101,7 +101,7 @@
                                         <div class="form-group">
                                             <label class="col-sm-4 control-label">
                                                 #{item.displayName}
-                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                <span class="glyphicon glyphicon-question-sign text-muted"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{item.localeDescription}"></span>
                                             </label>
                                             <div class="col-sm-6">
@@ -119,7 +119,7 @@
                                         <div class="form-group">
                                             <label class="col-sm-4 control-label">
                                                 #{bundle['dataset.metadata.publicationYear']}
-                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                <span class="glyphicon glyphicon-question-sign text-muted"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.metadata.publicationYear.tip']}"></span>
                                             </label>
                                             <div class="col-sm-6">
@@ -129,7 +129,7 @@
                                         <div class="form-group">
                                             <label class="col-sm-4 control-label">
                                                 #{bundle['dataset.metadata.persistentId']}
-                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                <span class="glyphicon glyphicon-question-sign text-muted"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.metadata.persistentId.tip']}"></span>
                                             </label>
                                             <div class="col-sm-6">
@@ -149,7 +149,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle.name}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.name.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -159,7 +159,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle.description}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.description.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -169,7 +169,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle['advanced.search.files.fileType']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.fileType.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -179,7 +179,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle['advanced.search.files.persistentId']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.persistentId.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -189,7 +189,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle['advanced.search.files.variableName']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.variableName.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -199,7 +199,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle['advanced.search.files.variableLabel']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                        <span class="glyphicon glyphicon-question-sign text-muted"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.variableLabel.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml
index fc34f95682f..91e6b07f20b 100644
--- a/src/main/webapp/template.xhtml
+++ b/src/main/webapp/template.xhtml
@@ -73,7 +73,7 @@
                                 <label class="col-sm-2 control-label" for="templateName">
                                     #{bundle['dataset.manageTemplates.tab.header.templte']} 
                                     <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataset.template.name.title']}"></span>
                                 </label>
                                 <div class="col-sm-5">
diff --git a/src/main/webapp/termsofuse.xhtml b/src/main/webapp/termsofuse.xhtml
index d4252869bfd..0b1e232fb4c 100644
--- a/src/main/webapp/termsofuse.xhtml
+++ b/src/main/webapp/termsofuse.xhtml
@@ -7,7 +7,7 @@
     <div class="form-group">
         <label for="position" class="col-sm-3 control-label">
             #{bundle['user.acccountterms']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+            <span class="glyphicon glyphicon-question-sign text-muted"
                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.acccountterms.tip']}"></span>
         </label>
         <div class="col-sm-9">
diff --git a/src/main/webapp/themeAndWidgetsFragment.xhtml b/src/main/webapp/themeAndWidgetsFragment.xhtml
index 21086660219..8c358532247 100644
--- a/src/main/webapp/themeAndWidgetsFragment.xhtml
+++ b/src/main/webapp/themeAndWidgetsFragment.xhtml
@@ -14,7 +14,7 @@
                         <div class="form-group" jsf:rendered="#{themeWidgetFragment.editDv.owner!=null}">
                             <label class="col-sm-3 control-label" for="inheritCustomization">
                                 #{bundle['dataverse.theme.inheritCustomization.label']}
-                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                <span class="glyphicon glyphicon-question-sign text-muted"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.inheritCustomization.title']}"></span>
                             </label>
                             <div class="col-sm-9">
@@ -35,7 +35,7 @@
                         <div class="form-group" jsf:rendered="#{themeWidgetFragment.editDv.themeRoot}">
                             <label class="col-sm-3 control-label" for="logoFormat">
                                 #{bundle['dataverse.theme.logo.image']}
-                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                <span class="glyphicon glyphicon-question-sign text-muted"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.logo.image.title']}"></span>
                             </label>
                             <div class="col-sm-9">
@@ -59,7 +59,7 @@
                                     <div class="form-col-container col-sm-4">
                                         <label for="logoFormat" class="control-label">
                                             #{bundle['dataverse.theme.logo.format']}
-                                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                            <span class="glyphicon glyphicon-question-sign text-muted"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.logo.format.title']}"></span>
                                         </label>
                                         <div>
@@ -75,7 +75,7 @@
                                         <div class="form-col-container col-sm-3">
                                             <label for="logoAlignment" class="control-label">
                                                 #{bundle['dataverse.theme.logo.alignment']}
-                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                <span class="glyphicon glyphicon-question-sign text-muted"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.logo.alignment.title']}"></span>
                                             </label>
                                             <div>
@@ -90,7 +90,7 @@
                                         <div class="form-col-container col-sm-4">
                                             <label for="logoBackgroundColor" class="control-label">
                                                 #{bundle['dataverse.theme.logo.backColor']}
-                                                <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                                <span class="glyphicon glyphicon-question-sign text-muted"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.logo.backColor.title']}"></span>
                                             </label>
                                             <div>
@@ -108,14 +108,14 @@
                             <div class="form-group">
                                 <label class="col-sm-3 control-label">
                                     #{bundle['dataverse.theme.headerColor']}
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.headerColor.tip']}"></span>
                                 </label>
                                 <div class="form-group col-sm-9">
                                     <div class="form-col-container col-sm-4">
                                         <label for="backgroundColor" class="control-label">
                                             #{bundle['dataverse.theme.backColor']}
-                                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                            <span class="glyphicon glyphicon-question-sign text-muted"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.backColor.title']}"></span>
                                         </label>
                                         <div>
@@ -126,7 +126,7 @@
                                     <div class="form-col-container col-sm-4">
                                         <label for="linkColor" class="control-label">
                                             #{bundle['dataverse.theme.linkColor']}
-                                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                            <span class="glyphicon glyphicon-question-sign text-muted"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.linkColor.title']}"></span>
                                         </label>
                                         <div>
@@ -137,7 +137,7 @@
                                     <div class="form-col-container col-sm-4">
                                         <label for="textColor" class="control-label">
                                             #{bundle['dataverse.theme.txtColor']}
-                                            <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                            <span class="glyphicon glyphicon-question-sign text-muted"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.txtColor.title']}"></span>
                                         </label>
                                         <div>
@@ -150,7 +150,7 @@
                             <div class="form-group">
                                 <label class="col-sm-3 control-label" for="tagline">
                                     #{bundle['dataverse.theme.tagline']}
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.tagline.title']}"></span>
                                 </label>
                                 <h:inputHidden id="linkAndUrl" value="true">
@@ -167,7 +167,7 @@
                             <div class="form-group">
                                 <label class="col-sm-3 control-label" for="website">
                                     #{bundle['dataverse.theme.website']}
-                                    <span class="glyphicon glyphicon-question-sign text-muted tooltiplabel"
+                                    <span class="glyphicon glyphicon-question-sign text-muted"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.website.title']}"></span>
                                 </label>
                                 <div class="col-sm-6">

From 26521c0d6460f83553b37fe09e0a36ae8087e58b Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Fri, 1 Mar 2019 16:36:32 -0500
Subject: [PATCH 16/22] Removed info-sign icon from help-block msgs [ref #3925]

---
 src/main/webapp/dashboard.xhtml               |  3 +--
 src/main/webapp/dataset-citation.xhtml        |  2 +-
 src/main/webapp/dataset-versions.xhtml        |  3 +--
 src/main/webapp/dataset-widgets.xhtml         |  8 +++----
 src/main/webapp/dataset.xhtml                 | 19 ++++++++--------
 src/main/webapp/dataverse.xhtml               | 17 +++++++-------
 src/main/webapp/dataverseuser.xhtml           | 11 ++++------
 src/main/webapp/editFilesFragment.xhtml       | 22 +++++++++----------
 .../webapp/explicitGroup-new-dialog.xhtml     |  2 +-
 .../webapp/file-download-popup-fragment.xhtml |  2 +-
 .../file-request-access-popup-fragment.xhtml  |  2 +-
 src/main/webapp/file-versions.xhtml           |  3 +--
 src/main/webapp/file.xhtml                    |  9 ++++----
 src/main/webapp/filesFragment.xhtml           |  4 ++--
 src/main/webapp/harvestclients.xhtml          |  3 +--
 src/main/webapp/harvestsets.xhtml             |  3 +--
 src/main/webapp/loginpage.xhtml               | 10 ++++-----
 src/main/webapp/metadataFragment.xhtml        |  6 ++---
 src/main/webapp/mydata_fragment.xhtml         |  2 +-
 src/main/webapp/oauth2/convert.xhtml          |  1 -
 src/main/webapp/oauth2/firstLogin.xhtml       |  3 +--
 .../package-download-popup-fragment.xhtml     |  5 ++---
 .../webapp/permissions-manage-files.xhtml     |  6 ++---
 src/main/webapp/permissions-manage.xhtml      |  6 ++---
 src/main/webapp/roles-assign.xhtml            |  2 +-
 src/main/webapp/search-include-fragment.xhtml |  2 +-
 src/main/webapp/subset/gui_subset.xhtml       |  3 +--
 src/main/webapp/themeAndWidgetsFragment.xhtml |  6 ++---
 28 files changed, 72 insertions(+), 93 deletions(-)

diff --git a/src/main/webapp/dashboard.xhtml b/src/main/webapp/dashboard.xhtml
index f81b0354f24..8128c3168fe 100644
--- a/src/main/webapp/dashboard.xhtml
+++ b/src/main/webapp/dashboard.xhtml
@@ -91,8 +91,7 @@
                                     <div class="row text-left">
                                         <div class="col-xs-12">
                                             <p class="help-block">
-                                                <span class="glyphicon glyphicon-info-sign"/>
-                                                <h:outputFormat value=" #{bundle['dashboard.card.metadataexport.message']}" escape="false">
+                                                <h:outputFormat value="#{bundle['dashboard.card.metadataexport.message']}" escape="false">
                                                     <f:param value="#{dataverseServiceBean.findRootDataverse().displayName}"/>
                                                     <f:param value="&lt;a href=&#34;#{systemConfig.guidesBaseUrl}/#{systemConfig.guidesVersion}/api&#34; target=&#34;_blank&#34;&gt;"/>
                                                     <f:param value="&lt;/a&gt;"/>
diff --git a/src/main/webapp/dataset-citation.xhtml b/src/main/webapp/dataset-citation.xhtml
index 2d1fac390c9..0458c38f0c1 100644
--- a/src/main/webapp/dataset-citation.xhtml
+++ b/src/main/webapp/dataset-citation.xhtml
@@ -44,7 +44,7 @@
                             </li>
                         </ul>
                     </div>
-                    <div class="small text-muted text-right citation-standards"><span class="glyphicon glyphicon-info-sign"></span> <h:outputText value=" #{bundle['dataset.cite.standards.tip']}" escape="false"/></div>
+                    <div class="small text-muted text-right citation-standards"><h:outputText value="#{bundle['dataset.cite.standards.tip']}" escape="false"/></div>
                 </div>
             </div>
         </div>
diff --git a/src/main/webapp/dataset-versions.xhtml b/src/main/webapp/dataset-versions.xhtml
index 1708372bde2..fb37cff8ff6 100644
--- a/src/main/webapp/dataset-versions.xhtml
+++ b/src/main/webapp/dataset-versions.xhtml
@@ -10,8 +10,7 @@
 
 <ui:fragment rendered="#{widgetWrapper.widgetView}">
     <p class="help-block">
-        <span class="glyphicon glyphicon-info-sign"/>
-        <h:outputFormat value=" #{bundle['file.dataFilesTab.versions.widget.viewMoreInfo']}" escape="false">
+        <h:outputFormat value="#{bundle['file.dataFilesTab.versions.widget.viewMoreInfo']}" escape="false">
             <f:param value="#{DatasetPage.dataset.globalIdString}"/>
             <f:param value="#{DatasetPage.dataset.displayName}"/>
             <f:param value="#{dataverseServiceBean.findRootDataverse().displayName}"/>
diff --git a/src/main/webapp/dataset-widgets.xhtml b/src/main/webapp/dataset-widgets.xhtml
index bdbff04cb42..2e4f3bbbd04 100644
--- a/src/main/webapp/dataset-widgets.xhtml
+++ b/src/main/webapp/dataset-widgets.xhtml
@@ -32,8 +32,8 @@
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.title']}"></span>
                                 </label>
                                 <div class="col-sm-9">
-                                    <p class="help-block"><span class="glyphicon glyphicon-info-sign"/>               
-                                        <h:outputFormat value=" #{bundle['dataset.thumbnailsAndWidget.thumbnailImage.tip']}" escape="false">
+                                    <p class="help-block">
+                                        <h:outputFormat value="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.tip']}" escape="false">
                                             <f:param value="#{systemConfig.uploadLogoSizeLimit/1000}"/>
                                         </h:outputFormat>
                                     </p>
@@ -149,8 +149,8 @@
                         </div>
 
                         <ui:fragment rendered="#{DatasetWidgetsPage.dataset.released}">
-                            <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> 
-                                <h:outputFormat value=" #{bundle['dataset.widgets.tip']}" escape="false">
+                            <p class="help-block">
+                                <h:outputFormat value="#{bundle['dataset.widgets.tip']}" escape="false">
                                     <f:param value="#{systemConfig.guidesBaseUrl}"/>
                                     <f:param value="#{systemConfig.guidesVersion}"/>
                                 </h:outputFormat>
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index a983e5526cb..395830f5b17 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -303,7 +303,7 @@
                                 </p:commandLink>
                             </div>
                             <p:dialog id="shareDialog" header="#{bundle['dataset.share.datasetShare']}" widgetVar="shareDialog" modal="true" rendered="#{!DatasetPage.workingVersion.deaccessioned}">
-                                <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataset.share.datasetShare.tip']}</p>
+                                <p class="help-block">#{bundle['dataset.share.datasetShare.tip']}</p>
 
                                 <div id="sharrre-widget" data-url="#{DatasetPage.dataverseSiteUrl}/dataset.xhtml?persistentId=#{dataset.globalId}" data-text="#{bundle['dataset.share.datasetShare.shareText']}"></div>
 
@@ -412,8 +412,7 @@
                                             <div class="col-sm-9" jsf:rendered="#{dsf.datasetFieldType.compound}">
                                                 <ui:fragment rendered="#{dsf.datasetFieldType.name == 'datasetContact'}">
                                                     <p class="help-block">
-                                                        <span class="glyphicon glyphicon-info-sign"/>
-                                                        <h:outputText value=" #{bundle['dataset.contact.tip']}"/>
+                                                        <h:outputText value="#{bundle['dataset.contact.tip']}"/>
                                                     </p>
                                                 </ui:fragment>
                                                 <ui:repeat value="#{dsf.datasetFieldCompoundValues}" var="compoundValue">
@@ -462,7 +461,7 @@
                             </label>
                             <div class="col-sm-6">
                                 <p class="help-block">
-                                    <span class="glyphicon glyphicon-info-sign"/> #{bundle['dataset.template.tip']}
+                                    #{bundle['dataset.template.tip']}
                                 </p>
                                 <p:selectOneMenu value="#{DatasetPage.selectedTemplate}" onchange="updateTemplate()"
                                                  converter="templateConverter" id="select_DatasetTemplate" styleClass="form-control"
@@ -669,7 +668,7 @@
                     <p:dialog styleClass="smallPopUp" header="#{bundle['dataset.inValidSelectedFilesForDownload']}" widgetVar="downloadInvalid" modal="true">
                         <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noValidSelectedFilesForDownload']}</p>
                         <ui:fragment rendered="#{DatasetPage.dataset.fileAccessRequest}">
-                            <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataset.requestAccessToRestrictedFiles']}</p>
+                            <p class="help-block">#{bundle['dataset.requestAccessToRestrictedFiles']}</p>
                         </ui:fragment>
                         <div class="button-block">
                             <p:commandButton value="#{bundle.close}" onclick="PF('downloadInvalid').hide();" type="button" />
@@ -685,7 +684,7 @@
                             </ui:repeat>
                         </table>
                         <div class="button-block">
-                            <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataset.downloadUnrestricted']}</p>
+                            <p class="help-block">#{bundle['dataset.downloadUnrestricted']}</p>
                             <ui:fragment rendered="#{!DatasetPage.downloadPopupRequired}">
                                 <p:commandButton value="#{bundle.continue}" onclick="PF('downloadMixed').hide()" action="#{DatasetPage.startMultipleFileDownload()}" />
                             </ui:fragment>
@@ -712,7 +711,7 @@
                     </p:dialog>
                     <p:dialog id="privateUrlId" styleClass="smallPopUp" header="#{bundle['dataset.privateurl.header']}" widgetVar="privateUrlConfirmation" modal="true">
                         <p:fragment id="privateUrlPanel" rendered="#{DatasetPage.userCanCreatePrivateURL}">
-                            <p class="help-block"><span class="glyphicon glyphicon-info-sign"/>&#160;
+                            <p class="help-block">
                                 <h:outputFormat value="#{bundle['dataset.privateurl.tip']}" escape="false">
                                     <f:param value="#{systemConfig.guidesBaseUrl}"/>
                                     <f:param value="#{systemConfig.guidesVersion}"/>
@@ -1062,7 +1061,7 @@
                     <!-- p:remoteCommand  name="openEditFilesPageCommand" action=" {DatasetPage.editFileMetadata()}"  / -->
 
                     <p:dialog id="fileTagsPopup" styleClass="smallPopUp" header="#{bundle['file.editTags']}" widgetVar="fileTagsPopup" modal="true">
-                        <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['file.editTagsDialog.tip']}</p>
+                        <p class="help-block">#{bundle['file.editTagsDialog.tip']}</p>
                         <div class="form-horizontal" jsf:rendered="#{!(empty DatasetPage.selectedFiles)}">
                             <div class="form-group text-left">
                                 <label for="selectedTagsList" class="col-sm-4 control-label">
@@ -1382,7 +1381,7 @@
                             <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.datasetPublishCustomText)}" escape="false"/>
                         </div>
                         <p class="help-block">
-                            <span class="glyphicon glyphicon-info-sign"/> #{bundle['dataset.publishBoth.tip']}
+                            #{bundle['dataset.publishBoth.tip']}
                         </p>
                         <div class="button-block">
                             <p:commandButton value="#{bundle['dataset.mayNotBePublished.both.button']}" onclick="PF('publishParent').hide();
@@ -1400,7 +1399,7 @@
                         </div>
                         <ui:fragment rendered="#{DatasetPage.dataset.latestVersion.minorUpdate}">
                             <p class="help-block">
-                                <span class="glyphicon glyphicon-info-sign"/> #{bundle['dataset.selectVersionNumber']}
+                                #{bundle['dataset.selectVersionNumber']}
                             </p>
                             <p:selectOneRadio id="options" value="#{DatasetPage.releaseRadio}">
                                 <f:selectItem itemLabel="#{bundle['dataset.minorRelease']} (#{DatasetPage.datasetNextMinorVersion})" itemValue="1" />
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 94b861ba999..6ea78e062db 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -177,8 +177,7 @@
                                 </label>
                                 <div class="col-sm-9 form-col-container">
                                     <p class="help-block">
-                                        <span class="glyphicon glyphicon-info-sign"/>
-                                        <h:outputFormat value=" #{bundle.htmlAllowedMsg}" escape="false">
+                                        <h:outputFormat value="#{bundle.htmlAllowedMsg}" escape="false">
                                             <f:param value="#{bundle.htmlAllowedTags}"/>
                                         </h:outputFormat>
                                     </p>
@@ -203,7 +202,7 @@
                                 <div class="col-sm-12 form-group">
                                     <label class="col-sm-3 control-label" for="mdbSelect">#{bundle['dataverse.metadataElements']}</label>
                                     <div class="col-sm-9">
-                                        <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.metadataElements.tip']}</p>
+                                        <p class="help-block">#{bundle['dataverse.metadataElements.tip']}</p>
 
                                         <label class="metadata-blocks-default" for="metadataRoot" jsf:rendered="#{DataversePage.dataverse.owner != null}">
                                             <h:selectBooleanCheckbox id="metadataRoot" tabindex="7" styleClass="metadata-blocks-default"
@@ -314,7 +313,7 @@
                                 <div class="col-sm-12 form-group">
                                     <label class="col-sm-3 control-label" for="facetPickListCreate">#{bundle['dataverse.facetPickList.text']}</label>
                                     <div class="col-sm-9">
-                                        <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.facetPickList.tip']}</p>
+                                        <p class="help-block">#{bundle['dataverse.facetPickList.tip']}</p>
 
                                         <label class="metadata-blocks-default" for="facetsRoot" jsf:rendered="#{DataversePage.dataverse.owner != null}">
                                             <h:selectBooleanCheckbox id="facetsRoot" tabindex="8" styleClass="facets-blocks-default"
@@ -486,7 +485,7 @@
                                 </p:commandLink>
                             </div>
                             <p:dialog id="shareDialog" header="#{bundle['dataverse.share.dataverseShare']}" widgetVar="shareDialog" modal="true">
-                                <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.share.dataverseShare.tip']}</p>
+                                <p class="help-block">#{bundle['dataverse.share.dataverseShare.tip']}</p>
 
                                 <div id="sharrre-widget" data-url="#{systemConfig.dataverseSiteUrl}/dataverse/#{DataversePage.dataverse.alias}" data-text="#{bundle['dataverse.share.dataverseShare.shareText']}"></div>
 
@@ -581,7 +580,7 @@
                     <p:dialog id="browseOptsForm" header="#{bundle['dataverse.option.featuredDataverse']}" widgetVar="browseOptsForm" modal="true">
                         <ui:fragment rendered="#{!empty DataversePage.featuredDataverses.source or !empty DataversePage.featuredDataverses.target}">
                         <div class="form-group">
-                            <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.selectToFeature']}</p>
+                            <p class="help-block">#{bundle['dataverse.selectToFeature']}</p>
                             <p:pickList id="featuredDataverseList" value="#{DataversePage.featuredDataverses}" var="featureddataverse"
                                         itemLabel="#{featureddataverse.name}"
                                         itemValue="#{featureddataverse}" converter="dataverseConverter"
@@ -644,10 +643,10 @@
                 <p:dialog id="linkDataverseForm" header="#{DataversePage.linkMode == 'SAVEDSEARCH' ? bundle['dataverse.savedsearch.link'] : bundle['dataverse.link']}" widgetVar="linkDataverseForm" modal="true">
                     <h:form styleClass="form-horizontal" rendered="#{DataversePage.dataversesForLinking.size() > 1}">
                         <ui:fragment rendered="#{DataversePage.linkMode == 'LINKDATAVERSE'}">
-                            <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.link.dataverse.choose']}</p>
+                            <p class="help-block">#{bundle['dataverse.link.dataverse.choose']}</p>
                         </ui:fragment>
                         <ui:fragment rendered="#{DataversePage.linkMode == 'SAVEDSEARCH'}">
-                            <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.savedsearch.dataverse.choose']}</p>
+                            <p class="help-block">#{bundle['dataverse.savedsearch.dataverse.choose']}</p>
                         </ui:fragment>
                         <div class="form-group">
                             <label class="col-sm-4 control-label">
@@ -708,7 +707,7 @@
                         </div>
                     </h:form>
                     <ui:fragment rendered="#{DataversePage.dataversesForLinking.size() == 1}">
-                        <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.link.no.choice']}</p>
+                        <p class="help-block">#{bundle['dataverse.link.no.choice']}</p>
                         <div class="form-horizontal">
                             <div class="form-group">
                                 <label class="col-sm-4 control-label">
diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index abea53f3baf..adb6cd8a8ef 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -334,8 +334,7 @@
                                 <div class="form-group" jsf:rendered="#{not DataverseUserPage.accountDetailsEditable}">
                                     <div class="col-sm-12">
                                         <p class="help-block">
-                                            <span class="glyphicon glyphicon-info-sign"/>
-                                            <h:outputText value=" #{bundle['user.isShibUser']}" />
+                                            <h:outputText value="#{bundle['user.isShibUser']}" />
                                             <h:outputText value=" #{bundle['user.helpShibUserMigrateOffShibBeforeLink']} " />
                                             <p:commandLink value="#{settingsWrapper.supportTeamName}" oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}">
                                                 <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
@@ -350,8 +349,7 @@
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.userAuthProvider.OAuthProvider}">
                                     <div class="col-sm-12">
                                         <p class="help-block">
-                                            <span class="glyphicon glyphicon-info-sign"/>
-                                            <h:outputFormat value=" #{bundle['user.helpOAuthBeforeLink']} ">
+                                            <h:outputFormat value="#{bundle['user.helpOAuthBeforeLink']} ">
                                                 <f:param value="#{DataverseUserPage.userAuthProvider.info.title}"/>
                                             </h:outputFormat>
                                             <p:commandLink value="#{settingsWrapper.supportTeamName}" oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}">
@@ -453,7 +451,6 @@
                         </p:tab>
                         <p:tab id="apiTokenTab" title="#{bundle['apitoken.title']}">
                             <p class="help-block">
-                                <span class="glyphicon glyphicon-info-sign"/>&#160;
                                 <h:outputFormat value="#{bundle['apitoken.message']}" escape="false">
                                     <f:param value="&lt;a href=&#34;#{systemConfig.guidesBaseUrl}/#{systemConfig.guidesVersion}/api&#34; target=&#34;_blank&#34;&gt;"/>
                                     <f:param value="&lt;/a&gt;"/>
@@ -481,7 +478,7 @@
                         </p:tab>
                         <ui:remove>
                             <p:tab id="groupsRoles" title="#{bundle['header.user.selectTab.groupsAndRoles']}">
-                                <span class="glyphicon glyphicon-info-sign"></span> #{bundle['groupAndRoles.manageTips']}
+                                #{bundle['groupAndRoles.manageTips']}
                             </p:tab>
                         </ui:remove>
                     </p:tabView>
@@ -490,7 +487,7 @@
                         <p:tab id="accountInfoEdit" title="#{bundle['account.info']}">
                             <ui:fragment rendered="#{DataverseUserPage.editMode == 'CREATE' and DataverseUserPage.nonLocalLoginEnabled}">
                                 <p class="help-block">
-                                    <span class="glyphicon glyphicon-info-sign"/> <h:outputText value=" #{bundle['user.signup.otherLogInOptions.tip']}" escape="false"/>
+                                    <h:outputText value="#{bundle['user.signup.otherLogInOptions.tip']}" escape="false"/>
                                 </p>
                             </ui:fragment>
                             <div class="form-horizontal">
diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index e338f1f68a5..656cd620781 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -66,15 +66,14 @@
                             </div>
                             <div class="panel-body" jsf:id="contentOfHttpPanel" jsf:rendered="#{!EditDatafilesPage.workingVersion.hasPackageFile}">
                                 <p class="help-block">
-                                    <span class="glyphicon glyphicon-info-sign"/>
+                                    <h:outputFormat value="#{bundle['file.selectToAdd.tipMoreInformation']}" escape="false">
+                                        <f:param value="#{systemConfig.guidesBaseUrl}"/>
+                                        <f:param value="#{systemConfig.guidesVersion}"/>
+                                    </h:outputFormat>
                                     <h:outputFormat value=" #{bundle['file.selectToAdd.tipLimit']}" escape="false" 
                                                     rendered="#{systemConfig.maxFileUploadSize !=null and !empty systemConfig.maxFileUploadSize}">
                                         <f:param value="#{systemConfig.humanMaxFileUploadSize}"/>
                                     </h:outputFormat>
-                                    <h:outputFormat value=" #{bundle['file.selectToAdd.tipMoreInformation']}" escape="false">
-                                        <f:param value="#{systemConfig.guidesBaseUrl}"/>
-                                        <f:param value="#{systemConfig.guidesVersion}"/>
-                                    </h:outputFormat>
                                 </p>
                     
                     <script>
@@ -140,7 +139,7 @@
                                 
                                 <div jsf:id="dropboxBlock" jsf:rendered="#{settingsWrapper.isHasDropBoxKey() and !lockedFromEdits }"  class="margin-top">
                                     <!-- Dropbox upload widget -->
-                                    <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['file.fromDropbox.tip']}</p>
+                                    <p class="help-block">#{bundle['file.fromDropbox.tip']}</p>
                                     <h:inputText id="dropBoxSelectionInput" style="display:none" value="#{EditDatafilesPage.dropBoxSelection}"/>
                                     <p:commandButton id="dropBoxButton" actionListener="#{EditDatafilesPage.handleDropBoxUpload}" oncomplete="javascript:dropBoxUploadFinished();" update="@none" style="display:none;" />
                                     <p:commandButton id="dropBoxUserButton" disabled="#{!(datasetPage || EditDatafilesPage.showFileUploadComponent())}" value="#{bundle['file.fromDropbox']}" onclick="openDropboxChooser();" icon="dropin-btn-status" />
@@ -163,7 +162,7 @@
                                 <ui:fragment rendered="#{createDataset}">
                                     <ui:fragment rendered="#{empty EditDatafilesPage.fileMetadatas}">
                                         <p class="help-block">
-                                            <span class="glyphicon glyphicon-info-sign"/> #{bundle['file.createUploadDisabled']}
+                                            #{bundle['file.createUploadDisabled']}
                                         </p>
                                     </ui:fragment>
                                     <ui:fragment rendered="#{!empty EditDatafilesPage.fileMetadatas}">
@@ -176,8 +175,7 @@
                                     <!-- NO RSYNC/PACKAGE FILE YET. PROVIDE INSTRUCTIONS: DOWNLOAD TO UPLOAD. -->
                                     <ui:fragment rendered="#{empty EditDatafilesPage.fileMetadatas and EditDatafilesPage.isHasRsyncScript()}">
                                         <p class="help-block">
-                                            <span class="glyphicon glyphicon-info-sign"></span>
-                                            <h:outputFormat value=" #{bundle['file.rsyncUpload.info']}" escape="false">
+                                            <h:outputFormat value="#{bundle['file.rsyncUpload.info']}" escape="false">
                                                 <f:param value="#{systemConfig.guidesBaseUrl}"/>
                                                 <f:param value="#{systemConfig.guidesVersion}"/>
                                             </h:outputFormat>
@@ -594,7 +592,7 @@
                     #{bundle['file.spss-savEncoding']}
                 </label>
                 <div class="col-sm-8">
-                    <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['file.spss-savEncoding.title']}</p>
+                    <p class="help-block">#{bundle['file.spss-savEncoding.title']}</p>
                     <p class="form-control-static"><h:outputText id="selectedEncoding" value="#{bundle['file.spss-savEncoding.current']} #{EditDatafilesPage.ingestLanguageEncoding}"/></p>
                     <p:tieredMenu id="spssSavEncodingLanguage" styleClass="form-control">
                         <p:submenu label="#{bundle['editfilesfragment.mainlabel']}">
@@ -756,7 +754,7 @@
                     #{bundle['file.spss-porExtraLabels']}
                 </label>
                 <div class="col-sm-8">
-                    <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['file.spss-porExtraLabels.title']}</p>
+                    <p class="help-block">#{bundle['file.spss-porExtraLabels.title']}</p>
                     <p:growl id="messageForLabelsFileUpload" showDetail="true" />
                     <p:fileUpload id="labelsFileUpload" label="#{bundle['file.spss-porExtraLabels.selectToAddBtn']}" update="messageForLabelsFileUpload" mode="advanced" auto="true" fileUploadListener="#{EditDatafilesPage.handleLabelsFileUpload}"/>
                 </div>
@@ -799,7 +797,7 @@
     </p:dialog>
     <ui:include rendered="#{systemConfig.provCollectionEnabled}" src="provenance-popups-fragment.xhtml"/>
     <p:dialog id="editFileTagsPopup" styleClass="smallPopUp" header="#{bundle['file.editTags']}" widgetVar="editFileTagsPopup" modal="true">
-        <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['file.editTagsDialog.tip']}</p>
+        <p class="help-block">#{bundle['file.editTagsDialog.tip']}</p>
 
         <div class="form-horizontal" jsf:rendered="#{!(empty EditDatafilesPage.fileMetadataSelectedForTagsPopup)}">
             <div class="form-group text-left">
diff --git a/src/main/webapp/explicitGroup-new-dialog.xhtml b/src/main/webapp/explicitGroup-new-dialog.xhtml
index 845693d69f3..406702fc97e 100644
--- a/src/main/webapp/explicitGroup-new-dialog.xhtml
+++ b/src/main/webapp/explicitGroup-new-dialog.xhtml
@@ -12,7 +12,7 @@
         </p:fragment>
         <p:fragment id="explicitGroupNewDialogContent">
             <div class="form-horizontal">
-                <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.permissions.explicitGroupEditDialog.help']}</p>
+                <p class="help-block">#{bundle['dataverse.permissions.explicitGroupEditDialog.help']}</p>
                 <div class="form-group">
                     <label for="explicitGroupName" class="col-sm-3 control-label">
                         #{bundle['dataverse.permissions.explicitGroupEditDialog.groupName']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
diff --git a/src/main/webapp/file-download-popup-fragment.xhtml b/src/main/webapp/file-download-popup-fragment.xhtml
index a3c0d5e8e56..a2d9ad9a569 100644
--- a/src/main/webapp/file-download-popup-fragment.xhtml
+++ b/src/main/webapp/file-download-popup-fragment.xhtml
@@ -11,7 +11,7 @@
 
         <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
         <p class="help-block">
-            <span class="glyphicon glyphicon-info-sign"/> #{bundle['file.downloadDialog.tip']}
+            #{bundle['file.downloadDialog.tip']}
         </p>
         <p:fragment id="guestbookMessages">
             <div class="container messagePanel">
diff --git a/src/main/webapp/file-request-access-popup-fragment.xhtml b/src/main/webapp/file-request-access-popup-fragment.xhtml
index 78383f7dd24..573b22fee8b 100644
--- a/src/main/webapp/file-request-access-popup-fragment.xhtml
+++ b/src/main/webapp/file-request-access-popup-fragment.xhtml
@@ -11,7 +11,7 @@
 
         <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
         <p class="help-block">
-            <span class="glyphicon glyphicon-info-sign"/> #{bundle['file.requestAccessTermsDialog.tip']}
+            #{bundle['file.requestAccessTermsDialog.tip']}
         </p>
         
         <div class="form-horizontal">
diff --git a/src/main/webapp/file-versions.xhtml b/src/main/webapp/file-versions.xhtml
index 3736dec27a3..e1a07f7ac6e 100644
--- a/src/main/webapp/file-versions.xhtml
+++ b/src/main/webapp/file-versions.xhtml
@@ -10,8 +10,7 @@
 
 <ui:fragment rendered="#{widgetWrapper.widgetView}">
     <p class="help-block">
-        <span class="glyphicon glyphicon-info-sign"/>
-        <h:outputFormat value=" #{bundle['file.dataFilesTab.versions.widget.viewMoreInfo']}" escape="false">
+        <h:outputFormat value="#{bundle['file.dataFilesTab.versions.widget.viewMoreInfo']}" escape="false">
             <f:param value="#{FilePage.fileMetadata.datasetVersion.dataset.globalIdString}"/>
             <f:param value="#{FilePage.fileMetadata.datasetVersion.dataset.displayName}"/>
             <f:param value="#{dataverseServiceBean.findRootDataverse().displayName}"/>
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index ad8aba129d6..8c7cac466b1 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -61,7 +61,7 @@
                                     </p:commandLink>
                                 </div>
                                 <p:dialog id="shareDialog" header="#{bundle['dataset.share.datasetShare']}" widgetVar="shareDialog" modal="true"  rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
-                                    <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataset.share.datasetShare.tip']}</p>
+                                    <p class="help-block">#{bundle['dataset.share.datasetShare.tip']}</p>
 
                                         <div id="sharrre-widget" data-url="#{systemConfig.dataverseSiteUrl}/dataset.xhtml?persistentId=#{FilePage.fileMetadata.datasetVersion.dataset.globalIdString}" data-text="#{bundle['dataset.share.datasetShare.shareText']}"></div>
 
@@ -270,7 +270,7 @@
                                                         </li>
                                                     </ul>
                                                 </div>
-                                                <div class="small text-muted text-right citation-standards"><span class="glyphicon glyphicon-info-sign"></span> <h:outputText value=" #{bundle['dataset.cite.standards.tip']}" escape="false"/></div>
+                                                <div class="small text-muted text-right citation-standards"><h:outputText value="#{bundle['dataset.cite.standards.tip']}" escape="false"/></div>
                                             </div>
                                         </div>
                                     </div>
@@ -315,7 +315,7 @@
                                                         </li>
                                                     </ul>
                                                 </div>
-                                                <div class="small text-muted text-right citation-standards"><span class="glyphicon glyphicon-info-sign"></span> <h:outputText value=" #{bundle['dataset.cite.standards.tip']}" escape="false"/></div>
+                                                <div class="small text-muted text-right citation-standards"><h:outputText value="#{bundle['dataset.cite.standards.tip']}" escape="false"/></div>
                                             </div>
                                             <!-- END: Cite Data Button -->
                                         </div>
@@ -439,8 +439,7 @@
                                                 </label>
                                                 <div class="col-sm-9">
                                                     <p class="help-block">
-                                                        <span class="glyphicon glyphicon-info-sign"></span>
-                                                        <h:outputFormat value=" #{bundle['file.metadataTab.fileMetadata.downloadUrl.info']}" escape="false">
+                                                        <h:outputFormat value="#{bundle['file.metadataTab.fileMetadata.downloadUrl.info']}" escape="false">
                                                             <f:param value="#{systemConfig.guidesBaseUrl}"/>
                                                             <f:param value="#{systemConfig.guidesVersion}"/>
                                                         </h:outputFormat>
diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
index 9912cb27e3a..2c0bebc6ed0 100644
--- a/src/main/webapp/filesFragment.xhtml
+++ b/src/main/webapp/filesFragment.xhtml
@@ -36,8 +36,8 @@
                 <!-- Cloud Storage Access -->
                 <div class="form-group col-xs-12 text-left">
                     <div class="col-xs-12">
-                        <p class="help-block text-muted"><span class="glyphicon glyphicon-info-sign"/> 
-                            <h:outputFormat value=" #{bundle['file.cloudStorageAccess.help']}" escape="false">
+                        <p class="help-block">
+                            <h:outputFormat value="#{bundle['file.cloudStorageAccess.help']}" escape="false">
                                 <f:param value="#{systemConfig.guidesBaseUrl}"/>
                                 <f:param value="#{systemConfig.guidesVersion}"/>
                                 <f:param value="#{DatasetPage.cloudEnvironmentName}"/>
diff --git a/src/main/webapp/harvestclients.xhtml b/src/main/webapp/harvestclients.xhtml
index 7b8bd94d6e8..b176a2e11bd 100644
--- a/src/main/webapp/harvestclients.xhtml
+++ b/src/main/webapp/harvestclients.xhtml
@@ -160,7 +160,6 @@
                         </p>
                         <!-- TODO: We probably don't need this extra text anymore - let's review
                           p class="help-block">
-                            <span class="glyphicon glyphicon-info-sign"/>
                             <h:outputFormat value=" _{bundle['harvestclients.tab.header.action.btn.delete.dialog.tip']}">
                                 <f:param value="_{harvestingClientsPage.getSelectedClient().name}"/>
                             </h:outputFormat>
@@ -178,7 +177,7 @@
                         <p:fragment id="newHarvestingClientDialogContent">
                             <p:focus context="newHarvestingClientDialogContent"/>
                             <p class="help-block">
-                                <span class="glyphicon glyphicon-info-sign"/> <h:outputText value=" #{bundle['harvestclients.newClientDialog.help']}"/>
+                                <h:outputText value="#{bundle['harvestclients.newClientDialog.help']}"/>
                             </p>
                             <fieldset id="addClientStepOne" class="form-horizontal" jsf:rendered="#{harvestingClientsPage.createStepOne}">
                                 <!-- STEP 1 - Info -->
diff --git a/src/main/webapp/harvestsets.xhtml b/src/main/webapp/harvestsets.xhtml
index 53422e94f44..ba952507bbf 100644
--- a/src/main/webapp/harvestsets.xhtml
+++ b/src/main/webapp/harvestsets.xhtml
@@ -42,7 +42,6 @@
                     <p:fragment id="serviceDisabled" rendered="#{!harvestingSetsPage.harvestingServerEnabled}">
                         <div>
                             <p class="help-block">
-                                <span class="glyphicon glyphicon-info-sign"/>&#160;
                                 <h:outputText value="#{bundle['harvestserver.service.disabled.msg']}"/>
                             </p>
                         </div>
@@ -198,7 +197,7 @@
                         <p:fragment id="newOAISetDialogContent">
                             <p:focus context="newOAISetDialogContent"/>
                             <p class="help-block">
-                                <span class="glyphicon glyphicon-info-sign"/> <h:outputText value=" #{bundle['harvestserver.newSetDialog.help']}"/>
+                                <h:outputText value="#{bundle['harvestserver.newSetDialog.help']}"/>
                             </p>
                             <div class="form-horizontal">
                                 <div class="form-group">
diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml
index 6db6a60ea15..a35b36c3bb4 100644
--- a/src/main/webapp/loginpage.xhtml
+++ b/src/main/webapp/loginpage.xhtml
@@ -107,8 +107,7 @@
                             <div id="remoteProvider" jsf:rendered="#{LoginPage.authProvider.id == 'shib'}">
                                 <h:form>
                                     <p class="help-block">
-                                        <span class="glyphicon glyphicon-info-sign"/>
-                                        <h:outputFormat value=" #{bundle['login.institution.blurb']} " escape="false">
+                                        <h:outputFormat value="#{bundle['login.institution.blurb']} " escape="false">
                                             <f:param value="#{settingsWrapper.guidesBaseUrl}"/>
                                             <f:param value="#{systemConfig.guidesVersion}"/>
                                         </h:outputFormat>
@@ -169,8 +168,7 @@
                             <div class="form-horizontal" jsf:rendered="#{LoginPage.authProvider.OAuthProvider}">
                                 <o:form useRequestURI="true">
                                     <p class="help-block">
-                                        <span class="glyphicon glyphicon-info-sign"/>
-                                        <h:outputFormat value=" #{bundle['auth.providers.blurb']}" escape="false">
+                                        <h:outputFormat value="#{bundle['auth.providers.blurb']}" escape="false">
                                             <o:param value="#{LoginPage.authProvider.info.title}"/>
                                             <o:param value="#{settingsWrapper.guidesBaseUrl}"/>
                                             <o:param value="#{systemConfig.guidesVersion}"/>
@@ -214,8 +212,8 @@
                                     </ui:repeat>
                                 </h:form>
                                 <div jsf:rendered="#{LoginPage.authProvider.id == 'builtin'}">
-                                    <p class="help-block"><span class="glyphicon glyphicon-info-sign"/>
-                                        <h:outputFormat value=" #{bundle['auth.providers.tip']}" escape="false">
+                                    <p class="help-block">
+                                        <h:outputFormat value="#{bundle['auth.providers.tip']}" escape="false">
                                             <o:param value="#{settingsWrapper.guidesBaseUrl}"/>
                                             <o:param value="#{systemConfig.guidesVersion}"/>
                                         </h:outputFormat>
diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index 6fc6bf870e0..39d7f0270dd 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -71,8 +71,7 @@
                                 <div class="col-sm-9" jsf:rendered="#{dsf.datasetFieldType.compound}">
                                     <ui:fragment rendered="#{dsf.datasetFieldType.name == 'datasetContact'}">
                                         <p class="help-block">
-                                            <span class="glyphicon glyphicon-info-sign"/>
-                                            <h:outputText value=" #{bundle['dataset.contact.tip']}"/>
+                                            <h:outputText value="#{bundle['dataset.contact.tip']}"/>
                                         </p>
                                     </ui:fragment>
                                     <ui:repeat value="#{dsf.datasetFieldCompoundValues}" var="compoundValue">
@@ -186,8 +185,7 @@
                                                             <div class="form-col-container #{(subdsf.datasetFieldType.fieldType == 'TEXTBOX') ? 'col-sm-12' : 'col-sm-6'}">
                                                                 <ui:fragment rendered="#{subdsf.datasetFieldType.name == 'dsDescriptionValue'}">
                                                                     <p class="help-block">
-                                                                        <span class="glyphicon glyphicon-info-sign"/>
-                                                                        <h:outputFormat value=" #{bundle.htmlAllowedMsg}" escape="false">
+                                                                        <h:outputFormat value="#{bundle.htmlAllowedMsg}" escape="false">
                                                                             <f:param value="#{bundle.htmlAllowedTags}"/>
                                                                         </h:outputFormat>
                                                                     </p>
diff --git a/src/main/webapp/mydata_fragment.xhtml b/src/main/webapp/mydata_fragment.xhtml
index c91acd1f3af..81990011f9c 100644
--- a/src/main/webapp/mydata_fragment.xhtml
+++ b/src/main/webapp/mydata_fragment.xhtml
@@ -11,7 +11,7 @@
     <div class="row">
         <div class="col-xs-12">
             <p class="help-block">
-                <span class="glyphicon glyphicon-info-sign"></span> #{bundle['mydataFragment.infoAccess']}
+                #{bundle['mydataFragment.infoAccess']}
             </p>
         </div>
     </div>
diff --git a/src/main/webapp/oauth2/convert.xhtml b/src/main/webapp/oauth2/convert.xhtml
index 9f11ec98dab..25e1c129494 100644
--- a/src/main/webapp/oauth2/convert.xhtml
+++ b/src/main/webapp/oauth2/convert.xhtml
@@ -29,7 +29,6 @@
                     <p:tab id="convertAccountTab" title="#{bundle['account.info']}">
                         <h:form id="convertAccountForm" styleClass="form-horizontal">
                             <p class="help-block">
-                                <span class="glyphicon glyphicon-info-sign"/>
                                 <h:outputFormat value="#{OAuth2FirstLoginPage.convertTip}" escape="false"/>
                             </p>
                             <div class="form-group">
diff --git a/src/main/webapp/oauth2/firstLogin.xhtml b/src/main/webapp/oauth2/firstLogin.xhtml
index f8163c98681..3bd8bf961fd 100644
--- a/src/main/webapp/oauth2/firstLogin.xhtml
+++ b/src/main/webapp/oauth2/firstLogin.xhtml
@@ -28,8 +28,7 @@
                 <p:tabView id="tabView">
                     <p:tab id="newAccountTab" title="#{bundle['account.info']}">
                         <p class="help-block">
-                            <span class="glyphicon glyphicon-info-sign"/>
-                            <span>#{OAuth2FirstLoginPage.createFromWhereTip}</span>
+                            #{OAuth2FirstLoginPage.createFromWhereTip}
                         </p>
                         <h:form id="newAccountForm" styleClass="form-horizontal">
                             <div class="form-group">
diff --git a/src/main/webapp/package-download-popup-fragment.xhtml b/src/main/webapp/package-download-popup-fragment.xhtml
index e1e229d5113..afbcc84eff9 100644
--- a/src/main/webapp/package-download-popup-fragment.xhtml
+++ b/src/main/webapp/package-download-popup-fragment.xhtml
@@ -11,9 +11,8 @@
     <!--The p:dialog for this lives in dataset & file -->
     <div jsf:id="packagePopupDownloadInfo">
         <div class="col-sm-12">
-            <p class="help-block no-margin-top"> 
-                <span class="glyphicon glyphicon-info-sign"></span>                                            
-                <h:outputFormat value=" #{bundle['packageDownload.instructions']}" escape="false">
+            <p class="help-block no-margin-top">                                           
+                <h:outputFormat value="#{bundle['packageDownload.instructions']}" escape="false">
                     <f:param value="#{systemConfig.guidesBaseUrl}"/>
                     <f:param value="#{systemConfig.guidesVersion}"/>
                 </h:outputFormat>
diff --git a/src/main/webapp/permissions-manage-files.xhtml b/src/main/webapp/permissions-manage-files.xhtml
index 4676d4a0b1c..f4fabccce3f 100644
--- a/src/main/webapp/permissions-manage-files.xhtml
+++ b/src/main/webapp/permissions-manage-files.xhtml
@@ -31,7 +31,7 @@
                             <div data-toggle="collapse" data-target="#panelCollapseUsersGroups" class="panel-heading text-info">
                                 #{bundle['dataverse.permissionsFiles.usersOrGroups']} <span class="glyphicon glyphicon-chevron-up"/>
                                 
-                                <span class="text-muted small pull-right"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.permissionsFiles.usersOrGroups.description']}</span>
+                                <span class="text-muted small pull-right">#{bundle['dataverse.permissionsFiles.usersOrGroups.description']}</span>
                             </div>
                             <div id="panelCollapseUsersGroups" class="collapse in">
                                 <div class="panel-body">
@@ -137,7 +137,7 @@
                             <div data-toggle="collapse" data-target="#panelCollapseFiles" class="panel-heading text-info">
                                 #{bundle['dataverse.permissionsFiles.files']} <span class="glyphicon glyphicon-chevron-down"/>
                                 
-                                <span class="text-muted small pull-right"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.permissionsFiles.files.description']}</span>
+                                <span class="text-muted small pull-right">#{bundle['dataverse.permissionsFiles.files.description']}</span>
                             </div>
                             <div id="panelCollapseFiles" class="collapse">
                                 <div class="panel-body">
@@ -245,7 +245,7 @@
                         </p:fragment>
                         <p:fragment id="assignRoleContent">
                             <div class="form-horizontal">
-                                <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.permissionsFiles.assignDialog.description']}</p>
+                                <p class="help-block">#{bundle['dataverse.permissionsFiles.assignDialog.description']}</p>
                                 <div class="form-group" jsf:rendered="#{empty manageFilePermissionsPage.fileRequester}">
                                     <label for="userGroupAccessInput" class="col-sm-3 control-label">
                                         #{bundle['dataverse.permissionsFiles.assignDialog.userOrGroup']}
diff --git a/src/main/webapp/permissions-manage.xhtml b/src/main/webapp/permissions-manage.xhtml
index 051c2298a10..b912f457ae1 100644
--- a/src/main/webapp/permissions-manage.xhtml
+++ b/src/main/webapp/permissions-manage.xhtml
@@ -32,7 +32,7 @@
                                     <div data-toggle="collapse" data-target="#panelCollapsePermissions" class="panel-heading text-info">
                                         #{bundle['dataverse.permissions.title']} <span class="glyphicon glyphicon-chevron-up"/>
                                         
-                                        <span class="text-muted small pull-right"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.permissions.description']}</span>
+                                        <span class="text-muted small pull-right">#{bundle['dataverse.permissions.description']}</span>
                                     </div>
                                     <div id="panelCollapsePermissions" class="collapse in">
                                         <div class="panel-body">
@@ -92,7 +92,7 @@
                             <div data-toggle="collapse" data-target="#panelCollapseUsersGroups" class="panel-heading text-info">
                                 #{bundle['dataverse.permissions.usersOrGroups']} <span class="glyphicon #{!managePermissionsPage.dvObject.instanceofDataverse ? 'glyphicon-chevron-up' : 'glyphicon-chevron-down'}"/>
                                 
-                                <span class="text-muted small pull-right"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.permissions.usersOrGroups.description']}</span>
+                                <span class="text-muted small pull-right">#{bundle['dataverse.permissions.usersOrGroups.description']}</span>
                             </div>
                             <div id="panelCollapseUsersGroups" class="collapse #{!managePermissionsPage.dvObject.instanceofDataverse ? 'in' : ''}">
                                 <div class="panel-body">
@@ -149,7 +149,7 @@
                             <div data-toggle="collapse" data-target="#panelCollapseRoles" class="panel-heading text-info">
                                 #{bundle['dataverse.permissions.roles']} <span class="glyphicon glyphicon-chevron-down"/>
                                 
-                                <span class="text-muted small pull-right"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.permissions.roles.description']}</span>
+                                <span class="text-muted small pull-right">#{bundle['dataverse.permissions.roles.description']}</span>
                             </div>
                             <div id="panelCollapseRoles" class="collapse">
                                 <div class="panel-body">
diff --git a/src/main/webapp/roles-assign.xhtml b/src/main/webapp/roles-assign.xhtml
index 94fea252cda..078c8be747d 100644
--- a/src/main/webapp/roles-assign.xhtml
+++ b/src/main/webapp/roles-assign.xhtml
@@ -13,7 +13,7 @@
         </p:fragment>
         <p:fragment id="assignRoleContent">
             <div class="form-horizontal">
-                <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.permissions.usersOrGroups.assignDialog.description']}</p>
+                <p class="help-block">#{bundle['dataverse.permissions.usersOrGroups.assignDialog.description']}</p>
                 <div class="form-group">
                     <label for="userGroupAccessInput" class="col-sm-2 control-label">
                         #{bundle['dataverse.permissions.usersOrGroups.assignDialog.userOrGroup']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
index 4d9e94f899a..ee0ceb2c7d6 100644
--- a/src/main/webapp/search-include-fragment.xhtml
+++ b/src/main/webapp/search-include-fragment.xhtml
@@ -556,7 +556,7 @@
                         </ui:repeat>
 
                         <div jsf:rendered="#{result.harvested and !empty result.harvestingDescription}" class="text-muted small margin-top-half">
-                            <span class="glyphicon glyphicon-info-sign"/> <h:outputText value=" #{result.harvestingDescription}"/>
+                            <h:outputText value="#{result.harvestingDescription}"/>
                         </div>
                     </div>
                     <!--FILE CARDS-->
diff --git a/src/main/webapp/subset/gui_subset.xhtml b/src/main/webapp/subset/gui_subset.xhtml
index c338bf67a85..9eb1e6fa09c 100755
--- a/src/main/webapp/subset/gui_subset.xhtml
+++ b/src/main/webapp/subset/gui_subset.xhtml
@@ -30,8 +30,7 @@
                     </div>
                     <div id="tab2" style="display:none;padding:6px;">
                         <div id="txtSubset" style="display:none;">
-                            <!-- <p class="help-block"><span class="glyphicon glyphicon-info-sign"></span> To select a subset, brush the plots. The subset will be the intersection of brushed values.</p> -->
-                            <p class="help-block"><span class="glyphicon glyphicon-info-sign"></span> Distribution of selected variables.</p>
+                            <p class="help-block">Distribution of selected variables.</p>
                         </div>
                         <div id="tab2ContentArea">
                             
diff --git a/src/main/webapp/themeAndWidgetsFragment.xhtml b/src/main/webapp/themeAndWidgetsFragment.xhtml
index 8c358532247..3091e84ca7a 100644
--- a/src/main/webapp/themeAndWidgetsFragment.xhtml
+++ b/src/main/webapp/themeAndWidgetsFragment.xhtml
@@ -39,7 +39,7 @@
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.logo.image.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.theme.logo.tip']}</p>
+                                <p class="help-block">#{bundle['dataverse.theme.logo.tip']}</p>
                                 <p:panelGrid rendered="#{not empty themeWidgetFragment.editDv.dataverseTheme.logo}" columns="2" styleClass="noBorders" columnClasses="text-center,uploadNewLogo">
                                     <p:column>
                                         <p>
@@ -159,7 +159,7 @@
                                     <f:attribute name="taglineInput" value="#{themeWidgetFragment.taglineInput}"/>
                                 </h:inputHidden>
                                 <div class="col-sm-8">
-                                    <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.theme.tagline.tip']}</p>
+                                    <p class="help-block">#{bundle['dataverse.theme.tagline.tip']}</p>
                                     <p:inputText id="tagline" styleClass="form-control" binding="#{themeWidgetFragment.taglineInput}" validator="#{themeWidgetFragment.validateTagline}" value="#{themeWidgetFragment.editDv.dataverseTheme.tagline}"/>
                                     <p:message for="tagline" display="text"/>
                                 </div>
@@ -171,7 +171,7 @@
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.website.title']}"></span>
                                 </label>
                                 <div class="col-sm-6">
-                                    <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.theme.website.tip']}</p>
+                                    <p class="help-block">#{bundle['dataverse.theme.website.tip']}</p>
                                     <p:inputText id="website" styleClass="form-control" binding="#{themeWidgetFragment.linkUrlInput}" validatorMessage="#{bundle['dataverse.theme.website.invalidMsg']}" validator="#{themeWidgetFragment.validateUrl}" value="#{themeWidgetFragment.editDv.dataverseTheme.linkUrl}"/>
                                     <p:watermark for="website" value="#{bundle['dataverse.theme.website.watermark']}" id="watermark" />
                                     <p:message for="website" display="text"/>

From 4c98f4bbf8a004ebe00fc54f5705f0ebee151640 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Fri, 1 Mar 2019 17:05:58 -0500
Subject: [PATCH 17/22] Added tooltip icon color and hover to stylesheet [ref
 #3925]

---
 src/main/webapp/dataset-license-terms.xhtml   | 70 +++++++++----------
 src/main/webapp/dataset-widgets.xhtml         |  6 +-
 src/main/webapp/dataset.xhtml                 | 14 ++--
 src/main/webapp/dataverse.xhtml               | 14 ++--
 src/main/webapp/dataverseuser.xhtml           | 20 +++---
 src/main/webapp/editFilesFragment.xhtml       |  4 +-
 .../webapp/explicitGroup-new-dialog.xhtml     |  2 +-
 .../webapp/file-data-access-fragment.xhtml    |  6 +-
 src/main/webapp/file.xhtml                    |  4 +-
 src/main/webapp/filesFragment.xhtml           |  2 +-
 src/main/webapp/guestbook.xhtml               |  2 +-
 src/main/webapp/harvestclients.xhtml          | 16 ++---
 src/main/webapp/harvestsets.xhtml             |  6 +-
 src/main/webapp/manage-guestbooks.xhtml       |  2 +-
 src/main/webapp/metadataFragment.xhtml        | 12 ++--
 src/main/webapp/oauth2/firstLogin.xhtml       | 14 ++--
 src/main/webapp/resources/css/structure.css   |  3 +-
 src/main/webapp/roles-edit.xhtml              |  6 +-
 src/main/webapp/search/advanced.xhtml         | 28 ++++----
 src/main/webapp/template.xhtml                |  2 +-
 src/main/webapp/termsofuse.xhtml              |  2 +-
 src/main/webapp/themeAndWidgetsFragment.xhtml | 22 +++---
 22 files changed, 129 insertions(+), 128 deletions(-)

diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index 4062a1eaa71..fe30d68cedb 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -29,7 +29,7 @@
                        <div class="form-group">
                            <label for="metadata_Terms" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver']}
-                               <span class="glyphicon glyphicon-question-sign text-muted"
+                               <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.title']}"></span>
                            </label>
                            <div class="col-sm-9">
@@ -57,7 +57,7 @@
                        <div class="form-group" jsf:rendered="#{termsOfUseAndAccess.license != 'CC0'}">
                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']}
-                               <span class="glyphicon glyphicon-question-sign text-muted"
+                               <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse.title']}"></span>
                            </label>
                            <div class="col-sm-9">
@@ -79,7 +79,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.confidentialityDeclaration}">
                                    <label for="confidentialityDeclaration" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -89,7 +89,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.specialPermissions}">
                                    <label for="specialPermissions" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -99,7 +99,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.restrictions}">
                                    <label for="restrictions" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -109,7 +109,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.citationRequirements}">
                                    <label for="citationRequirements" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -119,7 +119,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.depositorRequirements}">
                                    <label for="depositorRequirements" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -129,7 +129,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.conditions}">
                                    <label for="conditions" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -139,7 +139,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.disclaimer}">
                                    <label for="disclaimer" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -151,7 +151,7 @@
                                <div class="form-group">
                                    <label for="confidentialityDeclaration" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -161,7 +161,7 @@
                                <div class="form-group">
                                    <label for="specialPermissions" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -171,7 +171,7 @@
                                <div class="form-group">
                                    <label for="restrictions" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -181,7 +181,7 @@
                                <div class="form-group">
                                    <label for="citationRequirements" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -191,7 +191,7 @@
                                <div class="form-group">
                                    <label for="depositorRequirements" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -201,7 +201,7 @@
                                <div class="form-group">
                                    <label for="conditions" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -211,7 +211,7 @@
                                <div class="form-group">
                                    <label for="disclaimer" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -242,7 +242,7 @@
                        <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall}">
                            <label for="metadata_RestrictedFiles" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles']}
-                               <span class="glyphicon glyphicon-question-sign text-muted"
+                               <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.title']}"></span>
                            </label>
                            <div class="col-sm-9">
@@ -256,7 +256,7 @@
                        <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.termsOfAccess}">
                            <label for="metadata_TermsAccess" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                               <span class="glyphicon glyphicon-question-sign text-muted"
+                               <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                            </label>
                            <div class="col-sm-9">
@@ -266,7 +266,7 @@
                        <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall and (DatasetPage.restrictedFileCount > 0)}">
                            <label for="metadata_RequestAccess" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
-                               <span class="glyphicon glyphicon-question-sign text-muted"
+                               <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
                            </label>
                            <div class="col-sm-9">
@@ -285,7 +285,7 @@
                        <div class="form-group">
                            <label for="metadata_TermsAccess" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                               <span class="glyphicon glyphicon-question-sign text-muted"
+                               <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                            </label>
                            <div class="col-sm-9">
@@ -295,7 +295,7 @@
                        <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall}">
                            <label for="metadata_RequestAccess" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
-                               <span class="glyphicon glyphicon-question-sign text-muted"
+                               <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
                            </label>
                            <div class="col-sm-9">
@@ -315,7 +315,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.dataAccessPlace}">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -325,7 +325,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.originalArchive}">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -335,7 +335,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.availabilityStatus}">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -345,7 +345,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.contactForAccess}">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -355,7 +355,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.sizeOfCollection}">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection.tip']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -365,7 +365,7 @@
                                <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.studyCompletion}">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -377,7 +377,7 @@
                                <div class="form-group">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -387,7 +387,7 @@
                                <div class="form-group">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -397,7 +397,7 @@
                                <div class="form-group">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -407,7 +407,7 @@
                                <div class="form-group">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -417,7 +417,7 @@
                                <div class="form-group">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection.tip']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -427,7 +427,7 @@
                                <div class="form-group">
                                    <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion']}
-                                       <span class="glyphicon glyphicon-question-sign text-muted"
+                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion.title']}"></span>
                                    </label>
                                    <div class="col-sm-9">
@@ -451,7 +451,7 @@
                    <div class="form-group">
                        <label for="metadata_Guestbook" class="col-sm-3 control-label">
                            #{bundle['file.dataFilesTab.terms.list.guestbook']}
-                           <span class="glyphicon glyphicon-question-sign text-muted"
+                           <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.guestbook.title']}"></span>
                        </label>
                        <div class="col-sm-9">
@@ -545,7 +545,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">
                     #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData']}
-                    <span class="glyphicon glyphicon-question-sign text-muted"
+                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData.title']}"></span>
                 </label>
                 <div class="col-sm-8">
diff --git a/src/main/webapp/dataset-widgets.xhtml b/src/main/webapp/dataset-widgets.xhtml
index 2e4f3bbbd04..4adaf814f8f 100644
--- a/src/main/webapp/dataset-widgets.xhtml
+++ b/src/main/webapp/dataset-widgets.xhtml
@@ -28,7 +28,7 @@
                             <div class="form-group" jsf:rendered="#{true or themeWidgetFragment.editDv.themeRoot}">
                                 <label class="col-sm-3 control-label" for="logoFormat">
                                     #{bundle['dataset.thumbnailsAndWidget.thumbnailImage']}
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.title']}"></span>
                                 </label>
                                 <div class="col-sm-9">
@@ -52,7 +52,7 @@
                                         <div class="form-group" jsf:rendered="#{not empty DatasetWidgetsPage.datasetThumbnails}">
                                             <label for="selectThumbnail" class="control-label">
                                                 #{bundle['dataset.thumbnailsAndWidget.thumbnailImage.selectAvailable']}
-                                                <span class="glyphicon glyphicon-question-sign text-muted"
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.selectAvailable.title']}"></span>
                                             </label>
                                             <div>
@@ -62,7 +62,7 @@
                                         <div class="form-group">
                                             <label for="uploadThumbnail" class="control-label">
                                                 #{bundle['dataset.thumbnailsAndWidget.thumbnailImage.uploadNew']}
-                                                <span class="glyphicon glyphicon-question-sign text-muted"
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.uploadNew.title']}"></span>
                                             </label>
                                             <p:fileUpload invalidFileMessage="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.upload.invalidMsg']}" id="changelogo" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update="@all" 
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 395830f5b17..98e1cadd857 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -376,7 +376,7 @@
                                         <div id="keywords" class="form-group" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.keywordDisplay and dsf.datasetFieldType.id==DatasetPage.datasetVersionUI.keyword.datasetFieldType.id}">
                                             <label class="col-sm-3 control-label">
                                                 #{bundle['dataset.keywordDisplay.title']}
-                                                <span class="glyphicon glyphicon-question-sign text-muted"
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.keyword.datasetFieldType.localeDescription}"></span>
                                             </label>
                                             <div class="col-sm-9">#{DatasetPage.datasetVersionUI.keywordDisplay}</div>
@@ -384,7 +384,7 @@
                                         <div id="publication" class="form-group" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.relPublicationCitation and dsf.datasetFieldType.name=='publication'}">
                                             <label class="col-sm-3 control-label">
                                                 #{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).title}
-                                                <span class="glyphicon glyphicon-question-sign text-muted"
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).description}"></span>
                                             </label>
                                             <div class="col-sm-9">
@@ -396,7 +396,7 @@
                                         <div class="form-group" jsf:rendered="#{dsf.datasetFieldType.name!='publication' and dsf.datasetFieldType.name!='keyword'  }">
                                             <label for="metadata_#{dsf.datasetFieldType.name}" class="col-sm-3 control-label">
                                                 #{dsf.datasetFieldType.localeTitle}
-                                                <span class="glyphicon glyphicon-question-sign text-muted"
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
                                             </label>
                                             <!-- Primitive datasetFields -->
@@ -440,7 +440,7 @@
                         <div class="form-group">
                             <label for="select_HostDataverse" class="col-sm-2 control-label">
                                 #{bundle.hostDataverse}
-                                <span class="glyphicon glyphicon-question-sign text-muted"
+                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.host.title']}"></span>
                             </label>
                             <div class="col-sm-10">
@@ -456,7 +456,7 @@
                         <div class="form-group" jsf:rendered="#{!empty DatasetPage.dataverseTemplates and DatasetPage.editMode == 'CREATE'}">
                             <label for="select_DatasetTemplate" class="col-sm-2 control-label">
                                 #{bundle['dataset.manageTemplates.tab.action.btn.view.dialog.datasetTemplate']}
-                                <span class="glyphicon glyphicon-question-sign text-muted"
+                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageTemplates.tab.action.btn.view.dialog.datasetTemplate.title']}"></span>
                             </label>
                             <div class="col-sm-6">
@@ -1309,7 +1309,7 @@
                                 <div class="form-group">
                                     <label for="metadata_TermsAccess" class="col-sm-3 control-label">
                                         #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                                     </label>
                                     <div class="col-sm-9">
@@ -1319,7 +1319,7 @@
                                 <div class="form-group">
                                     <label for="metadata_RequestAccess" class="col-sm-3 control-label">
                                         #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
                                     </label>
                                     <div class="col-sm-9">
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 6ea78e062db..b2366e3bd58 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -54,7 +54,7 @@
                             <div class="col-xs-6 form-group form-col-container">
                                 <label class="col-sm-3 control-label" for="name">
                                     #{bundle.dataverse} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.title']}"></span>
                                 </label>
                                 <div class="col-sm-9 form-col-container">
@@ -64,7 +64,7 @@
                             <div class="col-xs-6 form-group form-col-container">
                                 <label class="col-sm-3 control-label" for="affiliation">
                                     #{bundle.affiliation}
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.affiliation.title']}"></span>
                                 </label>
                                 <div class="col-sm-9 form-col-container">
@@ -77,7 +77,7 @@
                             <div class="col-xs-6 form-group form-col-container">
                                 <label class="col-sm-3 control-label" for="identifier">
                                     #{bundle.identifier} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.identifier.title']}"></span>
                                 </label>
                                 <div class="col-sm-9 form-col-container">
@@ -91,7 +91,7 @@
                             <div class="col-xs-6 form-group" jsf:rendered="#{DataversePage.ownerId != null}">
                                 <label class="col-sm-3 control-label" for="hostDataverse">
                                     #{bundle.hostDataverse}
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.host.title']}"></span>
                                 </label>
                                 <div class="col-sm-9 form-col-container">
@@ -111,7 +111,7 @@
                                 <div class="form-group clearfix">
                                     <label class="col-sm-3 control-label" for="dataverseCategory">
                                         #{bundle['dataverse.category']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.category.title']}"></span>
                                     </label>
                                     <div class="col-sm-9 form-col-container">
@@ -135,7 +135,7 @@
                                        <p:autoUpdate />
                                         <label class="col-sm-3 control-label" for="contactEmail">
                                             #{bundle['dataverse.email']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                            <span class="glyphicon glyphicon-question-sign text-muted"
+                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.email.title']}"></span>
                                         </label>
                                         <div class="col-sm-9 form-col-container edit-compound-field">
@@ -172,7 +172,7 @@
                             <div class="col-xs-6 form-group form-col-container">
                                 <label class="col-sm-3 control-label" for="description">
                                     #{bundle.description}
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.description.title']}"></span>
                                 </label>
                                 <div class="col-sm-9 form-col-container">
diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index adb6cd8a8ef..79ba2ce4049 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -495,7 +495,7 @@
                                 <!-- Username -->
                                     <label for="userNameEmail" class="col-sm-3 control-label">
                                         #{bundle['user.username']} <span class="glyphicon glyphicon-asterisk text-danger"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.username.illegal.tip']}"></span>
                                     </label>
                                     <div class="col-sm-9">
@@ -514,7 +514,7 @@
                                 <!-- Current Password -->
                                     <label for="currentPassword" class="col-sm-3 control-label">
                                         #{bundle['user.currentPasswd']} <span class="glyphicon glyphicon-asterisk text-danger"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.currentPasswd.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
@@ -527,7 +527,7 @@
                                     <label for="inputPassword" class="col-sm-3 control-label">
                                         <h:outputText value="#{DataverseUserPage.editMode == 'CREATE' ? bundle['user.password'] : bundle['user.newPassword']}" />
                                         <span class="glyphicon glyphicon-asterisk text-danger"></span>
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.passwd.illegal.tip']}"></span>
                                     </label>
                                     <div class="col-sm-9">
@@ -546,7 +546,7 @@
                                     <!-- Retype Password -->
                                     <label for="retypePassword" class="col-sm-3 control-label">
                                         #{bundle['user.rePasswd']} <span class="glyphicon glyphicon-asterisk text-danger"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.rePasswd.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
@@ -558,7 +558,7 @@
                                 <!-- First Name -->
                                     <label for="firstName" class="col-sm-3 control-label">
                                         #{bundle['user.firstName']} <span class="glyphicon glyphicon-asterisk text-danger"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.firstName.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
@@ -570,7 +570,7 @@
                                     <!-- Last Name -->
                                     <label for="lastName" class="col-sm-3 control-label">
                                         #{bundle['user.lastName']} <span class="glyphicon glyphicon-asterisk text-danger"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.lastName.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
@@ -582,7 +582,7 @@
                                     <!-- Email -->
                                     <label for="email" class="col-sm-3 control-label">
                                         #{bundle.email} <span class="glyphicon glyphicon-asterisk text-danger"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.email.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
@@ -597,7 +597,7 @@
                                     <!-- ORCID iD, for example -->
                                     <label for="userPersistentId" class="col-sm-3 control-label">
                                         #{DataverseUserPage.userAuthProvider.persistentIdName}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{DataverseUserPage.userAuthProvider.persistentIdDescription}"></span>
                                     </label>
                                     <div class="col-sm-4">
@@ -613,7 +613,7 @@
                                     <!-- Affiliation -->
                                     <label for="affiliation" class="col-sm-3 control-label">
                                         #{bundle.affiliation}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.affiliation.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
@@ -625,7 +625,7 @@
                                 <!-- Position -->
                                     <label for="position" class="col-sm-3 control-label">
                                         #{bundle['user.position']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.position.tip']}"></span>
                                     </label>
                                     <div class="col-sm-4">
diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index 656cd620781..9dca6170695 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -546,7 +546,7 @@
             <div class="form-group">
                 <label for="metadata_TermsAccess" class="col-sm-3 control-label">
                     #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                    <span class="glyphicon glyphicon-question-sign text-muted"
+                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                           data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                 </label>
                 <ui:fragment rendered="#{!datasetPage}">
@@ -563,7 +563,7 @@
             <div class="form-group">
                 <label for="metadata_RequestAccess" class="col-sm-3 control-label">
                     #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
-                    <span class="glyphicon glyphicon-question-sign text-muted"
+                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                           data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
                 </label>
                 <ui:fragment rendered="#{!datasetPage}">
diff --git a/src/main/webapp/explicitGroup-new-dialog.xhtml b/src/main/webapp/explicitGroup-new-dialog.xhtml
index 406702fc97e..a061e29ebd6 100644
--- a/src/main/webapp/explicitGroup-new-dialog.xhtml
+++ b/src/main/webapp/explicitGroup-new-dialog.xhtml
@@ -30,7 +30,7 @@
                     <label for="explicitGroupIdentifier" class="col-sm-3 control-label">
                         #{bundle['dataverse.permissions.explicitGroupEditDialog.groupIdentifier']}
                         <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                        <span class="glyphicon glyphicon-question-sign text-muted"
+                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.permissions.explicitGroupEditDialog.groupIdentifier.tip']}"></span>
                     </label>
                     <div class="col-sm-9">
diff --git a/src/main/webapp/file-data-access-fragment.xhtml b/src/main/webapp/file-data-access-fragment.xhtml
index 4f3fb047c61..094c5db2c71 100644
--- a/src/main/webapp/file-data-access-fragment.xhtml
+++ b/src/main/webapp/file-data-access-fragment.xhtml
@@ -31,7 +31,7 @@
         <div class="form-group row">
             <label class="col-xs-12 col-lg-3 control-label">
                 #{bundle['file.dataFilesTab.dataAccess.local.label']}
-                <span class="glyphicon glyphicon-question-sign text-muted"
+                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.dataAccess.local.tooltip']}"></span>
             </label>
             <div class="col-sm-9">
@@ -43,7 +43,7 @@
         <div class="form-group row">
             <label class="col-xs-12 col-lg-3 control-label">
                 #{bundle['file.dataFilesTab.dataAccess.download.label']}
-                <span class="glyphicon glyphicon-question-sign text-muted"
+                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.dataAccess.download.tooltip']}"></span>
             </label>
             <div class="col-xs-12 col-lg-9 row">
@@ -58,7 +58,7 @@
         <div class="form-group row">
             <label class="col-xs-12 col-lg-3 control-label">
                 #{bundle['file.dataFilesTab.dataAccess.verify.label']}
-                <span class="glyphicon glyphicon-question-sign text-muted"
+                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.dataAccess.verify.tooltip']}"></span>
             </label>
             <div class="col-sm-9">
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 8c7cac466b1..9d249b3aec6 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -616,7 +616,7 @@
                                 <div class="form-group">
                                     <label for="metadata_TermsAccess" class="col-sm-3 control-label">
                                         #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                                     </label>
                                     <div class="col-sm-9">
@@ -626,7 +626,7 @@
                                 <div class="form-group">
                                     <label for="metadata_RequestAccess" class="col-sm-3 control-label">
                                         #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
                                     </label>
                                     <div class="col-sm-9">
diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
index 2c0bebc6ed0..8d9a2418418 100644
--- a/src/main/webapp/filesFragment.xhtml
+++ b/src/main/webapp/filesFragment.xhtml
@@ -46,7 +46,7 @@
                     </div>
                     <label class="col-sm-3 control-label">
                         #{bundle['file.cloudStorageAccess']}
-                        <span class="glyphicon glyphicon-question-sign text-muted"
+                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                               data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['file.cloudStorageAccess.tip']}"></span>
                     </label>
                     <div class="col-md-4 col-sm-5 col-xs-6 input-group">
diff --git a/src/main/webapp/guestbook.xhtml b/src/main/webapp/guestbook.xhtml
index 0dcfdf668b0..8af7416e75f 100644
--- a/src/main/webapp/guestbook.xhtml
+++ b/src/main/webapp/guestbook.xhtml
@@ -50,7 +50,7 @@
                             <label class="col-sm-3 control-label" for="guestbookName">
                                 #{bundle['dataset.manageGuestbooks.guestbook.name']} 
                                 <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"></span>
-                                <span class="glyphicon glyphicon-question-sign text-muted"
+                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageGuestbooks.guestbook.name.tip']}"></span>
                             </label>
                             <div class="col-sm-6">
diff --git a/src/main/webapp/harvestclients.xhtml b/src/main/webapp/harvestclients.xhtml
index b176a2e11bd..95fc708cb04 100644
--- a/src/main/webapp/harvestclients.xhtml
+++ b/src/main/webapp/harvestclients.xhtml
@@ -226,7 +226,7 @@
                                     <label for="serverUrl" class="col-sm-2 control-label">
                                         #{bundle['harvestclients.newClientDialog.url']} 
                                         <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{!harvestingClientsPage.initialSettingsValidated}" title="#{bundle.requiredField}"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.newClientDialog.url.tip']}"></span>
                                     </label>
                                     <div class="col-sm-9">
@@ -244,7 +244,7 @@
                                     <label for="destinationDataverse" class="col-sm-2 control-label">
                                         #{bundle['harvestclients.newClientDialog.dataverse']} 
                                         <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{harvestingClientsPage.createMode}" title="#{bundle.requiredField}"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.newClientDialog.dataverse.tip']}"></span>
                                     </label>
                                     <div class="col-sm-9">
@@ -304,7 +304,7 @@
                                 <div class="form-group">
                                     <label for="serverOaiSets" class="col-sm-3 control-label">
                                         #{bundle['harvestclients.newClientDialog.oaiSets']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.newClientDialog.oaiSets.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -332,7 +332,7 @@
                                     <label for="oaiMetadataFormat" class="col-sm-3 control-label">
                                         #{bundle['harvestclients.newClientDialog.oaiMetadataFormat']} 
                                         <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}" jsf:rendered="#{harvestingClientsPage.initialSettingsValidated and harvestingClientsPage.createMode}"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.newClientDialog.oaiMetadataFormat.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -388,7 +388,7 @@
                                 <div class="form-group">
                                     <label for="harvestingSchedule" class="col-sm-3 control-label">
                                         #{bundle['harvestclients.newClientDialog.schedule']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.newClientDialog.schedule.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -483,7 +483,7 @@
                                 <div class="form-group">
                                     <label for="harvestingStyle" class="col-sm-3 control-label">
                                         #{bundle['harvestclients.newClientDialog.harvestingStyle']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.newClientDialog.harvestingStyle.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -501,7 +501,7 @@
                                 <div class="form-group" jsf:rendered="#{harvestingClientsPage.editMode}">
                                     <label for="archiveUrl" class="col-sm-3 control-label">
                                         #{bundle['harvestclients.viewEditDialog.archiveUrl']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.viewEditDialog.archiveUrl.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -516,7 +516,7 @@
                                 <div class="form-group" jsf:rendered="#{harvestingClientsPage.editMode}">
                                     <label for="archiveDescription" class="col-sm-3 control-label">
                                         #{bundle['harvestclients.viewEditDialog.archiveDescription']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.viewEditDialog.archiveDescription.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
diff --git a/src/main/webapp/harvestsets.xhtml b/src/main/webapp/harvestsets.xhtml
index ba952507bbf..d7ffca72422 100644
--- a/src/main/webapp/harvestsets.xhtml
+++ b/src/main/webapp/harvestsets.xhtml
@@ -204,7 +204,7 @@
                                     <label for="setquery" class="col-sm-3 control-label">
                                         #{bundle['harvestserver.newSetDialog.setquery']} 
                                         <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{!harvestingSetsPage.setQueryValidated}" title="#{bundle.requiredField}"/>
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestserver.newSetDialog.setquery.tip']}"></span>
                                     </label>
                                     <div class="col-sm-8">
@@ -267,7 +267,7 @@
                                         <label for="setspec" class="col-sm-3 control-label">
                                             #{bundle['harvestserver.newSetDialog.setspec']} 
                                             <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{harvestingSetsPage.setQueryValidated}" title="#{bundle.requiredField}"/>
-                                            <span class="glyphicon glyphicon-question-sign text-muted"
+                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestserver.newSetDialog.setspec.tip']}"></span>
                                         </label>
                                         <div class="col-sm-8">
@@ -283,7 +283,7 @@
                                         <label for="setdescription" class="col-sm-3 control-label">
                                             #{bundle['harvestserver.newSetDialog.setdescription']} 
                                             <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{harvestingSetsPage.setSpecValidated}" title="#{bundle.requiredField}"/>
-                                            <span class="glyphicon glyphicon-question-sign text-muted"
+                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestserver.newSetDialog.setdescription.tip']}"></span>
                                         </label>
                                         <div class="col-sm-8">
diff --git a/src/main/webapp/manage-guestbooks.xhtml b/src/main/webapp/manage-guestbooks.xhtml
index 55f9058058a..3720929295a 100644
--- a/src/main/webapp/manage-guestbooks.xhtml
+++ b/src/main/webapp/manage-guestbooks.xhtml
@@ -179,7 +179,7 @@
                             <div class="form-group">
                                 <label class="col-sm-3 control-label">
                                     #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData']}
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData.title']}"></span>
                                 </label>
                                 <div class="col-sm-8">
diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index 39d7f0270dd..8656ac33ced 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -21,7 +21,7 @@
                             <div class="form-group">
                                 <label for="metadata_persistentId" class="col-sm-3 control-label">
                                     #{bundle['dataset.metadata.persistentId']}
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.metadata.persistentId.tip']}"></span>
                                 </label>
                                 <div class="col-sm-9">
@@ -32,7 +32,7 @@
                             <div class="form-group">
                                 <label for="metadata_persistentId" class="col-sm-3 control-label">
                                     #{bundle['dataset.metadata.alternativePersistentId']}
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.metadata.alternativePersistentId.tip']}"></span>
                                 </label>
                                 <div class="col-sm-9">
@@ -43,7 +43,7 @@
                             <div class="form-group" jsf:rendered="#{!empty publicationDate}">
                                 <label for="metadata_publicationDate" class="col-sm-3 control-label">
                                     #{bundle['dataset.metadata.publicationDate']}
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.metadata.publicationDate.tip']}"></span>
                                 </label>
                                 <div class="col-sm-9">
@@ -55,7 +55,7 @@
                             <div class="form-group">
                                 <label for="metadata_#{dsf.datasetFieldType.name}" class="col-sm-3 control-label">
                                     #{dsf.datasetFieldType.localeTitle}
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
                                 </label>
                                 <!-- Primitive datasetFields -->
@@ -112,7 +112,7 @@
                                         <label for="metadata_#{dsf.datasetFieldType.name}" class="col-sm-3 control-label">
                                             #{dsf.datasetFieldType.localeTitle}
                                             <h:outputText styleClass="glyphicon glyphicon-asterisk text-danger" value="" rendered="#{dsf.required  or dsf.datasetFieldType.hasRequiredChildren }" />
-                                            <span class="glyphicon glyphicon-question-sign text-muted"
+                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
                                         </label>
                                         <!-- Primitive fields -->
@@ -193,7 +193,7 @@
                                                                 <label class="control-label" for="metadata_#{subdsf.datasetFieldType.name}">
                                                                     #{subdsf.datasetFieldType.localeTitle}
                                                                     <h:outputText styleClass="glyphicon glyphicon-asterisk text-danger" value="" rendered="#{subdsf.required}" />
-                                                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{subdsf.datasetFieldType.localeDescription}"></span>
                                                                 </label>
                                                                 <ui:fragment rendered="#{!subdsf.datasetFieldType.controlledVocabulary}">
diff --git a/src/main/webapp/oauth2/firstLogin.xhtml b/src/main/webapp/oauth2/firstLogin.xhtml
index 3bd8bf961fd..53fda7e0d8c 100644
--- a/src/main/webapp/oauth2/firstLogin.xhtml
+++ b/src/main/webapp/oauth2/firstLogin.xhtml
@@ -35,7 +35,7 @@
                                 <label for="position" class="col-sm-3 control-label">
                                     #{bundle['user.username']} 
                                     <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.username.illegal.tip']}"></span>
                                 </label>
                                 <div class="col-sm-4">
@@ -52,7 +52,7 @@
                                 <label for="givenName" class="col-sm-3 control-label">
                                     #{bundle['user.firstName']} 
                                     <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.firstName.tip']}"></span>
                                 </label>
                                 <div class="col-sm-4">
@@ -64,7 +64,7 @@
                                 <label for="familyName" class="col-sm-3 control-label">
                                     #{bundle['user.lastName']} 
                                     <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.lastName.tip']}"></span>
                                 </label>
                                 <div class="col-sm-4">
@@ -76,7 +76,7 @@
                                 <label for="selectedEmail" class="col-sm-3 control-label">
                                     #{bundle['email']} 
                                     <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.email.tip']}"></span>
                                 </label>
                                 <div class="col-sm-4" jsf:rendered="#{OAuth2FirstLoginPage.getEmailsToPickFrom().size() lt 2}">
@@ -96,7 +96,7 @@
                             <div class="form-group" jsf:rendered="#{OAuth2FirstLoginPage.authProvider.displayIdentifier}">
                                 <label for="persistentUserId" class="col-sm-3 control-label">
                                     #{OAuth2FirstLoginPage.authProvider.persistentIdName}
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{OAuth2FirstLoginPage.authProvider.persistentIdDescription}"></span>
                                 </label>
                                 <div class="col-sm-4">
@@ -113,7 +113,7 @@
                                 <label for="affiliation" class="col-sm-3 control-label">
                                     #{bundle['affiliation']} 
                                     <span class="glyphicon text-danger" title="#{bundle.requiredField}"/>
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.affiliation.tip']}"></span>
                                 </label>
                                 <div class="col-sm-4">
@@ -124,7 +124,7 @@
                                 <label for="position" class="col-sm-3 control-label">
                                     #{bundle['user.position']} 
                                     <span class="glyphicon text-danger" title="#{bundle.requiredField}"/>
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.position.tip']}"></span>
                                 </label>
                                 <div class="col-sm-4">
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index da1e861a3fd..4c5ea81be3c 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -121,7 +121,8 @@ table.selectManyCheckboxBlock label {font-weight:normal;}
 hr {border-color: #ddd;}
 
 span.glyphicon[data-toggle='tooltip'] {cursor: default;}
-.tooltip {z-index:999999 !important;}
+span.glyphicon-question-sign.tooltip-icon {color: #99bcdb !important;}
+span.glyphicon-question-sign.tooltip-icon:hover {color: #337AB7 !important;}
 
 /* Dropdown submenu */
 .dropdown-submenu {
diff --git a/src/main/webapp/roles-edit.xhtml b/src/main/webapp/roles-edit.xhtml
index 8386a9492d7..4565929612f 100644
--- a/src/main/webapp/roles-edit.xhtml
+++ b/src/main/webapp/roles-edit.xhtml
@@ -10,7 +10,7 @@
                     <div class="col-xs-6 form-group">
                         <label class="col-sm-3 control-label" for="roleName">
                             #{bundle['dataverse.permissions.roles.name']}
-                            <span class="glyphicon glyphicon-question-sign text-muted"
+                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                   data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataverse.permissions.roles.name.title']}"></span>
                         </label>
                         <div class="col-sm-9">
@@ -23,7 +23,7 @@
                     <div class="col-xs-6 form-group">
                         <label class="col-sm-3 control-label" for="roleName">
                             #{bundle['dataverse.permissions.roles.id']}
-                            <span class="glyphicon glyphicon-question-sign text-muted"
+                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                   data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataverse.permissions.roles.id.title']}"></span>
                         </label>
                         <div class="col-sm-9">
@@ -36,7 +36,7 @@
                     <div class="col-xs-6 form-group">
                         <label class="col-sm-3 control-label" for="roleName">
                            #{bundle.description}
-                            <span class="glyphicon glyphicon-question-sign text-muted"
+                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                   data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataverse.permissions.roles.description.title']}"></span>
                         </label>
                         <div class="col-sm-9">
diff --git a/src/main/webapp/search/advanced.xhtml b/src/main/webapp/search/advanced.xhtml
index 5ba1aa8e4fd..6d1f07c9ee3 100644
--- a/src/main/webapp/search/advanced.xhtml
+++ b/src/main/webapp/search/advanced.xhtml
@@ -36,7 +36,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle.name}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.dataverses.name.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -46,7 +46,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle.identifier}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.identifier.title']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -56,7 +56,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle.affiliation}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.dataverses.affiliation.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -66,7 +66,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle.description}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.dataverses.description.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -76,7 +76,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle.subject}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.dataverses.subject.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -101,7 +101,7 @@
                                         <div class="form-group">
                                             <label class="col-sm-4 control-label">
                                                 #{item.displayName}
-                                                <span class="glyphicon glyphicon-question-sign text-muted"
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{item.localeDescription}"></span>
                                             </label>
                                             <div class="col-sm-6">
@@ -119,7 +119,7 @@
                                         <div class="form-group">
                                             <label class="col-sm-4 control-label">
                                                 #{bundle['dataset.metadata.publicationYear']}
-                                                <span class="glyphicon glyphicon-question-sign text-muted"
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.metadata.publicationYear.tip']}"></span>
                                             </label>
                                             <div class="col-sm-6">
@@ -129,7 +129,7 @@
                                         <div class="form-group">
                                             <label class="col-sm-4 control-label">
                                                 #{bundle['dataset.metadata.persistentId']}
-                                                <span class="glyphicon glyphicon-question-sign text-muted"
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.metadata.persistentId.tip']}"></span>
                                             </label>
                                             <div class="col-sm-6">
@@ -149,7 +149,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle.name}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.name.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -159,7 +159,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle.description}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.description.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -169,7 +169,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle['advanced.search.files.fileType']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.fileType.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -179,7 +179,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle['advanced.search.files.persistentId']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.persistentId.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -189,7 +189,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle['advanced.search.files.variableName']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.variableName.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
@@ -199,7 +199,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">
                                         #{bundle['advanced.search.files.variableLabel']}
-                                        <span class="glyphicon glyphicon-question-sign text-muted"
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.variableLabel.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml
index 91e6b07f20b..1f9c3dbf8d3 100644
--- a/src/main/webapp/template.xhtml
+++ b/src/main/webapp/template.xhtml
@@ -73,7 +73,7 @@
                                 <label class="col-sm-2 control-label" for="templateName">
                                     #{bundle['dataset.manageTemplates.tab.header.templte']} 
                                     <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataset.template.name.title']}"></span>
                                 </label>
                                 <div class="col-sm-5">
diff --git a/src/main/webapp/termsofuse.xhtml b/src/main/webapp/termsofuse.xhtml
index 0b1e232fb4c..72090bf6802 100644
--- a/src/main/webapp/termsofuse.xhtml
+++ b/src/main/webapp/termsofuse.xhtml
@@ -7,7 +7,7 @@
     <div class="form-group">
         <label for="position" class="col-sm-3 control-label">
             #{bundle['user.acccountterms']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-            <span class="glyphicon glyphicon-question-sign text-muted"
+            <span class="glyphicon glyphicon-question-sign tooltip-icon"
                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.acccountterms.tip']}"></span>
         </label>
         <div class="col-sm-9">
diff --git a/src/main/webapp/themeAndWidgetsFragment.xhtml b/src/main/webapp/themeAndWidgetsFragment.xhtml
index 3091e84ca7a..17d38c73150 100644
--- a/src/main/webapp/themeAndWidgetsFragment.xhtml
+++ b/src/main/webapp/themeAndWidgetsFragment.xhtml
@@ -14,7 +14,7 @@
                         <div class="form-group" jsf:rendered="#{themeWidgetFragment.editDv.owner!=null}">
                             <label class="col-sm-3 control-label" for="inheritCustomization">
                                 #{bundle['dataverse.theme.inheritCustomization.label']}
-                                <span class="glyphicon glyphicon-question-sign text-muted"
+                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.inheritCustomization.title']}"></span>
                             </label>
                             <div class="col-sm-9">
@@ -35,7 +35,7 @@
                         <div class="form-group" jsf:rendered="#{themeWidgetFragment.editDv.themeRoot}">
                             <label class="col-sm-3 control-label" for="logoFormat">
                                 #{bundle['dataverse.theme.logo.image']}
-                                <span class="glyphicon glyphicon-question-sign text-muted"
+                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.logo.image.title']}"></span>
                             </label>
                             <div class="col-sm-9">
@@ -59,7 +59,7 @@
                                     <div class="form-col-container col-sm-4">
                                         <label for="logoFormat" class="control-label">
                                             #{bundle['dataverse.theme.logo.format']}
-                                            <span class="glyphicon glyphicon-question-sign text-muted"
+                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.logo.format.title']}"></span>
                                         </label>
                                         <div>
@@ -75,7 +75,7 @@
                                         <div class="form-col-container col-sm-3">
                                             <label for="logoAlignment" class="control-label">
                                                 #{bundle['dataverse.theme.logo.alignment']}
-                                                <span class="glyphicon glyphicon-question-sign text-muted"
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.logo.alignment.title']}"></span>
                                             </label>
                                             <div>
@@ -90,7 +90,7 @@
                                         <div class="form-col-container col-sm-4">
                                             <label for="logoBackgroundColor" class="control-label">
                                                 #{bundle['dataverse.theme.logo.backColor']}
-                                                <span class="glyphicon glyphicon-question-sign text-muted"
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.logo.backColor.title']}"></span>
                                             </label>
                                             <div>
@@ -108,14 +108,14 @@
                             <div class="form-group">
                                 <label class="col-sm-3 control-label">
                                     #{bundle['dataverse.theme.headerColor']}
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.headerColor.tip']}"></span>
                                 </label>
                                 <div class="form-group col-sm-9">
                                     <div class="form-col-container col-sm-4">
                                         <label for="backgroundColor" class="control-label">
                                             #{bundle['dataverse.theme.backColor']}
-                                            <span class="glyphicon glyphicon-question-sign text-muted"
+                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.backColor.title']}"></span>
                                         </label>
                                         <div>
@@ -126,7 +126,7 @@
                                     <div class="form-col-container col-sm-4">
                                         <label for="linkColor" class="control-label">
                                             #{bundle['dataverse.theme.linkColor']}
-                                            <span class="glyphicon glyphicon-question-sign text-muted"
+                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.linkColor.title']}"></span>
                                         </label>
                                         <div>
@@ -137,7 +137,7 @@
                                     <div class="form-col-container col-sm-4">
                                         <label for="textColor" class="control-label">
                                             #{bundle['dataverse.theme.txtColor']}
-                                            <span class="glyphicon glyphicon-question-sign text-muted"
+                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.txtColor.title']}"></span>
                                         </label>
                                         <div>
@@ -150,7 +150,7 @@
                             <div class="form-group">
                                 <label class="col-sm-3 control-label" for="tagline">
                                     #{bundle['dataverse.theme.tagline']}
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.tagline.title']}"></span>
                                 </label>
                                 <h:inputHidden id="linkAndUrl" value="true">
@@ -167,7 +167,7 @@
                             <div class="form-group">
                                 <label class="col-sm-3 control-label" for="website">
                                     #{bundle['dataverse.theme.website']}
-                                    <span class="glyphicon glyphicon-question-sign text-muted"
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.website.title']}"></span>
                                 </label>
                                 <div class="col-sm-6">

From 01794c74b276c0c36e5d28bcf34d00c04fc44800 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Mon, 4 Mar 2019 09:34:37 -0500
Subject: [PATCH 18/22] Fixed broken icons in Style Guide [ref #3925]

---
 doc/sphinx-guides/source/style/foundations.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/sphinx-guides/source/style/foundations.rst b/doc/sphinx-guides/source/style/foundations.rst
index d90b617575f..5a404f2d6eb 100755
--- a/doc/sphinx-guides/source/style/foundations.rst
+++ b/doc/sphinx-guides/source/style/foundations.rst
@@ -264,10 +264,10 @@ There are over 250 glyphs in font format from the Glyphicon Halflings set provid
 .. raw:: html
 
 	<div class="panel panel-default code-example">
-	  <div class="panel-body">
-        <span class="glyphicon glyphicon-search h1"></span>
-        <span class="glyphicon glyphicon-user h1"></span>
-        <span class="glyphicon glyphicon-lock h1"></span>
+	  <div class="panel-body h1">
+        <span class="glyphicon glyphicon-search"></span>
+        <span class="glyphicon glyphicon-user"></span>
+        <span class="glyphicon glyphicon-lock"></span>
 	  </div>
 	</div>
 

From a28ae1dcbe7a2c78f4be3c17080564e60a4304ed Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Mon, 4 Mar 2019 15:04:18 -0500
Subject: [PATCH 19/22] Added new tooltip and icon changes to Style Guide, also
 applied guidelines style to a various msgs [ref #3925]

---
 .../source/_static/docsdataverse_org.css      |   4 +
 doc/sphinx-guides/source/style/patterns.rst   | 205 ++++++++++++------
 src/main/java/Bundle.properties               |   2 +-
 src/main/webapp/dataset.xhtml                 |   2 +-
 src/main/webapp/editFilesFragment.xhtml       |   4 +-
 .../file-configure-dropdown-fragment.xhtml    |   2 +-
 src/main/webapp/file.xhtml                    |   2 +-
 src/main/webapp/harvestclients.xhtml          |   4 +-
 src/main/webapp/harvestsets.xhtml             |   4 +-
 src/main/webapp/manage-groups.xhtml           |   2 +-
 src/main/webapp/manage-guestbooks.xhtml       |   2 +-
 src/main/webapp/roles-edit.xhtml              |   6 +-
 12 files changed, 155 insertions(+), 84 deletions(-)

diff --git a/doc/sphinx-guides/source/_static/docsdataverse_org.css b/doc/sphinx-guides/source/_static/docsdataverse_org.css
index ed017802f6a..38efc8891a6 100755
--- a/doc/sphinx-guides/source/_static/docsdataverse_org.css
+++ b/doc/sphinx-guides/source/_static/docsdataverse_org.css
@@ -96,6 +96,10 @@ div.code-example .color-swatch {
     margin: 0 5px;
     border-radius: 3px
 }
+div.code-example .messagePanel .glyphicon {
+    font-size: 1.5em;
+    vertical-align: bottom;
+}
 
 #breadcrumbNavBlock {margin-top:.5em;}
 #breadcrumbNavBlock .breadcrumbBlock {float:left; position:relative;}
diff --git a/doc/sphinx-guides/source/style/patterns.rst b/doc/sphinx-guides/source/style/patterns.rst
index 80792bbdf68..781de3d40fb 100644
--- a/doc/sphinx-guides/source/style/patterns.rst
+++ b/doc/sphinx-guides/source/style/patterns.rst
@@ -199,42 +199,18 @@ Forms fulfill various functions across the site, but we try to style them consis
   <div class="panel panel-default code-example">
     <div class="panel-body">
 
-		<div class="form-horizontal">
-			<div class="form-group">
+		      <div class="form-horizontal">
+			       <div class="form-group">
                 <label for="userNameEmail" class="col-sm-3 control-label">
-                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="Between 2-60 characters, and can use &quot;a-z&quot;, &quot;0-9&quot;, &quot;_&quot; for your username.">
-                        Username <span class="glyphicon glyphicon-asterisk text-danger"></span>
-                    </span>
+                    Username 
                 </label>
                 <div class="col-sm-4">
                 	<input name="userName" type="text" value="" tabindex="1" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all ui-state-default form-control" role="textbox" aria-disabled="false" aria-readonly="false">
                 </div>
             </div>
-            <div class="form-group">
-                <label for="firstName" class="col-sm-3 control-label">
-                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="The first name or name you would like to use for this account.">
-                        Given Name <span class="glyphicon glyphicon-asterisk text-danger"></span>
-                    </span>
-                </label>
-                <div class="col-sm-4">
-                	<input name="firstName" type="text" value="" tabindex="4" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all form-control" role="textbox" aria-disabled="false" aria-readonly="false">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="lastName" class="col-sm-3 control-label">
-                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="The last name you would like to use for this account.">
-                        Family Name <span class="glyphicon glyphicon-asterisk text-danger"></span>
-                    </span>
-                </label>
-                <div class="col-sm-4">
-                	<input name="lastName" type="text" value="" tabindex="5" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all form-control" role="textbox" aria-disabled="false" aria-readonly="false">
-                </div>
-            </div>
             <div class="form-group">
                 <label for="email" class="col-sm-3 control-label">
-                    <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="" title="">
-                        Email <span class="glyphicon glyphicon-asterisk text-danger"></span>
-                    </span>
+                    Email 
                 </label>
                 <div class="col-sm-4">
                 	<input name="email" type="text" value="" tabindex="6" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all form-control" role="textbox" aria-disabled="false" aria-readonly="false">
@@ -250,16 +226,73 @@ Forms fulfill various functions across the site, but we try to style them consis
   <div class="form-horizontal">
     <div class="form-group">
       <label for="userNameEmail" class="col-sm-3 control-label">
-        <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="Between 2-60 characters, and can use &quot;a-z&quot;, &quot;0-9&quot;, &quot;_&quot; for your username.">
-          Username <span class="glyphicon glyphicon-asterisk text-danger"></span>
-        </span>
+        #{bundle['user.username']} 
       </label>
       <div class="col-sm-4">
-        <input name="userName" type="text" value="" tabindex="1" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all ui-state-disabled form-control" role="textbox" aria-disabled="true" aria-readonly="false">
+        <p:inputText id="userName" styleClass="form-control"></p>
       </div>
     </div>
   </div>
 
+Here are additional form elements that are common across many pages, including required asterisks, icon tooltips, placeholder text, input info message with popover link, and validation error message.
+
+.. raw:: html
+
+  <div class="panel panel-default code-example">
+    <div class="panel-body">
+
+      <div class="form-group form-col-container col-sm-9 edit-compound-field">
+          <div class="form-col-container col-sm-12">
+              <p class="help-block">
+                  This field supports only certain <span class="text-info popoverHTML">HTML tags</span>.
+              </p>
+              <label class="control-label" for="metadata_dsDescriptionValue">
+                  Text <span class="glyphicon glyphicon-asterisk text-danger"></span>
+                  <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto right" data-original-title="A summary describing the purpose, nature, and scope of the Dataset."></span>
+              </label>
+              <div>
+                  <textarea id="datasetForm:description" name="datasetForm:description" cols="60" rows="5" tabindex="1" maxlength="2147483647" class="ui-inputfield ui-inputtextarea ui-widget ui-state-default ui-corner-all form-control ui-inputtextarea-resizable" role="textbox" aria-disabled="false" aria-readonly="false" aria-multiline="true" data-autosize-on="true" placeholder="" style="overflow: hidden; word-wrap: break-word; height: 114px;"></textarea>
+                  
+                  <div aria-live="polite" class="ui-message ui-message-error ui-widget ui-corner-all">
+                      <span class="ui-message-error-detail">Description Text is required.</span>
+                  </div>
+              </div>
+          </div>
+          <div class="form-col-container col-sm-6">
+               <label class="control-label" for="metadata_dsDescriptionDate">
+                   Date
+                   <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto right" data-original-title="In cases where a Dataset contains more than one description (for example, one might be supplied by the data producer and another prepared by the data repository where the data are deposited), the date attribute is used to distinguish between the two descriptions. The date attribute follows the ISO convention of YYYY-MM-DD."></span>
+              </label>
+              <div>
+                <input id="datasetForm:inputText" name="datasetForm:inputText" type="text" tabindex="1" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all form-control " role="textbox" aria-disabled="false" aria-readonly="false" placeholder="YYYY-MM-DD">
+              </div>
+            </div>
+        </div>
+    </div>
+
+.. code-block:: html
+
+  <div class="form-group form-col-container col-sm-9 edit-compound-field">
+      <div class="form-col-container col-sm-12">
+          <p class="help-block">
+              <h:outputFormat value="#{bundle.htmlAllowedMsg}" escape="false">
+                  <f:param value="#{bundle.htmlAllowedTags}"/>
+              </h:outputFormat>
+          </p>
+          <label class="control-label" for="metadata_#{subdsf.datasetFieldType.name}">
+              #{subdsf.datasetFieldType.localeTitle}
+              <h:outputText styleClass="glyphicon glyphicon-asterisk text-danger" value="" />
+              <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto right" data-original-title="#{subdsf.datasetFieldType.localeDescription}"></span>
+          </label>
+          <div>
+              <p:inputTextarea value="#{dsfv.valueForEdit}" id="description" tabindex="#{block.index+1}" rows="5" cols="60" styleClass="form-control" />
+              <div class="alert-danger" jsf:rendered="#{!empty subdsf.validationMessage}">
+                  <strong>#{subdsf.validationMessage}</strong>
+              </div>
+          </div>
+      </div>
+  </div>
+
 
 Buttons
 =======
@@ -510,16 +543,19 @@ For our help/information, success, warning, and error message blocks we use a cu
 
   <div class="panel panel-default code-example">
     <div class="panel-body">
-      <div class="color-swatches">
+      <div class="messagePanel">
         <div class="alert alert-dismissable alert-info">
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
-	        <span class="glyphicon glyphicon-info-sign"></span>&nbsp;<strong>Edit Dataset Metadata - Add more metadata about this dataset to help others easily find it.</strong>&nbsp;
-	    </div>
-	    <div class="alert alert-success">
-            <span class="glyphicon glyphicon glyphicon-ok-sign"></span>&nbsp;<strong>Success!</strong> – The metadata for this dataset has been updated.
+          <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+	        <span class="glyphicon glyphicon-info-sign"></span>&nbsp;<strong>Edit Dataset Metadata</strong> - Add more metadata about this dataset to help others easily find it.
+	      </div>
+	      <div class="alert alert-success">
+          <span class="glyphicon glyphicon glyphicon-ok-sign"></span>&nbsp;<strong>Success!</strong> – The metadata for this dataset has been updated.
+        </div>
+        <div class="alert alert-warning">
+          <span class="glyphicon glyphicon glyphicon-warning-sign"></span>&nbsp;<strong>File Upload in Progress</strong> – This dataset is locked while the data files are being transferred and verified.
         </div>
         <div class="alert alert-danger">
-			<span class="glyphicon glyphicon-exclamation-sign"></span>&nbsp;<strong>Error</strong> – The username, email address, or password you entered is invalid. Need assistance accessing your account? If you believe this is an error, please contact <a href="#" class="ui-commandlink ui-widget" onclick="return false;">Root Support</a> for assistance.
+          <span class="glyphicon glyphicon-exclamation-sign"></span>&nbsp;<strong>Error</strong> – The username, email address, or password you entered is invalid. Need assistance accessing your account? If you believe this is an error, please contact <a href="#" class="ui-commandlink ui-widget" onclick="return false;">Root Support</a> for assistance.
         </div>
       </div>
     </div>
@@ -533,6 +569,62 @@ For our help/information, success, warning, and error message blocks we use a cu
    <div class="alert alert-danger" role="alert">...</div>
 
 
+Message Classes
+---------------
+
+Style classes can be added to ``p``, ``div``, ``span`` and other elements to add emphasis to inline message blocks.
+
+.. raw:: html
+
+  <div class="panel panel-default code-example">
+    <div class="panel-body">
+
+      <p class="help-block">
+        <span class="text-muted">Select dataverses to feature on the homepage of this dataverse.</span>
+      </p>
+
+      <p class="help-block">
+        <span class="glyphicon glyphicon-ok-sign text-success"></span> <span class="text-success">Search query returned 1,000 datasets!</span>
+      </p>
+
+      <p class="help-block">
+        <span class="glyphicon glyphicon-asterisk text-info"></span> <span class="text-info">Permissions with an asterisk icon indicate actions that can be performed by users not logged into Dataverse.</span>
+      </p>
+
+      <p class="help-block">
+        <span class="glyphicon glyphicon-warning-sign text-warning"></span> <span class="text-warning">Are you sure you want to remove all roles for user dataverseUser?</span>
+      </p>
+
+      <p class="help-block">
+        <span class="glyphicon glyphicon-exclamation-sign text-danger"></span> <span class="text-danger">Please select two versions to view the differences.</span>
+      </p>
+
+    </div>
+  </div>
+
+.. code-block:: html
+    
+      <p class="help-block">
+        <span class="text-muted">...</span>
+      </p>
+
+      <p class="help-block">
+        <span class="glyphicon glyphicon-ok-sign text-success"></span> <span class="text-success">...</span>
+      </p>
+
+      <p class="help-block">
+        <span class="glyphicon glyphicon-asterisk text-info"></span> <span class="text-info">...</span>
+      </p>
+
+      <p class="help-block">
+        <span class="glyphicon glyphicon-warning-sign text-warning"></span> <span class="text-warning">...</span>
+      </p>
+
+      <p class="help-block">
+        <span class="glyphicon glyphicon-exclamation-sign text-danger"></span> <span class="text-danger">...</span>
+      </p>
+
+
 Images
 ======
 
@@ -571,24 +663,14 @@ The most common of our containers, the `Panels component <http://getbootstrap.co
 
         <div class="panel-group">
             <div class="panel panel-default">
-                <div data-toggle="collapse" data-target="#panelCollapse0" class="panel-heading text-info">
-                    Panel Heading &nbsp;<span class="glyphicon glyphicon-chevron-up"></span>
+                <div data-toggle="collapse" data-target="#panelCollapse0" class="panel-heading">
+                    <span class="text-info">Panel Heading &nbsp;<span class="glyphicon glyphicon-chevron-up"></span></span>
                 </div>
                 <div id="panelCollapse0" class="collapse in">
                     <div class="panel-body metadata-panel-body">
                         <div class="form-group col-sm-12">
                             <label for="metadata_dsDescription" class="col-sm-3 control-label">
-                                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="Label description.">
-                                    Label
-                                </span>
-                            </label>
-                            <div class="col-sm-9">Value</div>
-                        </div>
-                        <div class="form-group col-sm-12">
-                            <label for="metadata_subject" class="col-sm-3 control-label">
-                                <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="Label description.">
-                                    Label
-                                </span>
+                                Label
                             </label>
                             <div class="col-sm-9">Value</div>
                         </div>
@@ -610,24 +692,12 @@ The most common of our containers, the `Panels component <http://getbootstrap.co
 
   <div class="panel panel-default">
     <div data-toggle="collapse" data-target="#panelCollapse0" class="panel-heading">
-      Panel Heading &#160;<span class="glyphicon glyphicon-chevron-up"/>
+      <span class="text-info">Panel Heading &#160;<span class="glyphicon glyphicon-chevron-up"/></span>
     </div>
     <div id="panelCollapse0" class="panel-body form-horizontal collapse in">
       <div class="form-group">
         <label class="col-sm-4 control-label">
-          <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="Label description.">
-            Label
-          </span>
-        </label>
-        <div class="col-sm-6">
-          Value
-        </div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-4 control-label">
-          <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="Label description.">
-            Label
-          </span>
+          Label
         </label>
         <div class="col-sm-6">
           Value
@@ -662,9 +732,6 @@ We use the `TabView component <https://www.primefaces.org/showcase/ui/panel/tabV
 		      	<li class="ui-state-default ui-corner-top" role="tab" aria-expanded="false" aria-selected="false" tabindex="-1">
 		      		<a href="#" onclick="return false;" tabindex="-1">Content Tab 3</a>
 	      		</li>
-		      	<li class="ui-state-default ui-corner-top" role="tab" aria-expanded="false" aria-selected="false" tabindex="-1">
-		      		<a href="#" onclick="return false;" tabindex="-1">Content Tab 4</a>
-	      		</li>
 	      	</ul>
 
       	</div>
diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
index 2e8e4530c5d..55caa0626d4 100755
--- a/src/main/java/Bundle.properties
+++ b/src/main/java/Bundle.properties
@@ -974,7 +974,7 @@ dataverse.permissions.roles.id.title=Enter a name for the alias.
 dataverse.permissions.roles.description.title=Describe the role (1000 characters max).
 dataverse.permissions.roles.description.counter={0} characters remaining
 dataverse.permissions.roles.roleList.header=Role Permissions
-dataverse.permissions.roles.roleList.authorizedUserOnly=Permissions with the information icon indicate actions that can be performed by users not logged into Dataverse.
+dataverse.permissions.roles.roleList.authorizedUserOnly=Permissions with an asterisk icon indicate actions that can be performed by users not logged into Dataverse.
 
 # explicitGroup-new-dialog.xhtml
 dataverse.permissions.explicitGroupEditDialog.title.new=Create Group
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 98e1cadd857..5d29a48d7b4 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -852,7 +852,7 @@
                     <p:confirmDialog id="reasonTooManyCharacters" message="#{bundle['file.deaccessionDialog.dialog.limitChar.tip']}" header="#{bundle['file.deaccessionDialog.dialog.limitChar.header']}" widgetVar="reasonTooManyCharacters"> </p:confirmDialog>
                     <p:inputText id="hiddenReasonInput" style="display:none" widgetVar="hiddenReasonInput"/>
                     <p:dialog id="compareTwo" header="#{bundle['file.viewDiffDialog.header']}" widgetVar="compareTwo" modal="true">
-                        <p class="help-block"><span class="glyphicon glyphicon-warning-sign text-danger"/> <span class="text-danger">#{bundle['file.viewDiffDialog.dialog.warning']}</span></p>
+                        <p class="help-block"><span class="glyphicon glyphicon-exclamation-sign text-danger"/> <span class="text-danger">#{bundle['file.viewDiffDialog.dialog.warning']}</span></p>
                         <div class="button-block">
                             <p:commandButton value="#{bundle.close}" onclick="PF('compareTwo').hide();PF('blockDatasetForm').hide();" type="button" />
                         </div>
diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index 9dca6170695..09e202c8761 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -237,7 +237,7 @@
                                     <!-- CAN'T DOWNLOAD RSYNC SCRIPT DUE to DCM BACKEND BROKEN. -->
                                     <ui:fragment rendered="#{empty EditDatafilesPage.workingVersion.fileMetadatas and !EditDatafilesPage.isHasRsyncScript()}">
                                         <p class="help-block">
-                                            <span class="glyphicon glyphicon-warning-sign text-danger"></span>
+                                            <span class="glyphicon glyphicon-exclamation-sign text-danger"></span>
                                             <h:outputFormat class="text-danger" value=" #{bundle['file.rsyncUpload.noScriptBroken']}" escape="false">
                                                 <o:param>
                                                     <p:commandLink value="#{settingsWrapper.supportTeamName}" oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}">
@@ -787,7 +787,7 @@
     <p:dialog id="fileThumbnailConfirm" styleClass="smallPopUp" header="#{bundle['file.setThumbnail.header']}" widgetVar="fileThumbnailConfirm" modal="true">
         <div>
             <p class="help-block">
-                <span class="glyphicon glyphicon-warning-sign text-danger"/> <span class="text-danger">#{bundle['file.setThumbnail.confirmation']}</span>
+                <span class="glyphicon glyphicon-exclamation-sign text-danger"/> <span class="text-danger">#{bundle['file.setThumbnail.confirmation']}</span>
             </p>
         </div>
         <div class="button-block">
diff --git a/src/main/webapp/file-configure-dropdown-fragment.xhtml b/src/main/webapp/file-configure-dropdown-fragment.xhtml
index f2e11a4383c..d23e39bf38c 100644
--- a/src/main/webapp/file-configure-dropdown-fragment.xhtml
+++ b/src/main/webapp/file-configure-dropdown-fragment.xhtml
@@ -42,7 +42,7 @@
 
           <p:dialog header="#{bundle['file.mapData.unpublished.header']}" widgetVar="mapData_popup" modal="true" rendered="#{(worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata))}">
               <p class="help-block">
-                  <span class="text-danger"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.mapData.unpublished.message']}</span>
+                  <span class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['file.mapData.unpublished.message']}</span>
               </p>
               <div class="button-block">
                   <button type="button" class="btn btn-default" onclick="PF('mapData_popup').hide();PF('blockDatasetForm').hide();">
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 9d249b3aec6..d16430690e7 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -591,7 +591,7 @@
                     <!-- Request Access Sign Up/Log In Button -->
                     <p:dialog header="#{bundle['file.requestAccess']}" widgetVar="accessSignUpLogIn_popup" modal="true">
                         <p class="help-block">
-                            <span class="glyphicon glyphicon-warning-sign text-danger"/>&#160;
+                            <span class="glyphicon glyphicon-exclamation-sign text-danger"/>&#160;
                             <h:outputFormat styleClass="text-danger" value="#{dataverseHeaderFragment.signupAllowed ? bundle['file.requestAccess.dialog.msg.signup'] : bundle['file.requestAccess.dialog.msg']}" escape="false">
                                 <f:param value="#{navigationWrapper.redirectPage}"/>
                                 <f:param value="#{dataverseHeaderFragment.getSignupUrl(navigationWrapper.redirectPage)}"/>
diff --git a/src/main/webapp/harvestclients.xhtml b/src/main/webapp/harvestclients.xhtml
index 95fc708cb04..18a65f87b8f 100644
--- a/src/main/webapp/harvestclients.xhtml
+++ b/src/main/webapp/harvestclients.xhtml
@@ -153,8 +153,8 @@
                               modal="true" width="65%"
                               header="#{bundle['harvestclients.tab.header.action.btn.delete.dialog.header']}">
                         <p class="help-block">
-                            <span class="glyphicon glyphicon-warning-sign text-danger"/>
-                            <h:outputFormat styleClass="text-danger" value=" #{bundle['harvestclients.tab.header.action.btn.delete.dialog.warning']}">
+                            <span class="glyphicon glyphicon-warning-sign text-warning"/>
+                            <h:outputFormat styleClass="text-warning" value=" #{bundle['harvestclients.tab.header.action.btn.delete.dialog.warning']}">
                                 <f:param value="#{harvestingClientsPage.getSelectedClient().name}"/>
                             </h:outputFormat>
                         </p>
diff --git a/src/main/webapp/harvestsets.xhtml b/src/main/webapp/harvestsets.xhtml
index d7ffca72422..12c539b12b5 100644
--- a/src/main/webapp/harvestsets.xhtml
+++ b/src/main/webapp/harvestsets.xhtml
@@ -178,8 +178,8 @@
                     <!-- confirmation dialog for deleting a set: -->
                     <p:dialog id="deleteConfirmation" header="#{bundle['harvestserver.tab.header.action.btn.delete.dialog.header']}" widgetVar="deleteConfirmation" modal="true">
                         <p class="help-block">
-                            <span class="glyphicon glyphicon-warning-sign text-danger"/> 
-                            <h:outputFormat styleClass="text-danger" value=" #{bundle['harvestserver.tab.header.action.btn.delete.dialog.tip']}">
+                            <span class="glyphicon glyphicon-warning-sign text-warning"/> 
+                            <h:outputFormat styleClass="text-warning" value=" #{bundle['harvestserver.tab.header.action.btn.delete.dialog.tip']}">
                                 <f:param value="#{harvestingSetsPage.getSelectedSet().spec}"/>
                             </h:outputFormat>
                         </p>
diff --git a/src/main/webapp/manage-groups.xhtml b/src/main/webapp/manage-groups.xhtml
index 807dac4f204..0065adc2b34 100644
--- a/src/main/webapp/manage-groups.xhtml
+++ b/src/main/webapp/manage-groups.xhtml
@@ -88,7 +88,7 @@
                     </div>
                     <p:dialog header="#{bundle['dataverse.manageGroups.tab.action.btn.delete.dialog.header']}" widgetVar="deleteConfirmation" modal="true">
                         <p class="help-block">
-                            <span class="glyphicon glyphicon-warning-sign text-danger"/> <span class="text-danger">#{bundle['dataverse.manageGroups.tab.action.btn.delete.dialog.tip']}</span>
+                            <span class="glyphicon glyphicon-warning-sign text-warning"/> <span class="text-warning">#{bundle['dataverse.manageGroups.tab.action.btn.delete.dialog.tip']}</span>
                         </p>
                         <div class="button-block">
                             <p:commandButton value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageGroupsPage.deleteGroup()}" update="@all" />
diff --git a/src/main/webapp/manage-guestbooks.xhtml b/src/main/webapp/manage-guestbooks.xhtml
index 3720929295a..8146b920978 100644
--- a/src/main/webapp/manage-guestbooks.xhtml
+++ b/src/main/webapp/manage-guestbooks.xhtml
@@ -147,7 +147,7 @@
                     </div>
                     <p:dialog header="#{bundle['dataset.manageGuestbooks.tab.action.btn.delete.dialog.header']}" widgetVar="deleteConfirmation" modal="true">
                         <p class="help-block">
-                            <span class="glyphicon glyphicon-warning-sign text-danger"/> <span class="text-danger">#{bundle['dataset.manageGuestbooks.tab.action.btn.delete.dialog.tip']}</span>
+                            <span class="glyphicon glyphicon-warning-sign text-warning"/> <span class="text-warning">#{bundle['dataset.manageGuestbooks.tab.action.btn.delete.dialog.tip']}</span>
                         </p>
                         <div class="button-block">
                             <p:commandButton value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageGuestbooksPage.deleteGuestbook()}" update="@all" />
diff --git a/src/main/webapp/roles-edit.xhtml b/src/main/webapp/roles-edit.xhtml
index 4565929612f..4f02e163ae6 100644
--- a/src/main/webapp/roles-edit.xhtml
+++ b/src/main/webapp/roles-edit.xhtml
@@ -50,12 +50,12 @@
                     </div>
                 </div>
             </p:panel>
-            <p:panel id="editRolePermissionPanel" styleClass="panelLayoutBlock" header="#{bundle['dataverse.permissions.roles.roleList.header']}">
+            <p:panel id="editRolePermissionPanel" styleClass="panelLayoutBlock form-group" header="#{bundle['dataverse.permissions.roles.roleList.header']}">
                 <p class="help-block">
-                    <span class="text-info"><i class="glyphicon glyphicon glyphicon-info-sign"></i> #{bundle['dataverse.permissions.roles.roleList.authorizedUserOnly']}</span>
+                    <span class="glyphicon glyphicon glyphicon-asterisk text-info"></span> <span class="text-info">#{bundle['dataverse.permissions.roles.roleList.authorizedUserOnly']}</span>
                 </p>
                 <c:set var="authOnlyRemark">
-                    <i class="glyphicon glyphicon glyphicon-info-sign text-info"></i>
+                    <span class="glyphicon glyphicon glyphicon-asterisk text-info"></span>
                 </c:set>
                 <h:selectManyCheckbox value="#{managePermissionsPage.selectedPermissions}"
                                       layout="pageDirection" styleClass="selectManyCheckboxBlock">

From 9e41f4885b285e5a490b9de7e5561f43ed1ef532 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Tue, 5 Mar 2019 17:28:14 -0500
Subject: [PATCH 20/22] Fixed tooltips functionality in guides, removed
 outdated analytics code [ref #3925]

---
 .../source/_static/docsdataverse_org.css      |  2 ++
 .../source/_static/dv_rebind_bootstrap_ui.js  | 33 +++++++++++++++++--
 .../source/_templates/layout.html             | 10 +++---
 .../bootstrap/layout.html                     |  3 +-
 4 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/doc/sphinx-guides/source/_static/docsdataverse_org.css b/doc/sphinx-guides/source/_static/docsdataverse_org.css
index 38efc8891a6..29b6a08ab59 100755
--- a/doc/sphinx-guides/source/_static/docsdataverse_org.css
+++ b/doc/sphinx-guides/source/_static/docsdataverse_org.css
@@ -100,6 +100,8 @@ div.code-example .messagePanel .glyphicon {
     font-size: 1.5em;
     vertical-align: bottom;
 }
+div.code-example span.glyphicon-question-sign.tooltip-icon {color: #99bcdb !important;}
+div.code-example span.glyphicon-question-sign.tooltip-icon:hover {color: #337AB7 !important;}
 
 #breadcrumbNavBlock {margin-top:.5em;}
 #breadcrumbNavBlock .breadcrumbBlock {float:left; position:relative;}
diff --git a/doc/sphinx-guides/source/_static/dv_rebind_bootstrap_ui.js b/doc/sphinx-guides/source/_static/dv_rebind_bootstrap_ui.js
index dc61716f837..e90a1268419 100644
--- a/doc/sphinx-guides/source/_static/dv_rebind_bootstrap_ui.js
+++ b/doc/sphinx-guides/source/_static/dv_rebind_bootstrap_ui.js
@@ -1,4 +1,31 @@
-function bind_tooltip(){
-    // bind tooltips to all necessary elements
-    $("a.bootstrap-button-tooltip").tooltip({container: 'body'});
+function bind_bsui_components(){
+	bind_tooltip_popover();
+}
+
+function bind_tooltip_popover(){
+    // bind tooltips + popovers to all necessary elements
+    $jqTheme(".bootstrap-button-tooltip, [data-toggle='tooltip']").tooltip({container: 'body'});
+    $jqTheme("[data-toggle='popver']").popover({container: 'body'});
+    
+    // CLOSE OPEN TOOLTIPS + POPOVERS ON BODY CLICKS
+    $jqTheme('body').on("touchstart", function(e){
+        $jqTheme(".bootstrap-button-tooltip, [data-toggle='tooltip']").each(function () {
+            // hide any open tooltips when anywhere else in body is clicked
+            if (!$jqTheme(this).is(e.target) && $jqTheme(this).has(e.target).length === 0 && $jqTheme('div.tooltip').has(e.target).length === 0) {
+                $jqTheme(this).tooltip('hide');
+            }////end if
+        });
+        $jqTheme("a.popoverHTML, [data-toggle='popover']").each(function () {
+            //the 'is' for buttons that trigger popups
+            //the 'has' for icons within a button that triggers a popup
+            if (!$jqTheme(this).is(e.target) && $jqTheme(this).has(e.target).length === 0 && $jqTheme('div.popover').has(e.target).length === 0) {
+                $jqTheme(this).popover('hide');
+            }
+        });
+    });
+    
+    // CLOSE OPEN TOOLTIPS ON BUTTON CLICKS
+    $jqTheme('.bootstrap-button-tooltip').on('click', function () {
+        $jqTheme(this).tooltip('hide');
+    });
 }
\ No newline at end of file
diff --git a/doc/sphinx-guides/source/_templates/layout.html b/doc/sphinx-guides/source/_templates/layout.html
index 7a31569b0d5..b027c6caa82 100755
--- a/doc/sphinx-guides/source/_templates/layout.html
+++ b/doc/sphinx-guides/source/_templates/layout.html
@@ -5,12 +5,10 @@
 {% block footer %}
 {{ super() }}
 <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-57484542-1', 'auto');
-  ga('send', 'pageview');
+    $jqTheme(document).ready(function () {
+        // Rebind bootstrap UI components
+        bind_bsui_components();
+    });
 </script>
 {% endblock %}
 
diff --git a/doc/sphinx_bootstrap_theme/bootstrap/layout.html b/doc/sphinx_bootstrap_theme/bootstrap/layout.html
index 5477ec74600..61ec5309e22 100755
--- a/doc/sphinx_bootstrap_theme/bootstrap/layout.html
+++ b/doc/sphinx_bootstrap_theme/bootstrap/layout.html
@@ -13,7 +13,8 @@
     '_static/js/jquery-fix.js',
     '_static/bootstrap-' + bootstrap_version + '/js/bootstrap.min.js',
     '_static/bootstrap-sphinx.js',
-    '_static/navbarscroll.js'
+    '_static/navbarscroll.js',
+    '_static/dv_rebind_bootstrap_ui.js'
   ]
 %}
 

From 54cc13b7de8ef5ef27dbbb765e11a655ae3de871 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Tue, 5 Mar 2019 17:58:15 -0500
Subject: [PATCH 21/22] Returned previously removed analytics code to guides
 [ref #3925]

---
 doc/sphinx-guides/source/_templates/layout.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/sphinx-guides/source/_templates/layout.html b/doc/sphinx-guides/source/_templates/layout.html
index b027c6caa82..3942c492970 100755
--- a/doc/sphinx-guides/source/_templates/layout.html
+++ b/doc/sphinx-guides/source/_templates/layout.html
@@ -10,6 +10,14 @@
         bind_bsui_components();
     });
 </script>
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-57484542-1', 'auto');
+  ga('send', 'pageview');
+</script>
 {% endblock %}
 
 {# Import the theme's layout. #}

From 0a782f8e3ab90edef3df26017ffc59b2f325518a Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Thu, 7 Mar 2019 11:07:37 -0500
Subject: [PATCH 22/22] Fixed broken tooltips on edit password and edit dataset
 pgs [ref #3925]

---
 src/main/webapp/dataset.xhtml       | 2 +-
 src/main/webapp/dataverseuser.xhtml | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 5d29a48d7b4..fce20f2a1ba 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -474,7 +474,7 @@
                                 <p:commandButton value="#{bundle['file.dataFilesTab.button.direct']}" id="updateTemplate"
                                                  style="display:none"
                                                  update=":datasetForm,accessPopup"
-                                                 action="#{DatasetPage.handleChangeButton}">
+                                                 action="#{DatasetPage.handleChangeButton}" oncomplete="javascript:bind_bsui_components();">
                                 </p:commandButton>
                             </div>
                         </div>
diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index 79ba2ce4049..dad207b0a59 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -50,12 +50,13 @@
                                 <ui:fragment rendered="#{DataverseUserPage.passwordEditable or DataverseUserPage.accountDetailsEditable}">
                                     <li>
                                         <p:commandLink id="editAccount" rendered="#{DataverseUserPage.accountDetailsEditable}"
-                                                       actionListener="#{DataverseUserPage.edit}" update="@form" oncomplete="bind_bsui_components();">
+                                                       actionListener="#{DataverseUserPage.edit}" update="@form" oncomplete="javascript:bind_bsui_components();">
                                             <h:outputText value="#{bundle['account.info']}" />
                                         </p:commandLink>
                                     </li>
                                     <li>
-                                        <p:commandLink id="changePassword" rendered="#{DataverseUserPage.passwordEditable}" actionListener="#{DataverseUserPage.changePassword}" update="@form">
+                                        <p:commandLink id="changePassword" rendered="#{DataverseUserPage.passwordEditable}" 
+                                                       actionListener="#{DataverseUserPage.changePassword}" update="@form" oncomplete="javascript:bind_bsui_components();">
                                             <h:outputText value="#{bundle.passwd}" />
                                         </p:commandLink>
                                     </li>