From 93035e0de6a533a6fa305611def8618e67f7b57c Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 16 Jul 2019 14:21:29 +0200
Subject: [PATCH 1/5] LateNight: move hotcue button color from SVG to css, add
 outlines to hotcue number vectors

in order to make individual hotcue buttons stylable via css
by binding button bg color to 'highlight' connection
[ChannelN],hotcue_N_color_id).
default is red, like before.
---
 res/skins/LateNight/button_hotcue.xml         |  43 ++-
 .../LateNight/buttons/btn_hotcue_1_over.svg   |   1 -
 .../buttons/btn_hotcue_1_overdown.svg         |   1 -
 .../LateNight/buttons/btn_hotcue_1_set.svg    |   1 +
 .../buttons/btn_hotcue_1_set_pressed.svg      |   1 +
 ...tn_hotcue_1.svg => btn_hotcue_1_unset.svg} |   0
 ...own.svg => btn_hotcue_1_unset_pressed.svg} |   0
 .../LateNight/buttons/btn_hotcue_2_over.svg   |   1 -
 .../buttons/btn_hotcue_2_overdown.svg         |   1 -
 .../LateNight/buttons/btn_hotcue_2_set.svg    |   1 +
 .../buttons/btn_hotcue_2_set_pressed.svg      |   1 +
 ...tn_hotcue_2.svg => btn_hotcue_2_unset.svg} |   0
 ...own.svg => btn_hotcue_2_unset_pressed.svg} |   0
 .../LateNight/buttons/btn_hotcue_3_over.svg   |   1 -
 .../buttons/btn_hotcue_3_overdown.svg         |   1 -
 .../LateNight/buttons/btn_hotcue_3_set.svg    |   1 +
 .../buttons/btn_hotcue_3_set_pressed.svg      |   1 +
 ...tn_hotcue_3.svg => btn_hotcue_3_unset.svg} |   0
 ...own.svg => btn_hotcue_3_unset_pressed.svg} |   0
 .../LateNight/buttons/btn_hotcue_4_over.svg   |   1 -
 .../buttons/btn_hotcue_4_overdown.svg         |   1 -
 .../LateNight/buttons/btn_hotcue_4_set.svg    |   1 +
 .../buttons/btn_hotcue_4_set_pressed.svg      |   1 +
 ...tn_hotcue_4.svg => btn_hotcue_4_unset.svg} |   0
 ...own.svg => btn_hotcue_4_unset_pressed.svg} |   0
 .../LateNight/buttons/btn_hotcue_5_over.svg   |   1 -
 .../buttons/btn_hotcue_5_overdown.svg         |   1 -
 .../LateNight/buttons/btn_hotcue_5_set.svg    |   1 +
 .../buttons/btn_hotcue_5_set_pressed.svg      |   1 +
 ...tn_hotcue_5.svg => btn_hotcue_5_unset.svg} |   0
 ...own.svg => btn_hotcue_5_unset_pressed.svg} |   0
 .../LateNight/buttons/btn_hotcue_6_over.svg   |   1 -
 .../buttons/btn_hotcue_6_overdown.svg         |   1 -
 .../LateNight/buttons/btn_hotcue_6_set.svg    |   1 +
 .../buttons/btn_hotcue_6_set_pressed.svg      |   1 +
 ...tn_hotcue_6.svg => btn_hotcue_6_unset.svg} |   0
 ...own.svg => btn_hotcue_6_unset_pressed.svg} |   0
 .../LateNight/buttons/btn_hotcue_7_over.svg   |   1 -
 .../buttons/btn_hotcue_7_overdown.svg         |   1 -
 .../LateNight/buttons/btn_hotcue_7_set.svg    |   1 +
 .../buttons/btn_hotcue_7_set_pressed.svg      |   1 +
 ...tn_hotcue_7.svg => btn_hotcue_7_unset.svg} |   0
 ...own.svg => btn_hotcue_7_unset_pressed.svg} |   0
 .../LateNight/buttons/btn_hotcue_8_over.svg   |   1 -
 .../buttons/btn_hotcue_8_overdown.svg         |   1 -
 .../LateNight/buttons/btn_hotcue_8_set.svg    |   1 +
 .../buttons/btn_hotcue_8_set_pressed.svg      |   1 +
 ...tn_hotcue_8.svg => btn_hotcue_8_unset.svg} |   0
 ...own.svg => btn_hotcue_8_unset_pressed.svg} |   0
 .../LateNight/buttons/btn_hotcue_over.svg     |   1 +
 .../LateNight/buttons/btn_hotcue_x_over.svg   | 293 ++++++++++++++++++
 res/skins/LateNight/style.qss                 |  86 ++++-
 52 files changed, 427 insertions(+), 28 deletions(-)
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_1_over.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_1_overdown.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_1_set.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_1_set_pressed.svg
 rename res/skins/LateNight/buttons/{btn_hotcue_1.svg => btn_hotcue_1_unset.svg} (100%)
 rename res/skins/LateNight/buttons/{btn_hotcue_1_down.svg => btn_hotcue_1_unset_pressed.svg} (100%)
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_2_over.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_2_overdown.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_2_set.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_2_set_pressed.svg
 rename res/skins/LateNight/buttons/{btn_hotcue_2.svg => btn_hotcue_2_unset.svg} (100%)
 rename res/skins/LateNight/buttons/{btn_hotcue_2_down.svg => btn_hotcue_2_unset_pressed.svg} (100%)
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_3_over.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_3_overdown.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_3_set.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_3_set_pressed.svg
 rename res/skins/LateNight/buttons/{btn_hotcue_3.svg => btn_hotcue_3_unset.svg} (100%)
 rename res/skins/LateNight/buttons/{btn_hotcue_3_down.svg => btn_hotcue_3_unset_pressed.svg} (100%)
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_4_over.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_4_overdown.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_4_set.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_4_set_pressed.svg
 rename res/skins/LateNight/buttons/{btn_hotcue_4.svg => btn_hotcue_4_unset.svg} (100%)
 rename res/skins/LateNight/buttons/{btn_hotcue_4_down.svg => btn_hotcue_4_unset_pressed.svg} (100%)
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_5_over.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_5_overdown.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_5_set.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_5_set_pressed.svg
 rename res/skins/LateNight/buttons/{btn_hotcue_5.svg => btn_hotcue_5_unset.svg} (100%)
 rename res/skins/LateNight/buttons/{btn_hotcue_5_down.svg => btn_hotcue_5_unset_pressed.svg} (100%)
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_6_over.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_6_overdown.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_6_set.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_6_set_pressed.svg
 rename res/skins/LateNight/buttons/{btn_hotcue_6.svg => btn_hotcue_6_unset.svg} (100%)
 rename res/skins/LateNight/buttons/{btn_hotcue_6_down.svg => btn_hotcue_6_unset_pressed.svg} (100%)
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_7_over.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_7_overdown.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_7_set.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_7_set_pressed.svg
 rename res/skins/LateNight/buttons/{btn_hotcue_7.svg => btn_hotcue_7_unset.svg} (100%)
 rename res/skins/LateNight/buttons/{btn_hotcue_7_down.svg => btn_hotcue_7_unset_pressed.svg} (100%)
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_8_over.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_8_overdown.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_8_set.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_8_set_pressed.svg
 rename res/skins/LateNight/buttons/{btn_hotcue_8.svg => btn_hotcue_8_unset.svg} (100%)
 rename res/skins/LateNight/buttons/{btn_hotcue_8_down.svg => btn_hotcue_8_unset_pressed.svg} (100%)
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_over.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_x_over.svg

diff --git a/res/skins/LateNight/button_hotcue.xml b/res/skins/LateNight/button_hotcue.xml
index 3c0c98fd059..5d740cc6299 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"/>_unset_pressed.svg</Pressed>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>_set.svg</Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>_set_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/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_set.svg b/res/skins/LateNight/buttons/btn_hotcue_1_set.svg
new file mode 100644
index 00000000000..ca9eec7a51c
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_1_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=".11765" offset=".28"/><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"/><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_set_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_1_set_pressed.svg
new file mode 100644
index 00000000000..26c99892e11
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_1_set_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(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".078431" offset="0"/><stop stop-opacity=".039216" offset=".28"/><stop stop-opacity=".23529" 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"/><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.svg b/res/skins/LateNight/buttons/btn_hotcue_1_unset.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_hotcue_1.svg
rename to res/skins/LateNight/buttons/btn_hotcue_1_unset.svg
diff --git a/res/skins/LateNight/buttons/btn_hotcue_1_down.svg b/res/skins/LateNight/buttons/btn_hotcue_1_unset_pressed.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_hotcue_1_down.svg
rename to res/skins/LateNight/buttons/btn_hotcue_1_unset_pressed.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_set.svg b/res/skins/LateNight/buttons/btn_hotcue_2_set.svg
new file mode 100644
index 00000000000..b208509efcc
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_2_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=".11765" offset=".28"/><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 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_set_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_2_set_pressed.svg
new file mode 100644
index 00000000000..a4ad68a132b
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_2_set_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(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".078431" offset="0"/><stop stop-opacity=".039216" offset=".28"/><stop stop-opacity=".23529" 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"/><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.svg b/res/skins/LateNight/buttons/btn_hotcue_2_unset.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_hotcue_2.svg
rename to res/skins/LateNight/buttons/btn_hotcue_2_unset.svg
diff --git a/res/skins/LateNight/buttons/btn_hotcue_2_down.svg b/res/skins/LateNight/buttons/btn_hotcue_2_unset_pressed.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_hotcue_2_down.svg
rename to res/skins/LateNight/buttons/btn_hotcue_2_unset_pressed.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_set.svg b/res/skins/LateNight/buttons/btn_hotcue_3_set.svg
new file mode 100644
index 00000000000..d7e462f8ad6
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_3_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=".11765" offset=".28"/><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 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_set_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_3_set_pressed.svg
new file mode 100644
index 00000000000..688b9463894
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_3_set_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(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".078431" offset="0"/><stop stop-opacity=".039216" offset=".28"/><stop stop-opacity=".23529" 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"/><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.svg b/res/skins/LateNight/buttons/btn_hotcue_3_unset.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_hotcue_3.svg
rename to res/skins/LateNight/buttons/btn_hotcue_3_unset.svg
diff --git a/res/skins/LateNight/buttons/btn_hotcue_3_down.svg b/res/skins/LateNight/buttons/btn_hotcue_3_unset_pressed.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_hotcue_3_down.svg
rename to res/skins/LateNight/buttons/btn_hotcue_3_unset_pressed.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_set.svg b/res/skins/LateNight/buttons/btn_hotcue_4_set.svg
new file mode 100644
index 00000000000..41de89875cf
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_4_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=".11765" offset=".28"/><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 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_set_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_4_set_pressed.svg
new file mode 100644
index 00000000000..984957af1f5
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_4_set_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(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".078431" offset="0"/><stop stop-opacity=".039216" offset=".28"/><stop stop-opacity=".23529" 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"/><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.svg b/res/skins/LateNight/buttons/btn_hotcue_4_unset.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_hotcue_4.svg
rename to res/skins/LateNight/buttons/btn_hotcue_4_unset.svg
diff --git a/res/skins/LateNight/buttons/btn_hotcue_4_down.svg b/res/skins/LateNight/buttons/btn_hotcue_4_unset_pressed.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_hotcue_4_down.svg
rename to res/skins/LateNight/buttons/btn_hotcue_4_unset_pressed.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_set.svg b/res/skins/LateNight/buttons/btn_hotcue_5_set.svg
new file mode 100644
index 00000000000..3bf984a15c4
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_5_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=".11765" offset=".28"/><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 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_set_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_5_set_pressed.svg
new file mode 100644
index 00000000000..a981a843ac6
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_5_set_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(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".078431" offset="0"/><stop stop-opacity=".039216" offset=".28"/><stop stop-opacity=".23529" 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"/><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.svg b/res/skins/LateNight/buttons/btn_hotcue_5_unset.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_hotcue_5.svg
rename to res/skins/LateNight/buttons/btn_hotcue_5_unset.svg
diff --git a/res/skins/LateNight/buttons/btn_hotcue_5_down.svg b/res/skins/LateNight/buttons/btn_hotcue_5_unset_pressed.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_hotcue_5_down.svg
rename to res/skins/LateNight/buttons/btn_hotcue_5_unset_pressed.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_set.svg b/res/skins/LateNight/buttons/btn_hotcue_6_set.svg
new file mode 100644
index 00000000000..ce1327c628e
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_6_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=".11765" offset=".28"/><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 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_set_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_6_set_pressed.svg
new file mode 100644
index 00000000000..f51f3e4e86e
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_6_set_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(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".078431" offset="0"/><stop stop-opacity=".039216" offset=".28"/><stop stop-opacity=".23529" 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"/><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.svg b/res/skins/LateNight/buttons/btn_hotcue_6_unset.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_hotcue_6.svg
rename to res/skins/LateNight/buttons/btn_hotcue_6_unset.svg
diff --git a/res/skins/LateNight/buttons/btn_hotcue_6_down.svg b/res/skins/LateNight/buttons/btn_hotcue_6_unset_pressed.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_hotcue_6_down.svg
rename to res/skins/LateNight/buttons/btn_hotcue_6_unset_pressed.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_set.svg b/res/skins/LateNight/buttons/btn_hotcue_7_set.svg
new file mode 100644
index 00000000000..c9549397642
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_7_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=".11765" offset=".28"/><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 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_set_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_7_set_pressed.svg
new file mode 100644
index 00000000000..cba1786f1a5
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_7_set_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(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".078431" offset="0"/><stop stop-opacity=".039216" offset=".28"/><stop stop-opacity=".23529" 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"/><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.svg b/res/skins/LateNight/buttons/btn_hotcue_7_unset.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_hotcue_7.svg
rename to res/skins/LateNight/buttons/btn_hotcue_7_unset.svg
diff --git a/res/skins/LateNight/buttons/btn_hotcue_7_down.svg b/res/skins/LateNight/buttons/btn_hotcue_7_unset_pressed.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_hotcue_7_down.svg
rename to res/skins/LateNight/buttons/btn_hotcue_7_unset_pressed.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_set.svg b/res/skins/LateNight/buttons/btn_hotcue_8_set.svg
new file mode 100644
index 00000000000..f504a3a0a72
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_8_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=".11765" offset=".28"/><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 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_set_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_8_set_pressed.svg
new file mode 100644
index 00000000000..b9480d48710
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_8_set_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(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".078431" offset="0"/><stop stop-opacity=".039216" offset=".28"/><stop stop-opacity=".23529" 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"/><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.svg b/res/skins/LateNight/buttons/btn_hotcue_8_unset.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_hotcue_8.svg
rename to res/skins/LateNight/buttons/btn_hotcue_8_unset.svg
diff --git a/res/skins/LateNight/buttons/btn_hotcue_8_down.svg b/res/skins/LateNight/buttons/btn_hotcue_8_unset_pressed.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_hotcue_8_down.svg
rename to res/skins/LateNight/buttons/btn_hotcue_8_unset_pressed.svg
diff --git a/res/skins/LateNight/buttons/btn_hotcue_over.svg b/res/skins/LateNight/buttons/btn_hotcue_over.svg
new file mode 100644
index 00000000000..ec5c95e7fd1
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_over.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=".11765" offset=".28"/><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><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><g display="none"><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 display="none"><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 display="none"><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 display="none"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g><g display="none"><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 display="none"><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 display="none"><path d="m10 9h3v6h-2v-5h-1v-1" fill="#dcdcdc"/><path d="m13 10h1v6h-2v-1h1v-5" fill="#323232"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_x_over.svg b/res/skins/LateNight/buttons/btn_hotcue_x_over.svg
new file mode 100644
index 00000000000..0c06bb508d9
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_x_over.svg
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="26"
+   height="26"
+   version="1.1"
+   id="svg83"
+   sodipodi:docname="btn_hotcue_over.svg"
+   inkscape:version="0.92.4 (unknown)">
+  <metadata
+     id="metadata87">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="740"
+     id="namedview85"
+     showgrid="false"
+     inkscape:zoom="9.0769231"
+     inkscape:cx="-9.6851465"
+     inkscape:cy="17.222154"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer3" />
+  <defs
+     id="defs9">
+    <linearGradient
+       id="a"
+       x1=".5"
+       x2="23.5"
+       y1="12"
+       y2="12"
+       gradientTransform="translate(0,-24)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-opacity=".17647"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-opacity=".11765"
+         offset=".28"
+         id="stop4" />
+      <stop
+         stop-opacity=".47451"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="frame"
+     style="display:inline">
+    <g
+       id="g19">
+      <path
+         style="opacity:0.5;fill:#010101"
+         inkscape:connector-curvature="0"
+         d="m 24.82,2.1797 c 0.11293,0.25091 0.17969,0.52638 0.17969,0.82031 v 20 c 0,1.108 -0.892,2 -2,2 h -20 c -0.29393,0 -0.5694,-0.06676 -0.82031,-0.17969 0.31276,0.69491 1.0062,1.1797 1.8203,1.1797 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81407 -0.48477,-1.5075 -1.1797,-1.8203 z"
+         id="path11" />
+      <path
+         style="opacity:0.8;fill:#030303"
+         inkscape:connector-curvature="0"
+         d="m 23.814,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,2 -2,2 h -20 c -0.2947,0 -0.5716,-0.06963 -0.82422,-0.18555 0.31134,0.69838 1.0076,1.1855 1.8242,1.1855 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z"
+         id="path13" />
+      <rect
+         style="color:#000000;fill:url(#a)"
+         transform="rotate(90)"
+         x="0.5"
+         y="-23.5"
+         width="23"
+         height="23"
+         rx="1.5"
+         ry="1.5"
+         id="rect15" />
+      <path
+         inkscape:connector-curvature="0"
+         d="M 2,0 C 0.9006,0 0,0.90065 0,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 V 2 C 24,0.9006 23.09935,0 22,0 Z M 2.3,1 H 21.7 C 22.26265,1 23,1.73735 23,2.3 V 21.7 C 23,22.26265 22.26265,23 21.7,23 H 2.3 C 1.73735,23 1,22.26265 1,21.7 V 2.3 C 1,1.73735 1.73735,1 2.3,1 Z"
+         style="color:#000000;text-indent:0;text-transform:none;fill:#979797"
+         id="path17" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="1"
+     style="display:inline">
+    <g
+       id="g27">
+      <g
+         style="display:inline"
+         display="inline"
+         id="g25">
+        <path
+           style="fill:#dcdcdc"
+           inkscape:connector-curvature="0"
+           d="m 10,9 h 3 v 6 H 11 V 10 H 10 V 9"
+           id="path21" />
+        <path
+           style="fill:#323232"
+           inkscape:connector-curvature="0"
+           d="m 13,10 h 1 v 6 h -2 v -1 h 1 v -5"
+           id="path23" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="2"
+     style="display:none">
+    <g
+       id="g35">
+      <g
+         style="display:inline"
+         display="inline"
+         id="g33">
+        <path
+           style="fill:#323232"
+           inkscape:connector-curvature="0"
+           d="m 10,10 h 7 v 4 h -5 v 1 h 5 v 1 h -7 v -3 h 5 v -2 h -5 v -1"
+           id="path29" />
+        <path
+           style="fill:#dcdcdc"
+           inkscape:connector-curvature="0"
+           d="m 9,9 h 7 v 4 h -5 v 1 h 5 v 1 H 9 v -3 h 5 V 10 H 9 V 9"
+           id="path31" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="3"
+     style="display:none">
+    <g
+       id="g43">
+      <g
+         style="display:inline"
+         display="inline"
+         id="g41">
+        <path
+           style="fill:#323232"
+           inkscape:connector-curvature="0"
+           d="m 10,10 h 7 v 6 h -7 v -1 h 5 v -1 h -2 v -1 h 2 v -2 h -5 v -1"
+           id="path37" />
+        <path
+           style="fill:#dcdcdc"
+           inkscape:connector-curvature="0"
+           d="m 9,9 h 7 v 6 H 9 v -1 h 5 v -1 h -2 v -1 h 2 V 10 H 9 V 9"
+           id="path39" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="4"
+     style="display:none">
+    <g
+       id="g51">
+      <g
+         style="display:inline"
+         display="inline"
+         id="g49">
+        <path
+           style="fill:#323232"
+           inkscape:connector-curvature="0"
+           d="m 10,11 v 3 h 5 v 2 h 2 v -6 h -2 v 3 h -3 v -2 h -2"
+           id="path45" />
+        <path
+           style="fill:#dcdcdc"
+           inkscape:connector-curvature="0"
+           d="m 9,10 v 3 h 5 v 2 h 2 V 9 h -2 v 3 H 11 V 10 H 9"
+           id="path47" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer7"
+     inkscape:label="5"
+     style="display:none">
+    <g
+       id="g59">
+      <g
+         style="display:inline"
+         display="inline"
+         id="g57">
+        <path
+           style="fill:#323232"
+           inkscape:connector-curvature="0"
+           d="m 17,10 h -6 v 3 h 4 v 2 h -5 v 1 h 7 v -4 h -5 v -1 h 5 v -1"
+           id="path53" />
+        <path
+           style="fill:#dcdcdc"
+           inkscape:connector-curvature="0"
+           d="m 16,9 h -6 v 3 h 4 v 2 H 9 v 1 h 7 v -4 h -5 v -1 h 5 V 9"
+           id="path55" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer8"
+     inkscape:label="6"
+     style="display:none">
+    <g
+       id="g67">
+      <g
+         style="display:inline"
+         display="inline"
+         id="g65">
+        <path
+           style="fill:#323232"
+           inkscape:connector-curvature="0"
+           d="m 10,10 v 6 h 7 v -4 h -5 v -1 h 4 v -1 z m 2,3 h 4 v 2 h -4 z"
+           id="path61" />
+        <path
+           style="fill:#dcdcdc"
+           inkscape:connector-curvature="0"
+           d="m 9,9 v 6 h 7 v -4 h -5 v -1 h 4 V 9 Z m 2,3 h 4 v 2 h -4 z"
+           id="path63" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="7"
+     style="display:none">
+    <g
+       id="g75">
+      <g
+         style="display:inline"
+         display="inline"
+         id="g73">
+        <path
+           style="fill:#323232"
+           inkscape:connector-curvature="0"
+           d="m 10,10 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 v -2 h -4 v -1"
+           id="path69" />
+        <path
+           style="fill:#dcdcdc"
+           inkscape:connector-curvature="0"
+           d="m 9,9 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 V 10 H 9 V 9"
+           id="path71" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="8"
+     style="display:none">
+    <g
+       id="g81">
+      <path
+         style="fill:#323232"
+         inkscape:connector-curvature="0"
+         d="m 11,10 v 2 h -1 v 4 h 7 v -4 h -1 v -2 z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z"
+         id="path77" />
+      <path
+         style="fill:#dcdcdc"
+         inkscape:connector-curvature="0"
+         d="m 10,9 v 2 H 9 v 4 h 7 V 11 H 15 V 9 Z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z"
+         id="path79" />
+    </g>
+  </g>
+</svg>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 25ee6da5c89..d6d99c74f07 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -559,8 +559,92 @@ WEffectButtonParameter*/
   image: url(skin:/buttons/btn_settings_off.svg) no-repeat left center;
 }
 
+#HotcueButton,
 #SpecialCueButton {
-  margin: 0px 2px 2px 0px;
+  border-color: #000;
+  border-style: solid;
+  /* limit background to button surface resulting from SVG backpath */
+  border-width: 1px 3px 3px 1px;
+  border-radius: 2px;
+  /*
+  TEST pixel fonts instead of icons
+  FAIL basically all characters look blurry with a 100% GUI scale factor of 1oo%
+  Npx: tried a lot of integers as well as .5 values
+  at least I didn't find the magic, unintuitive floating point value that
+  so, right now I don't see a way to 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;
+}
+
+#SpecialCueButton[displayValue="1"] {
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+    stop:0 #0000D4,
+    stop:1 #10103b);
+}
+
+/* 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: #c50a08;
+}
+
+/* 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"] {
+    color: #333;
+    background-color: #f8d200;
+}
+
+/* Hotcue Color: Celeste */
+#HotcueButton[displayValue="1"][highlight="5"],
+#HotcueButton[displayValue="2"][highlight="5"] {
+    color: #333;
+    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"] {
+    color: #333;
+    background-color: #fca6d7;
+}
+
+/* Hotcue Color: White */
+#HotcueButton[displayValue="1"][highlight="8"],
+#HotcueButton[displayValue="2"][highlight="8"] {
+    color: #333;
+    background-color: #f2f2ff;
 }
 
 #SettingsButton[displayValue="1"] {

From ed5b05431b80151f545f413ac70ebd46f4459493 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 16 Jul 2019 14:23:14 +0200
Subject: [PATCH 2/5] LateNight: use hotcue SVGs for in/outro cues as well,
 adapt colors from waveform

---
 res/skins/LateNight/button_special_cue.xml           | 12 ++++++------
 res/skins/LateNight/buttons/btn_specialCue_set.svg   |  1 +
 .../LateNight/buttons/btn_specialCue_set_pressed.svg |  1 +
 res/skins/LateNight/buttons/btn_specialCue_unset.svg |  1 +
 .../buttons/btn_specialCue_unset_pressed.svg         |  1 +
 res/skins/LateNight/style.qss                        |  4 ----
 6 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 res/skins/LateNight/buttons/btn_specialCue_set.svg
 create mode 100644 res/skins/LateNight/buttons/btn_specialCue_set_pressed.svg
 create mode 100644 res/skins/LateNight/buttons/btn_specialCue_unset.svg
 create mode 100644 res/skins/LateNight/buttons/btn_specialCue_unset_pressed.svg

diff --git a/res/skins/LateNight/button_special_cue.xml b/res/skins/LateNight/button_special_cue.xml
index 7e79d39dac8..3dadf929eff 100644
--- a/res/skins/LateNight/button_special_cue.xml
+++ b/res/skins/LateNight/button_special_cue.xml
@@ -18,16 +18,16 @@ Variables:
     <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>
+      <Alignment>center</Alignment>
+      <Unpressed scalemode="STRETCH">skin:/buttons/btn_specialCue_unset.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons/btn_specialCue_unset_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>
+      <Alignment>center</Alignment>
+      <Unpressed scalemode="STRETCH">skin:/buttons/btn_specialCue_set.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons/btn_specialCue_set_pressed.svg</Pressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="group"/>,<Variable name="cue_type"/>_activate</ConfigKey>
diff --git a/res/skins/LateNight/buttons/btn_specialCue_set.svg b/res/skins/LateNight/buttons/btn_specialCue_set.svg
new file mode 100644
index 00000000000..eaafc4fc366
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_specialCue_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=".11765" offset=".28"/><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 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></svg>
diff --git a/res/skins/LateNight/buttons/btn_specialCue_set_pressed.svg b/res/skins/LateNight/buttons/btn_specialCue_set_pressed.svg
new file mode 100644
index 00000000000..8749b22f336
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_specialCue_set_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(0,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".078431" offset="0"/><stop stop-opacity=".039216" offset=".28"/><stop stop-opacity=".23529" 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"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_specialCue_unset.svg b/res/skins/LateNight/buttons/btn_specialCue_unset.svg
new file mode 100644
index 00000000000..9dd0e57b949
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_specialCue_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="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="translate(0,-1026.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#242424" offset="0"/><stop stop-color="#101010" offset="1"/></linearGradient></defs><rect x="2" y="2" width="24" height="24" rx="2" ry="2" color="#000000" fill="#060606" opacity=".62085"/><rect x="1" y="1" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".72"/><rect x=".5" y=".49998" width="23" height="23" rx="2" ry="2" 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"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_specialCue_unset_pressed.svg b/res/skins/LateNight/buttons/btn_specialCue_unset_pressed.svg
new file mode 100644
index 00000000000..fbe70b92c0b
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_specialCue_unset_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="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#222" offset="0"/><stop stop-color="#131516" offset="1"/></linearGradient></defs><rect x=".5" y=".49998" width="23" height="23" rx="2" ry="2" 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="#454748" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index d6d99c74f07..4f5964d1e3a 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -528,7 +528,6 @@ WEffectButtonParameter*/
   }
 
 #VinylButton[displayValue="0"],
-#SpecialCueButton[displayValue="0"],
 #BroadcastButton[displayValue="0"],
 #SettingsButton[displayValue="0"],
 #GuiToggleButton[displayValue="0"],
@@ -540,15 +539,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,

From f5f1514ae9d0ab73fc1db017f4c3e7ce515d6ded Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 16 Jul 2019 14:24:27 +0200
Subject: [PATCH 3/5] align hotcue labels right to waveform markers

---
 res/skins/LateNight/waveform.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/skins/LateNight/waveform.xml b/res/skins/LateNight/waveform.xml
index 04df7a64b6a..bf8bf4ed189 100644
--- a/res/skins/LateNight/waveform.xml
+++ b/res/skins/LateNight/waveform.xml
@@ -18,7 +18,7 @@
         <PlayPosColor>#00FF00</PlayPosColor>
         <EndOfTrackColor>#EA0000</EndOfTrackColor>
         <DefaultMark>
-          <Align>top</Align>
+          <Align>top|right</Align>
           <Color>#00FF00</Color>
           <TextColor>#FFFFFF</TextColor>
           <Text> %1 </Text>

From 2eb322303ac7aa7a635e986f83e32d1266061373 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Wed, 17 Jul 2019 15:36:39 +0200
Subject: [PATCH 4/5] simplify hotcue/intro/outro button icons...

by moving all bg colors to css, thus icons set/unset state are identical now
---
 res/skins/LateNight/button_hotcue.xml         |   6 +-
 res/skins/LateNight/button_special_cue.xml    |  12 +-
 res/skins/LateNight/buttons/btn_cue_N_set.svg |   1 +
 res/skins/LateNight/buttons/btn_cue_over.svg  |   2 +-
 res/skins/LateNight/buttons/btn_hotcue_1.svg  |   1 +
 .../buttons/btn_hotcue_1_pressed.svg          |   1 +
 .../LateNight/buttons/btn_hotcue_1_set.svg    |   1 -
 .../buttons/btn_hotcue_1_set_pressed.svg      |   1 -
 .../LateNight/buttons/btn_hotcue_1_unset.svg  |   2 +-
 .../buttons/btn_hotcue_1_unset_pressed.svg    |   1 -
 res/skins/LateNight/buttons/btn_hotcue_2.svg  |   1 +
 .../buttons/btn_hotcue_2_pressed.svg          |   1 +
 .../LateNight/buttons/btn_hotcue_2_set.svg    |   1 -
 .../buttons/btn_hotcue_2_set_pressed.svg      |   1 -
 .../LateNight/buttons/btn_hotcue_2_unset.svg  |   2 +-
 .../buttons/btn_hotcue_2_unset_pressed.svg    |   1 -
 res/skins/LateNight/buttons/btn_hotcue_3.svg  |   1 +
 .../buttons/btn_hotcue_3_pressed.svg          |   1 +
 .../LateNight/buttons/btn_hotcue_3_set.svg    |   1 -
 .../buttons/btn_hotcue_3_set_pressed.svg      |   1 -
 .../LateNight/buttons/btn_hotcue_3_unset.svg  |   2 +-
 .../buttons/btn_hotcue_3_unset_pressed.svg    |   1 -
 res/skins/LateNight/buttons/btn_hotcue_4.svg  |   1 +
 .../buttons/btn_hotcue_4_pressed.svg          |   1 +
 .../LateNight/buttons/btn_hotcue_4_set.svg    |   1 -
 .../buttons/btn_hotcue_4_set_pressed.svg      |   1 -
 .../LateNight/buttons/btn_hotcue_4_unset.svg  |   2 +-
 .../buttons/btn_hotcue_4_unset_pressed.svg    |   1 -
 res/skins/LateNight/buttons/btn_hotcue_5.svg  |   1 +
 .../buttons/btn_hotcue_5_pressed.svg          |   3 +
 .../LateNight/buttons/btn_hotcue_5_set.svg    |   1 -
 .../buttons/btn_hotcue_5_set_pressed.svg      |   1 -
 .../LateNight/buttons/btn_hotcue_5_unset.svg  |   2 +-
 .../buttons/btn_hotcue_5_unset_pressed.svg    |   1 -
 res/skins/LateNight/buttons/btn_hotcue_6.svg  |   1 +
 .../buttons/btn_hotcue_6_pressed.svg          |   1 +
 .../LateNight/buttons/btn_hotcue_6_set.svg    |   1 -
 .../buttons/btn_hotcue_6_set_pressed.svg      |   1 -
 .../LateNight/buttons/btn_hotcue_6_unset.svg  |   2 +-
 .../buttons/btn_hotcue_6_unset_pressed.svg    |   1 -
 res/skins/LateNight/buttons/btn_hotcue_7.svg  |   1 +
 .../buttons/btn_hotcue_7_pressed.svg          |   1 +
 .../LateNight/buttons/btn_hotcue_7_set.svg    |   1 -
 .../buttons/btn_hotcue_7_set_pressed.svg      |   1 -
 .../LateNight/buttons/btn_hotcue_7_unset.svg  |   2 +-
 .../buttons/btn_hotcue_7_unset_pressed.svg    |   1 -
 res/skins/LateNight/buttons/btn_hotcue_8.svg  |   1 +
 .../buttons/btn_hotcue_8_pressed.svg          |   1 +
 .../LateNight/buttons/btn_hotcue_8_set.svg    |   1 -
 .../buttons/btn_hotcue_8_set_pressed.svg      |   1 -
 .../LateNight/buttons/btn_hotcue_8_unset.svg  |   2 +-
 .../buttons/btn_hotcue_8_unset_pressed.svg    |   1 -
 .../LateNight/buttons/btn_hotcue_over.svg     |   1 -
 .../LateNight/buttons/btn_hotcue_x_over.svg   | 293 ------------------
 res/skins/LateNight/buttons/btn_intro_end.svg |   1 +
 .../buttons/btn_intro_end_pressed.svg         |   1 +
 .../LateNight/buttons/btn_intro_start.svg     |   1 +
 .../buttons/btn_intro_start_pressed.svg       |   1 +
 res/skins/LateNight/buttons/btn_outro_end.svg |   1 +
 .../buttons/btn_outro_end_pressed.svg         |   1 +
 .../LateNight/buttons/btn_outro_start.svg     |   1 +
 .../buttons/btn_outro_start_pressed.svg       |   1 +
 .../LateNight/buttons/btn_specialCue_set.svg  |   1 -
 .../buttons/btn_specialCue_set_pressed.svg    |   1 -
 .../buttons/btn_specialCue_unset.svg          |   1 -
 .../buttons/btn_specialCue_unset_pressed.svg  |   1 -
 res/skins/LateNight/deck_overview.xml         |   2 +-
 .../deck_row_5_transportLoopJump.xml          |   4 -
 res/skins/LateNight/preview_deck.xml          |   2 +-
 res/skins/LateNight/sampler.xml               |   2 +-
 res/skins/LateNight/style.qss                 |  56 ++--
 res/skins/LateNight/waveform.xml              |   2 +-
 72 files changed, 75 insertions(+), 378 deletions(-)
 create mode 100644 res/skins/LateNight/buttons/btn_cue_N_set.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_1.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_1_pressed.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_1_set.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_1_set_pressed.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_1_unset_pressed.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_2.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_2_pressed.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_2_set.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_2_set_pressed.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_2_unset_pressed.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_3.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_3_pressed.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_3_set.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_3_set_pressed.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_3_unset_pressed.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_4.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_4_pressed.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_4_set.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_4_set_pressed.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_4_unset_pressed.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_5.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_5_pressed.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_5_set.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_5_set_pressed.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_5_unset_pressed.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_6.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_6_pressed.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_6_set.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_6_set_pressed.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_6_unset_pressed.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_7.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_7_pressed.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_7_set.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_7_set_pressed.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_7_unset_pressed.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_8.svg
 create mode 100644 res/skins/LateNight/buttons/btn_hotcue_8_pressed.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_8_set.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_8_set_pressed.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_8_unset_pressed.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_over.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_hotcue_x_over.svg
 create mode 100644 res/skins/LateNight/buttons/btn_intro_end.svg
 create mode 100644 res/skins/LateNight/buttons/btn_intro_end_pressed.svg
 create mode 100644 res/skins/LateNight/buttons/btn_intro_start.svg
 create mode 100644 res/skins/LateNight/buttons/btn_intro_start_pressed.svg
 create mode 100644 res/skins/LateNight/buttons/btn_outro_end.svg
 create mode 100644 res/skins/LateNight/buttons/btn_outro_end_pressed.svg
 create mode 100644 res/skins/LateNight/buttons/btn_outro_start.svg
 create mode 100644 res/skins/LateNight/buttons/btn_outro_start_pressed.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_specialCue_set.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_specialCue_set_pressed.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_specialCue_unset.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_specialCue_unset_pressed.svg

diff --git a/res/skins/LateNight/button_hotcue.xml b/res/skins/LateNight/button_hotcue.xml
index 5d740cc6299..b9d2c178d3c 100644
--- a/res/skins/LateNight/button_hotcue.xml
+++ b/res/skins/LateNight/button_hotcue.xml
@@ -8,12 +8,12 @@
     <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"/>_unset_pressed.svg</Pressed>
+      <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"/>_set.svg</Unpressed>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>_set_pressed.svg</Pressed>
+      <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>
diff --git a/res/skins/LateNight/button_special_cue.xml b/res/skins/LateNight/button_special_cue.xml
index 3dadf929eff..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>center</Alignment>
-      <Unpressed scalemode="STRETCH">skin:/buttons/btn_specialCue_unset.svg</Unpressed>
-      <Pressed scalemode="STRETCH">skin:/buttons/btn_specialCue_unset_pressed.svg</Pressed>
+      <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>center</Alignment>
-      <Unpressed scalemode="STRETCH">skin:/buttons/btn_specialCue_set.svg</Unpressed>
-      <Pressed scalemode="STRETCH">skin:/buttons/btn_specialCue_set_pressed.svg</Pressed>
+      <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
new file mode 100644
index 00000000000..ed0d6fea65c
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_1.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="#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_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_set.svg b/res/skins/LateNight/buttons/btn_hotcue_1_set.svg
deleted file mode 100644
index ca9eec7a51c..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_1_set.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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=".11765" offset=".28"/><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"/><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_set_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_1_set_pressed.svg
deleted file mode 100644
index 26c99892e11..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_1_set_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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=".078431" offset="0"/><stop stop-opacity=".039216" offset=".28"/><stop stop-opacity=".23529" 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"/><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
index df586f33047..7116e6c78f2 100644
--- a/res/skins/LateNight/buttons/btn_hotcue_1_unset.svg
+++ b/res/skins/LateNight/buttons/btn_hotcue_1_unset.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="#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_1_unset_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_1_unset_pressed.svg
deleted file mode 100644
index 11ea2b78a9f..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_1_unset_pressed.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_2.svg b/res/skins/LateNight/buttons/btn_hotcue_2.svg
new file mode 100644
index 00000000000..0f1f1c8d21b
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_2.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="#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_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_set.svg b/res/skins/LateNight/buttons/btn_hotcue_2_set.svg
deleted file mode 100644
index b208509efcc..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_2_set.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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=".11765" offset=".28"/><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 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_set_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_2_set_pressed.svg
deleted file mode 100644
index a4ad68a132b..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_2_set_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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=".078431" offset="0"/><stop stop-opacity=".039216" offset=".28"/><stop stop-opacity=".23529" 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"/><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
index 77abc05c1b1..c4f23805c6b 100644
--- a/res/skins/LateNight/buttons/btn_hotcue_2_unset.svg
+++ b/res/skins/LateNight/buttons/btn_hotcue_2_unset.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="#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_2_unset_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_2_unset_pressed.svg
deleted file mode 100644
index 30cd63988e3..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_2_unset_pressed.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_3.svg b/res/skins/LateNight/buttons/btn_hotcue_3.svg
new file mode 100644
index 00000000000..a7cbfdc0144
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_3.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="#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_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_set.svg b/res/skins/LateNight/buttons/btn_hotcue_3_set.svg
deleted file mode 100644
index d7e462f8ad6..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_3_set.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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=".11765" offset=".28"/><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 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_set_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_3_set_pressed.svg
deleted file mode 100644
index 688b9463894..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_3_set_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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=".078431" offset="0"/><stop stop-opacity=".039216" offset=".28"/><stop stop-opacity=".23529" 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"/><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
index 6704b65d1a7..10f450f24e0 100644
--- a/res/skins/LateNight/buttons/btn_hotcue_3_unset.svg
+++ b/res/skins/LateNight/buttons/btn_hotcue_3_unset.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="#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_3_unset_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_3_unset_pressed.svg
deleted file mode 100644
index 2c6895a5c50..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_3_unset_pressed.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_4.svg b/res/skins/LateNight/buttons/btn_hotcue_4.svg
new file mode 100644
index 00000000000..87dbdc9160f
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_4.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="#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_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_set.svg b/res/skins/LateNight/buttons/btn_hotcue_4_set.svg
deleted file mode 100644
index 41de89875cf..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_4_set.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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=".11765" offset=".28"/><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 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_set_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_4_set_pressed.svg
deleted file mode 100644
index 984957af1f5..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_4_set_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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=".078431" offset="0"/><stop stop-opacity=".039216" offset=".28"/><stop stop-opacity=".23529" 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"/><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
index 4b6f20d5145..2cbed526d8c 100644
--- a/res/skins/LateNight/buttons/btn_hotcue_4_unset.svg
+++ b/res/skins/LateNight/buttons/btn_hotcue_4_unset.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="#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_4_unset_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_4_unset_pressed.svg
deleted file mode 100644
index ff88cd2b23f..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_4_unset_pressed.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_5.svg b/res/skins/LateNight/buttons/btn_hotcue_5.svg
new file mode 100644
index 00000000000..79548f6966e
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_5.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="#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_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_set.svg b/res/skins/LateNight/buttons/btn_hotcue_5_set.svg
deleted file mode 100644
index 3bf984a15c4..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_5_set.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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=".11765" offset=".28"/><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 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_set_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_5_set_pressed.svg
deleted file mode 100644
index a981a843ac6..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_5_set_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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=".078431" offset="0"/><stop stop-opacity=".039216" offset=".28"/><stop stop-opacity=".23529" 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"/><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
index 69b7ae08ffc..d093f7e780d 100644
--- a/res/skins/LateNight/buttons/btn_hotcue_5_unset.svg
+++ b/res/skins/LateNight/buttons/btn_hotcue_5_unset.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="#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_5_unset_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_5_unset_pressed.svg
deleted file mode 100644
index 2d4f28b17d4..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_5_unset_pressed.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_6.svg b/res/skins/LateNight/buttons/btn_hotcue_6.svg
new file mode 100644
index 00000000000..69372da16c9
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_6.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="#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_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_set.svg b/res/skins/LateNight/buttons/btn_hotcue_6_set.svg
deleted file mode 100644
index ce1327c628e..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_6_set.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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=".11765" offset=".28"/><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 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_set_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_6_set_pressed.svg
deleted file mode 100644
index f51f3e4e86e..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_6_set_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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=".078431" offset="0"/><stop stop-opacity=".039216" offset=".28"/><stop stop-opacity=".23529" 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"/><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
index e54fa90ddbf..a5125061ca7 100644
--- a/res/skins/LateNight/buttons/btn_hotcue_6_unset.svg
+++ b/res/skins/LateNight/buttons/btn_hotcue_6_unset.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="#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_6_unset_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_6_unset_pressed.svg
deleted file mode 100644
index f95363c1945..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_6_unset_pressed.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_7.svg b/res/skins/LateNight/buttons/btn_hotcue_7.svg
new file mode 100644
index 00000000000..7bf3d4a3a2a
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_7.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="#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_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_set.svg b/res/skins/LateNight/buttons/btn_hotcue_7_set.svg
deleted file mode 100644
index c9549397642..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_7_set.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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=".11765" offset=".28"/><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 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_set_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_7_set_pressed.svg
deleted file mode 100644
index cba1786f1a5..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_7_set_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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=".078431" offset="0"/><stop stop-opacity=".039216" offset=".28"/><stop stop-opacity=".23529" 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"/><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
index 60b5baa894b..e0bc3b5b94a 100644
--- a/res/skins/LateNight/buttons/btn_hotcue_7_unset.svg
+++ b/res/skins/LateNight/buttons/btn_hotcue_7_unset.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="#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_7_unset_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_7_unset_pressed.svg
deleted file mode 100644
index 688242f47d6..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_7_unset_pressed.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_8.svg b/res/skins/LateNight/buttons/btn_hotcue_8.svg
new file mode 100644
index 00000000000..17f26afa9fe
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_hotcue_8.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="#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_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_set.svg b/res/skins/LateNight/buttons/btn_hotcue_8_set.svg
deleted file mode 100644
index f504a3a0a72..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_8_set.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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=".11765" offset=".28"/><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 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_set_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_8_set_pressed.svg
deleted file mode 100644
index b9480d48710..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_8_set_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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=".078431" offset="0"/><stop stop-opacity=".039216" offset=".28"/><stop stop-opacity=".23529" 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"/><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
index 136cdbd7ffa..17d48932cb5 100644
--- a/res/skins/LateNight/buttons/btn_hotcue_8_unset.svg
+++ b/res/skins/LateNight/buttons/btn_hotcue_8_unset.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="#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_hotcue_8_unset_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_8_unset_pressed.svg
deleted file mode 100644
index a0951c1e59c..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_8_unset_pressed.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_over.svg b/res/skins/LateNight/buttons/btn_hotcue_over.svg
deleted file mode 100644
index ec5c95e7fd1..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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=".11765" offset=".28"/><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><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><g display="none"><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 display="none"><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 display="none"><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 display="none"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g><g display="none"><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 display="none"><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 display="none"><path d="m10 9h3v6h-2v-5h-1v-1" fill="#dcdcdc"/><path d="m13 10h1v6h-2v-1h1v-5" fill="#323232"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_x_over.svg b/res/skins/LateNight/buttons/btn_hotcue_x_over.svg
deleted file mode 100644
index 0c06bb508d9..00000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_x_over.svg
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="26"
-   height="26"
-   version="1.1"
-   id="svg83"
-   sodipodi:docname="btn_hotcue_over.svg"
-   inkscape:version="0.92.4 (unknown)">
-  <metadata
-     id="metadata87">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="740"
-     id="namedview85"
-     showgrid="false"
-     inkscape:zoom="9.0769231"
-     inkscape:cx="-9.6851465"
-     inkscape:cy="17.222154"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer3" />
-  <defs
-     id="defs9">
-    <linearGradient
-       id="a"
-       x1=".5"
-       x2="23.5"
-       y1="12"
-       y2="12"
-       gradientTransform="translate(0,-24)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-opacity=".17647"
-         offset="0"
-         id="stop2" />
-      <stop
-         stop-opacity=".11765"
-         offset=".28"
-         id="stop4" />
-      <stop
-         stop-opacity=".47451"
-         offset="1"
-         id="stop6" />
-    </linearGradient>
-  </defs>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="frame"
-     style="display:inline">
-    <g
-       id="g19">
-      <path
-         style="opacity:0.5;fill:#010101"
-         inkscape:connector-curvature="0"
-         d="m 24.82,2.1797 c 0.11293,0.25091 0.17969,0.52638 0.17969,0.82031 v 20 c 0,1.108 -0.892,2 -2,2 h -20 c -0.29393,0 -0.5694,-0.06676 -0.82031,-0.17969 0.31276,0.69491 1.0062,1.1797 1.8203,1.1797 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81407 -0.48477,-1.5075 -1.1797,-1.8203 z"
-         id="path11" />
-      <path
-         style="opacity:0.8;fill:#030303"
-         inkscape:connector-curvature="0"
-         d="m 23.814,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,2 -2,2 h -20 c -0.2947,0 -0.5716,-0.06963 -0.82422,-0.18555 0.31134,0.69838 1.0076,1.1855 1.8242,1.1855 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z"
-         id="path13" />
-      <rect
-         style="color:#000000;fill:url(#a)"
-         transform="rotate(90)"
-         x="0.5"
-         y="-23.5"
-         width="23"
-         height="23"
-         rx="1.5"
-         ry="1.5"
-         id="rect15" />
-      <path
-         inkscape:connector-curvature="0"
-         d="M 2,0 C 0.9006,0 0,0.90065 0,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 V 2 C 24,0.9006 23.09935,0 22,0 Z M 2.3,1 H 21.7 C 22.26265,1 23,1.73735 23,2.3 V 21.7 C 23,22.26265 22.26265,23 21.7,23 H 2.3 C 1.73735,23 1,22.26265 1,21.7 V 2.3 C 1,1.73735 1.73735,1 2.3,1 Z"
-         style="color:#000000;text-indent:0;text-transform:none;fill:#979797"
-         id="path17" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="1"
-     style="display:inline">
-    <g
-       id="g27">
-      <g
-         style="display:inline"
-         display="inline"
-         id="g25">
-        <path
-           style="fill:#dcdcdc"
-           inkscape:connector-curvature="0"
-           d="m 10,9 h 3 v 6 H 11 V 10 H 10 V 9"
-           id="path21" />
-        <path
-           style="fill:#323232"
-           inkscape:connector-curvature="0"
-           d="m 13,10 h 1 v 6 h -2 v -1 h 1 v -5"
-           id="path23" />
-      </g>
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="2"
-     style="display:none">
-    <g
-       id="g35">
-      <g
-         style="display:inline"
-         display="inline"
-         id="g33">
-        <path
-           style="fill:#323232"
-           inkscape:connector-curvature="0"
-           d="m 10,10 h 7 v 4 h -5 v 1 h 5 v 1 h -7 v -3 h 5 v -2 h -5 v -1"
-           id="path29" />
-        <path
-           style="fill:#dcdcdc"
-           inkscape:connector-curvature="0"
-           d="m 9,9 h 7 v 4 h -5 v 1 h 5 v 1 H 9 v -3 h 5 V 10 H 9 V 9"
-           id="path31" />
-      </g>
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="3"
-     style="display:none">
-    <g
-       id="g43">
-      <g
-         style="display:inline"
-         display="inline"
-         id="g41">
-        <path
-           style="fill:#323232"
-           inkscape:connector-curvature="0"
-           d="m 10,10 h 7 v 6 h -7 v -1 h 5 v -1 h -2 v -1 h 2 v -2 h -5 v -1"
-           id="path37" />
-        <path
-           style="fill:#dcdcdc"
-           inkscape:connector-curvature="0"
-           d="m 9,9 h 7 v 6 H 9 v -1 h 5 v -1 h -2 v -1 h 2 V 10 H 9 V 9"
-           id="path39" />
-      </g>
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer6"
-     inkscape:label="4"
-     style="display:none">
-    <g
-       id="g51">
-      <g
-         style="display:inline"
-         display="inline"
-         id="g49">
-        <path
-           style="fill:#323232"
-           inkscape:connector-curvature="0"
-           d="m 10,11 v 3 h 5 v 2 h 2 v -6 h -2 v 3 h -3 v -2 h -2"
-           id="path45" />
-        <path
-           style="fill:#dcdcdc"
-           inkscape:connector-curvature="0"
-           d="m 9,10 v 3 h 5 v 2 h 2 V 9 h -2 v 3 H 11 V 10 H 9"
-           id="path47" />
-      </g>
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer7"
-     inkscape:label="5"
-     style="display:none">
-    <g
-       id="g59">
-      <g
-         style="display:inline"
-         display="inline"
-         id="g57">
-        <path
-           style="fill:#323232"
-           inkscape:connector-curvature="0"
-           d="m 17,10 h -6 v 3 h 4 v 2 h -5 v 1 h 7 v -4 h -5 v -1 h 5 v -1"
-           id="path53" />
-        <path
-           style="fill:#dcdcdc"
-           inkscape:connector-curvature="0"
-           d="m 16,9 h -6 v 3 h 4 v 2 H 9 v 1 h 7 v -4 h -5 v -1 h 5 V 9"
-           id="path55" />
-      </g>
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer8"
-     inkscape:label="6"
-     style="display:none">
-    <g
-       id="g67">
-      <g
-         style="display:inline"
-         display="inline"
-         id="g65">
-        <path
-           style="fill:#323232"
-           inkscape:connector-curvature="0"
-           d="m 10,10 v 6 h 7 v -4 h -5 v -1 h 4 v -1 z m 2,3 h 4 v 2 h -4 z"
-           id="path61" />
-        <path
-           style="fill:#dcdcdc"
-           inkscape:connector-curvature="0"
-           d="m 9,9 v 6 h 7 v -4 h -5 v -1 h 4 V 9 Z m 2,3 h 4 v 2 h -4 z"
-           id="path63" />
-      </g>
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer9"
-     inkscape:label="7"
-     style="display:none">
-    <g
-       id="g75">
-      <g
-         style="display:inline"
-         display="inline"
-         id="g73">
-        <path
-           style="fill:#323232"
-           inkscape:connector-curvature="0"
-           d="m 10,10 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 v -2 h -4 v -1"
-           id="path69" />
-        <path
-           style="fill:#dcdcdc"
-           inkscape:connector-curvature="0"
-           d="m 9,9 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 V 10 H 9 V 9"
-           id="path71" />
-      </g>
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="8"
-     style="display:none">
-    <g
-       id="g81">
-      <path
-         style="fill:#323232"
-         inkscape:connector-curvature="0"
-         d="m 11,10 v 2 h -1 v 4 h 7 v -4 h -1 v -2 z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z"
-         id="path77" />
-      <path
-         style="fill:#dcdcdc"
-         inkscape:connector-curvature="0"
-         d="m 10,9 v 2 H 9 v 4 h 7 V 11 H 15 V 9 Z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z"
-         id="path79" />
-    </g>
-  </g>
-</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/buttons/btn_specialCue_set.svg b/res/skins/LateNight/buttons/btn_specialCue_set.svg
deleted file mode 100644
index eaafc4fc366..00000000000
--- a/res/skins/LateNight/buttons/btn_specialCue_set.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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=".11765" offset=".28"/><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 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></svg>
diff --git a/res/skins/LateNight/buttons/btn_specialCue_set_pressed.svg b/res/skins/LateNight/buttons/btn_specialCue_set_pressed.svg
deleted file mode 100644
index 8749b22f336..00000000000
--- a/res/skins/LateNight/buttons/btn_specialCue_set_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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=".078431" offset="0"/><stop stop-opacity=".039216" offset=".28"/><stop stop-opacity=".23529" 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"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_specialCue_unset.svg b/res/skins/LateNight/buttons/btn_specialCue_unset.svg
deleted file mode 100644
index 9dd0e57b949..00000000000
--- a/res/skins/LateNight/buttons/btn_specialCue_unset.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="translate(0,-1026.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#242424" offset="0"/><stop stop-color="#101010" offset="1"/></linearGradient></defs><rect x="2" y="2" width="24" height="24" rx="2" ry="2" color="#000000" fill="#060606" opacity=".62085"/><rect x="1" y="1" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".72"/><rect x=".5" y=".49998" width="23" height="23" rx="2" ry="2" 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"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_specialCue_unset_pressed.svg b/res/skins/LateNight/buttons/btn_specialCue_unset_pressed.svg
deleted file mode 100644
index fbe70b92c0b..00000000000
--- a/res/skins/LateNight/buttons/btn_specialCue_unset_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#222" offset="0"/><stop stop-color="#131516" offset="1"/></linearGradient></defs><rect x=".5" y=".49998" width="23" height="23" rx="2" ry="2" 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="#454748" style="block-progression:tb;text-indent:0;text-transform:none"/></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 4f5964d1e3a..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,
@@ -557,18 +556,20 @@ WEffectButtonParameter*/
 
 #HotcueButton,
 #SpecialCueButton {
-  border-color: #000;
-  border-style: solid;
-  /* limit background to button surface resulting from SVG backpath */
-  border-width: 1px 3px 3px 1px;
-  border-radius: 2px;
-  /*
+  /* 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%
-  Npx: tried a lot of integers as well as .5 values
-  at least I didn't find the magic, unintuitive floating point value that
-  so, right now I don't see a way to align font pixels to actual button size in pixels
-  to make the fonts look sharp.
+  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";
@@ -576,15 +577,18 @@ WEffectButtonParameter*/
   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: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-    stop:0 #0000D4,
-    stop:1 #10103b);
+  background-color: #0000D4;
 }
 
 /* Hotcue Color: Red
@@ -594,53 +598,49 @@ WEffectButtonParameter*/
 #HotcueButton[displayValue="2"][highlight="0"],
 #HotcueButton[displayValue="1"][highlight="1"],
 #HotcueButton[displayValue="2"][highlight="1"] {
-    background-color: #c50a08;
+  background-color: #db0000;
 }
 
 /* Hotcue Color: Green */
 #HotcueButton[displayValue="1"][highlight="2"],
 #HotcueButton[displayValue="2"][highlight="2"] {
-    background-color: #32be44;
+  background-color: #32be44;
 }
 
 /* Hotcue Color: Blue */
 #HotcueButton[displayValue="1"][highlight="3"],
 #HotcueButton[displayValue="2"][highlight="3"] {
-    background-color: #0044ff;
+  background-color: #0044ff;
 }
 
 /* Hotcue Color: Yellow */
 #HotcueButton[displayValue="1"][highlight="4"],
 #HotcueButton[displayValue="2"][highlight="4"] {
-    color: #333;
-    background-color: #f8d200;
+  background-color: #f8d200;
 }
 
 /* Hotcue Color: Celeste */
 #HotcueButton[displayValue="1"][highlight="5"],
 #HotcueButton[displayValue="2"][highlight="5"] {
-    color: #333;
-    background-color: #42d4f4;
+  background-color: #42d4f4;
 }
 
 /* Hotcue Color: Purple */
 #HotcueButton[displayValue="1"][highlight="6"],
 #HotcueButton[displayValue="2"][highlight="6"] {
-    background-color: #af00cc;
+  background-color: #af00cc;
 }
 
 /* Hotcue Color: Pink */
 #HotcueButton[displayValue="1"][highlight="7"],
 #HotcueButton[displayValue="2"][highlight="7"] {
-    color: #333;
-    background-color: #fca6d7;
+  background-color: #fca6d7;
 }
 
 /* Hotcue Color: White */
 #HotcueButton[displayValue="1"][highlight="8"],
 #HotcueButton[displayValue="2"][highlight="8"] {
-    color: #333;
-    background-color: #f2f2ff;
+  background-color: #f2f2ff;
 }
 
 #SettingsButton[displayValue="1"] {
diff --git a/res/skins/LateNight/waveform.xml b/res/skins/LateNight/waveform.xml
index bf8bf4ed189..9022f7b3cbc 100644
--- a/res/skins/LateNight/waveform.xml
+++ b/res/skins/LateNight/waveform.xml
@@ -19,7 +19,7 @@
         <EndOfTrackColor>#EA0000</EndOfTrackColor>
         <DefaultMark>
           <Align>top|right</Align>
-          <Color>#00FF00</Color>
+          <Color>#FF0000</Color>
           <TextColor>#FFFFFF</TextColor>
           <Text> %1 </Text>
         </DefaultMark>

From 8ffd45a5d20936e5d0aab1771133c12f5c9eddd7 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Wed, 17 Jul 2019 16:48:28 +0200
Subject: [PATCH 5/5] improve borders within PreviewDeck

---
 .../LateNight/style/clipping_previewdeck.png    | Bin 180 -> 164 bytes
 .../style/volume_display_previewdeck.png        | Bin 420 -> 400 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/res/skins/LateNight/style/clipping_previewdeck.png b/res/skins/LateNight/style/clipping_previewdeck.png
index 640e41d9657447f3fa1e49f038a3cced463c6838..3f453287c8b56e26502c8b5fde7f915c0e85e6e5 100644
GIT binary patch
delta 85
zcmdnOxP)<n3O`$tx4R3&e-K=-clqRrh7!u`C7!;n?2p+6`Ly}wUcbb|z`$VW>Eak7
naXGoCqvOZ^+TUdp>y$*6EtG3uzPE4=P@2Kh)z4*}Q$iB}8@V3v

delta 121
zcmZ3&xP@_oN)$`6lV=DA5Y%v_bTBY5a29w(7BevLUI$@DCym(^Ktah8*NBqf{Irtt
z#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQk$~T^vIsrY2vxdiC%B7Z;T$<|&CRnJd>I
T_PTW!P@2Kh)z4*}Q$iB}i7zNX

diff --git a/res/skins/LateNight/style/volume_display_previewdeck.png b/res/skins/LateNight/style/volume_display_previewdeck.png
index 96d5715fcdd0a479ce16ef77197a11cb3b2b6338..9ff165303e557f9a1d461e3add201b19ca61137d 100644
GIT binary patch
delta 353
zcmZ3&Jb`(F3O`$tx4R3&e-K=-clqRrh7$GcC7!;n?2p+6`Lu;Pul4ydFfht`x;Tbd
zoIZNlaJ5^3$nlT=*Z#KJ!^)<q%G}-R*p-s-agh#BkQW=97)WUSi=CHWmc6q1?z8=Q
z&j0-Rb+`X(cP+YZ;`?a*WEIbv!_I*sLU+IGwg~JOIJEosaaZ5V9tHE%+XQa79yajU
z@V?#}#5}#pW5YUa5bJoMhrxMc5bOMB4+9=%AnT|ChsT9dSrE&j&+~!_FNkI0>lqL#
z3S!xu_Y4qWZ4<EDFe6ox^VFsz0!+JSsBm(=+I0-bl4w)pytVBpkoDrX9p|ro$3d)J
zdYs1!j|d!M|F_jW_qIyJG*)MhH;Xc7sodDc3u3K%tzyx~3}UTXrLtokH;AQkTBTwh
dyEDi8ckH4L)j3z#e<?8lfv2mV%Q~loCIHf}ma_l=

delta 394
zcmbQhyo7mzN<B-llV=DA5Y%v_bTBY5a29w(7BevL9RXp+soH$fKtah8*NBqf{Irtt
z#G+J&^73-M%)IR4<ivthz5Jr|+3#$m7#J88JzX3_EP9V#R_tmE5NUg8ZScB)eUT%J
zBTtl$l#9TT1xH;YO*#}h9J^hcIhrI&xbvROFR7Q{n^W&MGtqCiK7agf`As_e=RFs+
zpR3~eNLX&ws!1<)=_$7SXcM@1S6=VcF2AP776vT`^kyydY|6b2V%^&2+msp!V(nVz
z-IO^C#QL?*zbR1y#A-|QXj=Cg#5z{!)3huT#9Ef=)wF6Ai1n<}uW3=ehC#~*{_e<W
z6Bp=s^C)iU_M9|f!Mbb^D^O(Og4}2j%TZv$g7?)R*1YEv6J*>$to{Gj%N|!eXmeh|
zDM4KKw9>&{>p(2t!wLuYy$7*OeU%SZ&I7STT@?@3-j{HyD32Gmsm_U?a9;u#rVO60
LelF{nof4V=lPa3e