diff --git a/_data/alerts.yml b/_data/alerts.yml
index 63e1fb13f0..0e47ea1c7e 100644
--- a/_data/alerts.yml
+++ b/_data/alerts.yml
@@ -1,9 +1,9 @@
-tip: '<div class="alert alert-success" role="alert"><i class="fa fa-check-square"></i> <b>Tip: </b>'
-note: '<div class="alert alert-info" role="alert"><i class="fa fa-info-circle"></i> <b>Note: </b>'
-important: '<div class="alert alert-warning" role="alert"><i class="fa fa-warning"></i> <b>Important: </b>'
-warning: '<div class="alert alert-danger" role="alert"><i class="fa fa-exclamation-circle"></i> <b>Warning: </b>'
-disclaimer: '<div class="alert alert-info" role="alert"><i class="fa fa-fa-hands-wash"></i> <b>Disclaimer: </b>'
-end: '</div>'
+tip: '<div class="alert alert-success" role="alert"><i class="fas fa-check-square"></i> <b>Tip: </b>'
+note: '<div class="alert alert-info" role="alert"><i class="fas fa-info-circle"></i> <b>Note: </b>'
+important: '<div class="alert alert-warning" role="alert"><i class="fas fa-exclamation-triangle"></i> <b>Important: </b>'
+warning: '<div class="alert alert-danger" role="alert"><i class="fas fa-exclamation-circle"></i> <b>Warning: </b>'
+disclaimer: '<div class="alert alert-info" role="alert"><i class="fas fa-hands-wash"></i> <b>Disclaimer: </b>'
+end: "</div>"
 
 callout_danger: '<div class="bs-callout bs-callout-danger">'
 callout_default: '<div class="bs-callout bs-callout-default">'
diff --git a/_plugins/customblocks.rb b/_plugins/customblocks.rb
index b5111e43fb..690ae877e7 100644
--- a/_plugins/customblocks.rb
+++ b/_plugins/customblocks.rb
@@ -2,14 +2,14 @@ module Jekyll
   class TipBlock < Liquid::Block
     def render(context)
       text = super
-      '<div markdown="span" class="alert alert-success" role="alert"><i class="fa fa-check-square"></i> <b>Tip:</b> ' + text + '</div>'
+      '<div markdown="span" class="alert alert-success" role="alert"><i class="fas fa-check-square"></i> <b>Tip:</b> ' + text + '</div>'
     end
   end
 
   class NoteBlock < Liquid::Block
     def render(context)
       text = super
-      '<div markdown="span" class="alert alert-info" role="alert"><i class="fa fa-info-circle"></i> <b>Note:</b> ' + text + '</div>'
+      '<div markdown="span" class="alert alert-info" role="alert"><i class="fas fa-info-circle"></i> <b>Note:</b> ' + text + '</div>'
     end
   end
 
@@ -30,7 +30,7 @@ def render(context)
   class DisclaimerBlock < Liquid::Block
     def render(context)
       text = super
-      '<div markdown="span" class="alert alert-info" role="alert"><i class="fa fa-hands-wash"></i> <b>Disclaimer:</b> ' + text + '</div>'
+      '<div markdown="span" class="alert alert-info" role="alert"><i class="fas fa-hands-wash"></i> <b>Disclaimer:</b> ' + text + '</div>'
     end
   end