diff --git a/sphinx_rtd_theme/breadcrumbs.html b/sphinx_rtd_theme/breadcrumbs.html
index 722e266be..c660a93c3 100644
--- a/sphinx_rtd_theme/breadcrumbs.html
+++ b/sphinx_rtd_theme/breadcrumbs.html
@@ -21,7 +21,7 @@
 <div role="navigation" aria-label="{{ _('Breadcrumbs') }}">
   <ul class="wy-breadcrumbs">
     {%- block breadcrumbs %}
-      <li><a href="{{ pathto(master_doc) }}" class="icon icon-home"></a> &raquo;</li>
+      <li><a href="{{ pathto(master_doc) }}" class="fa fa-home"></a> &raquo;</li>
         {%- for doc in parents %}
           <li><a href="{{ doc.link|e }}">{{ doc.title }}</a> &raquo;</li>
         {%- endfor %}
diff --git a/sphinx_rtd_theme/layout.html b/sphinx_rtd_theme/layout.html
index a61e51be8..d1bcb21f8 100644
--- a/sphinx_rtd_theme/layout.html
+++ b/sphinx_rtd_theme/layout.html
@@ -124,7 +124,7 @@
           {%- if logo and theme_logo_only %}
             <a href="{{ pathto(master_doc) }}">
           {%- else %}
-            <a href="{{ pathto(master_doc) }}" class="icon icon-home"> {{ project }}
+            <a href="{{ pathto(master_doc) }}" class="fa fa-home"> {{ project }}
           {%- endif %}
 
           {%- if logo %}
diff --git a/src/sass/_theme_badge.sass b/src/sass/_theme_badge.sass
index b24ec10f4..7e5743859 100644
--- a/src/sass/_theme_badge.sass
+++ b/src/sass/_theme_badge.sass
@@ -25,8 +25,6 @@
       color: $section-background-color
     .fa-book
       float: left
-    .icon-book
-      float: left
     &.rst-out-of-date
       background-color: $red
       color: $white
@@ -66,9 +64,6 @@
     border: none
     max-width: $nav-desktop-width
     max-height: 90%
-    .icon-book
-      float: none
-      line-height: 30px
     .fa-book
       float: none
       line-height: 30px
@@ -76,8 +71,6 @@
       text-align: right
       .fa-book
         float: left
-      .icon-book
-        float: left
     > .rst-current-version
       width: auto
       height: 30px
diff --git a/src/sass/_theme_badge_fa.sass b/src/sass/_theme_badge_fa.sass
index f5b7e32c5..6306e91d7 100644
--- a/src/sass/_theme_badge_fa.sass
+++ b/src/sass/_theme_badge_fa.sass
@@ -40,29 +40,14 @@ ul.fas
 .fa-book:before
   content: "\f02d"
 
-.icon-book:before
-  content: "\f02d"
-
 .fa-caret-down:before
   content: "\f0d7"
 
-.icon-caret-down:before
-  content: "\f0d7"
-
 .fa-caret-up:before
   content: "\f0d8"
 
-.icon-caret-up:before
-  content: "\f0d8"
-
 .fa-caret-left:before
   content: "\f0d9"
 
-.icon-caret-left:before
-  content: "\f0d9"
-
 .fa-caret-right:before
   content: "\f0da"
-
-.icon-caret-right:before
-  content: "\f0da"
diff --git a/src/sass/_theme_font_awesome_compatibility.sass b/src/sass/_theme_font_awesome_compatibility.sass
deleted file mode 100644
index 585795685..000000000
--- a/src/sass/_theme_font_awesome_compatibility.sass
+++ /dev/null
@@ -1,24 +0,0 @@
-.icon
-  @extend .fa
-.icon-home
-  @extend .fa-home
-.icon-search
-  @extend .fa-search
-.icon-book
-  @extend .fa-book
-.icon-caret-down
-  @extend .fa-caret-down
-.icon-github
-  @extend .fa-github
-.icon-bitbucket
-  @extend .fa-bitbucket
-.icon-gitlab
-  @extend .fa-gitlab
-.icon-fire
-  @extend .fa-fire
-.icon-circle-arrow-right
-  @extend .fa-arrow-circle-right
-.icon-circle-arrow-left
-  @extend .fa-arrow-circle-left
-.icon-link
-  @extend .fa-link
diff --git a/src/sass/_theme_layout.sass b/src/sass/_theme_layout.sass
index b387935a6..4178f6fa8 100644
--- a/src/sass/_theme_layout.sass
+++ b/src/sass/_theme_layout.sass
@@ -225,7 +225,7 @@ html
       border-radius: 0
       max-width: 100%  // shrink on mobile, if appropriate
       background: rgba(0, 0, 0, 0)  // make hover background of parent show up properly
-    &.icon
+    &.fa
       img.logo
         margin-top: 0.85em  // space it away from the title text
   > div.version
diff --git a/src/sass/theme.sass b/src/sass/theme.sass
index 73e77e4f6..b35a789ab 100644
--- a/src/sass/theme.sass
+++ b/src/sass/theme.sass
@@ -46,5 +46,4 @@
 @import theme_badge
 @import theme_rst
 @import theme_mathjax
-@import theme_font_awesome_compatibility
 @import theme_font_local