diff --git a/index.html b/index.html
index ee62ba04..dc1c33c7 100755
--- a/index.html
+++ b/index.html
@@ -1,49 +1,47 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, minimal-ui">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css" integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ" crossorigin="anonymous">
-    <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:400,500,700,400italic|Material+Icons">
-    <link rel="apple-touch-icon" href="static/icons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="192x192"  href="static/icons/android-chrome-192x192.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="static/icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="96x96" href="static/icons/icon-96x96.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="static/icons/favicon-16x16.png">
-    <link rel="shortcut icon" href="static/icons/favicon.ico">
-    <link rel="manifest" href="static/manifest.json">
-    <link rel="mask-icon" href="static/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <meta name="msapplication-TileColor" content="#222226">
-    <meta name="msapplication-TileImage" content="static/icons/mstile-150x150.png">
-    <meta name="msapplication-config" content="static/icons/browserconfig.xml">
-    <meta name="theme-color" content="#222226">
-    <meta name="apple-mobile-web-app-title" content="Gamebrary">
-    <meta name="description" content="Open source tool to organize video game collections.">
-    <meta name="mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <title>Gamebrary</title>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, minimal-ui">
+  <link rel="apple-touch-icon" href="static/icons/apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="192x192"  href="static/icons/android-chrome-192x192.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="static/icons/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="96x96" href="static/icons/icon-96x96.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="static/icons/favicon-16x16.png">
+  <link rel="shortcut icon" href="static/icons/favicon.ico">
+  <link rel="manifest" href="static/manifest.json">
+  <link rel="mask-icon" href="static/icons/safari-pinned-tab.svg" color="#5bbad5">
+  <meta name="msapplication-TileColor" content="#222226">
+  <meta name="msapplication-TileImage" content="static/icons/mstile-150x150.png">
+  <meta name="msapplication-config" content="static/icons/browserconfig.xml">
+  <meta name="theme-color" content="#222226">
+  <meta name="apple-mobile-web-app-title" content="Gamebrary">
+  <meta name="description" content="Open source tool to organize video game collections.">
+  <meta name="mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <title>Gamebrary</title>
 
-    <script>
-        if (window.location.origin.indexOf('localhost') === -1) {
-            window['_fs_debug'] = false;
-            window['_fs_host'] = 'fullstory.com';
-            window['_fs_org'] = 'HX3XV';
-            window['_fs_namespace'] = 'FS';
-            (function(m,n,e,t,l,o,g,y){
-                if (e in m) {if(m.console && m.console.log) { m.console.log('FullStory namespace conflict. Please set window["_fs_namespace"].');} return;}
-                g=m[e]=function(a,b,s){g.q?g.q.push([a,b,s]):g._api(a,b,s);};g.q=[];
-                o=n.createElement(t);o.async=1;o.src='https://'+_fs_host+'/s/fs.js';
-                y=n.getElementsByTagName(t)[0];y.parentNode.insertBefore(o,y);
-                g.identify=function(i,v,s){g(l,{uid:i},s);if(v)g(l,v,s)};g.setUserVars=function(v,s){g(l,v,s)};g.event=function(i,v,s){g('event',{n:i,p:v},s)};
-                g.shutdown=function(){g("rec",!1)};g.restart=function(){g("rec",!0)};
-                g.consent=function(a){g("consent",!arguments.length||a)};
-                g.identifyAccount=function(i,v){o='account';v=v||{};v.acctId=i;g(o,v)};
-                g.clearUserCookie=function(){};
-            })(window,document,window['_fs_namespace'],'script','user');
-        }
-    </script>
+  <script>
+  if (window.location.origin.indexOf('localhost') === -1) {
+    window['_fs_debug'] = false;
+    window['_fs_host'] = 'fullstory.com';
+    window['_fs_org'] = 'HX3XV';
+    window['_fs_namespace'] = 'FS';
+    (function(m,n,e,t,l,o,g,y){
+      if (e in m) {if(m.console && m.console.log) { m.console.log('FullStory namespace conflict. Please set window["_fs_namespace"].');} return;}
+      g=m[e]=function(a,b,s){g.q?g.q.push([a,b,s]):g._api(a,b,s);};g.q=[];
+      o=n.createElement(t);o.async=1;o.src='https://'+_fs_host+'/s/fs.js';
+      y=n.getElementsByTagName(t)[0];y.parentNode.insertBefore(o,y);
+      g.identify=function(i,v,s){g(l,{uid:i},s);if(v)g(l,v,s)};g.setUserVars=function(v,s){g(l,v,s)};g.event=function(i,v,s){g('event',{n:i,p:v},s)};
+      g.shutdown=function(){g("rec",!1)};g.restart=function(){g("rec",!0)};
+      g.consent=function(a){g("consent",!arguments.length||a)};
+      g.identifyAccount=function(i,v){o='account';v=v||{};v.acctId=i;g(o,v)};
+      g.clearUserCookie=function(){};
+    })(window,document,window['_fs_namespace'],'script','user');
+  }
+  </script>
 </head>
 <body>
-    <div id="app" />
+  <div id="app" />
 </body>
 </html>
diff --git a/src/components/Board/AddList.vue b/src/components/Board/AddList.vue
index 4dd1917e..da880b17 100644
--- a/src/components/Board/AddList.vue
+++ b/src/components/Board/AddList.vue
@@ -6,7 +6,7 @@
       :title="title"
       ref="addList"
     >
-      <i class="fas fa-plus" />
+      <b-icon-plus />
     </b-button>
 
     <b-modal
diff --git a/src/components/Board/GameModal.vue b/src/components/Board/GameModal.vue
index 8ab50de7..6ca38235 100644
--- a/src/components/Board/GameModal.vue
+++ b/src/components/Board/GameModal.vue
@@ -118,7 +118,7 @@
               :title="$t('gameDetail.removeFromList')"
               @click="removeGame"
             >
-              <i class="far fa-trash-alt" />
+              <b-icon-trash />
             </b-button>
           </div>
 
diff --git a/src/components/Lists/ListSettings.vue b/src/components/Lists/ListSettings.vue
index 8e792ab9..606e7ace 100644
--- a/src/components/Lists/ListSettings.vue
+++ b/src/components/Lists/ListSettings.vue
@@ -23,7 +23,7 @@
             :disabled="isFirst"
             @click="moveList(listIndex, listIndex - 1)"
           >
-            <i class="fas fa-arrow-left" />
+            <b-icon-arrow-left-short />
 
             {{ $t('list.moveLeft') }}
           </b-button>
@@ -34,7 +34,7 @@
             @click="moveList(listIndex, listIndex + 1)"
           >
             {{ $t('list.moveRight') }}
-            <i class="fas fa-arrow-right" />
+            <b-icon-arrow-right-short />
           </b-button>
         </b-button-group>
       </b-dropdown-item>
diff --git a/src/components/Settings/SettingsGlobal.vue b/src/components/Settings/SettingsGlobal.vue
index 6ca17968..5839099b 100644
--- a/src/components/Settings/SettingsGlobal.vue
+++ b/src/components/Settings/SettingsGlobal.vue
@@ -3,7 +3,6 @@
     <h3>General</h3>
 
     <div class="setting">
-      <i class="fas fa-language" />
       <h5>{{ $t('settings.language') }}</h5>
 
       <b-form-select v-model="value.language">
diff --git a/src/components/SortIcon.vue b/src/components/SortIcon.vue
deleted file mode 100644
index ead1cfea..00000000
--- a/src/components/SortIcon.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<template lang="html">
-  <!-- TODO: simplify, use computed props -->
-  <span
-    v-if="custom && sortOrder != 'sortByName'"
-    class="sort-icon"
-  >
-    <i class="fas fa-long-arrow-alt-down arrow" />
-    <i
-      v-if="sortOrder === 'sortByRating'"
-      class="fas fa-star sort-type"
-    />
-    <i
-      v-if="sortOrder === 'sortByRating'"
-      class="far fa-star sort-type bottom-icon"
-    />
-    <i
-      v-if="sortOrder === 'sortByProgress'"
-      class="fas fa-clock sort-type single-icon"
-    />
-    <i
-      v-if="sortOrder === 'sortByReleaseDate'"
-      class="fas fa-calendar sort-type single-icon"
-    />
-  </span>
-  <i
-    v-else-if="custom"
-    class="fas fa-sort-alpha-down"
-  />
-  <i
-    v-else
-    class="fas fa-sort-amount-down"
-  />
-</template>
-
-<script>
-export default {
-  props: {
-    sortOrder: {
-      type: String,
-      default: '',
-    },
-    custom: {
-      type: Boolean,
-      default: false,
-    },
-  },
-};
-</script>
-
-<style lang="scss" rel="stylesheet/scss" scoped>
-  // @import "~styles/styles";
-
-  .sort-icon {
-    display: inline-grid;
-    grid-gap: 1px;
-    grid-template: 1fr 1fr / 1fr 1fr;
-    align-items: center;
-    justify-items: center;
-
-    .arrow,
-    .single-icon {
-      grid-row: span 2;
-    }
-
-    .single-icon {
-      align-self: start;
-    }
-
-    .bottom-icon {
-      grid-column: 2;
-      grid-row: 2;
-    }
-  }
-</style>
