diff --git a/site/static/css/buttons-side.css b/site/static/css/buttons-side.css
index 78142a5..e384cc3 100644
--- a/site/static/css/buttons-side.css
+++ b/site/static/css/buttons-side.css
@@ -36,34 +36,34 @@ div.sharecolumn .share-buttons.side {
   background-color: #4CBD38;
 }
 .share-buttons.side .share-diaspora {
-  background-image: url("/img/share/diaspora_white.png");
+  background-image: url("/img/service-icons/diaspora_white.png");
 }
 .share-buttons.side .share-gnusocial {
-  background-image: url("/img/share/gnusocial_white.png");
+  background-image: url("/img/service-icons/gnusocial_white.png");
 }
 .share-buttons.side .share-reddit {
-  background-image: url("/img/share/reddit_white.png");
+  background-image: url("/img/service-icons/reddit_white.png");
 }
 .share-buttons.side .share-flattr {
-  background-image: url("/img/share/flattr_white.png");
+  background-image: url("/img/service-icons/flattr_white.png");
   display: none !important;
 }
 .share-buttons.side .share-hnews {
-  background-image: url("/img/share/hackernews_white.png");
+  background-image: url("/img/service-icons/hackernews_white.png");
   display: none !important;
 }
 .share-buttons.side .share-twitter {
-  background-image: url("/img/share/twitter_white.png");
+  background-image: url("/img/service-icons/twitter_white.png");
 }
 .share-buttons.side .share-facebook {
-  background-image: url("/img/share/facebook_white.png");
+  background-image: url("/img/service-icons/facebook_white.png");
 }
 .share-buttons.side .share-gplus {
-  background-image: url("/img/share/gplus_white.png");
+  background-image: url("/img/service-icons/gplus_white.png");
   display: none !important;
 }
 .share-buttons.side .share-support {
-  background-image: url("/img/share/support_red.png");
+  background-image: url("/img/service-icons/support_red.png");
 }
 
 /* Share pop-up behaviour hacks */
diff --git a/site/static/css/buttons-spread.css b/site/static/css/buttons-spread.css
index ee08734..951d8df 100644
--- a/site/static/css/buttons-spread.css
+++ b/site/static/css/buttons-spread.css
@@ -30,28 +30,28 @@
 /* Single services with their colours and logos */
 .share-buttons.spread .share-diaspora {
   background-color: #404040;
-  background-image: url("/img/share/diaspora_white.png");
+  background-image: url("/img/service-icons/diaspora_white.png");
 }
 .share-buttons.spread .share-diaspora:hover {
   background-color: #101010 !important;
 }
 .share-buttons.spread .share-gnusocial {
   background-color: #a22430;
-  background-image: url("/img/share/gnusocial_white.png");
+  background-image: url("/img/service-icons/gnusocial_white.png");
 }
 .share-buttons.spread .share-gnusocial:hover {
   background-color: #850713 !important;
 }
 .share-buttons.spread .share-reddit {
   background-color: #ff5700;
-  background-image: url("/img/share/reddit_white.png");
+  background-image: url("/img/service-icons/reddit_white.png");
 }
 .share-buttons.spread .share-reddit:hover {
   background-color: #dd3500 !important;
 }
 .share-buttons.spread .share-flattr {
   background-color: #7ea352;
-  background-image: url("/img/share/flattr_white.png");
+  background-image: url("/img/service-icons/flattr_white.png");
   display: none !important;
 }
 .share-buttons.spread .share-flattr:hover {
@@ -59,7 +59,7 @@
 }
 .share-buttons.spread .share-hnews {
   background-color: #ff6600;
-  background-image: url("/img/share/hackernews_white.png");
+  background-image: url("/img/service-icons/hackernews_white.png");
   display: none !important;
 }
 .share-buttons.spread .share-hnews:hover {
@@ -67,21 +67,21 @@
 }
 .share-buttons.spread .share-twitter {
   background-color: #55acee;
-  background-image: url("/img/share/twitter_white.png");
+  background-image: url("/img/service-icons/twitter_white.png");
 }
 .share-buttons.spread .share-twitter:hover {
   background-color: #338acc !important;
 }
 .share-buttons.spread .share-facebook {
   background-color: #3b5998;
-  background-image: url("/img/share/facebook_white.png");
+  background-image: url("/img/service-icons/facebook_white.png");
 }
 .share-buttons.spread .share-facebook:hover {
   background-color: #143271 !important;
 }
 .share-buttons.spread .share-gplus {
   background-color: #d34836;
-  background-image: url("/img/share/gplus_white.png");
+  background-image: url("/img/service-icons/gplus_white.png");
   display: none !important;
 }
 .share-buttons.spread .share-gplus:hover {
@@ -89,7 +89,7 @@
 }
 .share-buttons.spread .share-support {
   background-color: #47a447;
-  background-image: url("/img/share/support_red.png");
+  background-image: url("/img/service-icons/support_red.png");
 }
 .share-buttons.spread .share-support:hover {
   background-color: #2a872a !important;
diff --git a/site/static/img/share/diaspora_white.png b/site/static/img/service-icons/diaspora_white.png
similarity index 100%
rename from site/static/img/share/diaspora_white.png
rename to site/static/img/service-icons/diaspora_white.png
diff --git a/site/static/img/share/facebook_white.png b/site/static/img/service-icons/facebook_white.png
similarity index 100%
rename from site/static/img/share/facebook_white.png
rename to site/static/img/service-icons/facebook_white.png
diff --git a/site/static/img/share/gnusocial_white.png b/site/static/img/service-icons/gnusocial_white.png
similarity index 100%
rename from site/static/img/share/gnusocial_white.png
rename to site/static/img/service-icons/gnusocial_white.png
diff --git a/site/static/img/share/gplus_white.png b/site/static/img/service-icons/gplus_white.png
similarity index 100%
rename from site/static/img/share/gplus_white.png
rename to site/static/img/service-icons/gplus_white.png
diff --git a/site/static/img/share/hackernews_white.png b/site/static/img/service-icons/hackernews_white.png
similarity index 100%
rename from site/static/img/share/hackernews_white.png
rename to site/static/img/service-icons/hackernews_white.png
diff --git a/site/static/img/share/reddit_white.png b/site/static/img/service-icons/reddit_white.png
similarity index 100%
rename from site/static/img/share/reddit_white.png
rename to site/static/img/service-icons/reddit_white.png
diff --git a/site/static/img/share/support_red.png b/site/static/img/service-icons/support_red.png
similarity index 100%
rename from site/static/img/share/support_red.png
rename to site/static/img/service-icons/support_red.png
diff --git a/site/static/img/share/twitter_white.png b/site/static/img/service-icons/twitter_white.png
similarity index 100%
rename from site/static/img/share/twitter_white.png
rename to site/static/img/service-icons/twitter_white.png