diff --git a/api/src/org/labkey/api/view/menu/NavTreeMenu.java b/api/src/org/labkey/api/view/menu/NavTreeMenu.java
index a5e57e8a607..7345d4092a8 100644
--- a/api/src/org/labkey/api/view/menu/NavTreeMenu.java
+++ b/api/src/org/labkey/api/view/menu/NavTreeMenu.java
@@ -201,10 +201,11 @@ private void renderLinks(NavTree nav, int level, String pathToHere, String rootI
                 ActionURL expandCollapseUrl = Objects.requireNonNull(PageFlowUtil.urlProvider(ProjectUrls.class)).getExpandCollapseURL(getViewContext().getContainer(), pathToHere, rootId);
 
                 String image = collapsed ? "plus.gif" : "minus.gif";
+                String altPrefix = collapsed ? "Expand" : "Collapse";
                 id = config.makeId("navtree");
                 oldWriter.printf("<a id=\"%s\" href=\"%s\">", id, filter(expandCollapseUrl));
                 config.addHandler(id, "click", "return LABKEY.Utils.toggleLink(this,true);");
-                oldWriter.printf("<img src=\"%s/_images/%s\" width=9 height=9></a>", context.getContextPath(), image);
+                oldWriter.printf("<img src=\"%s/_images/%s\" width=9 height=9 alt=\"%s %s\"></a>", filter(context.getContextPath()), filter(image), filter(altPrefix), filter(nav.getText()));
             }
             else if (indentForExpansionGifs)
                 oldWriter.printf("<div class=\"labkey-nav-tree-indenter\"></div>");
diff --git a/core/src/org/labkey/core/view/template/bootstrap/ViewServiceImpl.java b/core/src/org/labkey/core/view/template/bootstrap/ViewServiceImpl.java
index 08c7d618fe2..23885cce85e 100644
--- a/core/src/org/labkey/core/view/template/bootstrap/ViewServiceImpl.java
+++ b/core/src/org/labkey/core/view/template/bootstrap/ViewServiceImpl.java
@@ -666,7 +666,7 @@ public void renderCollapsiblePortalTitle(PrintWriter out)
 
         public void renderCustomDropDown(String title, NavTree current, PrintWriter out)
         {
-            renderMenuWithFontImage(null, current, out, null, false);
+            renderMenuWithFontImage(title, current, out, null, false);
         }
     }
 
@@ -750,7 +750,9 @@ private void renderMenuWithFontImage(String title, NavTree menu, PrintWriter out
             if (rightAlign)
                 out.print(" pull-right");
             out.print("\">");
-            out.print("<a href=\"#\" data-toggle=\"dropdown\" class=\"dropdown-toggle ");
+            out.print("<a href=\"#\" aria-label=\"");
+            out.print(filter(title) + " webpart options");
+            out.print("\" data-toggle=\"dropdown\" class=\"dropdown-toggle ");
             out.print(!StringUtils.isEmpty(imageCls) ? imageCls : !StringUtils.isEmpty(menu.getImageCls()) ? menu.getImageCls() : "");
             out.print("\">");
             out.print("</a>");
diff --git a/core/src/org/labkey/core/view/template/bootstrap/header.jsp b/core/src/org/labkey/core/view/template/bootstrap/header.jsp
index e147df531db..a5d95b301f5 100644
--- a/core/src/org/labkey/core/view/template/bootstrap/header.jsp
+++ b/core/src/org/labkey/core/view/template/bootstrap/header.jsp
@@ -143,7 +143,7 @@
     {
 %>
             <li class="navbar-search hidden-xs">
-                <a class="fa fa-search" id="global-search-trigger"></a>
+                <a class="fa fa-search" id="global-search-trigger" aria-label="<%=h(SearchUtils.getPlaceholder(c))%>"></a>
                 <div id="global-search" class="global-search">
                     <labkey:form id="global-search-form" action="<%=urlProvider(SearchUrls.class).getSearchURL(c, null)%>" method="GET">
                         <input type="text" class="search-box" name="q" placeholder="<%=h(SearchUtils.getPlaceholder(c))%>" value="">
diff --git a/search/src/org/labkey/search/view/search.jsp b/search/src/org/labkey/search/view/search.jsp
index 3fd522f86e3..56a9e851d26 100644
--- a/search/src/org/labkey/search/view/search.jsp
+++ b/search/src/org/labkey/search/view/search.jsp
@@ -294,7 +294,7 @@
     <div style="position:relative;">
         <labkey:form id="<%=searchFormId%>" className="lk-search-form" action="<%=searchConfig.getPostURL(c)%>">
             <labkey:input type="text" name="q" placeholder="<%=form.isWebPart() ? \"\" : SearchUtils.getPlaceholder(c)%>" formGroup="false" value="<%=value%>"/>
-            <a class="search-overlay fa fa-search"></a>
+            <a class="search-overlay fa fa-search" aria-label="<%= h(SearchUtils.getPlaceholder(c)) %>"></a>
             <% if (showAdvancedUI) { %>
             <small>
                 <a class="search-advanced-toggle">advanced options</a>