diff --git a/data/images/shuffle-off-pressed.svg b/data/images/shuffle-off-pressed.svg
index ab5d146e1..f7271fd3c 100644
--- a/data/images/shuffle-off-pressed.svg
+++ b/data/images/shuffle-off-pressed.svg
@@ -5,9 +5,9 @@
     <defs></defs>
     <g id="Page 1" fill="rgb(223,223,223)" fill-rule="evenodd">
         <g id="Group" fill="rgb(0,0,0)">
-            <path d="M7.77301025,20.2530518 L16.6990099,20.2530518 C16.7240099,20.2530518 18.0540099,20.2830518 19.2910099,21.5430517 C19.9390099,19.8940517 20.7850099,18.4870517 21.7580099,17.3010516 C19.9980099,15.9400517 18.0720098,15.4490516 16.6990099,15.4490516 L7.77301025,15.4490516 C6.44701028,15.4490516 5.3710103,16.5230516 5.3710103,17.8510516 C5.37097168,19.1779785 6.44702148,20.2530518 7.77301025,20.2530518 C7.77301025,20.2530518 6.44702148,20.2530518 7.77301025,20.2530518 L7.77301025,20.2530518" id="Shape" fill="rgb(79,79,79)"></path>
-            <path d="M32.4860229,20.2530518 L38.7650228,20.2530518 L38.7650228,24.7340517 C38.7650228,25.1210517 38.9830227,25.4750517 39.3270227,25.6510517 C39.4740227,25.7260517 39.6350227,25.7630517 39.7940227,25.7630517 C40.0080227,25.7630517 40.2200227,25.6970517 40.3990228,25.5660517 L49.8750226,18.6830518 C50.1420226,18.4900518 50.3000226,18.1810518 50.3000226,17.8510518 C50.3000226,17.5210517 50.1420226,17.2110518 49.8750226,17.0180518 L40.3990228,10.1350519 C40.0870228,9.90705189 39.6700228,9.87405188 39.3270227,10.0500519 C38.9820227,10.2260519 38.7650228,10.5810519 38.7650228,10.9680519 L38.7650228,15.4480519 L32.4840226,15.4480519 C30.0310225,15.4490519 26.0760226,16.6740518 23.5990224,20.558052 C23.5680224,20.608052 23.5370224,20.657052 23.5070224,20.707052 C23.1980224,21.205052 22.9150224,21.745052 22.6630224,22.332052 C22.6490224,22.363052 22.6370224,22.394052 22.6240224,22.425052 C21.9210224,24.085052 21.4560224,26.1010522 21.3660224,28.5470522 C21.1040224,35.662052 17.1100223,36.0240525 16.6980222,36.0390524 L7.77202253,36.0390524 C6.44602255,36.0390524 5.37002258,37.1150523 5.37002258,38.4420525 C5.37002258,39.7690526 6.44602255,40.8440524 7.77202253,40.8440524 L16.6980222,40.8440524 C18.9870222,40.8440524 22.8210223,39.4770524 24.8430226,34.9660526 C24.8550226,34.9380526 24.8680226,34.9090526 24.8800226,34.8810526 C25.1070226,34.3670526 25.3080226,33.8140526 25.4830226,33.2160527 C25.4980226,33.1620527 25.5130226,33.1080527 25.5290226,33.0530527 C25.5990226,32.7990527 25.6650226,32.5380527 25.7260226,32.2700527 C25.7380226,32.2160527 25.7510226,32.1640527 25.7630226,32.1090527 C25.8290226,31.7970527 25.8890226,31.4750527 25.9410226,31.1420527 C25.9500226,31.0810527 25.9590226,31.0170527 25.9660226,30.9550527 C26.0070226,30.6800527 26.0410226,30.3950527 26.0700226,30.1050526 C26.0790226,30.0100526 26.0890226,29.9160526 26.0970226,29.8190526 C26.1280226,29.4630526 26.1550226,29.0990526 26.1680226,28.7210526 C26.1760226,28.5230526 26.1880226,28.3320526 26.2010226,28.1430526 L26.2010226,28.1430526 C26.7319946,20.618042 31.9110107,20.2679443 32.4860229,20.2530518 C32.4860229,20.2530518 31.9110107,20.2679443 32.4860229,20.2530518 L32.4860229,20.2530518" id="Shape" fill="rgb(79,79,79)"></path>
-            <path d="M49.8759766,37.6109619 L40.3999767,30.727962 C40.0879767,30.499962 39.6709768,30.467962 39.3279767,30.643962 C38.9829767,30.818962 38.7659767,31.172962 38.7659767,31.561962 L38.7659767,36.0409621 L32.4889768,36.0409621 C32.3479768,36.0409621 30.3989769,36.0049621 28.6999767,34.4059621 C28.1629767,36.1379621 27.4189767,37.6089622 26.5399767,38.8469621 C28.6059766,40.3149621 30.8719764,40.8449621 32.4869767,40.845962 L38.7659765,40.845962 L38.7659765,45.3259621 C38.7659765,45.7139621 38.9839765,46.0669621 39.3279765,46.2429621 C39.4749765,46.3179621 39.6359765,46.3549621 39.7949765,46.3549621 C40.0089765,46.3549621 40.2209765,46.2899621 40.3999765,46.1589621 L49.8759763,39.2759622 C50.1429763,39.0829622 50.3009763,38.7719622 50.3009763,38.4429622 C50.3009763,38.1139622 50.1430054,37.8050537 49.8759766,37.6109619 C49.8759766,37.6109619 50.1430054,37.8050537 49.8759766,37.6109619 L49.8759766,37.6109619" 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(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>
         </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 46fba9c3e..b551ba36d 100644
--- a/data/images/shuffle-off-rest.svg
+++ b/data/images/shuffle-off-rest.svg
@@ -5,9 +5,9 @@
     <defs></defs>
     <g id="Page 1" fill="rgb(223,223,223)" fill-rule="evenodd">
         <g id="Group" fill="rgb(0,0,0)">
-            <path d="M7.77301025,20.2530518 L16.6990099,20.2530518 C16.7240099,20.2530518 18.0540099,20.2830518 19.2910099,21.5430517 C19.9390099,19.8940517 20.7850099,18.4870517 21.7580099,17.3010516 C19.9980099,15.9400517 18.0720098,15.4490516 16.6990099,15.4490516 L7.77301025,15.4490516 C6.44701028,15.4490516 5.3710103,16.5230516 5.3710103,17.8510516 C5.37097168,19.1779785 6.44702148,20.2530518 7.77301025,20.2530518 C7.77301025,20.2530518 6.44702148,20.2530518 7.77301025,20.2530518 L7.77301025,20.2530518" id="Shape" fill="rgb(95,95,95)"></path>
-            <path d="M32.4860229,20.2530518 L38.7650228,20.2530518 L38.7650228,24.7340517 C38.7650228,25.1210517 38.9830227,25.4750517 39.3270227,25.6510517 C39.4740227,25.7260517 39.6350227,25.7630517 39.7940227,25.7630517 C40.0080227,25.7630517 40.2200227,25.6970517 40.3990228,25.5660517 L49.8750226,18.6830518 C50.1420226,18.4900518 50.3000226,18.1810518 50.3000226,17.8510518 C50.3000226,17.5210517 50.1420226,17.2110518 49.8750226,17.0180518 L40.3990228,10.1350519 C40.0870228,9.90705189 39.6700228,9.87405188 39.3270227,10.0500519 C38.9820227,10.2260519 38.7650228,10.5810519 38.7650228,10.9680519 L38.7650228,15.4480519 L32.4840226,15.4480519 C30.0310225,15.4490519 26.0760226,16.6740518 23.5990224,20.558052 C23.5680224,20.608052 23.5370224,20.657052 23.5070224,20.707052 C23.1980224,21.205052 22.9150224,21.745052 22.6630224,22.332052 C22.6490224,22.363052 22.6370224,22.394052 22.6240224,22.425052 C21.9210224,24.085052 21.4560224,26.1010522 21.3660224,28.5470522 C21.1040224,35.662052 17.1100223,36.0240525 16.6980222,36.0390524 L7.77202253,36.0390524 C6.44602255,36.0390524 5.37002258,37.1150523 5.37002258,38.4420525 C5.37002258,39.7690526 6.44602255,40.8440524 7.77202253,40.8440524 L16.6980222,40.8440524 C18.9870222,40.8440524 22.8210223,39.4770524 24.8430226,34.9660526 C24.8550226,34.9380526 24.8680226,34.9090526 24.8800226,34.8810526 C25.1070226,34.3670526 25.3080226,33.8140526 25.4830226,33.2160527 C25.4980226,33.1620527 25.5130226,33.1080527 25.5290226,33.0530527 C25.5990226,32.7990527 25.6650226,32.5380527 25.7260226,32.2700527 C25.7380226,32.2160527 25.7510226,32.1640527 25.7630226,32.1090527 C25.8290226,31.7970527 25.8890226,31.4750527 25.9410226,31.1420527 C25.9500226,31.0810527 25.9590226,31.0170527 25.9660226,30.9550527 C26.0070226,30.6800527 26.0410226,30.3950527 26.0700226,30.1050526 C26.0790226,30.0100526 26.0890226,29.9160526 26.0970226,29.8190526 C26.1280226,29.4630526 26.1550226,29.0990526 26.1680226,28.7210526 C26.1760226,28.5230526 26.1880226,28.3320526 26.2010226,28.1430526 L26.2010226,28.1430526 C26.7319946,20.618042 31.9110107,20.2679443 32.4860229,20.2530518 C32.4860229,20.2530518 31.9110107,20.2679443 32.4860229,20.2530518 L32.4860229,20.2530518" id="Shape" fill="rgb(96,96,96)"></path>
-            <path d="M49.8759766,37.6109619 L40.3999767,30.727962 C40.0879767,30.499962 39.6709768,30.467962 39.3279767,30.643962 C38.9829767,30.818962 38.7659767,31.172962 38.7659767,31.561962 L38.7659767,36.0409621 L32.4889768,36.0409621 C32.3479768,36.0409621 30.3989769,36.0049621 28.6999767,34.4059621 C28.1629767,36.1379621 27.4189767,37.6089622 26.5399767,38.8469621 C28.6059766,40.3149621 30.8719764,40.8449621 32.4869767,40.845962 L38.7659765,40.845962 L38.7659765,45.3259621 C38.7659765,45.7139621 38.9839765,46.0669621 39.3279765,46.2429621 C39.4749765,46.3179621 39.6359765,46.3549621 39.7949765,46.3549621 C40.0089765,46.3549621 40.2209765,46.2899621 40.3999765,46.1589621 L49.8759763,39.2759622 C50.1429763,39.0829622 50.3009763,38.7719622 50.3009763,38.4429622 C50.3009763,38.1139622 50.1430054,37.8050537 49.8759766,37.6109619 C49.8759766,37.6109619 50.1430054,37.8050537 49.8759766,37.6109619 L49.8759766,37.6109619" 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(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>
         </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 ce6e1ef50..12bc05bb0 100644
--- a/data/images/shuffle-on-pressed.svg
+++ b/data/images/shuffle-on-pressed.svg
@@ -5,9 +5,9 @@
     <defs></defs>
     <g id="Page 1" fill="rgb(223,223,223)" fill-rule="evenodd">
         <g id="Group" fill="rgb(0,0,0)">
-            <path d="M7.77301025,20.2530518 L16.6990099,20.2530518 C16.7240099,20.2530518 18.0540099,20.2830518 19.2910099,21.5430517 C19.9390099,19.8940517 20.7850099,18.4870517 21.7580099,17.3010516 C19.9980099,15.9400517 18.0720098,15.4490516 16.6990099,15.4490516 L7.77301025,15.4490516 C6.44701028,15.4490516 5.3710103,16.5230516 5.3710103,17.8510516 C5.37097168,19.1779785 6.44702148,20.2530518 7.77301025,20.2530518 C7.77301025,20.2530518 6.44702148,20.2530518 7.77301025,20.2530518 L7.77301025,20.2530518" id="Shape" fill="rgb(107,131,17)"></path>
-            <path d="M32.4860229,20.2530518 L38.7650228,20.2530518 L38.7650228,24.7340517 C38.7650228,25.1210517 38.9830227,25.4750517 39.3270227,25.6510517 C39.4740227,25.7260517 39.6350227,25.7630517 39.7940227,25.7630517 C40.0080227,25.7630517 40.2200227,25.6970517 40.3990228,25.5660517 L49.8750226,18.6830518 C50.1420226,18.4900518 50.3000226,18.1810518 50.3000226,17.8510518 C50.3000226,17.5210517 50.1420226,17.2110518 49.8750226,17.0180518 L40.3990228,10.1350519 C40.0870228,9.90705189 39.6700228,9.87405188 39.3270227,10.0500519 C38.9820227,10.2260519 38.7650228,10.5810519 38.7650228,10.9680519 L38.7650228,15.4480519 L32.4840226,15.4480519 C30.0310225,15.4490519 26.0760226,16.6740518 23.5990224,20.558052 C23.5680224,20.608052 23.5370224,20.657052 23.5070224,20.707052 C23.1980224,21.205052 22.9150224,21.745052 22.6630224,22.332052 C22.6490224,22.363052 22.6370224,22.394052 22.6240224,22.425052 C21.9210224,24.085052 21.4560224,26.1010522 21.3660224,28.5470522 C21.1040224,35.662052 17.1100223,36.0240525 16.6980222,36.0390524 L7.77202253,36.0390524 C6.44602255,36.0390524 5.37002258,37.1150523 5.37002258,38.4420525 C5.37002258,39.7690526 6.44602255,40.8440524 7.77202253,40.8440524 L16.6980222,40.8440524 C18.9870222,40.8440524 22.8210223,39.4770524 24.8430226,34.9660526 C24.8550226,34.9380526 24.8680226,34.9090526 24.8800226,34.8810526 C25.1070226,34.3670526 25.3080226,33.8140526 25.4830226,33.2160527 C25.4980226,33.1620527 25.5130226,33.1080527 25.5290226,33.0530527 C25.5990226,32.7990527 25.6650226,32.5380527 25.7260226,32.2700527 C25.7380226,32.2160527 25.7510226,32.1640527 25.7630226,32.1090527 C25.8290226,31.7970527 25.8890226,31.4750527 25.9410226,31.1420527 C25.9500226,31.0810527 25.9590226,31.0170527 25.9660226,30.9550527 C26.0070226,30.6800527 26.0410226,30.3950527 26.0700226,30.1050526 C26.0790226,30.0100526 26.0890226,29.9160526 26.0970226,29.8190526 C26.1280226,29.4630526 26.1550226,29.0990526 26.1680226,28.7210526 C26.1760226,28.5230526 26.1880226,28.3320526 26.2010226,28.1430526 L26.2010226,28.1430526 C26.7319946,20.618042 31.9110107,20.2679443 32.4860229,20.2530518 C32.4860229,20.2530518 31.9110107,20.2679443 32.4860229,20.2530518 L32.4860229,20.2530518" id="Shape" fill="rgb(107,131,17)"></path>
-            <path d="M49.8759766,37.6109619 L40.3999767,30.727962 C40.0879767,30.499962 39.6709768,30.467962 39.3279767,30.643962 C38.9829767,30.818962 38.7659767,31.172962 38.7659767,31.561962 L38.7659767,36.0409621 L32.4889768,36.0409621 C32.3479768,36.0409621 30.3989769,36.0049621 28.6999767,34.4059621 C28.1629767,36.1379621 27.4189767,37.6089622 26.5399767,38.8469621 C28.6059766,40.3149621 30.8719764,40.8449621 32.4869767,40.845962 L38.7659765,40.845962 L38.7659765,45.3259621 C38.7659765,45.7139621 38.9839765,46.0669621 39.3279765,46.2429621 C39.4749765,46.3179621 39.6359765,46.3549621 39.7949765,46.3549621 C40.0089765,46.3549621 40.2209765,46.2899621 40.3999765,46.1589621 L49.8759763,39.2759622 C50.1429763,39.0829622 50.3009763,38.7719622 50.3009763,38.4429622 C50.3009763,38.1139622 50.1430054,37.8050537 49.8759766,37.6109619 C49.8759766,37.6109619 50.1430054,37.8050537 49.8759766,37.6109619 L49.8759766,37.6109619" 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(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>
         </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 67b594d9f..1b70ec51a 100644
--- a/data/images/shuffle-on-rest.svg
+++ b/data/images/shuffle-on-rest.svg
@@ -5,9 +5,9 @@
     <defs></defs>
     <g id="Page 1" fill="rgb(223,223,223)" fill-rule="evenodd">
         <g id="Group" fill="rgb(0,0,0)">
-            <path d="M7.77301025,20.2530518 L16.6990099,20.2530518 C16.7240099,20.2530518 18.0540099,20.2830518 19.2910099,21.5430517 C19.9390099,19.8940517 20.7850099,18.4870517 21.7580099,17.3010516 C19.9980099,15.9400517 18.0720098,15.4490516 16.6990099,15.4490516 L7.77301025,15.4490516 C6.44701028,15.4490516 5.3710103,16.5230516 5.3710103,17.8510516 C5.37101015,19.1779785 6.44702148,20.2530518 7.77301025,20.2530518 C7.77301025,20.2530518 6.44702148,20.2530518 7.77301025,20.2530518 L7.77301025,20.2530518" id="Shape" fill="rgb(120,144,26)"></path>
-            <path d="M32.4860229,20.2530518 L38.7650228,20.2530518 L38.7650228,24.7340517 C38.7650228,25.1210517 38.9830227,25.4750517 39.3270227,25.6510517 C39.4740227,25.7260517 39.6350227,25.7630517 39.7940227,25.7630517 C40.0080227,25.7630517 40.2200227,25.6970517 40.3990228,25.5660517 L49.8750226,18.6830518 C50.1420226,18.4900518 50.3000226,18.1810518 50.3000226,17.8510518 C50.3000226,17.5210517 50.1420226,17.2110518 49.8750226,17.0180518 L40.3990228,10.1350519 C40.0870228,9.90705189 39.6700228,9.87405188 39.3270227,10.0500519 C38.9820227,10.2260519 38.7650228,10.5810519 38.7650228,10.9680519 L38.7650228,15.4480519 L32.4840226,15.4480519 C30.0310225,15.4490519 26.0760226,16.6740518 23.5990224,20.558052 C23.5680224,20.608052 23.5370224,20.657052 23.5070224,20.707052 C23.1980224,21.205052 22.9150224,21.745052 22.6630224,22.332052 C22.6490224,22.363052 22.6370224,22.394052 22.6240224,22.425052 C21.9210224,24.085052 21.4560224,26.1010522 21.3660224,28.5470522 C21.1040224,35.662052 17.1100223,36.0240525 16.6980222,36.0390524 L7.77202253,36.0390524 C6.44602255,36.0390524 5.37002258,37.1150523 5.37002258,38.4420525 C5.37002258,39.7690526 6.44602255,40.8440524 7.77202253,40.8440524 L16.6980222,40.8440524 C18.9870222,40.8440524 22.8210223,39.4770524 24.8430226,34.9660526 C24.8550226,34.9380526 24.8680226,34.9090526 24.8800226,34.8810526 C25.1070226,34.3670526 25.3080226,33.8140526 25.4830226,33.2160527 C25.4980226,33.1620527 25.5130226,33.1080527 25.5290226,33.0530527 C25.5990226,32.7990527 25.6650226,32.5380527 25.7260226,32.2700527 C25.7380226,32.2160527 25.7510226,32.1640527 25.7630226,32.1090527 C25.8290226,31.7970527 25.8890226,31.4750527 25.9410226,31.1420527 C25.9500226,31.0810527 25.9590226,31.0170527 25.9660226,30.9550527 C26.0070226,30.6800527 26.0410226,30.3950527 26.0700226,30.1050526 C26.0790226,30.0100526 26.0890226,29.9160526 26.0970226,29.8190526 C26.1280226,29.4630526 26.1550226,29.0990526 26.1680226,28.7210526 C26.1760226,28.5230526 26.1880226,28.3320526 26.2010226,28.1430526 L26.2010226,28.1430526 C26.7319946,20.618042 31.9110107,20.2679443 32.4860229,20.2530518 C32.4860229,20.2530518 31.9110107,20.2679443 32.4860229,20.2530518 L32.4860229,20.2530518" id="Shape" fill="rgb(120,144,26)"></path>
-            <path d="M49.8759766,37.6109619 L40.3999767,30.727962 C40.0879767,30.499962 39.6709768,30.467962 39.3279767,30.643962 C38.9829767,30.818962 38.7659767,31.172962 38.7659767,31.561962 L38.7659767,36.0409621 L32.4889768,36.0409621 C32.3479768,36.0409621 30.3989769,36.0049621 28.6999767,34.4059621 C28.1629767,36.1379621 27.4189767,37.6089622 26.5399767,38.8469621 C28.6059766,40.3149621 30.8719764,40.8449621 32.4869767,40.845962 L38.7659765,40.845962 L38.7659765,45.3259621 C38.7659765,45.7139621 38.9839765,46.0669621 39.3279765,46.2429621 C39.4749765,46.3179621 39.6359765,46.3549621 39.7949765,46.3549621 C40.0089765,46.3549621 40.2209765,46.2899621 40.3999765,46.1589621 L49.8759763,39.2759622 C50.1429763,39.0829622 50.3009763,38.7719622 50.3009763,38.4429622 C50.3009763,38.1139622 50.1430054,37.8050537 49.8759766,37.6109619 C49.8759766,37.6109619 50.1430054,37.8050537 49.8759766,37.6109619 L49.8759766,37.6109619" 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(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>
         </g>
     </g>
 </svg>
\ No newline at end of file