diff --git a/app/views/_partials/pagination.volt b/app/views/_partials/pagination.volt
index a7db769..4720288 100644
--- a/app/views/_partials/pagination.volt
+++ b/app/views/_partials/pagination.volt
@@ -16,7 +16,7 @@
     {% if page.current !== page.before %}
     <li>
         <a href="{{ pagination_url ~ page.before }}">
-            {{ icon('android-arrow-back') }} Previous
+            {{ icon('solid/arrow-left') }} Previous
         </a>
     </li>
     {% endif %}
@@ -52,7 +52,7 @@
     {% if page.current !== page.next %}
     <li>
         <a href="{{ pagination_url ~ page.next }}">
-            Next {{ icon('android-arrow-forward') }}
+            Next {{ icon('solid/arrow-right') }}
         </a>
     </li>
     {% endif %}
diff --git a/app/views/_templates/footer.volt b/app/views/_templates/footer.volt
index bf3556a..af3cddc 100644
--- a/app/views/_templates/footer.volt
+++ b/app/views/_templates/footer.volt
@@ -9,7 +9,7 @@
 
     <div class="footer-middle">
         <a class="footer-button-top" href="#top">
-            {{ icon('android-arrow-dropup') }}
+            {{ icon('solid/caret-up') }}
         </a>
     </div>
 
diff --git a/app/views/_templates/navigation.volt b/app/views/_templates/navigation.volt
index ef7d12a..1ea1e03 100644
--- a/app/views/_templates/navigation.volt
+++ b/app/views/_templates/navigation.volt
@@ -11,18 +11,18 @@
             <a id="user-dropdown-button" class="navigation-user-menu-dropdown-button"
                data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
 
-                {{ icon('android-person') }} <strong>{{ auth.getUser().username }}</strong>
+                {{ icon('solid/user') }} <strong>{{ auth.getUser().username }}</strong>
             </a>
 
             <ul aria-labelledby="user-dropdown" class="navigation-user-menu-dropdown-list">
-                <li>{{ link_to(['for': 'user-settings'], '<i class="icon ion-gear-a"></i> Settings') }}</li>
-                <li>{{ link_to('/user/activity', '<i class="icon ion-android-list"></i> Activity') }}</li>
+                <li>{{ link_to(['for': 'user-settings'], '<i class="icon fas fa-cog"></i> Settings') }}</li>
+                <li>{{ link_to('/user/activity', '<i class="icon fas fa-list-alt"></i> Activity') }}</li>
                 <li role="separator" class="divider"></li>
-                <li>{{ link_to(['for': 'logout'], '<i class="icon ion-log-out"></i> Log out') }}</li>
+                <li>{{ link_to(['for': 'logout'], '<i class="icon far fa-times-circle"></i> Log out') }}</li>
             </ul>
         </div>
     {% else %}
-        <div class="navigation-user-menu-login">{{ link_to(['for': 'login'], '<i class="icon ion-log-in"></i> Login', 'class': 'login-button') }}</div>
+        <div class="navigation-user-menu-login">{{ link_to(['for': 'login'], '<i class="icon far fa-arrow-alt-circle-right"></i> Login', 'class': 'login-button') }}</div>
     {% endif %}
     </div>
 
diff --git a/app/views/auth/index.volt b/app/views/auth/index.volt
index 491d2c6..299400b 100644
--- a/app/views/auth/index.volt
+++ b/app/views/auth/index.volt
@@ -31,15 +31,15 @@
     <div class="oauth">
 
         <a class="button button-github" href="{{ url(['for': 'oauth', 'strategy': 'github']) }}">
-            {{ icon('social-github') }} GitHub
+            {{ icon('brand/github') }} GitHub
         </a>
 
         <a class="button button-google" href="{{ url(['for': 'oauth', 'strategy': 'google']) }}">
-            {{ icon('social-google') }} Google
+            {{ icon('brand/google') }} Google
         </a>
 
         <a class="button button-gitlab" href="{{ url(['for': 'oauth', 'strategy': 'gitlab']) }}">
-            Gitlab
+            {{ icon('brand/gitlab') }} Gitlab
         </a>
     </div>
 </div>
diff --git a/app/views/callback/list.volt b/app/views/callback/list.volt
index ec84f77..5f4d100 100644
--- a/app/views/callback/list.volt
+++ b/app/views/callback/list.volt
@@ -6,7 +6,7 @@
 
         <div class="pull-right">
             <a class="button button-large button-primary" href="{{ url('/callback/new') }}">
-                {{ icon('android-add') }} New
+                {{ icon('solid/plus') }} New
             </a>
         </div>
     </div>
@@ -29,10 +29,10 @@
             </div>
 
             <div class="callback-list-item-info">
-                <span>{{ icon('android-time') }} Created at: {{ item.created_at }}</span>
+                <span>{{ icon('clock') }} Created at: {{ item.created_at }}</span>
 
                 <span>
-                    {{ icon('paper-airplane') }}
+                    {{ icon('paper-plane') }}
 
                     {% if item.countRequests() > 0 %}
                         Last request: {{ item.last_request }}
@@ -42,13 +42,13 @@
                 </span>
 
                 <span>
-                    {{ icon('link') }}
+                    {{ icon('solid/link') }}
                     {{ serverUrl() }}{{ url(['for': 'cb-endpoint', 'id': item.public_id]) }}
                 </span>
             </div>
 
             <a class="callback-list-item-arrow" href="/callback/show/{{ item.public_id }}">
-                {{ icon('android-arrow-dropright-circle') }}
+                {{ icon('solid/arrow-alt-circle-right') }}
             </a>
         </div>
         {% endfor %}
diff --git a/app/views/callback/show.volt b/app/views/callback/show.volt
index 24ddb7f..3e30bcd 100644
--- a/app/views/callback/show.volt
+++ b/app/views/callback/show.volt
@@ -25,24 +25,22 @@
                     </span>
 
                     <span class="request-list-item-header-timestamp">
-                        {{ icon('android-time') }} {{ req.getTimestamp() }}
+                        {{ icon('clock') }} {{ req.getTimestamp() }}
                     </span>
                 </div>
 
                 <div class="request-list-item-header-row">
 
-
-
                     <span class="request-list-item-header-type">
-                        {{ icon('android-list') }} {{ req.getType() }}
+                        {{ icon('file-alt') }} {{ req.getType() }}
                     </span>
 
                     <span class="request-list-item-header-size">
-                        {{ icon('cube') }} {{ req.getSize() }} b
+                        {{ icon('solid/database') }} {{ req.getSize() }} b
                     </span>
 
                     <span class="request-list-item-header-ip">
-                        {{ icon('location') }} {{ req.getSourceIp() }}
+                        {{ icon('compass') }} {{ req.getSourceIp() }}
                     </span>
 
                 </div>