diff --git a/LICENSES b/LICENSES
index ed453af87..6d236c2e7 100644
--- a/LICENSES
+++ b/LICENSES
@@ -59,8 +59,10 @@ otherwise.
 - static/themes/default/icons/roundcube.png :: [[https://roundcube.net/][GPL-3+]]
 - static/themes/default/icons/shaarli.png :: [[https://github.com/shaarli/Shaarli][zlib/libpng]]
 - static/themes/default/icons/shadowsocks.png :: [[https://commons.wikimedia.org/wiki/File:Shadowsocks_logo.png][Apache 2.0]]
+- static/themes/default/icons/sharing.png :: [[https://www.shareicon.net/social-share-this-107338][CC 2.5]]
 - static/themes/default/icons/syncthing.png :: [[https://github.com/syncthing/syncthing/][Mozilla Public License Version 2.0]]
 - static/themes/default/icons/tahoe.png :: [[https://github.com/thekishanraval/Logos][GPLv3+]]
+- static/themes/default/icons/tor.png :: [[https://commons.wikimedia.org/wiki/File:Tor_logo1.png][CC BY 3.0 US]]
 - static/themes/default/icons/transmission.png :: [[https://transmissionbt.com/][GPL]]
 - static/themes/default/icons/ttrss.png :: [[https://tt-rss.org/gitlab/fox/tt-rss][GPL]]
 - static/themes/default/icons/f-droid.png :: [[https://gitlab.com/fdroid/artwork/blob/master/fdroid-logo-2015/fdroid-logo.svg][CC-BY-SA 3.0 or GPLv3+]]
diff --git a/plinth/modules/coquelicot/__init__.py b/plinth/modules/coquelicot/__init__.py
index ae05a4748..b6ebbd83f 100644
--- a/plinth/modules/coquelicot/__init__.py
+++ b/plinth/modules/coquelicot/__init__.py
@@ -56,7 +56,7 @@ manual_page = 'Coquelicot'
 def init():
     """Intialize the module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-open-file', 'coquelicot:index',
+    menu.add_urlname(name, 'coquelicot', 'coquelicot:index',
                      short_description)
 
     global service
diff --git a/plinth/modules/deluge/__init__.py b/plinth/modules/deluge/__init__.py
index 5bd18169b..6cfaab34c 100644
--- a/plinth/modules/deluge/__init__.py
+++ b/plinth/modules/deluge/__init__.py
@@ -59,7 +59,7 @@ manual_page = 'Deluge'
 def init():
     """Initialize the Deluge module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-magnet', 'deluge:index',
+    menu.add_urlname(name, 'deluge', 'deluge:index',
                      short_description)
     register_group(group)
 
diff --git a/plinth/modules/ejabberd/__init__.py b/plinth/modules/ejabberd/__init__.py
index 1490fad55..b7c896231 100644
--- a/plinth/modules/ejabberd/__init__.py
+++ b/plinth/modules/ejabberd/__init__.py
@@ -70,7 +70,7 @@ logger = logging.getLogger(__name__)
 def init():
     """Initialize the ejabberd module"""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-comment', 'ejabberd:index',
+    menu.add_urlname(name, 'ejabberd', 'ejabberd:index',
                      short_description)
 
     global service
diff --git a/plinth/modules/ikiwiki/__init__.py b/plinth/modules/ikiwiki/__init__.py
index e7c014cf0..0164f00fa 100644
--- a/plinth/modules/ikiwiki/__init__.py
+++ b/plinth/modules/ikiwiki/__init__.py
@@ -67,7 +67,7 @@ manual_page = 'Ikiwiki'
 def init():
     """Initialize the ikiwiki module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-edit', 'ikiwiki:index',
+    menu.add_urlname(name, 'ikiwiki', 'ikiwiki:index',
                      short_description)
     register_group(group)
 
diff --git a/plinth/modules/infinoted/__init__.py b/plinth/modules/infinoted/__init__.py
index fa1cdfe6e..c7158618f 100644
--- a/plinth/modules/infinoted/__init__.py
+++ b/plinth/modules/infinoted/__init__.py
@@ -58,7 +58,7 @@ clients = clients
 def init():
     """Initialize the infinoted module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-pencil', 'infinoted:index',
+    menu.add_urlname(name, 'infinoted', 'infinoted:index',
                      short_description)
 
     global service
diff --git a/plinth/modules/jsxc/__init__.py b/plinth/modules/jsxc/__init__.py
index 14ab7723d..28ce38215 100644
--- a/plinth/modules/jsxc/__init__.py
+++ b/plinth/modules/jsxc/__init__.py
@@ -53,7 +53,7 @@ logger = logging.getLogger(__name__)
 def init():
     """Initialize the JSXC module"""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-comment', 'jsxc:index', short_description)
+    menu.add_urlname(name, 'jsxc', 'jsxc:index', short_description)
 
     global service
     setup_helper = globals()['setup_helper']
diff --git a/plinth/modules/matrixsynapse/__init__.py b/plinth/modules/matrixsynapse/__init__.py
index 7d1f1f5aa..0a51f640b 100644
--- a/plinth/modules/matrixsynapse/__init__.py
+++ b/plinth/modules/matrixsynapse/__init__.py
@@ -70,7 +70,7 @@ CONFIG_FILE_PATH = '/etc/matrix-synapse/homeserver.yaml'
 def init():
     """Initialize the matrix-synapse module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-comment', 'matrixsynapse:index',
+    menu.add_urlname(name, 'matrixsynapse', 'matrixsynapse:index',
                      short_description)
 
     global service
diff --git a/plinth/modules/mediawiki/__init__.py b/plinth/modules/mediawiki/__init__.py
index b68edf30d..708091071 100644
--- a/plinth/modules/mediawiki/__init__.py
+++ b/plinth/modules/mediawiki/__init__.py
@@ -59,7 +59,7 @@ clients = clients
 def init():
     """Intialize the module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-edit', 'mediawiki:index',
+    menu.add_urlname(name, 'mediawiki', 'mediawiki:index',
                      short_description)
 
     global service
diff --git a/plinth/modules/minetest/__init__.py b/plinth/modules/minetest/__init__.py
index 5d70da7aa..9b9379cca 100644
--- a/plinth/modules/minetest/__init__.py
+++ b/plinth/modules/minetest/__init__.py
@@ -69,7 +69,7 @@ AUG_PATH = '/files' + CONFIG_FILE + '/.anon'
 def init():
     """Initialize the module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-th-large', 'minetest:index',
+    menu.add_urlname(name, 'minetest', 'minetest:index',
                      short_description)
 
     global service
diff --git a/plinth/modules/mumble/__init__.py b/plinth/modules/mumble/__init__.py
index 8477e000d..2e6a23bf1 100644
--- a/plinth/modules/mumble/__init__.py
+++ b/plinth/modules/mumble/__init__.py
@@ -58,7 +58,7 @@ manual_page = 'Mumble'
 def init():
     """Intialize the Mumble module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-headphones', 'mumble:index',
+    menu.add_urlname(name, 'mumble', 'mumble:index',
                      short_description)
 
     global service
diff --git a/plinth/modules/openvpn/__init__.py b/plinth/modules/openvpn/__init__.py
index 374749e90..dce31e9e3 100644
--- a/plinth/modules/openvpn/__init__.py
+++ b/plinth/modules/openvpn/__init__.py
@@ -55,7 +55,7 @@ manual_page = 'OpenVPN'
 def init():
     """Initialize the OpenVPN module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-lock', 'openvpn:index',
+    menu.add_urlname(name, 'openvpn', 'openvpn:index',
                      short_description)
 
     global service
diff --git a/plinth/modules/privoxy/__init__.py b/plinth/modules/privoxy/__init__.py
index 1055953d4..197d5e995 100644
--- a/plinth/modules/privoxy/__init__.py
+++ b/plinth/modules/privoxy/__init__.py
@@ -64,7 +64,7 @@ manual_page = 'Privoxy'
 def init():
     """Intialize the module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-cloud-upload', 'privoxy:index',
+    menu.add_urlname(name, 'privoxy', 'privoxy:index',
                      short_description)
 
     global service
diff --git a/plinth/modules/quassel/__init__.py b/plinth/modules/quassel/__init__.py
index 347f7636e..3dd96e9db 100644
--- a/plinth/modules/quassel/__init__.py
+++ b/plinth/modules/quassel/__init__.py
@@ -67,7 +67,7 @@ manual_page = 'Quassel'
 def init():
     """Initialize the quassel module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-retweet', 'quassel:index',
+    menu.add_urlname(name, 'quassel', 'quassel:index',
                      short_description)
 
     global service
diff --git a/plinth/modules/radicale/__init__.py b/plinth/modules/radicale/__init__.py
index d9fb2c649..657727b60 100644
--- a/plinth/modules/radicale/__init__.py
+++ b/plinth/modules/radicale/__init__.py
@@ -62,7 +62,7 @@ CONFIG_FILE = '/etc/radicale/config'
 def init():
     """Initialize the radicale module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-calendar', 'radicale:index',
+    menu.add_urlname(name, 'radicale', 'radicale:index',
                      short_description)
 
     global service
diff --git a/plinth/modules/repro/__init__.py b/plinth/modules/repro/__init__.py
index 269379f5a..95cb7ec92 100644
--- a/plinth/modules/repro/__init__.py
+++ b/plinth/modules/repro/__init__.py
@@ -69,7 +69,7 @@ manual_page = 'Repro'
 def init():
     """Initialize the repro module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-phone-alt', 'repro:index',
+    menu.add_urlname(name, 'repro', 'repro:index',
                      short_description)
 
     global service
diff --git a/plinth/modules/roundcube/__init__.py b/plinth/modules/roundcube/__init__.py
index 85c8eb29e..638601c89 100644
--- a/plinth/modules/roundcube/__init__.py
+++ b/plinth/modules/roundcube/__init__.py
@@ -64,7 +64,7 @@ manual_page = 'Roundcube'
 def init():
     """Intialize the module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-envelope', 'roundcube:index',
+    menu.add_urlname(name, 'roundcube', 'roundcube:index',
                      short_description)
 
     global service
diff --git a/plinth/modules/searx/__init__.py b/plinth/modules/searx/__init__.py
index 39ef86d4a..e4810a6e5 100644
--- a/plinth/modules/searx/__init__.py
+++ b/plinth/modules/searx/__init__.py
@@ -58,7 +58,7 @@ manual_page = 'Searx'
 def init():
     """Intialize the module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-search', 'searx:index',
+    menu.add_urlname(name, 'searx', 'searx:index',
                      short_description)
     register_group(group)
 
diff --git a/plinth/modules/shadowsocks/__init__.py b/plinth/modules/shadowsocks/__init__.py
index eb1d5eeb6..ad6ccd4a4 100644
--- a/plinth/modules/shadowsocks/__init__.py
+++ b/plinth/modules/shadowsocks/__init__.py
@@ -58,7 +58,7 @@ manual_page = 'Shadowsocks'
 def init():
     """Intialize the module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-send', 'shadowsocks:index',
+    menu.add_urlname(name, 'shadowsocks', 'shadowsocks:index',
                      short_description)
 
     global service
diff --git a/plinth/modules/sharing/__init__.py b/plinth/modules/sharing/__init__.py
index 62d83ee43..614f337c3 100644
--- a/plinth/modules/sharing/__init__.py
+++ b/plinth/modules/sharing/__init__.py
@@ -41,7 +41,7 @@ description = [
 def init():
     """Initialize the module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-share', 'sharing:index')
+    menu.add_urlname(name, 'sharing', 'sharing:index')
 
 
 def list_shares():
diff --git a/plinth/modules/syncthing/__init__.py b/plinth/modules/syncthing/__init__.py
index d999425c7..10741ffbc 100644
--- a/plinth/modules/syncthing/__init__.py
+++ b/plinth/modules/syncthing/__init__.py
@@ -68,7 +68,7 @@ manual_page = 'Syncthing'
 def init():
     """Intialize the module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-refresh', 'syncthing:index',
+    menu.add_urlname(name, 'syncthing', 'syncthing:index',
                      short_description)
     register_group(group)
 
diff --git a/plinth/modules/tahoe/__init__.py b/plinth/modules/tahoe/__init__.py
index fb9ec7920..c6be36264 100644
--- a/plinth/modules/tahoe/__init__.py
+++ b/plinth/modules/tahoe/__init__.py
@@ -87,7 +87,7 @@ description = [
 def init():
     """Intialize the module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-hdd', 'tahoe:index', short_description)
+    menu.add_urlname(name, 'tahoe-lafs', 'tahoe:index', short_description)
 
     global service
     setup_helper = globals()['setup_helper']
diff --git a/plinth/modules/tor/__init__.py b/plinth/modules/tor/__init__.py
index 96fe38515..90595987b 100644
--- a/plinth/modules/tor/__init__.py
+++ b/plinth/modules/tor/__init__.py
@@ -65,7 +65,7 @@ manual_page = 'Tor'
 def init():
     """Initialize the module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-eye-close', 'tor:index',
+    menu.add_urlname(name, 'tor', 'tor:index',
                      short_description)
 
     setup_helper = globals()['setup_helper']
diff --git a/plinth/modules/transmission/__init__.py b/plinth/modules/transmission/__init__.py
index dcde47a44..7e4fa58f3 100644
--- a/plinth/modules/transmission/__init__.py
+++ b/plinth/modules/transmission/__init__.py
@@ -60,7 +60,7 @@ manual_page = 'Transmission'
 def init():
     """Intialize the Transmission module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-save', 'transmission:index',
+    menu.add_urlname(name, 'transmission', 'transmission:index',
                      short_description)
     register_group(group)
 
diff --git a/plinth/modules/ttrss/__init__.py b/plinth/modules/ttrss/__init__.py
index 89a89cbd8..ef7895c82 100644
--- a/plinth/modules/ttrss/__init__.py
+++ b/plinth/modules/ttrss/__init__.py
@@ -67,7 +67,7 @@ manual_page = 'TinyTinyRSS'
 def init():
     """Intialize the module."""
     menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-envelope', 'ttrss:index',
+    menu.add_urlname(name, 'ttrss', 'ttrss:index',
                      short_description)
     register_group(group)
 
diff --git a/plinth/templates/cards.html b/plinth/templates/cards.html
index e1050c88d..7edf9a75f 100644
--- a/plinth/templates/cards.html
+++ b/plinth/templates/cards.html
@@ -38,7 +38,11 @@
           <div class="card thumbnail">
             <a href="{{ item.url }}" class="nav-link">
               <div class="card-icon">
-                <span class="{{ item.icon }} glyphicon"></span>
+                {% if 'glyphicon-' in item.icon %}
+                  <span class="{{ item.icon }} glyphicon"></span>
+                {% else %}
+                  <img src="{% static 'theme/icons/' %}{{ item.icon }}.png"/>
+                {% endif %}
               </div>
               <div class="card-title">{{ item.name }}</div>
               <div class="card-description">{{ item.short_description}}</div>
diff --git a/plinth/templates/index.html b/plinth/templates/index.html
index 3013565ff..695eaddc1 100644
--- a/plinth/templates/index.html
+++ b/plinth/templates/index.html
@@ -87,8 +87,7 @@
                     <a href="{{ shortcut.url }}" class="nav-link">
                   {% endif %}
                         <div class="card-icon">
-                          <img src="{% static 'theme/icons/' %}{{ shortcut.icon }}.png"
-                               style="max-width: 100px; height: 100px; font-size: 80px"/>
+                          <img src="{% static 'theme/icons/' %}{{ shortcut.icon }}.png"/>
                         </div>
                         <div class="card-title">
                           {{ shortcut.name }}
diff --git a/static/themes/default/css/plinth.css b/static/themes/default/css/plinth.css
index 1bd7eaf34..c8d95ffb0 100644
--- a/static/themes/default/css/plinth.css
+++ b/static/themes/default/css/plinth.css
@@ -281,6 +281,12 @@ a.menu_link_active {
     font-size: 80px;
 }
 
+.card-icon img {
+    width: 100px;
+    height: 100px;
+    font-size: 80px;
+}
+
 /* Button table - Tables with a list of actions as buttons on top */
 .button-table > .button-row + .table {
     margin-top: 10px;
diff --git a/static/themes/default/icons/sharing.png b/static/themes/default/icons/sharing.png
new file mode 100644
index 000000000..86ff7d5dc
Binary files /dev/null and b/static/themes/default/icons/sharing.png differ
diff --git a/static/themes/default/icons/tor.png b/static/themes/default/icons/tor.png
new file mode 100644
index 000000000..e23f23312
Binary files /dev/null and b/static/themes/default/icons/tor.png differ