From 70621353ca838cf0cb8e1a46ac829cc0d4679679 Mon Sep 17 00:00:00 2001
From: Jason Herskowitz <jherskowitz@globallistic.com>
Date: Fri, 7 Dec 2012 12:29:46 -0500
Subject: [PATCH] Change shuffle and repeat active states and more

---
 data/images/charts.svg                   | 10 +++-------
 data/images/headphones.svg               |  6 +++---
 data/images/loved.svg                    | 16 ++++++++--------
 data/images/loved_playlist.svg           | 10 +++++-----
 data/images/new-additions.svg            | 10 +++-------
 data/images/new-releases.svg             | 13 ++++++-------
 data/images/now-playing-speaker-dark.svg | 12 ++++++------
 data/images/now-playing-speaker.svg      | 17 +++++++++++------
 data/images/recently-played.svg          |  6 +++---
 data/images/repeat-1-on-pressed.svg      | 12 +++++-------
 data/images/repeat-1-on-rest.svg         | 19 +++++++++++--------
 data/images/repeat-all-on-pressed.svg    |  4 ++--
 data/images/repeat-all-on-rest.svg       | 11 ++++++++---
 data/images/shuffle-on-pressed.svg       |  6 +++---
 data/images/shuffle-on-rest.svg          | 17 +++++++++++++----
 data/images/subscribe-on.svg             |  6 +++---
 data/images/supercollection.svg          | 12 ++++++------
 17 files changed, 99 insertions(+), 88 deletions(-)

diff --git a/data/images/charts.svg b/data/images/charts.svg
index ef88fe974..24e209fa0 100644
--- a/data/images/charts.svg
+++ b/data/images/charts.svg
@@ -3,14 +3,10 @@
     <title>charts</title>
     <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
     <defs>
-        <radialGradient cx="50%" cy="25.578859%" fx="50%" fy="25.578859%" r="165.62525%" id="radialGradient-1">
-            <stop stop-color="rgb(126,199,41)" offset="0%"></stop>
-            <stop stop-color="rgb(107,201,93)" offset="100%"></stop>
-        </radialGradient>
-        <path d="M13.7301205,53.1286277 C11.7670753,53.1286277 10.1770858,51.5371147 10.1770508,49.5741004 L10.1770508,25.0653276 C10.1770508,23.1023343 11.7671188,21.5122663 13.7301107,21.5122663 L19.8863005,21.5122663 C21.8492924,21.5122663 23.4393604,23.1023343 23.4393604,25.0653276 L23.4393604,49.5741004 C23.4393604,51.5370923 21.8492924,53.1286277 19.8863005,53.1286277 Z M34.2850119,53.1286277 C32.3219667,53.1286277 30.7319772,51.5371147 30.7319436,49.5741004 L30.7319436,38.2791864 C30.7319436,36.3161944 32.3220087,34.7261265 34.2850035,34.7261265 L40.4411918,34.7261265 C42.4041838,34.7261265 43.9942517,36.3161944 43.9942517,38.2791864 L43.9942517,49.5741004 C43.9942517,51.5370923 42.4041838,53.1286277 40.4411918,53.1286277 Z M60.9960832,53.1286277 L54.8399033,53.1286277 C52.8768581,53.1286277 51.2868686,51.5371147 51.286835,49.5741004 L51.286835,8.91505513 C51.286835,6.95206281 52.8769029,5.36199522 54.8398921,5.36199522 L60.9960832,5.36199522 C62.959078,5.36199522 64.5491459,6.95206298 64.5491459,8.91505513 L64.5491459,49.5741004 C64.5491459,51.5370923 62.959078,53.1286277 60.9960832,53.1286277 Z M4.3526503,57.9619521 L71.7316266,57.9619521 C73.3451841,57.9619521 74.6563004,59.271545 74.65625,60.8866203 L74.65625,61.0921684 C74.65625,62.7071933 73.3466067,64.0168366 71.7315817,64.0168366 L4.3526503,64.0168366 C2.73762326,64.0168366 1.42798293,62.7086663 1.42798293,61.0921684 L1.42798293,60.8866203 C1.42798293,59.2715898 2.73615499,57.9619521 4.3526503,57.9619521 Z M4.3526503,57.9619521" id="path-2"></path>
+        <path d="M13.7301205,53.1286277 C11.7670753,53.1286277 10.1770858,51.5371147 10.1770508,49.5741004 L10.1770508,25.0653276 C10.1770508,23.1023343 11.7671188,21.5122663 13.7301107,21.5122663 L19.8863005,21.5122663 C21.8492924,21.5122663 23.4393604,23.1023343 23.4393604,25.0653276 L23.4393604,49.5741004 C23.4393604,51.5370923 21.8492924,53.1286277 19.8863005,53.1286277 Z M34.2850119,53.1286277 C32.3219667,53.1286277 30.7319772,51.5371147 30.7319436,49.5741004 L30.7319436,38.2791864 C30.7319436,36.3161944 32.3220087,34.7261265 34.2850035,34.7261265 L40.4411918,34.7261265 C42.4041838,34.7261265 43.9942517,36.3161944 43.9942517,38.2791864 L43.9942517,49.5741004 C43.9942517,51.5370923 42.4041838,53.1286277 40.4411918,53.1286277 Z M60.9960832,53.1286277 L54.8399033,53.1286277 C52.8768581,53.1286277 51.2868686,51.5371147 51.286835,49.5741004 L51.286835,8.91505513 C51.286835,6.95206281 52.8769029,5.36199522 54.8398921,5.36199522 L60.9960832,5.36199522 C62.959078,5.36199522 64.5491459,6.95206298 64.5491459,8.91505513 L64.5491459,49.5741004 C64.5491459,51.5370923 62.959078,53.1286277 60.9960832,53.1286277 Z M4.3526503,57.9619521 L71.7316266,57.9619521 C73.3451841,57.9619521 74.6563004,59.271545 74.65625,60.8866203 L74.65625,61.0921684 C74.65625,62.7071933 73.3466067,64.0168366 71.7315817,64.0168366 L4.3526503,64.0168366 C2.73762326,64.0168366 1.42798293,62.7086663 1.42798293,61.0921684 L1.42798293,60.8866203 C1.42798293,59.2715898 2.73615499,57.9619521 4.3526503,57.9619521 Z M4.3526503,57.9619521" id="path-1"></path>
     </defs>
     <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <use id="Shape" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
-        <use id="Shape-1" stroke="none" fill="none" xlink:href="#path-2"></use>
+        <use id="Shape" fill="rgb(111,201,14)" xlink:href="#path-1"></use>
+        <use id="Shape-1" stroke="none" fill="none" xlink:href="#path-1"></use>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/headphones.svg b/data/images/headphones.svg
index c8db543da..c4a7f8a31 100644
--- a/data/images/headphones.svg
+++ b/data/images/headphones.svg
@@ -3,9 +3,9 @@
     <title>headphones</title>
     <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
     <defs>
-        <radialGradient cx="50%" cy="0%" fx="50%" fy="0%" r="44.1207319%" id="radialGradient-1">
-            <stop stop-color="rgb(233,105,103)" offset="0%"></stop>
-            <stop stop-color="rgb(150,44,38)" offset="100%"></stop>
+        <radialGradient cx="50%" cy="44.6433738%" fx="50%" fy="44.6433738%" r="44.1207319%" id="radialGradient-1">
+            <stop stop-color="rgb(226,146,124)" offset="0%"></stop>
+            <stop stop-color="rgb(230,66,56)" offset="100%"></stop>
         </radialGradient>
         <path d="M22.9489994,3 C35.6030006,3 45.8990002,13.3579998 45.8990002,26.0900002 C45.8990002,30.10709 44.8480053,34.0531349 42.8749985,37.5289989 L42.8749985,40.066999 C42.8749985,40.9539864 42.3148781,41.7097526 41.5294123,42 L35.2420579,42 C34.4561193,41.7097529 33.895999,40.9539867 33.895999,40.0669993 L33.895999,26.431999 C33.895999,25.2939991 34.8179989,24.3719991 35.9559989,24.3719991 L40.815999,24.3719991 C41.140999,24.3719991 41.444999,24.4539991 41.717999,24.5889991 C40.9559999,14.8269995 32.8329998,7.11599952 22.9499994,7.11599952 C13.0770002,7.11599952 4.95700002,14.8149999 4.185,24.5669997 C4.44700003,24.4439997 4.73800001,24.3719997 5.046,24.3719997 L9.90600014,24.3719997 C11.0430002,24.3719997 11.9650002,25.2939997 11.9650002,26.4319997 L11.9650002,40.0669999 C11.9650002,41.2049999 11.0430001,42.1269999 9.90600014,42.1269999 L5.046,42.1269999 C3.90800005,42.1269999 2.98600006,41.2049999 2.98600006,40.0669999 L2.98600006,37.4549999 C1.03699994,33.9960003 0,30.0800002 0,26.0900002 C0,13.3570004 10.2959995,3 22.9489994,3 Z M22.9489994,3" id="path-2"></path>
     </defs>
diff --git a/data/images/loved.svg b/data/images/loved.svg
index 9eefb7108..16f7b72bc 100644
--- a/data/images/loved.svg
+++ b/data/images/loved.svg
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="54px" height="53px" 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">
+<svg width="61px" height="60px" 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>loved</title>
     <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
     <defs>
-        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="211.271691%" id="radialGradient-1">
-            <stop stop-color="rgb(254,255,254)" stop-opacity="0.5" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" stop-opacity="0.5" offset="100%"></stop>
+        <radialGradient cx="50%" cy="46.764687%" fx="50%" fy="46.764687%" r="60.855037%" id="radialGradient-1">
+            <stop stop-color="rgb(150,44,38)" offset="0%"></stop>
+            <stop stop-color="rgb(233,105,103)" offset="100%"></stop>
         </radialGradient>
-        <path d="M38.9730225,12.7592135 C35.9960225,12.7592135 33.1390224,14.516259 31.1350226,17.579327 C30.3090227,18.8403498 28.9100227,19.593077 27.3950226,19.593077 C25.8770226,19.593077 24.4790227,18.839327 23.6550226,17.5772816 C21.6530225,14.5203497 18.8030224,12.7653498 15.8350224,12.7653498 C12.0650225,12.7653498 8.24702263,15.6136454 8.24702263,21.0586455 C8.24702263,27.6920546 15.2200227,33.305805 20.3110228,37.40285 C22.7020228,39.3317136 24.4340229,40.6776226 25.5790229,41.5684181 C26.2490229,42.0910317 26.8330228,42.5461454 27.3620229,42.9664863 C28.4130229,42.1104635 29.706023,41.1092136 31.512023,39.7080771 L34.5240231,37.368077 C40.340023,32.8476223 46.545023,27.477282 46.545023,20.9625084 C46.5449829,15.5778309 42.7360229,12.7592135 38.9730225,12.7592135 L38.9730225,12.7592135 L38.9730225,12.7592135" id="path-2"></path>
+        <path d="M44.2226347,8.16248946 C40.6619092,8.16248946 37.244713,10.5442623 34.8477722,14.696421 C33.8598114,16.4058074 32.1864978,17.426171 30.3744388,17.426171 C28.5587918,17.426171 26.8866743,16.404421 25.9011055,14.6936483 C23.5065564,10.5498073 20.0977327,8.17080753 16.5477719,8.17080753 C12.0385563,8.17080753 7.47192903,12.0318304 7.47192903,19.4128305 C7.47192903,28.4047852 15.812184,36.0145356 21.9014194,41.5683077 C24.7612429,44.1829896 26.8328509,46.007444 28.2023607,47.2149668 C29.0037333,47.9233986 29.702243,48.5403304 30.3349685,49.1101258 C31.592047,47.9497395 33.1385765,46.5924895 35.2986941,44.6931711 L38.9012825,41.521171 C45.8576746,35.3934436 53.2793412,28.1136489 53.2793412,19.2825114 C53.2792933,11.9832819 48.7234784,8.16248946 44.2226347,8.16248946 L44.2226347,8.16248946 L44.2226347,8.16248946" id="path-2"></path>
     </defs>
     <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
         <g id="Group" fill="rgb(0,0,0)">
-            <use id="Shape" fill="rgb(233,63,51)" xlink:href="#path-2"></use>
-            <use id="Shape-1" stroke="none" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
-            <path d="M38.9730225,6.77728271 C34.5670223,6.77728271 30.4710226,8.87898733 27.3950224,12.70501 C24.3230224,8.88205553 20.2350225,6.78341912 15.8340225,6.78341912 C9.32002258,6.78341912 2.3960228,11.7866011 2.3960228,21.0596687 C2.3960228,30.5986457 10.6670227,37.2566005 16.7070227,42.1176234 C18.9940226,43.9626235 20.6720226,45.2696689 22.0370226,46.3333055 C24.1930225,48.0136464 25.2750225,48.8563737 26.4430227,50.0427374 C26.6950227,50.3025101 27.0350227,50.4456919 27.3940227,50.4456919 C27.7530227,50.4456919 28.0910227,50.3035329 28.3470227,50.0437601 C29.8900227,48.4748964 31.2900228,47.3877375 35.0440227,44.4780784 L38.0640227,42.1329648 C43.0720226,38.2404648 52.3940226,30.9944423 52.3940226,20.9655779 C52.3950195,11.748721 45.4790039,6.77728271 38.9730225,6.77728271 L38.9730225,6.77728271 L38.9730225,6.77728271 M36.4279785,39.9361434 L33.4139786,42.2771661 C30.2769785,44.7081889 28.7519784,45.8904616 27.3889785,47.1627342 C26.3949785,46.2545524 25.2869785,45.3923934 23.6719785,44.1344388 C22.3649784,43.1178479 20.6839786,41.8087571 18.3629785,39.9361434 C12.7629786,35.4300069 5.09497881,29.2578479 5.09497881,21.0596653 C5.09497881,13.5804606 10.6279788,9.54375601 15.8329787,9.54375601 C19.8699789,9.54375601 23.6749787,11.820347 26.2719789,15.7864834 C26.7509789,16.5197788 28.0379789,16.5197788 28.5159788,15.7864834 C31.1159787,11.8152335 34.9259787,9.5376196 38.9709787,9.5376196 C44.1679788,9.5376196 49.6939783,13.5426195 49.6939783,20.9645518 C49.6950073,28.9540599 42.8480225,34.9472892 36.4279785,39.9361434 C36.4279785,39.9361434 42.8480225,34.9472892 36.4279785,39.9361434 L36.4279785,39.9361434" id="Shape" fill="rgb(79,79,79)"></path>
+            <use id="Shape" stroke="rgb(254,255,254)" stroke-width="1" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
+            <use id="Shape-1" stroke="none" fill="none" xlink:href="#path-2"></use>
+            <path d="M44.2226347,0.0536499023 C38.952713,0.0536499023 34.0535761,2.90262727 30.3744385,8.08901354 C26.7000856,2.90678639 21.8105172,0.0619681423 16.546576,0.0619681423 C8.75532113,0.0619681423 0.473674325,6.84405933 0.473674325,19.4142176 C0.473674325,32.3448308 10.3664389,41.3700584 17.5907526,47.9594451 C20.3261839,50.4604451 22.3332035,52.2322179 23.9658505,53.6740363 C26.5445955,55.9518318 27.8387524,57.0941954 29.2357723,58.7023774 C29.5371841,59.0545137 29.9438507,59.2486046 30.3732428,59.2486046 C30.802635,59.2486046 31.2069095,59.0559001 31.5131056,58.7037637 C33.3586546,56.5770818 35.0331645,55.1033775 39.5232429,51.1591729 L43.1353997,47.9802411 C49.1253604,42.7037411 60.2752036,32.8813551 60.2752036,19.2866723 C60.2763959,6.79271074 52.0042988,0.0536499023 44.2226347,0.0536499023 L44.2226347,0.0536499023 L44.2226347,0.0536499023 M41.1785625,45.0023277 L37.5735822,48.1757141 C33.8214841,51.4711006 31.9974644,53.0737368 30.3672096,54.7983731 C29.1783076,53.5672822 27.8530527,52.3985777 25.921386,50.6933504 C24.3581115,49.3153049 22.3475038,47.5407596 19.5714056,45.0023277 C12.8733665,38.8940093 3.7018374,30.527305 3.7018374,19.414213 C3.7018374,9.27573545 10.3197394,3.80375814 16.5453275,3.80375814 C21.3738963,3.80375814 25.9249746,6.8898037 29.0311904,12.2661219 C29.604112,13.2601446 31.1434649,13.2601446 31.7151903,12.2661219 C34.8249942,6.88287205 39.3820529,3.7954399 44.2201903,3.7954399 C50.4362099,3.7954399 57.0457388,9.22443975 57.0457388,19.2852813 C57.0469695,30.1155035 48.8574386,38.2396587 41.1785625,45.0023277 C41.1785625,45.0023277 48.8574386,38.2396587 41.1785625,45.0023277 L41.1785625,45.0023277" id="Shape" fill="rgb(79,79,79)"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/loved_playlist.svg b/data/images/loved_playlist.svg
index 96eda1e34..78e92b687 100644
--- a/data/images/loved_playlist.svg
+++ b/data/images/loved_playlist.svg
@@ -3,15 +3,15 @@
     <title>loved_playlist</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>
+        <radialGradient cx="50%" cy="39.1449653%" fx="50%" fy="39.1449653%" r="60.855037%" id="radialGradient-1">
+            <stop stop-color="rgb(150,44,38)" offset="0%"></stop>
+            <stop stop-color="rgb(233,105,103)" offset="100%"></stop>
+        </radialGradient>
         <path d="M55.0021389,22.2169656 C49.4723594,14.3379083 42.111921,10.0126471 34.1916638,10.0126471 C22.4642834,10.0126471 10.0024792,20.3241374 10.0024792,39.4358042 C10.0024792,59.0955064 24.8907622,72.8174611 35.763115,82.8359636 C39.8798485,86.6384837 42.9003465,89.3322867 45.3556263,91.5244272 C49.2383525,94.9875871 51.1860157,96.7244366 53.286684,99.1695162 C53.7420987,99.7049042 54.3523186,100 55.0003396,100 C55.6465606,100 56.2549804,99.707012 56.7139953,99.171624 C59.4914854,95.9382172 62.0133673,93.6975973 68.7707865,87.7008293 L74.205163,82.8675819 C83.2198554,74.8451921 100,59.9112378 100,39.2418842 C100.001727,20.2461957 87.5543621,10 75.8432154,10 C67.9121578,10 60.5373182,14.3315847 55.0021389,22.2169656 Z M55.0021389,22.2169656" id="path-2"></path>
     </defs>
     <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
         <g id="Group">
-            <use id="Shape" stroke="rgb(254,255,254)" stroke-width="2" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <use id="Shape" stroke="rgb(254,255,254)" stroke-width="1" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
             <use id="Shape-1" stroke="none" fill="none" xlink:href="#path-2"></use>
         </g>
     </g>
diff --git a/data/images/new-additions.svg b/data/images/new-additions.svg
index acb39f13e..f1f072395 100644
--- a/data/images/new-additions.svg
+++ b/data/images/new-additions.svg
@@ -3,14 +3,10 @@
     <title>new-additions</title>
     <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
     <defs>
-        <radialGradient cx="50%" cy="53.6083847%" fx="50%" fy="53.6083847%" r="77.8748035%" id="radialGradient-1">
-            <stop stop-color="rgb(243,166,51)" offset="0%"></stop>
-            <stop stop-color="rgb(236,110,51)" offset="100%"></stop>
-        </radialGradient>
-        <path d="M45.2483787,33.7077824 C44.9053787,31.7337824 44.1083787,29.6497823 43.2653786,27.4447824 C41.2633786,22.2107822 39.1933786,16.7987825 43.0373786,12.3127824 C43.1743786,12.1537824 43.1963786,11.9247824 43.0933786,11.7417824 C42.9893786,11.5587824 42.7813786,11.4567824 42.5753786,11.4947824 C36.3223789,12.5367825 33.8533785,18.7377825 32.9803784,21.9907827 C30.1093783,16.5227828 28.9243781,10.7617826 28.9243781,2.50078296 C28.9243781,2.32078295 28.8273781,2.15378296 28.6703781,2.06478297 C28.5143781,1.97678297 28.3213781,1.97778297 28.1673781,2.07178297 C23.2333781,5.03278294 22.247378,9.96678295 21.2823779,14.8357829 C21.2823779,19.3827828 20.3623779,22.775783 18.2333779,25.9577827 C17.1373779,21.9527825 14.087378,19.9197825 11.1293778,17.9477824 C10.3523778,17.4287824 9.5483778,16.8927825 8.80037777,16.3327824 C8.62237777,16.1997824 8.38037779,16.2007824 8.20237778,16.3317824 C8.02437778,16.4637824 7.95437779,16.6957824 8.03037778,16.9037824 C9.42837778,20.7497824 8.9593778,25.2537828 8.50637779,29.6087824 C7.7413778,36.9477826 6.95037779,44.5377823 14.918378,49.4377828 C16.521378,50.2387828 18.214378,50.8937828 19.950378,51.3827829 C19.995378,51.3957829 20.041378,51.4017829 20.086378,51.4017829 C20.382378,51.4017829 20.606378,51.1777829 20.606378,50.9017829 C20.606378,50.6987829 20.485378,50.5237829 20.3113781,50.4457829 C17.3013781,48.1657829 17.647378,44.8407829 18.012378,41.3217833 C18.206378,39.4527833 18.406378,37.5327833 18.083378,35.7367833 L18.200378,35.8147833 C19.811378,36.8897833 21.335378,37.9057833 21.6933781,40.0587832 C21.7263781,40.2557832 21.8743781,40.4147832 22.0683781,40.4617832 C22.2633781,40.5107832 22.467378,40.4367832 22.5873781,40.2757832 C24.0393781,38.3387832 24.6593781,36.3317832 24.650378,33.6557833 C25.077378,31.5237834 25.483378,29.4967834 27.1233781,28.1097833 C27.1883781,31.1897832 27.6283781,34.7147833 29.6453781,38.2507831 C29.7493781,38.4317831 29.9523782,38.5347831 30.1603781,38.4957831 C30.3663781,38.4627831 30.5293781,38.3057831 30.5703781,38.1007831 C30.7693781,37.1077831 31.5413781,34.1567831 33.8263782,32.990783 C32.7023782,35.3737829 33.7133782,38.0157831 34.6203782,40.3897831 C35.0463782,41.5017831 35.4473782,42.5517831 35.6163782,43.522783 C35.6883782,43.870783 35.7163782,44.222783 35.7013782,44.6617831 C35.8803782,46.932783 34.5363782,49.0037831 31.7083782,50.8157829 C31.5013782,50.9487829 31.4213782,51.2117829 31.5203782,51.4367829 C31.6013782,51.6227829 31.7833782,51.7367829 31.9783782,51.7367829 C32.0193782,51.7367829 32.0613782,51.7317829 32.1033782,51.7207829 C32.5143782,51.6147829 32.9223782,51.4957829 33.3923782,51.3347829 C41.8493425,47.1077629 45.9013445,41.9698235 45.4363787,36.1277825 C45.4743787,35.2827824 45.4123787,34.4857825 45.2483787,33.7077824 Z M45.2483787,33.7077824" id="path-2"></path>
+        <path d="M45.2483787,33.7077824 C44.9053787,31.7337824 44.1083787,29.6497823 43.2653786,27.4447824 C41.2633786,22.2107822 39.1933786,16.7987825 43.0373786,12.3127824 C43.1743786,12.1537824 43.1963786,11.9247824 43.0933786,11.7417824 C42.9893786,11.5587824 42.7813786,11.4567824 42.5753786,11.4947824 C36.3223789,12.5367825 33.8533785,18.7377825 32.9803784,21.9907827 C30.1093783,16.5227828 28.9243781,10.7617826 28.9243781,2.50078296 C28.9243781,2.32078295 28.8273781,2.15378296 28.6703781,2.06478297 C28.5143781,1.97678297 28.3213781,1.97778297 28.1673781,2.07178297 C23.2333781,5.03278294 22.247378,9.96678295 21.2823779,14.8357829 C21.2823779,19.3827828 20.3623779,22.775783 18.2333779,25.9577827 C17.1373779,21.9527825 14.087378,19.9197825 11.1293778,17.9477824 C10.3523778,17.4287824 9.5483778,16.8927825 8.80037777,16.3327824 C8.62237777,16.1997824 8.38037779,16.2007824 8.20237778,16.3317824 C8.02437778,16.4637824 7.95437779,16.6957824 8.03037778,16.9037824 C9.42837778,20.7497824 8.9593778,25.2537828 8.50637779,29.6087824 C7.7413778,36.9477826 6.95037779,44.5377823 14.918378,49.4377828 C16.521378,50.2387828 18.214378,50.8937828 19.950378,51.3827829 C19.995378,51.3957829 20.041378,51.4017829 20.086378,51.4017829 C20.382378,51.4017829 20.606378,51.1777829 20.606378,50.9017829 C20.606378,50.6987829 20.485378,50.5237829 20.3113781,50.4457829 C17.3013781,48.1657829 17.647378,44.8407829 18.012378,41.3217833 C18.206378,39.4527833 18.406378,37.5327833 18.083378,35.7367833 L18.200378,35.8147833 C19.811378,36.8897833 21.335378,37.9057833 21.6933781,40.0587832 C21.7263781,40.2557832 21.8743781,40.4147832 22.0683781,40.4617832 C22.2633781,40.5107832 22.467378,40.4367832 22.5873781,40.2757832 C24.0393781,38.3387832 24.6593781,36.3317832 24.650378,33.6557833 C25.077378,31.5237834 25.483378,29.4967834 27.1233781,28.1097833 C27.1883781,31.1897832 27.6283781,34.7147833 29.6453781,38.2507831 C29.7493781,38.4317831 29.9523782,38.5347831 30.1603781,38.4957831 C30.3663781,38.4627831 30.5293781,38.3057831 30.5703781,38.1007831 C30.7693781,37.1077831 31.5413781,34.1567831 33.8263782,32.990783 C32.7023782,35.3737829 33.7133782,38.0157831 34.6203782,40.3897831 C35.0463782,41.5017831 35.4473782,42.5517831 35.6163782,43.522783 C35.6883782,43.870783 35.7163782,44.222783 35.7013782,44.6617831 C35.8803782,46.932783 34.5363782,49.0037831 31.7083782,50.8157829 C31.5013782,50.9487829 31.4213782,51.2117829 31.5203782,51.4367829 C31.6013782,51.6227829 31.7833782,51.7367829 31.9783782,51.7367829 C32.0193782,51.7367829 32.0613782,51.7317829 32.1033782,51.7207829 C32.5143782,51.6147829 32.9223782,51.4957829 33.3923782,51.3347829 C41.8493425,47.1077629 45.9013445,41.9698235 45.4363787,36.1277825 C45.4743787,35.2827824 45.4123787,34.4857825 45.2483787,33.7077824 Z M45.2483787,33.7077824" id="path-1"></path>
     </defs>
     <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <use id="Shape" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
-        <use id="Shape-1" stroke="none" fill="none" xlink:href="#path-2"></use>
+        <use id="Shape" fill="rgb(239,140,51)" xlink:href="#path-1"></use>
+        <use id="Shape-1" stroke="none" fill="none" xlink:href="#path-1"></use>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/new-releases.svg b/data/images/new-releases.svg
index 3ffcd03b1..7a2dc4084 100644
--- a/data/images/new-releases.svg
+++ b/data/images/new-releases.svg
@@ -3,16 +3,15 @@
     <title>new-releases</title>
     <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
     <defs>
-        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="50%" id="radialGradient-1">
-            <stop stop-color="rgb(92,165,233)" offset="0%"></stop>
-            <stop stop-color="rgb(99,173,249)" offset="100%"></stop>
+        <radialGradient cx="50%" cy="53.6083847%" fx="50%" fy="53.6083847%" r="48.6437738%" id="radialGradient-1">
+            <stop stop-color="rgb(239,141,51)" offset="0%"></stop>
+            <stop stop-color="rgb(246,187,50)" offset="100%"></stop>
         </radialGradient>
-        <path d="M48.7129995,21.6340195 L44.8359994,19.2480196 L46.7349994,15.1130193 C46.9529994,14.6380194 46.9359994,14.0880194 46.6889994,13.6270194 C46.4419994,13.1640194 45.9949994,12.8460194 45.4769994,12.7620194 L40.9829994,12.0430194 L41.1549995,7.49501956 C41.1759995,6.97301954 40.9499995,6.47101951 40.5449994,6.13701952 C40.1409994,5.80501953 39.6039995,5.68301952 39.0949994,5.80301952 L34.6679993,6.86001956 L33.0859993,2.59401977 C32.9029993,2.10401976 32.5029993,1.72501975 32.0029994,1.57301974 C31.5019994,1.42201975 30.9599994,1.51201974 30.5339994,1.81901975 L26.8479993,4.48701973 L23.7529993,1.15101977 C23.3969993,0.766019776 22.8829993,0.571019784 22.3609993,0.622019783 C21.8399993,0.675019782 21.3729993,0.966019794 21.0989993,1.41301979 L18.7139993,5.29001988 L14.5779992,3.39101984 C14.1029992,3.17301984 13.5529992,3.19101983 13.0909992,3.43601984 C12.6299992,3.68101984 12.3099992,4.13001984 12.2269992,4.64801985 L11.5079992,9.14001995 L6.95999934,8.97001995 C6.44299932,8.94301995 5.93499937,9.17501995 5.60299935,9.58101995 C5.27099936,9.98501997 5.14799934,10.52002 5.26899936,11.03002 L6.3239993,15.4580199 L2.05799951,17.0400199 C1.5679995,17.2220199 1.19099953,17.62202 1.03799953,18.1240199 C0.887999523,18.6240199 0.976999529,19.1670199 1.28399954,19.5910199 L3.95199952,23.2770201 L0.614999626,26.3710202 C0.230999622,26.7280201 0.0359996296,27.2430201 0.0869996287,27.7640202 C0.13899963,28.2840201 0.43099964,28.7510201 0.87699965,29.0260201 L4.75299958,31.4110201 L2.85599962,35.5460203 C2.63599962,36.0230203 2.65399962,36.5720204 2.90099962,37.0320203 C3.14699963,37.4950203 3.59499963,37.8150203 4.11199959,37.8980203 L8.60399969,38.6180203 L8.43499969,43.1650202 C8.41499969,43.6880202 8.63999969,44.1900202 9.04399972,44.5220202 C9.44999971,44.8530202 9.98499971,44.9780202 10.4949997,44.8540202 L14.9209998,43.8010202 L16.5039998,48.06702 C16.6849998,48.5570201 17.0859998,48.93402 17.5869997,49.08702 C18.0869997,49.23702 18.6319997,49.14802 19.0549998,48.84102 L22.7409999,46.17302 L25.8359999,49.50902 C26.1539999,49.85302 26.5999999,50.04602 27.0639999,50.04602 C27.1189999,50.04602 27.1719999,50.04202 27.2279999,50.03802 C27.749,49.98502 28.2149999,49.69402 28.4899999,49.24902 L30.8749999,45.3720199 L35.0110001,47.2690199 C35.486,47.4890199 36.036,47.4710199 36.497,47.2250199 C36.959,46.9790199 37.278,46.5300199 37.362,46.0120198 L38.081,41.5200197 L42.6299998,41.6920197 C43.6299998,41.6920197 44.3799998,40.9440197 44.3799998,40.0180197 C44.3799998,39.8100197 44.3419998,39.6110197 44.2729998,39.4260197 L43.2659998,35.2030196 L47.5319996,33.6200197 C48.0229996,33.4370197 48.3999996,33.0370197 48.5529997,32.5370198 C48.7029997,32.0370198 48.6129996,31.4940198 48.3059997,31.0680198 L45.6379997,27.3820197 L48.9759997,24.2880196 C49.3580017,23.9320068 49.5540009,23.4160156 49.5009995,22.8950195 C49.4499995,22.3750196 49.1589994,21.9090195 48.7129995,21.6340195 Z M48.7129995,21.6340195" id="path-2"></path>
+        <path d="M49.2034612,21.6340195 L45.3264611,19.2480196 L47.2254612,15.1130193 C47.4434612,14.6380194 47.4264612,14.0880194 47.1794612,13.6270194 C46.9324612,13.1640194 46.4854612,12.8460194 45.9674612,12.7620194 L41.4734612,12.0430194 L41.6454612,7.49501956 C41.6664612,6.97301954 41.4404612,6.47101951 41.0354612,6.13701952 C40.6314612,5.80501953 40.0944612,5.68301952 39.5854611,5.80301952 L35.1584611,6.86001956 L33.5764611,2.59401977 C33.3934611,2.10401976 32.9934611,1.72501975 32.4934611,1.57301974 C31.9924612,1.42201975 31.4504612,1.51201974 31.0244612,1.81901975 L27.338461,4.48701973 L24.243461,1.15101977 C23.887461,0.766019776 23.373461,0.571019784 22.8514611,0.622019783 C22.330461,0.675019782 21.8634611,0.966019794 21.5894611,1.41301979 L19.2044611,5.29001988 L15.0684609,3.39101984 C14.593461,3.17301984 14.043461,3.19101983 13.581461,3.43601984 C13.120461,3.68101984 12.8004609,4.13001984 12.7174609,4.64801985 L11.998461,9.14001995 L7.4504611,8.97001995 C6.93346108,8.94301995 6.42546112,9.17501995 6.0934611,9.58101995 C5.76146112,9.98501997 5.63846109,10.52002 5.75946111,11.03002 L6.81446106,15.4580199 L2.54846127,17.0400199 C2.05846126,17.2220199 1.68146128,17.62202 1.52846129,18.1240199 C1.37846128,18.6240199 1.46746128,19.1670199 1.77446129,19.5910199 L4.44246127,23.2770201 L1.10546138,26.3710202 C0.721461378,26.7280201 0.526461385,27.2430201 0.577461384,27.7640202 C0.629461385,28.2840201 0.921461396,28.7510201 1.36746141,29.0260201 L5.24346133,31.4110201 L3.34646138,35.5460203 C3.12646138,36.0230203 3.14446137,36.5720204 3.39146138,37.0320203 C3.63746139,37.4950203 4.08546139,37.8150203 4.60246135,37.8980203 L9.09446145,38.6180203 L8.92546145,43.1650202 C8.90546145,43.6880202 9.13046145,44.1900202 9.53446148,44.5220202 C9.94046146,44.8530202 10.4754615,44.9780202 10.9854615,44.8540202 L15.4114616,43.8010202 L16.9944615,48.06702 C17.1754615,48.5570201 17.5764615,48.93402 18.0774615,49.08702 C18.5774615,49.23702 19.1224614,49.14802 19.5454615,48.84102 L23.2314616,46.17302 L26.3264617,49.50902 C26.6444616,49.85302 27.0904616,50.04602 27.5544617,50.04602 C27.6094617,50.04602 27.6624617,50.04202 27.7184617,50.03802 C28.2394617,49.98502 28.7054617,49.69402 28.9804617,49.24902 L31.3654617,45.3720199 L35.5014618,47.2690199 C35.9764618,47.4890199 36.5264618,47.4710199 36.9874618,47.2250199 C37.4494618,46.9790199 37.7684618,46.5300199 37.8524618,46.0120198 L38.5714617,41.5200197 L43.1204615,41.6920197 C44.1204616,41.6920197 44.8704616,40.9440197 44.8704616,40.0180197 C44.8704616,39.8100197 44.8324616,39.6110197 44.7634616,39.4260197 L43.7564616,35.2030196 L48.0224614,33.6200197 C48.5134614,33.4370197 48.8904613,33.0370197 49.0434614,32.5370198 C49.1934614,32.0370198 49.1034614,31.4940198 48.7964614,31.0680198 L46.1284614,27.3820197 L49.4664615,24.2880196 C49.8484635,23.9320068 50.0444626,23.4160156 49.9914612,22.8950195 C49.9404612,22.3750196 49.6494612,21.9090195 49.2034612,21.6340195 Z M49.2034612,21.6340195" id="path-2"></path>
     </defs>
     <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="Group" fill="rgb(0,0,0)">
-            <path d="M23.0719986,23.0679932 C22.4859986,23.0679932 22.0049986,23.2689932 21.6299986,23.6729932 C21.2531112,24.0790264 21.0259986,24.6789932 20.9439986,25.4719932 L25.2079985,25.4719932 C25.1509985,24.6649932 24.9349985,24.0659932 24.5579985,23.6649932 C24.1843812,23.2675912 23.6869965,23.0679932 23.0719986,23.0679932 L23.0719986,23.0679932 L23.0719986,23.0679932" id="Shape" fill="rgb(111,111,111)"></path>
-            <use id="Shape" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
+        <g id="Group" fill="url(#radialGradient-1)">
+            <use id="Shape" fill="rgb(239,140,51)" xlink:href="#path-2"></use>
             <use id="Shape-1" stroke="none" fill="none" xlink:href="#path-2"></use>
         </g>
     </g>
diff --git a/data/images/now-playing-speaker-dark.svg b/data/images/now-playing-speaker-dark.svg
index 02c0f2631..dc3b856d0 100644
--- a/data/images/now-playing-speaker-dark.svg
+++ b/data/images/now-playing-speaker-dark.svg
@@ -4,24 +4,24 @@
     <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
     <defs>
         <linearGradient x1="50%" y1="-39.1231204%" x2="50%" y2="222.072246%" id="linearGradient-1">
-            <stop stop-color="rgb(85,85,85)" offset="0%"></stop>
+            <stop stop-color="rgb(67,68,67)" offset="0%"></stop>
             <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
         </linearGradient>
         <linearGradient x1="50%" y1="-39.1231204%" x2="50%" y2="222.072246%" id="linearGradient-2">
-            <stop stop-color="rgb(83,83,83)" offset="0%"></stop>
+            <stop stop-color="rgb(65,66,65)" offset="0%"></stop>
             <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
         </linearGradient>
         <linearGradient x1="50%" y1="-39.1231204%" x2="50%" y2="222.072246%" id="linearGradient-3">
-            <stop stop-color="rgb(87,88,87)" offset="0%"></stop>
-            <stop stop-color="rgb(47,47,47)" offset="45.8253235%"></stop>
+            <stop stop-color="rgb(69,70,69)" offset="0%"></stop>
+            <stop stop-color="rgb(35,35,35)" offset="45.8253235%"></stop>
             <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
         </linearGradient>
         <linearGradient x1="50%" y1="-39.1231204%" x2="50%" y2="222.072246%" id="linearGradient-4">
-            <stop stop-color="rgb(100,100,100)" offset="0%"></stop>
+            <stop stop-color="rgb(81,82,81)" offset="0%"></stop>
             <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
         </linearGradient>
     </defs>
-    <g id="Page 1" fill="rgb(223,223,223)" fill-rule="evenodd">
+    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
         <g id="Group" fill="rgb(0,0,0)">
             <path d="M34.974563,18.947998 C34.045343,19.086998 33.468023,19.7009981 33.686303,20.3189981 L33.681203,20.3199981 C34.182023,21.7209981 34.430903,23.166998 34.425803,24.6099981 C34.430903,26.0639981 34.167743,27.5229982 33.664883,28.9479979 C33.441503,29.5639979 34.031063,30.1759979 34.965383,30.3219978 C35.096963,30.3429978 35.228543,30.3509978 35.360123,30.3509978 C36.144503,30.3509978 36.858503,29.9929978 37.047203,29.4659978 C37.607183,27.8709978 37.888703,26.2399978 37.897883,24.6099979 C37.891763,22.9909979 37.611263,21.3779978 37.055363,19.7979981 C36.8319666,19.1810303 35.90479,18.802002 34.974563,18.947998 C34.974563,18.947998 35.90479,18.802002 34.974563,18.947998 L34.974563,18.947998" id="Shape" fill="url(#linearGradient-1)"></path>
             <path d="M47.4460925,9.19897461 C47.0360525,8.62297463 45.9997325,8.38197464 45.1388524,8.65097463 C44.2738925,8.91697463 43.9056725,9.59897465 44.3106125,10.1709746 L44.3024525,10.1709746 C47.5735925,14.7489747 49.2035523,19.6799744 49.2035523,24.6209744 C49.2035523,29.5639743 47.5746123,34.4979743 44.3024525,39.0749749 C43.8934325,39.6469749 44.2647125,40.3289748 45.1378325,40.5979749 C45.3765125,40.6689749 45.6253925,40.7039749 45.8671324,40.7029749 C46.5209524,40.7049749 47.1462124,40.4599749 47.4450725,40.0469749 C50.9293924,35.163975 52.6827727,29.8949744 52.6827727,24.6209752 C52.6828064,19.3530273 50.928374,14.0839844 47.4460925,9.19897461 C47.4460925,9.19897461 50.928374,14.0839844 47.4460925,9.19897461 L47.4460925,9.19897461" id="Shape" fill="url(#linearGradient-2)"></path>
diff --git a/data/images/now-playing-speaker.svg b/data/images/now-playing-speaker.svg
index 8ee243440..1f8066f46 100644
--- a/data/images/now-playing-speaker.svg
+++ b/data/images/now-playing-speaker.svg
@@ -2,13 +2,18 @@
 <svg width="54px" 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>now-playing-speaker</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">
+    <defs>
+        <radialGradient cx="55.2273095%" cy="55.2857311%" fx="55.2273095%" fy="55.2857311%" r="173.920643%" id="radialGradient-1">
+            <stop stop-color="rgb(243,247,240)" offset="0%"></stop>
+            <stop stop-color="rgb(128,128,128)" offset="100%"></stop>
+        </radialGradient>
+    </defs>
+    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
         <g id="Group" fill="rgb(0,0,0)">
-            <path d="M34.974563,18.947998 C34.045343,19.086998 33.468023,19.7009981 33.686303,20.3189981 L33.681203,20.3199981 C34.182023,21.7209981 34.430903,23.166998 34.425803,24.6099981 C34.430903,26.0639981 34.167743,27.5229982 33.664883,28.9479979 C33.441503,29.5639979 34.031063,30.1759979 34.965383,30.3219978 C35.096963,30.3429978 35.228543,30.3509978 35.360123,30.3509978 C36.144503,30.3509978 36.858503,29.9929978 37.047203,29.4659978 C37.607183,27.8709978 37.888703,26.2399978 37.897883,24.6099979 C37.891763,22.9909979 37.611263,21.3779978 37.055363,19.7979981 C36.8319666,19.1810303 35.90479,18.802002 34.974563,18.947998 C34.974563,18.947998 35.90479,18.802002 34.974563,18.947998 L34.974563,18.947998" id="Shape" fill="rgb(255,255,255)"></path>
-            <path d="M45.1388524,8.65097463 C44.2738925,8.91697463 43.9056725,9.59897465 44.3106125,10.1709746 C47.5735925,14.7489747 49.2035523,19.6799744 49.2035523,24.6209744 C49.2035523,29.5639743 47.5746123,34.4979743 44.3024525,39.0749749 C43.8934325,39.6469749 44.2647125,40.3289748 45.1378325,40.5979749 C45.3765125,40.6689749 45.6253925,40.7039749 45.8671324,40.7029749 C46.5209524,40.7049749 47.1462124,40.4599749 47.4450725,40.0469749 C50.9293924,35.163975 52.6827727,29.8949744 52.6827727,24.6209752 C52.6828064,19.3530273 50.928374,14.0839844 47.4460925,9.19897461 C47.0360525,8.62297463 45.9997325,8.38197464 45.1388524,8.65097463 Z M45.1388524,8.65097463" id="Shape" fill="rgb(255,255,255)"></path>
-            <path d="M42.8683569,15.4260254 C42.5501169,14.8270254 41.562757,14.5150254 40.6641369,14.7230254 C39.7634769,14.9250254 39.2830569,15.5770254 39.5972169,16.1730254 C41.0211369,18.8780254 41.730037,21.7370256 41.730037,24.6030257 C41.727997,27.4820257 41.004817,30.363026 39.5747771,33.0970262 C39.2616371,33.6910262 39.7420571,34.3460261 40.6488371,34.5490262 C40.8354971,34.5910262 41.025217,34.6110262 41.211877,34.6110262 C41.935057,34.6110262 42.6102971,34.3150262 42.861217,33.8400262 C44.4075371,30.8650263 45.1980369,27.737026 45.197017,24.6030257 C45.1980334,21.4909668 44.4319751,18.3780518 42.8683569,15.4260254 C42.8683569,15.4260254 44.4319751,18.3780518 42.8683569,15.4260254 L42.8683569,15.4260254" id="Shape" fill="rgb(255,255,255)"></path>
-            <path d="M14.5816932,16.280982 L3.95227371,16.280982 C3.24337372,16.280982 2.66605367,16.845982 2.66605367,17.542982 L2.66605367,32.0439824 C2.66605367,32.7399824 3.24235367,33.3049824 3.95227371,33.3049824 L14.8203734,33.3049824 C18.4699335,36.4019823 24.5399537,41.4649823 26.9451135,42.9769824 C30.0102136,44.9039824 30.4029136,41.6499823 30.4029136,41.6499823 L30.4029136,25.0769824 L30.4029136,24.3079824 L30.4029136,7.73498243 C30.4029285,7.73400879 30.0102185,4.47900391 26.9451135,6.40698242 C24.4869134,7.95198238 18.2006536,13.2089825 14.5816932,16.280982 Z M14.5816932,16.280982" id="Shape" fill="rgb(255,255,255)"></path>
+            <path d="M32.686303,23.3189981 C33.182023,24.7209981 33.430903,26.166998 33.425803,27.6099981 C33.430903,29.0639981 33.167743,30.5229982 32.664883,31.9479979 C32.441503,32.5639979 33.031063,33.1759979 33.965383,33.3219978 C34.096963,33.3429978 34.228543,33.3509978 34.360123,33.3509978 C35.144503,33.3509978 35.858503,32.9929978 36.047203,32.4659978 C36.607183,30.8709978 36.888703,29.2399978 36.897883,27.6099979 C36.891763,25.9909979 36.611263,24.3779978 36.055363,22.7979981 C35.8319666,22.1810303 34.90479,21.802002 33.974563,21.947998 C33.045343,22.086998 32.468023,22.7009981 32.686303,23.3189981 Z M32.686303,23.3189981" id="Shape" fill="url(#radialGradient-1)"></path>
+            <path d="M46.4460925,12.1989746 C46.0360525,11.6229746 44.9997325,11.3819746 44.1388524,11.6509746 C43.2738925,11.9169746 42.9056725,12.5989746 43.3106125,13.1709746 L43.3024525,13.1709746 C46.5735925,17.7489747 48.2035523,22.6799744 48.2035523,27.6209744 C48.2035523,32.5639743 46.5746123,37.4979743 43.3024525,42.0749749 C42.8934325,42.6469749 43.2647125,43.3289748 44.1378325,43.5979749 C44.3765125,43.6689749 44.6253925,43.7039749 44.8671324,43.7029749 C45.5209524,43.7049749 46.1462124,43.4599749 46.4450725,43.0469749 C49.9293924,38.163975 51.6827727,32.8949744 51.6827727,27.6209752 C51.6828064,22.3530273 49.928374,17.0839844 46.4460925,12.1989746 C46.4460925,12.1989746 49.928374,17.0839844 46.4460925,12.1989746 L46.4460925,12.1989746" id="Shape" fill="url(#radialGradient-1)"></path>
+            <path d="M41.8683569,18.4260254 C41.5501169,17.8270254 40.562757,17.5150254 39.6641369,17.7230254 C38.7634769,17.9250254 38.2830569,18.5770254 38.5972169,19.1730254 C40.0211369,21.8780254 40.730037,24.7370256 40.730037,27.6030257 C40.727997,30.4820257 40.004817,33.363026 38.5747771,36.0970262 C38.2616371,36.6910262 38.7420571,37.3460261 39.6488371,37.5490262 C39.8354971,37.5910262 40.025217,37.6110262 40.211877,37.6110262 C40.935057,37.6110262 41.6102971,37.3150262 41.861217,36.8400262 C43.4075371,33.8650263 44.1980369,30.737026 44.197017,27.6030257 C44.1980334,24.4909668 43.4319751,21.3780518 41.8683569,18.4260254 C41.8683569,18.4260254 43.4319751,21.3780518 41.8683569,18.4260254 L41.8683569,18.4260254" id="Shape" fill="url(#radialGradient-1)"></path>
+            <path d="M13.5816932,19.280982 L2.95227371,19.280982 C2.24337372,19.280982 1.66605367,19.845982 1.66605367,20.542982 L1.66605367,35.0439824 C1.66605367,35.7399824 2.24235367,36.3049824 2.95227371,36.3049824 L13.8203734,36.3049824 C17.4699335,39.4019823 23.5399537,44.4649823 25.9451135,45.9769824 C29.0102136,47.9039824 29.4029136,44.6499823 29.4029136,44.6499823 L29.4029136,28.0769824 L29.4029136,27.3079824 L29.4029136,10.7349824 C29.4029285,10.7340088 29.0102185,7.47900391 25.9451135,9.40698242 C23.4869134,10.9519824 17.2006536,16.2089825 13.5816932,19.280982 Z M13.5816932,19.280982" id="Shape" fill="url(#radialGradient-1)"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/recently-played.svg b/data/images/recently-played.svg
index 36c1c261a..4551691b4 100644
--- a/data/images/recently-played.svg
+++ b/data/images/recently-played.svg
@@ -3,9 +3,9 @@
     <title>recently-played</title>
     <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
     <defs>
-        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="83.8948071%" id="radialGradient-1">
-            <stop stop-color="rgb(80,193,251)" offset="0%"></stop>
-            <stop stop-color="rgb(76,79,123)" offset="100%"></stop>
+        <radialGradient cx="50%" cy="55.5052529%" fx="50%" fy="55.5052529%" r="55.5052519%" id="radialGradient-1">
+            <stop stop-color="rgb(83,147,174)" offset="0%"></stop>
+            <stop stop-color="rgb(80,193,251)" offset="100%"></stop>
         </radialGradient>
         <path d="M0.416038513,50.541996 C0.416038513,78.041996 22.792038,100.415997 50.2900391,100.415997 C77.7880402,100.415997 100.160038,78.041996 100.160038,50.541996 C100.157959,23.0419922 77.7879639,0.67199707 50.2900391,0.67199707 C22.7920399,0.67199707 0.416038513,23.0439968 0.416038513,50.541996 Z M0.416038513,50.541996" id="path-2"></path>
     </defs>
diff --git a/data/images/repeat-1-on-pressed.svg b/data/images/repeat-1-on-pressed.svg
index e9dfd3425..0130540a7 100644
--- a/data/images/repeat-1-on-pressed.svg
+++ b/data/images/repeat-1-on-pressed.svg
@@ -5,14 +5,12 @@
     <defs></defs>
     <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
         <g id="Group">
-            <g fill="rgb(81,91,21)">
-                <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" fill="rgb(98,106,25)"></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(98,106,25)"></path>
+            <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(81,91,21)"></path>
-            <text id="1" fill="rgb(254,255,254)" font-family="Helvetica" font-size="12" font-weight="bold">
-                <tspan x="54" y="16" fill="rgb(254,254,254)">1</tspan>
-            </text>
+            <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
index 57ca557eb..d81de3070 100644
--- a/data/images/repeat-1-on-rest.svg
+++ b/data/images/repeat-1-on-rest.svg
@@ -2,15 +2,18 @@
 <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></defs>
+    <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="rgb(121,138,29)"></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="rgb(137,150,33)"></path>
+        <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="rgb(137,150,33)"></path>
-        <text id="1" fill="rgb(254,255,254)" font-family="Helvetica" font-size="12" font-weight="bold">
-            <tspan x="54" y="16">1</tspan>
-        </text>
+        <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
index 3fd03f962..9931d38b4 100644
--- a/data/images/repeat-all-on-pressed.svg
+++ b/data/images/repeat-all-on-pressed.svg
@@ -5,8 +5,8 @@
     <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(98,106,25)"></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(98,106,25)"></path>
+            <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
index b78c8f7f7..52f202a2f 100644
--- a/data/images/repeat-all-on-rest.svg
+++ b/data/images/repeat-all-on-rest.svg
@@ -2,11 +2,16 @@
 <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></defs>
+    <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="rgb(138,153,50)"></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="rgb(138,153,50)"></path>
+            <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/shuffle-on-pressed.svg b/data/images/shuffle-on-pressed.svg
index 57fb4e1dd..2cc3e9808 100644
--- a/data/images/shuffle-on-pressed.svg
+++ b/data/images/shuffle-on-pressed.svg
@@ -5,9 +5,9 @@
     <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(96,109,22)"></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(96,109,22)"></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(96,109,22)"></path>
+            <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
index 0e7ec5cf8..5727c39f3 100644
--- a/data/images/shuffle-on-rest.svg
+++ b/data/images/shuffle-on-rest.svg
@@ -2,12 +2,21 @@
 <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-rest</title>
     <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
+    <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>
+        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="21.2684318%" id="radialGradient-2">
+            <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(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.39520646,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(109,123,28)"></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(109,123,28)"></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(109,123,28)"></path>
+            <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="url(#linearGradient-1)"></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="url(#radialGradient-2)"></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="url(#linearGradient-1)"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/subscribe-on.svg b/data/images/subscribe-on.svg
index 6aab575d7..95932bcdb 100644
--- a/data/images/subscribe-on.svg
+++ b/data/images/subscribe-on.svg
@@ -3,9 +3,9 @@
     <title>subscribe-on</title>
     <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
     <defs>
-        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="100%" id="radialGradient-1">
-            <stop stop-color="rgb(222,149,98)" offset="0%"></stop>
-            <stop stop-color="rgb(217,120,60)" offset="100%"></stop>
+        <radialGradient cx="52.0051003%" cy="43.0593083%" fx="52.0051003%" fy="43.0593083%" r="100%" id="radialGradient-1">
+            <stop stop-color="rgb(250,211,103)" offset="0%"></stop>
+            <stop stop-color="rgb(237,119,51)" offset="100%"></stop>
         </radialGradient>
         <path d="M46.8499985,19.6000036 C46.8499985,34.813804 34.5369987,47.1954035 19.4029999,47.1954035 L19.4029999,53.7418054 C38.1447983,53.7418016 53.3936005,38.4230036 53.3936005,19.6000036 L46.8499985,19.6000036 M35.2915993,19.6056036 C35.2915993,23.885404 33.6367989,27.9048036 30.6310005,30.9204038 C27.6308002,33.936004 23.6408005,35.5992044 19.3917999,35.5992044 L19.3917999,42.1428026 C31.7678013,42.1428026 41.8338013,32.0306028 41.8338013,19.6056036 L35.2916031,19.6056036 L35.2915993,19.6056036 M23.9194012,19.6350034 C21.4176006,19.6350034 19.3889999,21.6678041 19.3889999,24.1696047 C19.3889999,26.6742033 21.4176006,28.702804 23.9194012,28.702804 C26.4225998,28.702804 28.4526005,26.6742033 28.4526005,24.1696047 C28.4526005,21.6678041 26.4225998,19.6350034 23.9194012,19.6350034 M34.6126022,69.6640009 C15.5712004,69.6640009 0.137600422,54.2276033 0.137600422,35.1890062 C0.137600422,16.1462044 15.5712004,0.714004517 34.6126022,0.714004517 C53.6525993,0.714004517 69.0876007,16.1462044 69.0876007,35.1890062 C69.0876007,54.2276033 53.6525993,69.6640009 34.6126022,69.6640009" id="path-2"></path>
     </defs>
diff --git a/data/images/supercollection.svg b/data/images/supercollection.svg
index d9d42ae2d..f95015db6 100644
--- a/data/images/supercollection.svg
+++ b/data/images/supercollection.svg
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="56px" height="64px" 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">
+<svg width="55px" height="63px" 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>supercollection</title>
     <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
     <defs>
-        <radialGradient cx="44.839108%" cy="50%" fx="44.839108%" fy="50%" r="100%" id="radialGradient-1">
-            <stop stop-color="rgb(152,169,199)" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
+        <radialGradient cx="90.5947289%" cy="62.51549%" fx="90.5947289%" fy="62.51549%" r="35.5185747%" id="radialGradient-1">
+            <stop stop-color="rgb(254,255,254)" offset="0%"></stop>
+            <stop stop-color="rgb(230,89,232)" offset="100%"></stop>
         </radialGradient>
-        <path d="M1.60763874,22.4675003 C1.60763874,20.3100003 3.39131933,18.5562503 5.59259259,18.5562503 C7.79131944,18.5562503 9.57627308,20.3100003 9.57627308,22.4675003 C9.57627308,24.6300004 7.79131944,26.3800004 5.59259259,26.3800004 C3.39131948,26.3800004 1.60763874,24.6300004 1.60763874,22.4675003 Z M21.8703704,43.1300004 L20.3247685,45.9587504 C19.9708334,46.6062503 19.150926,46.8525003 18.4863426,46.5025003 C17.8268517,46.1562504 17.5773148,45.3475005 17.9312499,44.6975003 L19.4806712,41.8687503 C19.7225693,41.4225003 20.1910879,41.1650003 20.6761573,41.1650003 C20.8925925,41.1650003 21.1128471,41.2175003 21.317824,41.3250003 C21.9773148,41.6725004 22.2255787,42.4812504 21.8703704,43.1300004 Z M15.6848381,58.5425005 C15.6848381,60.7025002 13.9024306,62.4550007 11.7037037,62.4550007 C9.50243059,62.4550007 7.71874985,60.7025002 7.71874985,58.5425005 C7.71874985,56.3812504 9.50243059,54.6300004 11.7037037,54.6300004 C13.9024306,54.6300004 15.6848381,56.3812504 15.6848381,58.5425005 Z M48.625,62.3762502 C45.2829861,62.3762502 42.5584492,59.7062503 42.5584492,56.4200004 C42.5584492,55.3725004 42.8385418,54.3900004 43.3236113,53.5325004 L29.4857635,39.2750003 C28.2291663,40.0225003 26.7612263,40.4575002 25.1914349,40.4575002 C20.5928238,40.4575002 16.854861,36.7875001 16.854861,32.2750002 C16.854861,27.7650002 20.5928241,24.0937501 25.1914349,24.0937501 C25.2767359,24.0937501 25.3543979,24.1025001 25.4422451,24.1050001 L28.5334488,12.1937498 C26.8057868,11.1424998 25.6446756,9.26874989 25.6446756,7.12999964 C25.6446756,3.84499961 28.3692127,1.17499971 31.713773,1.17499971 C34.6355271,1.17499971 37.0818062,3.21415952 37.6522293,5.92089705 C37.7345264,6.31140862 37.7777777,6.7158158 37.7777777,7.12999964 C37.7777777,10.3062495 35.2314814,12.9012498 32.0409721,13.0699995 L28.9484954,24.9824991 C31.6590277,26.3324992 33.5229166,29.0924993 33.5229166,32.2749993 C33.5229166,33.9587493 33.002199,35.5262493 32.1097221,36.8274992 L45.9488423,51.0837489 C46.7560183,50.6899989 47.6637729,50.4637489 48.6249997,50.4637489 C51.9721062,50.4637489 54.6940972,53.134999 54.6940972,56.4199987 C54.6940975,59.7062503 51.9721067,62.3762502 48.625,62.3762502 Z M14.7592593,28.6300004 L11.5929398,26.9112504 C10.9347222,26.5537504 10.6953704,25.7425004 11.0607639,25.1000004 C11.3077546,24.6600004 11.7711806,24.4112504 12.2486111,24.4112504 C12.4701389,24.4112504 12.6967593,24.4650004 12.9042824,24.5775004 L16.0706019,26.2987504 C16.7288195,26.6550004 16.9668981,27.4650004 16.6040509,28.1112504 C16.2412037,28.7550004 15.4136574,28.9887504 14.7592593,28.6300004 Z M44.3866899,22.4675003 C44.3866899,20.3100003 46.1690973,18.5575002 48.3703704,18.5575002 C50.5703704,18.5575002 52.3540509,20.3100002 52.3540509,22.4675003 C52.3540509,24.6300004 50.5703704,26.3800004 48.3703704,26.3800004 C46.1690973,26.3800004 44.3866899,24.6300004 44.3866899,22.4675003 Z M17.8148148,50.1300004 L16.269213,52.9587504 C15.9152778,53.6062503 15.0953705,53.8525003 14.430787,53.5025003 C13.7712961,53.1562504 13.5217593,52.3475005 13.8756943,51.6975003 L15.4251156,48.8687503 C15.6670138,48.4225003 16.1355323,48.1650003 16.6206017,48.1650003 C16.8370369,48.1650003 17.0572916,48.2175003 17.2622684,48.3250003 C17.9217593,48.6725004 18.1700232,49.4812504 17.8148148,50.1300004 Z M41.4953704,27.1300004 L38.3481483,28.8925004 C37.6975694,29.2562504 36.8687499,29.0337504 36.4957175,28.3962504 C36.1265046,27.7550004 36.3518519,26.9425004 37.0011574,26.5762504 L40.1445604,24.8137505 C40.3609955,24.6950005 40.5888891,24.6387505 40.820602,24.6387505 C41.2891206,24.6387505 41.7474539,24.8812505 41.9982641,25.3125004 C42.3700231,25.9512504 42.1421297,26.7650004 41.4953704,27.1300004 Z M41.4953704,27.1300004" id="path-2"></path>
+        <path d="M0.607638743,22.4675003 C0.607638743,20.3100003 2.39131933,18.5562503 4.59259259,18.5562503 C6.79131944,18.5562503 8.57627308,20.3100003 8.57627308,22.4675003 C8.57627308,24.6300004 6.79131944,26.3800004 4.59259259,26.3800004 C2.39131948,26.3800004 0.607638743,24.6300004 0.607638743,22.4675003 Z M20.8703704,43.1300004 L19.3247685,45.9587504 C18.9708334,46.6062503 18.150926,46.8525003 17.4863426,46.5025003 C16.8268517,46.1562504 16.5773148,45.3475005 16.9312499,44.6975003 L18.4806712,41.8687503 C18.7225693,41.4225003 19.1910879,41.1650003 19.6761573,41.1650003 C19.8925925,41.1650003 20.1128471,41.2175003 20.317824,41.3250003 C20.9773148,41.6725004 21.2255787,42.4812504 20.8703704,43.1300004 Z M14.6848381,58.5425005 C14.6848381,60.7025002 12.9024306,62.4550007 10.7037037,62.4550007 C8.50243059,62.4550007 6.71874985,60.7025002 6.71874985,58.5425005 C6.71874985,56.3812504 8.50243059,54.6300004 10.7037037,54.6300004 C12.9024306,54.6300004 14.6848381,56.3812504 14.6848381,58.5425005 Z M47.625,62.3762502 C44.2829861,62.3762502 41.5584492,59.7062503 41.5584492,56.4200004 C41.5584492,55.3725004 41.8385418,54.3900004 42.3236113,53.5325004 L28.4857635,39.2750003 C27.2291663,40.0225003 25.7612263,40.4575002 24.1914349,40.4575002 C19.5928238,40.4575002 15.854861,36.7875001 15.854861,32.2750002 C15.854861,27.7650002 19.5928241,24.0937501 24.1914349,24.0937501 C24.2767359,24.0937501 24.3543979,24.1025001 24.4422451,24.1050001 L27.5334488,12.1937498 C25.8057868,11.1424998 24.6446756,9.26874989 24.6446756,7.12999964 C24.6446756,3.84499961 27.3692127,1.17499971 30.713773,1.17499971 C33.6355271,1.17499971 36.0818062,3.21415952 36.6522293,5.92089705 C36.7345264,6.31140862 36.7777777,6.7158158 36.7777777,7.12999964 C36.7777777,10.3062495 34.2314814,12.9012498 31.0409721,13.0699995 L27.9484954,24.9824991 C30.6590277,26.3324992 32.5229166,29.0924993 32.5229166,32.2749993 C32.5229166,33.9587493 32.002199,35.5262493 31.1097221,36.8274992 L44.9488423,51.0837489 C45.7560183,50.6899989 46.6637729,50.4637489 47.6249997,50.4637489 C50.9721062,50.4637489 53.6940972,53.134999 53.6940972,56.4199987 C53.6940975,59.7062503 50.9721067,62.3762502 47.625,62.3762502 Z M13.7592593,28.6300004 L10.5929398,26.9112504 C9.93472221,26.5537504 9.69537041,25.7425004 10.0607639,25.1000004 C10.3077546,24.6600004 10.7711806,24.4112504 11.2486111,24.4112504 C11.4701389,24.4112504 11.6967593,24.4650004 11.9042824,24.5775004 L15.0706019,26.2987504 C15.7288195,26.6550004 15.9668981,27.4650004 15.6040509,28.1112504 C15.2412037,28.7550004 14.4136574,28.9887504 13.7592593,28.6300004 Z M43.3866899,22.4675003 C43.3866899,20.3100003 45.1690973,18.5575002 47.3703704,18.5575002 C49.5703704,18.5575002 51.3540509,20.3100002 51.3540509,22.4675003 C51.3540509,24.6300004 49.5703704,26.3800004 47.3703704,26.3800004 C45.1690973,26.3800004 43.3866899,24.6300004 43.3866899,22.4675003 Z M16.8148148,50.1300004 L15.269213,52.9587504 C14.9152778,53.6062503 14.0953705,53.8525003 13.430787,53.5025003 C12.7712961,53.1562504 12.5217593,52.3475005 12.8756943,51.6975003 L14.4251156,48.8687503 C14.6670138,48.4225003 15.1355323,48.1650003 15.6206017,48.1650003 C15.8370369,48.1650003 16.0572916,48.2175003 16.2622684,48.3250003 C16.9217593,48.6725004 17.1700232,49.4812504 16.8148148,50.1300004 Z M40.4953704,27.1300004 L37.3481483,28.8925004 C36.6975694,29.2562504 35.8687499,29.0337504 35.4957175,28.3962504 C35.1265046,27.7550004 35.3518519,26.9425004 36.0011574,26.5762504 L39.1445604,24.8137505 C39.3609955,24.6950005 39.5888891,24.6387505 39.820602,24.6387505 C40.2891206,24.6387505 40.7474539,24.8812505 40.9982641,25.3125004 C41.3700231,25.9512504 41.1421297,26.7650004 40.4953704,27.1300004 Z M40.4953704,27.1300004" id="path-2"></path>
     </defs>
     <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
         <g id="Group">
-            <use id="path2722" stroke="rgb(254,255,254)" stroke-width="1" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
+            <use id="path2722" stroke="rgb(254,255,254)" stroke-width="0.5" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
             <use id="path2722-1" stroke="none" fill="none" xlink:href="#path-2"></use>
         </g>
     </g>