diff --git a/app/javascript/dmemo.css b/app/javascript/dmemo.css
index b4be397..c78ba3a 100644
--- a/app/javascript/dmemo.css
+++ b/app/javascript/dmemo.css
@@ -16,10 +16,6 @@
   }
 }
 
-.page-header i.fa {
-  vertical-align: text-bottom;
-}
-
 a.editable-click, a.editable-click:hover {
   cursor: pointer !important;
   border-bottom: none !important;
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 2c839bd..8c4362c 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -1,7 +1,10 @@
+import '@fortawesome/fontawesome-free/css/brands.css';
+import '@fortawesome/fontawesome-free/css/fontawesome.css';
+import '@fortawesome/fontawesome-free/css/regular.css';
+import '@fortawesome/fontawesome-free/css/solid.css';
 import 'admin-lte/bootstrap/css/bootstrap.css';
 import 'admin-lte/dist/css/AdminLTE.css';
 import 'admin-lte/dist/css/skins/skin-blue.css';
-import 'font-awesome/css/font-awesome.css';
 import 'jquery-colorbox/example4/colorbox.css';
 import 'pygments-css/github.css';
 import '../dmemo.css';
diff --git a/app/views/data_sources/edit.html.haml b/app/views/data_sources/edit.html.haml
index c15c211..51c35b0 100644
--- a/app/views/data_sources/edit.html.haml
+++ b/app/views/data_sources/edit.html.haml
@@ -5,7 +5,7 @@
   %ol.breadcrumb
     %li
       = link_to root_path do
-        %i.fa.fa-home
+        %i.fa-solid.fa-home
         Home
     %li
       = link_to "Data Sources", data_sources_path
diff --git a/app/views/data_sources/new.html.haml b/app/views/data_sources/new.html.haml
index 5df4787..3771f4a 100644
--- a/app/views/data_sources/new.html.haml
+++ b/app/views/data_sources/new.html.haml
@@ -5,11 +5,11 @@
   %ol.breadcrumb
     %li
       = link_to root_path do
-        %i.fa.fa-home
+        %i.fa-solid.fa-home
         Home
     %li
       = link_to setting_path do
-        %i.fa.fa-gear
+        %i.fa-solid.fa-gear
         Setting
     %li.active
       New Data Source
diff --git a/app/views/database_memo_logs/index.html.haml b/app/views/database_memo_logs/index.html.haml
index e4dbf7a..88ba688 100644
--- a/app/views/database_memo_logs/index.html.haml
+++ b/app/views/database_memo_logs/index.html.haml
@@ -7,7 +7,7 @@
   %ol.breadcrumb
     %li
       = link_to root_path do
-        %i.fa.fa-home
+        %i.fa-solid.fa-home
         Home
     %li
       = link_to @database_memo.name, database_memo_path(@database_memo.name)
diff --git a/app/views/database_memos/_schema_memo.html.haml b/app/views/database_memos/_schema_memo.html.haml
index e5f87f5..fad0ea2 100644
--- a/app/views/database_memos/_schema_memo.html.haml
+++ b/app/views/database_memos/_schema_memo.html.haml
@@ -2,7 +2,7 @@
   %td.truncate-td
     = link_to schema_memo.name, database_schema_path(@database_memo.name, schema_memo.name)
     - unless schema_memo.linked?
-      %i.fa.fa-exclamation-triangle{ data: { toggle: "tooltip", placement: "bottom", title: t("unlinked_table") } }
+      %i.fa-solid.fa-triangle-exclamation{ data: { toggle: "tooltip", placement: "bottom", title: t("unlinked_table") } }
   %td.truncate-td
     - if schema_memo.description.present?
       = schema_memo.description_text.truncate(200)
diff --git a/app/views/database_memos/_table_memo.html.haml b/app/views/database_memos/_table_memo.html.haml
index 96d94fe..a14f309 100644
--- a/app/views/database_memos/_table_memo.html.haml
+++ b/app/views/database_memos/_table_memo.html.haml
@@ -2,7 +2,7 @@
   %td.truncate-td
     = link_to table_memo.name, database_schema_table_path(@database_memo.name, table_memo.schema_memo.name, table_memo.name)
     - unless table_memo.linked?
-      %i.fa.fa-exclamation-triangle{ data: { toggle: "tooltip", placement: "bottom", title: t("unlinked_table") } }
+      %i.fa-solid.fa-triangle-exclamation{ data: { toggle: "tooltip", placement: "bottom", title: t("unlinked_table") } }
   %td.truncate-td
     - if table_memo.description.present?
       = table_memo.description_text.truncate(200)
diff --git a/app/views/database_memos/show.html.haml b/app/views/database_memos/show.html.haml
index 521b6ac..53c8c82 100644
--- a/app/views/database_memos/show.html.haml
+++ b/app/views/database_memos/show.html.haml
@@ -3,13 +3,13 @@
   %h1.page-header
     = @database_memo.name
     = link_to edit_database_memo_path(@database_memo) do
-      %i.fa.fa-edit
+      %i.fa-solid.fa-pen-to-square
 
   - unless @database_memo.linked?
     .box.box-warning
       .box-header
         %h4
-          %i.fa.fa-warning= t("unlinked_database")
+          %i.fa-solid.fa-triangle-exclamation= t("unlinked_database")
       .box-body
         = link_to "Delete database information", @database_memo,
           method: :delete,
@@ -19,7 +19,7 @@
   %ol.breadcrumb
     %li
       = link_to root_path do
-        %i.fa.fa-home
+        %i.fa-solid.fa-home
         Home
     %li.active
       = @database_memo.name
@@ -35,7 +35,7 @@
     = l(@database_memo.updated_at)
     - if @database_memo.logs.exists?
       = link_to database_memo_logs_path(@database_memo.id) do
-        %i.fa.fa-clock-o
+        %i.fa-regular.fa-clock
 
 - if @database_memo.single_schema?
   .box
diff --git a/app/views/ignored_tables/new.html.haml b/app/views/ignored_tables/new.html.haml
index 7aa25b6..ae2687c 100644
--- a/app/views/ignored_tables/new.html.haml
+++ b/app/views/ignored_tables/new.html.haml
@@ -5,11 +5,11 @@
   %ol.breadcrumb
     %li
       = link_to root_path do
-        %i.fa.fa-home
+        %i.fa-solid.fa-home
         Home
     %li
       = link_to setting_path do
-        %i.fa.fa-gear
+        %i.fa-solid.fa-gear
         Setting
     %li.active
       New Ignored Table
diff --git a/app/views/keyword_logs/index.html.haml b/app/views/keyword_logs/index.html.haml
index 33ea63e..1feccdb 100644
--- a/app/views/keyword_logs/index.html.haml
+++ b/app/views/keyword_logs/index.html.haml
@@ -7,7 +7,7 @@
   %ol.breadcrumb
     %li
       = link_to root_path do
-        %i.fa.fa-home
+        %i.fa-solid.fa-home
         Home
     %li
       = link_to "Keywords", keywords_path
diff --git a/app/views/keywords/edit.html.haml b/app/views/keywords/edit.html.haml
index 7a044f4..066270c 100644
--- a/app/views/keywords/edit.html.haml
+++ b/app/views/keywords/edit.html.haml
@@ -6,7 +6,7 @@
   %ol.breadcrumb
     %li
       = link_to root_path do
-        %i.fa.fa-home
+        %i.fa-solid.fa-home
         Home
     %li
       = link_to "Keywords", keywords_path
diff --git a/app/views/keywords/index.html.haml b/app/views/keywords/index.html.haml
index 926b6e8..e0d6fc6 100644
--- a/app/views/keywords/index.html.haml
+++ b/app/views/keywords/index.html.haml
@@ -6,7 +6,7 @@
   %ol.breadcrumb
     %li
       = link_to root_path do
-        %i.fa.fa-home
+        %i.fa-solid.fa-home
         Home
     %li.active
       Keywords
@@ -17,7 +17,7 @@
 
     .pull-right
       = link_to new_keyword_path, class: "btn btn-primary" do
-        %i.fa.fa-plus
+        %i.fa-solid.fa-plus
         New
   .box-body
     %table.table.table-hover.table-bordered.table-striped{ role: "grid" }
diff --git a/app/views/keywords/new.html.haml b/app/views/keywords/new.html.haml
index 4287dce..10bf8c1 100644
--- a/app/views/keywords/new.html.haml
+++ b/app/views/keywords/new.html.haml
@@ -4,7 +4,7 @@
   %ol.breadcrumb
     %li
       = link_to root_path do
-        %i.fa.fa-home
+        %i.fa-solid.fa-home
         Home
     %li
       = link_to "Keywords", keywords_path
diff --git a/app/views/keywords/show.html.haml b/app/views/keywords/show.html.haml
index e8ffb1e..edf6cf9 100644
--- a/app/views/keywords/show.html.haml
+++ b/app/views/keywords/show.html.haml
@@ -3,12 +3,12 @@
   %h1.page-header
     = @keyword.name
     = link_to edit_keyword_path(@keyword) do
-      %i.fa.fa-edit
+      %i.fa-solid.fa-pen-to-square
 
   %ol.breadcrumb
     %li
       = link_to root_path do
-        %i.fa.fa-home
+        %i.fa-solid.fa-home
         Home
     %li
       = link_to "Keywords", keywords_path
@@ -23,4 +23,4 @@
     = l(@keyword.updated_at)
     - if @keyword.logs.exists?
       = link_to keyword_logs_path(@keyword.id) do
-        %i.fa.fa-clock-o
+        %i.fa-regular.fa-clock
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 1fae5a7..4088ee7 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -16,9 +16,9 @@
       %header.main-header
         %a.logo{ href: root_path }
           %span.logo-mini
-            %i.fa.fa-home
+            %i.fa-solid.fa-home
           %span.logo-lg
-            %i.fa.fa-home
+            %i.fa-solid.fa-home
             %b> Database
             MEMO
         = render "/shared/navbar"
diff --git a/app/views/masked_data/new.html.haml b/app/views/masked_data/new.html.haml
index 8ab04b8..2b43d98 100644
--- a/app/views/masked_data/new.html.haml
+++ b/app/views/masked_data/new.html.haml
@@ -5,11 +5,11 @@
   %ol.breadcrumb
     %li
       = link_to root_path do
-        %i.fa.fa-home
+        %i.fa-solid.fa-home
         Home
     %li
       = link_to setting_path do
-        %i.fa.fa-gear
+        %i.fa-solid.fa-gear
         Setting
     %li.active
       New Masked Datum
diff --git a/app/views/schema_memo_logs/index.html.haml b/app/views/schema_memo_logs/index.html.haml
index a69f849..dd44901 100644
--- a/app/views/schema_memo_logs/index.html.haml
+++ b/app/views/schema_memo_logs/index.html.haml
@@ -7,7 +7,7 @@
   %ol.breadcrumb
     %li
       = link_to root_path do
-        %i.fa.fa-home
+        %i.fa-solid.fa-home
         Home
     %li
       = link_to @schema_memo.database_memo.name, database_memo_path(@schema_memo.database_memo.name)
diff --git a/app/views/schema_memos/_table_memo.html.haml b/app/views/schema_memos/_table_memo.html.haml
index d0cb091..d7e1dd7 100644
--- a/app/views/schema_memos/_table_memo.html.haml
+++ b/app/views/schema_memos/_table_memo.html.haml
@@ -2,7 +2,7 @@
   %td.truncate-td
     = link_to table_memo.name, database_schema_table_path(@schema_memo.database_memo.name, @schema_memo.name, table_memo.name)
     - unless table_memo.linked?
-      %i.fa.fa-exclamation-triangle{ data: { toggle: "tooltip", placement: "bottom", title: t("unlinked_table") } }
+      %i.fa-solid.fa-triangle-exclamation{ data: { toggle: "tooltip", placement: "bottom", title: t("unlinked_table") } }
   %td.truncate-td
     - if table_memo.description.present?
       = table_memo.description_text.truncate(200)
diff --git a/app/views/schema_memos/show.html.haml b/app/views/schema_memos/show.html.haml
index e809cf0..9d78938 100644
--- a/app/views/schema_memos/show.html.haml
+++ b/app/views/schema_memos/show.html.haml
@@ -3,13 +3,13 @@
   %h1.page-header
     = @schema_memo.name
     = link_to edit_schema_memo_path(@schema_memo) do
-      %i.fa.fa-edit
+      %i.fa-solid.fa-pen-to-square
 
   - unless @schema_memo.linked?
     .box.box-warning
       .box-header
         %h4
-          %i.fa.fa-warning= t("unlinked_schema")
+          %i.fa-solid.fa-triangle-exclamation= t("unlinked_schema")
       .box-body
         = link_to "Delete schema information", @schema_memo,
           method: :delete,
@@ -19,7 +19,7 @@
   %ol.breadcrumb
     %li
       = link_to root_path do
-        %i.fa.fa-home
+        %i.fa-solid.fa-home
         Home
     %li
       = link_to @schema_memo.database_memo.name, database_memo_path(@schema_memo.database_memo.name)
@@ -37,7 +37,7 @@
     = l(@schema_memo.updated_at)
     - if @schema_memo.logs.exists?
       = link_to schema_memo_logs_path(@schema_memo.id) do
-        %i.fa.fa-clock-o
+        %i.fa-regular.fa-clock
 
 .box
   .box-header.with-border
diff --git a/app/views/sessions/new.html.haml b/app/views/sessions/new.html.haml
index b8371a5..09469b9 100644
--- a/app/views/sessions/new.html.haml
+++ b/app/views/sessions/new.html.haml
@@ -2,5 +2,5 @@
 .content
   %p.lead Required sign in to access Dmemo.
   = button_to google_oauth2_path(return_to: params[:return_to]), class: 'btn btn-default', method: :post do
-    %i.fa.fa-google
+    %i.fa-brands.fa-google
     %span Sign in with Google
diff --git a/app/views/settings/_data_sources.html.haml b/app/views/settings/_data_sources.html.haml
index 2d3e921..e2f3fe9 100644
--- a/app/views/settings/_data_sources.html.haml
+++ b/app/views/settings/_data_sources.html.haml
@@ -4,7 +4,7 @@
 
     - if current_user.admin?
       = link_to new_data_source_path, class: "btn btn-default btn-sm pull-right" do
-        %i.fa.fa-plus
+        %i.fa-solid.fa-plus
         Add Data Source
   .box-body
     %table.table.table-hover.table-bordered.table-striped{ role: "grid" }
@@ -34,7 +34,7 @@
             - if current_user.admin?
               = link_to edit_data_source_path(data_source) do
                 %button.btn.btn-default
-                  %i.fa.fa-edit
+                  %i.fa-solid.fa-pen-to-square
               = link_to data_source_path(data_source), method: :delete, data: { confirm: "Delete data source #{data_source.name}?" } do
                 %button.btn.btn-default
-                  %i.fa.fa-trash
+                  %i.fa-solid.fa-trash
diff --git a/app/views/settings/_ignored_tables.html.haml b/app/views/settings/_ignored_tables.html.haml
index e4fa3b9..0466ef5 100644
--- a/app/views/settings/_ignored_tables.html.haml
+++ b/app/views/settings/_ignored_tables.html.haml
@@ -4,7 +4,7 @@
 
     - if current_user.admin?
       = link_to new_ignored_table_path, class: "btn btn-default btn-sm pull-right" do
-        %i.fa.fa-plus
+        %i.fa-solid.fa-plus
         Add Ignored Table
   .box-body
     %table.table.table-hover.table-bordered.table-striped{ role: "grid" }
@@ -22,4 +22,4 @@
             - if current_user.admin?
               = link_to ignored_table, method: :delete, data: { confirm: "Delete ignore table pattern #{ignored_table.pattern}" } do
                 %button.btn.btn-default
-                  %i.fa.fa-trash
+                  %i.fa-solid.fa-trash
diff --git a/app/views/settings/_masked_data.html.haml b/app/views/settings/_masked_data.html.haml
index 0948e82..ad7f416 100644
--- a/app/views/settings/_masked_data.html.haml
+++ b/app/views/settings/_masked_data.html.haml
@@ -4,7 +4,7 @@
 
     - if current_user.admin?
       = link_to new_masked_datum_path, class: "btn btn-default btn-sm pull-right" do
-        %i.fa.fa-plus
+        %i.fa-solid.fa-plus
         Add Masked Data
   .box-body
     %table.table.table-hover.table-bordered.table-striped{ role: "grid" }
@@ -25,5 +25,5 @@
             - if current_user.admin?
               = link_to masked_datum_path(masked_datum), method: :delete, data: { confirm: "Delete masked_data #{masked_datum.pack}?" } do
                 %button.btn.btn-default
-                  %i.fa.fa-trash
+                  %i.fa-solid.fa-trash
 
diff --git a/app/views/settings/show.html.haml b/app/views/settings/show.html.haml
index 27aff64..0c5549d 100644
--- a/app/views/settings/show.html.haml
+++ b/app/views/settings/show.html.haml
@@ -6,10 +6,10 @@
   %ol.breadcrumb
     %li
       = link_to root_path do
-        %i.fa.fa-home
+        %i.fa-solid.fa-home
         Home
     %li.active
-      %i.fa.fa-gear
+      %i.fa-solid.fa-gear
       Setting
 
 .container-data_sources= render "data_sources"
diff --git a/app/views/shared/_main_sidebar.html.haml b/app/views/shared/_main_sidebar.html.haml
index bf8ddbf..d9112d0 100644
--- a/app/views/shared/_main_sidebar.html.haml
+++ b/app/views/shared/_main_sidebar.html.haml
@@ -12,26 +12,26 @@
         = f.text_field :keyword, placeholder: "Search...", class: "form-control"
         %span.input-group-btn
           %button#search-btn.btn.btn-flat{name: "search", type: "submit"}
-            %i.fa.fa-search
+            %i.fa-solid.fa-magnifying-glass
 
     %ul.sidebar-menu
       %li
         = link_to root_path do
-          %i.fa.fa-home
+          %i.fa-solid.fa-home
           Home
       %li
         = link_to users_path do
-          %i.fa.fa-user
+          %i.fa-solid.fa-user
           User
       %li
         = link_to keywords_path do
-          %i.fa.fa-book
+          %i.fa-solid.fa-book
           Keyword
       %li.treeview.opened
         %a.disable-click
-          %i.fa.fa-database
+          %i.fa-solid.fa-database
           %span Database
-          %i.fa.fa-angle-down.pull-right
+          %i.fa-solid.fa-angle-down.pull-right
         %ul.treeview-menu
           - @sidebar_databases.map(&:name).each do |name|
             %li
diff --git a/app/views/shared/_navbar.html.haml b/app/views/shared/_navbar.html.haml
index c3bf3f8..29587d3 100644
--- a/app/views/shared/_navbar.html.haml
+++ b/app/views/shared/_navbar.html.haml
@@ -4,13 +4,13 @@
       %ul.nav.navbar-nav
         %li
           = link_to setting_path do
-            %i.fa.fa-gear
+            %i.fa-solid.fa-gear
             Setting
         %li
           = link_to edit_user_path(current_user) do
-            %i.fa.fa-user
+            %i.fa-solid.fa-user
             = current_user.name
         %li
           = link_to logout_path, method: :delete do
-            %i.fa.fa-sign-out
+            %i.fa-solid.fa-arrow-right-from-bracket
             Sign-out
diff --git a/app/views/table_memo_logs/index.html.haml b/app/views/table_memo_logs/index.html.haml
index f89efd6..6ad9680 100644
--- a/app/views/table_memo_logs/index.html.haml
+++ b/app/views/table_memo_logs/index.html.haml
@@ -7,7 +7,7 @@
   %ol.breadcrumb
     %li
       = link_to root_path do
-        %i.fa.fa-home
+        %i.fa-solid.fa-home
         Home
     %li
       = link_to @table_memo.database_memo.name, database_memo_path(@table_memo.database_memo.name)
diff --git a/app/views/table_memos/_column_memo.html.haml b/app/views/table_memos/_column_memo.html.haml
index 213568a..b157220 100644
--- a/app/views/table_memos/_column_memo.html.haml
+++ b/app/views/table_memos/_column_memo.html.haml
@@ -2,15 +2,15 @@
   %td
     = column_memo.name
     - unless column_memo.linked?
-      %i.fa.fa-exclamation-triangle{ data: { toggle: "tooltip", placement: "bottom", title: t("unlinked_column") } }
+      %i.fa-solid.fa-triangle-exclamation{ data: { toggle: "tooltip", placement: "bottom", title: t("unlinked_column") } }
       = link_to column_memo, method: :delete, data: { confirm: "Delete column #{column_memo.name}?" } do
-        %i.fa.fa-trash
+        %i.fa-solid.fa-trash
   %td
     - if column_memo.logs.present?
       = link_to column_memo_logs_path(column_memo.id), class: "pull-right colorbox" do
-        %i.fa.fa-clock-o
+        %i.fa-regular.fa-clock
     = link_to edit_column_memo_path(column_memo), class: "pull-right colorbox" do
-      %i.fa.fa-edit
+      %i.fa-solid.fa-pen-to-square
     .column-description
       - if column_memo.description.present?
         = column_memo.description_html
diff --git a/app/views/table_memos/show.html.haml b/app/views/table_memos/show.html.haml
index 39312d2..9e5eba0 100644
--- a/app/views/table_memos/show.html.haml
+++ b/app/views/table_memos/show.html.haml
@@ -5,17 +5,17 @@
     - favorited_status = @table_memo.favorited_by?(current_user) ? "favorited" : "unfavorited"
     %span.favorite-table-block{ class: favorited_status }
       = link_to table_memo_favorite_table_path(@table_memo.id), method: :delete, remote: true, class: "unfavorite-table-link" do
-        %i.fa.fa-star
+        %i.fa-solid.fa-star
       = link_to table_memo_favorite_table_path(@table_memo.id), method: :post, remote: true, class: "favorite-table-link" do
-        %i.fa.fa-star-o
+        %i.fa-regular.fa-star
     = link_to edit_table_memo_path(@table_memo) do
-      %i.fa.fa-edit
+      %i.fa-solid.fa-pen-to-square
 
   - unless @table_memo.linked?
     .box.box-warning
       .box-header
         %h4
-          %i.fa.fa-warning= t("unlinked_table")
+          %i.fa-solid.fa-triangle-exclamation= t("unlinked_table")
       .box-body
         = link_to "Delete table information", @table_memo,
           method: :delete,
@@ -25,7 +25,7 @@
   %ul.breadcrumb
     %li
       = link_to root_path do
-        %i.fa.fa-home
+        %i.fa-solid.fa-home
         Home
     %li
       = link_to @table_memo.database_memo.name, database_memo_path(@table_memo.database_memo.name)
@@ -46,7 +46,7 @@
     = l(@table_memo.updated_at)
     - if @table_memo.logs.exists?
       = link_to table_memo_logs_path(@table_memo.id) do
-        %i.fa.fa-clock-o
+        %i.fa-regular.fa-clock
 
 .box
   .box-header
diff --git a/app/views/top/_table_memo.html.haml b/app/views/top/_table_memo.html.haml
index 039db10..0410cb7 100644
--- a/app/views/top/_table_memo.html.haml
+++ b/app/views/top/_table_memo.html.haml
@@ -2,7 +2,7 @@
   %td.truncate-td
     = link_to table_memo.name, database_schema_table_path(table_memo.database_memo.name, table_memo.schema_memo.name, table_memo.name)
     - unless table_memo.linked?
-      %i.fa.fa-exclamation-triangle{ data: { toggle: "tooltip", placement: "bottom", title: t("unlinked_table") } }
+      %i.fa-solid.fa-triangle-exclamation{ data: { toggle: "tooltip", placement: "bottom", title: t("unlinked_table") } }
   %td.truncate-td
     - if table_memo.description.present?
       = table_memo.description_text.truncate(200)
diff --git a/app/views/top/show.html.haml b/app/views/top/show.html.haml
index 0004151..7cdd601 100644
--- a/app/views/top/show.html.haml
+++ b/app/views/top/show.html.haml
@@ -19,7 +19,7 @@
             %td.truncate-td
               = link_to database_memo.name, database_memo_path(database_memo.name)
               - unless database_memo.linked?
-                %i.fa.fa-exclamation-triangle{ data: { toggle: "tooltip", placement: "bottom", title: t("unlinked_database") } }
+                %i.fa-solid.fa-triangle-exclamation{ data: { toggle: "tooltip", placement: "bottom", title: t("unlinked_database") } }
             %td.truncate-td
               - if database_memo.description.present?
                 = database_memo.description_text.truncate(200)
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index f54a451..8cfcc76 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -5,7 +5,7 @@
   %ol.breadcrumb
     %li
       = link_to root_path do
-        %i.fa.fa-home
+        %i.fa-solid.fa-home
         Home
     %li
       = link_to "Users", users_path
diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml
index 13fe13c..aebe2b9 100644
--- a/app/views/users/index.html.haml
+++ b/app/views/users/index.html.haml
@@ -5,7 +5,7 @@
   %ol.breadcrumb
     %li
       = link_to root_path do
-        %i.fa.fa-home
+        %i.fa-solid.fa-home
         Home
     %li.active
       Users
@@ -26,8 +26,8 @@
           %td= user.email
           %td
             - if user.admin?
-              %i.fa.fa-check
+              %i.fa-solid.fa-check
           %td
             - if current_user.editable_user?(user.id)
               = link_to edit_user_path(user) do
-                %i.fa.fa-edit
+                %i.fa-solid.fa-pen-to-square
diff --git a/package-lock.json b/package-lock.json
index 9a779f4..193d861 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,9 +8,9 @@
       "name": "dmemo",
       "version": "1.0.0",
       "dependencies": {
+        "@fortawesome/fontawesome-free": "^6.5.1",
         "@rails/ujs": "^6.1.5",
         "admin-lte": "2.3.3",
-        "font-awesome": "4.5.0",
         "jquery": "^2.2.4",
         "jquery-colorbox": "1.6.4",
         "pygments-css": "1.0.0"
@@ -33,6 +33,15 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/@fortawesome/fontawesome-free": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz",
+      "integrity": "sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw==",
+      "hasInstallScript": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -1572,14 +1581,6 @@
         }
       }
     },
-    "node_modules/font-awesome": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.5.0.tgz",
-      "integrity": "sha1-Hp18z31jvb5XAA4Y1RiMslV+cPg=",
-      "engines": {
-        "node": ">=0.10.3"
-      }
-    },
     "node_modules/foreground-child": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
@@ -4413,6 +4414,11 @@
       "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
       "dev": true
     },
+    "@fortawesome/fontawesome-free": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz",
+      "integrity": "sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw=="
+    },
     "@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -5621,11 +5627,6 @@
       "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
       "dev": true
     },
-    "font-awesome": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.5.0.tgz",
-      "integrity": "sha1-Hp18z31jvb5XAA4Y1RiMslV+cPg="
-    },
     "foreground-child": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
diff --git a/package.json b/package.json
index d61a2e4..008f02a 100644
--- a/package.json
+++ b/package.json
@@ -7,9 +7,9 @@
     "webpack": "webpack"
   },
   "dependencies": {
+    "@fortawesome/fontawesome-free": "^6.5.1",
     "@rails/ujs": "^6.1.5",
     "admin-lte": "2.3.3",
-    "font-awesome": "4.5.0",
     "jquery": "^2.2.4",
     "jquery-colorbox": "1.6.4",
     "pygments-css": "1.0.0"