diff --git a/apps/activejobs/app/views/layouts/application.html.erb b/apps/activejobs/app/views/layouts/application.html.erb
index 83cc7d9997..51d0e5c802 100644
--- a/apps/activejobs/app/views/layouts/application.html.erb
+++ b/apps/activejobs/app/views/layouts/application.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
   <meta charset="UTF-8">
 
diff --git a/apps/dashboard/app/assets/javascripts/products.coffee b/apps/dashboard/app/assets/javascripts/products.coffee
index 9ac37a362f..372a0b27c3 100644
--- a/apps/dashboard/app/assets/javascripts/products.coffee
+++ b/apps/dashboard/app/assets/javascripts/products.coffee
@@ -15,7 +15,7 @@ jQuery ->
       target =$(@).data('target')
       header = "$ <code><strong>#{cmd}</strong></code>\n"
       $("#{id} .modal-title").html """
-        <i class="fa fa-spinner fa-spin pull-right" id="#{id.substring(1)}Spinner"></i>
+        <i class="fa fa-spinner fa-spin pull-right" aria-hidden="true" id="#{id.substring(1)}Spinner"></i>
         #{title}
       """
       $("#{id} .product-cli-body").html header
diff --git a/apps/dashboard/app/controllers/products_controller.rb b/apps/dashboard/app/controllers/products_controller.rb
index 366437337a..c0591d59b7 100644
--- a/apps/dashboard/app/controllers/products_controller.rb
+++ b/apps/dashboard/app/controllers/products_controller.rb
@@ -120,9 +120,9 @@ def cli
             response.stream.write line
           end
           if t.value.success?
-            response.stream.write %Q(<code><p class="text-success"><i class="fa fa-check"></i> Ran successfully!</p></code>)
+            response.stream.write %Q(<code><p class="text-success"><i class="fa fa-check" aria-hidden="true"></i> Ran successfully!</p></code>)
           else
-            response.stream.write %Q(<code><p class="text-danger"><i class="fa fa-times"></i> Something bad happened (exit code = #{t.value.exitstatus})</p></code>)
+            response.stream.write %Q(<code><p class="text-danger"><i class="fa fa-times" aria-hidden="true"></i> Something bad happened (exit code = #{t.value.exitstatus})</p></code>)
           end
         end
       end
diff --git a/apps/dashboard/app/views/layouts/application.html.erb b/apps/dashboard/app/views/layouts/application.html.erb
index 03533eed48..4cdaf6a9e1 100644
--- a/apps/dashboard/app/views/layouts/application.html.erb
+++ b/apps/dashboard/app/views/layouts/application.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%= Configuration.locale %>">
 <head>
   <title><%= content_for?(:title) ? yield(:title) : "Dashboard" %></title>
   <%= favicon_link_tag nil, href: OodAppkit.public.url.join('favicon.ico') %>
@@ -36,14 +36,13 @@
             <%= render partial: "layouts/nav/help_dropdown" %>
           </ul>
           <p class="navbar-text" data-toggle="popover" data-content="<%= t('dashboard.nav_user', username: @user.name) %>" data-placement="bottom" >
-            <i class="fas fa-user" title="<%= t('dashboard.nav_user', username: @user.name) %>"></i>
-            <span class="hidden-sm"><span class="hidden-md"> <%= t('dashboard.nav_user', username: @user.name) %></span>
+            <i class="fas fa-user" title="<%= t('dashboard.nav_user', username: @user.name) %>" aria-hidden="true"></i>
+            <span class="hidden-sm hidden-md"> <%= t('dashboard.nav_user', username: @user.name) %></span>
           </p>
           <ul class="nav navbar-nav">
             <li>
-              <a href="/logout"><i class="fas fa-sign-out-alt"></i><span class="hidden-sm"> <%= t('dashboard.nav_logout') %></span></a>
+              <a href="/logout"><i class="fas fa-sign-out-alt" aria-hidden="true"></i><span class="hidden-sm"> <%= t('dashboard.nav_logout') %></span></a>
             </li>
-            <li>
           </ul>
         </div>
       </div>
diff --git a/apps/dashboard/app/views/layouts/nav/_all_apps.html.erb b/apps/dashboard/app/views/layouts/nav/_all_apps.html.erb
index 7ad14c0bd6..63a8bc0e97 100644
--- a/apps/dashboard/app/views/layouts/nav/_all_apps.html.erb
+++ b/apps/dashboard/app/views/layouts/nav/_all_apps.html.erb
@@ -1,5 +1,5 @@
 <li title="<%= t('dashboard.nav_all_apps') %>">
   <a target="_self" href="<%= apps_index_path %>">
-    <i class="fas fa-th"></i><span class="hidden-sm hidden-md hidden-md-nav"> <%= t('dashboard.nav_all_apps') %></span>
+    <i class="fas fa-th" aria-hidden="true"></i><span class="hidden-sm hidden-md hidden-md-nav"> <%= t('dashboard.nav_all_apps') %></span>
   </a>
 </li>
diff --git a/apps/dashboard/app/views/layouts/nav/_develop_dropdown.html.erb b/apps/dashboard/app/views/layouts/nav/_develop_dropdown.html.erb
index 5610e56db7..abc32bab4a 100644
--- a/apps/dashboard/app/views/layouts/nav/_develop_dropdown.html.erb
+++ b/apps/dashboard/app/views/layouts/nav/_develop_dropdown.html.erb
@@ -1,6 +1,6 @@
 <li class="dropdown" title="<%= t('dashboard.nav_develop_title') %>">
   <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
-    <i class="fas fa-code"></i><span class="hidden-sm hidden-sm-nav"> <%= t('dashboard.nav_develop_title') %></span><span class="caret"></span>
+    <i class="fas fa-code" aria-hidden="true"></i><span class="hidden-sm hidden-sm-nav"> <%= t('dashboard.nav_develop_title') %></span><span class="caret"></span>
   </a>
   <ul class="dropdown-menu">
     <%= nav_link(t('dashboard.nav_restart_server'), "sync", restart_url) %>
diff --git a/apps/dashboard/app/views/layouts/nav/_help_dropdown.html.erb b/apps/dashboard/app/views/layouts/nav/_help_dropdown.html.erb
index bc60e9c0bd..b51c65bab9 100644
--- a/apps/dashboard/app/views/layouts/nav/_help_dropdown.html.erb
+++ b/apps/dashboard/app/views/layouts/nav/_help_dropdown.html.erb
@@ -1,6 +1,6 @@
 <li class="dropdown" title="<%= t('dashboard.nav_help_title') %>" >
   <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
-    <i class="fas fa-question-circle"></i><span class="hidden-sm hidden-sm-nav"> <%= t('dashboard.nav_help_title') %></span><span class="caret"></span>
+    <i class="fas fa-question-circle" aria-hidden="true"></i><span class="hidden-sm hidden-sm-nav"> <%= t('dashboard.nav_help_title') %></span><span class="caret"></span>
   </a>
   <ul class="dropdown-menu">
     <%= nav_link(t('dashboard.nav_help_support'), "question-circle", support_url, target: "_blank") %>
diff --git a/apps/dashboard/app/views/layouts/nav/_link.html.erb b/apps/dashboard/app/views/layouts/nav/_link.html.erb
index b88d84df85..8aac2a45eb 100644
--- a/apps/dashboard/app/views/layouts/nav/_link.html.erb
+++ b/apps/dashboard/app/views/layouts/nav/_link.html.erb
@@ -9,6 +9,6 @@ role - optional, default ""
 
 <li <%= "class=\"#{local_assigns[:role]}\"" unless local_assigns[:role].blank? %>>
   <%= link_to url, target: local_assigns.fetch(:target, "_self") do %>
-    <i class="fas fa-<%= local_assigns.fetch(:faicon, "cog") %> fa-fw"></i> <%= title %>
+    <i class="fas fa-<%= local_assigns.fetch(:faicon, "cog") %> fa-fw" aria-hidden="true"></i> <%= title %>
   <% end %>
 </li>
diff --git a/apps/dashboard/app/views/layouts/nav/_sessions.html.erb b/apps/dashboard/app/views/layouts/nav/_sessions.html.erb
index e2e31884d9..977d04779f 100644
--- a/apps/dashboard/app/views/layouts/nav/_sessions.html.erb
+++ b/apps/dashboard/app/views/layouts/nav/_sessions.html.erb
@@ -1,5 +1,5 @@
 <li title="<%= t('dashboard.breadcrumbs_my_sessions') %>">
   <a target="_self" href="<%= batch_connect_sessions_path %>">
-    <i class="fas fa-window-restore"></i><span class="hidden-sm hidden-md hidden-md-nav"> <%= t('dashboard.nav_sessions') %></span>
+    <i class="fas fa-window-restore" aria-hidden="true"></i><span class="hidden-sm hidden-md hidden-md-nav"> <%= t('dashboard.nav_sessions') %></span>
   </a>
 </li>
diff --git a/apps/dashboard/app/views/products/_form_git.html.erb b/apps/dashboard/app/views/products/_form_git.html.erb
index 65ae34d77a..ea18e29d2f 100644
--- a/apps/dashboard/app/views/products/_form_git.html.erb
+++ b/apps/dashboard/app/views/products/_form_git.html.erb
@@ -5,7 +5,7 @@
 <div class="alert alert-<%= ssh_key ? "success" : "danger" %> clearfix alert-ssh-key">
   <% if ssh_key %>
       <a class="text-success" role="button" data-toggle="collapse" href="#sshKeyValue" aria-expanded="false" aria-controls="collapseSshKeyValue">
-        <i class="fas fa-check"></i> Detected locally generated SSH key
+        <i class="fas fa-check" aria-hidden="true"></i> Detected locally generated SSH key
       </a>
       <div class="collapse" id="sshKeyValue">
         <p>
@@ -15,7 +15,7 @@
       </div>
   <% else %>
       <div class="pull-left">
-        <i class="fas fa-times"></i> No SSH key was found. You will need to generate a locally installed SSH key to clone the git repo using SSH.
+        <i class="fas fa-times" aria-hidden="true"></i> No SSH key was found. You will need to generate a locally installed SSH key to clone the git repo using SSH.
       </div>
       <%= link_to 'Generate SSH Key', create_key_products_path(type: type), class: 'btn btn-default pull-right' %>
   <% end %>
diff --git a/apps/file-editor/app/views/layouts/application.html.erb b/apps/file-editor/app/views/layouts/application.html.erb
index dfaa176565..ca918f09e2 100644
--- a/apps/file-editor/app/views/layouts/application.html.erb
+++ b/apps/file-editor/app/views/layouts/application.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
   <meta charset="UTF-8">
 
diff --git a/apps/myjobs/app/views/layouts/application.html.erb b/apps/myjobs/app/views/layouts/application.html.erb
index f707c21f2b..b2163ed0e5 100644
--- a/apps/myjobs/app/views/layouts/application.html.erb
+++ b/apps/myjobs/app/views/layouts/application.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%= Configuration.locale %>">
 <head>
   <meta charset="UTF-8">
 
