diff --git a/data/images/arrow-right-double.svg b/data/images/arrow-right-double.svg
deleted file mode 100644
index d7adadc6d..000000000
--- a/data/images/arrow-right-double.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="45px" viewBox="0 0 45 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>arrow-right-double</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="arrow-up-double" fill="rgb(0,0,0)" transform="translate(22.000000, 22.500000) rotate(-270.000000) translate(-22.000000, -22.500000)">
-            <g id="Page 1" fill="rgb(222,223,222)">
-                <g id="Group" fill="rgb(0,0,0)">
-                    <path d="M3.76020197,38.3028483 L40.9212013,38.3028483 C42.0771995,38.3028483 43.1372009,37.65385 43.6622024,36.6218485 C43.8891998,36.1828494 43.9992004,35.7028498 43.9992004,35.2248492 C43.9992004,34.5878481 43.7991996,33.9508471 43.4101997,33.4168467 L24.8282009,7.83484741 C24.2492004,7.03584762 23.3231998,6.56584783 22.3382011,6.56584783 C21.3532005,6.56584783 20.4271999,7.03784748 19.8492008,7.83484741 L1.26820104,33.4168467 C0.588201029,34.3518481 0.49320106,35.5948481 1.01720105,36.6218485 C1.5421844,37.6539225 2.60321955,38.3028483 3.76020197,38.3028483 C3.76020197,38.3028483 2.60321955,38.3028483 3.76020197,38.3028483 L3.76020197,38.3028483" id="Shape" fill="rgb(99,100,99)"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/arrow-up-double.svg b/data/images/arrow-up-double.svg
deleted file mode 100644
index 5cc0c9e07..000000000
--- a/data/images/arrow-up-double.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="42px" height="42px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>arrow-up-double</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(223,223,223)" fill-rule="evenodd">
-        <g id="Group" fill="rgb(0,0,0)">
-            <path d="M2.35400391,38.0279541 L39.5150032,38.0279541 C40.6710032,38.0279541 41.7310033,37.3789541 42.2560031,36.3469541 C42.4830031,35.9079541 42.5930032,35.4279541 42.5930032,34.9499542 C42.5930032,34.3129541 42.3930032,33.6759541 42.0040032,33.1419542 L23.4220024,7.55995345 C22.8430024,6.76095343 21.9170024,6.2909534 20.9320024,6.2909534 C19.9470024,6.2909534 19.0210024,6.7629534 18.4430023,7.55995345 L-0.137997031,33.1419542 C-0.817997038,34.0769542 -0.912997007,35.3199542 -0.388997018,36.3469541 C0.135986328,37.3790283 1.19702148,38.0279541 2.35400391,38.0279541 C2.35400391,38.0279541 1.19702148,38.0279541 2.35400391,38.0279541 L2.35400391,38.0279541" id="Shape" fill="rgb(100,100,100)"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/back-pressed.svg b/data/images/back-pressed.svg
deleted file mode 100644
index 5ed9fdb96..000000000
--- a/data/images/back-pressed.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="122px" height="122px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>back-pressed</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <linearGradient x1="50%" y1="50%" x2="50%" y2="0%" id="linearGradient-1">
-            <stop stop-color="rgb(37,41,44)" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" stop-opacity="0.5" offset="100%"></stop>
-        </linearGradient>
-        <path d="M61,106 C85.852815,106 106,85.852815 106,61 C106,36.147185 85.852815,16 61,16 C36.147185,16 16,36.147185 16,61 C16,85.852815 36.147185,106 61,106 Z M61,121 C27.8629134,121 1,94.1370866 1,61 C1,27.8629134 27.8629134,1 61,1 C94.1370866,1 121,27.8629134 121,61 C121,94.1370866 94.1370866,121 61,121 Z M72.020667,47.866611 C72.5906846,47.4418988 73.3484729,47.3820274 73.9739682,47.7088251 C74.602506,48.0362617 74.9981666,48.6973776 75,49.4182771 L75,72.5816226 C75,73.3019496 74.603731,73.963029 73.9751875,74.2898267 C73.7063342,74.4307738 73.4155337,74.5 73.1241236,74.5 C72.7357801,74.5 72.3474365,74.3758917 72.0212766,74.1332881 L64.3385355,68.4243067 L64.3385355,72.5816224 C64.3385355,73.3019495 63.9416569,73.9630288 63.3131133,74.2898265 C63.0448697,74.4307736 62.7534596,74.4999998 62.4620495,74.4999998 C62.0737059,74.4999998 61.6853623,74.3758915 61.3598121,74.1332879 L45.773639,62.5513035 C45.2865329,62.1895808 45,61.6126956 45,60.9983907 C45,60.3847096 45.2877523,59.8072007 45.773639,59.4467253 L61.3598121,47.8666109 C61.9298299,47.4418986 62.6870084,47.3820273 63.3125037,47.708825 C63.941657,48.0362464 64.3379259,48.6973257 64.3379259,49.4189 L64.3379259,53.5737213 Z M72.020667,47.866611" id="path-2"></path>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M61,121 C94.1370866,121 121,94.1370866 121,61 C121,27.8629134 94.1370866,1 61,1 C27.8629134,1 1,27.8629134 1,61 C1,94.1370866 27.8629134,121 61,121 Z M61,121" id="Oval 18" stroke="rgb(150,150,150)" stroke-width="1" fill-opacity="0.00241268382" fill="rgb(254,255,254)"></path>
-        <use id="Oval 33" stroke="rgb(150,150,150)" stroke-width="1" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
-        <use id="Oval 33-1" stroke="none" fill="none" xlink:href="#path-2"></use>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/back-rest.svg b/data/images/back-rest.svg
deleted file mode 100644
index 0b19e2b1d..000000000
--- a/data/images/back-rest.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="122px" height="122px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>back-rest</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <linearGradient x1="50%" y1="50%" x2="50%" y2="0%" id="linearGradient-1">
-            <stop stop-color="rgb(37,41,44)" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" stop-opacity="0.5" offset="100%"></stop>
-        </linearGradient>
-        <path d="M61,106 C85.852815,106 106,85.852815 106,61 C106,36.147185 85.852815,16 61,16 C36.147185,16 16,36.147185 16,61 C16,85.852815 36.147185,106 61,106 Z M61,121 C27.8629134,121 1,94.1370866 1,61 C1,27.8629134 27.8629134,1 61,1 C94.1370866,1 121,27.8629134 121,61 C121,94.1370866 94.1370866,121 61,121 Z M72.020667,47.866611 C72.5906846,47.4418988 73.3484729,47.3820274 73.9739682,47.7088251 C74.602506,48.0362617 74.9981666,48.6973776 75,49.4182771 L75,72.5816226 C75,73.3019496 74.603731,73.963029 73.9751875,74.2898267 C73.7063342,74.4307738 73.4155337,74.5 73.1241236,74.5 C72.7357801,74.5 72.3474365,74.3758917 72.0212766,74.1332881 L64.3385355,68.4243067 L64.3385355,72.5816224 C64.3385355,73.3019495 63.9416569,73.9630288 63.3131133,74.2898265 C63.0448697,74.4307736 62.7534596,74.4999998 62.4620495,74.4999998 C62.0737059,74.4999998 61.6853623,74.3758915 61.3598121,74.1332879 L45.773639,62.5513035 C45.2865329,62.1895808 45,61.6126956 45,60.9983907 C45,60.3847096 45.2877523,59.8072007 45.773639,59.4467253 L61.3598121,47.8666109 C61.9298299,47.4418986 62.6870084,47.3820273 63.3125037,47.708825 C63.941657,48.0362464 64.3379259,48.6973257 64.3379259,49.4189 L64.3379259,53.5737213 Z M72.020667,47.866611" id="path-2"></path>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M61,121 C94.1370866,121 121,94.1370866 121,61 C121,27.8629134 94.1370866,1 61,1 C27.8629134,1 1,27.8629134 1,61 C1,94.1370866 27.8629134,121 61,121 Z M61,121" id="Oval 18" stroke="rgb(150,150,150)" stroke-width="1" fill-opacity="0.5027861" fill="rgb(254,255,254)"></path>
-        <use id="Oval 33" stroke="rgb(150,150,150)" stroke-width="1" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
-        <use id="Oval 33-1" stroke="none" fill="none" xlink:href="#path-2"></use>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/no-album-no-case.svg b/data/images/no-album-no-case.svg
deleted file mode 100644
index 4907d1d10..000000000
--- a/data/images/no-album-no-case.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="100px" height="100px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>no-album-no-case</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(223,223,223)" fill-rule="evenodd">
-        <path d="M50,100 C77.6142389,100 100,77.6142389 100,50 C100,22.3857611 77.6142389,0 50,0 C22.3857611,0 0,22.3857611 0,50 C0,77.6142389 22.3857611,100 50,100 Z M50,100" id="Oval 1" fill="rgb(155,155,155)"></path>
-        <path d="M50.5,71 C61.8218379,71 71,61.8218379 71,50.5 C71,39.1781621 61.8218379,30 50.5,30 C39.1781621,30 30,39.1781621 30,50.5 C30,61.8218379 39.1781621,71 50.5,71 Z M50.5,71" id="Oval 3" stroke="rgb(167,167,167)" stroke-width="1"></path>
-        <path d="M50,58 C54.4182782,58 58,54.4182782 58,50 C58,45.5817218 54.4182782,42 50,42 C45.5817218,42 42,45.5817218 42,50 C42,54.4182782 45.5817218,58 50,58 Z M50,58" id="Oval 2" stroke="rgb(167,167,167)" stroke-width="1" fill="rgb(254,254,254)"></path>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/no-artist-image-placeholder.svg b/data/images/no-artist-image-placeholder.svg
deleted file mode 100644
index 89500fc4b..000000000
--- a/data/images/no-artist-image-placeholder.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="100px" height="100px" viewBox="0 0 100 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>no-artist-image-placeholder</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M50,100 C77.6142389,100 100,77.6142389 100,50 C100,22.3857611 77.6142389,0 50,0 C22.3857611,0 0,22.3857611 0,50 C0,77.6142389 22.3857611,100 50,100 Z M50,100" id="Oval 1" fill="rgb(196,197,196)"></path>
-        <path d="M78.2332518,38.461946 L68.0212481,38.2429279 L65.019543,38.1808728 L62.0178379,38.1133422 L59.4557854,38.062238 L58.255793,38.0348607 L57.6213143,36.1202778 L51.6989383,18.27213 C51.4454917,17.5128673 50.7644615,17 50.0006733,17 C49.236885,17 48.5541308,17.5128673 48.3006841,18.27213 L42.3800321,36.1202778 L41.7438293,38.0348607 L40.5421128,38.062238 L37.9800602,38.1133422 L34.9800793,38.1808728 L31.9800984,38.2429279 L21.7663707,38.461946 C20.9974101,38.4801975 20.3232765,39.0094912 20.0870711,39.7833549 C19.8508658,40.5590439 20.1060365,41.4040886 20.7215499,41.8914038 L36.6300696,54.5287458 L30.8473477,74.5378719 C30.6249353,75.315386 30.8887267,76.1531301 31.5076883,76.6331447 C31.6645838,76.7536047 31.8335483,76.843037 32.0128575,76.903267 C32.0697537,76.9251688 32.1300981,76.9233437 32.1921667,76.93977 C32.3128556,76.9653221 32.4352686,76.9963497 32.5594057,76.9981748 C32.6869911,77 32.7990594,76.9707976 32.9128518,76.9470706 C32.9731962,76.9342946 33.0352648,76.93977 33.0938851,76.9178682 C33.269746,76.8612886 33.4369863,76.7791568 33.5921578,76.6641723 L50.0023975,64.7003107 L66.4126372,76.6641723 C66.7212559,76.8886658 67.076426,77 67.4333203,77 C67.8074559,77 68.1815914,76.8795401 68.4988307,76.6331447 C69.1160682,76.151305 69.3798596,75.3099105 69.1574472,74.5378719 L63.3730013,54.5287458 L79.284969,41.8914038 C79.8953985,41.4021957 80.1487981,40.5571279 79.9125514,39.7833549 C79.676346,39.0094911 79.0039365,38.4801975 78.2332518,38.461946 Z M78.2332518,38.461946" id="Shape" fill="rgb(254,255,254)"></path>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/pause-pressed.svg b/data/images/pause-pressed.svg
deleted file mode 100644
index fca4e8970..000000000
--- a/data/images/pause-pressed.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="122px" height="122px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>pause-pressed</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <linearGradient x1="50%" y1="50%" x2="50%" y2="0%" id="linearGradient-1">
-            <stop stop-color="rgb(37,41,44)" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" stop-opacity="0.5" offset="100%"></stop>
-        </linearGradient>
-        <path d="M61,121 C27.8629134,121 1,94.1370866 1,61 C1,27.8629134 27.8629134,1 61,1 C94.1370866,1 121,27.8629134 121,61 C121,94.1370866 94.1370866,121 61,121 Z M61,106 C85.852815,106 106,85.852815 106,61 C106,36.147185 85.852815,16 61,16 C36.147185,16 16,36.147185 16,61 C16,85.852815 36.147185,106 61,106 Z M61,106" id="path-2"></path>
-        <path d="M47.8163555,41.1253995 C46.9554464,41.1253995 46.2563556,41.8235813 46.2563556,42.6853995 L46.2563556,78.9744897 C46.2563556,79.8363079 46.9554465,80.5353988 47.8163555,80.5353988 L54.8781738,80.5353988 C55.7390829,80.5353988 56.4390829,79.8363079 56.4390829,78.9744897 L56.4390829,42.6853995 C56.4381769,41.8227539 55.7391025,41.1253995 54.8781738,41.1253995 L47.8163555,41.1253995 Z M47.8163555,41.1253995" id="path-3"></path>
-        <path d="M74.2227117,41.1253995 L67.1618025,41.1253995 C66.2999843,41.1253995 65.6008934,41.8235813 65.6008934,42.6853995 L65.6008934,78.9744897 C65.6008934,79.8363079 66.2999843,80.5353988 67.1618025,80.5353988 L74.2227117,80.5353988 C75.0845299,80.5353988 75.7836208,79.8363079 75.7836208,78.9744897 L75.7836208,42.6853995 C75.7836581,41.8227539 75.0845281,41.1253995 74.2227117,41.1253995 L74.2227117,41.1253995 L74.2227117,41.1253995" id="path-4"></path>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M61,121 C94.1370866,121 121,94.1370866 121,61 C121,27.8629134 94.1370866,1 61,1 C27.8629134,1 1,27.8629134 1,61 C1,94.1370866 27.8629134,121 61,121 Z M61,121" id="Oval 18" stroke="rgb(150,150,150)" stroke-width="1" fill-opacity="0.00241268382" fill="rgb(254,255,254)"></path>
-        <g id="Group">
-            <use id="Oval 33" stroke="rgb(150,150,150)" stroke-width="1" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
-            <use id="Oval 33-1" stroke="none" fill="none" xlink:href="#path-2"></use>
-            <g stroke="rgb(150,150,150)" stroke-width="1" fill="url(#linearGradient-1)">
-                <use id="Shape" xlink:href="#path-3"></use>
-                <use id="Shape-1" stroke="none" fill="none" xlink:href="#path-3"></use>
-                <use id="Shape" xlink:href="#path-4"></use>
-                <use id="Shape-1" stroke="none" fill="none" xlink:href="#path-4"></use>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/pause-rest.svg b/data/images/pause-rest.svg
deleted file mode 100644
index e57457bd2..000000000
--- a/data/images/pause-rest.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="122px" height="122px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>pause-rest</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <linearGradient x1="50%" y1="50%" x2="50%" y2="0%" id="linearGradient-1">
-            <stop stop-color="rgb(37,41,44)" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" stop-opacity="0.5" offset="100%"></stop>
-        </linearGradient>
-        <path d="M61,121 C27.8629134,121 1,94.1370866 1,61 C1,27.8629134 27.8629134,1 61,1 C94.1370866,1 121,27.8629134 121,61 C121,94.1370866 94.1370866,121 61,121 Z M61,106 C85.852815,106 106,85.852815 106,61 C106,36.147185 85.852815,16 61,16 C36.147185,16 16,36.147185 16,61 C16,85.852815 36.147185,106 61,106 Z M61,106" id="path-2"></path>
-        <path d="M47.8163555,41.1253995 C46.9554464,41.1253995 46.2563556,41.8235813 46.2563556,42.6853995 L46.2563556,78.9744897 C46.2563556,79.8363079 46.9554465,80.5353988 47.8163555,80.5353988 L54.8781738,80.5353988 C55.7390829,80.5353988 56.4390829,79.8363079 56.4390829,78.9744897 L56.4390829,42.6853995 C56.4381769,41.8227539 55.7391025,41.1253995 54.8781738,41.1253995 L47.8163555,41.1253995 Z M47.8163555,41.1253995" id="path-3"></path>
-        <path d="M74.2227117,41.1253995 L67.1618025,41.1253995 C66.2999843,41.1253995 65.6008934,41.8235813 65.6008934,42.6853995 L65.6008934,78.9744897 C65.6008934,79.8363079 66.2999843,80.5353988 67.1618025,80.5353988 L74.2227117,80.5353988 C75.0845299,80.5353988 75.7836208,79.8363079 75.7836208,78.9744897 L75.7836208,42.6853995 C75.7836581,41.8227539 75.0845281,41.1253995 74.2227117,41.1253995 L74.2227117,41.1253995 L74.2227117,41.1253995" id="path-4"></path>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M61,121 C94.1370866,121 121,94.1370866 121,61 C121,27.8629134 94.1370866,1 61,1 C27.8629134,1 1,27.8629134 1,61 C1,94.1370866 27.8629134,121 61,121 Z M61,121" id="Oval 18" stroke="rgb(150,150,150)" stroke-width="1" fill-opacity="0.5027861" fill="rgb(254,255,254)"></path>
-        <g id="Group">
-            <use id="Oval 33" stroke="rgb(150,150,150)" stroke-width="1" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
-            <use id="Oval 33-1" stroke="none" fill="none" xlink:href="#path-2"></use>
-            <g stroke="rgb(150,150,150)" stroke-width="1" fill="url(#linearGradient-1)">
-                <use id="Shape" xlink:href="#path-3"></use>
-                <use id="Shape-1" stroke="none" fill="none" xlink:href="#path-3"></use>
-                <use id="Shape" xlink:href="#path-4"></use>
-                <use id="Shape-1" stroke="none" fill="none" xlink:href="#path-4"></use>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/play-pressed.svg b/data/images/play-pressed.svg
deleted file mode 100644
index b4d719910..000000000
--- a/data/images/play-pressed.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="122px" height="122px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>play-pressed</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <linearGradient x1="50%" y1="50%" x2="50%" y2="0%" id="linearGradient-1">
-            <stop stop-color="rgb(37,41,44)" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" stop-opacity="0.5" offset="100%"></stop>
-        </linearGradient>
-        <path d="M61,106 C85.852815,106 106,85.852815 106,61 C106,36.147185 85.852815,16 61,16 C36.147185,16 16,36.147185 16,61 C16,85.852815 36.147185,106 61,106 Z M61,121 C27.8629134,121 1,94.1370866 1,61 C1,27.8629134 27.8629134,1 61,1 C94.1370866,1 121,27.8629134 121,61 C121,94.1370866 94.1370866,121 61,121 Z M52.2667596,83.9999894 C51.3047827,84.0027739 50.6146688,83.4551662 50.2900698,82.9381874 C50.1100401,82.6504614 50.0109329,82.3163279 50.0109329,81.9756974 L50.0000207,41.1677891 C50.0000207,41.1677891 49.9963838,40.298114 50.0854894,39.7792788 C50.2909778,38.5801108 51.4211642,38.0037306 52.2803969,38.000018 C52.8750404,37.9972335 53.4078556,38.3183729 53.948854,38.731399 L78.8129561,58.5390173 C78.8675105,58.5844966 78.9193373,58.630904 78.9693455,58.6810241 C79.8422168,59.5618371 80.0104263,60.4760634 79.9995155,61.0849288 C79.9731475,62.3416419 79.1793802,63.1407778 79.020263,63.2864972 C69.7223658,70.6346492 54.7126176,82.7571985 54.7126176,82.7571985 C53.8161061,83.422681 53.095078,83.9953487 52.2667596,83.9999894 Z M52.2667596,83.9999894" id="path-2"></path>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M61,121 C94.1370866,121 121,94.1370866 121,61 C121,27.8629134 94.1370866,1 61,1 C27.8629134,1 1,27.8629134 1,61 C1,94.1370866 27.8629134,121 61,121 Z M61,121" id="Oval 18" stroke="rgb(150,150,150)" stroke-width="1" fill-opacity="0.00241268382" fill="rgb(254,255,254)"></path>
-        <use id="Oval 33" stroke="rgb(150,150,150)" stroke-width="1" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
-        <use id="Oval 33-1" stroke="none" fill="none" xlink:href="#path-2"></use>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/play-rest.svg b/data/images/play-rest.svg
deleted file mode 100644
index 9502d3172..000000000
--- a/data/images/play-rest.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="122px" height="122px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>play-rest</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <linearGradient x1="50%" y1="50%" x2="50%" y2="0%" id="linearGradient-1">
-            <stop stop-color="rgb(37,41,44)" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" stop-opacity="0.5" offset="100%"></stop>
-        </linearGradient>
-        <path d="M61,106 C85.852815,106 106,85.852815 106,61 C106,36.147185 85.852815,16 61,16 C36.147185,16 16,36.147185 16,61 C16,85.852815 36.147185,106 61,106 Z M61,121 C27.8629134,121 1,94.1370866 1,61 C1,27.8629134 27.8629134,1 61,1 C94.1370866,1 121,27.8629134 121,61 C121,94.1370866 94.1370866,121 61,121 Z M52.2667596,83.9999894 C51.3047827,84.0027739 50.6146688,83.4551662 50.2900698,82.9381874 C50.1100401,82.6504614 50.0109329,82.3163279 50.0109329,81.9756974 L50.0000207,41.1677891 C50.0000207,41.1677891 49.9963838,40.298114 50.0854894,39.7792788 C50.2909778,38.5801108 51.4211642,38.0037306 52.2803969,38.000018 C52.8750404,37.9972335 53.4078556,38.3183729 53.948854,38.731399 L78.8129561,58.5390173 C78.8675105,58.5844966 78.9193373,58.630904 78.9693455,58.6810241 C79.8422168,59.5618371 80.0104263,60.4760634 79.9995155,61.0849288 C79.9731475,62.3416419 79.1793802,63.1407778 79.020263,63.2864972 C69.7223658,70.6346492 54.7126176,82.7571985 54.7126176,82.7571985 C53.8161061,83.422681 53.095078,83.9953487 52.2667596,83.9999894 Z M52.2667596,83.9999894" id="path-2"></path>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M61,121 C94.1370866,121 121,94.1370866 121,61 C121,27.8629134 94.1370866,1 61,1 C27.8629134,1 1,27.8629134 1,61 C1,94.1370866 27.8629134,121 61,121 Z M61,121" id="Oval 18" stroke="rgb(150,150,150)" stroke-width="1" fill-opacity="0.5027861" fill="rgb(254,255,254)"></path>
-        <use id="Oval 33" stroke="rgb(150,150,150)" stroke-width="1" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
-        <use id="Oval 33-1" stroke="none" fill="none" xlink:href="#path-2"></use>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/repeat-1-on-pressed.svg b/data/images/repeat-1-on-pressed.svg
deleted file mode 100644
index 0130540a7..000000000
--- a/data/images/repeat-1-on-pressed.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="73px" height="54px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>repeat-1-on-pressed</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="Group">
-            <g fill="rgb(59,60,59)">
-                <path d="M34.6940002,22.7480168 C34.6940002,23.1300168 34.9090002,23.4800168 35.2500002,23.6540169 C35.3956046,23.7283135 35.5550002,23.7650169 35.7130002,23.7650169 C35.9230002,23.7650169 36.1340002,23.6990169 36.3110002,23.5700169 L45.6810001,16.765017 C45.9450001,16.574017 46.1010001,16.267017 46.1010001,15.941017 C46.1010001,15.615017 45.9450001,15.308017 45.6810001,15.117017 L36.3110002,8.3120172 C36.0010002,8.08601721 35.5910002,8.05401722 35.2500002,8.2270172 C34.9074061,8.40082598 34.6940002,8.75101719 34.6940002,9.13401721 L34.6940002,13.5650174 L14.0710011,13.5650174 C8.26900101,13.5650174 3.55000114,18.2850172 3.55000114,24.0860173 L3.55000114,32.0150172 C3.55000114,33.3270173 4.61400115,34.3910172 5.92600107,34.3910172 C7.23800099,34.3910172 8.302001,33.3280172 8.302001,32.0150172 L8.302001,24.0860173 C8.302001,20.9050174 10.8900011,18.3170173 14.072001,18.3170173 L34.6940002,18.3170173 L34.6940002,22.7480168 Z M34.6940002,22.7480168" id="Shape"></path>
-                <path d="M50.5130005,21.7110596 C49.2010005,21.7110596 48.1380005,22.7750596 48.1380005,24.0860596 L48.1380005,32.0150595 C48.1380005,35.1980596 45.5500004,37.7860594 42.3680005,37.7860594 L21.6460004,37.7860594 L21.6460004,33.3530593 C21.6460004,32.9710593 21.4300004,32.6210593 21.0900004,32.4460593 C20.7500004,32.2740593 20.3380004,32.3040593 20.0290004,32.5300593 L10.66,39.3360595 C10.395,39.5270595 10.239,39.8340595 10.239,40.1600595 C10.239,40.4850595 10.395,40.7920595 10.6589999,40.9830595 L20.0289998,47.7900597 C20.2069998,47.9190597 20.4159998,47.9840597 20.6269998,47.9840597 C20.7849998,47.9840597 20.9429998,47.9470597 21.0899998,47.8740597 C21.4299998,47.7000597 21.6459998,47.3490597 21.6459998,46.9660597 L21.6459998,42.5370598 L42.3679999,42.5370598 C48.1690001,42.5370598 52.8889998,37.8160596 52.8889998,32.0160599 L52.8889998,24.08706 C52.8890076,22.7750244 51.8250122,21.7110596 50.5130005,21.7110596 L50.5130005,21.7110596 L50.5130005,21.7110596" id="Shape"></path>
-            </g>
-            <path d="M58,20 C62.970563,20 67,15.970563 67,11 C67,6.02943701 62.970563,2 58,2 C53.029437,2 49,6.02943701 49,11 C49,15.970563 53.029437,20 58,20 Z M58,20" id="Oval 1" fill="rgb(59,60,59)"></path>
-        </g>
-        <path d="M57,7 L57,15 L59,15 L59,7 L57,7 Z M57,7" id="Rectangle 1" stroke="rgb(254,255,254)" stroke-width="1" fill="rgb(254,255,254)"></path>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/repeat-1-on-rest.svg b/data/images/repeat-1-on-rest.svg
deleted file mode 100644
index d81de3070..000000000
--- a/data/images/repeat-1-on-rest.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="73px" height="54px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>repeat-1-on-rest</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="21.2684318%" id="radialGradient-1">
-            <stop stop-color="rgb(233,105,103)" offset="0%"></stop>
-            <stop stop-color="rgb(150,44,38)" offset="100%"></stop>
-        </radialGradient>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="Group" fill="url(#radialGradient-1)">
-            <path d="M34.6940002,18.3170166 L34.6940002,22.7480168 C34.6940002,23.1300168 34.9090002,23.4800168 35.2500002,23.6540169 C35.3956046,23.7283135 35.5550002,23.7650169 35.7130002,23.7650169 C35.9230002,23.7650169 36.1340002,23.6990169 36.3110002,23.5700169 L45.6810001,16.765017 C45.9450001,16.574017 46.1010001,16.267017 46.1010001,15.941017 C46.1010001,15.615017 45.9450001,15.308017 45.6810001,15.117017 L36.3110002,8.3120172 C36.0010002,8.08601721 35.5910002,8.05401722 35.2500002,8.2270172 C34.9074061,8.40082598 34.6940002,8.75101719 34.6940002,9.13401721 L34.6940002,13.5650174 L14.0710011,13.5650174 C8.26900101,13.5650174 3.55000114,18.2850172 3.55000114,24.0860173 L3.55000114,32.0150172 C3.55000114,33.3270173 4.61400115,34.3910172 5.92600107,34.3910172 C7.23800099,34.3910172 8.302001,33.3280172 8.302001,32.0150172 L8.302001,24.0860173 C8.302001,20.9050174 10.8900011,18.3170173 14.072001,18.3170173 L34.6940002,18.3170173 L34.6940002,18.3170173 L34.6940002,18.3170166" id="Shape"></path>
-            <path d="M48.1380005,24.0860596 L48.1380005,32.0150595 C48.1380005,35.1980596 45.5500004,37.7860594 42.3680005,37.7860594 L21.6460004,37.7860594 L21.6460004,33.3530593 C21.6460004,32.9710593 21.4300004,32.6210593 21.0900004,32.4460593 C20.7500004,32.2740593 20.3380004,32.3040593 20.0290004,32.5300593 L10.66,39.3360595 C10.395,39.5270595 10.239,39.8340595 10.239,40.1600595 C10.239,40.4850595 10.395,40.7920595 10.6589999,40.9830595 L20.0289998,47.7900597 C20.2069998,47.9190597 20.4159998,47.9840597 20.6269998,47.9840597 C20.7849998,47.9840597 20.9429998,47.9470597 21.0899998,47.8740597 C21.4299998,47.7000597 21.6459998,47.3490597 21.6459998,46.9660597 L21.6459998,42.5370598 L42.3679999,42.5370598 C48.1690001,42.5370598 52.8889998,37.8160596 52.8889998,32.0160599 L52.8889998,24.08706 C52.8890076,22.7750244 51.8250122,21.7110596 50.5130005,21.7110596 C49.2010005,21.7110596 48.1380005,22.7750596 48.1380005,24.0860596 Z M48.1380005,24.0860596" id="Shape"></path>
-        </g>
-        <path d="M58,20 C62.970563,20 67,15.970563 67,11 C67,6.02943701 62.970563,2 58,2 C53.029437,2 49,6.02943701 49,11 C49,15.970563 53.029437,20 58,20 Z M58,20" id="Oval 1" fill="url(#radialGradient-1)"></path>
-        <path d="M57,7 L57,15 L59,15 L59,7 L57,7 Z M57,7" id="Rectangle 1" stroke="rgb(254,255,254)" stroke-width="1" fill="rgb(254,255,254)"></path>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/repeat-all-on-pressed.svg b/data/images/repeat-all-on-pressed.svg
deleted file mode 100644
index 9931d38b4..000000000
--- a/data/images/repeat-all-on-pressed.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="73px" height="54px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>repeat-all-on-pressed</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="Group" fill="rgb(81,91,21)">
-            <path d="M34.6940002,18.3170166 L34.6940002,22.7480168 C34.6940002,23.1300168 34.9090002,23.4800168 35.2500002,23.6540169 C35.3956046,23.7283135 35.5550002,23.7650169 35.7130002,23.7650169 C35.9230002,23.7650169 36.1340002,23.6990169 36.3110002,23.5700169 L45.6810001,16.765017 C45.9450001,16.574017 46.1010001,16.267017 46.1010001,15.941017 C46.1010001,15.615017 45.9450001,15.308017 45.6810001,15.117017 L36.3110002,8.3120172 C36.0010002,8.08601721 35.5910002,8.05401722 35.2500002,8.2270172 C34.9074061,8.40082598 34.6940002,8.75101719 34.6940002,9.13401721 L34.6940002,13.5650174 L14.0710011,13.5650174 C8.26900101,13.5650174 3.55000114,18.2850172 3.55000114,24.0860173 L3.55000114,32.0150172 C3.55000114,33.3270173 4.61400115,34.3910172 5.92600107,34.3910172 C7.23800099,34.3910172 8.302001,33.3280172 8.302001,32.0150172 L8.302001,24.0860173 C8.302001,20.9050174 10.8900011,18.3170173 14.072001,18.3170173 L34.6940002,18.3170173 L34.6940002,18.3170173 L34.6940002,18.3170166" id="Shape" fill="rgb(76,77,76)"></path>
-            <path d="M50.5130005,21.7110596 C49.2010005,21.7110596 48.1380005,22.7750596 48.1380005,24.0860596 L48.1380005,32.0150595 C48.1380005,35.1980596 45.5500004,37.7860594 42.3680005,37.7860594 L21.6460004,37.7860594 L21.6460004,33.3530593 C21.6460004,32.9710593 21.4300004,32.6210593 21.0900004,32.4460593 C20.7500004,32.2740593 20.3380004,32.3040593 20.0290004,32.5300593 L10.66,39.3360595 C10.395,39.5270595 10.239,39.8340595 10.239,40.1600595 C10.239,40.4850595 10.395,40.7920595 10.6589999,40.9830595 L20.0289998,47.7900597 C20.2069998,47.9190597 20.4159998,47.9840597 20.6269998,47.9840597 C20.7849998,47.9840597 20.9429998,47.9470597 21.0899998,47.8740597 C21.4299998,47.7000597 21.6459998,47.3490597 21.6459998,46.9660597 L21.6459998,42.5370598 L42.3679999,42.5370598 C48.1690001,42.5370598 52.8889998,37.8160596 52.8889998,32.0160599 L52.8889998,24.08706 C52.8890076,22.7750244 51.8250122,21.7110596 50.5130005,21.7110596 L50.5130005,21.7110596 L50.5130005,21.7110596" id="Shape" fill="rgb(76,77,76)"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/repeat-all-on-rest.svg b/data/images/repeat-all-on-rest.svg
deleted file mode 100644
index 52f202a2f..000000000
--- a/data/images/repeat-all-on-rest.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="73px" height="54px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>repeat-all-on-rest</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="21.2684318%" id="radialGradient-1">
-            <stop stop-color="rgb(233,105,103)" offset="0%"></stop>
-            <stop stop-color="rgb(150,44,38)" offset="100%"></stop>
-        </radialGradient>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="Group" fill="rgb(81,91,21)">
-            <path d="M34.6940002,18.3170166 L34.6940002,22.7480168 C34.6940002,23.1300168 34.9090002,23.4800168 35.2500002,23.6540169 C35.3956046,23.7283135 35.5550002,23.7650169 35.7130002,23.7650169 C35.9230002,23.7650169 36.1340002,23.6990169 36.3110002,23.5700169 L45.6810001,16.765017 C45.9450001,16.574017 46.1010001,16.267017 46.1010001,15.941017 C46.1010001,15.615017 45.9450001,15.308017 45.6810001,15.117017 L36.3110002,8.3120172 C36.0010002,8.08601721 35.5910002,8.05401722 35.2500002,8.2270172 C34.9074061,8.40082598 34.6940002,8.75101719 34.6940002,9.13401721 L34.6940002,13.5650174 L14.0710011,13.5650174 C8.26900101,13.5650174 3.55000114,18.2850172 3.55000114,24.0860173 L3.55000114,32.0150172 C3.55000114,33.3270173 4.61400115,34.3910172 5.92600107,34.3910172 C7.23800099,34.3910172 8.302001,33.3280172 8.302001,32.0150172 L8.302001,24.0860173 C8.302001,20.9050174 10.8900011,18.3170173 14.072001,18.3170173 L34.6940002,18.3170173 L34.6940002,18.3170173 L34.6940002,18.3170166" id="Shape" fill="url(#radialGradient-1)"></path>
-            <path d="M48.1380005,24.0860596 L48.1380005,32.0150595 C48.1380005,35.1980596 45.5500004,37.7860594 42.3680005,37.7860594 L21.6460004,37.7860594 L21.6460004,33.3530593 C21.6460004,32.9710593 21.4300004,32.6210593 21.0900004,32.4460593 C20.7500004,32.2740593 20.3380004,32.3040593 20.0290004,32.5300593 L10.66,39.3360595 C10.395,39.5270595 10.239,39.8340595 10.239,40.1600595 C10.239,40.4850595 10.395,40.7920595 10.6589999,40.9830595 L20.0289998,47.7900597 C20.2069998,47.9190597 20.4159998,47.9840597 20.6269998,47.9840597 C20.7849998,47.9840597 20.9429998,47.9470597 21.0899998,47.8740597 C21.4299998,47.7000597 21.6459998,47.3490597 21.6459998,46.9660597 L21.6459998,42.5370598 L42.3679999,42.5370598 C48.1690001,42.5370598 52.8889998,37.8160596 52.8889998,32.0160599 L52.8889998,24.08706 C52.8890076,22.7750244 51.8250122,21.7110596 50.5130005,21.7110596 C49.2010005,21.7110596 48.1380005,22.7750596 48.1380005,24.0860596 Z M48.1380005,24.0860596" id="Shape" fill="url(#radialGradient-1)"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/repeat-off-pressed.svg b/data/images/repeat-off-pressed.svg
deleted file mode 100644
index 405bb2877..000000000
--- a/data/images/repeat-off-pressed.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="73px" height="54px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>repeat-off-pressed</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="Group" fill="rgb(81,91,21)">
-            <path d="M34.6940002,18.3170166 L34.6940002,22.7480168 C34.6940002,23.1300168 34.9090002,23.4800168 35.2500002,23.6540169 C35.3956046,23.7283135 35.5550002,23.7650169 35.7130002,23.7650169 C35.9230002,23.7650169 36.1340002,23.6990169 36.3110002,23.5700169 L45.6810001,16.765017 C45.9450001,16.574017 46.1010001,16.267017 46.1010001,15.941017 C46.1010001,15.615017 45.9450001,15.308017 45.6810001,15.117017 L36.3110002,8.3120172 C36.0010002,8.08601721 35.5910002,8.05401722 35.2500002,8.2270172 C34.9074061,8.40082598 34.6940002,8.75101719 34.6940002,9.13401721 L34.6940002,13.5650174 L14.0710011,13.5650174 C8.26900101,13.5650174 3.55000114,18.2850172 3.55000114,24.0860173 L3.55000114,32.0150172 C3.55000114,33.3270173 4.61400115,34.3910172 5.92600107,34.3910172 C7.23800099,34.3910172 8.302001,33.3280172 8.302001,32.0150172 L8.302001,24.0860173 C8.302001,20.9050174 10.8900011,18.3170173 14.072001,18.3170173 L34.6940002,18.3170173 L34.6940002,18.3170173 L34.6940002,18.3170166" id="Shape" fill="rgb(61,62,61)"></path>
-            <path d="M50.5130005,21.7110596 C49.2010005,21.7110596 48.1380005,22.7750596 48.1380005,24.0860596 L48.1380005,32.0150595 C48.1380005,35.1980596 45.5500004,37.7860594 42.3680005,37.7860594 L21.6460004,37.7860594 L21.6460004,33.3530593 C21.6460004,32.9710593 21.4300004,32.6210593 21.0900004,32.4460593 C20.7500004,32.2740593 20.3380004,32.3040593 20.0290004,32.5300593 L10.66,39.3360595 C10.395,39.5270595 10.239,39.8340595 10.239,40.1600595 C10.239,40.4850595 10.395,40.7920595 10.6589999,40.9830595 L20.0289998,47.7900597 C20.2069998,47.9190597 20.4159998,47.9840597 20.6269998,47.9840597 C20.7849998,47.9840597 20.9429998,47.9470597 21.0899998,47.8740597 C21.4299998,47.7000597 21.6459998,47.3490597 21.6459998,46.9660597 L21.6459998,42.5370598 L42.3679999,42.5370598 C48.1690001,42.5370598 52.8889998,37.8160596 52.8889998,32.0160599 L52.8889998,24.08706 C52.8890076,22.7750244 51.8250122,21.7110596 50.5130005,21.7110596 L50.5130005,21.7110596 L50.5130005,21.7110596" id="Shape" fill="rgb(60,60,60)"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/repeat-off-rest.svg b/data/images/repeat-off-rest.svg
deleted file mode 100644
index 4063dce83..000000000
--- a/data/images/repeat-off-rest.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="73px" height="54px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>repeat-off-rest</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="Group" fill="rgb(81,91,21)">
-            <path d="M34.6940002,18.3170166 L34.6940002,22.7480168 C34.6940002,23.1300168 34.9090002,23.4800168 35.2500002,23.6540169 C35.3956046,23.7283135 35.5550002,23.7650169 35.7130002,23.7650169 C35.9230002,23.7650169 36.1340002,23.6990169 36.3110002,23.5700169 L45.6810001,16.765017 C45.9450001,16.574017 46.1010001,16.267017 46.1010001,15.941017 C46.1010001,15.615017 45.9450001,15.308017 45.6810001,15.117017 L36.3110002,8.3120172 C36.0010002,8.08601721 35.5910002,8.05401722 35.2500002,8.2270172 C34.9074061,8.40082598 34.6940002,8.75101719 34.6940002,9.13401721 L34.6940002,13.5650174 L14.0710011,13.5650174 C8.26900101,13.5650174 3.55000114,18.2850172 3.55000114,24.0860173 L3.55000114,32.0150172 C3.55000114,33.3270173 4.61400115,34.3910172 5.92600107,34.3910172 C7.23800099,34.3910172 8.302001,33.3280172 8.302001,32.0150172 L8.302001,24.0860173 C8.302001,20.9050174 10.8900011,18.3170173 14.072001,18.3170173 L34.6940002,18.3170173 L34.6940002,18.3170173 L34.6940002,18.3170166" id="Shape" fill="rgb(77,78,77)"></path>
-            <path d="M50.5130005,21.7110596 C49.2010005,21.7110596 48.1380005,22.7750596 48.1380005,24.0860596 L48.1380005,32.0150595 C48.1380005,35.1980596 45.5500004,37.7860594 42.3680005,37.7860594 L21.6460004,37.7860594 L21.6460004,33.3530593 C21.6460004,32.9710593 21.4300004,32.6210593 21.0900004,32.4460593 C20.7500004,32.2740593 20.3380004,32.3040593 20.0290004,32.5300593 L10.66,39.3360595 C10.395,39.5270595 10.239,39.8340595 10.239,40.1600595 C10.239,40.4850595 10.395,40.7920595 10.6589999,40.9830595 L20.0289998,47.7900597 C20.2069998,47.9190597 20.4159998,47.9840597 20.6269998,47.9840597 C20.7849998,47.9840597 20.9429998,47.9470597 21.0899998,47.8740597 C21.4299998,47.7000597 21.6459998,47.3490597 21.6459998,46.9660597 L21.6459998,42.5370598 L42.3679999,42.5370598 C48.1690001,42.5370598 52.8889998,37.8160596 52.8889998,32.0160599 L52.8889998,24.08706 C52.8890076,22.7750244 51.8250122,21.7110596 50.5130005,21.7110596 L50.5130005,21.7110596 L50.5130005,21.7110596" id="Shape" fill="rgb(77,78,77)"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/shuffle-off-pressed.svg b/data/images/shuffle-off-pressed.svg
deleted file mode 100644
index 07f4af6a4..000000000
--- a/data/images/shuffle-off-pressed.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="73px" height="54px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>shuffle-off-pressed</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="Group" fill="rgb(0,0,0)">
-            <path d="M7.95385875,20.8453176 L17.4619888,20.8453176 C17.4886192,20.8453176 18.9053584,20.8768966 20.2230323,22.2032123 C20.9132932,20.4674228 21.814467,18.9863702 22.8509236,17.7379491 C20.976141,16.3053176 18.9245322,15.7884754 17.4619888,15.7884754 L7.95385875,15.7884754 C6.54138051,15.7884754 5.39520663,16.9190017 5.39520663,18.3168964 C5.39516548,19.7136616 6.54139245,20.8453176 7.95385875,20.8453176 C7.95385875,20.8453176 6.54139245,20.8453176 7.95385875,20.8453176 L7.95385875,20.8453176" id="Shape" fill="rgb(61,62,61)"></path>
-            <path d="M41.7103572,20.8453176 L41.7103572,25.5621597 C41.7103572,25.9695281 41.9474266,26.3421597 42.3215177,26.5274228 C42.4813764,26.6063702 42.6564598,26.6453176 42.8293682,26.6453176 C43.0620877,26.6453176 43.2926322,26.5758439 43.4872901,26.4379492 L53.7921959,19.1926861 C54.0825515,18.9895282 54.2543725,18.6642651 54.2543725,18.3168966 C54.2543725,17.9695282 54.0825515,17.6432124 53.7921959,17.4400545 L43.4872901,10.1947915 C43.1479981,9.95479146 42.6945214,9.92005461 42.3215177,10.1053178 C41.9463391,10.2905809 41.7103572,10.6642652 41.7103572,11.0716336 L41.7103572,15.787423 L34.8799313,15.787423 C32.2123569,15.7884757 27.9113963,17.0779493 25.2177223,21.1663706 C25.1840106,21.2190021 25.1502989,21.2705811 25.1176747,21.3232127 C24.7816452,21.8474232 24.47389,22.4158442 24.1998465,23.033739 C24.1846218,23.0663706 24.1715721,23.0990021 24.157435,23.1316337 C23.3929406,24.8790021 22.8872651,27.0011075 22.7893924,29.5758445 C22.5044741,37.0653179 18.1611019,37.446371 17.7130623,37.4621604 L8.00626757,37.4621604 C6.56427675,37.4621604 5.39415448,38.5947919 5.39415448,39.9916342 C5.39415448,41.3884764 6.56427675,42.5200552 8.00626757,42.5200552 L17.7130623,42.5200552 C20.2022909,42.5200552 24.3716673,41.0811078 26.5705406,36.332687 C26.8576338,35.7021607 27.0762161,35.1200554 27.2665241,34.4905818 C27.2828362,34.4337397 27.2991483,34.3768975 27.3165479,34.3190028 C27.3926711,34.0516344 27.4644444,33.7768976 27.5307803,33.4947923 C27.54383,33.4379502 27.5579672,33.3832133 27.5710169,33.3253186 C27.6427902,32.9968976 27.7080386,32.6579502 27.7645873,32.3074239 C27.7743746,32.2432133 27.7841618,32.1758449 27.7917741,32.1105818 C27.8363606,31.8211081 27.8733347,31.5211081 27.9048715,31.2158449 C27.9146587,31.1158449 27.9255335,31.0168975 27.9342333,30.9147922 C27.967945,30.5400554 27.9973068,30.1568975 28.0114439,29.7590027 C28.0201437,29.5505817 28.0331934,29.349529 28.0473306,29.1505817 C28.624749,21.2295179 34.2567956,20.860994 34.8821066,20.8453176 L41.7103572,20.8453176 Z M41.7103572,20.8453176" id="Shape" fill="rgb(61,62,61)"></path>
-            <path d="M52.8026707,39.116802 L42.7086709,31.871539 C42.376323,31.631539 41.9321274,31.5978548 41.5667578,31.7831179 C41.1992578,31.9673284 40.9681056,32.33996 40.9681056,32.7494337 L40.9681056,37.4641706 L34.2817361,37.4641706 C34.1315405,37.4641706 32.0554319,37.4262759 30.2456274,35.743118 C29.6736057,37.5662759 28.8810839,39.114697 27.9447577,40.4178548 C30.1454969,41.963118 32.5592792,42.5210128 34.2796056,42.5220653 L40.9681054,42.5220653 L40.9681054,47.2378548 C40.9681054,47.6462759 41.2003228,48.0178548 41.5667575,48.203118 C41.7233445,48.2820653 41.8948445,48.3210127 42.0642141,48.3210127 C42.2921706,48.3210127 42.5179967,48.2525916 42.7086706,48.1146969 L52.8026704,40.8694339 C53.0870835,40.666276 53.2553878,40.3389075 53.2553878,39.9925917 C53.2553878,39.646276 53.0871144,39.3211092 52.8026707,39.116802 C52.8026707,39.116802 53.0871144,39.3211092 52.8026707,39.116802 L52.8026707,39.116802" id="Shape" fill="rgb(59,60,59)"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/shuffle-off-rest.svg b/data/images/shuffle-off-rest.svg
deleted file mode 100644
index d6c566a3c..000000000
--- a/data/images/shuffle-off-rest.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="73px" height="54px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>shuffle-off-rest</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="Group" fill="rgb(0,0,0)">
-            <path d="M7.95385875,20.8453176 L17.4619888,20.8453176 C17.4886192,20.8453176 18.9053584,20.8768966 20.2230323,22.2032123 C20.9132932,20.4674228 21.814467,18.9863702 22.8509236,17.7379491 C20.976141,16.3053176 18.9245322,15.7884754 17.4619888,15.7884754 L7.95385875,15.7884754 C6.54138051,15.7884754 5.39520663,16.9190017 5.39520663,18.3168964 C5.39516548,19.7136616 6.54139245,20.8453176 7.95385875,20.8453176 C7.95385875,20.8453176 6.54139245,20.8453176 7.95385875,20.8453176 L7.95385875,20.8453176" id="Shape" fill="rgb(76,77,76)"></path>
-            <path d="M34.2785897,20.8453176 L40.9670895,20.8453176 L40.9670895,25.5621597 C40.9670895,25.9695281 41.1993068,26.3421597 41.5657416,26.5274228 C41.7223286,26.6063702 41.8938286,26.6453176 42.0631981,26.6453176 C42.2911547,26.6453176 42.5169807,26.5758439 42.7076547,26.4379492 L52.8016545,19.1926861 C53.0860675,18.9895282 53.2543719,18.6642651 53.2543719,18.3168966 C53.2543719,17.9695282 53.0860675,17.6432124 52.8016545,17.4400545 L42.7076547,10.1947915 C42.3753068,9.95479146 41.9311112,9.92005461 41.5657416,10.1053178 C41.1982416,10.2905809 40.9670895,10.6642652 40.9670895,11.0716336 L40.9670895,15.787423 L34.2764589,15.787423 C31.6634805,15.7884757 27.4505458,17.0779493 24.8120021,21.1663706 C24.7789804,21.2190021 24.7459586,21.2705811 24.7140021,21.3232127 C24.38485,21.8474232 24.0833934,22.4158442 23.8149587,23.033739 C23.8000456,23.0663706 23.787263,23.0990021 23.7734152,23.1316337 C23.0245673,24.8790021 22.5292413,27.0011075 22.4333717,29.5758445 C22.1542847,37.0653179 17.8998064,37.446371 17.4609367,37.4621604 L7.9528066,37.4621604 C6.54032837,37.4621604 5.39415448,38.5947919 5.39415448,39.9916342 C5.39415448,41.3884764 6.54032837,42.5200552 7.9528066,42.5200552 L17.4609367,42.5200552 C19.8992193,42.5200552 23.9832629,41.0811078 26.1371328,36.332687 C26.1499154,36.3032133 26.1637632,36.272687 26.1765458,36.2432133 C26.4183502,35.7021607 26.6324589,35.1200554 26.8188719,34.4905818 C26.8348502,34.4337397 26.8508284,34.3768975 26.8678719,34.3190028 C26.9424371,34.0516344 27.0127415,33.7768976 27.0777197,33.4947923 C27.0905023,33.4379502 27.1043502,33.3832133 27.1171328,33.3253186 C27.1874371,32.9968976 27.2513502,32.6579502 27.3067415,32.3074239 C27.3163284,32.2432133 27.3259154,32.1758449 27.3333719,32.1105818 C27.3770458,31.8211081 27.4132632,31.5211081 27.4441545,31.2158449 C27.4537415,31.1158449 27.4643937,31.0168975 27.4729154,30.9147922 C27.5059371,30.5400554 27.534698,30.1568975 27.5485458,29.7590027 C27.5570676,29.5505817 27.5698502,29.349529 27.583698,29.1505817 L27.583698,29.1505817 C28.1492986,21.2295179 33.6660767,20.860994 34.2785897,20.8453176 C34.2785897,20.8453176 33.6660767,20.860994 34.2785897,20.8453176 L34.2785897,20.8453176" id="Shape" fill="rgb(77,78,77)"></path>
-            <path d="M52.8026707,39.116802 L42.7086709,31.871539 C42.376323,31.631539 41.9321274,31.5978548 41.5667578,31.7831179 C41.1992578,31.9673284 40.9681056,32.33996 40.9681056,32.7494337 L40.9681056,37.4641706 L34.2817361,37.4641706 C34.1315405,37.4641706 32.0554319,37.4262759 30.2456274,35.743118 C29.6736057,37.5662759 28.8810839,39.114697 27.9447577,40.4178548 C30.1454969,41.963118 32.5592792,42.5210128 34.2796056,42.5220653 L40.9681054,42.5220653 L40.9681054,47.2378548 C40.9681054,47.6462759 41.2003228,48.0178548 41.5667575,48.203118 C41.7233445,48.2820653 41.8948445,48.3210127 42.0642141,48.3210127 C42.2921706,48.3210127 42.5179967,48.2525916 42.7086706,48.1146969 L52.8026704,40.8694339 C53.0870835,40.666276 53.2553878,40.3389075 53.2553878,39.9925917 C53.2553878,39.646276 53.0871144,39.3211092 52.8026707,39.116802 C52.8026707,39.116802 53.0871144,39.3211092 52.8026707,39.116802 L52.8026707,39.116802" id="Shape" fill="rgb(76,77,76)"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/shuffle-on-pressed.svg b/data/images/shuffle-on-pressed.svg
deleted file mode 100644
index 2cc3e9808..000000000
--- a/data/images/shuffle-on-pressed.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="73px" height="54px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>shuffle-on-pressed</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="Group" fill="rgb(0,0,0)">
-            <path d="M7.95385875,20.8453176 L17.4619888,20.8453176 C17.4886192,20.8453176 18.9053584,20.8768966 20.2230323,22.2032123 C20.9132932,20.4674228 21.814467,18.9863702 22.8509236,17.7379491 C20.976141,16.3053176 18.9245322,15.7884754 17.4619888,15.7884754 L7.95385875,15.7884754 C6.54138051,15.7884754 5.39520663,16.9190017 5.39520663,18.3168964 C5.39516548,19.7136616 6.54139245,20.8453176 7.95385875,20.8453176 C7.95385875,20.8453176 6.54139245,20.8453176 7.95385875,20.8453176 L7.95385875,20.8453176" id="Shape" fill="rgb(61,62,61)"></path>
-            <path d="M41.7103572,20.8453176 L41.7103572,25.5621597 C41.7103572,25.9695281 41.9474266,26.3421597 42.3215177,26.5274228 C42.4813764,26.6063702 42.6564598,26.6453176 42.8293682,26.6453176 C43.0620877,26.6453176 43.2926322,26.5758439 43.4872901,26.4379492 L53.7921959,19.1926861 C54.0825515,18.9895282 54.2543725,18.6642651 54.2543725,18.3168966 C54.2543725,17.9695282 54.0825515,17.6432124 53.7921959,17.4400545 L43.4872901,10.1947915 C43.1479981,9.95479146 42.6945214,9.92005461 42.3215177,10.1053178 C41.9463391,10.2905809 41.7103572,10.6642652 41.7103572,11.0716336 L41.7103572,15.787423 L34.8799313,15.787423 C32.2123569,15.7884757 27.9113963,17.0779493 25.2177223,21.1663706 C25.1840106,21.2190021 25.1502989,21.2705811 25.1176747,21.3232127 C24.7816452,21.8474232 24.47389,22.4158442 24.1998465,23.033739 C24.1846218,23.0663706 24.1715721,23.0990021 24.157435,23.1316337 C23.3929406,24.8790021 22.8872651,27.0011075 22.7893924,29.5758445 C22.5044741,37.0653179 18.1611019,37.446371 17.7130623,37.4621604 L8.00626757,37.4621604 C6.56427675,37.4621604 5.39415448,38.5947919 5.39415448,39.9916342 C5.39415448,41.3884764 6.56427675,42.5200552 8.00626757,42.5200552 L17.7130623,42.5200552 C20.2022909,42.5200552 24.3716673,41.0811078 26.5705406,36.332687 C26.8576338,35.7021607 27.0762161,35.1200554 27.2665241,34.4905818 C27.2828362,34.4337397 27.2991483,34.3768975 27.3165479,34.3190028 C27.3926711,34.0516344 27.4644444,33.7768976 27.5307803,33.4947923 C27.54383,33.4379502 27.5579672,33.3832133 27.5710169,33.3253186 C27.6427902,32.9968976 27.7080386,32.6579502 27.7645873,32.3074239 C27.7743746,32.2432133 27.7841618,32.1758449 27.7917741,32.1105818 C27.8363606,31.8211081 27.8733347,31.5211081 27.9048715,31.2158449 C27.9146587,31.1158449 27.9255335,31.0168975 27.9342333,30.9147922 C27.967945,30.5400554 27.9973068,30.1568975 28.0114439,29.7590027 C28.0201437,29.5505817 28.0331934,29.349529 28.0473306,29.1505817 C28.624749,21.2295179 34.2567956,20.860994 34.8821066,20.8453176 L41.7103572,20.8453176 Z M41.7103572,20.8453176" id="Shape" fill="rgb(61,62,61)"></path>
-            <path d="M52.8026707,39.116802 L42.7086709,31.871539 C42.376323,31.631539 41.9321274,31.5978548 41.5667578,31.7831179 C41.1992578,31.9673284 40.9681056,32.33996 40.9681056,32.7494337 L40.9681056,37.4641706 L34.2817361,37.4641706 C34.1315405,37.4641706 32.0554319,37.4262759 30.2456274,35.743118 C29.6736057,37.5662759 28.8810839,39.114697 27.9447577,40.4178548 C30.1454969,41.963118 32.5592792,42.5210128 34.2796056,42.5220653 L40.9681054,42.5220653 L40.9681054,47.2378548 C40.9681054,47.6462759 41.2003228,48.0178548 41.5667575,48.203118 C41.7233445,48.2820653 41.8948445,48.3210127 42.0642141,48.3210127 C42.2921706,48.3210127 42.5179967,48.2525916 42.7086706,48.1146969 L52.8026704,40.8694339 C53.0870835,40.666276 53.2553878,40.3389075 53.2553878,39.9925917 C53.2553878,39.646276 53.0871144,39.3211092 52.8026707,39.116802 C52.8026707,39.116802 53.0871144,39.3211092 52.8026707,39.116802 L52.8026707,39.116802" id="Shape" fill="rgb(59,60,59)"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/shuffle-on-rest.svg b/data/images/shuffle-on-rest.svg
deleted file mode 100644
index 162e4bde6..000000000
--- a/data/images/shuffle-on-rest.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="73px" height="54px" viewBox="0 0 73 54" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>shuffle-on-rest</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
-            <stop stop-color="rgb(233,105,103)" offset="0%"></stop>
-            <stop stop-color="rgb(150,44,38)" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M7.95385875,20.8453176 C6.54139245,20.8453176 5.39520646,19.7136616 5.39520663,18.3168964 C5.39520663,16.9190017 6.54138051,15.7884754 7.95385875,15.7884754 L17.4619888,15.7884754 C18.9245322,15.7884754 20.976141,16.3053176 22.8509236,17.7379491 C21.814467,18.9863702 20.9132932,20.4674228 20.2230323,22.2032123 C18.9053584,20.8768966 17.4886192,20.8453176 17.4619888,20.8453176 Z M27.3333719,32.1105818 L27.3067415,32.3074239 C27.2513502,32.6579502 27.1874371,32.9968976 27.1171328,33.3253186 L27.0777197,33.4947923 C27.0127415,33.7768976 26.9424371,34.0516344 26.8678719,34.3190028 L26.8188719,34.4905818 C26.6324589,35.1200554 26.4183502,35.7021607 26.1371328,36.332687 C23.9832629,41.0811078 19.8992193,42.5200552 17.4609367,42.5200552 L7.9528066,42.5200552 C6.54032837,42.5200552 5.39415448,41.3884764 5.39415448,39.9916342 C5.39415448,38.5947919 6.54032837,37.4621604 7.9528066,37.4621604 L17.4609367,37.4621604 C17.8998064,37.446371 22.1542847,37.0653179 22.4333717,29.5758445 C22.5292413,27.0011075 23.0245673,24.8790021 23.7734152,23.1316337 L23.8149587,23.033739 C24.0833934,22.4158442 24.38485,21.8474232 24.7140021,21.3232127 L24.8120021,21.1663706 C27.4505458,17.0779493 31.6634805,15.7884757 34.2764589,15.787423 L40.9670895,15.787423 L40.9670895,11.0716336 C40.9670895,10.6642652 41.1982416,10.2905809 41.5657416,10.1053178 C41.9311112,9.92005461 42.3753068,9.95479146 42.7076547,10.1947915 L52.8016545,17.4400545 C53.0860675,17.6432124 53.2543719,17.9695282 53.2543719,18.3168966 C53.2543719,18.6642651 53.0860675,18.9895282 52.8016545,19.1926861 L42.7076547,26.4379492 C42.5169807,26.5758439 42.2911547,26.6453176 42.0631981,26.6453176 C41.8938286,26.6453176 41.7223286,26.6063702 41.5657416,26.5274228 C41.1993068,26.3421597 40.9670895,25.9695281 40.9670895,25.5621597 L40.9670895,20.8453176 L34.2785897,20.8453176 C33.6660767,20.860994 28.1492986,21.2295179 27.583698,29.1505817 C27.5698502,29.349529 27.5570676,29.5505817 27.5485458,29.7590027 C27.534698,30.1568975 27.5059371,30.5400554 27.4729154,30.9147922 C27.4643937,31.0168975 27.4537415,31.1158449 27.4441545,31.2158449 C27.4132636,31.5211048 27.3770466,31.8211016 27.3333719,32.1105818 Z M52.8026707,39.116802 C53.0871144,39.3211092 53.2553878,39.646276 53.2553878,39.9925917 C53.2553878,40.3389075 53.0870835,40.666276 52.8026704,40.8694339 L42.7086706,48.1146969 C42.5179967,48.2525916 42.2921706,48.3210127 42.0642141,48.3210127 C41.8948445,48.3210127 41.7233445,48.2820653 41.5667575,48.203118 C41.2003228,48.0178548 40.9681054,47.6462759 40.9681054,47.2378548 L40.9681054,42.5220653 L34.2796056,42.5220653 C32.5592792,42.5210128 30.1454969,41.963118 27.9447577,40.4178548 C28.8810839,39.114697 29.6736057,37.5662759 30.2456274,35.743118 C32.0554319,37.4262759 34.1315405,37.4641706 34.2817361,37.4641706 L40.9681056,37.4641706 L40.9681056,32.7494337 C40.9681056,32.33996 41.1992578,31.9673284 41.5667578,31.7831179 C41.9321274,31.5978548 42.376323,31.631539 42.7086709,31.871539 Z M52.8026707,39.116802" id="Shape" fill="url(#linearGradient-1)"></path>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/skip-pressed.svg b/data/images/skip-pressed.svg
deleted file mode 100644
index 5f99aa83b..000000000
--- a/data/images/skip-pressed.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="122px" height="122px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>skip-pressed</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <linearGradient x1="50%" y1="50%" x2="50%" y2="0%" id="linearGradient-1">
-            <stop stop-color="rgb(37,41,44)" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" stop-opacity="0.5" offset="100%"></stop>
-        </linearGradient>
-        <path d="M61,106 C85.852815,106 106,85.852815 106,61 C106,36.147185 85.852815,16 61,16 C36.147185,16 16,36.147185 16,61 C16,85.852815 36.147185,106 61,106 Z M61,121 C27.8629134,121 1,94.1370866 1,61 C1,27.8629134 27.8629134,1 61,1 C94.1370866,1 121,27.8629134 121,61 C121,94.1370866 94.1370866,121 61,121 Z M51.9776252,74.6203902 C51.4088036,75.0602053 50.6509846,75.1222969 50.0248542,74.7833805 C49.3962815,74.44317 49.0000001,73.7582485 49,73.0105371 L49,48.98887 C49,48.2411842 49.3962851,47.5562368 50.0248542,47.2166737 C50.2931087,47.0704998 50.583921,47.0000001 50.8759526,47.0000001 C51.2643121,47.0000001 51.6526714,47.1280639 51.9776252,47.379664 L59.6618979,53.2997049 L59.6618979,48.9888699 C59.6618979,48.2411842 60.058183,47.5562368 60.6861424,47.2166736 C60.9543969,47.0704998 61.2458189,47 61.5372408,47 C61.9256002,47 62.3139596,47.1280638 62.639523,47.379664 L78.2269392,59.3904975 C78.7140651,59.765634 79,60.3639119 79,61.0009971 C79,61.6374354 78.7128457,62.2370069 78.2269392,62.610203 L62.639523,74.6203901 C62.0700918,75.0602052 61.3122728,75.1222968 60.6861424,74.7833804 C60.0575733,74.4438172 59.6618979,73.758223 59.6618979,73.0098905 L59.6618979,68.7009957 Z M51.9776252,74.6203902" id="path-2"></path>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M61,121 C94.1370866,121 121,94.1370866 121,61 C121,27.8629134 94.1370866,1 61,1 C27.8629134,1 1,27.8629134 1,61 C1,94.1370866 27.8629134,121 61,121 Z M61,121" id="Oval 18" stroke="rgb(150,150,150)" stroke-width="1" fill-opacity="0.00241268382" fill="rgb(254,255,254)"></path>
-        <use id="Oval 33" stroke="rgb(150,150,150)" stroke-width="1" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
-        <use id="Oval 33-1" stroke="none" fill="none" xlink:href="#path-2"></use>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/skip-rest.svg b/data/images/skip-rest.svg
deleted file mode 100644
index 063aac30e..000000000
--- a/data/images/skip-rest.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="122px" height="122px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>skip-rest</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <linearGradient x1="50%" y1="50%" x2="50%" y2="0%" id="linearGradient-1">
-            <stop stop-color="rgb(37,41,44)" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" stop-opacity="0.5" offset="100%"></stop>
-        </linearGradient>
-        <path d="M61,106 C85.852815,106 106,85.852815 106,61 C106,36.147185 85.852815,16 61,16 C36.147185,16 16,36.147185 16,61 C16,85.852815 36.147185,106 61,106 Z M61,121 C27.8629134,121 1,94.1370866 1,61 C1,27.8629134 27.8629134,1 61,1 C94.1370866,1 121,27.8629134 121,61 C121,94.1370866 94.1370866,121 61,121 Z M51.9776252,74.6203902 C51.4088036,75.0602053 50.6509846,75.1222969 50.0248542,74.7833805 C49.3962815,74.44317 49.0000001,73.7582485 49,73.0105371 L49,48.98887 C49,48.2411842 49.3962851,47.5562368 50.0248542,47.2166737 C50.2931087,47.0704998 50.583921,47.0000001 50.8759526,47.0000001 C51.2643121,47.0000001 51.6526714,47.1280639 51.9776252,47.379664 L59.6618979,53.2997049 L59.6618979,48.9888699 C59.6618979,48.2411842 60.058183,47.5562368 60.6861424,47.2166736 C60.9543969,47.0704998 61.2458189,47 61.5372408,47 C61.9256002,47 62.3139596,47.1280638 62.639523,47.379664 L78.2269392,59.3904975 C78.7140651,59.765634 79,60.3639119 79,61.0009971 C79,61.6374354 78.7128457,62.2370069 78.2269392,62.610203 L62.639523,74.6203901 C62.0700918,75.0602052 61.3122728,75.1222968 60.6861424,74.7833804 C60.0575733,74.4438172 59.6618979,73.758223 59.6618979,73.0098905 L59.6618979,68.7009957 Z M51.9776252,74.6203902" id="path-2"></path>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M61,121 C94.1370866,121 121,94.1370866 121,61 C121,27.8629134 94.1370866,1 61,1 C27.8629134,1 1,27.8629134 1,61 C1,94.1370866 27.8629134,121 61,121 Z M61,121" id="Oval 18" stroke="rgb(150,150,150)" stroke-width="1" fill-opacity="0.5027861" fill="rgb(254,255,254)"></path>
-        <use id="Oval 33" stroke="rgb(150,150,150)" stroke-width="1" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
-        <use id="Oval 33-1" stroke="none" fill="none" xlink:href="#path-2"></use>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/resources.qrc b/resources.qrc
index a67b9bbf0..db1dbcf42 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -3,38 +3,19 @@
         <file>data/images/collection_background.png</file>
         <file>data/images/collection_background_small.png</file>
         <file>data/images/playlist_background.png</file>
-        <file>data/images/back-pressed.svg</file>
-        <file>data/images/back-rest.svg</file>
         <file>data/images/filter.svg</file>
         <file>data/images/loved.svg</file>
         <file>data/images/love.svg</file>
         <file>data/images/not-loved.svg</file>
         <file>data/images/no-album-art-placeholder.svg</file>
-        <file>data/images/no-artist-image-placeholder.svg</file>
         <file>data/images/artist-placeholder-grid.svg</file>
         <file>data/images/album-placeholder-grid.svg</file>
         <file>data/images/track-placeholder-grid.svg</file>
         <file>data/images/now-playing-speaker.svg</file>
         <file>data/images/now-playing-speaker-dark.svg</file>
-        <file>data/images/pause-pressed.svg</file>
-        <file>data/images/pause-rest.svg</file>
-        <file>data/images/play-pressed.svg</file>
-        <file>data/images/play-rest.svg</file>
         <file>data/images/playlist-icon.svg</file>
-        <file>data/images/repeat-1-on-pressed.svg</file>
-        <file>data/images/repeat-1-on-rest.svg</file>
-        <file>data/images/repeat-all-on-pressed.svg</file>
-        <file>data/images/repeat-all-on-rest.svg</file>
-        <file>data/images/repeat-off-pressed.svg</file>
-        <file>data/images/repeat-off-rest.svg</file>
         <file>data/images/shuffle.svg</file>
         <file>data/images/repeat.svg</file>
-        <file>data/images/shuffle-off-pressed.svg</file>
-        <file>data/images/shuffle-off-rest.svg</file>
-        <file>data/images/shuffle-on-pressed.svg</file>
-        <file>data/images/shuffle-on-rest.svg</file>
-        <file>data/images/skip-pressed.svg</file>
-        <file>data/images/skip-rest.svg</file>
         <file>data/images/user-avatar.svg</file>
         <file>data/images/view-toggle-active-centre.png</file>
         <file>data/images/view-toggle-active-left.png</file>
@@ -53,9 +34,7 @@
         <file>data/images/view-toggle-pressed-right.png</file>
         <file>data/images/list-add.svg</file>
         <file>data/images/list-remove.svg</file>
-        <file>data/images/arrow-up-double.svg</file>
         <file>data/images/arrow-down-double.svg</file>
-        <file>data/images/arrow-right-double.svg</file>
         <file>data/images/view-refresh.svg</file>
         <file>data/images/volume-icon-muted.svg</file>
         <file>data/images/volume-icon-full.svg</file>
@@ -117,7 +96,6 @@
         <file>data/images/closed-padlock.svg</file>
         <file>data/images/open-padlock.svg</file>
         <file>data/images/headphones.svg</file>
-        <file>data/images/no-album-no-case.svg</file>
         <file>data/images/rdio.png</file>
         <file>data/images/grooveshark.png</file>
         <file>data/images/lastfm-icon.svg</file>