diff --git a/data/images/album-icon.svg b/data/images/album-icon.svg
index 1fe79b739..e85d6b304 100644
--- a/data/images/album-icon.svg
+++ b/data/images/album-icon.svg
@@ -5,8 +5,8 @@
     <defs>
         <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="70.6690133%" id="radialGradient-1">
             <stop stop-color="rgb(187,190,185)" offset="0%"></stop>
-            <stop stop-color="rgb(253,253,253)" offset="0.923389476%"></stop>
-            <stop stop-color="rgb(123,119,119)" offset="100%"></stop>
+            <stop stop-color="rgb(213,211,209)" offset="0.923389476%"></stop>
+            <stop stop-color="rgb(241,240,240)" offset="100%"></stop>
         </radialGradient>
         <path d="M179,239 C212.137087,239 239,212.137087 239,179 C239,145.862913 212.137087,119 179,119 C145.862913,119 119,145.862913 119,179 C119,212.137087 145.862913,239 179,239 Z M178.5,356 C80.4694521,356 1,276.530548 1,178.5 C1,80.4694521 80.4694521,1 178.5,1 C276.530548,1 356,80.4694521 356,178.5 C356,276.530548 276.530548,356 178.5,356 Z M178.5,356" id="path-2"></path>
     </defs>
diff --git a/data/images/automatic-playlist.svg b/data/images/automatic-playlist.svg
index 13db148fb..48913f5f7 100644
--- a/data/images/automatic-playlist.svg
+++ b/data/images/automatic-playlist.svg
@@ -10,7 +10,7 @@
     </defs>
     <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
         <g id="g2598" fill="rgb(0,0,0)">
-            <path d="M20.0684075,81.2901123 L20.9789657,80.3761627 L28.3736486,85.5563411 L26.3575333,87.5775429 C24.502504,89.429181 24.502504,92.4457232 26.354142,94.2990568 C28.2074758,96.1523906 31.2223223,96.1523906 33.0807429,94.2990568 L37.4521008,89.9260028 C43.0087105,84.3710886 43.9158777,78.5380895 44.0939198,74.0751679 C44.1176588,73.4715203 44.1312239,72.8729597 44.126137,72.2777904 C44.1227457,70.6414986 44.0396594,69.0238586 43.9599643,67.4604792 C43.8802693,65.9310126 43.8175306,64.566023 43.8073568,63.1908597 C43.8005742,62.5685601 43.8073568,61.9479562 43.8310957,61.3358304 C43.8972257,59.8487549 44.0633983,58.2497669 44.516134,56.5795623 L52.9519391,62.4854738 C50.8357813,63.3502498 48.8077968,63.6622475 46.9392023,63.7792466 C46.9561587,64.8831078 47.0172017,66.0293599 47.0799404,67.2807417 C47.1562441,68.7627304 47.2291566,70.2141976 47.2478087,71.7080559 C53.384327,71.8182724 59.8447124,70.9823223 65.7777551,65.0492805 C71.9193604,58.9059797 72.6027032,52.2065091 72.4263565,45.8834694 C72.4077045,45.2781262 72.3839656,44.6710873 72.358531,44.0742222 C72.334792,43.5638348 72.3093574,43.0619256 72.2822272,42.5634077 C72.1499673,39.9283843 72.0160118,37.203492 72.3127487,34.6159469 C72.3907481,33.9139523 72.4958778,33.2797832 72.6213551,32.67444 C72.9180919,31.2941897 73.364045,30.0071996 73.9575188,28.7829478 C73.9575188,28.7829478 79.759797,31.8201554 80.0533419,33.0525673 C80.3468867,34.2849792 77.0808863,34.5243821 75.4191598,34.919466 C75.1444662,37.2391005 75.2733348,39.7486466 75.4055946,42.4023221 L75.4496813,43.3298368 C79.8227349,43.089056 85.3674752,42.0089338 90.6561747,36.720235 L95.0326197,32.3488769 C96.8859535,30.4938476 96.8842578,27.4756096 95.0292285,25.6256675 C93.1758947,23.7689425 90.162744,23.7689425 88.3077145,25.6222762 L87.3140699,26.6176165 L79.9176915,21.4391344 L82.0219799,19.3365417 C83.873618,17.4832079 83.873618,14.4683613 82.0202843,12.6150278 C80.165255,10.7599985 77.1504084,10.7599985 75.2987703,12.6150278 L70.9240212,16.9880814 C65.3724985,22.5413 64.4619399,28.3692118 64.2838981,32.8372216 C64.2584636,33.4408692 64.2482897,34.0428211 64.251681,34.6362948 C64.2550723,36.2437608 64.3347673,37.8291835 64.4127667,39.3637372 C64.4924618,40.9101602 64.561983,42.320932 64.5721568,43.7181389 C64.5772437,44.3421341 64.5738524,44.9627381 64.5450266,45.5765594 C64.4755054,47.1518083 64.294072,48.8491431 63.7735107,50.6244775 L55.1087939,44.559176 C57.3385596,43.5943573 59.4784561,43.2552295 61.4386153,43.1314478 C61.4199633,41.9987608 61.3589203,40.8236829 61.2961816,39.6316486 C61.2232691,38.1852683 61.1469654,36.7236272 61.1334002,35.2026389 C54.9951864,35.0924223 48.5314091,35.9317638 42.5949771,41.8681967 C36.4550673,48.0081065 35.7734208,54.7024898 35.949767,61.0255295 C35.9650278,61.6376553 35.9955493,62.2396072 36.0175926,62.8415591 L36.0938963,64.350678 C36.2244606,66.9873969 36.3618074,69.7088981 36.0650705,72.2964433 C35.9853754,73.0001335 35.8819414,73.632607 35.7547685,74.2379502 C35.4495534,75.6605915 34.9883396,76.9797988 34.3677356,78.234572 L28.2159564,73.9293439 C29.6945537,73.040829 31.2528463,72.4015729 32.9569637,71.992924 C33.2333529,69.6715939 33.1044843,67.1603523 32.9722244,64.5134597 L32.9247465,63.5842494 C28.5567799,63.8216389 23.0086482,64.9017611 17.7199494,70.1921557 L13.3468958,74.5652093 C11.4901708,76.4185431 11.4935621,79.4384766 13.3468958,81.2901146 C15.2002268,83.1451418 18.2150736,83.1451418 20.0684075,81.2901123 Z M20.0684075,81.2901123" id="path2600" fill="url(#radialGradient-1)"></path>
+            <path d="M20.0684075,81.2901123 L20.9789657,80.3761627 L28.3736486,85.5563411 L26.3575333,87.5775429 C24.502504,89.429181 24.502504,92.4457232 26.354142,94.2990568 C28.2074758,96.1523906 31.2223223,96.1523906 33.0807429,94.2990568 L37.4521008,89.9260028 C43.0087105,84.3710886 43.9158777,78.5380895 44.0939198,74.0751679 C44.1176588,73.4715203 44.1312239,72.8729597 44.126137,72.2777904 C44.1227457,70.6414986 44.0396594,69.0238586 43.9599643,67.4604792 C43.8802693,65.9310126 43.8175306,64.566023 43.8073568,63.1908597 C43.8005742,62.5685601 43.8073568,61.9479562 43.8310957,61.3358304 C43.8972257,59.8487549 44.0633983,58.2497669 44.516134,56.5795623 L52.9519391,62.4854738 C50.8357813,63.3502498 48.8077968,63.6622475 46.9392023,63.7792466 C46.9561587,64.8831078 47.0172017,66.0293599 47.0799404,67.2807417 C47.1562441,68.7627304 47.2291566,70.2141976 47.2478087,71.7080559 C53.384327,71.8182724 59.8447124,70.9823223 65.7777551,65.0492805 C71.9193604,58.9059797 72.6027032,52.2065091 72.4263565,45.8834694 C72.4077045,45.2781262 72.3839656,44.6710873 72.358531,44.0742222 C72.334792,43.5638348 72.3093574,43.0619256 72.2822272,42.5634077 C72.1499673,39.9283843 72.0160118,37.203492 72.3127487,34.6159469 C72.3907481,33.9139523 72.4958778,33.2797832 72.6213551,32.67444 C72.9180919,31.2941897 73.364045,30.0071996 73.9575188,28.7829478 C73.9575188,28.7829478 79.759797,31.8201554 80.0533419,33.0525673 C80.3468867,34.2849792 77.0808863,34.5243821 75.4191598,34.919466 C75.1444662,37.2391005 75.2733348,39.7486466 75.4055946,42.4023221 L75.4496813,43.3298368 C79.8227349,43.089056 85.3674752,42.0089338 90.6561747,36.720235 L95.0326197,32.3488769 C96.8859535,30.4938476 96.8842578,27.4756096 95.0292285,25.6256675 C93.1758947,23.7689425 90.162744,23.7689425 88.3077145,25.6222762 L87.3140699,26.6176165 L79.9176915,21.4391344 L82.0219799,19.3365417 C83.873618,17.4832079 83.873618,14.4683613 82.0202843,12.6150278 C80.165255,10.7599985 77.1504084,10.7599985 75.2987703,12.6150278 L70.9240212,16.9880814 C65.3724985,22.5413 64.4619399,28.3692118 64.2838981,32.8372216 C64.2584636,33.4408692 64.2482897,34.0428211 64.251681,34.6362948 C64.2550723,36.2437608 64.3347673,37.8291835 64.4127667,39.3637372 C64.4924618,40.9101602 64.561983,42.320932 64.5721568,43.7181389 C64.5772437,44.3421341 64.5738524,44.9627381 64.5450266,45.5765594 C64.4755054,47.1518083 64.294072,48.8491431 63.7735107,50.6244775 L55.1087939,44.559176 C57.3385596,43.5943573 59.4784561,43.2552295 61.4386153,43.1314478 C61.4199633,41.9987608 61.3589203,40.8236829 61.2961816,39.6316486 C61.2232691,38.1852683 61.1469654,36.7236272 61.1334002,35.2026389 C54.9951864,35.0924223 48.5314091,35.9317638 42.5949771,41.8681967 C36.4550673,48.0081065 35.7734208,54.7024898 35.949767,61.0255295 C35.9650278,61.6376553 35.9955493,62.2396072 36.0175926,62.8415591 L36.0938963,64.350678 C36.2244606,66.9873969 36.3618074,69.7088981 36.0650705,72.2964433 C35.9853754,73.0001335 35.8819414,73.632607 35.7547685,74.2379502 C35.4495534,75.6605915 34.9883396,76.9797988 34.3677356,78.234572 L28.2159564,73.9293439 C29.6945537,73.040829 31.2528463,72.4015729 32.9569637,71.992924 C33.2333529,69.6715939 33.1044843,67.1603523 32.9722244,64.5134597 L32.9247465,63.5842494 C28.5567799,63.8216389 23.0086482,64.9017611 17.7199494,70.1921557 L13.3468958,74.5652093 C11.4901708,76.4185431 11.4935621,79.4384766 13.3468958,81.2901146 C15.2002268,83.1451418 18.2150736,83.1451418 20.0684075,81.2901123 Z M20.0684075,81.2901123" id="path2600" stroke="rgb(254,255,254)" stroke-width="2" fill="url(#radialGradient-1)"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/charts.svg b/data/images/charts.svg
index 3c2f1584f..d53fb1841 100644
--- a/data/images/charts.svg
+++ b/data/images/charts.svg
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="74px" 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">
+<svg width="75px" height="75px" 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>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(0,0,0)" offset="100%"></stop>
+            <stop stop-color="rgb(107,201,93)" offset="100%"></stop>
         </radialGradient>
-        <path d="M12.7301205,48.1286277 C10.7670753,48.1286277 9.17708582,46.5371147 9.17705081,44.5741004 L9.17705081,20.0653276 C9.17705081,18.1023343 10.7671188,16.5122663 12.7301107,16.5122663 L18.8863005,16.5122663 C20.8492924,16.5122663 22.4393604,18.1023343 22.4393604,20.0653276 L22.4393604,44.5741004 C22.4393604,46.5370923 20.8492924,48.1286277 18.8863005,48.1286277 Z M33.2850119,48.1286277 C31.3219667,48.1286277 29.7319772,46.5371147 29.7319436,44.5741004 L29.7319436,33.2791864 C29.7319436,31.3161944 31.3220087,29.7261265 33.2850035,29.7261265 L39.4411918,29.7261265 C41.4041838,29.7261265 42.9942517,31.3161944 42.9942517,33.2791864 L42.9942517,44.5741004 C42.9942517,46.5370923 41.4041838,48.1286277 39.4411918,48.1286277 Z M59.9960832,48.1286277 L53.8399033,48.1286277 C51.8768581,48.1286277 50.2868686,46.5371147 50.286835,44.5741004 L50.286835,3.91505513 C50.286835,1.95206281 51.8769029,0.36199522 53.8398921,0.36199522 L59.9960832,0.36199522 C61.959078,0.36199522 63.5491459,1.95206298 63.5491459,3.91505513 L63.5491459,44.5741004 C63.5491459,46.5370923 61.959078,48.1286277 59.9960832,48.1286277 Z M3.3526503,52.9619521 L70.7316266,52.9619521 C72.3451841,52.9619521 73.6563004,54.271545 73.65625,55.8866203 L73.65625,56.0921684 C73.65625,57.7071933 72.3466067,59.0168366 70.7315817,59.0168366 L3.3526503,59.0168366 C1.73762326,59.0168366 0.427982926,57.7086663 0.427982926,56.0921684 L0.427982926,55.8866203 C0.427982926,54.2715898 1.73615499,52.9619521 3.3526503,52.9619521 Z M3.3526503,52.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-2"></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" stroke="rgb(254,255,254)" stroke-width="2" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
         <use id="Shape-1" stroke="none" fill="none" xlink:href="#path-2"></use>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/closed-padlock.svg b/data/images/closed-padlock.svg
new file mode 100644
index 000000000..8bbfc41a1
--- /dev/null
+++ b/data/images/closed-padlock.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="52px" height="52px" 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>closed-padlock</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="M39.8569946,23.8280029 L37.4989946,23.8280029 C37.5089946,23.7290029 37.5289946,23.6340029 37.5289946,23.5330029 L37.5289946,18.4480029 C37.5289946,11.9580031 32.2489944,6.677003 25.7589941,6.677003 C19.2689939,6.677003 13.9899941,11.9570032 13.9899941,18.4480029 L13.9899941,23.5330029 C13.9899941,23.6340029 14.0099941,23.7290029 14.0199941,23.8280029 L12.628994,23.8280029 C10.464994,23.8280029 8.70399409,25.5900029 8.70399409,27.7530029 L8.70399409,46.4710033 C8.70399409,48.6360033 10.4649941,50.3970034 12.628994,50.3970034 L39.8569947,50.3970034 C42.0209947,50.3970034 43.7819946,48.6360034 43.7819946,46.4710033 L43.7819946,27.7530029 C43.7820129,25.5899658 42.0209961,23.8280029 39.8569946,23.8280029 L39.8569946,23.8280029 L39.8569946,23.8280029 M19.9979858,23.532959 L19.9979858,18.4479589 C19.9979858,15.269959 22.581986,12.6849589 25.758986,12.6849589 C28.935986,12.6849589 31.5209861,15.269959 31.5209861,18.4479589 L31.5209861,23.532959 C31.5209861,23.633959 31.5409861,23.728959 31.5509861,23.827959 L19.9679859,23.827959 C19.9779968,23.7290039 19.9979858,23.6340332 19.9979858,23.532959 C19.9979858,23.532959 19.9979858,23.6340332 19.9979858,23.532959 L19.9979858,23.532959" id="Shape" fill="rgb(103,103,103)"></path>
+            <path d="M26.2420044,36.1169434 C25.0000044,36.1169434 23.9940045,37.1239433 23.9940045,38.3649433 L23.9940045,42.6949432 L28.4920046,42.6949432 L28.4920046,38.3649433 C28.4920044,37.1240234 27.4849854,36.1169434 26.2420044,36.1169434 L26.2420044,36.1169434 L26.2420044,36.1169434" id="Shape" fill="rgb(255,255,255)"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/images/collection.svg b/data/images/collection.svg
index 682b61e4b..74d36f586 100644
--- a/data/images/collection.svg
+++ b/data/images/collection.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="74px" height="68px" 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="78px" height="72px" 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>collection</title>
     <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
     <defs>
@@ -7,10 +7,10 @@
             <stop stop-color="rgb(152,169,199)" offset="0%"></stop>
             <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
         </radialGradient>
-        <path d="M18.0049167,0 L56.9950833,0 C58.6532394,0 60,1.34389141 60,3.00166547 L60,4.99833453 C60,6.66097987 58.654653,8 56.9950833,8 L18.0049167,8 C16.3467606,8 15,6.65610859 15,4.99833453 L15,3.00166547 C15,1.33902013 16.345347,0 18.0049167,0 Z M17.5049167,15 L56.4950833,15 C58.1532394,15 59.5,16.3438914 59.5,18.0016655 L59.5,19.9983345 C59.5,21.6609799 58.154653,23 56.4950833,23 L17.5049167,23 C15.8467606,23 14.5,21.6561086 14.5,19.9983345 L14.5,18.0016655 C14.5,16.3390201 15.845347,15 17.5049167,15 Z M18.0049167,30 L56.9950833,30 C58.6532394,30 60,31.3438914 60,33.0016655 L60,34.9983345 C60,36.6609799 58.654653,38 56.9950833,38 L18.0049167,38 C16.3467606,38 15,36.6561086 15,34.9983345 L15,33.0016655 C15,31.3390201 16.345347,30 18.0049167,30 Z M17.4772685,45 L56.4674351,45 C58.1255911,45 59.4723518,46.3438914 59.4723518,48.0016655 L59.4723518,49.9983345 C59.4723518,51.6609799 58.1270047,53 56.4674351,53 L17.4772685,53 C15.8191124,53 14.4723518,51.6561086 14.4723518,49.9983345 L14.4723518,48.0016655 C14.4723518,46.3390201 15.8176988,45 17.4772685,45 Z M8.05129913,60 L65.9487009,60 L65.9487009,34.999854 C65.9487009,33.3499755 67.2897874,32 68.9441015,32 L70.5322476,32 C72.1901307,32 73.5276482,33.3430804 73.5276482,34.999854 L73.5276482,64.5444498 C73.5276482,65.4958702 73.0816863,66.3475616 72.3868662,66.8981603 C71.8693265,67.3237633 71.2063342,67.5789474 70.4835672,67.5789474 L3.51643275,67.5789474 C2.87373094,67.5789474 2.27755463,67.3758914 1.78900862,67.0303375 C0.993762261,66.4910318 0.472351765,65.5788851 0.472351765,64.5444498 L0.472351765,34.999854 C0.472351765,33.3499755 1.81343833,32 3.46775245,32 L5.05589845,32 C6.71378156,32 8.05129913,33.3430804 8.05129913,34.999854 Z M8.05129913,60" id="path-2"></path>
+        <path d="M20.0049167,2 L58.9950833,2 C60.6532394,2 62,3.34389141 62,5.00166547 L62,6.99833453 C62,8.66097987 60.654653,10 58.9950833,10 L20.0049167,10 C18.3467606,10 17,8.65610859 17,6.99833453 L17,5.00166547 C17,3.33902013 18.345347,2 20.0049167,2 Z M19.5049167,17 L58.4950833,17 C60.1532394,17 61.5,18.3438914 61.5,20.0016655 L61.5,21.9983345 C61.5,23.6609799 60.154653,25 58.4950833,25 L19.5049167,25 C17.8467606,25 16.5,23.6561086 16.5,21.9983345 L16.5,20.0016655 C16.5,18.3390201 17.845347,17 19.5049167,17 Z M20.0049167,32 L58.9950833,32 C60.6532394,32 62,33.3438914 62,35.0016655 L62,36.9983345 C62,38.6609799 60.654653,40 58.9950833,40 L20.0049167,40 C18.3467606,40 17,38.6561086 17,36.9983345 L17,35.0016655 C17,33.3390201 18.345347,32 20.0049167,32 Z M19.4772685,47 L58.4674351,47 C60.1255911,47 61.4723518,48.3438914 61.4723518,50.0016655 L61.4723518,51.9983345 C61.4723518,53.6609799 60.1270047,55 58.4674351,55 L19.4772685,55 C17.8191124,55 16.4723518,53.6561086 16.4723518,51.9983345 L16.4723518,50.0016655 C16.4723518,48.3390201 17.8176988,47 19.4772685,47 Z M10.0512991,62 L67.9487009,62 L67.9487009,36.999854 C67.9487009,35.3499755 69.2897874,34 70.9441015,34 L72.5322476,34 C74.1901307,34 75.5276482,35.3430804 75.5276482,36.999854 L75.5276482,66.5444498 C75.5276482,67.4958702 75.0816863,68.3475616 74.3868662,68.8981603 C73.8693265,69.3237633 73.2063342,69.5789474 72.4835672,69.5789474 L5.51643275,69.5789474 C4.87373094,69.5789474 4.27755463,69.3758914 3.78900862,69.0303375 C2.99376226,68.4910318 2.47235177,67.5788851 2.47235177,66.5444498 L2.47235177,36.999854 C2.47235177,35.3499755 3.81343833,34 5.46775245,34 L7.05589845,34 C8.71378156,34 10.0512991,35.3430804 10.0512991,36.999854 Z M10.0512991,62" id="path-2"></path>
     </defs>
     <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <use id="Rectangle 1" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
+        <use id="Rectangle 1" stroke="rgb(254,255,254)" stroke-width="2" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
         <use id="Rectangle 1-1" stroke="none" fill="none" xlink:href="#path-2"></use>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/dashboard.svg b/data/images/dashboard.svg
index d5cfb731d..42dba0edb 100644
--- a/data/images/dashboard.svg
+++ b/data/images/dashboard.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="51px" height="51px" 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="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>dashboard</title>
     <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
     <defs>
@@ -9,13 +9,13 @@
             <stop stop-color="rgb(129,129,129)" offset="0%"></stop>
             <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
         </radialGradient>
-        <path d="M0.910989761,28.1920242 C0.910989761,33.9540243 2.93898988,39.5620241 6.62398958,43.9850245 C6.94898957,44.3770244 7.4329896,44.6020244 7.94198954,44.6020244 L43.2639881,44.6020244 C43.7739881,44.6020244 44.2559881,44.3760244 44.5819881,43.9850245 C48.2659881,39.5620246 50.2949879,33.9540243 50.2949879,28.1920242 C50.2949829,14.5769043 39.21698,3.49902344 25.6019897,3.49902344 C11.98699,3.49902344 0.910989761,14.5770235 0.910989761,28.1920242 Z M0.910989761,28.1920242" id="path-2"></path>
+        <path d="M2.91098976,28.1920242 C2.91098976,33.9540243 4.93898988,39.5620241 8.62398958,43.9850245 C8.94898957,44.3770244 9.4329896,44.6020244 9.94198954,44.6020244 L45.2639881,44.6020244 C45.7739881,44.6020244 46.2559881,44.3760244 46.5819881,43.9850245 C50.2659881,39.5620246 52.2949879,33.9540243 52.2949879,28.1920242 C52.2949829,14.5769043 41.21698,3.49902344 27.6019897,3.49902344 C13.98699,3.49902344 2.91098976,14.5770235 2.91098976,28.1920242 Z M2.91098976,28.1920242" 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="url(#radialGradient-1)" xlink:href="#path-2"></use>
+            <use id="Shape" stroke="rgb(254,255,254)" stroke-width="2" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
             <use id="Shape-1" stroke="none" fill="none" xlink:href="#path-2"></use>
-            <path d="M34.9169866,21.8380293 C35.2319866,21.5710293 35.6349866,21.4050293 36.0799866,21.4050293 C37.0820007,21.4050293 37.894989,22.2180176 37.8939861,23.2200301 C37.8939861,23.64403 37.7429861,24.02903 37.5019861,24.34103 L28.317986,35.4180297 C28.198986,35.6020297 28.068986,35.7730297 27.890986,35.9600297 C27.3089861,36.5490297 26.4989861,36.9170297 25.6039861,36.9170297 C23.8249862,36.9170297 22.3829861,35.4740298 22.3829861,33.6960298 C22.3829861,32.5890296 22.9419862,31.6120296 23.7929861,31.0330297 Z M9.35198975,27.4318848 C9.92001343,27.4318848 10.381012,27.8920898 10.3809898,28.4608848 C10.3809898,29.0288849 9.91998976,29.4898849 9.35198975,29.4898849 L7.5729897,29.4898849 C7.00498965,29.4898849 6.54398966,29.0288848 6.54398966,28.4608848 C6.54398966,27.8918848 7.00498968,27.4318848 7.5729897,27.4318848 Z M13.1270142,14.9970703 L14.4680141,16.3370703 C14.8700141,16.7380704 14.8700141,17.3910703 14.4680141,17.7930703 C14.2660141,17.9940703 14.0030141,18.0950703 13.7400141,18.0950703 C13.4770141,18.0950703 13.2120141,17.9940703 13.0110141,17.7930703 L11.6720141,16.4540703 C11.2700141,16.0520703 11.270014,15.3990703 11.6720141,14.9970703 C12.0740142,14.5950703 12.7250142,14.5970703 13.1270142,14.9970703 Z M25.8250122,12.7929688 C25.256012,12.7929688 24.79599,12.3320312 24.7960122,11.7629688 L24.7960122,10.0609688 C24.7960122,9.49196878 25.2560122,9.03096879 25.8250122,9.03096879 C26.3940122,9.03096879 26.8550122,9.49196875 26.8550122,10.0609688 L26.8550122,11.7629688 C26.8550122,12.3319688 26.3940122,12.7929688 25.8250122,12.7929688 Z M38.3519897,15.0209961 C38.7550049,14.6169434 39.4079897,14.618996 39.8099897,15.019996 C40.2119897,15.4209961 40.2119897,16.073996 39.8099897,16.475996 L38.4939897,17.792996 C38.2919898,17.993996 38.0289898,18.094996 37.7649898,18.094996 C37.5019897,18.094996 37.2389898,17.9939961 37.0379898,17.792996 C36.6349898,17.3909961 36.6349898,16.7389961 37.0359898,16.3369961 Z M43.5960083,27.4331055 C44.1640015,27.4331055 44.625,27.894043 44.6250083,28.4621055 C44.6250083,29.0311055 44.1640083,29.4911056 43.5960083,29.4911056 L41.7420083,29.4911056 C41.1740083,29.4911056 40.7130083,29.0311055 40.7130083,28.4621055 C40.7130083,27.8941055 41.1740083,27.4331055 41.7420083,27.4331055 Z M43.5960083,27.4331055" id="Shape" fill="rgb(254,255,254)"></path>
+            <path d="M36.9169866,21.8380293 C37.2319866,21.5710293 37.6349866,21.4050293 38.0799866,21.4050293 C39.0820007,21.4050293 39.894989,22.2180176 39.8939861,23.2200301 C39.8939861,23.64403 39.7429861,24.02903 39.5019861,24.34103 L30.317986,35.4180297 C30.198986,35.6020297 30.068986,35.7730297 29.890986,35.9600297 C29.3089861,36.5490297 28.4989861,36.9170297 27.6039861,36.9170297 C25.8249862,36.9170297 24.3829861,35.4740298 24.3829861,33.6960298 C24.3829861,32.5890296 24.9419862,31.6120296 25.7929861,31.0330297 Z M11.3519897,27.4318848 C11.9200134,27.4318848 12.381012,27.8920898 12.3809898,28.4608848 C12.3809898,29.0288849 11.9199898,29.4898849 11.3519897,29.4898849 L9.5729897,29.4898849 C9.00498965,29.4898849 8.54398966,29.0288848 8.54398966,28.4608848 C8.54398966,27.8918848 9.00498968,27.4318848 9.5729897,27.4318848 Z M15.1270142,14.9970703 L16.4680141,16.3370703 C16.8700141,16.7380704 16.8700141,17.3910703 16.4680141,17.7930703 C16.2660141,17.9940703 16.0030141,18.0950703 15.7400141,18.0950703 C15.4770141,18.0950703 15.2120141,17.9940703 15.0110141,17.7930703 L13.6720141,16.4540703 C13.2700141,16.0520703 13.270014,15.3990703 13.6720141,14.9970703 C14.0740142,14.5950703 14.7250142,14.5970703 15.1270142,14.9970703 Z M27.8250122,12.7929688 C27.256012,12.7929688 26.79599,12.3320312 26.7960122,11.7629688 L26.7960122,10.0609688 C26.7960122,9.49196878 27.2560122,9.03096879 27.8250122,9.03096879 C28.3940122,9.03096879 28.8550122,9.49196875 28.8550122,10.0609688 L28.8550122,11.7629688 C28.8550122,12.3319688 28.3940122,12.7929688 27.8250122,12.7929688 Z M40.3519897,15.0209961 C40.7550049,14.6169434 41.4079897,14.618996 41.8099897,15.019996 C42.2119897,15.4209961 42.2119897,16.073996 41.8099897,16.475996 L40.4939897,17.792996 C40.2919898,17.993996 40.0289898,18.094996 39.7649898,18.094996 C39.5019897,18.094996 39.2389898,17.9939961 39.0379898,17.792996 C38.6349898,17.3909961 38.6349898,16.7389961 39.0359898,16.3369961 Z M45.5960083,27.4331055 C46.1640015,27.4331055 46.625,27.894043 46.6250083,28.4621055 C46.6250083,29.0311055 46.1640083,29.4911056 45.5960083,29.4911056 L43.7420083,29.4911056 C43.1740083,29.4911056 42.7130083,29.0311055 42.7130083,28.4621055 C42.7130083,27.8941055 43.1740083,27.4331055 43.7420083,27.4331055 Z M45.5960083,27.4331055" id="Shape" fill="rgb(254,255,254)"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/drop-all-album.svg b/data/images/drop-all-album.svg
new file mode 100644
index 000000000..c8caf31c9
--- /dev/null
+++ b/data/images/drop-all-album.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="106px" height="106px" 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>drop-all-album</title>
+    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="173.920641%" id="linearGradient-1">
+            <stop stop-color="rgb(123,125,121)" offset="0%"></stop>
+            <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
+        </linearGradient>
+        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="100%" id="radialGradient-2">
+            <stop stop-color="rgb(254,255,254)" offset="0%"></stop>
+            <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
+        </radialGradient>
+        <path d="M53.1408451,70.0422535 C62.4752357,70.0422535 70.0422535,62.4752357 70.0422535,53.1408451 C70.0422535,43.8064545 62.4752357,36.2394366 53.1408451,36.2394366 C43.8064545,36.2394366 36.2394366,43.8064545 36.2394366,53.1408451 C36.2394366,62.4752357 43.8064545,70.0422535 53.1408451,70.0422535 Z M53,103 C25.3857611,103 3,80.6142389 3,53 C3,25.3857611 25.3857611,3 53,3 C80.6142389,3 103,25.3857611 103,53 C103,65.1628884 98.6571066,76.311439 91.4374063,84.9795662 C82.2657261,95.9912818 68.4513504,103 53,103 Z M53,103" id="path-3"></path>
+    </defs>
+    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
+        <g id="Group" fill="url(#linearGradient-1)">
+            <use id="Oval 1" stroke="rgb(49,54,58)" stroke-width="6" xlink:href="#path-3"></use>
+            <use id="Oval 1-1" stroke="none" fill="none" xlink:href="#path-3"></use>
+            <path d="M53.1408451,70.0422535 C43.8064545,70.0422535 36.2394366,62.4752357 36.2394366,53.1408451 C36.2394366,43.8064545 43.8064545,36.2394366 53.1408451,36.2394366 C62.4752357,36.2394366 70.0422535,43.8064545 70.0422535,53.1408451 C70.0422535,62.4752357 62.4752357,70.0422535 53.1408451,70.0422535 Z M53.2816901,60.4647887 C57.4043793,60.4647887 60.7464789,57.1857477 60.7464789,53.1408451 C60.7464789,49.0959425 57.4043793,45.8169014 53.2816901,45.8169014 C49.159001,45.8169014 45.8169014,49.0959425 45.8169014,53.1408451 C45.8169014,57.1857477 49.159001,60.4647887 53.2816901,60.4647887 Z M53.2816901,60.4647887" id="Oval 2" stroke="rgb(150,150,150)" stroke-width="1" fill="rgb(137,137,137)"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/images/info.svg b/data/images/info.svg
index 5230327f1..b369d3c0a 100644
--- a/data/images/info.svg
+++ b/data/images/info.svg
@@ -3,7 +3,7 @@
     <title>info</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="M35.5340004,11 C22.0050001,11 11,22.0059996 11,35.5349998 C11,49.0640001 22.0050001,60.0720005 35.5340004,60.0720005 C49.0630007,60.0720005 60.0699997,49.0640001 60.0699997,35.5349998 C60.0699997,22.0059996 49.0630531,11 35.5340004,11 L35.5340004,11 L35.5340004,11 M36.2140541,18.2849731 C39.2040541,18.2849731 41.636054,20.7189732 41.636054,23.7089729 C41.636054,26.6989727 39.2040541,29.1319728 36.2140541,29.1319728 C33.2240541,29.1319728 30.7900543,26.6989727 30.7900543,23.7089729 C30.7900543,20.7189732 33.2240028,18.2849731 36.2140541,18.2849731 C36.2140541,18.2849731 33.2240028,18.2849731 36.2140541,18.2849731 L36.2140541,18.2849731 M43.6360512,50.75 C43.2080512,51.206 42.7490512,51.303 42.4390512,51.303 L29.9860511,51.303 C29.6750511,51.303 29.2150511,51.206 28.7890511,50.75 C28.4580511,50.395 28.290051,49.932 28.290051,49.374 C28.290051,48.807 28.453051,48.3319999 28.7750511,47.9649999 C29.2050511,47.4789999 29.6710511,47.3769999 29.986051,47.3769999 L31.4000511,47.3769999 L31.4000511,36.9980002 L29.986051,36.9980002 C29.675051,36.9980002 29.215051,36.9020002 28.789051,36.4450002 C28.458051,36.0900002 28.290051,35.6270002 28.290051,35.0680003 C28.290051,34.5020003 28.453051,34.0290002 28.775051,33.6620002 C29.205051,33.1740002 29.671051,33.0720003 29.986051,33.0720003 L40.4180511,33.0720003 C40.7550511,33.0720003 41.0270512,33.3440003 41.0270512,33.6790003 L41.0270512,47.3759998 L42.4390511,47.3759998 C42.7540511,47.3759998 43.2210511,47.4779998 43.6480511,47.9639998 C43.9720511,48.3309998 44.1360511,48.8059998 44.1360511,49.3729998 C44.1360512,49.9329834 43.9680214,50.3950195 43.6360512,50.75 C43.6360512,50.75 43.9680214,50.3950195 43.6360512,50.75 L43.6360512,50.75" id="Shape" fill="rgb(99,99,99)"></path>
+    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
+        <path d="M35.5340004,11 C22.0050001,11 11,22.0059996 11,35.5349998 C11,49.0640001 22.0050001,60.0720005 35.5340004,60.0720005 C49.0630007,60.0720005 60.0699997,49.0640001 60.0699997,35.5349998 C60.0699997,22.0059996 49.0630531,11 35.5340004,11 L35.5340004,11 L35.5340004,11 M36.2140541,18.2849731 C39.2040541,18.2849731 41.636054,20.7189732 41.636054,23.7089729 C41.636054,26.6989727 39.2040541,29.1319728 36.2140541,29.1319728 C33.2240541,29.1319728 30.7900543,26.6989727 30.7900543,23.7089729 C30.7900543,20.7189732 33.2240028,18.2849731 36.2140541,18.2849731 C36.2140541,18.2849731 33.2240028,18.2849731 36.2140541,18.2849731 L36.2140541,18.2849731 M43.6360512,50.75 C43.2080512,51.206 42.7490512,51.303 42.4390512,51.303 L29.9860511,51.303 C29.6750511,51.303 29.2150511,51.206 28.7890511,50.75 C28.4580511,50.395 28.290051,49.932 28.290051,49.374 C28.290051,48.807 28.453051,48.3319999 28.7750511,47.9649999 C29.2050511,47.4789999 29.6710511,47.3769999 29.986051,47.3769999 L31.4000511,47.3769999 L31.4000511,36.9980002 L29.986051,36.9980002 C29.675051,36.9980002 29.215051,36.9020002 28.789051,36.4450002 C28.458051,36.0900002 28.290051,35.6270002 28.290051,35.0680003 C28.290051,34.5020003 28.453051,34.0290002 28.775051,33.6620002 C29.205051,33.1740002 29.671051,33.0720003 29.986051,33.0720003 L40.4180511,33.0720003 C40.7550511,33.0720003 41.0270512,33.3440003 41.0270512,33.6790003 L41.0270512,47.3759998 L42.4390511,47.3759998 C42.7540511,47.3759998 43.2210511,47.4779998 43.6480511,47.9639998 C43.9720511,48.3309998 44.1360511,48.8059998 44.1360511,49.3729998 C44.1360512,49.9329834 43.9680214,50.3950195 43.6360512,50.75 C43.6360512,50.75 43.9680214,50.3950195 43.6360512,50.75 L43.6360512,50.75" id="Shape" fill="rgb(80,81,80)"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/jump-link.svg b/data/images/jump-link.svg
index 16fbe1acf..5911c4969 100644
--- a/data/images/jump-link.svg
+++ b/data/images/jump-link.svg
@@ -4,6 +4,6 @@
     <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="M19.5,39 C8.73044685,39 0,30.2695532 0,19.5 C0,8.73044685 8.73044685,0 19.5,0 C30.2695532,0 39,8.73044685 39,19.5 C39,30.2695532 30.2695532,39 19.5,39 Z M4.60662879,13.3905612 C4.30108734,13.6055851 4.11833356,13.9490738 4.11833356,14.3131718 C4.11976135,14.6779568 4.30108734,15.0193846 4.60662879,15.2337215 L13.6300961,22.8509258 C13.8499717,23.0048088 14.1133941,23.0659498 14.3753888,23.0556451 L14.3768166,23.0556451 C14.4553436,23.0522102 14.5331567,23.0460274 14.6109698,23.0261051 C14.6966356,23.0082437 14.7815876,22.9821385 14.8622562,22.9422938 C15.2591746,22.7485662 15.5090332,22.3563022 15.5090332,21.9283153 L15.5083194,18.4281657 C22.8163279,18.8911883 28.1161869,21.8980885 28.1161869,25.58647 C28.1161869,27.7710583 26.2807965,29.8574085 23.0804642,31.3096788 C22.7520785,31.4601268 22.603591,31.8304076 22.7420841,32.1539739 C22.8505942,32.4054076 23.1040223,32.5579166 23.371728,32.5579166 C23.4481133,32.5579166 23.5259265,32.546238 23.6015979,32.5201329 C30.1129145,30.2764649 34.0000016,26.4005387 34.0000016,22.1543314 C34.0000016,16.1886198 26.2522416,11.107735 15.5775657,10.0703992 C15.5540076,10.0676513 15.533305,10.077269 15.509033,10.077269 L15.5083191,8.40241815 L15.5083191,6.69665329 C15.5083191,6.60116342 15.4918998,6.5077345 15.4676278,6.41911442 C15.4612029,6.39300928 15.4519224,6.36690414 15.4454975,6.34285993 C15.4197978,6.27347522 15.3898147,6.20683842 15.3534067,6.1436365 C15.3426985,6.12440113 15.3341319,6.10447879 15.3212821,6.08661738 C15.2748797,6.01723265 15.2227664,5.94990887 15.1620864,5.89151579 C15.1563753,5.88601997 15.1513782,5.88395904 15.1456671,5.87983718 C15.0628568,5.80220874 14.9679105,5.73419798 14.862256,5.6819877 C14.4653377,5.4875731 13.9891784,5.5239829 13.629382,5.77472965 Z M4.60662879,13.3905612" id="Oval 1" fill="rgb(100,98,99)"></path>
+        <path d="M19.5,39 C8.73044685,39 0,30.2695532 0,19.5 C0,8.73044685 8.73044685,0 19.5,0 C30.2695532,0 39,8.73044685 39,19.5 C39,30.2695532 30.2695532,39 19.5,39 Z M13.6675145,5.77472965 L4.60903105,13.3905612 C4.30227965,13.6055851 4.11880217,13.9490738 4.11880217,14.3131718 C4.12023561,14.6779568 4.30227965,15.0193846 4.60903105,15.2337215 L13.6682314,22.8509258 C13.8889778,23.0048088 14.1534434,23.0659498 14.417909,23.0556451 C14.4967469,23.0522102 14.5748682,23.0460274 14.6529895,23.0261051 C14.7389945,23.0082437 14.8242829,22.9821385 14.905271,22.9422938 C15.3037611,22.7485662 15.5546092,22.3563022 15.5546092,21.9283153 L15.5538925,18.4281657 C22.890841,18.8911883 28.2116875,21.8980885 28.2116875,25.58647 C28.2116875,27.7710583 26.3690289,29.8574085 23.1560232,31.3096788 C22.8263371,31.4601268 22.6772616,31.8304076 22.8163032,32.1539739 C22.9252429,32.4054076 23.1796746,32.5579166 23.4484404,32.5579166 C23.5251283,32.5579166 23.6032495,32.546238 23.6792207,32.5201329 C30.2163222,30.2764649 34.1188022,26.4005387 34.1188022,22.1543314 C34.1188022,16.1886198 26.3403609,11.107735 15.554609,10.077269 L15.5538923,8.40241815 L15.5538923,6.69665329 C15.5538923,6.60116342 15.537408,6.5077345 15.4908219,6.34285993 C15.4650204,6.27347522 15.4349186,6.20683842 15.3661146,6.08661738 C15.3195285,6.01723265 15.2672087,5.94990887 15.1898042,5.87983718 C15.1066659,5.80220874 15.0113437,5.73419798 14.9052707,5.6819877 C14.5067806,5.4875731 14.0287358,5.5239829 13.6675145,5.77472965 Z M13.6675145,5.77472965" id="Oval 1" fill="rgb(100,98,99)"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/loved.svg b/data/images/loved.svg
index 0f2fc65e6..9eefb7108 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="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">
+<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">
     <title>loved</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>
-        <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>
+        <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>
+        <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>
     </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="url(#linearGradient-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>
+            <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>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/loved_playlist.svg b/data/images/loved_playlist.svg
index 0293c7c2a..96eda1e34 100644
--- a/data/images/loved_playlist.svg
+++ b/data/images/loved_playlist.svg
@@ -7,10 +7,12 @@
             <stop stop-color="rgb(233,105,103)" offset="0%"></stop>
             <stop stop-color="rgb(150,44,38)" offset="100%"></stop>
         </linearGradient>
-        <path d="M55.0021389,27.2169656 C49.4723594,19.3379083 42.111921,15.0126471 34.1916638,15.0126471 C22.4642834,15.0126471 10.0024792,25.3241374 10.0024792,44.4358042 C10.0024792,64.0955064 24.8907622,77.8174611 35.763115,87.8359636 C39.8798485,91.6384837 42.9003465,94.3322867 45.3556263,96.5244272 C49.2383525,99.9875871 51.1860157,101.724437 53.286684,104.169516 C53.7420987,104.704904 54.3523186,105 55.0003396,105 C55.6465606,105 56.2549804,104.707012 56.7139953,104.171624 C59.4914854,100.938217 62.0133673,98.6975973 68.7707865,92.7008293 L74.205163,87.8675819 C83.2198554,79.8451921 100,64.9112378 100,44.2418842 C100.001727,25.2461957 87.5543621,15 75.8432154,15 C67.9121578,15 60.5373182,19.3315847 55.0021389,27.2169656 Z M55.0021389,27.2169656" id="path-2"></path>
+        <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">
-        <use id="Shape" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
-        <use id="Shape-1" stroke="none" fill="none" xlink:href="#path-2"></use>
+        <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-1" stroke="none" fill="none" xlink:href="#path-2"></use>
+        </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/new-releases.svg b/data/images/new-releases.svg
index a562dce7d..4f868209f 100644
--- a/data/images/new-releases.svg
+++ b/data/images/new-releases.svg
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="50px" height="51px" 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="52px" 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">
     <title>new-releases</title>
     <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
     <defs>
-        <linearGradient x1="50%" y1="54.3443845%" x2="50%" y2="165.385118%" id="linearGradient-1">
-            <stop stop-color="rgb(138,81,252)" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
-        </linearGradient>
-        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="153.418744%" id="radialGradient-2">
-            <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="50%" fx="50%" fy="50%" r="66.9981956%" id="radialGradient-1">
+            <stop stop-color="rgb(123,80,183)" offset="0%"></stop>
+            <stop stop-color="rgb(91,68,204)" offset="100%"></stop>
+            <stop stop-color="rgb(133,112,206)" 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-3"></path>
+        <path d="M49.7129995,22.6340195 L45.8359994,20.2480196 L47.7349994,16.1130193 C47.9529994,15.6380194 47.9359994,15.0880194 47.6889994,14.6270194 C47.4419994,14.1640194 46.9949994,13.8460194 46.4769994,13.7620194 L41.9829994,13.0430194 L42.1549995,8.49501956 C42.1759995,7.97301954 41.9499995,7.47101951 41.5449994,7.13701952 C41.1409994,6.80501953 40.6039995,6.68301952 40.0949994,6.80301952 L35.6679993,7.86001956 L34.0859993,3.59401977 C33.9029993,3.10401976 33.5029993,2.72501975 33.0029994,2.57301974 C32.5019994,2.42201975 31.9599994,2.51201974 31.5339994,2.81901975 L27.8479993,5.48701973 L24.7529993,2.15101977 C24.3969993,1.76601978 23.8829993,1.57101978 23.3609993,1.62201978 C22.8399993,1.67501978 22.3729993,1.96601979 22.0989993,2.41301979 L19.7139993,6.29001988 L15.5779992,4.39101984 C15.1029992,4.17301984 14.5529992,4.19101983 14.0909992,4.43601984 C13.6299992,4.68101984 13.3099992,5.13001984 13.2269992,5.64801985 L12.5079992,10.14002 L7.95999934,9.97001995 C7.44299932,9.94301995 6.93499937,10.1750199 6.60299935,10.58102 C6.27099936,10.98502 6.14799934,11.52002 6.26899936,12.03002 L7.3239993,16.4580199 L3.05799951,18.0400199 C2.5679995,18.2220199 2.19099953,18.62202 2.03799953,19.1240199 C1.88799952,19.6240199 1.97699953,20.1670199 2.28399954,20.5910199 L4.95199952,24.2770201 L1.61499963,27.3710202 C1.23099962,27.7280201 1.03599963,28.2430201 1.08699963,28.7640202 C1.13899963,29.2840201 1.43099964,29.7510201 1.87699965,30.0260201 L5.75299958,32.4110201 L3.85599962,36.5460203 C3.63599962,37.0230203 3.65399962,37.5720204 3.90099962,38.0320203 C4.14699963,38.4950203 4.59499963,38.8150203 5.11199959,38.8980203 L9.60399969,39.6180203 L9.43499969,44.1650202 C9.41499969,44.6880202 9.63999969,45.1900202 10.0439997,45.5220202 C10.4499997,45.8530202 10.9849997,45.9780202 11.4949997,45.8540202 L15.9209998,44.8010202 L17.5039998,49.06702 C17.6849998,49.5570201 18.0859998,49.93402 18.5869997,50.08702 C19.0869997,50.23702 19.6319997,50.14802 20.0549998,49.84102 L23.7409999,47.17302 L26.8359999,50.50902 C27.1539999,50.85302 27.5999999,51.04602 28.0639999,51.04602 C28.1189999,51.04602 28.1719999,51.04202 28.2279999,51.03802 C28.749,50.98502 29.2149999,50.69402 29.4899999,50.24902 L31.8749999,46.3720199 L36.0110001,48.2690199 C36.486,48.4890199 37.036,48.4710199 37.497,48.2250199 C37.959,47.9790199 38.278,47.5300199 38.362,47.0120198 L39.081,42.5200197 L43.6299998,42.6920197 C44.6299998,42.6920197 45.3799998,41.9440197 45.3799998,41.0180197 C45.3799998,40.8100197 45.3419998,40.6110197 45.2729998,40.4260197 L44.2659998,36.2030196 L48.5319996,34.6200197 C49.0229996,34.4370197 49.3999996,34.0370197 49.5529997,33.5370198 C49.7029997,33.0370198 49.6129996,32.4940198 49.3059997,32.0680198 L46.6379997,28.3820197 L49.9759997,25.2880196 C50.3580017,24.9320068 50.5540009,24.4160156 50.5009995,23.8950195 C50.4499995,23.3750196 50.1589994,22.9090195 49.7129995,22.6340195 Z M49.7129995,22.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(#linearGradient-1)" xlink:href="#path-3"></use>
-            <use id="Shape-1" stroke="none" fill="url(#radialGradient-2)" xlink:href="#path-3"></use>
+            <path d="M24.0719986,24.0679932 C23.4859986,24.0679932 23.0049986,24.2689932 22.6299986,24.6729932 C22.2531112,25.0790264 22.0259986,25.6789932 21.9439986,26.4719932 L26.2079985,26.4719932 C26.1509985,25.6649932 25.9349985,25.0659932 25.5579985,24.6649932 C25.1843812,24.2675912 24.6869965,24.0679932 24.0719986,24.0679932 L24.0719986,24.0679932 L24.0719986,24.0679932" id="Shape" fill="rgb(111,111,111)"></path>
+            <use id="Shape" stroke="rgb(254,255,254)" stroke-width="2" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
+            <use id="Shape-1" stroke="none" fill="none" xlink:href="#path-2"></use>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/not-loved.svg b/data/images/not-loved.svg
index dee499939..00a863f19 100644
--- a/data/images/not-loved.svg
+++ b/data/images/not-loved.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="60px" 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">
+<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">
     <title>not-loved</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="M42.3107783,9 C37.8163885,9 33.6371976,11.1657924 30.5005096,15.1084828 C27.3668816,11.1689541 23.1958516,9.00632353 18.7075822,9.00632353 C12.0618836,9.00632353 5,14.1620687 5,23.7179021 C5,33.5477532 13.4369261,40.4087305 19.5980958,45.4179818 C21.9309757,47.3192418 23.6426383,48.6661433 25.0340019,49.7622136 C27.234274,51.4937935 28.3379802,52.3622183 29.5283917,53.5847581 C29.7864672,53.8524521 30.132268,54 30.49949,54 C30.865692,54 31.2104727,53.853506 31.4705883,53.585812 C33.0445427,51.9691086 34.4736485,50.8487987 38.3029582,47.8504146 L41.382523,45.4337909 C46.4909894,41.4225961 56,33.9556189 56,23.6209421 C56.0009784,14.1230979 48.9472776,9 42.3107783,9 L42.3107783,9 L42.3107783,9 M18.7075433,11.8508541 C22.8245101,11.8508541 26.7058433,14.1968657 29.3549418,18.2839424 C29.8435512,19.0395984 31.15637,19.0395984 31.6439591,18.2839424 C34.2961182,14.1915963 38.1825513,11.8445306 42.3097194,11.8445306 C47.6109775,11.8445306 53.2468158,15.9716558 53.2468158,23.6199068 C53.2468158,31.8530791 46.2614366,38.0290125 39.7136636,43.170002 L36.6391992,45.5824101 C33.4392671,48.0875626 31.8836737,49.3058865 30.4933303,50.6169549 C29.4783694,49.6810797 28.3481417,48.7926307 26.7007428,47.496317 C25.3675228,46.4487269 23.65382,45.0997177 21.2862579,43.170002 C15.5739152,38.5264588 7.75208617,32.1660908 7.75208617,23.7179192 C7.75415046,16.0095799 13.3981073,11.8508541 18.7075433,11.8508541 C18.7075433,11.8508541 13.3981073,11.8508541 18.7075433,11.8508541 L18.7075433,11.8508541" id="Shape" fill="rgb(82,83,82)"></path>
+        <path d="M38.3107783,5 C33.8163885,5 29.6371976,7.16579237 26.5005096,11.1084828 C23.3668816,7.16895414 19.1958516,5.00632353 14.7075822,5.00632353 C8.06188357,5.00632353 1,10.1620687 1,19.7179021 C1,29.5477532 9.43692613,36.4087305 15.5980958,41.4179818 C17.9309757,43.3192418 19.6426383,44.6661433 21.0340019,45.7622136 C23.234274,47.4937935 24.3379802,48.3622183 25.5283917,49.5847581 C25.7864672,49.8524521 26.132268,50 26.49949,50 C26.865692,50 27.2104727,49.853506 27.4705883,49.585812 C29.0445427,47.9691086 30.4736485,46.8487987 34.3029582,43.8504146 L37.382523,41.4337909 C42.4909894,37.4225961 52,29.9556189 52,19.6209421 C52.0009784,10.1230979 44.9472776,5 38.3107783,5 L38.3107783,5 L38.3107783,5 M14.7075433,7.85085411 C18.8245101,7.85085411 22.7058433,10.1968657 25.3549418,14.2839424 C25.8435512,15.0395984 27.15637,15.0395984 27.6439591,14.2839424 C30.2961182,10.1915963 34.1825513,7.84453058 38.3097194,7.84453058 C43.6109775,7.84453058 49.2468158,11.9716558 49.2468158,19.6199068 C49.2468158,27.8530791 42.2614366,34.0290125 35.7136636,39.170002 L32.6391992,41.5824101 C29.4392671,44.0875626 27.8836737,45.3058865 26.4933303,46.6169549 C25.4783694,45.6810797 24.3481417,44.7926307 22.7007428,43.496317 C21.3675228,42.4487269 19.65382,41.0997177 17.2862579,39.170002 C11.5739152,34.5264588 3.75208617,28.1660908 3.75208617,19.7179192 C3.75415046,12.0095799 9.39810727,7.85085411 14.7075433,7.85085411 C14.7075433,7.85085411 9.39810727,7.85085411 14.7075433,7.85085411 L14.7075433,7.85085411" id="Shape" fill="rgb(82,83,82)"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/playlist-icon.svg b/data/images/playlist-icon.svg
index 4b5dcff31..7ecc0bed0 100644
--- a/data/images/playlist-icon.svg
+++ b/data/images/playlist-icon.svg
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="82px" height="82px" 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="70px" height="70px" 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>playlist-icon</title>
     <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
     <defs>
-        <radialGradient cx="44.3827927%" cy="39.150463%" fx="44.3827927%" fy="39.150463%" r="120.982587%" id="radialGradient-1">
-            <stop stop-color="rgb(196,210,241)" offset="0%"></stop>
-            <stop stop-color="rgb(8,10,12)" offset="99.1944134%"></stop>
-            <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
+        <radialGradient cx="55.1087141%" cy="29.5365341%" fx="55.1087141%" fy="29.5365341%" r="100%" id="radialGradient-1">
+            <stop stop-color="rgb(149,198,243)" offset="0%"></stop>
+            <stop stop-color="rgb(124,142,212)" offset="100%"></stop>
         </radialGradient>
     </defs>
     <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M6.43623614,15.75 C4.66868603,15.75 3.23473984,14.40255 3.23473984,12.7394874 C3.23473984,11.0764248 4.66868618,9.72898734 6.43623614,9.72898734 L47.4069145,9.72898734 C49.176302,9.72898734 50.6065645,11.0764248 50.6065645,12.7394874 C50.6065645,14.40255 49.176302,15.75 47.4069145,15.75 Z M69.9009962,21.4003115 C74.4584718,27.0023785 78.7628333,32.2932302 78.2153628,42.444845 C78.1670164,43.2940642 77.5385017,43.9603053 76.7649355,43.9775173 C75.9828509,44.0040984 75.3401012,43.3566204 75.2633225,42.5120921 C74.7983218,37.4433334 72.3397144,35.5587651 68.9354703,32.9469628 C66.694415,31.2297488 64.2528569,29.3577014 62.148322,26.3251924 L62.148322,61.3874233 C63.8049311,65.1565361 62.1739148,70.8618269 58.1468475,75.1736436 C55.3199326,78.1967634 51.7976681,80 48.7219038,80 C46.8192853,80 45.2039052,79.3149882 44.0506733,78.0153452 C40.9350936,74.4870749 42.2390561,67.7151626 47.0226276,62.5994834 C50.1154537,59.2917193 54.0870695,57.4462533 57.29649,57.8200397 L57.29649,11.9900279 C57.0064121,9.58779701 56.8499901,6.92907451 56.8371937,4.08268304 C56.8357677,3.28037169 57.3633243,2.59380384 58.0828527,2.46556412 C58.8080725,2.34200271 59.5019955,2.80650265 59.7266776,3.56971163 C62.2051998,11.9415442 66.2934222,16.9665097 69.9009962,21.4003115 Z M6.43623614,34.5 C4.66868603,34.5 3.23473984,33.15255 3.23473984,31.4894874 C3.23473984,29.8264248 4.66868618,28.4789873 6.43623614,28.4789873 L47.4069145,28.4789873 C49.176302,28.4789873 50.6065645,29.8264248 50.6065645,31.4894874 C50.6065645,33.15255 49.176302,34.5 47.4069145,34.5 Z M50.6710758,49.7816772 C50.6710758,51.4430023 49.2426508,52.7921773 47.4714133,52.7921773 L6.50074923,52.7921773 C4.73319405,52.7921773 3.29924786,51.4430022 3.29924786,49.7816772 C3.29924786,48.1203396 4.7331942,46.7729021 6.50074923,46.7729021 L47.4714133,46.7729021 C49.2426508,46.7729021 50.6710758,48.1203398 50.6710758,49.7816772 Z M50.6710758,49.7816772" id="path16" fill="url(#radialGradient-1)"></path>
+        <path d="M47.5025931,4.54194679 C50.2434046,11.2347259 54.7642469,15.2518915 58.7535969,18.7964536 C63.7933571,23.2749746 68.5532165,27.5046907 67.947814,35.6202967 C67.8943508,36.299203 67.1993188,36.8318242 66.3438972,36.8455785 C65.479041,36.8668316 64.7682846,36.3492118 64.6833724,35.6740588 C64.1691718,31.6218858 61.4503799,30.1152899 57.6858897,28.0273149 C55.2076821,26.6545008 52.5077542,25.1579058 50.1805015,22.7336035 L50.1805015,50.763756 C52.0124282,53.776944 50.2088108,58.337985 45.7555785,61.7850227 C42.6295123,64.2018243 38.7345144,65.6434035 35.3332647,65.6434035 C33.2293047,65.6434035 31.4429788,65.0957783 30.1677088,64.0567913 C26.7224306,61.2361459 28.1643853,55.8224099 33.4541645,51.7327263 C36.8742835,49.0883728 41.2661852,47.6130348 44.8152448,47.9118526 L44.8152448,11.2734866 C44.4944604,9.3530458 44.3214913,7.22756122 44.3073393,4.95204222 C44.3057668,4.31064159 44.8891498,3.76176773 45.6848184,3.65924778 C46.4867767,3.56047332 47.2541413,3.93180806 47.5025931,4.54194679 Z M7.41968321,19 L34.3132543,19 C35.4747001,19 36.4135367,20.1189523 36.4135367,21.5 C36.4135367,22.8810496 35.4747001,24 34.3132543,24 L7.41968321,24 C6.25944519,24 5.3181884,22.8810496 5.3181884,21.5 C5.3181884,20.1189523 6.25944519,19 7.41968321,19 Z M7.41968321,34.4487179 L34.3132543,34.4487179 C35.4747001,34.4487179 36.4135367,35.5676703 36.4135367,36.9487199 C36.4135367,38.3297656 35.4747001,39.4487179 34.3132543,39.4487179 L7.41968321,39.4487179 C6.25944519,39.4487179 5.3181884,38.3297656 5.3181884,36.9487199 C5.3181884,35.5676703 6.25944519,34.4487179 7.41968321,34.4487179 Z M36.4558825,7.30593303 C36.4558825,8.68593858 35.5182542,9.80521313 34.3555971,9.80521313 L7.46202753,9.80521313 C6.3017895,9.80521313 5.36053281,8.68593858 5.36053281,7.30593303 C5.36053281,5.92592748 6.3017895,4.80521313 7.46202753,4.80521313 L34.3555971,4.80521313 C35.5182542,4.80521313 36.4558825,5.92592748 36.4558825,7.30593303 Z M36.4558825,7.30593303" id="path1084" stroke="rgb(49,54,58)" stroke-width="1" fill="url(#radialGradient-1)"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/recently-played.svg b/data/images/recently-played.svg
index 5a781ca34..2f8cb53a5 100644
--- a/data/images/recently-played.svg
+++ b/data/images/recently-played.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="101px" height="101px" 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>Slice 1</title>
+<svg width="105px" height="105px" 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>recently-played</title>
     <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
     <defs>
         <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="10.6786549%" id="radialGradient-1">
@@ -8,11 +8,11 @@
             <stop stop-color="rgb(37,76,123)" offset="100%"></stop>
             <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
         </radialGradient>
-        <path d="M0.416038513,50.541996 C0.416038513,23.0439968 22.7920399,0.67199707 50.2900391,0.67199707 C77.7879639,0.67199707 100.157959,23.0419922 100.160038,50.541996 C100.160038,78.041996 77.7880402,100.415997 50.2900391,100.415997 C22.792038,100.415997 0.416038513,78.041996 0.416038513,50.541996 Z M51.0059547,48.5100098 L51.0059547,20.7240105 C51.0059547,19.0420104 49.6419548,17.6760104 47.9599547,17.6760104 C46.2779547,17.6760104 44.9119546,19.0440104 44.9119546,20.7240105 L44.9119546,52.5760098 C44.9119546,53.2180098 45.1139546,53.8140098 45.4539546,54.3040098 C46.1039546,55.6800098 47.4959547,56.6400098 49.1199545,56.6400098 L70.5279555,56.6400098 C72.7739555,56.6400098 74.5919556,54.8200097 74.5919556,52.5760096 C74.5919556,50.3320096 72.7740479,48.5100098 70.5279541,48.5100098 Z M51.0059547,48.5100098" id="path-2"></path>
+        <path d="M2.41603851,52.541996 C2.41603851,25.0439968 24.7920399,2.67199707 52.2900391,2.67199707 C79.7879639,2.67199707 102.157959,25.0419922 102.160038,52.541996 C102.160038,80.041996 79.7880402,102.415997 52.2900391,102.415997 C24.792038,102.415997 2.41603851,80.041996 2.41603851,52.541996 Z M53.0059547,50.5100098 L53.0059547,22.7240105 C53.0059547,21.0420104 51.6419548,19.6760104 49.9599547,19.6760104 C48.2779547,19.6760104 46.9119546,21.0440104 46.9119546,22.7240105 L46.9119546,54.5760098 C46.9119546,55.2180098 47.1139546,55.8140098 47.4539546,56.3040098 C48.1039546,57.6800098 49.4959547,58.6400098 51.1199545,58.6400098 L72.5279555,58.6400098 C74.7739555,58.6400098 76.5919556,56.8200097 76.5919556,54.5760096 C76.5919556,52.3320096 74.7740479,50.5100098 72.5279541,50.5100098 Z M53.0059547,50.5100098" 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="url(#radialGradient-1)" xlink:href="#path-2"></use>
+            <use id="Shape" stroke="rgb(254,255,254)" stroke-width="2" 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/repeat-1-on-pressed.svg b/data/images/repeat-1-on-pressed.svg
index b6c0fb414..e9dfd3425 100644
--- a/data/images/repeat-1-on-pressed.svg
+++ b/data/images/repeat-1-on-pressed.svg
@@ -3,15 +3,15 @@
     <title>repeat-1-on-pressed</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="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
         <g id="Group">
-            <g fill="rgb(93,112,20)">
-                <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(111,128,23)"></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(111,128,23)"></path>
+            <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>
-            <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(93,112,20)"></path>
-            <text id="1" fill="rgb(254,254,254)" font-family="Helvetica" font-size="12" font-weight="bold">
-                <tspan x="54" y="16">1</tspan>
+            <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>
         </g>
     </g>
diff --git a/data/images/repeat-1-on-rest.svg b/data/images/repeat-1-on-rest.svg
index 0647a26d0..57ca557eb 100644
--- a/data/images/repeat-1-on-rest.svg
+++ b/data/images/repeat-1-on-rest.svg
@@ -3,16 +3,14 @@
     <title>repeat-1-on-rest</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">
-            <g fill="rgb(93,112,20)">
-                <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(131,158,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(147,169,28)"></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(147,169,28)"></path>
-            <text id="1" fill="rgb(254,254,254)" font-family="Helvetica" font-size="12" font-weight="bold">
-                <tspan x="54" y="16">1</tspan>
-            </text>
+    <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>
+        <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>
     </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 7aa7cf8ef..3fd03f962 100644
--- a/data/images/repeat-all-on-pressed.svg
+++ b/data/images/repeat-all-on-pressed.svg
@@ -3,10 +3,10 @@
     <title>repeat-all-on-pressed</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(93,112,20)">
-            <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(111,128,23)"></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(111,128,23)"></path>
+    <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>
         </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 75d155c14..b78c8f7f7 100644
--- a/data/images/repeat-all-on-rest.svg
+++ b/data/images/repeat-all-on-rest.svg
@@ -3,10 +3,10 @@
     <title>repeat-all-on-rest</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(93,112,20)">
-            <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(147,171,58)"></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(147,171,58)"></path>
+    <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>
         </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
index 2ee1414cb..405bb2877 100644
--- a/data/images/repeat-off-pressed.svg
+++ b/data/images/repeat-off-pressed.svg
@@ -3,10 +3,10 @@
     <title>repeat-off-pressed</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(93,112,20)">
-            <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(79,79,79)"></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,76,76)"></path>
+    <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
index 4f25d0e99..4063dce83 100644
--- a/data/images/repeat-off-rest.svg
+++ b/data/images/repeat-off-rest.svg
@@ -3,10 +3,10 @@
     <title>repeat-off-rest</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(93,112,20)">
-            <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(96,96,96)"></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(96,96,96)"></path>
+    <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/share.svg b/data/images/share.svg
index aff85008d..b6aa87471 100644
--- a/data/images/share.svg
+++ b/data/images/share.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64px" height="59px" 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="35px" 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>share</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="M63.1779187,13.6943139 C63.6923204,14.0447233 64.0023992,14.6044864 64,15.1978275 C63.9975962,15.792292 63.6923204,16.3486928 63.1779187,16.6979826 L47.9862402,29.1112044 C47.6160632,29.3619766 47.172572,29.4616138 46.7314845,29.444821 L46.7290807,29.444821 C46.5968747,29.4392234 46.4658705,29.4291478 46.3348663,29.3966817 C46.1906415,29.3675742 46.0476186,29.3250325 45.9118069,29.2601004 C45.2435653,28.9443962 44.8229097,28.3051511 44.8229097,27.6076909 L44.8241116,21.9037434 C32.5205355,22.6582988 23.5978286,27.5584324 23.5978286,33.5691282 C23.5978286,37.129198 26.6878449,40.5291762 32.0758425,42.8958388 C32.6287042,43.1410134 32.8803708,43.7450036 32.6455304,44.2717273 C32.4628457,44.6814711 32.0361807,44.9300043 31.5854782,44.9300043 C31.4568777,44.9300043 31.3258736,44.9109724 31.198475,44.8684307 C20.2361891,41.2120829 13.6919889,34.8957588 13.6919889,27.9760135 C13.6919889,18.2541132 26.7359192,9.97415277 44.7075303,8.28367956 C44.7471921,8.27920148 44.7820464,8.29487474 44.8229101,8.29487474 L44.824112,5.56548822 L44.824112,2.78572326 C44.824112,2.63011013 44.8517551,2.4778556 44.8926188,2.3334377 C44.9034356,2.29089598 44.91906,2.24835427 44.9298768,2.20917112 C44.9731443,2.09609974 45.023623,1.98750643 45.0849185,1.88451071 C45.1029466,1.85316419 45.1173691,1.82069815 45.1390028,1.79159066 C45.2171245,1.67851926 45.3048613,1.56880644 45.4070205,1.47364734 C45.4166355,1.46469119 45.4250486,1.46133264 45.4346636,1.45461552 C45.5740809,1.32810992 45.7339301,1.21727757 45.9118073,1.13219416 C46.5800489,0.815370358 47.3816983,0.874704852 47.9874425,1.28332918 Z M47.7713727,32.8702357 C48.7624031,32.8702357 49.5669714,33.7650576 49.5669724,34.8698186 L49.5669724,56.5004171 C49.5669724,57.6051781 48.7624041,58.5 47.7713737,58.5 L1.7955987,58.5 C0.803538101,58.5 1.42108547e-14,57.605178 1.42108547e-14,56.5004171 L1.42108547e-14,16.4995829 C1.42108547e-14,15.3971163 0.803538162,14.5 1.7955987,14.5 L12.4970778,14.5 C13.4891384,14.5 14.2926765,15.3971163 14.2926765,16.4995829 C14.2926765,17.6043438 13.4891384,18.4991657 12.4970778,18.4991657 L3.5901668,18.4991657 L3.5901668,54.5008343 L45.975774,54.5008343 L45.975774,34.8698186 C45.975774,33.7650576 46.7803424,32.8702357 47.7713727,32.8702357 Z M47.7713727,32.8702357" id="path900" fill="rgb(100,98,99)"></path>
+        <path d="M53.4683713,8.57012309 C53.9125911,8.80107477 54.1803646,9.17000951 54.1782927,9.56107528 C54.1762169,9.95288139 53.9125911,10.3196001 53.4683713,10.5498139 L40.3493565,18.7312555 C40.0296843,18.8965372 39.6467004,18.9622071 39.2657923,18.9511392 L39.2637165,18.9511392 C39.1495479,18.9474498 39.0364172,18.9408091 38.9232864,18.919411 C38.7987388,18.9002265 38.6752291,18.8721876 38.5579468,18.8293915 C37.9808762,18.6213137 37.6176123,18.1999931 37.6176123,17.7403034 L37.6186502,13.9808835 C26.993702,14.478204 19.288357,17.7078376 19.288357,21.6694326 C19.288357,24.0158422 21.9567896,26.2567369 26.6096804,27.8165827 C27.0871129,27.978175 27.3044435,28.3762595 27.1016434,28.7234183 C26.9438831,28.9934767 26.5754297,29.1572827 26.1862185,29.1572827 C26.0751635,29.1572827 25.9620328,29.144739 25.8520157,29.1167001 C16.38536,26.7068345 10.7340122,22.5438027 10.7340122,17.9830615 C10.7340122,11.5754453 21.9983049,6.11819872 37.5179746,5.0040232 C37.5522252,5.00107174 37.5823242,5.01140184 37.6176127,5.01140184 L37.6186506,3.212488 L37.6186506,1.38037019 C37.6186506,1.27780699 37.6425222,1.17745741 37.6778107,1.08227288 C37.6871518,1.05423402 37.7006444,1.02619517 37.7099855,1.00036991 C37.7473498,0.92584559 37.7909414,0.854272728 37.8438742,0.786389185 C37.8594426,0.765728979 37.8718974,0.744330906 37.8905795,0.725146426 C37.9580428,0.650622095 38.0338093,0.578311368 38.1220305,0.515592876 C38.1303337,0.509689958 38.1375989,0.507476364 38.1459021,0.503049177 C38.2662982,0.419670485 38.4043384,0.346621891 38.5579471,0.290544184 C39.1350177,0.0817284989 39.8272948,0.120835325 40.3503948,0.390155907 Z M45.975774,19.0721546 C45.975774,18.3440167 46.7803424,17.7542477 47.7713727,17.7542477 C48.7624031,17.7542477 49.5669714,18.3440167 49.5669724,19.0721546 L49.5669724,33.3286855 C49.5669724,34.0568234 48.7624041,34.6465924 47.7713737,34.6465924 L1.7955987,34.6465924 C0.803538101,34.6465924 1.42108547e-14,34.0568233 1.42108547e-14,33.3286855 L1.42108547e-14,6.96449925 C1.42108547e-14,6.23787358 0.803538162,5.64659236 1.7955987,5.64659236 L12.4970778,5.64659236 C13.4891384,5.64659236 14.2926765,6.23787358 14.2926765,6.96449925 C14.2926765,7.69263716 13.4891384,8.28240613 12.4970778,8.28240613 L3.5901668,8.28240613 L3.5901668,32.0107786 L27.9550782,32.0107786 L45.975774,32.0107786 Z M45.975774,19.0721546" id="path900" fill="rgb(100,98,99)"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/shuffle-off-pressed.svg b/data/images/shuffle-off-pressed.svg
index f7271fd3c..07f4af6a4 100644
--- a/data/images/shuffle-off-pressed.svg
+++ b/data/images/shuffle-off-pressed.svg
@@ -3,11 +3,11 @@
     <title>shuffle-off-pressed</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="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(79,79,79)"></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(79,79,79)"></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,76,76)"></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-off-rest.svg b/data/images/shuffle-off-rest.svg
index b551ba36d..d6c566a3c 100644
--- a/data/images/shuffle-off-rest.svg
+++ b/data/images/shuffle-off-rest.svg
@@ -3,11 +3,11 @@
     <title>shuffle-off-rest</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="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(95,95,95)"></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,96,96)"></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(95,95,95)"></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(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
index 12bc05bb0..57fb4e1dd 100644
--- a/data/images/shuffle-on-pressed.svg
+++ b/data/images/shuffle-on-pressed.svg
@@ -3,11 +3,11 @@
     <title>shuffle-on-pressed</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="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(107,131,17)"></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(107,131,17)"></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(107,131,17)"></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(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>
         </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 1b70ec51a..0e7ec5cf8 100644
--- a/data/images/shuffle-on-rest.svg
+++ b/data/images/shuffle-on-rest.svg
@@ -3,11 +3,11 @@
     <title>shuffle-on-rest</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="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(120,144,26)"></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(120,144,26)"></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(120,144,26)"></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.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>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/station.svg b/data/images/station.svg
index bf9a01d25..64966d825 100644
--- a/data/images/station.svg
+++ b/data/images/station.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="65px" height="65px" 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="64px" 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">
     <title>station</title>
     <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
     <defs>
@@ -7,7 +7,7 @@
             <stop stop-color="rgb(234,223,222)" stop-opacity="0.675953585" offset="0%"></stop>
             <stop stop-color="rgb(249,247,245)" offset="100%"></stop>
         </radialGradient>
-        <path d="M34.7205264,23.8658403 L43.7497617,6.06399576 C45.0702623,5.97554713 46.1191884,4.88551118 46.1191884,3.54134096 C46.1191884,2.13737466 44.9818137,1 43.5790931,1 C42.1763724,1 41.0377521,2.13737466 41.0377521,3.54134096 C41.0377521,4.04213465 41.19098,4.50680137 41.4413769,4.90170587 L31.8228992,23.8658398 L30.9421501,23.8658398 L22.5694278,9.42255184 C22.9132563,8.98653746 23.1275263,8.44463382 23.1275263,7.84791695 C23.1275263,6.44395065 21.9913974,5.30657599 20.587431,5.30657599 C19.1847103,5.30657599 18.0498273,6.44395065 18.0498273,7.84791695 C18.0498273,9.08619784 18.9392966,10.1164375 20.1140439,10.3394277 L27.9560743,23.8658396 L4.26056096,23.8658396 C3.07086457,23.8658396 2.10540409,24.8300543 2.10540409,26.018505 L2.10540409,60.8473346 C2.10540409,62.037031 3.0708645,63 4.26056096,63 L61.8219364,63 C63.0128786,63 63.9758475,62.0370311 63.9758475,60.8473346 L63.9758475,26.018505 C63.9758475,24.8300543 63.0128786,23.8658396 61.8219364,23.8658396 L34.7205264,23.8658403 Z M34.7205264,23.8658403" id="path-2"></path>
+        <path d="M33.7205264,23.8658403 L42.7497617,6.06399576 C44.0702623,5.97554713 45.1191884,4.88551118 45.1191884,3.54134096 C45.1191884,2.13737466 43.9818137,1 42.5790931,1 C41.1763724,1 40.0377521,2.13737466 40.0377521,3.54134096 C40.0377521,4.04213465 40.19098,4.50680137 40.4413769,4.90170587 L30.8228992,23.8658398 L29.9421501,23.8658398 L21.5694278,9.42255184 C21.9132563,8.98653746 22.1275263,8.44463382 22.1275263,7.84791695 C22.1275263,6.44395065 20.9913974,5.30657599 19.587431,5.30657599 C18.1847103,5.30657599 17.0498273,6.44395065 17.0498273,7.84791695 C17.0498273,9.08619784 17.9392966,10.1164375 19.1140439,10.3394277 L26.9560743,23.8658396 L3.26056096,23.8658396 C2.07086457,23.8658396 1.10540409,24.8300543 1.10540409,26.018505 L1.10540409,60.8473346 C1.10540409,62.037031 2.0708645,63 3.26056096,63 L60.8219364,63 C62.0128786,63 62.9758475,62.0370311 62.9758475,60.8473346 L62.9758475,26.018505 C62.9758475,24.8300543 62.0128786,23.8658396 60.8219364,23.8658396 L33.7205264,23.8658403 Z M33.7205264,23.8658403" id="path-2"></path>
         <radialGradient cx="111.454284%" cy="38.2510383%" fx="111.454284%" fy="38.2510383%" r="100%" id="radialGradient-3">
             <stop stop-color="rgb(254,255,254)" offset="0%"></stop>
             <stop stop-color="rgb(131,130,126)" offset="11.943046%"></stop>
@@ -19,14 +19,14 @@
         </radialGradient>
     </defs>
     <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <use id="Path" stroke="rgb(49,54,58)" stroke-width="0.5" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
+        <use id="Path" stroke="rgb(49,54,58)" stroke-width="1" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
         <use id="Path-1" stroke="none" fill="none" xlink:href="#path-2"></use>
-        <path d="M14.4493761,42.4725 C15.0156261,42.47 15.4718761,42.01125 15.4718761,41.4462501 C15.4718761,40.8787501 15.0156261,40.41875 14.4468761,40.4175 C13.8818761,40.4175 13.4231261,40.87875 13.4231261,41.4462501 C13.4231261,42.01125 13.8818761,42.4700001 14.4493761,42.4725 M14.4493761,47.0437501 C15.0156261,47.0437501 15.4718761,46.5850001 15.4718761,46.0212501 C15.4718761,45.4550001 15.0156261,44.9937501 14.4468761,44.9937501 C13.8818761,44.9937501 13.4231261,45.455 13.4231261,46.0212501 C13.4231261,46.5850001 13.8818761,47.0437501 14.4493761,47.0437501 M16.7356261,40.1837502 C17.300626,40.1837502 17.760626,39.7250002 17.760626,39.1600002 C17.760626,38.5937502 17.300626,38.1337502 16.7356261,38.1337502 C16.1706261,38.1337502 15.711876,38.5937502 15.711876,39.1600002 C15.711876,39.7250002 16.1706261,40.1837502 16.7356261,40.1837502 M16.7356261,44.7575001 C17.300626,44.7575001 17.760626,44.2975001 17.760626,43.7337501 C17.760626,43.1662501 17.300626,42.7075001 16.7356261,42.7075001 C16.1706261,42.7075001 15.711876,43.1662501 15.711876,43.7337501 C15.711876,44.2987501 16.1706261,44.7575001 16.7356261,44.7575001 M16.7356261,49.33125 C17.300626,49.33125 17.760626,48.8725 17.760626,48.305 C17.760626,47.74 17.300626,47.28125 16.7356261,47.28 C16.1706261,47.28 15.711876,47.74 15.711876,48.305 C15.711876,48.8725 16.1706261,49.33125 16.7356261,49.33125 M19.020626,42.4462501 C19.590626,42.4462501 20.046876,41.9887501 20.046876,41.4225001 C20.046876,40.8550001 19.590626,40.3975001 19.020626,40.3975001 C18.455626,40.3975001 17.998126,40.8550001 17.998126,41.4225001 C17.998126,41.9887501 18.455626,42.4462501 19.020626,42.4462501 M20.046876,46.02125 C20.046876,45.455 19.590626,44.99375 19.020626,44.99375 C18.455626,44.99375 17.998126,45.455 17.998126,46.02125 C17.998126,46.585 18.455626,47.04375 19.020626,47.04375 C19.590626,47.04375 20.046876,46.585 20.046876,46.02125 M19.0206261,51.6412501 C19.590626,51.6400002 20.0468763,51.1824999 20.0468763,50.6162499 C20.0468763,50.0487499 19.5881261,49.5899997 19.0206261,49.5899997 C18.4556262,49.5899997 17.9981261,50.0487498 17.9981261,50.6149997 C17.9981261,51.1824997 18.4556261,51.6399997 19.0206261,51.6412497 M21.3106262,40.1837492 C21.8756262,40.1837492 22.3343762,39.7249992 22.3343762,39.1599992 C22.3343762,38.5937492 21.8756262,38.1337493 21.3081262,38.1337493 C20.7431262,38.1337493 20.2831262,38.5937493 20.2831262,39.1599992 C20.2831262,39.7249992 20.7431262,40.1837492 21.3106262,40.1837492 M21.3106262,44.7574991 C21.8756262,44.7574991 22.3343762,44.2974991 22.3343762,43.7337491 C22.3343762,43.1662491 21.8756262,42.7074992 21.3081263,42.7074992 C20.7431263,42.7074992 20.2831263,43.1662492 20.2831263,43.7337491 C20.2831263,44.2987491 20.7431263,44.7574991 21.3106263,44.7574991 M21.3106263,49.331249 C21.8756263,49.331249 22.3343763,48.872499 22.3343763,48.3049991 C22.3343763,47.7399991 21.8756263,47.2812491 21.3081263,47.2799991 C20.7431264,47.2799991 20.2831264,47.7399991 20.2831264,48.3049991 C20.2831264,48.8724991 20.7431264,49.331249 21.3106264,49.331249 M23.6193764,37.8499985 C24.1856264,37.8499985 24.6431264,37.3924985 24.6431264,36.8262485 C24.6431264,36.2587485 24.1856264,35.7999985 23.6193764,35.7999985 C23.0531264,35.7999985 22.5931264,36.2587486 22.5931264,36.8262485 C22.5931264,37.3924985 23.0531264,37.8499985 23.6193764,37.8499985 M23.6193764,42.4462486 C24.1856264,42.4462486 24.6431264,41.9887486 24.6431264,41.4224986 C24.6431264,40.8549986 24.1856264,40.3974986 23.6193764,40.3974986 C23.0531264,40.3974986 22.5931264,40.8549986 22.5931264,41.4224986 C22.5931264,41.9887486 23.0531264,42.4462486 23.6193764,42.4462486 M23.6193764,47.0449985 C24.1856261,47.0437501 24.6431257,46.585 24.6431257,46.02125 C24.6431257,45.4549999 24.1856261,44.99375 23.619376,44.99375 C23.053126,44.99375 22.593126,45.455 22.593126,46.02125 C22.593126,46.585 23.053126,47.04375 23.619376,47.045 M23.619376,51.6400002 C24.185626,51.6400002 24.643126,51.1825002 24.643126,50.6150002 C24.643126,50.0487502 24.185626,49.5900002 23.619376,49.5900002 C23.053126,49.5900002 22.593126,50.0487502 22.593126,50.6150002 C22.593126,51.1825002 23.053126,51.6400002 23.619376,51.6400002 M25.8818759,44.7575001 C26.4518759,44.7575001 26.909376,44.2975001 26.909376,43.7337501 C26.909376,43.1662501 26.451876,42.7075001 25.8818759,42.7075001 C25.316876,42.7075001 24.8581259,43.1662501 24.8581259,43.7337501 C24.8581259,44.2987501 25.316876,44.7575001 25.8818759,44.7575001 M25.8818759,49.33125 C26.4518759,49.33125 26.909376,48.8725 26.909376,48.305 C26.909376,47.74 26.451876,47.28125 25.8818759,47.28 C25.316876,47.28 24.8581259,47.74 24.8581259,48.305 C24.8581259,48.8725 25.316876,49.33125 25.8818759,49.33125 M25.9056259,38.1112502 C25.338126,38.1112502 24.8818759,38.5687502 24.879376,39.1362502 C24.879376,39.7025002 25.338126,40.1612502 25.9056259,40.1612502 C26.471876,40.1612502 26.929376,39.7025002 26.929376,39.1362502 C26.929376,38.5687502 26.4706259,38.1112502 25.9056259,38.1112502 M28.1693759,47.0437501 C28.7381259,47.0437501 29.196876,46.5850001 29.196876,46.0212501 C29.196876,45.4550001 28.7381259,44.9937501 28.1693759,44.9937501 C27.6043759,44.9937501 27.1443759,45.455 27.1443759,46.0212501 C27.1443759,46.5850001 27.6043759,47.0437501 28.1693759,47.0437501 M28.1918759,40.3975002 C27.6281259,40.3975002 27.1681259,40.8550002 27.1681259,41.4225002 C27.1681259,41.9887502 27.6281259,42.4462502 28.1918759,42.4462502 C28.7606259,42.4462502 29.2168759,41.9887502 29.2168759,41.4225002 C29.2168759,40.8550002 28.7581259,40.3975002 28.1918759,40.3975002 M19.0206261,35.845 C18.4556262,35.845 17.9981261,36.30375 17.9981261,36.8725 C17.9981261,37.43875 18.4556261,37.8975 19.0206261,37.8975 C19.5906261,37.8975 20.0468761,37.43875 20.0468761,36.8725 C20.0468761,36.3025 19.5906261,35.845 19.0206261,35.845 M33.0406258,43.7337501 C33.0406258,44.3843893 32.9876847,45.0226659 32.885873,45.644503 C31.9736976,51.2158133 27.1386109,55.4675002 21.3081262,55.4675002 C14.8281262,55.4675002 9.57437609,50.2137501 9.57437609,43.7337501 C9.57437609,37.2525002 14.8281262,32 21.3081262,32 C27.7893761,32 33.0406258,37.2525002 33.0406258,43.7337501 Z M33.0406258,43.7337501" id="path2520" fill="url(#radialGradient-3)"></path>
+        <path d="M13.4493761,42.4725 C14.0156261,42.47 14.4718761,42.01125 14.4718761,41.4462501 C14.4718761,40.8787501 14.0156261,40.41875 13.4468761,40.4175 C12.8818761,40.4175 12.4231261,40.87875 12.4231261,41.4462501 C12.4231261,42.01125 12.8818761,42.4700001 13.4493761,42.4725 M13.4493761,47.0437501 C14.0156261,47.0437501 14.4718761,46.5850001 14.4718761,46.0212501 C14.4718761,45.4550001 14.0156261,44.9937501 13.4468761,44.9937501 C12.8818761,44.9937501 12.4231261,45.455 12.4231261,46.0212501 C12.4231261,46.5850001 12.8818761,47.0437501 13.4493761,47.0437501 M15.7356261,40.1837502 C16.300626,40.1837502 16.760626,39.7250002 16.760626,39.1600002 C16.760626,38.5937502 16.300626,38.1337502 15.7356261,38.1337502 C15.1706261,38.1337502 14.711876,38.5937502 14.711876,39.1600002 C14.711876,39.7250002 15.1706261,40.1837502 15.7356261,40.1837502 M15.7356261,44.7575001 C16.300626,44.7575001 16.760626,44.2975001 16.760626,43.7337501 C16.760626,43.1662501 16.300626,42.7075001 15.7356261,42.7075001 C15.1706261,42.7075001 14.711876,43.1662501 14.711876,43.7337501 C14.711876,44.2987501 15.1706261,44.7575001 15.7356261,44.7575001 M15.7356261,49.33125 C16.300626,49.33125 16.760626,48.8725 16.760626,48.305 C16.760626,47.74 16.300626,47.28125 15.7356261,47.28 C15.1706261,47.28 14.711876,47.74 14.711876,48.305 C14.711876,48.8725 15.1706261,49.33125 15.7356261,49.33125 M18.020626,42.4462501 C18.590626,42.4462501 19.046876,41.9887501 19.046876,41.4225001 C19.046876,40.8550001 18.590626,40.3975001 18.020626,40.3975001 C17.455626,40.3975001 16.998126,40.8550001 16.998126,41.4225001 C16.998126,41.9887501 17.455626,42.4462501 18.020626,42.4462501 M19.046876,46.02125 C19.046876,45.455 18.590626,44.99375 18.020626,44.99375 C17.455626,44.99375 16.998126,45.455 16.998126,46.02125 C16.998126,46.585 17.455626,47.04375 18.020626,47.04375 C18.590626,47.04375 19.046876,46.585 19.046876,46.02125 M18.0206261,51.6412501 C18.590626,51.6400002 19.0468763,51.1824999 19.0468763,50.6162499 C19.0468763,50.0487499 18.5881261,49.5899997 18.0206261,49.5899997 C17.4556262,49.5899997 16.9981261,50.0487498 16.9981261,50.6149997 C16.9981261,51.1824997 17.4556261,51.6399997 18.0206261,51.6412497 M20.3106262,40.1837492 C20.8756262,40.1837492 21.3343762,39.7249992 21.3343762,39.1599992 C21.3343762,38.5937492 20.8756262,38.1337493 20.3081262,38.1337493 C19.7431262,38.1337493 19.2831262,38.5937493 19.2831262,39.1599992 C19.2831262,39.7249992 19.7431262,40.1837492 20.3106262,40.1837492 M20.3106262,44.7574991 C20.8756262,44.7574991 21.3343762,44.2974991 21.3343762,43.7337491 C21.3343762,43.1662491 20.8756262,42.7074992 20.3081263,42.7074992 C19.7431263,42.7074992 19.2831263,43.1662492 19.2831263,43.7337491 C19.2831263,44.2987491 19.7431263,44.7574991 20.3106263,44.7574991 M20.3106263,49.331249 C20.8756263,49.331249 21.3343763,48.872499 21.3343763,48.3049991 C21.3343763,47.7399991 20.8756263,47.2812491 20.3081263,47.2799991 C19.7431264,47.2799991 19.2831264,47.7399991 19.2831264,48.3049991 C19.2831264,48.8724991 19.7431264,49.331249 20.3106264,49.331249 M22.6193764,37.8499985 C23.1856264,37.8499985 23.6431264,37.3924985 23.6431264,36.8262485 C23.6431264,36.2587485 23.1856264,35.7999985 22.6193764,35.7999985 C22.0531264,35.7999985 21.5931264,36.2587486 21.5931264,36.8262485 C21.5931264,37.3924985 22.0531264,37.8499985 22.6193764,37.8499985 M22.6193764,42.4462486 C23.1856264,42.4462486 23.6431264,41.9887486 23.6431264,41.4224986 C23.6431264,40.8549986 23.1856264,40.3974986 22.6193764,40.3974986 C22.0531264,40.3974986 21.5931264,40.8549986 21.5931264,41.4224986 C21.5931264,41.9887486 22.0531264,42.4462486 22.6193764,42.4462486 M22.6193764,47.0449985 C23.1856261,47.0437501 23.6431257,46.585 23.6431257,46.02125 C23.6431257,45.4549999 23.1856261,44.99375 22.619376,44.99375 C22.053126,44.99375 21.593126,45.455 21.593126,46.02125 C21.593126,46.585 22.053126,47.04375 22.619376,47.045 M22.619376,51.6400002 C23.185626,51.6400002 23.643126,51.1825002 23.643126,50.6150002 C23.643126,50.0487502 23.185626,49.5900002 22.619376,49.5900002 C22.053126,49.5900002 21.593126,50.0487502 21.593126,50.6150002 C21.593126,51.1825002 22.053126,51.6400002 22.619376,51.6400002 M24.8818759,44.7575001 C25.4518759,44.7575001 25.909376,44.2975001 25.909376,43.7337501 C25.909376,43.1662501 25.451876,42.7075001 24.8818759,42.7075001 C24.316876,42.7075001 23.8581259,43.1662501 23.8581259,43.7337501 C23.8581259,44.2987501 24.316876,44.7575001 24.8818759,44.7575001 M24.8818759,49.33125 C25.4518759,49.33125 25.909376,48.8725 25.909376,48.305 C25.909376,47.74 25.451876,47.28125 24.8818759,47.28 C24.316876,47.28 23.8581259,47.74 23.8581259,48.305 C23.8581259,48.8725 24.316876,49.33125 24.8818759,49.33125 M24.9056259,38.1112502 C24.338126,38.1112502 23.8818759,38.5687502 23.879376,39.1362502 C23.879376,39.7025002 24.338126,40.1612502 24.9056259,40.1612502 C25.471876,40.1612502 25.929376,39.7025002 25.929376,39.1362502 C25.929376,38.5687502 25.4706259,38.1112502 24.9056259,38.1112502 M27.1693759,47.0437501 C27.7381259,47.0437501 28.196876,46.5850001 28.196876,46.0212501 C28.196876,45.4550001 27.7381259,44.9937501 27.1693759,44.9937501 C26.6043759,44.9937501 26.1443759,45.455 26.1443759,46.0212501 C26.1443759,46.5850001 26.6043759,47.0437501 27.1693759,47.0437501 M27.1918759,40.3975002 C26.6281259,40.3975002 26.1681259,40.8550002 26.1681259,41.4225002 C26.1681259,41.9887502 26.6281259,42.4462502 27.1918759,42.4462502 C27.7606259,42.4462502 28.2168759,41.9887502 28.2168759,41.4225002 C28.2168759,40.8550002 27.7581259,40.3975002 27.1918759,40.3975002 M18.0206261,35.845 C17.4556262,35.845 16.9981261,36.30375 16.9981261,36.8725 C16.9981261,37.43875 17.4556261,37.8975 18.0206261,37.8975 C18.5906261,37.8975 19.0468761,37.43875 19.0468761,36.8725 C19.0468761,36.3025 18.5906261,35.845 18.0206261,35.845 M32.0406258,43.7337501 C32.0406258,44.3843893 31.9876847,45.0226659 31.885873,45.644503 C30.9736976,51.2158133 26.1386109,55.4675002 20.3081262,55.4675002 C13.8281262,55.4675002 8.57437609,50.2137501 8.57437609,43.7337501 C8.57437609,37.2525002 13.8281262,32 20.3081262,32 C26.7893761,32 32.0406258,37.2525002 32.0406258,43.7337501 Z M32.0406258,43.7337501" id="path2520" fill="url(#radialGradient-3)"></path>
         <g id="g2512" fill="rgb(37,41,44)">
-            <path d="M47.5,41.2337501 C48.35875,42.0925001 49.5,42.5637501 50.715,42.5637501 C51.9287501,42.5637501 53.07125,42.0925001 53.9300001,41.2325 C54.78625,40.3737501 55.2625,39.2312501 55.2625,38.0175002 C55.2625,36.8025 54.7887498,35.66 53.9300001,34.8012502 C53.0712497,33.9424999 51.92875,33.4700001 50.715,33.4700001 C49.5,33.4700001 48.35875,33.9424999 47.5,34.8012502 C45.7275,36.5750001 45.7275,39.4600001 47.5,41.2337501 M50.715,32.6075001 C52.1600001,32.6075001 53.5187501,33.1700001 54.5412502,34.19125 C55.5650002,35.2125 56.1262502,36.5725 56.1262502,38.0175002 C56.1262502,39.4625002 55.5625002,40.8212502 54.5412502,41.8437503 C53.5187501,42.8662503 52.1600002,43.4287503 50.715,43.4287503 C49.2687501,43.4287503 47.91125,42.8662503 46.8900001,41.8437503 C44.7800002,39.7337503 44.7800002,36.3012503 46.8900001,34.19125 C47.9112501,33.1700001 49.2687501,32.6075001 50.715,32.6075001" id="path2514"></path>
+            <path d="M46.5,41.2337501 C47.35875,42.0925001 48.5,42.5637501 49.715,42.5637501 C50.9287501,42.5637501 52.07125,42.0925001 52.9300001,41.2325 C53.78625,40.3737501 54.2625,39.2312501 54.2625,38.0175002 C54.2625,36.8025 53.7887498,35.66 52.9300001,34.8012502 C52.0712497,33.9424999 50.92875,33.4700001 49.715,33.4700001 C48.5,33.4700001 47.35875,33.9424999 46.5,34.8012502 C44.7275,36.5750001 44.7275,39.4600001 46.5,41.2337501 M49.715,32.6075001 C51.1600001,32.6075001 52.5187501,33.1700001 53.5412502,34.19125 C54.5650002,35.2125 55.1262502,36.5725 55.1262502,38.0175002 C55.1262502,39.4625002 54.5625002,40.8212502 53.5412502,41.8437503 C52.5187501,42.8662503 51.1600002,43.4287503 49.715,43.4287503 C48.2687501,43.4287503 46.91125,42.8662503 45.8900001,41.8437503 C43.7800002,39.7337503 43.7800002,36.3012503 45.8900001,34.19125 C46.9112501,33.1700001 48.2687501,32.6075001 49.715,32.6075001" id="path2514"></path>
         </g>
         <g id="g2508" fill="rgb(37,41,44)">
-            <path d="M52.415,38.4500001 L53.4387501,40.3425 C53.53,40.5100001 53.50125,40.7200001 53.365,40.8550001 C53.2293737,40.9893823 53.02125,41.0175 52.8525,40.9275002 L50.96625,39.9012501 C50.20625,40.1375 49.34625,39.965 48.7437499,39.3625001 C47.8812501,38.4987502 47.8812501,37.0962501 48.7437499,36.2337501 C49.608125,35.3693748 51.01125,35.3687501 51.875,36.2337501 C52.475,36.8337501 52.65,37.6925002 52.415,38.4500001 Z M52.415,38.4500001" id="path2510" fill="url(#radialGradient-4)"></path>
+            <path d="M51.415,38.4500001 L52.4387501,40.3425 C52.53,40.5100001 52.50125,40.7200001 52.365,40.8550001 C52.2293737,40.9893823 52.02125,41.0175 51.8525,40.9275002 L49.96625,39.9012501 C49.20625,40.1375 48.34625,39.965 47.7437499,39.3625001 C46.8812501,38.4987502 46.8812501,37.0962501 47.7437499,36.2337501 C48.608125,35.3693748 50.01125,35.3687501 50.875,36.2337501 C51.475,36.8337501 51.65,37.6925002 51.415,38.4500001 Z M51.415,38.4500001" id="path2510" fill="url(#radialGradient-4)"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/supercollection.svg b/data/images/supercollection.svg
index e22cac7a5..d9d42ae2d 100644
--- a/data/images/supercollection.svg
+++ b/data/images/supercollection.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="62px" height="62px" 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="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">
     <title>supercollection</title>
     <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
     <defs>
@@ -7,11 +7,11 @@
             <stop stop-color="rgb(152,169,199)" offset="0%"></stop>
             <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
         </radialGradient>
-        <path d="M3.60763874,20.4675003 C3.60763874,18.3100003 5.39131933,16.5562503 7.59259259,16.5562503 C9.79131944,16.5562503 11.5762731,18.3100003 11.5762731,20.4675003 C11.5762731,22.6300004 9.79131944,24.3800004 7.59259259,24.3800004 C5.39131948,24.3800004 3.60763874,22.6300004 3.60763874,20.4675003 Z M23.8703704,41.1300004 L22.3247685,43.9587504 C21.9708334,44.6062503 21.150926,44.8525003 20.4863426,44.5025003 C19.8268517,44.1562504 19.5773148,43.3475005 19.9312499,42.6975003 L21.4806712,39.8687503 C21.7225693,39.4225003 22.1910879,39.1650003 22.6761573,39.1650003 C22.8925925,39.1650003 23.1128471,39.2175003 23.317824,39.3250003 C23.9773148,39.6725004 24.2255787,40.4812504 23.8703704,41.1300004 Z M17.6848381,56.5425005 C17.6848381,58.7025002 15.9024306,60.4550007 13.7037037,60.4550007 C11.5024306,60.4550007 9.71874985,58.7025002 9.71874985,56.5425005 C9.71874985,54.3812504 11.5024306,52.6300004 13.7037037,52.6300004 C15.9024306,52.6300004 17.6848381,54.3812504 17.6848381,56.5425005 Z M50.625,60.3762502 C47.2829861,60.3762502 44.5584492,57.7062503 44.5584492,54.4200004 C44.5584492,53.3725004 44.8385418,52.3900004 45.3236113,51.5325004 L31.4857635,37.2750003 C30.2291663,38.0225003 28.7612263,38.4575002 27.1914349,38.4575002 C22.5928238,38.4575002 18.854861,34.7875001 18.854861,30.2750002 C18.854861,25.7650002 22.5928241,22.0937501 27.1914349,22.0937501 C27.2767359,22.0937501 27.3543979,22.1025001 27.4422451,22.1050001 L30.5334488,10.1937498 C28.8057868,9.14249976 27.6446756,7.26874989 27.6446756,5.12999964 C27.6446756,1.84499961 30.3692127,-0.825000286 33.713773,-0.825000286 C36.6355271,-0.825000286 39.0818062,1.21415952 39.6522293,3.92089705 C39.7345264,4.31140862 39.7777777,4.7158158 39.7777777,5.12999964 C39.7777777,8.3062495 37.2314814,10.9012498 34.0409721,11.0699995 L30.9484954,22.9824991 C33.6590277,24.3324992 35.5229166,27.0924993 35.5229166,30.2749993 C35.5229166,31.9587493 35.002199,33.5262493 34.1097221,34.8274992 L47.9488423,49.0837489 C48.7560183,48.6899989 49.6637729,48.4637489 50.6249997,48.4637489 C53.9721062,48.4637489 56.6940972,51.134999 56.6940972,54.4199987 C56.6940975,57.7062503 53.9721067,60.3762502 50.625,60.3762502 Z M16.7592593,26.6300004 L13.5929398,24.9112504 C12.9347222,24.5537504 12.6953704,23.7425004 13.0607639,23.1000004 C13.3077546,22.6600004 13.7711806,22.4112504 14.2486111,22.4112504 C14.4701389,22.4112504 14.6967593,22.4650004 14.9042824,22.5775004 L18.0706019,24.2987504 C18.7288195,24.6550004 18.9668981,25.4650004 18.6040509,26.1112504 C18.2412037,26.7550004 17.4136574,26.9887504 16.7592593,26.6300004 Z M46.3866899,20.4675003 C46.3866899,18.3100003 48.1690973,16.5575002 50.3703704,16.5575002 C52.5703704,16.5575002 54.3540509,18.3100002 54.3540509,20.4675003 C54.3540509,22.6300004 52.5703704,24.3800004 50.3703704,24.3800004 C48.1690973,24.3800004 46.3866899,22.6300004 46.3866899,20.4675003 Z M19.8148148,48.1300004 L18.269213,50.9587504 C17.9152778,51.6062503 17.0953705,51.8525003 16.430787,51.5025003 C15.7712961,51.1562504 15.5217593,50.3475005 15.8756943,49.6975003 L17.4251156,46.8687503 C17.6670138,46.4225003 18.1355323,46.1650003 18.6206017,46.1650003 C18.8370369,46.1650003 19.0572916,46.2175003 19.2622684,46.3250003 C19.9217593,46.6725004 20.1700232,47.4812504 19.8148148,48.1300004 Z M43.4953704,25.1300004 L40.3481483,26.8925004 C39.6975694,27.2562504 38.8687499,27.0337504 38.4957175,26.3962504 C38.1265046,25.7550004 38.3518519,24.9425004 39.0011574,24.5762504 L42.1445604,22.8137505 C42.3609955,22.6950005 42.5888891,22.6387505 42.820602,22.6387505 C43.2891206,22.6387505 43.7474539,22.8812505 43.9982641,23.3125004 C44.3700231,23.9512504 44.1421297,24.7650004 43.4953704,25.1300004 Z M43.4953704,25.1300004" id="path-2"></path>
+        <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>
     </defs>
     <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
         <g id="Group">
-            <use id="path2722" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
+            <use id="path2722" stroke="rgb(254,255,254)" stroke-width="1" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
             <use id="path2722-1" stroke="none" fill="none" xlink:href="#path-2"></use>
         </g>
     </g>
diff --git a/data/images/view-toggle-active-centre.svg b/data/images/view-toggle-active-centre.svg
new file mode 100644
index 000000000..e2b7c72cb
--- /dev/null
+++ b/data/images/view-toggle-active-centre.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="38px" height="38px" 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>view-toggle-active-centre</title>
+    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
+    <defs>
+        <linearGradient x1="50%" y1="173.920641%" x2="50%" y2="0%" id="linearGradient-1">
+            <stop stop-color="rgb(254,255,254)" offset="0%"></stop>
+            <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
+        <path d="M0,0 L0,38 L38,38 L38,0 L0,0 Z M0,0" id="Rectangle 1" stroke="rgb(150,150,150)" stroke-width="1" fill="url(#linearGradient-1)"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/images/view-toggle-active-left.svg b/data/images/view-toggle-active-left.svg
new file mode 100644
index 000000000..3ffc30e13
--- /dev/null
+++ b/data/images/view-toggle-active-left.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="38px" height="38px" 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>view-toggle-active-left</title>
+    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
+    <defs>
+        <linearGradient x1="50%" y1="173.920641%" x2="50%" y2="0%" id="linearGradient-1">
+            <stop stop-color="rgb(254,255,254)" offset="0%"></stop>
+            <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
+        <path d="M11.9973518,0 C5.37139735,0 0,5.36387601 0,11.9973518 L0,26.0026482 C0,32.6286026 5.36387601,38 11.9973518,38 L38,38 L38,0 L11.9973518,0 Z M11.9973518,0" id="Rectangle 2" stroke="rgb(150,150,150)" stroke-width="1" fill="url(#linearGradient-1)"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/images/view-toggle-active-right.svg b/data/images/view-toggle-active-right.svg
new file mode 100644
index 000000000..7f45e334d
--- /dev/null
+++ b/data/images/view-toggle-active-right.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="38px" height="38px" 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>view-toggle-active-right</title>
+    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
+    <defs>
+        <linearGradient x1="50%" y1="173.920641%" x2="50%" y2="0%" id="linearGradient-1">
+            <stop stop-color="rgb(254,255,254)" offset="0%"></stop>
+            <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
+        <path d="M0,0 L0,38 L26.0026482,38 C32.6286026,38 38,32.636124 38,26.0026482 L38,11.9973518 C38,5.37139735 32.636124,0 26.0026482,0 L0,0 Z M0,0" id="Rectangle 2" stroke="rgb(150,150,150)" stroke-width="1" fill="url(#linearGradient-1)"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/images/view-toggle-pressed-left.svg b/data/images/view-toggle-pressed-left.svg
index 3561d5400..7ea9c32f7 100644
--- a/data/images/view-toggle-pressed-left.svg
+++ b/data/images/view-toggle-pressed-left.svg
@@ -3,12 +3,12 @@
     <title>view-toggle-pressed-left</title>
     <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
     <defs>
-        <linearGradient x1="50%" y1="173.920641%" x2="50%" y2="0%" id="linearGradient-1">
-            <stop stop-color="rgb(254,255,254)" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
-        </linearGradient>
+        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="57.2162807%" id="radialGradient-1">
+            <stop stop-color="rgb(6,6,6)" offset="0%"></stop>
+            <stop stop-color="rgb(99,97,97)" offset="100%"></stop>
+        </radialGradient>
     </defs>
     <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M11.9973518,0 C5.37139735,0 0,5.36387601 0,11.9973518 L0,26.0026482 C0,32.6286026 5.36387601,38 11.9973518,38 L38,38 L38,0 L11.9973518,0 Z M11.9973518,0" id="Rectangle 2" stroke="rgb(150,150,150)" stroke-width="1" fill="url(#linearGradient-1)"></path>
+        <path d="M0,0 L0,38 L29.9992049,38 C34.417922,38 38,34.4250523 38,29.9992049 L38,8.00079513 C38,3.582078 34.4250523,0 29.9992049,0 L0,0 Z M0,0" id="Rectangle 1" stroke="rgb(150,150,150)" stroke-width="1" fill="url(#radialGradient-1)"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/images/view-toggle-pressed-right.svg b/data/images/view-toggle-pressed-right.svg
index 43b4ca8bb..c58c0ad03 100644
--- a/data/images/view-toggle-pressed-right.svg
+++ b/data/images/view-toggle-pressed-right.svg
@@ -3,12 +3,12 @@
     <title>view-toggle-pressed-right</title>
     <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
     <defs>
-        <linearGradient x1="50%" y1="173.920641%" x2="50%" y2="0%" id="linearGradient-1">
-            <stop stop-color="rgb(254,255,254)" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
-        </linearGradient>
+        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="57.2162807%" id="radialGradient-1">
+            <stop stop-color="rgb(6,6,6)" offset="0%"></stop>
+            <stop stop-color="rgb(99,97,97)" offset="100%"></stop>
+        </radialGradient>
     </defs>
     <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M0,0 L0,38 L26.0026482,38 C32.6286026,38 38,32.636124 38,26.0026482 L38,11.9973518 C38,5.37139735 32.636124,0 26.0026482,0 L0,0 Z M0,0" id="Rectangle 2" stroke="rgb(150,150,150)" stroke-width="1" fill="url(#linearGradient-1)"></path>
+        <path d="M8.00079513,0 C3.582078,0 0,3.57494774 0,8.00079513 L0,29.9992049 C0,34.417922 3.57494774,38 8.00079513,38 L38,38 L38,0 L8.00079513,0 Z M8.00079513,0" id="Rectangle 1" stroke="rgb(150,150,150)" stroke-width="1" fill="url(#radialGradient-1)"></path>
     </g>
 </svg>
\ No newline at end of file