diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/admin/adminDaemonJobsViewLogsResults.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/admin/adminDaemonJobsViewLogsResults.jsp
index 7ca404755afa..7954157d1a8a 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/admin/adminDaemonJobsViewLogsResults.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/admin/adminDaemonJobsViewLogsResults.jsp
@@ -112,11 +112,11 @@
                         <td>${guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.id}</td>
                         <td style="white-space: nowrap">${guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.lastUpdated}</td>
                         <td style="white-space: nowrap">${guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.host}</td>
-                        <td style="white-space: nowrap"><span class="jobMessageContainer"><grouper:abbreviateTextarea text="${guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.jobMessage}" showCharCount="30" cols="20" rows="3"/></span><c:if test="${not empty guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.jobMessage}"> <a href="#" onclick="grouperCopyJobMessage(this); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" style="margin-left:4px;"><i class="fa fa-clone" aria-hidden="true"></i></a></c:if></td>
+                        <td style="white-space: nowrap"><span class="jobMessageContainer"><grouper:abbreviateTextarea text="${guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.jobMessage}" showCharCount="30" cols="20" rows="3"/></span><c:if test="${not empty guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.jobMessage}"> <button type="button" onclick="grouperCopyJobMessage(this); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" class="btn-link" style="margin-left:4px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button></c:if></td>
                         <td style="white-space: nowrap">${guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.parentJobId}</td>
                         <td style="white-space: nowrap">
                           <c:if test="${guiHib3GrouperLoaderLog.hib3GrouperLoaderLog.status == 'ERROR_FAILSAFE' && grouperRequestContainer.adminContainer.guiDaemonJobs.get(0).failsafeNeedsApproval}">
-                            <a href="#" onclick="ajax('../app/UiV2Admin.daemonJobsSubmit?action=failsafeApprove&source=logs&jobName=${grouper:escapeUrl(grouperRequestContainer.adminContainer.guiDaemonJobs.get(0).jobName)}'); return false;">${textContainer.text['adminDaemonJobsMoreActionsFailsafeApprove'] }</a>
+                            <button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" onclick="ajax('../app/UiV2Admin.daemonJobsSubmit?action=failsafeApprove&source=logs&jobName=${grouper:escapeUrl(grouperRequestContainer.adminContainer.guiDaemonJobs.get(0).jobName)}'); return false;">${textContainer.text['adminDaemonJobsMoreActionsFailsafeApprove'] }</button>
                           </c:if>
                         </td>
                           
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/assetsJsp/header.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/assetsJsp/header.jsp
index ebc4833379a3..512517ad6d50 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/assetsJsp/header.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/assetsJsp/header.jsp
@@ -1,6 +1,6 @@
 <header class="pull-left"><a href="?operation=UiV2Main.indexMain" onclick="return handleGuiV2LinkClick(event, 'operation=UiV2Main.indexMain');" aria-label="${textContainer.textEscapeXml['ariaLabelGrouperHome']}" title="${textContainer.text['institutionName']}"><img class="brand" src="../../${mediaMap['image.organisation-logo']}" alt="" style="padding-top: 5px; padding-bottom: 5px" /></a><br />
    <c:if test="${mediaMap['uiV2.disable.hide-show.side.panel']=='false'}">
-      <a id="grouperHideSidePanelId" href="#" style="font-size: smaller; color: inherit" onclick="ajax('../app/UiV2Main.grouperHideSidePanel'); return false;">${textContainer.text['grouperHideSidePanel']}</a>
-      <a id="grouperShowSidePanelId" href="#" style="display: none; font-size: smaller; color: inherit" onclick="ajax('../app/UiV2Main.grouperShowSidePanel'); return false;">${textContainer.text['grouperShowSidePanel']}</a>
+      <button type="button" id="grouperHideSidePanelId" style="font-size: smaller; color: inherit;padding:0;border:0;background:none;font-family:inherit;line-height:inherit;vertical-align:baseline;" onclick="ajax('../app/UiV2Main.grouperHideSidePanel'); return false;">${textContainer.text['grouperHideSidePanel']}</button>
+      <button type="button" id="grouperShowSidePanelId" style="display: none; font-size: smaller; color: inherit;padding:0;border:0;background:none;font-family:inherit;line-height:inherit;vertical-align:baseline;" onclick="ajax('../app/UiV2Main.grouperShowSidePanel'); return false;">${textContainer.text['grouperShowSidePanel']}</button>
   </c:if>
 </header>
\ No newline at end of file
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/attributeDef/attributeDefHeader.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/attributeDef/attributeDefHeader.jsp
index 7c95b7168476..ebd7eeabda4c 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/attributeDef/attributeDefHeader.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/attributeDef/attributeDefHeader.jsp
@@ -179,7 +179,7 @@
                           </tr>
                           <tr>
                             <td><strong>${textContainer.text['attributeDefLabelIdPath']}</strong></td>
-                            <td><span id="attributeDefIdPath">${grouper:escapeHtml(grouperRequestContainer.attributeDefContainer.guiAttributeDef.attributeDef.name)}</span> <a href="#" onclick="grouperCopyToClipboard('attributeDefIdPath'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" style="margin-left:4px;"><i class="fa fa-clone" aria-hidden="true"></i></a></td>
+                            <td><span id="attributeDefIdPath">${grouper:escapeHtml(grouperRequestContainer.attributeDefContainer.guiAttributeDef.attributeDef.name)}</span> <button type="button" onclick="grouperCopyToClipboard('attributeDefIdPath'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" class="btn-link" style="margin-left:4px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button></td>
                           </tr>
                           <tr>
                             <td><strong>${textContainer.text['attributeDefLabelId']}</strong></td>
@@ -218,8 +218,8 @@
                         </tbody>
                       </table>
                     </div>
-                    <p id="attributeDefDetailsMoreId"><a href="#" aria-label="${textContainer.text['ariaLabelGuiMoreAttributeDefDetails']}" id="moreButtonId" onclick="$('#attributeDefDetailsId').show('slow'); $('#attributeDefDetailsMoreId').hide(); $('#attributeDefDetailsLessId').show(); return false" >${textContainer.text['guiMore']} <i class="fa fa-angle-down"></i></a></p>
-                    <p id="attributeDefDetailsLessId" style="display: none"><a href="#" onclick="$('#attributeDefDetailsId').hide('slow'); $('#attributeDefDetailsLessId').hide(); $('#attributeDefDetailsMoreId').show(); return false" >${textContainer.text['guiLess']} <i class="fa fa-angle-up"></i></a></p>
+                    <p id="attributeDefDetailsMoreId"><button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" aria-label="${textContainer.text['ariaLabelGuiMoreAttributeDefDetails']}" id="moreButtonId" onclick="$('#attributeDefDetailsId').show('slow'); $('#attributeDefDetailsMoreId').hide(); $('#attributeDefDetailsLessId').show(); return false" >${textContainer.text['guiMore']} <i class="fa fa-angle-down"></i></button></p>
+                    <p id="attributeDefDetailsLessId" style="display: none"><button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" onclick="$('#attributeDefDetailsId').hide('slow'); $('#attributeDefDetailsLessId').hide(); $('#attributeDefDetailsMoreId').show(); return false" >${textContainer.text['guiLess']} <i class="fa fa-angle-up"></i></button></p>
                   </div>
                   <div class="span2" id="attributeDefMoreActionsButtonContentsDivId">
                     <%@ include file="attributeDefMoreActionsButtonContents.jsp"%>
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/attributeDefName/attributeDefNameView.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/attributeDefName/attributeDefNameView.jsp
index 3acb45682457..49c9a4d8aab7 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/attributeDefName/attributeDefNameView.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/attributeDefName/attributeDefNameView.jsp
@@ -79,7 +79,7 @@ ${grouper:titleFromKeyAndText('viewAttributeDefNamePageTitle', grouperRequestCon
                           <tr class="attributeDefNameDetailsName" style="display: none;">
                             <td style="vertical-align: top; white-space: nowrap;"><strong>${textContainer.text['attributeDefNameIdPathLabel']}</strong></td>
                             <td>
-                              <span id="attributeDefNameIdPath">${grouper:escapeHtml(grouperRequestContainer.attributeDefNameContainer.guiAttributeDefName.attributeDefName.name)}</span> <a href="#" onclick="grouperCopyToClipboard('attributeDefNameIdPath'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" style="margin-left:4px;"><i class="fa fa-clone" aria-hidden="true"></i></a>
+                              <span id="attributeDefNameIdPath">${grouper:escapeHtml(grouperRequestContainer.attributeDefNameContainer.guiAttributeDefName.attributeDefName.name)}</span> <button type="button" onclick="grouperCopyToClipboard('attributeDefNameIdPath'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" class="btn-link" style="margin-left:4px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button>
                               <br /><span class="help-block description">${textContainer.text['attributeDefNameIdPathDescription'] }</span>
                             </td>
                           </tr>
@@ -122,8 +122,8 @@ ${grouper:titleFromKeyAndText('viewAttributeDefNamePageTitle', grouperRequestCon
                         </tbody>
                       </table>
                     </div>
-                    <p id="attributeDefNameDetailsMoreId"><a href="#" aria-label="${textContainer.text['ariaLabelGuiMoreAttributeDefNameDetails']}" id="moreButtonId" onclick="$('.attributeDefNameDetailsName').show('slow'); $('#attributeDefNameDetailsMoreId').hide(); $('#attributeDefNameDetailsLessId').show(); return false" >${textContainer.text['guiMore']} <i class="fa fa-angle-down"></i></a></p>
-                    <p id="attributeDefNameDetailsLessId" style="display: none"><a href="#" onclick="$('.attributeDefNameDetailsName').hide('slow'); $('#attributeDefNameDetailsLessId').hide(); $('#attributeDefNameDetailsMoreId').show(); return false" >${textContainer.text['guiLess']} <i class="fa fa-angle-up"></i></a></p>
+                    <p id="attributeDefNameDetailsMoreId"><button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" aria-label="${textContainer.text['ariaLabelGuiMoreAttributeDefNameDetails']}" id="moreButtonId" onclick="$('.attributeDefNameDetailsName').show('slow'); $('#attributeDefNameDetailsMoreId').hide(); $('#attributeDefNameDetailsLessId').show(); return false" >${textContainer.text['guiMore']} <i class="fa fa-angle-down"></i></button></p>
+                    <p id="attributeDefNameDetailsLessId" style="display: none"><button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" onclick="$('.attributeDefNameDetailsName').hide('slow'); $('#attributeDefNameDetailsLessId').hide(); $('#attributeDefNameDetailsMoreId').show(); return false" >${textContainer.text['guiLess']} <i class="fa fa-angle-up"></i></button></p>
                                       
                   </div>
                 </div> <%-- row fluid --%>
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/entityDataFields/dataFieldRowDictionary.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/entityDataFields/dataFieldRowDictionary.jsp
index 66b6fd001235..8fbaa0ad6043 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/entityDataFields/dataFieldRowDictionary.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/entityDataFields/dataFieldRowDictionary.jsp
@@ -155,7 +155,7 @@ ${grouper:title('miscAttestationDataFieldAndRowDictionaryLink')}
             
             <c:if test="${!grouper:isBlank(guiDataFieldRowDictionaryTable.documentation)}">
               <div class="control-group">
-                <a href="#" onclick="$('#documentation-${j}').toggle('slow'); return false;">${textContainer.text['entityDataFieldRowDictionaryTableDocumentation']}</a>
+                <button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" onclick="$('#documentation-${j}').toggle('slow'); return false;">${textContainer.text['entityDataFieldRowDictionaryTableDocumentation']}</button>
                 <span id="documentation-${j}" style="display: none;">${guiDataFieldRowDictionaryTable.documentation}</span>
               </div>
             </c:if>
@@ -195,10 +195,10 @@ ${grouper:title('miscAttestationDataFieldAndRowDictionaryLink')}
                     <i class="fa fa-pencil"></i>
                   </a>
                 </c:if>
-                <a href="#" onclick="dictionaryCopyPermalink('${grouper:escapeJavascript(guiDataFieldRowDictionary.dataFieldConfigId)}', '${grouper:escapeJavascript(guiDataFieldRowDictionary.dataRowConfigId)}'); return false;"
-                   title="${textContainer.text['dataFieldDictionaryPermalinkTitle']}" style="margin-left: 3px;">
+                <button type="button" class="btn-link" onclick="dictionaryCopyPermalink('${grouper:escapeJavascript(guiDataFieldRowDictionary.dataFieldConfigId)}', '${grouper:escapeJavascript(guiDataFieldRowDictionary.dataRowConfigId)}'); return false;"
+                   title="${textContainer.text['dataFieldDictionaryPermalinkTitle']}" style="margin-left: 3px;padding:0;border:0;background:none;vertical-align:baseline;">
                   <i class="fa fa-link"></i>
-                </a>
+                </button>
               </td>
               
               <%-- Column 2: Description (truncated unless auto-expand) --%>
@@ -211,7 +211,7 @@ ${grouper:title('miscAttestationDataFieldAndRowDictionaryLink')}
                     <div class="dict-desc-truncated" id="desc-${j}-${i}" style="max-height: 7.5em; overflow: hidden; position: relative;">
                       ${guiDataFieldRowDictionary.description}
                     </div>
-                    <a href="#" class="dict-desc-toggle" data-target="desc-${j}-${i}" onclick="dictionaryToggleDesc(this); return false;" style="display:none;">${textContainer.text['dataFieldDictionaryMoreLink']}</a>
+                    <button type="button" class="dict-desc-toggle btn-link" data-target="desc-${j}-${i}" onclick="dictionaryToggleDesc(this); return false;" style="display:none;padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;">${textContainer.text['dataFieldDictionaryMoreLink']}</button>
                   </c:otherwise>
                 </c:choose>
               </td>
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/externalEntities/inviteExtraGroups.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/externalEntities/inviteExtraGroups.jsp
index 9a3a7ab20ab4..5a4ae662807e 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/externalEntities/inviteExtraGroups.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/externalEntities/inviteExtraGroups.jsp
@@ -7,6 +7,6 @@
                   <br />
 
                   <input type="hidden" name="extraGroupId_${status.count-1}" value="${grouper:escapeHtml(guiGroup.group.id)}" />            
-                  ${guiGroup.linkWithIcon} <a href="#" onclick="ajax('../app/UiV2ExternalEntities.inviteRemoveGroup?removeGroupId=${grouper:escapeUrl(guiGroup.group.id)}', {formIds: 'inviteFormId'}); return false;"><i class="fa fa-times" style="color: #aaaaaa"></i></a>
+                  ${guiGroup.linkWithIcon} <button type="button" class="btn-link" style="padding:0;border:0;background:none;vertical-align:baseline;" onclick="ajax('../app/UiV2ExternalEntities.inviteRemoveGroup?removeGroupId=${grouper:escapeUrl(guiGroup.group.id)}', {formIds: 'inviteFormId'}); return false;"><i class="fa fa-times" style="color: #aaaaaa"></i></button>
                 
                 </c:forEach>
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupContents.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupContents.jsp
index 3b72227e80d4..5f422207d444 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupContents.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupContents.jsp
@@ -49,7 +49,7 @@
                           <tr>
                             <!-- ${guiPITMembershipView.getPITMembershipView().getId()} -->
                             <td>&nbsp;</td>
-                            <td class="expand foo-clicker">${guiPITMembershipView.guiSubject.shortLinkWithIcon}<c:if test="${not empty guiPITMembershipView.guiSubject.subject.description}"> <a href="#" data-gr-copy-text="${grouperUtil.xmlEscape(guiPITMembershipView.guiSubject.subject.description)}" onclick="grouperCopyTextToClipboard(this); return false;" aria-label="${textContainer.textEscapeXml['groupViewCopyEntityDescriptionTooltip']}" title="${textContainer.text['groupViewCopyEntityDescriptionTooltip']}" style="margin-left:4px;"><i class="fa fa-clone" aria-hidden="true"></i></a></c:if> <br/>
+                            <td class="expand foo-clicker">${guiPITMembershipView.guiSubject.shortLinkWithIcon}<c:if test="${not empty guiPITMembershipView.guiSubject.subject.description}"> <button type="button" data-gr-copy-text="${grouperUtil.xmlEscape(guiPITMembershipView.guiSubject.subject.description)}" onclick="grouperCopyTextToClipboard(this); return false;" aria-label="${textContainer.textEscapeXml['groupViewCopyEntityDescriptionTooltip']}" title="${textContainer.text['groupViewCopyEntityDescriptionTooltip']}" class="btn-link" style="margin-left:4px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button></c:if> <br/>
                             </td>
                             <td>${guiPITMembershipView.getStartTimeLabel()}</td>
                             <td>${guiPITMembershipView.getEndTimeLabel()}</td>
@@ -84,7 +84,7 @@
                                 </label>
                               </c:if>
                             </td>
-                            <td class="expand foo-clicker">${guiMembershipSubjectContainer.guiSubject.shortLinkWithIcon}<c:if test="${not empty guiMembershipSubjectContainer.guiSubject.subject.description}"> <a href="#" data-gr-copy-text="${grouperUtil.xmlEscape(guiMembershipSubjectContainer.guiSubject.subject.description)}" onclick="grouperCopyTextToClipboard(this); return false;" aria-label="${textContainer.textEscapeXml['groupViewCopyEntityDescriptionTooltip']}" title="${textContainer.text['groupViewCopyEntityDescriptionTooltip']}" style="margin-left:4px;"><i class="fa fa-clone" aria-hidden="true"></i></a></c:if> <br/>
+                            <td class="expand foo-clicker">${guiMembershipSubjectContainer.guiSubject.shortLinkWithIcon}<c:if test="${not empty guiMembershipSubjectContainer.guiSubject.subject.description}"> <button type="button" data-gr-copy-text="${grouperUtil.xmlEscape(guiMembershipSubjectContainer.guiSubject.subject.description)}" onclick="grouperCopyTextToClipboard(this); return false;" aria-label="${textContainer.textEscapeXml['groupViewCopyEntityDescriptionTooltip']}" title="${textContainer.text['groupViewCopyEntityDescriptionTooltip']}" class="btn-link" style="margin-left:4px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button></c:if> <br/>
                             </td>
                             <c:if test="${grouperRequestContainer.groupContainer.showEnabledStatus}">
                               <td>${guiMembershipContainer.getImmediateMembershipEnabledLabel()}</td>
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupHeader.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupHeader.jsp
index 53d23386f66d..6db29da02b27 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupHeader.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupHeader.jsp
@@ -208,7 +208,7 @@
                           </tr>
                           <tr>
                             <td><strong>${textContainer.text['groupLabelIdPath']}</strong></td>
-                            <td><span id="groupIdPath">${grouper:escapeHtml(grouperRequestContainer.groupContainer.guiGroup.group.name)}</span> <a href="#" onclick="grouperCopyToClipboard('groupIdPath'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" style="margin-left:4px;"><i class="fa fa-clone" aria-hidden="true"></i></a></td>
+                            <td><span id="groupIdPath">${grouper:escapeHtml(grouperRequestContainer.groupContainer.guiGroup.group.name)}</span> <button type="button" onclick="grouperCopyToClipboard('groupIdPath'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" class="btn-link" style="margin-left:4px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button></td>
                           </tr>
                           <tr>
                             <td><strong>${textContainer.text['groupLabelAlternateIdPath']}</strong></td>
@@ -286,7 +286,7 @@
                       </table>
                     </div>
                     <%-- <p id="groupDetailsMoreId"><a href="#" aria-label="${textContainer.text['ariaLabelGuiMoreGroupDetails']}" id="moreButtonId" onclick="$('#groupDetailsId').show('slow'); $('#groupDetailsMoreId').hide(); $('#groupDetailsLessId').show(); return false" >${textContainer.text['guiMore']} <i class="fa fa-angle-down"></i></a></p> --%>
-                    <p id="groupDetailsLessId" style="display: none"><a href="#" onclick="$('#groupDetailsId').hide('slow'); $('#groupDetailsLessId').hide(); $('#groupDetailsMoreId').show(); return false" >${textContainer.text['guiLess']} <i class="fa fa-angle-up"></i></a></p>
+                    <p id="groupDetailsLessId" style="display: none"><button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" onclick="$('#groupDetailsId').hide('slow'); $('#groupDetailsLessId').hide(); $('#groupDetailsMoreId').show(); return false" >${textContainer.text['guiLess']} <i class="fa fa-angle-up"></i></button></p>
                   </div>
                 </div>
               </div>
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupSummary.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupSummary.jsp
index 1891dbf8bc30..510a68fe29de 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupSummary.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupSummary.jsp
@@ -222,7 +222,7 @@
         </tr>
         <tr>
           <td style="vertical-align: top;"><strong><grouper:message key="groupLabelIdPath" /></strong></td>
-          <td style="padding-left: 0px;"><span id="groupSummaryIdPath">${grouper:escapeHtml(grouperRequestContainer.groupContainer.guiGroup.group.name)}</span> <a href="#" onclick="grouperCopyToClipboard('groupSummaryIdPath'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" style="margin-left:4px;"><i class="fa fa-clone" aria-hidden="true"></i></a></td>
+          <td style="padding-left: 0px;"><span id="groupSummaryIdPath">${grouper:escapeHtml(grouperRequestContainer.groupContainer.guiGroup.group.name)}</span> <button type="button" onclick="grouperCopyToClipboard('groupSummaryIdPath'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" class="btn-link" style="margin-left:4px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button></td>
         </tr>
         <tr>
           <td style="vertical-align: top;"><strong><grouper:message key="groupLabelAlternateIdPath" /></strong></td>
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/groupImport/groupImportExtraGroups.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/groupImport/groupImportExtraGroups.jsp
index 6248187b586e..e549977dc8ac 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/groupImport/groupImportExtraGroups.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/groupImport/groupImportExtraGroups.jsp
@@ -7,6 +7,6 @@
                   <br />
 
                   <input type="hidden" name="extraGroupId_${status.count-1}" value="${grouper:escapeHtml(guiGroup.group.id)}" />            
-                  ${guiGroup.linkWithIcon} <a href="#" onclick="ajax('../app/UiV2GroupImport.groupImportRemoveGroup?removeGroupId=${grouper:escapeUrl(guiGroup.group.id)}', {formIds: 'importGroupFormId'}); return false;"><i class="fa fa-times" style="color: #aaaaaa"></i></a>
+                  ${guiGroup.linkWithIcon} <button type="button" class="btn-link" style="padding:0;border:0;background:none;vertical-align:baseline;" onclick="ajax('../app/UiV2GroupImport.groupImportRemoveGroup?removeGroupId=${grouper:escapeUrl(guiGroup.group.id)}', {formIds: 'importGroupFormId'}); return false;"><i class="fa fa-times" style="color: #aaaaaa"></i></button>
                 
                 </c:forEach>
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexGroupsImanage.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexGroupsImanage.jsp
index c762c7ea54fa..c21bdd7e4eb8 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexGroupsImanage.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexGroupsImanage.jsp
@@ -12,7 +12,7 @@
                         </ul>
                       </c:when>
                       <c:otherwise>
-                        <a href="#" onclick="ajax('UiV2Main.indexColGroupsImanage?col=${col}&storePref=false'); return false;">${textContainer.text['indexMyGroupsTitleLoad'] }</a>
+                        <button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" onclick="ajax('UiV2Main.indexColGroupsImanage?col=${col}&storePref=false'); return false;">${textContainer.text['indexMyGroupsTitleLoad'] }</button>
                         <br /><br /><br /><br/>
                       </c:otherwise>
                     </c:choose>
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexMyMemberships.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexMyMemberships.jsp
index e2241cb41c2e..e73e210f2c94 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexMyMemberships.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexMyMemberships.jsp
@@ -15,7 +15,7 @@
                         </ul>
                       </c:when>
                       <c:otherwise>
-                        <a href="#" onclick="ajax('UiV2Main.indexColMyMemberships?col=${col}&storePref=false'); return false;">${textContainer.text['indexMyMembershipsMyMembershipsLoad'] }</a>
+                        <button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" onclick="ajax('UiV2Main.indexColMyMemberships?col=${col}&storePref=false'); return false;">${textContainer.text['indexMyMembershipsMyMembershipsLoad'] }</button>
                         <br /><br /><br /><br/>
                       </c:otherwise>
                     </c:choose>
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexMyServices.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexMyServices.jsp
index 4954ab18d9cb..d105ca158697 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexMyServices.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexMyServices.jsp
@@ -12,7 +12,7 @@
                         </ul>
                       </c:when>
                       <c:otherwise>
-                        <a href="#" onclick="ajax('UiV2Main.indexColMyServices?col=${col}&storePref=false'); return false;">${textContainer.text['indexMyServicesSectionTitleLoad'] }</a>
+                        <button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" onclick="ajax('UiV2Main.indexColMyServices?col=${col}&storePref=false'); return false;">${textContainer.text['indexMyServicesSectionTitleLoad'] }</button>
                         <br /><br /><br /><br/>
                       </c:otherwise>
                     </c:choose>
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexRecentlyUsed.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexRecentlyUsed.jsp
index 45fcbfa24978..032f93570272 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexRecentlyUsed.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/index/indexRecentlyUsed.jsp
@@ -38,7 +38,7 @@
                         </ul>
                       </c:when>
                       <c:otherwise>
-                        <a href="#" onclick="ajax('UiV2Main.indexColRecentlyUsed?col=${col}&storePref=false'); return false;">${textContainer.text['indexRecentlyUsedRecentlyUsedLoad'] }</a>
+                        <button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" onclick="ajax('UiV2Main.indexColRecentlyUsed?col=${col}&storePref=false'); return false;">${textContainer.text['indexRecentlyUsedRecentlyUsedLoad'] }</button>
                         <br /><br /><br /><br/>
                       </c:otherwise>
                     </c:choose>
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpConfidentialClientResult.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpConfidentialClientResult.jsp
index e68fc187057e..ef44b4906821 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpConfidentialClientResult.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpConfidentialClientResult.jsp
@@ -8,35 +8,35 @@
                       <td style="white-space: nowrap; font-weight: bold; width: 200px;">${textContainer.text['mcpInfoConfidentialClientIdLabel']}</td>
                       <td>
                         <code id="confClientId">${grouper:escapeHtml(grouperRequestContainer.mcpContainer.registeredClientId)}</code>
-                        <a href="#" onclick="grouperCopyToClipboard('confClientId'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" style="margin-left: 6px;"><i class="fa fa-clone" aria-hidden="true"></i></a>
+                        <button type="button" onclick="grouperCopyToClipboard('confClientId'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" class="btn-link" style="margin-left: 6px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button>
                       </td>
                     </tr>
                     <tr>
                       <td style="white-space: nowrap; font-weight: bold; width: 200px;">${textContainer.text['mcpInfoConfidentialClientSecretLabel']}</td>
                       <td>
                         <code id="confClientSecret">${grouper:escapeHtml(grouperRequestContainer.mcpContainer.registeredClientSecret)}</code>
-                        <a href="#" onclick="grouperCopyToClipboard('confClientSecret'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" style="margin-left: 6px;"><i class="fa fa-clone" aria-hidden="true"></i></a>
+                        <button type="button" onclick="grouperCopyToClipboard('confClientSecret'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" class="btn-link" style="margin-left: 6px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button>
                       </td>
                     </tr>
                     <tr>
                       <td style="white-space: nowrap; font-weight: bold; width: 200px;">${textContainer.text['mcpInfoConfidentialAuthorizationUrlLabel']}</td>
                       <td>
                         <code id="confAuthUrl">${grouper:escapeHtml(grouperRequestContainer.mcpContainer.registeredAuthorizationUrl)}</code>
-                        <a href="#" onclick="grouperCopyToClipboard('confAuthUrl'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" style="margin-left: 6px;"><i class="fa fa-clone" aria-hidden="true"></i></a>
+                        <button type="button" onclick="grouperCopyToClipboard('confAuthUrl'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" class="btn-link" style="margin-left: 6px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button>
                       </td>
                     </tr>
                     <tr>
                       <td style="white-space: nowrap; font-weight: bold; width: 200px;">${textContainer.text['mcpInfoConfidentialTokenUrlLabel']}</td>
                       <td>
                         <code id="confTokenUrl">${grouper:escapeHtml(grouperRequestContainer.mcpContainer.registeredTokenUrl)}</code>
-                        <a href="#" onclick="grouperCopyToClipboard('confTokenUrl'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" style="margin-left: 6px;"><i class="fa fa-clone" aria-hidden="true"></i></a>
+                        <button type="button" onclick="grouperCopyToClipboard('confTokenUrl'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" class="btn-link" style="margin-left: 6px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button>
                       </td>
                     </tr>
                     <tr>
                       <td style="white-space: nowrap; font-weight: bold; width: 200px;">${textContainer.text['mcpInfoConfidentialScopeLabel']}</td>
                       <td>
                         <code id="confScope">openid</code>
-                        <a href="#" onclick="grouperCopyToClipboard('confScope'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" style="margin-left: 6px;"><i class="fa fa-clone" aria-hidden="true"></i></a>
+                        <button type="button" onclick="grouperCopyToClipboard('confScope'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" class="btn-link" style="margin-left: 6px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button>
                       </td>
                     </tr>
                   </tbody>
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpInfo.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpInfo.jsp
index 7fadd14fc8e7..8eb9cec47f9a 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpInfo.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpInfo.jsp
@@ -30,7 +30,7 @@
                         <td style="white-space: nowrap; font-weight: bold; width: 200px;">${textContainer.text['mcpInfoServerUrlLabel']}</td>
                         <td>
                           <code id="mcpServerUrl" style="color: #8b0000;">${grouper:escapeHtml(grouperRequestContainer.mcpContainer.mcpServerUrl)}/mcp</code>
-                          <a href="#" onclick="grouperCopyToClipboard('mcpServerUrl'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" style="margin-left: 6px;"><i class="fa fa-clone" aria-hidden="true"></i></a>
+                          <button type="button" onclick="grouperCopyToClipboard('mcpServerUrl'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" class="btn-link" style="margin-left: 6px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button>
                         </td>
                       </tr>
                     </c:if>
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpToolLogsResults.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpToolLogsResults.jsp
index 19794051db76..c39343be29ae 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpToolLogsResults.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/mcp/mcpToolLogsResults.jsp
@@ -36,8 +36,8 @@
                               </c:choose>
                             </td>
                             <td style="white-space: nowrap">${grouper:escapeHtml(guiMcpToolLog.durationMs)}</td>
-                            <td style="white-space: nowrap"><span class="jobMessageContainer"><grouper:abbreviateTextarea text="${guiMcpToolLog.grouperMcpToolLog.request}" showCharCount="30" cols="20" rows="3"/></span><c:if test="${not empty guiMcpToolLog.grouperMcpToolLog.request}"> <a href="#" onclick="grouperCopyJobMessage(this); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" style="margin-left:4px;"><i class="fa fa-clone" aria-hidden="true"></i></a></c:if></td>
-                            <td style="white-space: nowrap"><span class="jobMessageContainer"><grouper:abbreviateTextarea text="${guiMcpToolLog.grouperMcpToolLog.responseOrError}" showCharCount="30" cols="20" rows="3"/></span><c:if test="${not empty guiMcpToolLog.grouperMcpToolLog.responseOrError}"> <a href="#" onclick="grouperCopyJobMessage(this); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" style="margin-left:4px;"><i class="fa fa-clone" aria-hidden="true"></i></a></c:if></td>
+                            <td style="white-space: nowrap"><span class="jobMessageContainer"><grouper:abbreviateTextarea text="${guiMcpToolLog.grouperMcpToolLog.request}" showCharCount="30" cols="20" rows="3"/></span><c:if test="${not empty guiMcpToolLog.grouperMcpToolLog.request}"> <button type="button" onclick="grouperCopyJobMessage(this); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" class="btn-link" style="margin-left:4px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button></c:if></td>
+                            <td style="white-space: nowrap"><span class="jobMessageContainer"><grouper:abbreviateTextarea text="${guiMcpToolLog.grouperMcpToolLog.responseOrError}" showCharCount="30" cols="20" rows="3"/></span><c:if test="${not empty guiMcpToolLog.grouperMcpToolLog.responseOrError}"> <button type="button" onclick="grouperCopyJobMessage(this); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" class="btn-link" style="margin-left:4px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button></c:if></td>
                           </tr>
                         </c:forEach>
                       </tbody>
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/provisioning/provisioningFolderProvisioners.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/provisioning/provisioningFolderProvisioners.jsp
index 838d75e35b7a..a774554fa16c 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/provisioning/provisioningFolderProvisioners.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/provisioning/provisioningFolderProvisioners.jsp
@@ -25,9 +25,9 @@ ${grouper:titleFromKeyAndText('stemProvisioningPageTitle', grouperRequestContain
     
     <div class="row-fluid">
       <div class="span12"> 
-       <a href="#" onclick="$('#provisioningFolderDocumentation').toggle('slow'); return false;">
+       <button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" onclick="$('#provisioningFolderDocumentation').toggle('slow'); return false;">
         ${textContainer.text['provisioning.documentationLink'] }
-       </a>
+       </button>
       </div>
     </div>
     
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/provisioning/provisioningGroupProvisioners.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/provisioning/provisioningGroupProvisioners.jsp
index 3796700fb4f2..41712de9b67e 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/provisioning/provisioningGroupProvisioners.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/provisioning/provisioningGroupProvisioners.jsp
@@ -24,9 +24,9 @@ ${grouper:titleFromKeyAndText('groupProvisioningPageTitle', grouperRequestContai
     
        <div class="row-fluid">
       <div class="span12"> 
-       <a href="#" onclick="$('#provisioningGroupDocumentation').toggle('slow'); return false;">
+       <button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" onclick="$('#provisioningGroupDocumentation').toggle('slow'); return false;">
         ${textContainer.text['provisioning.documentationLink'] }
-       </a>
+       </button>
       </div>
     </div>
     
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/scriptTester/scriptTesterScreen.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/scriptTester/scriptTesterScreen.jsp
index 5a76bb7134d7..a6bb2dfd4927 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/scriptTester/scriptTesterScreen.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/scriptTester/scriptTesterScreen.jsp
@@ -169,7 +169,7 @@ ${grouper:title('scriptTesterScreenPageTitle')}
                                 <td style="vertical-align: top; white-space: nowrap;"><strong><label>${textContainer.text['scriptExecuted']}</label></strong></td>
                                 <td style="vertical-align: top; white-space: nowrap;">&nbsp;</td>
                                 <td>
-                                 <p class="showHideGshScript"><a href="#" onclick="$('.gshScript').toggle('slow'); return false;">${textContainer.text['showHideGshScript']} <i class="fa fa-angle-down"></i></a></p>
+                                 <p class="showHideGshScript"><button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" onclick="$('.gshScript').toggle('slow'); return false;">${textContainer.text['showHideGshScript']} <i class="fa fa-angle-down"></i></button></p>
                                  
                                  <code class="gshScript" style="display: none; white-space: pre-wrap;"
                                   >${grouper:escapeHtml(grouperRequestContainer.scriptTesterContainer.jexlScriptTesterResult.gshScriptThatWasExecuted)}</code>
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/stem/stemHeader.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/stem/stemHeader.jsp
index 6975f883a78d..2c1ecb001bd0 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/stem/stemHeader.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/stem/stemHeader.jsp
@@ -212,7 +212,7 @@
                           </tr>
                           <tr>
                             <td><strong>${textContainer.text['stemLabelIdPath'] }</strong></td>
-                            <td><span id="stemIdPath">${grouper:escapeHtml(grouperRequestContainer.stemContainer.guiStem.stem.name)}</span> <a href="#" onclick="grouperCopyToClipboard('stemIdPath'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" style="margin-left:4px;"><i class="fa fa-clone" aria-hidden="true"></i></a></td>
+                            <td><span id="stemIdPath">${grouper:escapeHtml(grouperRequestContainer.stemContainer.guiStem.stem.name)}</span> <button type="button" onclick="grouperCopyToClipboard('stemIdPath'); return false;" aria-label="${textContainer.textEscapeXml['copyToClipboardTooltip']}" title="${textContainer.text['copyToClipboardTooltip']}" class="btn-link" style="margin-left:4px;padding:0;border:0;background:none;vertical-align:baseline;"><i class="fa fa-clone" aria-hidden="true"></i></button></td>
                           </tr>
                           <tr>
                             <td><strong>${textContainer.text['stemLabelAlternateIdPath'] }</strong></td>
@@ -251,8 +251,8 @@
                         </tbody>
                       </table>
                     </div>
-                    <p id="stemDetailsMoreId"><a href="#" aria-label="${textContainer.text['ariaLabelGuiMoreStemDetails']}" onclick="$('#stemDetailsId').show('slow'); $('#stemDetailsMoreId').hide(); $('#stemDetailsLessId').show(); return false" >${textContainer.text['guiMore']} <i class="fa fa-angle-down"></i></a></p>
-                    <p id="stemDetailsLessId" style="display: none"><a href="#" onclick="$('#stemDetailsId').hide('slow'); $('#stemDetailsLessId').hide(); $('#stemDetailsMoreId').show(); return false" >${textContainer.text['guiLess']} <i class="fa fa-angle-up"></i></a></p>
+                    <p id="stemDetailsMoreId"><button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" aria-label="${textContainer.text['ariaLabelGuiMoreStemDetails']}" onclick="$('#stemDetailsId').show('slow'); $('#stemDetailsMoreId').hide(); $('#stemDetailsLessId').show(); return false" >${textContainer.text['guiMore']} <i class="fa fa-angle-down"></i></button></p>
+                    <p id="stemDetailsLessId" style="display: none"><button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" onclick="$('#stemDetailsId').hide('slow'); $('#stemDetailsLessId').hide(); $('#stemDetailsMoreId').show(); return false" >${textContainer.text['guiLess']} <i class="fa fa-angle-up"></i></button></p>
                      
                   </div>
                   <div class="span2" id="stemMoreActionsButtonContentsDivId">
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/subject/subjectHeader.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/subject/subjectHeader.jsp
index 09f8b588975d..61950a67fb51 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/subject/subjectHeader.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/subject/subjectHeader.jsp
@@ -382,8 +382,8 @@
                         </tbody>
                       </table>
                     </div>
-                    <p id="subjectDetailsMoreId"><a href="#" aria-label="${textContainer.text['ariaLabelGuiMoreSubjectDetails']}" onclick="$('#subjectDetailsId').show('slow'); $('#subjectDetailsMoreId').hide(); $('#subjectDetailsLessId').show(); return false" >${textContainer.text['guiMore']} <i class="fa fa-angle-down"></i></a></p>
-                    <p id="subjectDetailsLessId" style="display: none"><a href="#" onclick="$('#subjectDetailsId').hide('slow'); $('#subjectDetailsLessId').hide(); $('#subjectDetailsMoreId').show(); return false" >${textContainer.text['guiLess']} <i class="fa fa-angle-up"></i></a></p>
+                    <p id="subjectDetailsMoreId"><button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" aria-label="${textContainer.text['ariaLabelGuiMoreSubjectDetails']}" onclick="$('#subjectDetailsId').show('slow'); $('#subjectDetailsMoreId').hide(); $('#subjectDetailsLessId').show(); return false" >${textContainer.text['guiMore']} <i class="fa fa-angle-down"></i></button></p>
+                    <p id="subjectDetailsLessId" style="display: none"><button type="button" class="btn-link" style="padding:0;border:0;background:none;font-family:inherit;font-size:inherit;line-height:inherit;vertical-align:baseline;" onclick="$('#subjectDetailsId').hide('slow'); $('#subjectDetailsLessId').hide(); $('#subjectDetailsMoreId').show(); return false" >${textContainer.text['guiLess']} <i class="fa fa-angle-up"></i></button></p>
                   </div>
                   <div class="span3" id="subjectMoreActionsButtonContentsDivId">
                     <%@ include file="subjectMoreActionsButtonContents.jsp"%>