Merge branch '2.3' of github.com:mixxxdj/mixxx into HEAD

50 files changed, 1521 insertions, 1062 deletions

diff --git a/res/controllers/Denon-MC7000-scripts.js b/res/controllers/Denon-MC7000-scripts.js
index e422f9862d..a8afcd8361 100644
--- a/res/controllers/Denon-MC7000-scripts.js
+++ b/res/controllers/Denon-MC7000-scripts.js
@@ -726,16 +726,16 @@ MC7000.sortLibrary = function(channel, control, value) {
     var sortColumn;
     switch (control) {
     case 0x12:  // TITLE
-        sortColumn = 1;
+        sortColumn = 2;
         break;
     case 0x13:  // BPM
-        sortColumn = 14;
+        sortColumn = 15;
         break;
     case 0x14:  // ARTIST
-        sortColumn = 0;
+        sortColumn = 1;
         break;
     case 0x20:  // KEY
-        sortColumn = 19;
+        sortColumn = 20;
         break;
     }
     engine.setValue("[Library]", "sort_column_toggle", sortColumn);
diff --git a/res/controllers/Roland_DJ-505-scripts.js b/res/controllers/Roland_DJ-505-scripts.js
index 25425483dc..30ea621c2a 100644
--- a/res/controllers/Roland_DJ-505-scripts.js
+++ b/res/controllers/Roland_DJ-505-scripts.js
@@ -313,16 +313,16 @@ DJ505.sortLibrary = function(channel, control, value, _status, _group) {
     var sortColumn;
     switch (control) {
     case 0x12:  // SONG
-        sortColumn = 1;
+        sortColumn = 2;
         break;
     case 0x13:  // BPM
-        sortColumn = 14;
+        sortColumn = 15;
         break;
     case 0x14:  // ARTIST
-        sortColumn = 0;
+        sortColumn = 1;
         break;
     case 0x1E:  // KEY
-        sortColumn = 19;
+        sortColumn = 20;
         break;
     default:
         // unknown sort column
diff --git a/res/skins/LateNight/classic/sliders/knob_pitch_sampler.svg b/res/skins/LateNight/classic/sliders/knob_pitch_sampler.svg
index 4f4b6e7f26..0843728d97 100644
--- a/res/skins/LateNight/classic/sliders/knob_pitch_sampler.svg
+++ b/res/skins/LateNight/classic/sliders/knob_pitch_sampler.svg
@@ -25,34 +25,34 @@
      id="defs26" />
   <path
      style="color:#000000;opacity:0.5"
-     d="m 3.29375,11.18361 c 0.504291,0.413239 1.075229,0.816575 2.205357,0.816565 L 24.897874,12 c 2.101752,-1.9e-5 3.101864,-1.652533 3.101752,-2.99965 L 27.999376,6 C 27.999328,5.42619 27.80088,4.7078645 27.419053,4.2223066 28.281613,4.7480866 28.499785,5.91145 28.499876,6.99965 L 28.500126,10 c 1.38e-4,1.662 -1.338,2.999985 -3,3 L 5.85625,13.000175 c -1.0882,10e-6 -2.27159,-0.138071 -2.5625,-1.816565 z"
+     d="m 4.293625,11.183485 c 0.504291,0.413239 1.075229,0.816575 2.205357,0.816565 L 23.897874,12 c 2.101752,-6e-6 3.101864,-1.652533 3.101752,-2.99965 L 26.999376,6 C 26.999328,5.42619 26.80088,4.7078645 26.419053,4.2223066 27.281613,4.7480866 27.499785,5.91145 27.499876,6.99965 L 27.500126,10 c 1.38e-4,1.662 -1.338,2.999995 -3,3 l -17.644001,5e-5 c -1.0882,10e-6 -2.27159,-0.138071 -2.5625,-1.816565 z"
      id="path2-3" />
   <path
      style="color:#000000;opacity:0.8"
-     d="m 2.3555,6.000525 2.5e-4,3.00035 c 1.39e-4,1.662 1.338,3.000015 3,3 L 24.999626,12.0007 c 1.662,-1.5e-5 3.000138,-1.338 3,-3 l -2.5e-4,-3.00035 c -1.38e-4,-1.662 -1.338,-3.0000148 -3,-3 L 5.3555,3.000525 c -1.662,1.48e-5 -3.000138,1.338 -3,3 z"
+     d="m 3.355375,6.0004 2.5e-4,3.00035 c 1.385e-4,1.662 1.338,3.000005 3,3 l 17.644001,-5e-5 c 1.662,-5e-6 3.000138,-1.338 3,-3 l -2.5e-4,-3.00035 c -1.38e-4,-1.662 -1.338,-3.0000047 -3,-3 l -17.644001,5e-5 c -1.662,4.7e-6 -3.0001385,1.338 -3,3 z"
      id="path4-6" />
   <path
      id="path8-5-5"
-     d="m 2,5.000075 c 0,-1.662 1.338,-3 3,-3 L 25,2 c 0.831,-3.1e-6 1.5828,0.33275 2.125,0.875 L 26,4 4,9.000745 l -1.125,1.125 C 2.33275,9.583495 2,8.831745 2,8.000745 Z"
+     d="m 2.999875,4.99995 c 0,-1.662 1.338,-3 3,-3 L 24,2 c 0.831,2.3e-6 1.5828,0.33275 2.125,0.875 L 25,4 4.999875,9.00062 l -1.125,1.125 c -0.54225,-0.54225 -0.875,-1.294 -0.875,-2.125 z"
      style="color:#000000;fill:#444444" />
   <path
      id="path10-3-3"
-     d="M 2.875,10.12532 4,9.00032 26,3.999575 l 1.125,-1.125 c 0.54225,0.54225 0.875,1.294 0.875,2.125 V 8.00022 c 0,1.662 -1.338,3 -3,3 l -20,7.5e-5 c -0.831,3e-6 -1.5828,-0.33275 -2.125,-0.875 z"
+     d="m 3.874875,10.125195 1.125,-1.125 L 25,3.999575 l 1.125,-1.125 c 0.54225,0.54225 0.875,1.294 0.875,2.125 V 8.00022 c 0,1.662 -1.338,3 -3,3 l -18.000125,-5e-5 c -0.831,-2e-6 -1.5828,-0.33275 -2.125,-0.875 z"
      style="color:#000000;fill:#1a1a1a" />
   <path
      id="path12-5-5"
-     d="M 3,5.000075 V 8.00072 c 0,1.108 0.892,2 2,2 l 20,-7.5e-5 c 1.108,-4e-6 2,-0.892 2,-2 V 5 C 27,3.892 26.108,3 25,3 l -20,7.5e-5 c -1.108,4.2e-6 -2,0.892 -2,2 z"
+     d="m 3.999875,4.99995 v 3.000645 c 0,1.108 0.892,2 2,2 L 24,10.000645 c 1.108,3e-6 2,-0.892 2,-2 V 5 C 26,3.892 25.108,3 24,3 l -18.000125,-5e-5 c -1.108,-3.1e-6 -2,0.892 -2,2 z"
      style="color:#000000;fill:#262626;fill-opacity:1" />
   <path
      id="path14-6-6"
-     d="m 3,6.0007203 v 1 l 24,-7.5e-5 v -1 z"
+     d="m 3.999875,6.0005953 v 1 L 26,7.0006453 v -1 z"
      style="color:#000000;fill:#b40000;fill-opacity:1" />
   <path
      id="path18-9"
-     d="m 3,7.0007203 v 1 l 24,-7.5e-5 v -1 z"
+     d="m 3.999875,7.0005953 v 1 L 26,8.0006453 v -1 z"
      style="color:#000000;fill:#ea0000" />
   <path
      id="path20"
-     d="M 3.2658829,5.0002 3,6.0002003 27,6.0001253 26.733722,5.000125 Z"
+     d="M 4.2657579,5.000075 3.999875,6.0000753 26,6.0001253 25.733722,5.000125 Z"
      style="color:#000000;fill:#191919;fill-opacity:1" />
 </svg>
diff --git a/res/skins/LateNight/controls/knob.xml b/res/skins/LateNight/controls/knob.xml
index 2b59b4f6f3..728be37968 100644
--- a/res/skins/LateNight/controls/knob.xml
+++ b/res/skins/LateNight/controls/knob.xml
@@ -3,48 +3,33 @@
   Description:
     A standard knob.
   Variables:
-    group
-    control: The control to connect to
-    label
-    Size
-    TooltipId
-    PotiMinAngle
-    PotiMaxAngle
+    control: The control to connect to.
 -->
 <Template>
   <WidgetGroup>
-    <Layout>vertical</Layout>
-    <SizePolicy>min,min</SizePolicy>
+    <Layout>horizontal</Layout>
+    <ObjectName><Variable name="ObjectName"/></ObjectName>
     <Children>
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <ObjectName>KnobCentered</ObjectName>
-        <Children>
-
-          <KnobComposed>
-            <TooltipId><Variable name="TooltipId"/></TooltipId>
-            <Size><Variable name="Size"/></Size>
-            <Knob>skin:/<Variable name="KnobScheme"/>/knobs/knob_indicator_<Variable name="KnobIndicator"/>_<Variable name="Color"/>.svg</Knob>
-            <BackPath>skin:/<Variable name="KnobScheme"/>/knobs/knob_bg_<Variable name="KnobBg"/>.svg</BackPath>
-            <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
-            <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
-            <ArcColor>#ff8800</ArcColor>
-            <ArcBgColor>#fff</ArcBgColor>
-            <ArcThickness>5</ArcThickness>
-            <ArcBgThickness>3</ArcBgThickness>
-            <KnobCenterYOffset>1.998</KnobCenterYOffset>
-            <Connection>
-              <ConfigKey><Variable name="Group"/>,<Variable name="Control"/></ConfigKey>
-            </Connection>
-          </KnobComposed>
-        </Children>
-      </WidgetGroup>
-
-      <Label>
-        <ObjectName>KnobLabel</ObjectName>
-        <Text><Variable name="Label"/></Text>
-      </Label>
-
+      <KnobComposed>
+        <TooltipId><Variable name="TooltipId"/></TooltipId>
+        <Size><Variable name="Size"/></Size>
+        <Knob>skin:/<Variable name="KnobScheme"/>/knobs/knob_indicator_<Variable name="KnobIndicator"/>_<Variable name="KnobColor"/>.svg</Knob>
+        <BackPath>skin:/<Variable name="KnobScheme"/>/knobs/knob_bg_<Variable name="KnobBg"/>.svg</BackPath>
+        <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+        <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+        <ArcRadius><Variable name="ArcRadius"/></ArcRadius>
+        <ArcUnipolar><Variable name="ArcUnipolar"/></ArcUnipolar>
+        <ArcReversed><Variable name="ArcReversed"/></ArcReversed>
+        <ArcColor><Variable name="ArcColor"/></ArcColor>
+        <ArcBgColor><Variable name="ArcBgColor"/></ArcBgColor>
+        <ArcThickness><Variable name="ArcThickness"/></ArcThickness>
+        <ArcBgThickness><Variable name="ArcBgThickness"/></ArcBgThickness>
+        <ArcRoundCaps><Variable name="ArcRoundCaps"/></ArcRoundCaps>
+        <KnobCenterYOffset>1.998</KnobCenterYOffset>
+        <Connection>
+          <ConfigKey><Variable name="Group"/>,<Variable name="Control"/></ConfigKey>
+        </Connection>
+      </KnobComposed>
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/controls/knob_textless.xml b/res/skins/LateNight/controls/knob_textless.xml
deleted file mode 100644
index 728be37968..0000000000
--- a/res/skins/LateNight/controls/knob_textless.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    A standard knob.
-  Variables:
-    control: The control to connect to.
--->
-<Template>
-  <WidgetGroup>
-    <Layout>horizontal</Layout>
-    <ObjectName><Variable name="ObjectName"/></ObjectName>
-    <Children>
-      <KnobComposed>
-        <TooltipId><Variable name="TooltipId"/></TooltipId>
-        <Size><Variable name="Size"/></Size>
-        <Knob>skin:/<Variable name="KnobScheme"/>/knobs/knob_indicator_<Variable name="KnobIndicator"/>_<Variable name="KnobColor"/>.svg</Knob>
-        <BackPath>skin:/<Variable name="KnobScheme"/>/knobs/knob_bg_<Variable name="KnobBg"/>.svg</BackPath>
-        <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
-        <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
-        <ArcRadius><Variable name="ArcRadius"/></ArcRadius>
-        <ArcUnipolar><Variable name="ArcUnipolar"/></ArcUnipolar>
-        <ArcReversed><Variable name="ArcReversed"/></ArcReversed>
-        <ArcColor><Variable name="ArcColor"/></ArcColor>
-        <ArcBgColor><Variable name="ArcBgColor"/></ArcBgColor>
-        <ArcThickness><Variable name="ArcThickness"/></ArcThickness>
-        <ArcBgThickness><Variable name="ArcBgThickness"/></ArcBgThickness>
-        <ArcRoundCaps><Variable name="ArcRoundCaps"/></ArcRoundCaps>
-        <KnobCenterYOffset>1.998</KnobCenterYOffset>
-        <Connection>
-          <ConfigKey><Variable name="Group"/>,<Variable name="Control"/></ConfigKey>
-        </Connection>
-      </KnobComposed>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/controls/knob_with_label.xml b/res/skins/LateNight/controls/knob_with_label.xml
new file mode 100644
index 0000000000..57346b0d46
--- /dev/null
+++ b/res/skins/LateNight/controls/knob_with_label.xml
@@ -0,0 +1,62 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    A standard knob.
+  Variables:
+    group
+    control:  The control to connect to
+    TooltipId
+    Size:
+    Label:    text shown below the knob
+    PotiMinAngle
+    PotiMaxAngle
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>AlignCenter</ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>KnobCentered</ObjectName>
+        <Layout>horizontal</Layout>
+        <Children>
+          <KnobComposed>
+            <TooltipId><Variable name="TooltipId"/></TooltipId>
+            <Size><Variable name="Size"/></Size>
+            <Knob>skin:/<Variable name="KnobScheme"/>/knobs/knob_indicator_<Variable name="KnobIndicator"/>_<Variable name="KnobColor"/>.svg</Knob>
+            <BackPath>skin:/<Variable name="KnobScheme"/>/knobs/knob_bg_<Variable name="KnobBg"/>.svg</BackPath>
+            <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+            <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+            <ArcRadius><Variable name="ArcRadius"/></ArcRadius>
+            <ArcUnipolar><Variable name="ArcUnipolar"/></ArcUnipolar>
+            <ArcReversed><Variable name="ArcReversed"/></ArcReversed>
+            <ArcColor><Variable name="ArcColor"/></ArcColor>
+            <ArcBgColor><Variable name="ArcBgColor"/></ArcBgColor>
+            <ArcThickness><Variable name="ArcThickness"/></ArcThickness>
+            <ArcBgThickness><Variable name="ArcBgThickness"/></ArcBgThickness>
+            <ArcRoundCaps><Variable name="ArcRoundCaps"/></ArcRoundCaps>
+            <KnobCenterYOffset>1.998</KnobCenterYOffset>
+            <Connection>
+              <ConfigKey><Variable name="Group"/>,<Variable name="Control"/></ConfigKey>
+            </Connection>
+          </KnobComposed>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>AlignCenter</ObjectName>
+        <Layout>horizontal</Layout>
+        <Children>
+          <Label>
+            <ObjectName>KnobLabel</ObjectName>
+            <SizePolicy>max,min</SizePolicy>
+            <Text><Variable name="Label"/></Text>
+            <Alignment>center</Alignment>
+          </Label>
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/decks/deck_full.xml b/res/skins/LateNight/decks/deck_full.xml
index 6b1a2d1322..2f8a696cce 100644
--- a/res/skins/LateNight/decks/deck_full.xml
+++ b/res/skins/LateNight/decks/deck_full.xml
@@ -61,6 +61,7 @@
             <ObjectName>DeckRateSpacer</ObjectName>
             <SizePolicy>min,min</SizePolicy>
             <Children/>
+            <!-- this is sized and styled in css -->
             <Connection>
               <ConfigKey persist="true">[Skin],show_rate_controls</ConfigKey>
               <Transform><Not/></Transform>
diff --git a/res/skins/LateNight/decks/rate_controls.xml b/res/skins/LateNight/decks/rate_controls.xml
index 3ca319c59d..bb577d4fea 100644
--- a/res/skins/LateNight/decks/rate_controls.xml
+++ b/res/skins/LateNight/decks/rate_controls.xml
@@ -11,6 +11,7 @@
         <Layout>horizontal</Layout>
         <SizePolicy>min,me</SizePolicy>
         <Children/>
+        <!-- this is sized and styled in css -->
        </WidgetGroup>
 
       <WidgetGroup>
diff --git a/res/skins/LateNight/decks/rate_controls_compact.xml b/res/skins/LateNight/decks/rate_controls_compact.xml
index 43f452076e..5129d881c8 100644
--- a/res/skins/LateNight/decks/rate_controls_compact.xml
+++ b/res/skins/LateNight/decks/rate_controls_compact.xml
@@ -11,6 +11,7 @@
         <Layout>horizontal</Layout>
         <SizePolicy>min,me</SizePolicy>
         <Children/>
+        <!-- this is sized and styled in css -->
        </WidgetGroup>
 
       <WidgetGroup>
diff --git a/res/skins/LateNight/fx/assign_buttons_master.xml b/res/skins/LateNight/fx/assign_buttons_master.xml
new file mode 100644
index 0000000000..a2f3e711b4
--- /dev/null
+++ b/res/skins/LateNight/fx/assign_buttons_master.xml
@@ -0,0 +1,49 @@
+<!--
+Description:
+  A button that has click or display controls.
+Variables:
+  ObjectName        : object name
+  ToolTipID         : standard Tooltip from mixxx db
+    see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/TooltipIds.cpp
+  Size              : button size
+  state_X_text      : label text for state X
+  state_X_pressed   : background graphic for pressed state X
+  state_X_unpressed : background graphic for unpressed state X
+  Align             : alignment of text
+  ConfigKey         : left-click control
+-->
+<Template>
+  <SetVariable name="BtnType"></SetVariable>
+
+  <WidgetGroup>
+    <ObjectName>AlignLeft</ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>max,max</SizePolicy>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>FxAssignButtons</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>f,min</SizePolicy>
+        <Children>
+          <Template src="skin:/fx/assign_button.xml">
+            <SetVariable name="FxUnit">1</SetVariable>
+            <SetVariable name="Width">26</SetVariable>
+            <SetVariable name="Text">&#8202;FX&#8202;</SetVariable>
+          </Template>
+          <Template src="skin:/fx/assign_button.xml">
+            <SetVariable name="FxUnit">2</SetVariable>
+            <SetVariable name="Width">20</SetVariable>
+          </Template>
+          <Template src="skin:/fx/assign_button.xml">
+            <SetVariable name="FxUnit">3</SetVariable>
+            <SetVariable name="Width">20</SetVariable>
+          </Template>
+          <Template src="skin:/fx/assign_button.xml">
+            <SetVariable name="FxUnit">4</SetVariable>
+            <SetVariable name="Width">20</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/fx/singletons.xml b/res/skins/LateNight/fx/singletons.xml
index 86e02576de..2a4c5972be 100644
--- a/res/skins/LateNight/fx/singletons.xml
+++ b/res/skins/LateNight/fx/singletons.xml
@@ -57,7 +57,6 @@
                   <Label>
                     <ObjectName>FxUnitControllerInputIndicator</ObjectName>
                     <Size>2f,0min</Size>
-                    <!-- <Text> > </Text> -->
                     <Connection>
                       <ConfigKey>[<Variable name="FxRack_FxUnit"/>],controller_input_active</ConfigKey>
                       <BindProperty>highlight</BindProperty>
@@ -155,11 +154,11 @@
         <SizePolicy>me,min</SizePolicy>
         <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:/controls/knob_textless.xml">
-            <SetVariable name="Size">40f,34f</SetVariable>
+          <Template src="skin:/controls/knob.xml">
+            <SetVariable name="Size">35f,30f</SetVariable>
             <SetVariable name="ObjectName">SuperKnob</SetVariable>
-            <SetVariable name="KnobBg">regular</SetVariable>
-            <SetVariable name="KnobIndicator">regular</SetVariable>
+            <SetVariable name="KnobBg">small</SetVariable>
+            <SetVariable name="KnobIndicator">small</SetVariable>
             <SetVariable name="ArcColor"><Variable name="ArcColorSuper"/></SetVariable>
             <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
             <SetVariable name="Group">[<Variable name="FxRack_FxUnit"/>]</SetVariable>
@@ -178,11 +177,11 @@
         <SizePolicy>me,min</SizePolicy>
         <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:/controls/knob_textless.xml">
-            <SetVariable name="Size">40f,34f</SetVariable>
+          <Template src="skin:/controls/knob.xml">
+            <SetVariable name="Size">35f,30f</SetVariable>
             <SetVariable name="ObjectName">DryWetKnob</SetVariable>
-            <SetVariable name="KnobBg">regular</SetVariable>
-            <SetVariable name="KnobIndicator">regular</SetVariable>
+            <SetVariable name="KnobBg">small</SetVariable>
+            <SetVariable name="KnobIndicator">small</SetVariable>
             <SetVariable name="KnobColor">red</SetVariable>
             <SetVariable name="ArcColor"><Variable name="ArcColorFxMix"/></SetVariable>
             <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
diff --git a/res/skins/LateNight/fx_rack.xml b/res/skins/LateNight/fx_rack.xml
index 487bcaca94..eff69fe064 100644
--- a/res/skins/LateNight/fx_rack.xml
+++ b/res/skins/LateNight/fx_rack.xml
@@ -1,5 +1,5 @@
 <Template>
-  <SetVariable name="ArcRadius"><Variable name="ArcRadiusBig"/></SetVariable>
+  <SetVariable name="ArcRadius"><Variable name="ArcRadiusCompact"/></SetVariable>
   <SetVariable name="ArcThickness"><Variable name="ArcThicknessBig"/></SetVariable>
   <SetVariable name="ArcUnipolar">true</SetVariable>
 
diff --git a/res/skins/LateNight/mic_aux/aux_unit.xml b/res/skins/LateNight/mic_aux/aux_unit.xml
index b54a110ffd..804fe21c2e 100644
--- a/res/skins/LateNight/mic_aux/aux_unit.xml
+++ b/res/skins/LateNight/mic_aux/aux_unit.xml
@@ -27,6 +27,8 @@
                 <Alignment>center</Alignment>
               </Label>
 
+              <Template src="skin:/controls/button_xfader_aux.xml"/>
+
               <WidgetGroup>
                 <ObjectName>AuxPlayBox</ObjectName>
                 <Layout>vertical</Layout>
@@ -42,8 +44,6 @@
                 </Children>
               </WidgetGroup>
 
-              <Template src="skin:/controls/button_xfader_aux.xml"/>
-
             </Children>
           </WidgetGroup><!-- MicAuxMainControls -->
 
@@ -69,7 +69,7 @@
                 <Layout>horizontal</Layout>
                 <SizePolicy>min,me</SizePolicy>
                 <Children>
-                  <Template src="skin:/controls/knob_textless.xml">
+                  <Template src="skin:/controls/knob.xml">
                     <SetVariable name="TooltipId">auxiliary_pregain</SetVariable>
                     <SetVariable name="Size">35f,30f</SetVariable>
                     <SetVariable name="KnobColor">orange</SetVariable>
diff --git a/res/skins/LateNight/mic_aux/ducking_controls.xml b/res/skins/LateNight/mic_aux/ducking_controls.xml
index b2e16edf8d..d5663468c7 100644
--- a/res/skins/LateNight/mic_aux/ducking_controls.xml
+++ b/res/skins/LateNight/mic_aux/ducking_controls.xml
@@ -24,7 +24,7 @@
         <Layout>horizontal</Layout>
         <SizePolicy>me,min</SizePolicy>
         <Children>
-          <Template src="skin:/controls/knob_textless.xml">
+          <Template src="skin:/controls/knob.xml">
             <SetVariable name="TooltipId">talkover_duck_strength</SetVariable>
             <SetVariable name="Size">35f,30f</SetVariable>
             <SetVariable name="KnobColor">red</SetVariable>
diff --git a/res/skins/LateNight/mic_aux/mic_unit.xml b/res/skins/LateNight/mic_aux/mic_unit.xml
index 9ca521854f..ee068f438a 100644
--- a/res/skins/LateNight/mic_aux/mic_unit.xml
+++ b/res/skins/LateNight/mic_aux/mic_unit.xml
@@ -69,7 +69,7 @@
                 <Layout>horizontal</Layout>