diff --git a/res/skins/LateNight/button_hotcue.xml b/res/skins/LateNight/button_hotcue.xml
index 3c0c98fd059..b9d2c178d3c 100644
--- a/res/skins/LateNight/button_hotcue.xml
+++ b/res/skins/LateNight/button_hotcue.xml
@@ -1,14 +1,35 @@
 <!-- A hotcue button. The only variable that needs to be specified is "number" -->
 <Template>
-  <Template src="skin:button_2state_right_display.xml">
-    <SetVariable name="TooltipId">hotcue</SetVariable>
-    <SetVariable name="state_0_pressed">hotcue_<Variable name="number"/>_down.svg</SetVariable>
-    <SetVariable name="state_0_unpressed">hotcue_<Variable name="number"/>.svg</SetVariable>
-    <SetVariable name="state_1_pressed">hotcue_<Variable name="number"/>_overdown.svg</SetVariable>
-    <SetVariable name="state_1_unpressed">hotcue_<Variable name="number"/>_over.svg</SetVariable>
-    <SetVariable name="ConfigKey"><Variable name="group"/>,hotcue_<Variable name="number"/>_activate</SetVariable>
-    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,hotcue_<Variable name="number"/>_clear</SetVariable>
-    <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,hotcue_<Variable name="number"/>_enabled</SetVariable>
-    <SetVariable name="Size">26,26</SetVariable>
-  </Template>
+  <PushButton>
+    <TooltipId>hotcue</TooltipId>
+    <ObjectName>HotcueButton</ObjectName>
+    <Size>26f,26f</Size>
+    <NumberStates>2</NumberStates>
+    <State>
+      <Number>0</Number>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>_unset.svg</Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>_pressed.svg</Pressed>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>_pressed.svg</Pressed>
+    </State>
+    <Connection>
+      <ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_activate</ConfigKey>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+    <Connection>
+      <ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_clear</ConfigKey>
+      <ButtonState>RightButton</ButtonState>
+    </Connection>
+    <Connection>
+      <ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_enabled</ConfigKey>
+      <ConnectValueFromWidget>false</ConnectValueFromWidget>
+    </Connection>
+    <Connection>
+      <ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_color_id</ConfigKey>
+      <BindProperty>highlight</BindProperty>
+    </Connection>
+  </PushButton>
 </Template>
diff --git a/res/skins/LateNight/button_special_cue.xml b/res/skins/LateNight/button_special_cue.xml
index 7e79d39dac8..57897097fc3 100644
--- a/res/skins/LateNight/button_special_cue.xml
+++ b/res/skins/LateNight/button_special_cue.xml
@@ -17,17 +17,13 @@ Variables:
     <RightClickIsPushButton>true</RightClickIsPushButton>
     <State>
       <Number>0</Number>
-      <Text><Variable name="label"/></Text>
-      <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="cue_type"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="cue_type"/>_pressed.svg</Pressed>
     </State>
     <State>
       <Number>1</Number>
-      <Text><Variable name="label"/></Text>
-      <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
+      <Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="cue_type"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="cue_type"/>_pressed.svg</Pressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="group"/>,<Variable name="cue_type"/>_activate</ConfigKey>
diff --git a/res/skins/LateNight/buttons/btn_cue_N_set.svg b/res/skins/LateNight/buttons/btn_cue_N_set.svg
new file mode 100644
index 00000000000..7825fd65ed9
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_cue_N_set.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><g display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_cue_over.svg b/res/skins/LateNight/buttons/btn_cue_over.svg
index ae5bb4a5f8f..15c5c6dfb0d 100644
--- a/res/skins/LateNight/buttons/btn_cue_over.svg
+++ b/res/skins/LateNight/buttons/btn_cue_over.svg
@@ -1 +1 @@
-<svg id="svg2" width="52" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs id="defs4"><linearGradient id="linearGradient3143" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.1304 0 0 1 -85.881 -1007)" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient3801-6-9-9-36-0"/><linearGradient id="linearGradient4090" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.1304 0 0 1 -63.27 -1075.3)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-95-7" stop-color="#ce0e0e" offset="0"/><stop id="stop4329-2-5" stop-color="#d00" offset=".28"/><stop id="stop3805-5-28-1-3" stop-color="#8d0000" offset="1"/></linearGradient><linearGradient id="linearGradient4127" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.1304 0 0 1 -40.74 -1071.6)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-95-6-9" stop-color="#ce520e" offset="0"/><stop id="stop4329-2-7-1" stop-color="#dd4e00" offset=".28"/><stop id="stop3805-5-28-1-5-2" stop-color="#8d3200" offset="1"/></linearGradient><linearGradient id="linearGradient4164" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.1304 0 0 1 -82.932 -1079.7)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-95-7-3" stop-color="#6e6e6e" offset="0"/><stop id="stop4329-2-5-6" stop-color="#696969" offset=".28"/><stop id="stop3805-5-28-1-3-0" stop-color="#474747" offset="1"/></linearGradient><linearGradient id="linearGradient4969" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.1304 0 0 1 -17.423 -1066.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-95-6-9-1" stop-color="#ca7d0e" offset="0"/><stop id="stop4329-2-7-1-8" stop-color="#be5e00" offset=".28"/><stop id="stop3805-5-28-1-5-2-7" stop-color="#884300" offset="1"/></linearGradient><linearGradient id="linearGradient3801-6-9-9-36-0"><stop id="stop4329-2-5-3" stop-color="#dd7200" offset="0"/><stop id="stop3805-5-28-1-3-7" stop-color="#8d2800" offset="1"/></linearGradient><linearGradient id="linearGradient5006" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.1304 0 0 1 -63.316 -1039.4)" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient3801-6-9-9-36-0"/><linearGradient id="linearGradient3308" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.1304 0 0 1 -.56521 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-95-7-7" stop-color="#ce0e0e" offset="0"/><stop id="stop4329-2-5-5" stop-color="#d00" offset=".28"/><stop id="stop3805-5-28-1-3-3" stop-color="#8d0000" offset="1"/></linearGradient></defs><rect id="rect3029-6-6-3" x="1" y="1" width="50" height="24" rx="2" ry="2" color="#000000" opacity=".9"/><path id="rect3029-6-65" d="m50.812 2.1875c0.11153 0.24962 0.1875 0.5205 0.1875 0.8125v20c0 1.108-0.892 2-2 2h-46c-0.292 0-0.56288-0.075973-0.8125-0.1875 0.31167 0.69758 0.9965 1.1875 1.8125 1.1875h46c1.108 0 2-0.892 2-2v-20c0-0.816-0.48992-1.5008-1.1875-1.8125z" color="#000000" fill="#060606" opacity=".62085"/><rect id="rect3029-96-3" x="-84.816" y="19.866" width="49" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient3143)"/><rect id="rect3029-96-3-5-56" x=".5" y=".49998" width="49" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient3308)"/><path id="rect3029-96" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h46c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h45.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-45.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#aaa" style="block-progression:tb;text-indent:0;text-transform:none"/><g id="g6087" fill="#fff"><path id="path6038" d="m20 9h-7v6h7v-1h-5v-4h5v-1"/><path id="path6042" d="m22 9v6h7v-6h-2v5h-3v-5h-2"/><path id="path6046" d="m31 9v6h7v-1h-5v-2h4v-1h-4v-1h5v-1h-7"/></g><g id="g6078" fill="#3d0000"><path id="path6050" d="m21 10h-6v4h1v-3h5v-1"/><path id="path6054" d="m21 15v1h-7v-1h7"/><path id="path6058" d="m24 10h1v4h-1v-4"/><path id="path6062" d="m23 15v1h7v-6h-1v5h-6"/><path id="path6066" d="m39 10h-6v1h6v-1"/><path id="path6070" d="m38 12h-5v2h1v-1h4v-1"/><path id="path6074" d="m39 15v1h-7v-1h7"/></g><rect id="rect3029-96-3-5-6" x="-81.867" y="-52.859" width="49" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient4164)"/><rect id="rect3029-96-3-5" x="-62.205" y="-48.418" width="49" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient4090)"/><rect id="rect3029-96-3-7" x="-39.674" y="-44.717" width="49" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient4127)"/><rect id="rect3029-96-3-7-9" x="-16.358" y="-39.536" width="49" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient4969)"/><rect id="rect3029-96-3-5-5" x="-62.251" y="-12.518" width="49" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient5006)"/></svg>
+<svg width="52" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="a" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.1304 0 0 1 -.56521 -1026.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#ce0e0e" offset="0"/><stop stop-color="#d00" offset=".28"/><stop stop-color="#8d0000" offset="1"/></linearGradient></defs><rect x="1" y="1" width="50" height="24" rx="2" ry="2" color="#000000" opacity=".9"/><path d="m50.812 2.1875c.11153.24962.1875.5205.1875.8125v20c0 1.108-.892 2-2 2h-46c-.292 0-.56288-.075973-.8125-.1875.31167.69758.9965 1.1875 1.8125 1.1875h46c1.108 0 2-.892 2-2v-20c0-.816-.48992-1.5008-1.1875-1.8125z" color="#000000" fill="#060606" opacity=".62085"/><rect x=".5" y=".49998" width="49" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h46c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h45.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-45.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#aaa" style="block-progression:tb;text-indent:0;text-transform:none"/><g fill="#fff"><path d="m20 9h-7v6h7v-1h-5v-4h5v-1"/><path d="m22 9v6h7v-6h-2v5h-3v-5h-2"/><path d="m31 9v6h7v-1h-5v-2h4v-1h-4v-1h5v-1h-7"/></g><g fill="#3d0000"><path d="m21 10h-6v4h1v-3h5v-1"/><path d="m21 15v1h-7v-1h7"/><path d="m24 10h1v4h-1v-4"/><path d="m23 15v1h7v-6h-1v5h-6"/><path d="m39 10h-6v1h6v-1"/><path d="m38 12h-5v2h1v-1h4v-1"/><path d="m39 15v1h-7v-1h7"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_1.svg b/res/skins/LateNight/buttons/btn_hotcue_1.svg
index df586f33047..ed0d6fea65c 100644
--- a/res/skins/LateNight/buttons/btn_hotcue_1.svg
+++ b/res/skins/LateNight/buttons/btn_hotcue_1.svg
@@ -1 +1 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient3807-3" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7" stop-color="#242424" offset="0"/><stop id="stop3805-5" stop-color="#101010" offset="1"/></linearGradient></defs><g id="layer2"><rect id="rect3029-6" x="2" y="2" width="24" height="24" rx="2" ry="2" color="#000000" fill="#060606" opacity=".62085"/><rect id="rect3029-6-6" x="1" y="1" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".72"/><rect id="rect3029" x=".5" y=".49998" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient3807-3)"/><g id="layer6"><path id="path3944" d="m10 9h3v6h-2v-5h-1v-1" fill="#bfbfbf"/><path id="path3948" d="m13 10h1v6h-2v-1h1v-5" fill="#060606"/></g><path id="rect3029-96-0" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="block-progression:tb;text-indent:0;text-transform:none"/></g></svg>
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#888888" style="text-indent:0;text-transform:none"/><path d="m10 9h3v6h-2v-5h-1z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><g display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m10 9h3v6h-2v-5h-1v-1" fill="#dcdcdc"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_1_down.svg b/res/skins/LateNight/buttons/btn_hotcue_1_down.svg
deleted file mode 100644
index 11ea2b78a9f..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_1_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient12786" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-6" stop-color="#222" offset="0"/><stop id="stop3805-5-2" stop-color="#131516" offset="1"/></linearGradient></defs><rect id="rect3029-9" x=".5" y=".49998" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient12786)"/><path id="path3944-9" d="m10 9h3v6h-2v-5h-1v-1" fill="#8d8f90"/><path id="path3948-7" d="m13 10h1v6h-2v-1h1v-5" fill="#080808"/><path id="rect3029-96-0-9" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#454748" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_1_over.svg b/res/skins/LateNight/buttons/btn_hotcue_1_over.svg
deleted file mode 100644
index 11a44c91afb..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_1_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient5287" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-95-1" stop-color="#ce0e0e" offset="0"/><stop id="stop4329-2-8" stop-color="#d00" offset=".28"/><stop id="stop3805-5-28-1-7" stop-color="#8d0000" offset="1"/></linearGradient></defs><rect id="rect3029-6-1" x="2" y="2" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".5"/><rect id="rect3029-6-6-7" x="1" y="1" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".8"/><rect id="rect3029-96-3" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient5287)"/><path id="rect3029-96" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path3944-4" d="m10 9h3v6h-2v-5h-1v-1" fill="#bfbfbf"/><path id="path3948-4" d="m13 10h1v6h-2v-1h1v-5" fill="#3d0000"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_1_overdown.svg b/res/skins/LateNight/buttons/btn_hotcue_1_overdown.svg
deleted file mode 100644
index a5aa3fb795d..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_1_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient12758" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-9" stop-color="#aa1112" offset="0"/><stop id="stop4329-4" stop-color="#b60607" offset=".28"/><stop id="stop3805-5-28-5" stop-color="#760607" offset="1"/></linearGradient></defs><rect id="rect3029-96-4" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient12758)"/><g id="layer9"><path id="path3944-9-6" d="m10 9h3v6h-2v-5h-1v-1" fill="#8d8f90"/><path id="path3948-7-8" d="m13 10h1v6h-2v-1h1v-5" fill="#320202"/></g><path id="rect3029-96-9" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_1_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_1_pressed.svg
new file mode 100644
index 00000000000..6139dc2f9b7
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_1_pressed.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="#db0000"/><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#c8c8c8" style="text-indent:0;text-transform:none"/><path d="m10 9h3v6h-2v-5h-1z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><path d="m10 9h3v6h-2v-5h-1v-1" fill="#fff"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_1_unset.svg b/res/skins/LateNight/buttons/btn_hotcue_1_unset.svg
new file mode 100644
index 00000000000..7116e6c78f2
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_1_unset.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="text-indent:0;text-transform:none"/><path d="m10 9h3v6h-2v-5h-1z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><g display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m10 9h3v6h-2v-5h-1v-1" fill="#dcdcdc"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_2.svg b/res/skins/LateNight/buttons/btn_hotcue_2.svg
index 77abc05c1b1..0f1f1c8d21b 100644
--- a/res/skins/LateNight/buttons/btn_hotcue_2.svg
+++ b/res/skins/LateNight/buttons/btn_hotcue_2.svg
@@ -1 +1 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient3807-3" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7" stop-color="#242424" offset="0"/><stop id="stop3805-5" stop-color="#101010" offset="1"/></linearGradient></defs><g id="layer2"><rect id="rect3029-6" x="2" y="2" width="24" height="24" rx="2" ry="2" color="#000000" fill="#060606" opacity=".62085"/><rect id="rect3029-6-6" x="1" y="1" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".72"/><rect id="rect3029" x=".5" y=".49998" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient3807-3)"/><g id="layer14"><path id="path5770-89-8-1" d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#060606"/><path id="path5770-8-5-6-8" d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#bfbfbf"/></g><path id="rect3029-96-0" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="block-progression:tb;text-indent:0;text-transform:none"/></g></svg>
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#888888" style="text-indent:0;text-transform:none"/><g display="none"><g display="inline"><path d="m10 9h3v6h-2v-5h-1v-1" fill="#dcdcdc"/><path d="m13 10h1v6h-2v-1h1v-5" fill="#323232"/></g></g><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><g display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_2_down.svg b/res/skins/LateNight/buttons/btn_hotcue_2_down.svg
deleted file mode 100644
index 30cd63988e3..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_2_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient3878" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-6" stop-color="#222" offset="0"/><stop id="stop3805-5-2" stop-color="#131516" offset="1"/></linearGradient></defs><g id="layer3"><rect id="rect3029-9" x=".5" y=".49998" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient3878)"/><g id="layer13"><path id="path5770-89-8" d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#080808"/><path id="path5770-8-5-6" d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#8d8f90"/></g><path id="rect3029-96-0-9" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#454748" style="block-progression:tb;text-indent:0;text-transform:none"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_2_over.svg b/res/skins/LateNight/buttons/btn_hotcue_2_over.svg
deleted file mode 100644
index e1ef45f909b..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_2_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient5287" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-95-0" stop-color="#ce0e0e" offset="0"/><stop id="stop4329-2-6" stop-color="#d00" offset=".28"/><stop id="stop3805-5-28-1-2" stop-color="#8d0000" offset="1"/></linearGradient></defs><rect id="rect3029-6-1" x="2" y="2" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".5"/><rect id="rect3029-6-6-7" x="1" y="1" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".8"/><rect id="rect3029-96-3" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient5287)"/><path id="rect3029-96" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path5770" d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#3c0000"/><path id="path5770-8" d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_2_overdown.svg b/res/skins/LateNight/buttons/btn_hotcue_2_overdown.svg
deleted file mode 100644
index 07afdd1e9a0..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_2_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient4370" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-9" stop-color="#aa1112" offset="0"/><stop id="stop4329-4" stop-color="#b60607" offset=".28"/><stop id="stop3805-5-28-5" stop-color="#760607" offset="1"/></linearGradient></defs><g id="layer5"><rect id="rect3029-96-4" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient4370)"/><g id="layer12"><path id="path5770-89" d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#320202"/><path id="path5770-8-5" d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#8d8f90"/></g><path id="rect3029-96-9" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_2_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_2_pressed.svg
new file mode 100644
index 00000000000..4a754c4269d
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_2_pressed.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#fff"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_2_unset.svg b/res/skins/LateNight/buttons/btn_hotcue_2_unset.svg
new file mode 100644
index 00000000000..c4f23805c6b
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_2_unset.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="text-indent:0;text-transform:none"/><g display="none"><g display="inline"><path d="m10 9h3v6h-2v-5h-1v-1" fill="#dcdcdc"/><path d="m13 10h1v6h-2v-1h1v-5" fill="#323232"/></g></g><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><g display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_3.svg b/res/skins/LateNight/buttons/btn_hotcue_3.svg
index 6704b65d1a7..a7cbfdc0144 100644
--- a/res/skins/LateNight/buttons/btn_hotcue_3.svg
+++ b/res/skins/LateNight/buttons/btn_hotcue_3.svg
@@ -1 +1 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient3807-3" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7" stop-color="#242424" offset="0"/><stop id="stop3805-5" stop-color="#101010" offset="1"/></linearGradient></defs><g id="layer2"><rect id="rect3029-6" x="2" y="2" width="24" height="24" rx="2" ry="2" color="#000000" fill="#060606" opacity=".62085"/><rect id="rect3029-6-6" x="1" y="1" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".72"/><rect id="rect3029" x=".5" y=".49998" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient3807-3)"/><g id="layer18"><path id="path6542-5-0" d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#060606"/><path id="path6542-3" d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#bfbfbf"/></g><path id="rect3029-96-0" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="block-progression:tb;text-indent:0;text-transform:none"/></g></svg>
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#888888" style="text-indent:0;text-transform:none"/><g display="none"><g display="inline"><path d="m10 9h3v6h-2v-5h-1v-1" fill="#dcdcdc"/><path d="m13 10h1v6h-2v-1h1v-5" fill="#323232"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><g display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_3_down.svg b/res/skins/LateNight/buttons/btn_hotcue_3_down.svg
deleted file mode 100644
index 2c6895a5c50..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_3_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs id="defs4"><linearGradient id="linearGradient3878" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-6" stop-color="#222" offset="0"/><stop id="stop3805-5-2" stop-color="#131516" offset="1"/></linearGradient></defs><g id="layer15"><image id="image5756" x="39" y="4" width="26" height="26" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABHNCSVQICAgIfAhkiAAAAk9JREFU SIm9ls1OU1EUhb+FJJpYC/oKzI0DmPsAxAkhaZg58Z18AUQkRKMJJA6ZMsF3YCppigMZnOVgn597 uS3BhLLTNL09e+911v5ZrTY2Nt5tbW19Ywl2dnb2/vLy8isw02Qy8fn5+TJw2Nzc5ODg4C1wsbIU hL69Bl6uAti+d5SARd4LztaAZ6sAyUaElwUyGCMRX5QsmISqL4pLFr/Ud+1ZMEqJembhnMU25SkA DfUUXMGUH5xfQ27BKAOhTkKpBgphEqgAxDcWKIdaGcyRSPOBHElS4WWMKlbKQZJJmYXcUilug7uX QnNK5xSXd2mJESJl/1LzJAeAQE6gUt7MCiE5AHVX6TpNdC7b/qd9Ftne3l43JKJK/NxhcIqGqlLK TMxkMmE6nfaCTk5OALi6umJ9bS3zr3XMLOeULqU2MR1K9abj8bjkGOyJbVwnUXUnPW8Y7ruwnw8P ByDJvcItjP0voN3dXWazGaenpz2w2zaP+RCoeOWdOjr6cid4qXYZdleQOT1qQXlBTVaIxM7ODtfX f7JCxMDEzEQiJ8d+lcQLqtMkSCrCQ7JQVgIQo9HzTjGaYpSNToWRi6LA7eIFUA6IqQHknn71ax4i Whe7DWmMtN1ksWMrwTaUoUyQ3e2bm4R1nkmNWH13zF1ON2RUs3f0qqvEUv4s9X5CWjvUegi1j0Og wa52vZqs4HbS77kbs04pB6V7DHs0II1Gow/b29sfl5H8+Pj4583NzXfgh4B14A3xb2X8wFhT4Bdw IeAJ8AJ4BTx9YKC/wG9g9g8RZHBSkFRzuQAAAABJRU5ErkJggg== "/><image id="image5767" x="39" y="-19" width="26" height="26" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABHNCSVQICAgIfAhkiAAAAlNJREFU SIm9lj1uU0EUhb8TIoGihx3YgntE4fQsIKIJkax0NOyJBcS4ikAgJRJl2jRhD26JLCsFKeZQzM+b l/cMKeKMXHhm7r1nzv05tiaTyfuDg4NvbGFdXl5+XC6XX4G1ZrOZr66utoHDdDplsVi8A653toLQ XW+AV7sAth/sJWCT9Ya7MfBiFyDYiGhlgQzGSMSDHAUTULFF8ZHZLnRNOysyCoFyZ+EUxTZ5FwEN 5RZcwJQ2Tp8+t8goAaEqoFQchTABlAHiiQVKrlYCcwykYSDHICHzMkYFKyQnyYTEQm5DKb4G149C A6lziI93LokRIiT7nPMgRwCBHEA5vYkVQnIE1L9SVxXRKW2oynZqkvnpHICTk5PaJXpl/8FmcIgF VaGUmJgv8wUAs9msl/mbmxv2x+PEv+QxsRxIXQhtx1SUOkFXqxXj0ag3J7Zx6USVmfRQMzxkYM/P z3tntgnuJG6j/3+Bjo+PWa/XnbOLi4sO2P01pBB9oGxVzVTTNBsj5Gzn6rmYDNSodUoDapJC5G5M A5oa5sPREevb2+gTHOcrB96QnVaCpCw8BAslJcg0nN+aJKrZ2yvqETIjZ0UpXO8BJYfYNYDc0a9u xqKIlsFumzS2tN3KYrV2ItuoDLmD7LpubiWs2hOoRiD7Jd5hQzOU6JVe1Uospe9S5yekLUeqYa6T WqZdoN6s1latrOD2pltzt8yqVPZS9xTryYDUNM2nw8PDz9sIfnZ29vPu7u478EPAPvCW+G9l9MhY K+AXcC3gGfASeA08f2SgP8BvYP0Xwnh4X0KADAMAAAAASUVORK5CYII= "/></g><g id="layer3"><rect id="rect3029-9" x=".5" y=".49998" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient3878)"/><g id="layer19"><path id="path6542-5" d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#080808"/><path id="path6542" d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#8d8f90"/></g><path id="rect3029-96-0-9" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#454748" style="block-progression:tb;text-indent:0;text-transform:none"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_3_over.svg b/res/skins/LateNight/buttons/btn_hotcue_3_over.svg
deleted file mode 100644
index b5e10e4a15b..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_3_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient5287" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-95-0" stop-color="#ce0e0e" offset="0"/><stop id="stop4329-2-9" stop-color="#d00" offset=".28"/><stop id="stop3805-5-28-1-3" stop-color="#8d0000" offset="1"/></linearGradient></defs><rect id="rect3029-6-1" x="2" y="2" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".5"/><rect id="rect3029-6-6-7" x="1" y="1" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".8"/><rect id="rect3029-96-3" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient5287)"/><path id="rect3029-96" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path6542-5-0-4" d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#3d0000"/><path id="path6542-3-5" d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_3_overdown.svg b/res/skins/LateNight/buttons/btn_hotcue_3_overdown.svg
deleted file mode 100644
index 122a147674b..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_3_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient4370" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-9" stop-color="#aa1112" offset="0"/><stop id="stop4329-4" stop-color="#b60607" offset=".28"/><stop id="stop3805-5-28-5" stop-color="#760607" offset="1"/></linearGradient></defs><g id="layer5"><rect id="rect3029-96-4" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient4370)"/><g id="layer17"><path id="path6542-5-0-4-4" d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#320202"/><path id="path6542-3-5-9" d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#8d8f90"/></g><path id="rect3029-96-9" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_3_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_3_pressed.svg
new file mode 100644
index 00000000000..5a3da3c3421
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_3_pressed.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#fff"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_3_unset.svg b/res/skins/LateNight/buttons/btn_hotcue_3_unset.svg
new file mode 100644
index 00000000000..10f450f24e0
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_3_unset.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="text-indent:0;text-transform:none"/><g display="none"><g display="inline"><path d="m10 9h3v6h-2v-5h-1v-1" fill="#dcdcdc"/><path d="m13 10h1v6h-2v-1h1v-5" fill="#323232"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><g display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_4.svg b/res/skins/LateNight/buttons/btn_hotcue_4.svg
index 4b6f20d5145..87dbdc9160f 100644
--- a/res/skins/LateNight/buttons/btn_hotcue_4.svg
+++ b/res/skins/LateNight/buttons/btn_hotcue_4.svg
@@ -1 +1 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient3807-3" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7" stop-color="#242424" offset="0"/><stop id="stop3805-5" stop-color="#101010" offset="1"/></linearGradient></defs><g id="layer2"><rect id="rect3029-6" x="2" y="2" width="24" height="24" rx="2" ry="2" color="#000000" fill="#060606" opacity=".62085"/><rect id="rect3029-6-6" x="1" y="1" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".72"/><rect id="rect3029" x=".5" y=".49998" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient3807-3)"/><g id="layer22"><path id="path6751-9" d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#060606"/><path id="path6751" d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#bfbfbf"/></g><path id="rect3029-96-0" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="block-progression:tb;text-indent:0;text-transform:none"/></g></svg>
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#888888" style="text-indent:0;text-transform:none"/><g display="none"><g display="inline"><path d="m10 9h3v6h-2v-5h-1v-1" fill="#dcdcdc"/><path d="m13 10h1v6h-2v-1h1v-5" fill="#323232"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><g display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_4_down.svg b/res/skins/LateNight/buttons/btn_hotcue_4_down.svg
deleted file mode 100644
index ff88cd2b23f..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_4_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient3878" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-6" stop-color="#222" offset="0"/><stop id="stop3805-5-2" stop-color="#131516" offset="1"/></linearGradient></defs><g id="layer3"><rect id="rect3029-9" x=".5" y=".49998" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient3878)"/><g id="layer23"><path id="path6751-9-1-3-1" d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#080808"/><path id="path6751-6-3-5" d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#8d8f90"/></g><path id="rect3029-96-0-9" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#454748" style="block-progression:tb;text-indent:0;text-transform:none"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_4_over.svg b/res/skins/LateNight/buttons/btn_hotcue_4_over.svg
deleted file mode 100644
index fa454897116..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_4_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient5287" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-95-9" stop-color="#ce0e0e" offset="0"/><stop id="stop4329-2-1" stop-color="#d00" offset=".28"/><stop id="stop3805-5-28-1-2" stop-color="#8d0000" offset="1"/></linearGradient></defs><rect id="rect3029-6-1" x="2" y="2" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".5"/><rect id="rect3029-6-6-7" x="1" y="1" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".8"/><rect id="rect3029-96-3" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient5287)"/><path id="rect3029-96" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path6751-9-1-3" d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#3d0000"/><path id="path6751-6-3" d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_4_overdown.svg b/res/skins/LateNight/buttons/btn_hotcue_4_overdown.svg
deleted file mode 100644
index 523ee8b0a8e..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_4_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient4370" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-9" stop-color="#aa1112" offset="0"/><stop id="stop4329-4" stop-color="#b60607" offset=".28"/><stop id="stop3805-5-28-5" stop-color="#760607" offset="1"/></linearGradient></defs><g id="layer5"><rect id="rect3029-96-4" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient4370)"/><g id="layer21"><path id="path6751-9-1" d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#320202"/><path id="path6751-6" d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#8d8f90"/></g><path id="rect3029-96-9" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_4_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_4_pressed.svg
new file mode 100644
index 00000000000..bd4d900f2ee
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_4_pressed.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#fff"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_4_unset.svg b/res/skins/LateNight/buttons/btn_hotcue_4_unset.svg
new file mode 100644
index 00000000000..2cbed526d8c
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_4_unset.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="text-indent:0;text-transform:none"/><g display="none"><g display="inline"><path d="m10 9h3v6h-2v-5h-1v-1" fill="#dcdcdc"/><path d="m13 10h1v6h-2v-1h1v-5" fill="#323232"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><g display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_5.svg b/res/skins/LateNight/buttons/btn_hotcue_5.svg
index 69b7ae08ffc..79548f6966e 100644
--- a/res/skins/LateNight/buttons/btn_hotcue_5.svg
+++ b/res/skins/LateNight/buttons/btn_hotcue_5.svg
@@ -1 +1 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient3807-3" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7" stop-color="#242424" offset="0"/><stop id="stop3805-5" stop-color="#101010" offset="1"/></linearGradient></defs><rect id="rect3029-6-0" x="2" y="2" width="24" height="24" rx="2" ry="2" color="#000000" fill="#060606" opacity=".62085"/><rect id="rect3029-6-6-5" x="1" y="1" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".72"/><rect id="rect3029-1" x=".5" y=".49998" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient3807-3)"/><path id="path3178-6-1" d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#060606"/><path id="path3178-0" d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#bfbfbf"/><path id="rect3029-96-0-1" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#888888" style="text-indent:0;text-transform:none"/><g display="none"><g display="inline"><path d="m10 9h3v6h-2v-5h-1v-1" fill="#dcdcdc"/><path d="m13 10h1v6h-2v-1h1v-5" fill="#323232"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><g display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_5_down.svg b/res/skins/LateNight/buttons/btn_hotcue_5_down.svg
deleted file mode 100644
index 2d4f28b17d4..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_5_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient3878" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-6" stop-color="#222" offset="0"/><stop id="stop3805-5-2" stop-color="#131516" offset="1"/></linearGradient></defs><rect id="rect3029-9-4" x=".5" y=".49998" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient3878)"/><path id="path3178-6" d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#080808"/><path id="path3178" d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#8d8f90"/><path id="rect3029-96-0-9-5" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#454748" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_5_over.svg b/res/skins/LateNight/buttons/btn_hotcue_5_over.svg
deleted file mode 100644
index 49b64a528ef..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_5_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient5075" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-95" stop-color="#ce0e0e" offset="0"/><stop id="stop4329-2" stop-color="#d00" offset=".28"/><stop id="stop3805-5-28-1" stop-color="#8d0000" offset="1"/></linearGradient></defs><rect id="rect3029-6-1" x="2" y="2" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".5"/><rect id="rect3029-6-6-7" x="1" y="1" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".8"/><rect id="rect3029-96-3" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient5075)"/><path id="rect3029-96" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path3178-6-6" d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#3d0000"/><path id="path3178-4" d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_5_overdown.svg b/res/skins/LateNight/buttons/btn_hotcue_5_overdown.svg
deleted file mode 100644
index f94fc938be7..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_5_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient4370" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-9" stop-color="#aa1112" offset="0"/><stop id="stop4329-4" stop-color="#b60607" offset=".28"/><stop id="stop3805-5-28-5" stop-color="#760607" offset="1"/></linearGradient></defs><rect id="rect3029-96-4-6" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient4370)"/><path id="path3178-6-8" d="m17 10h-6v3h4v2h-4v1h6v-4h-5v-1h5v-1" fill="#320202"/><path id="path3178-7" d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#8d8f90"/><path id="rect3029-96-9-0" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_5_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_5_pressed.svg
new file mode 100644
index 00000000000..8ae9bcee64c
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_5_pressed.svg
@@ -0,0 +1,3 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs>
+<linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient>
+</defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#fff"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_5_unset.svg b/res/skins/LateNight/buttons/btn_hotcue_5_unset.svg
new file mode 100644
index 00000000000..d093f7e780d
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_5_unset.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="text-indent:0;text-transform:none"/><g display="none"><g display="inline"><path d="m10 9h3v6h-2v-5h-1v-1" fill="#dcdcdc"/><path d="m13 10h1v6h-2v-1h1v-5" fill="#323232"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><g display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_6.svg b/res/skins/LateNight/buttons/btn_hotcue_6.svg
index e54fa90ddbf..69372da16c9 100644
--- a/res/skins/LateNight/buttons/btn_hotcue_6.svg
+++ b/res/skins/LateNight/buttons/btn_hotcue_6.svg
@@ -1 +1 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient3807-3" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7" stop-color="#242424" offset="0"/><stop id="stop3805-5" stop-color="#101010" offset="1"/></linearGradient></defs><rect id="rect3029-6-0" x="2" y="2" width="24" height="24" rx="2" ry="2" color="#000000" fill="#060606" opacity=".62085"/><rect id="rect3029-6-6-5" x="1" y="1" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".72"/><rect id="rect3029-1" x=".5" y=".49998" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient3807-3)"/><path id="rect3029-96-0-1" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path3998-7-2" d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#060606"/><path id="path3998-5" d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#bfbfbf"/></svg>
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#888888" style="text-indent:0;text-transform:none"/><g display="none"><g display="inline"><path d="m10 9h3v6h-2v-5h-1v-1" fill="#dcdcdc"/><path d="m13 10h1v6h-2v-1h1v-5" fill="#323232"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><g display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_6_down.svg b/res/skins/LateNight/buttons/btn_hotcue_6_down.svg
deleted file mode 100644
index f95363c1945..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_6_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient3878" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-6" stop-color="#222" offset="0"/><stop id="stop3805-5-2" stop-color="#131516" offset="1"/></linearGradient></defs><rect id="rect3029-9-4" x=".5" y=".49998" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient3878)"/><path id="rect3029-96-0-9-5" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#454748" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path3998-7" d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#080808"/><path id="path3998" d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#8d8f90"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_6_over.svg b/res/skins/LateNight/buttons/btn_hotcue_6_over.svg
deleted file mode 100644
index f5787f22b31..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_6_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient5075" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-95" stop-color="#ce0e0e" offset="0"/><stop id="stop4329-2" stop-color="#d00" offset=".28"/><stop id="stop3805-5-28-1" stop-color="#8d0000" offset="1"/></linearGradient></defs><rect id="rect3029-6-1" x="2" y="2" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".5"/><rect id="rect3029-6-6-7" x="1" y="1" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".8"/><rect id="rect3029-96-3" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient5075)"/><path id="rect3029-96" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path3998-7-0" d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#3d0000"/><path id="path3998-94" d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_6_overdown.svg b/res/skins/LateNight/buttons/btn_hotcue_6_overdown.svg
deleted file mode 100644
index 2b7e86cb97f..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_6_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient4370" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-9" stop-color="#aa1112" offset="0"/><stop id="stop4329-4" stop-color="#b60607" offset=".28"/><stop id="stop3805-5-28-5" stop-color="#760607" offset="1"/></linearGradient></defs><rect id="rect3029-96-4-6" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient4370)"/><path id="rect3029-96-9-0" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path3998-7-4" d="m11 10v6h6v-4h-4v-1h3v-1zm2 3h3v2h-3z" fill="#320202"/><path id="path3998-9" d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#8d8f90"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_6_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_6_pressed.svg
new file mode 100644
index 00000000000..51830c72b5f
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_6_pressed.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#fff"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_6_unset.svg b/res/skins/LateNight/buttons/btn_hotcue_6_unset.svg
new file mode 100644
index 00000000000..a5125061ca7
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_6_unset.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="text-indent:0;text-transform:none"/><g display="none"><g display="inline"><path d="m10 9h3v6h-2v-5h-1v-1" fill="#dcdcdc"/><path d="m13 10h1v6h-2v-1h1v-5" fill="#323232"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><g display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_7.svg b/res/skins/LateNight/buttons/btn_hotcue_7.svg
index 60b5baa894b..7bf3d4a3a2a 100644
--- a/res/skins/LateNight/buttons/btn_hotcue_7.svg
+++ b/res/skins/LateNight/buttons/btn_hotcue_7.svg
@@ -1 +1 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient3807-3" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7" stop-color="#242424" offset="0"/><stop id="stop3805-5" stop-color="#101010" offset="1"/></linearGradient></defs><rect id="rect3029-6-0" x="2" y="2" width="24" height="24" rx="2" ry="2" color="#000000" fill="#060606" opacity=".62085"/><rect id="rect3029-6-6-5" x="1" y="1" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".72"/><rect id="rect3029-1" x=".5" y=".49998" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient3807-3)"/><path id="rect3029-96-0-1" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path4031-8-1" d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#060606"/><path id="path4031-9" d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#bfbfbf"/></svg>
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#888888" style="text-indent:0;text-transform:none"/><g display="none"><g display="inline"><path d="m10 9h3v6h-2v-5h-1v-1" fill="#dcdcdc"/><path d="m13 10h1v6h-2v-1h1v-5" fill="#323232"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><g display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_7_down.svg b/res/skins/LateNight/buttons/btn_hotcue_7_down.svg
deleted file mode 100644
index 688242f47d6..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_7_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient3878" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-6" stop-color="#222" offset="0"/><stop id="stop3805-5-2" stop-color="#131516" offset="1"/></linearGradient></defs><rect id="rect3029-9-4" x=".5" y=".49998" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient3878)"/><path id="rect3029-96-0-9-5" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#454748" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path4031-8" d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#080808"/><path id="path4031" d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#8d8f90"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_7_over.svg b/res/skins/LateNight/buttons/btn_hotcue_7_over.svg
deleted file mode 100644
index d1c061c3363..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_7_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient5075" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-95" stop-color="#ce0e0e" offset="0"/><stop id="stop4329-2" stop-color="#d00" offset=".28"/><stop id="stop3805-5-28-1" stop-color="#8d0000" offset="1"/></linearGradient></defs><rect id="rect3029-6-1" x="2" y="2" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".5"/><rect id="rect3029-6-6-7" x="1" y="1" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".8"/><rect id="rect3029-96-3" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient5075)"/><path id="rect3029-96" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path4031-8-5" d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#3d0000"/><path id="path4031-46" d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_7_overdown.svg b/res/skins/LateNight/buttons/btn_hotcue_7_overdown.svg
deleted file mode 100644
index 6d77cb31bb8..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_7_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient4370" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-9" stop-color="#aa1112" offset="0"/><stop id="stop4329-4" stop-color="#b60607" offset=".28"/><stop id="stop3805-5-28-5" stop-color="#760607" offset="1"/></linearGradient></defs><rect id="rect3029-96-4-6" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient4370)"/><path id="rect3029-96-9-0" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path4031-8-2" d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#320202"/><path id="path4031-4" d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#8d8f90"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_7_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_7_pressed.svg
new file mode 100644
index 00000000000..9e000236295
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_7_pressed.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#fff"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_7_unset.svg b/res/skins/LateNight/buttons/btn_hotcue_7_unset.svg
new file mode 100644
index 00000000000..e0bc3b5b94a
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_7_unset.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="text-indent:0;text-transform:none"/><g display="none"><g display="inline"><path d="m10 9h3v6h-2v-5h-1v-1" fill="#dcdcdc"/><path d="m13 10h1v6h-2v-1h1v-5" fill="#323232"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><g display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_8.svg b/res/skins/LateNight/buttons/btn_hotcue_8.svg
index 136cdbd7ffa..17f26afa9fe 100644
--- a/res/skins/LateNight/buttons/btn_hotcue_8.svg
+++ b/res/skins/LateNight/buttons/btn_hotcue_8.svg
@@ -1 +1 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient3807-3" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7" stop-color="#242424" offset="0"/><stop id="stop3805-5" stop-color="#101010" offset="1"/></linearGradient></defs><rect id="rect3029-6-0" x="2" y="2" width="24" height="24" rx="2" ry="2" color="#000000" fill="#060606" opacity=".62085"/><rect id="rect3029-6-6-5" x="1" y="1" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".72"/><rect id="rect3029-1" x=".5" y=".49998" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient3807-3)"/><path id="rect3029-96-0-1" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path4077-1-7" d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#060606"/><path id="path4077-13" d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#bfbfbf"/></svg>
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#888888" style="text-indent:0;text-transform:none"/><g display="none"><g display="inline"><path d="m10 9h3v6h-2v-5h-1v-1" fill="#dcdcdc"/><path d="m13 10h1v6h-2v-1h1v-5" fill="#323232"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_8_down.svg b/res/skins/LateNight/buttons/btn_hotcue_8_down.svg
deleted file mode 100644
index a0951c1e59c..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_8_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient3878" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-6" stop-color="#222" offset="0"/><stop id="stop3805-5-2" stop-color="#131516" offset="1"/></linearGradient></defs><rect id="rect3029-9-4" x=".5" y=".49998" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient3878)"/><path id="rect3029-96-0-9-5" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#454748" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path4077-1" d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#080808"/><path id="path4077" d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#989898"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_8_over.svg b/res/skins/LateNight/buttons/btn_hotcue_8_over.svg
deleted file mode 100644
index e615f69cfba..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_8_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient5075" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-95" stop-color="#ce0e0e" offset="0"/><stop id="stop4329-2" stop-color="#d00" offset=".28"/><stop id="stop3805-5-28-1" stop-color="#8d0000" offset="1"/></linearGradient></defs><rect id="rect3029-6-1" x="2" y="2" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".5"/><rect id="rect3029-6-6-7" x="1" y="1" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".8"/><rect id="rect3029-96-3" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient5075)"/><path id="rect3029-96" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path4077-1-6" d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#3d0000"/><path id="path4077-3" d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_8_overdown.svg b/res/skins/LateNight/buttons/btn_hotcue_8_overdown.svg
deleted file mode 100644
index 48c8b387463..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_8_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient4370" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-9" stop-color="#aa1112" offset="0"/><stop id="stop4329-4" stop-color="#b60607" offset=".28"/><stop id="stop3805-5-28-5" stop-color="#760607" offset="1"/></linearGradient></defs><rect id="rect3029-96-4-6" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient4370)"/><path id="rect3029-96-9-0" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path4077-1-4" d="m11 10v2h-1v4h7v-4h-1v-2zm1 1h3v1h-3zm-1 2h5v2h-5z" fill="#320202"/><path id="path4077-5" d="m10 9v2h-1v4h7v-4h-1v-2zm1 1h3v1h-3zm-1 2h5v2h-5z" fill="#8d8f90"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_8_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_8_pressed.svg
new file mode 100644
index 00000000000..0f3e0c55af4
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_8_pressed.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#fff"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_8_unset.svg b/res/skins/LateNight/buttons/btn_hotcue_8_unset.svg
new file mode 100644
index 00000000000..17d48932cb5
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_8_unset.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="text-indent:0;text-transform:none"/><g display="none"><g display="inline"><path d="m10 9h3v6h-2v-5h-1v-1" fill="#dcdcdc"/><path d="m13 10h1v6h-2v-1h1v-5" fill="#323232"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_intro_end.svg b/res/skins/LateNight/buttons/btn_intro_end.svg
new file mode 100644
index 00000000000..a46e2083b70
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_intro_end.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="text-indent:0;text-transform:none"/><g display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" fill="#bfbfbf" style="paint-order:markers fill stroke"/><path d="m5 17 9-10v10z" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_intro_end_pressed.svg b/res/skins/LateNight/buttons/btn_intro_end_pressed.svg
new file mode 100644
index 00000000000..54c4c2f3a3e
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_intro_end_pressed.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><g><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#c8c8c8" style="text-indent:0;text-transform:none"/><rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" fill="#b4b4b4" style="paint-order:markers fill stroke"/><path d="m5 17 9-10v10z" fill="#b4b4b4"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_intro_start.svg b/res/skins/LateNight/buttons/btn_intro_start.svg
new file mode 100644
index 00000000000..e52321f7416
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_intro_start.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="text-indent:0;text-transform:none"/><g display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><rect x="6" y="7" width="2" height="10" fill="#bfbfbf" style="paint-order:markers fill stroke"/><path d="m9 17 9-10v10z" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_intro_start_pressed.svg b/res/skins/LateNight/buttons/btn_intro_start_pressed.svg
new file mode 100644
index 00000000000..bb9409e12e9
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_intro_start_pressed.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><g><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#c8c8c8" style="text-indent:0;text-transform:none"/><rect x="6" y="7" width="2" height="10" fill="#b4b4b4" style="paint-order:markers fill stroke"/><path d="m9 17 9-10v10z" fill="#b4b4b4"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_outro_end.svg b/res/skins/LateNight/buttons/btn_outro_end.svg
new file mode 100644
index 00000000000..4f8965fad19
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_outro_end.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="text-indent:0;text-transform:none"/><g display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" fill="#bfbfbf" style="paint-order:markers fill stroke"/><path d="m15 17-9-10v10z" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_outro_end_pressed.svg b/res/skins/LateNight/buttons/btn_outro_end_pressed.svg
new file mode 100644
index 00000000000..060ec4243ab
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_outro_end_pressed.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><g><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#c8c8c8" style="text-indent:0;text-transform:none"/><rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" fill="#b4b4b4" style="paint-order:markers fill stroke"/><path d="m15 17-9-10v10z" fill="#b4b4b4"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_outro_start.svg b/res/skins/LateNight/buttons/btn_outro_start.svg
new file mode 100644
index 00000000000..2ea1b2ed9d0
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_outro_start.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="text-indent:0;text-transform:none"/><g display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><rect x="6" y="7" width="2" height="10" fill="#bfbfbf" style="paint-order:markers fill stroke"/><path d="m19 17-9-10v10z" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_outro_start_pressed.svg b/res/skins/LateNight/buttons/btn_outro_start_pressed.svg
new file mode 100644
index 00000000000..752d6e3eff2
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_outro_start_pressed.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#c8c8c8" style="text-indent:0;text-transform:none"/><rect x="6" y="7" width="2" height="10" fill="#b4b4b4" style="paint-order:markers fill stroke"/><path d="m19 17-9-10v10z" fill="#b4b4b4"/></svg>
diff --git a/res/skins/LateNight/deck_overview.xml b/res/skins/LateNight/deck_overview.xml
index 52949506b49..5a6b4d6c714 100644
--- a/res/skins/LateNight/deck_overview.xml
+++ b/res/skins/LateNight/deck_overview.xml
@@ -14,7 +14,7 @@
     <EndOfTrackColor>#EA0000</EndOfTrackColor>
     <DefaultMark>
       <Align>bottom|right</Align>
-      <Color>#00FF00</Color>
+      <Color>#FF0000</Color>
       <TextColor>#FFFFFF</TextColor>
       <Text> %1 </Text>
     </DefaultMark>
diff --git a/res/skins/LateNight/deck_row_5_transportLoopJump.xml b/res/skins/LateNight/deck_row_5_transportLoopJump.xml
index e07b6b0e8d4..b57492cec40 100644
--- a/res/skins/LateNight/deck_row_5_transportLoopJump.xml
+++ b/res/skins/LateNight/deck_row_5_transportLoopJump.xml
@@ -152,12 +152,10 @@
             <Children>
               <Template src="skin:button_special_cue.xml">
                 <SetVariable name="cue_type">intro_start</SetVariable>
-                <SetVariable name="label">|&#9698;</SetVariable>
               </Template>
 
               <Template src="skin:button_special_cue.xml">
                 <SetVariable name="cue_type">intro_end</SetVariable>
-                <SetVariable name="label">&#9698;|</SetVariable>
               </Template>
             </Children>
           </WidgetGroup>
@@ -168,12 +166,10 @@
             <Children>
               <Template src="skin:button_special_cue.xml">
                 <SetVariable name="cue_type">outro_start</SetVariable>
-                <SetVariable name="label">|&#9699;</SetVariable>
               </Template>
 
               <Template src="skin:button_special_cue.xml">
                 <SetVariable name="cue_type">outro_end</SetVariable>
-                <SetVariable name="label">&#9699;|</SetVariable>
               </Template>
             </Children>
           </WidgetGroup>
diff --git a/res/skins/LateNight/preview_deck.xml b/res/skins/LateNight/preview_deck.xml
index a4e04520ab8..60d78698405 100644
--- a/res/skins/LateNight/preview_deck.xml
+++ b/res/skins/LateNight/preview_deck.xml
@@ -135,7 +135,7 @@
                     <PlayedOverlayColor><Variable name="PlayedOverlayColor"/></PlayedOverlayColor>
                     <DefaultMark>
                       <Align>bottom|right</Align>
-                      <Color>#00FF00</Color>
+                      <Color>#FF0000</Color>
                       <TextColor>#FFFFFF</TextColor>
                       <Text> %1 </Text>
                     </DefaultMark>
diff --git a/res/skins/LateNight/sampler.xml b/res/skins/LateNight/sampler.xml
index f7119270555..58ac212aa90 100644
--- a/res/skins/LateNight/sampler.xml
+++ b/res/skins/LateNight/sampler.xml
@@ -80,7 +80,7 @@
                 <MarkerColor>#00FF00</MarkerColor>
                 <DefaultMark>
                   <Align>bottom|right</Align>
-                  <Color>#00FF00</Color>
+                  <Color>#FF0000</Color>
                   <TextColor>#FFFFFF</TextColor>
                   <Text> %1 </Text>
                 </DefaultMark>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 25ee6da5c89..589f8c4017d 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -399,7 +399,7 @@ WTime {
   #BpmTextSmall {
     margin: 0px 1px 0px 0px;
   }
-  
+
 
 #ArtistText,
 #TitleText,
@@ -506,7 +506,6 @@ WEffectButtonParameter*/
 }
 
 #VinylButton,
-#SpecialCueButton,
 #FxAssignButton,
 #GuiToggleButton,
 #BroadcastButton,
@@ -528,7 +527,6 @@ WEffectButtonParameter*/
   }
 
 #VinylButton[displayValue="0"],
-#SpecialCueButton[displayValue="0"],
 #BroadcastButton[displayValue="0"],
 #SettingsButton[displayValue="0"],
 #GuiToggleButton[displayValue="0"],
@@ -540,15 +538,12 @@ WEffectButtonParameter*/
 }
 
 #VinylButton[displayValue="1"],
-#SpecialCueButton[displayValue="1"],
 #VinylButton[displayValue="2"],
 #GuiToggleButton[displayValue="1"],
 #GuiToggleButton[displayValue="2"],
 #BroadcastButton[displayValue="1"], /* connecting: yellow */
 #SettingsButton[displayValue="1"],
 #FxAssignButton[displayValue="1"] {
-  border: 1px solid #585858;
-  border-radius: 2px;
   color: #0e0e0e;
   background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
     stop:0 #B69700,
@@ -559,8 +554,93 @@ WEffectButtonParameter*/
   image: url(skin:/buttons/btn_settings_off.svg) no-repeat left center;
 }
 
+#HotcueButton,
 #SpecialCueButton {
-  margin: 0px 2px 2px 0px;
+  /* limit background to button surface resulting from SVG backpath.
+    border width wouldn't be applied.
+    otoh, margin would set in the colored background area and not
+    crop the SVG background image set in xml button template.
+    border-width:  1px 3px 3px 1px;*/
+  margin: 1px 3px 3px 1px;
+  /* just to be sure the colored background doesn't overlap the rounded SVG border */
+  border-radius: 1px;
+  /* ronso0
+  TEST pixel fonts instead of icons
+  FAIL basically all characters look blurry with a 100% GUI scale factor of 1oo%
+  font-size: tried a lot of integers as well as .5 values
+  didn't I didn't find the magic, unintuitive floating point value that would align
+  font pixels to actual button size in pixels to make the fonts look sharp.
+
+  font-family: "Acknowledge TT (BRK)";
+  font-family: "Bulky Pixels";
+  font-family: "Irresistor";
+  font-family: "Visitor TT1 BRK";
+  font-family: "Boxy Bold";
+  font-family: "Pixel Intv";
+  font-size: 13px;
+  color: #eee;
+  */
+}
+
+#HotcueButton[displayValue="0"],
+#SpecialCueButton[displayValue="0"] {
+  background-color: #1d1d1d;
+}
+
+#SpecialCueButton[displayValue="1"] {
+  background-color: #0000D4;
+}
+
+/* Hotcue Color: Red
+   this is also the default color if Auto-Color
+   in Preferences > Decks is Off */
+#HotcueButton[displayValue="1"][highlight="0"],
+#HotcueButton[displayValue="2"][highlight="0"],
+#HotcueButton[displayValue="1"][highlight="1"],
+#HotcueButton[displayValue="2"][highlight="1"] {
+  background-color: #db0000;
+}
+
+/* Hotcue Color: Green */
+#HotcueButton[displayValue="1"][highlight="2"],
+#HotcueButton[displayValue="2"][highlight="2"] {
+  background-color: #32be44;
+}
+
+/* Hotcue Color: Blue */
+#HotcueButton[displayValue="1"][highlight="3"],
+#HotcueButton[displayValue="2"][highlight="3"] {
+  background-color: #0044ff;
+}
+
+/* Hotcue Color: Yellow */
+#HotcueButton[displayValue="1"][highlight="4"],
+#HotcueButton[displayValue="2"][highlight="4"] {
+  background-color: #f8d200;
+}
+
+/* Hotcue Color: Celeste */
+#HotcueButton[displayValue="1"][highlight="5"],
+#HotcueButton[displayValue="2"][highlight="5"] {
+  background-color: #42d4f4;
+}
+
+/* Hotcue Color: Purple */
+#HotcueButton[displayValue="1"][highlight="6"],
+#HotcueButton[displayValue="2"][highlight="6"] {
+  background-color: #af00cc;
+}
+
+/* Hotcue Color: Pink */
+#HotcueButton[displayValue="1"][highlight="7"],
+#HotcueButton[displayValue="2"][highlight="7"] {
+  background-color: #fca6d7;
+}
+
+/* Hotcue Color: White */
+#HotcueButton[displayValue="1"][highlight="8"],
+#HotcueButton[displayValue="2"][highlight="8"] {
+  background-color: #f2f2ff;
 }
 
 #SettingsButton[displayValue="1"] {
diff --git a/res/skins/LateNight/style/clipping_previewdeck.png b/res/skins/LateNight/style/clipping_previewdeck.png
index 640e41d9657..3f453287c8b 100644
Binary files a/res/skins/LateNight/style/clipping_previewdeck.png and b/res/skins/LateNight/style/clipping_previewdeck.png differ
diff --git a/res/skins/LateNight/style/volume_display_previewdeck.png b/res/skins/LateNight/style/volume_display_previewdeck.png
index 96d5715fcdd..9ff165303e5 100644
Binary files a/res/skins/LateNight/style/volume_display_previewdeck.png and b/res/skins/LateNight/style/volume_display_previewdeck.png differ
diff --git a/res/skins/LateNight/waveform.xml b/res/skins/LateNight/waveform.xml
index 04df7a64b6a..9022f7b3cbc 100644
--- a/res/skins/LateNight/waveform.xml
+++ b/res/skins/LateNight/waveform.xml
@@ -18,8 +18,8 @@
         <PlayPosColor>#00FF00</PlayPosColor>
         <EndOfTrackColor>#EA0000</EndOfTrackColor>
         <DefaultMark>
-          <Align>top</Align>
-          <Color>#00FF00</Color>
+          <Align>top|right</Align>
+          <Color>#FF0000</Color>
           <TextColor>#FFFFFF</TextColor>
           <Text> %1 </Text>
         </DefaultMark>