diff --git a/docs/_static/dz0ny-mopidy-lux.png b/docs/clients/dz0ny-mopidy-lux.png
similarity index 100%
rename from docs/_static/dz0ny-mopidy-lux.png
rename to docs/clients/dz0ny-mopidy-lux.png
diff --git a/docs/clients/http.rst b/docs/clients/http.rst
index a31636cd..9ef3b131 100644
--- a/docs/clients/http.rst
+++ b/docs/clients/http.rst
@@ -18,7 +18,7 @@ See :ref:`http-api` for details on how to build your own web client.
 woutervanwijk/Mopidy-Webclient
 ==============================
 
-.. image:: /_static/woutervanwijk-mopidy-webclient.png
+.. image:: woutervanwijk-mopidy-webclient.png
     :width: 1275
     :height: 600
 
@@ -36,7 +36,7 @@ Also the web client used for Wouter's popular `Pi Musicbox
 Mopidy Lux
 ==========
 
-.. image:: /_static/dz0ny-mopidy-lux.png
+.. image:: dz0ny-mopidy-lux.png
     :width: 1000
     :height: 645
 
@@ -50,7 +50,7 @@ A Mopidy web client made with AngularJS by Janez Troha.
 Moped
 =====
 
-.. image:: /_static/martijnboland-moped.png
+.. image:: martijnboland-moped.png
     :width: 720
     :height: 450
 
diff --git a/docs/_static/martijnboland-moped.png b/docs/clients/martijnboland-moped.png
similarity index 100%
rename from docs/_static/martijnboland-moped.png
rename to docs/clients/martijnboland-moped.png
diff --git a/docs/_static/mpd-client-gmpc.png b/docs/clients/mpd-client-gmpc.png
similarity index 100%
rename from docs/_static/mpd-client-gmpc.png
rename to docs/clients/mpd-client-gmpc.png
diff --git a/docs/_static/mpd-client-mpad.jpg b/docs/clients/mpd-client-mpad.jpg
similarity index 100%
rename from docs/_static/mpd-client-mpad.jpg
rename to docs/clients/mpd-client-mpad.jpg
diff --git a/docs/_static/mpd-client-mpdroid.jpg b/docs/clients/mpd-client-mpdroid.jpg
similarity index 100%
rename from docs/_static/mpd-client-mpdroid.jpg
rename to docs/clients/mpd-client-mpdroid.jpg
diff --git a/docs/_static/mpd-client-mpod.jpg b/docs/clients/mpd-client-mpod.jpg
similarity index 100%
rename from docs/_static/mpd-client-mpod.jpg
rename to docs/clients/mpd-client-mpod.jpg
diff --git a/docs/_static/mpd-client-ncmpcpp.png b/docs/clients/mpd-client-ncmpcpp.png
similarity index 100%
rename from docs/_static/mpd-client-ncmpcpp.png
rename to docs/clients/mpd-client-ncmpcpp.png
diff --git a/docs/_static/mpd-client-sonata.png b/docs/clients/mpd-client-sonata.png
similarity index 100%
rename from docs/_static/mpd-client-sonata.png
rename to docs/clients/mpd-client-sonata.png
diff --git a/docs/clients/mpd.rst b/docs/clients/mpd.rst
index 0993303d..4a2736fe 100644
--- a/docs/clients/mpd.rst
+++ b/docs/clients/mpd.rst
@@ -51,7 +51,7 @@ ncmpcpp
 A console client that works well with Mopidy, and is regularly used by Mopidy
 developers.
 
-.. image:: /_static/mpd-client-ncmpcpp.png
+.. image:: mpd-client-ncmpcpp.png
     :width: 575
     :height: 426
 
@@ -84,7 +84,7 @@ GMPC
 `GMPC <http://gmpc.wikia.com>`_ is a graphical MPD client (GTK+) which works
 well with Mopidy.
 
-.. image:: /_static/mpd-client-gmpc.png
+.. image:: mpd-client-gmpc.png
     :width: 1000
     :height: 565
 
@@ -101,7 +101,7 @@ Sonata
 `Sonata <http://sonata.berlios.de/>`_ is a graphical MPD client (GTK+).
 It generally works well with Mopidy, except for search.
 
-.. image:: /_static/mpd-client-sonata.png
+.. image:: mpd-client-sonata.png
     :width: 475
     :height: 424
 
@@ -140,7 +140,7 @@ Test date:
 Tested version:
     1.03.1 (released 2012-10-16)
 
-.. image:: /_static/mpd-client-mpdroid.jpg
+.. image:: mpd-client-mpdroid.jpg
     :width: 288
     :height: 512
 
@@ -269,7 +269,7 @@ Test date:
 Tested version:
     1.7.1
 
-.. image:: /_static/mpd-client-mpod.jpg
+.. image:: mpd-client-mpod.jpg
     :width: 320
     :height: 480
 
@@ -297,7 +297,7 @@ Test date:
 Tested version:
     1.7.1
 
-.. image:: /_static/mpd-client-mpad.jpg
+.. image:: mpd-client-mpad.jpg
     :width: 480
     :height: 360
 
@@ -332,7 +332,7 @@ other web clients, see :ref:`http-clients`.
 Rompr
 -----
 
-.. image:: /_static/rompr.png
+.. image:: rompr.png
     :width: 557
     :height: 600
 
diff --git a/docs/clients/mpris.rst b/docs/clients/mpris.rst
index e1bd4bff..650372e6 100644
--- a/docs/clients/mpris.rst
+++ b/docs/clients/mpris.rst
@@ -24,7 +24,7 @@ sound menu in Ubuntu since 10.10 or 11.04. By default, it only includes the
 Rhytmbox music player, but many other players can integrate with the sound
 menu, including the official Spotify player and Mopidy.
 
-.. image:: /_static/ubuntu-sound-menu.png
+.. image:: ubuntu-sound-menu.png
     :height: 480
     :width: 955
 
diff --git a/docs/_static/rompr.png b/docs/clients/rompr.png
similarity index 100%
rename from docs/_static/rompr.png
rename to docs/clients/rompr.png
diff --git a/docs/_static/ubuntu-sound-menu.png b/docs/clients/ubuntu-sound-menu.png
similarity index 100%
rename from docs/_static/ubuntu-sound-menu.png
rename to docs/clients/ubuntu-sound-menu.png
diff --git a/docs/_static/woutervanwijk-mopidy-webclient.png b/docs/clients/woutervanwijk-mopidy-webclient.png
similarity index 100%
rename from docs/_static/woutervanwijk-mopidy-webclient.png
rename to docs/clients/woutervanwijk-mopidy-webclient.png
diff --git a/docs/_static/raspberry-pi-by-jwrodgers.jpg b/docs/installation/raspberry-pi-by-jwrodgers.jpg
similarity index 100%
rename from docs/_static/raspberry-pi-by-jwrodgers.jpg
rename to docs/installation/raspberry-pi-by-jwrodgers.jpg
diff --git a/docs/installation/raspberrypi.rst b/docs/installation/raspberrypi.rst
index e266dee2..4bc17a26 100644
--- a/docs/installation/raspberrypi.rst
+++ b/docs/installation/raspberrypi.rst
@@ -9,7 +9,7 @@ January 2013, Mopidy will run with Spotify support on both the armel
 (soft-float) and armhf (hard-float) architectures, which includes the Raspbian
 distribution.
 
-.. image:: /_static/raspberry-pi-by-jwrodgers.jpg
+.. image:: raspberry-pi-by-jwrodgers.jpg
     :width: 640
     :height: 427