diff --git a/plinth/menu.py b/plinth/menu.py
index b2576d26a..2dbd79964 100644
--- a/plinth/menu.py
+++ b/plinth/menu.py
@@ -27,8 +27,8 @@ class Menu(object):
         """label is the text that is displayed on the menu.
 
         icon is the icon to be displayed next to the label.
-        Choose from the Glyphicon set:
-        http://twitter.github.com/bootstrap/base-css.html#icons
+        Choose from the Fork Awesome set:
+        https://forkawesome.github.io/Fork-Awesome/icons/
 
         url is the url location that will be activated when the menu
         item is selected.
diff --git a/plinth/modules/backups/templates/backups_repository.inc b/plinth/modules/backups/templates/backups_repository.inc
index 91942e0cc..e73b8e713 100644
--- a/plinth/modules/backups/templates/backups_repository.inc
+++ b/plinth/modules/backups/templates/backups_repository.inc
@@ -65,7 +65,7 @@
           <a title="{% trans 'Remove Location. This will not delete the remote backup.' %}"
              role="button" class="repository-remove btn btn-sm btn-default"
              href="{% url 'backups:repository-remove' uuid %}">
-             <span class="fa fa-trash" aria-hidden="true">
+             <span class="fa fa-trash-o" aria-hidden="true">
           </a>
 
         {% endif %}
@@ -91,7 +91,7 @@
             </a>
             <a class="archive-delete btn btn-sm btn-default"
                href="{% url 'backups:delete' uuid archive.name %}">
-              <span class="fa fa-trash" aria-hidden="true">
+              <span class="fa fa-trash-o" aria-hidden="true">
               </span>
             </a>
           </td>
diff --git a/plinth/modules/diagnostics/templates/diagnostics.html b/plinth/modules/diagnostics/templates/diagnostics.html
index 767129e82..2fe323ab4 100644
--- a/plinth/modules/diagnostics/templates/diagnostics.html
+++ b/plinth/modules/diagnostics/templates/diagnostics.html
@@ -69,7 +69,7 @@
         {% if module_results %}
           {% include "diagnostics_results.html" with results=module_results %}
         {% else %}
-          <p><span class="fa fa-hourglass"></span></p>
+          <p><span class="fa fa-hourglass-o"></span></p>
         {% endif %}
       {% endfor %}
     {% endif %}
diff --git a/plinth/modules/diaspora/__init__.py b/plinth/modules/diaspora/__init__.py
index 4dde6f73e..4bcc49327 100644
--- a/plinth/modules/diaspora/__init__.py
+++ b/plinth/modules/diaspora/__init__.py
@@ -76,8 +76,7 @@ clients = clients
 def init():
     """Initialize the Diaspora module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'fa-thumbs-o-up', 'diaspora:index',
-                     short_description)
+    menu.add_urlname(name, 'fa-diaspora', 'diaspora:index', short_description)
 
     global service
     setup_helper = globals()['setup_helper']
diff --git a/plinth/modules/ikiwiki/templates/ikiwiki_manage.html b/plinth/modules/ikiwiki/templates/ikiwiki_manage.html
index 8053cd922..e1956e5b5 100644
--- a/plinth/modules/ikiwiki/templates/ikiwiki_manage.html
+++ b/plinth/modules/ikiwiki/templates/ikiwiki_manage.html
@@ -53,7 +53,7 @@
                  class="btn btn-default btn-sm pull-right"
                  role="button"
                  title="{% blocktrans %}Delete site {{ site }}{% endblocktrans %}">
-                <span class="fa fa-trash"
+                <span class="fa fa-trash-o"
                       aria-hidden="true"></span>
               </a>
 
diff --git a/plinth/modules/sharing/templates/sharing.html b/plinth/modules/sharing/templates/sharing.html
index 8133e5b7c..5ca2b7395 100644
--- a/plinth/modules/sharing/templates/sharing.html
+++ b/plinth/modules/sharing/templates/sharing.html
@@ -81,7 +81,7 @@
               <form class="form form-inline" method="post"
                     action="{% url 'sharing:remove' share.name %}">
                 {% csrf_token %}
-                <button class="share-remove btn btn-sm btn-default fa fa-trash"
+                <button class="share-remove btn btn-sm btn-default fa fa-trash-o"
                         type="submit"></button>
               </form>
             </td>
diff --git a/plinth/templates/cards.html b/plinth/templates/cards.html
index 38c9ae155..a819332bb 100644
--- a/plinth/templates/cards.html
+++ b/plinth/templates/cards.html
@@ -40,7 +40,7 @@
               <div class="card-title">{{ item.name }}</div>
               <div class="card-icon">
                 {% if 'fa-' in item.icon %}
-                  <span class="fa {{ item.icon }} fa-3x"></span>
+                  <span class="fa {{ item.icon }}"></span>
                 {% else %}
                   <img src="{% static 'theme/icons/' %}{{ item.icon }}.png"/>
                 {% endif %}
diff --git a/static/themes/default/css/plinth.css b/static/themes/default/css/plinth.css
index 95f40c36c..6fee2d584 100644
--- a/static/themes/default/css/plinth.css
+++ b/static/themes/default/css/plinth.css
@@ -67,14 +67,13 @@ body {
     list-style-type: none;
 }
 
-.nav .fa,
-.sidebar .fa {
+.nav .fa {
     margin-right: 4px;
 }
 
 .navbar-brand .fa {
     float: left;
-    margin-top: -15px;
+    margin-top: -19px;
     padding: 8px;
 }
 
@@ -226,11 +225,11 @@ footer license-info p {
 
 #clients-button .fa:before,
 .no-js #clients-button.collapsed .fa:before {
-    content: "\f054";
+    content: "\f078";
 }
 
 #clients-button.collapsed .fa:before {
-    content: "\f078";
+    content: "\f054";
 }
 
 /* No-JS fallbacks for collapsible content in clients.html */