diff --git a/app/assets/images/icon/missing.png b/app/assets/images/icon/missing.png
index b13b08127..829b71959 100644
Binary files a/app/assets/images/icon/missing.png and b/app/assets/images/icon/missing.png differ
diff --git a/app/assets/images/icon_small/missing.png b/app/assets/images/icon_small/missing.png
index d931b189f..f783de8e5 100644
Binary files a/app/assets/images/icon_small/missing.png and b/app/assets/images/icon_small/missing.png differ
diff --git a/app/assets/images/medium/missing.png b/app/assets/images/medium/missing.png
index 12128ce01..3aed78f53 100644
Binary files a/app/assets/images/medium/missing.png and b/app/assets/images/medium/missing.png differ
diff --git a/app/assets/images/thumb/missing.png b/app/assets/images/thumb/missing.png
index cc0b6b9e6..cacaaa845 100644
Binary files a/app/assets/images/thumb/missing.png and b/app/assets/images/thumb/missing.png differ
diff --git a/app/assets/javascripts/protocols/steps.js.erb b/app/assets/javascripts/protocols/steps.js.erb
index 462cdb8db..c41de1592 100644
--- a/app/assets/javascripts/protocols/steps.js.erb
+++ b/app/assets/javascripts/protocols/steps.js.erb
@@ -462,7 +462,7 @@
   function enableCheckboxSorting(el) {
     Sortable.create(el, {
       draggable: 'fieldset',
-      handle: '.glyphicon-chevron-right',
+      handle: '.fa-circle',
       onUpdate: function () {
         reorderCheckboxData(el);
       }
diff --git a/app/assets/javascripts/repositories/repository_datatable.js.erb b/app/assets/javascripts/repositories/repository_datatable.js.erb
index 383ec23df..5652dda36 100644
--- a/app/assets/javascripts/repositories/repository_datatable.js.erb
+++ b/app/assets/javascripts/repositories/repository_datatable.js.erb
@@ -1110,7 +1110,7 @@ var RepositoryDatatable = (function(global) {
         var colIndex = $(el).attr('data-column-index');
         var visible = TABLE.column(colIndex).visible();
 
-        var visClass = (visible) ? 'glyphicon-eye-open' : 'glyphicon-eye-close';
+        var visClass = (visible) ? 'fa-eye' : 'fa-eye-slash';
         var visLi = (visible) ? '' : 'col-invisible';
 
         var thederName;
@@ -1165,14 +1165,14 @@ var RepositoryDatatable = (function(global) {
       var column = TABLE.column(li.attr('data-position'));
 
       if (column.visible()) {
-        self.addClass('glyphicon-eye-close');
-        self.removeClass('glyphicon-eye-open');
+        self.addClass('fa-eye-slash');
+        self.removeClass('fa-eye');
         li.addClass('col-invisible');
         column.visible(false);
         TABLE.setColumnSearchable(column.index(), false);
       } else {
-        self.addClass('glyphicon-eye-open');
-        self.removeClass('glyphicon-eye-close');
+        self.addClass('fa-eye');
+        self.removeClass('fa-eye-slash');
         li.removeClass('col-invisible');
         column.visible(true);
         TABLE.setColumnSearchable(column.index(), true);
diff --git a/app/assets/javascripts/repository_columns/index.js.erb b/app/assets/javascripts/repository_columns/index.js.erb
index df4f88399..55fac90c4 100644
--- a/app/assets/javascripts/repository_columns/index.js.erb
+++ b/app/assets/javascripts/repository_columns/index.js.erb
@@ -110,7 +110,7 @@
     html += '<span class="pull-left">' + column.name + '</span>';
     html += '<span class="controlls pull-right">';
     html += '<button class="btn btn-default" data-action="edit">';
-    html += '<span class="glyphicon glyphicon-pencil"></span>&nbsp;';
+    html += '<span class="fas fa-pencil-alt"></span>&nbsp;';
     html += '<%= I18n.t "libraries.repository_columns.index.edit_column" %></button>&nbsp;';
     html += '<button class="btn btn-default" data-action="destroy">';
     html += '<span class="glyphicon glyphicon-trash"></span>&nbsp;';
diff --git a/app/assets/javascripts/samples/sample_datatable.js.erb b/app/assets/javascripts/samples/sample_datatable.js.erb
index 69900eed3..2bb7e9550 100644
--- a/app/assets/javascripts/samples/sample_datatable.js.erb
+++ b/app/assets/javascripts/samples/sample_datatable.js.erb
@@ -1077,7 +1077,7 @@ function changeToEditMode() {
         var editable = $(el).is('[data-editable]');
         var deletable = $(el).is('[data-deletable]');
 
-        var visClass = (visible) ? 'glyphicon-eye-open' : 'glyphicon-eye-close';
+        var visClass = (visible) ? 'fas fa-eye' : 'glyphicon-eye-close';
         var visLi = (visible) ? '' : 'col-invisible';
         var editClass = (editable) ? '' : 'disabled';
         var delClass = (deletable) ? '' : 'disabled';
@@ -1105,7 +1105,7 @@ function changeToEditMode() {
           '<span class="ok glyphicon glyphicon-ok" style="display: none;" title="<%= I18n.t("general.save") %>"></span>' +
           '<span class="cancel glyphicon glyphicon-remove" style="display: none;" title="<%= I18n.t("general.cancel") %>"></span>' +
           '<span class="vis glyphicon ' + visClass + '" title="<%= I18n.t("samples.columns_visibility") %>"></span> ' +
-          '<span class="edit glyphicon glyphicon-pencil ' + editClass + '" title="<%= I18n.t("general.edit") %>"></span>' +
+          '<span class="edit fas fa-pencil-alt ' + editClass + '" title="<%= I18n.t("general.edit") %>"></span>' +
           '<span class="del glyphicon glyphicon-trash ' + delClass + '" title="<%= I18n.t("samples.columns_delete") %>"></span>' +
           '</span><br></span></li>';
         dropdownList.append(html);
@@ -1141,12 +1141,12 @@ function changeToEditMode() {
 
       if (column.visible()) {
         self.addClass('glyphicon-eye-close');
-        self.removeClass('glyphicon-eye-open');
+        self.removeClass('fas fa-eye');
         li.addClass('col-invisible');
         column.visible(false);
         table.setColumnSearchable(column.index(), false);
       } else {
-        self.addClass('glyphicon-eye-open');
+        self.addClass('fas fa-eye');
         self.removeClass('glyphicon-eye-close');
         li.removeClass('col-invisible');
         column.visible(true);
diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss
index 7d2f0be30..e088d54a4 100644
--- a/app/assets/stylesheets/projects.scss
+++ b/app/assets/stylesheets/projects.scss
@@ -417,7 +417,7 @@ li.module-hover {
       }
     }
 
-    .glyphicon {
+    .glyphicon, .fas {
       color: $color-white;
       font-size: $font-size-h6;
     }
diff --git a/app/assets/stylesheets/steps.scss b/app/assets/stylesheets/steps.scss
index 85680557f..3c68cec48 100644
--- a/app/assets/stylesheets/steps.scss
+++ b/app/assets/stylesheets/steps.scss
@@ -11,8 +11,7 @@
       margin-bottom: 10px;
 
       & > div > span.pull-left {
-        margin-top: 8px;
-        font-size: 1.2em;
+        margin-top: 10px;
       }
     }
   }
diff --git a/app/datatables/protocol_linked_children_datatable.rb b/app/datatables/protocol_linked_children_datatable.rb
index cf2757def..c4c2bd977 100644
--- a/app/datatables/protocol_linked_children_datatable.rb
+++ b/app/datatables/protocol_linked_children_datatable.rb
@@ -55,7 +55,7 @@ class ProtocolLinkedChildrenDatatable < CustomDatatable
   def record_html(record)
     res = ''
     res += "<ol class='breadcrumb'>"
-    res += "<li><span class='glyphicon glyphicon-blackboard'></span>&nbsp;"
+    res += "<li><span class='fas fa-folder'></span>&nbsp;"
     res += @controller.render_to_string(
       partial: 'search/results/partials/project_text.html.erb',
       locals: { project: record.my_module.experiment.project }
diff --git a/app/helpers/protocol_status_helper.rb b/app/helpers/protocol_status_helper.rb
index 37acb3b7b..a12875495 100644
--- a/app/helpers/protocol_status_helper.rb
+++ b/app/helpers/protocol_status_helper.rb
@@ -28,9 +28,9 @@ module ProtocolStatusHelper
   def protocol_status_popover_title(protocol)
     res = ""
     if protocol.in_repository_public?
-      res << "<span class='glyphicon glyphicon-eye-open' title='" + I18n.t("my_modules.protocols.protocol_status_bar.public_desc") + "'></span>"
+      res << "<span class='fas fa-eye' title='" + I18n.t("my_modules.protocols.protocol_status_bar.public_desc") + "'></span>"
     elsif protocol.in_repository_private?
-      res << "<span class='glyphicon glyphicon-eye-close' title='" + I18n.t("my_modules.protocols.protocol_status_bar.private_desc") + "'></span>"
+      res << "<span class='fas fa-eye-slash' title='" + I18n.t("my_modules.protocols.protocol_status_bar.private_desc") + "'></span>"
     end
     res << "&nbsp;"
     if can_read_protocol_in_repository?(protocol)
diff --git a/app/javascript/src/components/Navigation/index.jsx b/app/javascript/src/components/Navigation/index.jsx
index be939c850..2e5f4af41 100644
--- a/app/javascript/src/components/Navigation/index.jsx
+++ b/app/javascript/src/components/Navigation/index.jsx
@@ -91,14 +91,14 @@ class Navigation extends Component {
           </Navbar.Header>
           <Nav>
             <NavItem eventKey={1}>
-              <span className="glyphicon glyphicon-home" title="Home" />&nbsp;
+              <span className="fas fa-folder" title="Home" />&nbsp;
               <span className="visible-xs-inline visible-sm-inline">
                 <FormattedMessage id="navbar.home_label" />
               </span>
             </NavItem>
             <NavItem eventKey={2}>
               <span
-                className="glyphicon glyphicon-list-alt"
+                className="fas fa-edit"
                 title="Protocol repositories"
               />&nbsp;
               <span className="visible-xs-inline visible-sm-inline">
@@ -107,7 +107,7 @@ class Navigation extends Component {
             </NavItem>
             <NavItem eventKey={3}>
               <i
-                className="fas fa-cubes"
+                className="fas fa-list-alt"
                 aria-hidden="true"
                 title="Repositories"
               />&nbsp;
@@ -117,7 +117,7 @@ class Navigation extends Component {
             </NavItem>
             <NavItem eventKey={4}>
               <span
-                className="glyphicon glyphicon-equalizer"
+                className="fas fa-list"
                 title="Activities"
               />&nbsp;
               <span className="visible-xs-inline visible-sm-inline">
diff --git a/app/javascript/src/scenes/SettingsPage/scenes/profile/components/AvatarInputField.jsx b/app/javascript/src/scenes/SettingsPage/scenes/profile/components/AvatarInputField.jsx
index 286c5401f..9bf56f018 100644
--- a/app/javascript/src/scenes/SettingsPage/scenes/profile/components/AvatarInputField.jsx
+++ b/app/javascript/src/scenes/SettingsPage/scenes/profile/components/AvatarInputField.jsx
@@ -62,7 +62,7 @@ class AvatarInputField extends Component {
             alt="default avatar"
           />
           <EditAvatar className="text-center">
-            <span className="glyphicon glyphicon-pencil" />
+            <span className="fas fa-pencil-alt" />
             <FormattedMessage id="settings_page.edit_avatar" />
           </EditAvatar>
         </AvatarWrapper>
diff --git a/app/views/canvas/_tags.html.erb b/app/views/canvas/_tags.html.erb
index 9149e54c8..e935de4bc 100644
--- a/app/views/canvas/_tags.html.erb
+++ b/app/views/canvas/_tags.html.erb
@@ -2,11 +2,11 @@
   <% tags2 = my_module.tags[0..3] %>
   <% tags2.each do |tag| %>
     <div style="color: <%= tag.color %>" class="<%= "last" if tag == tags2[-1] %>" title="<%= tag.name %>">
-      <span class="glyphicon glyphicon-tag"></span>
+      <span class="fas fa-tag"></span>
     </div>
   <% end %>
   <% if tags2.count == 0 %>
-    <div class="add-tag last"><span class="glyphicon glyphicon-tag"></span></div>
+    <div class="add-tag last"><span class="fas fa-tag"></span></div>
   <% end %>
   <% if my_module.tags.count > 0 %>
     <span class="badge badge-indicator">
diff --git a/app/views/canvas/full_zoom/_my_module.html.erb b/app/views/canvas/full_zoom/_my_module.html.erb
index ccea08365..087428d64 100644
--- a/app/views/canvas/full_zoom/_my_module.html.erb
+++ b/app/views/canvas/full_zoom/_my_module.html.erb
@@ -43,7 +43,7 @@
       <% if can_read_experiment?(my_module.experiment) %>
         <li role="presentation">
           <a class="btn btn-link task-card-view-users" href="<%= my_module_user_my_modules_url(my_module_id: my_module.id, format: :json) %>" aria-controls="<%= my_module.id %>_users" role="tab" data-remote="true">
-            <span class="glyphicon glyphicon-user" aria-hidden="true"></span>
+            <span class="fas fa-users" aria-hidden="true"></span>
             <span class="badge badge-indicator users-badge-indicator <%= 'hidden' unless my_module.users.count.positive? %>"
                   data-linked-id="<%= my_module.id %>">
               <%= my_module.users.count %>
@@ -52,12 +52,12 @@
         </li>
         <li role="presentation">
           <a class="btn btn-link task-card-view-activities" href="<%= activities_tab_my_module_url(id: my_module.id, format: :json) %>" aria-controls="<%= my_module.id %>_activities" role="tab" data-remote="true">
-            <span class="glyphicon glyphicon-equalizer" aria-hidden="true"></span>
+            <span class="fas fa-list" aria-hidden="true"></span>
           </a>
         </li>
         <li role="presentation">
           <a class="btn btn-link task-card-view-comments" href="<%= my_module_my_module_comments_url(my_module_id: my_module.id, format: :json) %>" aria-controls="<%= my_module.id %>_comments" role="tab" data-remote="true">
-            <span class="glyphicon glyphicon-comment" aria-hidden="true"></span>
+            <span class="fas fa-comment" aria-hidden="true"></span>
             <span class="badge badge-indicator comments-badge-indicator <%= 'hidden' unless my_module.task_comments.count.positive? %>"
                   data-linked-id="<%= my_module.id %>">
               <%= my_module.task_comments.count %>
diff --git a/app/views/experiments/canvas.html.erb b/app/views/experiments/canvas.html.erb
index 264534630..2af3d1235 100644
--- a/app/views/experiments/canvas.html.erb
+++ b/app/views/experiments/canvas.html.erb
@@ -13,7 +13,7 @@
                 id: 'edit-canvas-button',
                 data: { action: 'edit' },
                 class: 'ajax btn btn-default' do %>
-                  <span class="glyphicon glyphicon-pencil"></span>
+                  <span class="fas fa-pencil-alt"></span>
                   <span class="hidden-xs"><%=t 'experiments.canvas.canvas_edit' %></span>
                 <% end %>
           <!-- experiment actions -->
diff --git a/app/views/my_module_tags/_index_edit.html.erb b/app/views/my_module_tags/_index_edit.html.erb
index 646ea6756..ce8ef3bac 100644
--- a/app/views/my_module_tags/_index_edit.html.erb
+++ b/app/views/my_module_tags/_index_edit.html.erb
@@ -12,7 +12,7 @@
           </div>
             <div class="pull-right">
               <%= link_to "", remote: true, class: 'btn btn-link edit-tag-link', title: t("experiments.canvas.modal_manage_tags.edit_tag") do %>
-                <span class="glyphicon glyphicon-adjust"></span>
+                <span class="fas fa-pencil-alt"></span>
               <% end %>
               <%= link_to my_module_my_module_tag_path(@my_module, mmt, format: :json), method: :delete, remote: true, class: 'btn btn-link remove-tag-link', title: t("experiments.canvas.modal_manage_tags.remove_tag", module: @my_module.name) do %>
                 <span class="glyphicon glyphicon-remove"></span>
diff --git a/app/views/my_modules/_module_header.html.erb b/app/views/my_modules/_module_header.html.erb
index 3806eb640..4d1b7d2bd 100644
--- a/app/views/my_modules/_module_header.html.erb
+++ b/app/views/my_modules/_module_header.html.erb
@@ -54,10 +54,10 @@
     <div class="badge-icon">
       <% if can_manage_module?(@my_module) %>
         <a class="edit-tags-link" data-remote="true" href="<%= my_module_tags_edit_url(@my_module, format: :json) %>" style="color: inherit">
-          <span class="glyphicon glyphicon-tags"></span>
+          <span class="fas fa-tags"></span>
         </a>
       <% else %>
-        <span class="glyphicon glyphicon-tags"></span>
+        <span class="fas fa-tags"></span>
       <% end %>
     </div>
     <div class="well well-sm">
diff --git a/app/views/my_modules/_result.html.erb b/app/views/my_modules/_result.html.erb
index 4f5aaff63..0d3de8fc2 100644
--- a/app/views/my_modules/_result.html.erb
+++ b/app/views/my_modules/_result.html.erb
@@ -4,7 +4,7 @@
     <% if result.is_text %>
     <span class="glyphicon glyphicon-font"></span>
     <% elsif result.is_table %>
-    <span class="glyphicon glyphicon-list-alt"></span>
+    <span class="fas fa-table"></span>
     <% elsif result.is_asset %>
     <span class="glyphicon glyphicon-picture"></span>
     <% end %>
@@ -15,7 +15,7 @@
       <div class="panel-options pull-right">
         <% if can_manage_module?(result.my_module) %>
           <a class="btn btn-link edit-result-button <%= edit_result_button_class(result) %>" id="<%= result.id %>_edit" href="<%= edit_result_link(result) %>" data-remote="true" title="<%= t'my_modules.results.options.edit_title' %>">
-            <span class="glyphicon glyphicon-edit"></span>
+            <span class="fas fa-pencil-alt"></span>
           </a>
         <% end %>
         <% if can_manage_result?(result) %>
diff --git a/app/views/my_modules/_tags.html.erb b/app/views/my_modules/_tags.html.erb
index 8799679bc..237cfb06c 100644
--- a/app/views/my_modules/_tags.html.erb
+++ b/app/views/my_modules/_tags.html.erb
@@ -1,6 +1,6 @@
 <% tags = my_module.tags %>
   <% tags.each do |tag| %>
-    <span class="glyphicon glyphicon-tag" style="color: <%= tag.color %>"></span>
+    <span class="fas fa-tag" style="color: <%= tag.color %>"></span>
     <strong><%= tag.name %></strong>
   <% end %>
 <% if tags.count == 0 %>
diff --git a/app/views/my_modules/archive/_result.html.erb b/app/views/my_modules/archive/_result.html.erb
index 2c5a9cee3..0693efad5 100644
--- a/app/views/my_modules/archive/_result.html.erb
+++ b/app/views/my_modules/archive/_result.html.erb
@@ -44,7 +44,7 @@
       <% elsif result.is_text %>
         <span class="glyphicon glyphicon-asterisk"></span>
       <% elsif result.is_table %>
-        <span class="glyphicon glyphicon-th"></span>
+        <span class="fas fa-table"></span>
       <% end %>
       <%= result.name %>
     </h3>
diff --git a/app/views/my_modules/results.html.erb b/app/views/my_modules/results.html.erb
index 5a8fa7188..4ee4f9569 100644
--- a/app/views/my_modules/results.html.erb
+++ b/app/views/my_modules/results.html.erb
@@ -27,7 +27,7 @@
          id="new-result-table"
          data-href="<%= new_my_module_result_table_path(my_module_id: @my_module.id) %>"
          href="#">
-        <span class="glyphicon glyphicon-list-alt"></span>
+        <span class="fas fa-table"></span>
         <span class="hidden-xs"><%= t("my_modules.results.new_table_result") %></span>
       </a>
       <a class="btn btn-primary"
diff --git a/app/views/projects/archive/_project.html.erb b/app/views/projects/archive/_project.html.erb
index b382e4644..ab6e0dfa1 100644
--- a/app/views/projects/archive/_project.html.erb
+++ b/app/views/projects/archive/_project.html.erb
@@ -26,9 +26,9 @@
 
     <h3 class="panel-title">
       <% if project.hidden? then %>
-        <span class="glyphicon glyphicon-eye-close" aria-hidden="true" title="<%=t "projects.index.visibility_private" %>"></span>
+        <span class="fas fa-eye-slash" aria-hidden="true" title="<%=t "projects.index.visibility_private" %>"></span>
       <% else %>
-        <span class="glyphicon glyphicon-eye-open" aria-hidden="true" title="<%=t "projects.index.visibility_public" %>"></span>
+        <span class="fas fa-eye" aria-hidden="true" title="<%=t "projects.index.visibility_public" %>"></span>
       <% end %>
       <span><%= project.name %></span>
     </h3>
diff --git a/app/views/projects/index/_project.html.erb b/app/views/projects/index/_project.html.erb
index b7925874e..e613f1e91 100644
--- a/app/views/projects/index/_project.html.erb
+++ b/app/views/projects/index/_project.html.erb
@@ -26,9 +26,9 @@ data-project-users-tab-url="<%= url_for project_user_projects_path(project_id: p
 
     <h3 class="panel-title">
       <% if project.hidden? then %>
-        <span class="glyphicon glyphicon-eye-close" aria-hidden="true" title="<%=t "projects.index.visibility_private" %>"></span>
+        <span class="fas fa-eye-slash" aria-hidden="true" title="<%=t "projects.index.visibility_private" %>"></span>
       <% else %>
-        <span class="glyphicon glyphicon-eye-open" aria-hidden="true" title="<%=t "projects.index.visibility_public" %>"></span>
+        <span class="fas fa-eye" aria-hidden="true" title="<%=t "projects.index.visibility_public" %>"></span>
       <% end %>
       <% if can_read_project?(project) then %>
         <%= link_to project.name, project_path(project), id: "#{project.id}-project-canvas-link" %>
@@ -54,12 +54,12 @@ data-project-users-tab-url="<%= url_for project_user_projects_path(project_id: p
       <% if can_read_project?(project) %>
         <li role="presentation">
           <a class="btn btn-link" href="<%= url_for project_project_activities_path(project_id: project.id, format: :json) %>" aria-controls="activities-<%= project.id %>" role="tab" data-remote="true">
-            <span class="glyphicon glyphicon-equalizer"></span>
+            <span class="fas fa-list"></span>
           </a>
         </li>
         <li role="presentation">
           <a class="btn btn-link" href="<%= url_for project_user_projects_path(project_id: project.id, format: :json) %>" aria-controls="users-<%= project.id %>" role="tab" data-remote="true">
-            <span class="glyphicon glyphicon-user"></span>
+            <span class="fas fa-users"></span>
             <span class="badge badge-indicator users-badge-indicator <%= 'hidden' unless project.users.count.positive? %>"
                   data-linked-id="<%= project.id %>">
               <%= project.users.count %>
@@ -68,7 +68,7 @@ data-project-users-tab-url="<%= url_for project_user_projects_path(project_id: p
         </li>
         <li role="presentation">
           <a class="btn btn-link" href="<%= url_for notifications_project_path(id: project.id, format: :json) %>" aria-controls="notifications-<%= project.id %>" role="tab" data-remote="true">
-            <span class="glyphicon glyphicon-bell"></span>
+            <span class="fas fa-bell"></span>
             <% if project.notifications_count(current_user).positive? %>
               <span class="badge badge-indicator"><%= project.notifications_count(current_user) %></span>
             <% end %>
@@ -76,7 +76,7 @@ data-project-users-tab-url="<%= url_for project_user_projects_path(project_id: p
         </li>
         <li role="presentation">
           <a class="btn btn-link" href="<%= url_for project_project_comments_path(project_id: project.id, format: :json) %>" aria-controls="comments-<%= project.id %>" role="tab" data-remote="true">
-            <span class="glyphicon glyphicon-comment"></span>
+            <span class="fas fa-comment"></span>
             <span class="badge badge-indicator comments-badge-indicator <%= 'hidden' unless project.project_comments.count.positive? %>"
                   data-linked-id="<%= project.id %>">
               <%= project.project_comments.count %>
diff --git a/app/views/protocols/_header.html.erb b/app/views/protocols/_header.html.erb
index ad8455cae..78384ec7a 100644
--- a/app/views/protocols/_header.html.erb
+++ b/app/views/protocols/_header.html.erb
@@ -31,7 +31,7 @@
 
   <div class="col-xs-12 col-sm-4 col-md-4">
     <div class="badge-icon">
-      <span class="glyphicon glyphicon-user"></span>
+      <span class="fas fa-user fa-lg"></span>
     </div>
     <div class="well well-sm">
       <span class="hidden-xs hidden-sm hidden-md"><%=t "protocols.header.added_by" %>:</span>
diff --git a/app/views/protocols/header/_name_label.html.erb b/app/views/protocols/header/_name_label.html.erb
index 63e007cb7..7d5a83d7e 100644
--- a/app/views/protocols/header/_name_label.html.erb
+++ b/app/views/protocols/header/_name_label.html.erb
@@ -1,6 +1,6 @@
 <h2 style="margin-top: 0;">
   <%= @protocol.name %>
   <small>
-    <span class="glyphicon glyphicon-edit"></span>
+    <span class="fas fa-pencil-alt"></span>
   </small>
 </h2>
diff --git a/app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb b/app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb
index e9a17eed7..9e2161eda 100644
--- a/app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb
+++ b/app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb
@@ -35,7 +35,7 @@
         </div>
         <div class="form-group">
           <label>
-            <span class="glyphicon glyphicon-user">
+            <span class="fas fa-user">
             </span>&nbsp;<%= t('protocols.import_export.import_modal.authors_label') %>
           </label>
           <%= f.text_field :authors, :value => pio_eval_title_len(sanitize_input(not_null(@json_object['authors']))), class:
diff --git a/app/views/protocols/import_export/_import_modal.html.erb b/app/views/protocols/import_export/_import_modal.html.erb
index 2c761b0a0..324220aab 100644
--- a/app/views/protocols/import_export/_import_modal.html.erb
+++ b/app/views/protocols/import_export/_import_modal.html.erb
@@ -20,7 +20,7 @@
         </div>
         <div class="form-group">
           <label for="protocol_authors">
-            <span class="glyphicon glyphicon-user"></span>&nbsp;<%= t("protocols.import_export.import_modal.authors_label") %>
+            <span class="fas fa-user"></span>&nbsp;<%= t("protocols.import_export.import_modal.authors_label") %>
           </label>
           <input type="text" class="form-control" id="protocol_authors">
         </div>
diff --git a/app/views/protocols/index.html.erb b/app/views/protocols/index.html.erb
index 95b5e816f..90a5b6e32 100644
--- a/app/views/protocols/index.html.erb
+++ b/app/views/protocols/index.html.erb
@@ -26,7 +26,7 @@
               <span class="hidden-xs">&nbsp;<%= t("protocols.index.create_new") %></span>
             </a>
             <a class="btn btn-default" data-action="edit">
-              <span class="glyphicon glyphicon-pencil"></span>
+              <span class="fas fa-pencil-alt"></span>
               <span class="hidden-xs">&nbsp;<%= t("protocols.index.edit") %></span>
             </a>
             <a class="btn btn-default" data-action="clone">
@@ -35,12 +35,12 @@
             </a>
             <% if @type == :public %>
               <a class="btn btn-default" data-action="make-private" data-url="<%= make_private_protocols_path %>">
-                <span class="glyphicon glyphicon-eye-close"></span>
+                <span class="fas fa-eye-slash"></span>
                 <span class="hidden-xs">&nbsp;<%= t("protocols.index.make_private") %></span>
               </a>
             <% elsif @type == :private %>
               <a class="btn btn-default" data-action="publish" data-url="<%= publish_protocols_path %>">
-                <span class="glyphicon glyphicon-open"></span>
+                <span class="fas fa-eye"></span>
                 <span class="hidden-xs">&nbsp;<%= t("protocols.index.publish") %></span>
               </a>
             <% end %>
diff --git a/app/views/protocols/index/_protocol_preview_modal_body.html.erb b/app/views/protocols/index/_protocol_preview_modal_body.html.erb
index 1780de92b..da26eb078 100644
--- a/app/views/protocols/index/_protocol_preview_modal_body.html.erb
+++ b/app/views/protocols/index/_protocol_preview_modal_body.html.erb
@@ -21,7 +21,7 @@
 
   <div class="col-xs-12 col-sm-4 col-md-4">
     <div class="badge-icon">
-      <span class="glyphicon glyphicon-user"></span>
+      <span class="fas fa-user fa-lg"></span>
     </div>
     <div class="well well-sm">
       <span class="hidden-xs hidden-sm hidden-md"><%=t "protocols.header.added_by" %>:</span>
diff --git a/app/views/reports/elements/_my_module_activity_element.html.erb b/app/views/reports/elements/_my_module_activity_element.html.erb
index 8a709e931..22192e36c 100644
--- a/app/views/reports/elements/_my_module_activity_element.html.erb
+++ b/app/views/reports/elements/_my_module_activity_element.html.erb
@@ -2,11 +2,11 @@
 <% if order.blank? and @order.present? then order = @order end %>
 <% timestamp = Time.current + 1.year - 2.days %>
 <% activities = my_module.activities.order(created_at: order) %>
-<div class="report-element report-module-activity-element" data-ts="<%= timestamp.to_i %>" data-type="my_module_activity" data-id='{ "my_module_id": <%= my_module.id %> }' data-scroll-id="<%= my_module.id %>" data-order="<%= order == :asc ? "asc" : "desc" %>" data-name="<%=t "projects.reports.elements.module_activity.sidebar_name" %>" data-icon-class="glyphicon glyphicon-equalizer">
+<div class="report-element report-module-activity-element" data-ts="<%= timestamp.to_i %>" data-type="my_module_activity" data-id='{ "my_module_id": <%= my_module.id %> }' data-scroll-id="<%= my_module.id %>" data-order="<%= order == :asc ? "asc" : "desc" %>" data-name="<%=t "projects.reports.elements.module_activity.sidebar_name" %>" data-icon-class="fas fa-list">
   <div class="report-element-header">
     <div class="row">
       <div class="pull-left activity-icon">
-        <span class="glyphicon glyphicon-equalizer"></span>
+        <span class="fas fa-list"></span>
       </div>
       <div class="pull-left activity-name">
         <%=t "projects.reports.elements.module_activity.name", my_module: my_module.name %>
diff --git a/app/views/reports/elements/_my_module_repository_element.html.erb b/app/views/reports/elements/_my_module_repository_element.html.erb
index 8c9ae0ef3..2de1cb99c 100644
--- a/app/views/reports/elements/_my_module_repository_element.html.erb
+++ b/app/views/reports/elements/_my_module_repository_element.html.erb
@@ -4,11 +4,11 @@
 <% if order.blank? and @order.present? then order = @order end %>
 <% timestamp = Time.current + 1.year - 1.days %>
 <% rows_json = my_module.repository_json_hot(repository.id, order) %>
-<div class="report-element report-module-repository-element" data-sort-hot="1" data-ts="<%= timestamp.to_i %>" data-type="my_module_repository" data-id='{ "my_module_id": <%= my_module.id %>, "repository_id": <%= repository.id %> }' data-scroll-id="<%= "#{my_module.id}_#{repository.id}" %>" data-order="<%= order == :asc ? "asc" : "desc" %>" data-name="<%= repository.name %>" data-icon-class="fas fa-cubes">
+<div class="report-element report-module-repository-element" data-sort-hot="1" data-ts="<%= timestamp.to_i %>" data-type="my_module_repository" data-id='{ "my_module_id": <%= my_module.id %>, "repository_id": <%= repository.id %> }' data-scroll-id="<%= "#{my_module.id}_#{repository.id}" %>" data-order="<%= order == :asc ? "asc" : "desc" %>" data-name="<%= repository.name %>" data-icon-class="fas fa-list-alt">
   <div class="report-element-header">
     <div class="row">
       <div class="pull-left repository-icon">
-        <i class="fas fa-cubes"></i>
+        <i class="fas fa-list-alt"></i>
       </div>
       <div class="pull-left repository-name">
         <%=t "projects.reports.elements.module_repository.name", repository: repository.name, my_module: my_module.name %>
diff --git a/app/views/reports/elements/_my_module_result_table_element.html.erb b/app/views/reports/elements/_my_module_result_table_element.html.erb
index a545e009a..9d3805a0b 100644
--- a/app/views/reports/elements/_my_module_result_table_element.html.erb
+++ b/app/views/reports/elements/_my_module_result_table_element.html.erb
@@ -3,12 +3,12 @@
 <% comments = result.result_comments %>
 <% timestamp = table.created_at %>
 <% name = result.name %>
-<div class="report-element report-result-element report-result-table-element" data-ts="<%= timestamp.to_i %>" data-type="result_table" data-id='{ "result_id": <%= result.id %> }' data-scroll-id="<%= result.id %>" data-modal-title="<%=t "projects.reports.elements.modals.result_contents.head_title", result: result.name %>" data-name="<%= name %>" data-icon-class="glyphicon glyphicon-th">
+<div class="report-element report-result-element report-result-table-element" data-ts="<%= timestamp.to_i %>" data-type="result_table" data-id='{ "result_id": <%= result.id %> }' data-scroll-id="<%= result.id %>" data-modal-title="<%=t "projects.reports.elements.modals.result_contents.head_title", result: result.name %>" data-name="<%= name %>" data-icon-class="fas fa-table">
   <div class="report-element-header">
     <div class="row">
       <div class="pull-left result-name-container">
         <div class="result-icon">
-            <span class="glyphicon glyphicon-th"></span>
+            <span class="fas fa-table"></span>
         </div>
         <div class="result-name">
           <%= name %>
diff --git a/app/views/reports/elements/_result_comments_element.html.erb b/app/views/reports/elements/_result_comments_element.html.erb
index d0c0ce929..8a54c7b9e 100644
--- a/app/views/reports/elements/_result_comments_element.html.erb
+++ b/app/views/reports/elements/_result_comments_element.html.erb
@@ -2,11 +2,11 @@
 <% if order.blank? and @order.present? then order = @order end %>
 <% comments = result.result_comments.order(created_at: order) %>
 <% timestamp = Time.current + 1.year %>
-<div class="report-element report-comments-element report-result-comments-element" data-ts="<%= timestamp.to_i %>" data-order="<%= order == :asc ? "asc" : "desc" %>" data-type="result_comments" data-id='{ "result_id": <%= result.id %> }' data-scroll-id="<%= result.id %>" data-name="<%=t "projects.reports.elements.result_comments.sidebar_name" %>" data-icon-class="glyphicon glyphicon-comment">
+<div class="report-element report-comments-element report-result-comments-element" data-ts="<%= timestamp.to_i %>" data-order="<%= order == :asc ? "asc" : "desc" %>" data-type="result_comments" data-id='{ "result_id": <%= result.id %> }' data-scroll-id="<%= result.id %>" data-name="<%=t "projects.reports.elements.result_comments.sidebar_name" %>" data-icon-class="fas fa-comment">
   <div class="report-element-header">
     <div class="row">
       <div class="pull-left comments-icon">
-          <span class="glyphicon glyphicon-comment"></span>
+          <span class="fas fa-comment"></span>
       </div>
       <div class="pull-left comments-name">
         <%=t "projects.reports.elements.result_comments.name", result: result.name %>
diff --git a/app/views/reports/elements/_step_checklist_element.html.erb b/app/views/reports/elements/_step_checklist_element.html.erb
index 9f04e801b..abd56ddc0 100644
--- a/app/views/reports/elements/_step_checklist_element.html.erb
+++ b/app/views/reports/elements/_step_checklist_element.html.erb
@@ -1,11 +1,11 @@
 <% if checklist.blank? and @checklist.present? then checklist = @checklist end %>
 <% items = checklist.checklist_items %>
 <% timestamp = checklist.created_at %>
-<div class="report-element report-step-attachment-element report-step-checklist-element" data-ts="<%= timestamp.to_i %>" data-type="step_checklist" data-id='{ "checklist_id": <%= checklist.id %> }' data-scroll-id="<%= checklist.id %>" data-name="<%= checklist.name %>" data-icon-class="glyphicon glyphicon-list">
+<div class="report-element report-step-attachment-element report-step-checklist-element" data-ts="<%= timestamp.to_i %>" data-type="step_checklist" data-id='{ "checklist_id": <%= checklist.id %> }' data-scroll-id="<%= checklist.id %>" data-name="<%= checklist.name %>" data-icon-class="fas fa-tasks">
   <div class="report-element-header">
     <div class="row">
       <div class="pull-left attachment-icon">
-          <span class="glyphicon glyphicon-list"></span>
+          <span class="fas fa-tasks"></span>
       </div>
       <div class="pull-left checklist-name">
         <%= custom_auto_link(t('projects.reports.elements.step_checklist.checklist_name', name: checklist.name)) %>
diff --git a/app/views/reports/elements/_step_comments_element.html.erb b/app/views/reports/elements/_step_comments_element.html.erb
index 6c9a73a93..88477a8dc 100644
--- a/app/views/reports/elements/_step_comments_element.html.erb
+++ b/app/views/reports/elements/_step_comments_element.html.erb
@@ -2,11 +2,11 @@
 <% if order.blank? and @order.present? then order = @order end %>
 <% comments = step.step_comments.order(created_at: order) %>
 <% timestamp = Time.current + 1.year %>
-<div class="report-element report-comments-element report-step-comments-element" data-ts="<%= timestamp.to_i %>" data-order="asc" data-type="step_comments" data-id='{ "step_id": <%= step.id %> }' data-scroll-id="<%= step.id %>" data-name="<%=t "projects.reports.elements.step_comments.sidebar_name" %>" data-icon-class="glyphicon glyphicon-comment">
+<div class="report-element report-comments-element report-step-comments-element" data-ts="<%= timestamp.to_i %>" data-order="asc" data-type="step_comments" data-id='{ "step_id": <%= step.id %> }' data-scroll-id="<%= step.id %>" data-name="<%=t "projects.reports.elements.step_comments.sidebar_name" %>" data-icon-class="fas fa-comment">
   <div class="report-element-header">
     <div class="row">
       <div class="pull-left comments-icon">
-          <span class="glyphicon glyphicon-comment"></span>
+          <span class="fas fa-comment"></span>
       </div>
       <div class="pull-left comments-name">
         <%=t "projects.reports.elements.step_comments.name", step: step.name %>
diff --git a/app/views/reports/elements/_step_table_element.html.erb b/app/views/reports/elements/_step_table_element.html.erb
index cbad89990..f425a33f1 100644
--- a/app/views/reports/elements/_step_table_element.html.erb
+++ b/app/views/reports/elements/_step_table_element.html.erb
@@ -1,10 +1,10 @@
 <% if table.blank? and @table.present? then table = @table end %>
 <% timestamp = table.created_at %>
-<div class="report-element report-step-attachment-element report-step-table-element" data-ts="<%= timestamp.to_i %>" data-type="step_table" data-id='{ "table_id": <%= table.id %> }' data-scroll-id="<%= table.id %>" data-name="<%= table.name %>" data-icon-class="glyphicon glyphicon-th">
+<div class="report-element report-step-attachment-element report-step-table-element" data-ts="<%= timestamp.to_i %>" data-type="step_table" data-id='{ "table_id": <%= table.id %> }' data-scroll-id="<%= table.id %>" data-name="<%= table.name %>" data-icon-class="fas fa-table">
   <div class="report-element-header">
     <div class="row">
       <div class="pull-left attachment-icon">
-          <span class="glyphicon glyphicon-th"></span>
+          <span class="fas fa-table"></span>
       </div>
       <% if table && table.name %>
         <div class="pull-left table-name">
diff --git a/app/views/reports/index.html.erb b/app/views/reports/index.html.erb
index 349249ad6..500094a04 100644
--- a/app/views/reports/index.html.erb
+++ b/app/views/reports/index.html.erb
@@ -11,7 +11,7 @@
             <span class="hidden-xs"><%=t "projects.reports.index.new" %></span>
           <% end %>
           <%= link_to "", remote: true, class: "btn btn-default", id: "edit-report-btn" do %>
-            <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
+            <span class="fas fa-pencil-alt" aria-hidden="true"></span>
             <span class="hidden-xs"><%=t "projects.reports.index.edit" %></span>
           <% end %>
           <%= link_to "", remote: true, class: "btn btn-default", id: "delete-reports-btn" do %>
diff --git a/app/views/repositories/_columns_reorder_dropdown.html.erb b/app/views/repositories/_columns_reorder_dropdown.html.erb
index fb66d7947..d0b8ffdd0 100644
--- a/app/views/repositories/_columns_reorder_dropdown.html.erb
+++ b/app/views/repositories/_columns_reorder_dropdown.html.erb
@@ -1,6 +1,6 @@
 <div id="repository-columns-dropdown" class="dropdown">
   <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">
-    <span class="glyphicon glyphicon-eye-open"></span>
+    <span class="fas fa-eye"></span>
     <span class="hidden-xs"><%= t('repositories.index.visibility') %></span>
   </button>
   <ul class="dropdown-menu dropdown-menu-right smart-dropdown" id="repository-columns-list">
@@ -8,7 +8,7 @@
       <i class="grippy"></i>
       <span class="text"></span>
       <span class="pull-right controls">
-        <span class="vis glyphicon" title=""></span>
+        <span class="vis fas" title=""></span>
       </span>
       <br>
     </li>
diff --git a/app/views/repositories/_repository_row_info_modal.html.erb b/app/views/repositories/_repository_row_info_modal.html.erb
index ba2d7d30a..40faf068c 100644
--- a/app/views/repositories/_repository_row_info_modal.html.erb
+++ b/app/views/repositories/_repository_row_info_modal.html.erb
@@ -8,7 +8,7 @@
 
       <div class="modal-body">
         <ol class="breadcrumb breadcrumb-repository">
-          <span class="fa fa-cubes" aria-hidden="true"></span>
+          <span class="fas fa-list-alt" aria-hidden="true"></span>
           <%= t('repositories.repository', name: @repository_row.repository.name) %>
         </ol>
         <p>
@@ -50,7 +50,7 @@
                 <tr role="row">
                   <td class="sorting_1">
                     <ol class='breadcrumb'>
-                      <li><span class='glyphicon glyphicon-blackboard'></span>&nbsp;
+                      <li><span class='fas fa-folder'></span>&nbsp;
                         <%= render partial: 'search/results/partials/project_text.html.erb',
                                   locals: { project: element.my_module.experiment.project } %>
                       </li>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 263cb9b84..7d4799e39 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -23,7 +23,7 @@
              aria-haspopup="true"
              aria-expanded="true"
              <%= "disabled" unless can_perform_repository_actions(@repository) %>>
-          <span class="glyphicon glyphicon-cog"></span>
+          <span class="fas fa-ellipsis-v"></span>
           <span class="hidden-xs"><%= t('repositories.index.advanced') %></span>
           <span class="caret"></span>
         </div>
@@ -115,7 +115,7 @@
   <div class="toolbarButtons" style="display:none">
     <% if can_manage_repository_rows?(@repository.team) %>
       <button type="button" class="btn btn-default editAdd" id="editRepositoryRecord" onclick="onClickEdit()" disabled>
-        <span class="glyphicon glyphicon-pencil"></span>
+        <span class="fas fa-pencil-alt"></span>
         <span class="hidden-xs-custom"><%= t("repositories.edit_record") %></span>
       </button>
       <button type="button" class="btn btn-default"
diff --git a/app/views/repository_columns/index.html.erb b/app/views/repository_columns/index.html.erb
index e9d674617..c81d22c72 100644
--- a/app/views/repository_columns/index.html.erb
+++ b/app/views/repository_columns/index.html.erb
@@ -37,7 +37,7 @@
               <span class="pull-left"><%= column.name %></span>
               <span class="controlls pull-right">
                 <button class="btn btn-default" data-action="edit">
-                  <span class="glyphicon glyphicon-pencil"></span>
+                  <span class="fas fa-pencil-alt"></span>
                   <%=t 'libraries.repository_columns.index.edit_column'%>
                 </button>
                 <button class="btn btn-default" data-action="destroy">
diff --git a/app/views/sample_groups/_sample_group.html.erb b/app/views/sample_groups/_sample_group.html.erb
index 2e2a60a99..623a8eca5 100644
--- a/app/views/sample_groups/_sample_group.html.erb
+++ b/app/views/sample_groups/_sample_group.html.erb
@@ -15,7 +15,7 @@
                                     class: 'edit-sample-group-color' %>
         <% end %>
       </span>
-      <span class="edit-sample-group glyphicon glyphicon-pencil"></span>
+      <span class="edit-sample-group fas fa-pencil-alt"></span>
       <span class="delete glyphicon glyphicon-trash"></span>
     </span>
   </span>
diff --git a/app/views/sample_types/_sample_type.html.erb b/app/views/sample_types/_sample_type.html.erb
index 8c6b90388..0313b7631 100644
--- a/app/views/sample_types/_sample_type.html.erb
+++ b/app/views/sample_types/_sample_type.html.erb
@@ -7,7 +7,7 @@
   <span class="form-group">
     <input class="text-edit" style="display: none;" />
     <span class="pull-right">
-      <span class="edit-sample-type glyphicon glyphicon-pencil"></span>
+      <span class="edit-sample-type fas fa-pencil-alt"></span>
       <span class="delete glyphicon glyphicon-trash"></span>
     </span>
   </span>
diff --git a/app/views/samples/_info_sample_modal.html.erb b/app/views/samples/_info_sample_modal.html.erb
index ea41c1d14..2eccb33b1 100644
--- a/app/views/samples/_info_sample_modal.html.erb
+++ b/app/views/samples/_info_sample_modal.html.erb
@@ -56,7 +56,7 @@
                 <tr role="row">
                   <td class="sorting_1">
                     <ol class='breadcrumb'>
-                      <li><span class='glyphicon glyphicon-blackboard'></span>&nbsp;
+                      <li><span class='fas fa-folder'></span>&nbsp;
                         <%= render partial: 'search/results/partials/project_text.html.erb',
                                   locals: { project: mod.experiment.project } %>
                       </li>
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index 9d7a21ef1..e5f8b746a 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -55,7 +55,7 @@
                            match_case: @search_case, utf8: '✓',
                            search_id: @search_id}.to_query %>">
               <span class="badge pull-right"><%= @project_search_count %></span>
-              <span class="glyphicon glyphicon-blackboard"></span>
+              <span class="fas fa-folder"></span>
               <%= t'Projects' %>
             </a>
           </li>
@@ -111,7 +111,7 @@
                            match_case: @search_case, utf8: '✓',
                            search_id: @search_id}.to_query %>">
               <span class="badge pull-right"><%= @tag_search_count %></span>
-              <span class="glyphicon glyphicon-tags"></span>
+              <span class="fas fa-tags"></span>
               <%= t'Tags' %>
             </a>
           </li>
@@ -125,7 +125,7 @@
                            match_case: @search_case, utf8: '✓',
                            search_id: @search_id}.to_query %>">
               <span class="badge pull-right"><%= @report_search_count %></span>
-              <span class="glyphicon glyphicon-align-left"></span>
+              <span class="fas fa-clipboard-check"></span>
               <%= t'Reports' %>
             </a>
           </li>
@@ -139,7 +139,7 @@
                            match_case: @search_case, utf8: '✓',
                            search_id: @search_id}.to_query %>">
               <span class="badge pull-right"><%= @protocol_search_count %></span>
-              <span class="glyphicon glyphicon-list-alt"></span>
+              <span class="fas fa-edit"></span>
               <%= t'Protocols' %>
             </a>
           </li>
@@ -167,7 +167,7 @@
                            match_case: @search_case, utf8: '✓',
                            search_id: @search_id}.to_query %>">
               <span class="badge pull-right"><%= @checklist_search_count %></span>
-              <span class="glyphicon glyphicon-list"></span>
+              <span class="fas fa-tasks"></span>
               <%= t'Checklists' %>
             </a>
           </li>
@@ -196,7 +196,7 @@
                            match_case: @search_case, utf8: '✓',
                            search_id: @search_id}.to_query %>">
               <span class="badge pull-right"><%= @table_search_count %></span>
-              <span class="glyphicon glyphicon-th"></span>
+              <span class="fas fa-table"></span>
               <%= t'Tables' %>
             </a>
           </li>
@@ -210,14 +210,14 @@
                            match_case: @search_case, utf8: '✓',
                            search_id: @search_id}.to_query %>">
               <span class="badge pull-right"><%= @comment_search_count %></span>
-              <span class="glyphicon glyphicon-comment"></span>
+              <span class="fas fa-comment"></span>
               <%= t'Comments' %>
             </a>
           </li>
 
           <% @repository_search_count.each do |team, results| %>
             <li class="repositories-team <%= 'active' if results[:count] > 0 %>">
-              <i class="fas fa-cubes"></i>
+              <i class="fas fa-list-alt"></i>
               <%= t('Repositories_team', team: team) %>
             </li>
             <% results[:repositories].each do |repository, values| %>
diff --git a/app/views/search/results/_comments.html.erb b/app/views/search/results/_comments.html.erb
index 2f4ef1769..af55d3b60 100644
--- a/app/views/search/results/_comments.html.erb
+++ b/app/views/search/results/_comments.html.erb
@@ -1,7 +1,7 @@
 <% results.each do |comment| %>
 
   <p>
-    <span class="glyphicon glyphicon-comment"></span>
+    <span class="fas fa-comment"></span>
     <% if comment.is_a?(ProjectComment) && comment.project.present? %>
       <%=t "search.index.comments.project" %>
     <% elsif comment.is_a?(TaskComment) && comment.my_module.present? %>
diff --git a/app/views/search/results/_projects.html.erb b/app/views/search/results/_projects.html.erb
index b639bfbb5..c4252cb61 100644
--- a/app/views/search/results/_projects.html.erb
+++ b/app/views/search/results/_projects.html.erb
@@ -1,6 +1,6 @@
 <% results.each do |project| %>
   <h5>
-    <span class="glyphicon glyphicon-blackboard"></span>
+    <span class="fas fa-folder"></span>
     <%= render partial: 'search/results/partials/project_text.html.erb',
                locals: { project: project, query: search_query, link_to_page: :show } %>
   </h5>
diff --git a/app/views/search/results/_protocols.html.erb b/app/views/search/results/_protocols.html.erb
index 577e21ad4..89f41d768 100644
--- a/app/views/search/results/_protocols.html.erb
+++ b/app/views/search/results/_protocols.html.erb
@@ -6,7 +6,7 @@
   <% has_keywords = protocol.in_repository? && protocol.protocol_keywords.count > 0 %>
 
   <h5>
-    <span class="glyphicon glyphicon-list-alt"></span>
+    <span class="fas fa-edit"></span>
     <%= render partial: "search/results/partials/protocol_text.html.erb", locals: { protocol: protocol, query: search_query } %>
   </h5>
 
diff --git a/app/views/search/results/_reports.html.erb b/app/views/search/results/_reports.html.erb
index eea79d270..e4a07170d 100644
--- a/app/views/search/results/_reports.html.erb
+++ b/app/views/search/results/_reports.html.erb
@@ -1,6 +1,6 @@
 <% results.each do |report| %>
   <h5>
-    <span class="glyphicon glyphicon-list-alt"></span>
+    <span class="fas fa-clipboard-check"></span>
     <%= render partial: "search/results/partials/report_text.html.erb", locals: { report: report, query: search_query } %>
   </h5>
 
diff --git a/app/views/search/results/_repositories.html.erb b/app/views/search/results/_repositories.html.erb
index 96ff4032f..f6a31889d 100644
--- a/app/views/search/results/_repositories.html.erb
+++ b/app/views/search/results/_repositories.html.erb
@@ -1,6 +1,6 @@
 <% results.each do |repository_row| %>
   <h5>
-    <i class="fas fa-cubes"></i>
+    <i class="fas fa-list-alt"></i>
     <%=t "search.index.repositories.repository_row" %>
     <%= highlight repository_row.name, search_query.strip.split(/\s+/) %>
   </h5>
diff --git a/app/views/search/results/_results.html.erb b/app/views/search/results/_results.html.erb
index a87bd3773..a9dfaef71 100644
--- a/app/views/search/results/_results.html.erb
+++ b/app/views/search/results/_results.html.erb
@@ -3,7 +3,7 @@
     <% if result.is_text %>
       <span class="glyphicon glyphicon-asterisk"></span>
     <% elsif result.is_table %>
-      <span class="glyphicon glyphicon-th"></span>
+      <span class="fas fa-table"></span>
     <% else %>
       <% if result.asset.is_image? %>
         <span class="glyphicon glyphicon-picture"></span>
diff --git a/app/views/search/results/_tables.html.erb b/app/views/search/results/_tables.html.erb
index c4f8679a5..e10716bb3 100644
--- a/app/views/search/results/_tables.html.erb
+++ b/app/views/search/results/_tables.html.erb
@@ -1,6 +1,6 @@
 <% results.each do |table| %>
   <h5>
-    <span class="glyphicon glyphicon-th"></span>
+    <span class="fas fa-table"></span>
     <%= highlight search_query, search_query.strip.split(/\s+/) %>
   </h5>
 
diff --git a/app/views/search/results/_tags.html.erb b/app/views/search/results/_tags.html.erb
index fecdd480f..13e9b4f42 100644
--- a/app/views/search/results/_tags.html.erb
+++ b/app/views/search/results/_tags.html.erb
@@ -1,6 +1,6 @@
 <% results.each do |tag| %>
   <h5>
-    <span class="glyphicon glyphicon-tag" style="color: <%= tag.color %>"></span>
+    <span class="fas fa-tag" style="color: <%= tag.color %>"></span>
     <%= render partial: "search/results/partials/tag_text.html.erb", locals: { tag: tag, query: search_query } %>
   </h5>
 
diff --git a/app/views/shared/_left_menu_bar.html.erb b/app/views/shared/_left_menu_bar.html.erb
index 45d2962c2..520149308 100644
--- a/app/views/shared/_left_menu_bar.html.erb
+++ b/app/views/shared/_left_menu_bar.html.erb
@@ -2,25 +2,25 @@
   <ul class="nav">
     <li class="<%= "active" if projects_are_selected? %>">
       <%= link_to projects_path, id: "projects-link", title: t('left_menu_bar.projects') do %>
-        <span class="glyphicon glyphicon-home"></span>
+        <span class="fas fa-folder"></span>
         <span><%= t('left_menu_bar.projects') %></span>
       <% end %>
     </li>
     <li class="<%= "active" if repositories_are_selected? %>">
       <%= link_to repositories_path, data: { no_turbolink: false }, id: "repositories-link", title: t('left_menu_bar.repositories') do %>
-        <span class="fas fa-cubes" aria-hidden="true"></span>
+        <span class="fas fa-list-alt" aria-hidden="true"></span>
         <span><%= t('left_menu_bar.repositories') %></span>
       <% end %>
     </li>
     <li class="<%= "active" if templates_are_selected? %>">
       <%= link_to protocols_path, id: "templates-link", title: t('left_menu_bar.templates') do %>
-        <span class="glyphicon glyphicon-list-alt"></span>
+        <span class="fas fa-edit"></span>
         <span><%= t('left_menu_bar.templates') %></span>
       <% end %>
     </li>
     <li class="<%= "active" if reports_are_selected? %>">
       <%= link_to reports_path, data: { no_turbolink: false }, id: "reports-link", title: t('left_menu_bar.reports') do %>
-        <span class="glyphicon glyphicon-indent-left"></span>
+        <span class="fas fa-clipboard-check"></span>
         <span><%= t('left_menu_bar.reports') %></span>
       <% end %>
     </li>
@@ -28,7 +28,7 @@
   <ul class="nav nav-bottom">
     <li class="<%= "active" if activities_are_selected? %>">
       <%= link_to activities_path, id: "activities-link", title: t('left_menu_bar.activities') do %>
-        <span class="glyphicon glyphicon-equalizer"></span>
+        <span class="fas fa-list"></span>
         <span><%= t('left_menu_bar.activities') %></span>
       <% end %>
     </li>
@@ -42,7 +42,7 @@
          role="button"
          aria-haspopup="true"
          aria-expanded="false">
-        <span class="glyphicon glyphicon-paperclip"></span>
+        <span class="fas fa-question-circle"></span>
         <span><%= t('left_menu_bar.support') %></span>
       </a>
       <ul class="dropdown-menu" data-hook="support-dropdown">
@@ -59,24 +59,24 @@
     </li>
     <li class="<%= "active" if settings_are_selected? %>">
       <%= link_to edit_user_registration_path, id: "settings-link", title: t('left_menu_bar.settings') do %>
-        <span class="glyphicon glyphicon-cog"></span>
+        <span class="fas fa-cog"></span>
         <span><%= t('left_menu_bar.settings') %></span>
       <% end %>
     </li>
     <!-- arrow for opening/closing -->
     <li class="text-center" style="padding: 5px;">
       <span id="sideBarLeft"
-            class="glyphicon glyphicon-chevron-left"
+            class="fas fa-chevron-left"
             aria-hidden="true"
             onclick="SideBarToggle.hide()"
             ></span>
       <span id="sideBarRight"
-            class="glyphicon glyphicon-chevron-right"
+            class="fas fa-chevron-right"
             aria-hidden="true"
             onclick="SideBarToggle.show()"
             style="display:none;"
             ></span>
-    </li>
+    </li>   
   </ul>
 </div>
 
diff --git a/app/views/shared/_samples.html.erb b/app/views/shared/_samples.html.erb
index 23c1dcda2..7a487509e 100644
--- a/app/views/shared/_samples.html.erb
+++ b/app/views/shared/_samples.html.erb
@@ -95,7 +95,7 @@
 <!-- These buttons are appended to table in javascript, after table initialization -->
 <div class="toolbarButtons" style="display:none">
   <button type="button" class="btn btn-default editAdd" id="editSample" onclick="onClickEdit()" disabled>
-    <span class="glyphicon glyphicon-pencil"></span>
+    <span class="fas fa-pencil-alt"></span>
     <span class="hidden-xs-custom"><%= t("samples.edit_sample") %></span>
   </button>
 
diff --git a/app/views/shared/_secondary_navigation.html.erb b/app/views/shared/_secondary_navigation.html.erb
index a62c813a5..0a57f8dd8 100644
--- a/app/views/shared/_secondary_navigation.html.erb
+++ b/app/views/shared/_secondary_navigation.html.erb
@@ -22,7 +22,7 @@
             <li id="canvas-nav-tab" class="<%= "active" if is_all_projects_index? %>">
               <a href="<%= projects_path %>" title="<%=t "nav2.all_projects.index" %>">
                 <span class="hidden-sm hidden-md"><%=t "nav2.all_projects.index" %></span>
-                <span class="hidden-xs hidden-lg glyphicon glyphicon-blackboard"></span>
+                <span class="hidden-xs hidden-lg fas fa-folder"></span>
               </a>
             </li>
             <li id="project-archive-nav-tab" data-turbolinks="false" class="<%= "active" if is_all_projects_archive? %>">
@@ -40,7 +40,7 @@
             <li id="canvas-nav-tab" class="<%= "active" if is_project_show? %>">
               <a href="<%= project_url(@project) %>" title="<%=t "nav2.projects.show" %>">
                 <span class="hidden-sm hidden-md"><%=t "nav2.projects.show" %></span>
-                <span class="hidden-xs hidden-lg glyphicon glyphicon-blackboard"></span>
+                <span class="hidden-xs hidden-lg fas fa-folder"></span>
               </a>
             </li>
             <li id="project-archive-nav-tab" data-turbolinks="false" class="<%= "active" if is_project_archive? %>">
@@ -58,7 +58,7 @@
             <li id="canvas-nav-tab" class="<%= "active" if is_experiment_canvas? %>">
               <a href="<%= canvas_experiment_url(@experiment) %>" title="<%=t "nav2.experiments.canvas" %>">
                 <span class="hidden-sm hidden-md"><%=t "nav2.experiments.canvas" %></span>
-                <span class="hidden-xs hidden-lg glyphicon glyphicon-blackboard"></span>
+                <span class="hidden-xs hidden-lg fas fa-folder"></span>
               </a>
             </li>
           <% end %>
@@ -84,13 +84,13 @@
             <li id="results-nav-tab" class="<%= "active" if is_module_results? %>">
               <a href="<%= results_my_module_url(@my_module) %>" title="<%=t "nav2.modules.results" %>">
                 <span class="hidden-sm hidden-md"><%=t "nav2.modules.results" %></span>
-                <span class="hidden-xs hidden-lg glyphicon glyphicon-th"></span>
+                <span class="hidden-xs hidden-lg glyphicon glyphicon-modal-window"></span>
               </a>
             </li>
             <li id="activities-nav-tab" class="<%= "active" if is_module_activities? %>">
               <a href="<%= activities_my_module_url(@my_module) %>" title="<%=t "nav2.modules.activities" %>">
                 <span class="hidden-sm hidden-md"><%=t "nav2.modules.activities" %></span>
-                <span class="hidden-xs hidden-lg glyphicon glyphicon-equalizer"></span>
+                <span class="hidden-xs hidden-lg fas fa-list"></span>
               </a>
             </li>
           <% end %>
@@ -101,7 +101,7 @@
             <li id="repositories-nav-tab" class="<%= "active" if module_repository_page? %>">
               <a href="#" id="repositoriesDropdownMenuLink" title="<%=t "nav2.modules.repositories" %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 <span class="hidden-sm hidden-md"><%=t "nav2.modules.repositories" %></span>
-                <span class="hidden-xs hidden-lg glyphicon glyphicon-list"></span>
+                <span class="hidden-xs hidden-lg fas fa-list-alt"></span>
                 <span class="caret"></span>
               </a>
               <ul class="dropdown-menu repositories-dropdown-menu" aria-labelledby="repositoriesDropdownMenuLink">
diff --git a/app/views/steps/_empty_step.html.erb b/app/views/steps/_empty_step.html.erb
index e60576598..370666a4f 100644
--- a/app/views/steps/_empty_step.html.erb
+++ b/app/views/steps/_empty_step.html.erb
@@ -1,12 +1,12 @@
 <ul class="nav nav-tabs">
   <li role="presentation" id="new-step-main-tab" class="active">
     <a href="#new-step-main" data-toggle="tab" data-no-turbolink="true">
-      <span class="glyphicon glyphicon-pencil"></span>
+      <span class="fas fa-pencil-alt"></span>
     </a>
   </li>
   <li role="presentation" id="new-step-checklists-tab">
     <a href="#new-step-checklists" data-toggle="tab" data-no-turbolink="true">
-      <span class="glyphicon glyphicon-list"></span>
+      <span class="fas fa-tasks"></span>
       <%= t("protocols.steps.new.tab_checklists") %>
     </a>
   </li>
@@ -20,7 +20,7 @@
   </li>
   <li role="presentation" id="new-step-tables-tab">
     <a href="#new-step-tables" data-toggle="tab" data-no-turbolink="true">
-      <span class="glyphicon glyphicon-th"></span>
+      <span class="fas fa-table"></span>
       <%= t("protocols.steps.new.tab_tables") %>
     </a>
   </li>
diff --git a/app/views/steps/_form_checklists.html.erb b/app/views/steps/_form_checklists.html.erb
index ab30bd4f5..c895cc81d 100644
--- a/app/views/steps/_form_checklists.html.erb
+++ b/app/views/steps/_form_checklists.html.erb
@@ -1,6 +1,6 @@
 <div class="panel panel-default panel-step-attachment">
   <div class="panel-heading">
-    <span class="glyphicon glyphicon-list"></span>
+    <span class="fas fa-tasks"></span>
     <%= t("protocols.steps.new.checklist_panel_title") %>
     <div class="pull-right">
       <%= ff.remove_nested_fields_link do %>
@@ -20,7 +20,7 @@
       <%= ff.nested_fields_for :checklist_items, ordered_checklist_items(ff.object) do |chkItems| %>
         <li>
           <div class="row">
-            <span class="glyphicon glyphicon-chevron-right handle-move pull-left"></span>
+            <span class="fas fa-circle handle-move pull-left"></span>
             <div class="row">
               <div class="col-xs-6">
                 <%= chkItems.smart_text_area :text,
diff --git a/app/views/steps/_form_tables.html.erb b/app/views/steps/_form_tables.html.erb
index 89948547e..ddcc806de 100644
--- a/app/views/steps/_form_tables.html.erb
+++ b/app/views/steps/_form_tables.html.erb
@@ -1,6 +1,6 @@
 <div class="panel panel-default panel-step-attachment">
   <div class="panel-heading">
-    <span class="glyphicon glyphicon-th"></span>
+    <span class="fas fa-table"></span>
     <%= t("protocols.steps.new.table_panel_title") %>
     <div class="pull-right">
       <%= ff.remove_nested_fields_link do %>
@@ -15,4 +15,4 @@
       <div class="hot"></div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/steps/_step.html.erb b/app/views/steps/_step.html.erb
index 31b13030d..262657baa 100644
--- a/app/views/steps/_step.html.erb
+++ b/app/views/steps/_step.html.erb
@@ -24,7 +24,7 @@
              title="<%= t("protocols.steps.options.edit_title") %>"
              href="<%= edit_step_path(step, format: :json) %>"
              data-remote="true">
-            <span class="glyphicon glyphicon-edit">
+            <span class="fas fa-pencil-alt">
           </a>
           <%= link_to(step_path(step), title: t("protocols.steps.options.delete_title"), method: "delete", class: "btn btn-link",
             data: {action: "delete-step", confirm: t("protocols.steps.destroy.confirm", step: step.name)}) do %>
diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb
index 76f56c518..27746a5c9 100644
--- a/app/views/users/registrations/edit.html.erb
+++ b/app/views/users/registrations/edit.html.erb
@@ -32,7 +32,7 @@
                       </div>
                       <div class="avatar-edit">
                         <div class="btn btn-grey btn-sm">
-                          <span class="glyphicon glyphicon-pencil"></span>
+                          <span class="fas fa-pencil-alt"></span>
                           <%=t "users.registrations.edit.avatar_btn" %>
                         </div>
                       </div>
diff --git a/app/views/users/settings/teams/_user_dropdown.html.erb b/app/views/users/settings/teams/_user_dropdown.html.erb
index 54d17f475..a2682ab3c 100644
--- a/app/views/users/settings/teams/_user_dropdown.html.erb
+++ b/app/views/users/settings/teams/_user_dropdown.html.erb
@@ -1,6 +1,6 @@
 <% if user_team.user == user %>
   <div class="btn btn-default btn-xs" type="button" disabled="disabled">
-    <span class="glyphicon glyphicon-cog"></span>
+    <span class="fas fa-user-cog"></span>
     <span class="caret"></span>
   </div>
 <% else %>
@@ -12,7 +12,7 @@
          data-toggle="dropdown"
          aria-haspopup="true"
          aria-expanded="true">
-      <span class="glyphicon glyphicon-cog"></span>
+      <span class="fas fa-user-cog"></span>
       <span class="caret"></span>
     </div>
     <ul class="dropdown-menu custom-dropdown-menu dropdown-menu-right" aria-labelledby="<%= id %>">
diff --git a/app/views/users/settings/teams/show.html.erb b/app/views/users/settings/teams/show.html.erb
index 0b4ae5cf5..27022b5c8 100644
--- a/app/views/users/settings/teams/show.html.erb
+++ b/app/views/users/settings/teams/show.html.erb
@@ -38,7 +38,7 @@
 
       <div class="col-xs-10 col-sm-5">
         <div class="badge-icon">
-          <span class="glyphicon glyphicon-user"></span>
+          <span class="fas fa-user fa-lg"></span>
         </div>
         <div class="well well-sm">
           <span class="hidden-xs hidden-sm"><%= t("users.settings.teams.edit.header_created_by") %></span>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6386d3a33..00b78eae2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1058,7 +1058,7 @@ en:
         no_column: "No columns"
         delete_column: "Delete"
         edit_column: "Edit"
-        back_to_repository_html: "<span class='glyphicon glyphicon-chevron-left'></span> Back to %{repository}"
+        back_to_repository_html: "<span class='fas fa-arrow-left'></span> Back to %{repository}"
     index:
       head_title: "Inventories"
       no_libraries:
diff --git a/public/images/icon/missing.png b/public/images/icon/missing.png
index b13b08127..829b71959 100644
Binary files a/public/images/icon/missing.png and b/public/images/icon/missing.png differ
diff --git a/public/images/icon_small/missing.png b/public/images/icon_small/missing.png
index d931b189f..f783de8e5 100644
Binary files a/public/images/icon_small/missing.png and b/public/images/icon_small/missing.png differ
diff --git a/public/images/medium/missing.png b/public/images/medium/missing.png
index 12128ce01..3aed78f53 100644
Binary files a/public/images/medium/missing.png and b/public/images/medium/missing.png differ
diff --git a/public/images/thumb/missing.png b/public/images/thumb/missing.png
index cc0b6b9e6..cacaaa845 100644
Binary files a/public/images/thumb/missing.png and b/public/images/thumb/missing.png differ