diff --git a/res/skins/Deere/deck_mixer_controls_col1_left.xml b/res/skins/Deere/deck_mixer_controls_col1_left.xml
index f3d5d0a53d87..e1fabac74d44 100644
--- a/res/skins/Deere/deck_mixer_controls_col1_left.xml
+++ b/res/skins/Deere/deck_mixer_controls_col1_left.xml
@@ -64,5 +64,9 @@
       </Template>
 
     </Children>
+    <Connection>
+      <ConfigKey>[Master],show_eqs</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/deck_mixer_controls_col1_right.xml b/res/skins/Deere/deck_mixer_controls_col1_right.xml
index 900e67923fed..6cb96b1786be 100644
--- a/res/skins/Deere/deck_mixer_controls_col1_right.xml
+++ b/res/skins/Deere/deck_mixer_controls_col1_right.xml
@@ -64,5 +64,9 @@
       </Template>
 
     </Children>
+    <Connection>
+      <ConfigKey>[Master],show_eqs</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/hotcue.xml b/res/skins/Deere/hotcue.xml
index a4000078d1bc..b2f0bccb9dfa 100644
--- a/res/skins/Deere/hotcue.xml
+++ b/res/skins/Deere/hotcue.xml
@@ -25,10 +25,6 @@
         </Children>
       </WidgetGroup>
 
-      <!-- Workaround. Remove when https://bugs.launchpad.net/mixxx/+bug/1578111
-          is fixed -->
-      <WidgetGroup><Size>1min,2f</Size><Children/></WidgetGroup>
-
       <WidgetGroup>
         <Layout>horizontal</Layout>
         <SizePolicy>min,min</SizePolicy>
diff --git a/res/skins/Deere/left_deck_mixer_controls.xml b/res/skins/Deere/left_deck_mixer_controls.xml
index a95db4a9bf1c..3159f5ed11c2 100644
--- a/res/skins/Deere/left_deck_mixer_controls.xml
+++ b/res/skins/Deere/left_deck_mixer_controls.xml
@@ -14,19 +14,16 @@
       <!-- In 2 deck mode, we show a 3-column mixer section -->
       <WidgetGroup>
         <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
         <Children>
+          <Template src="skin:deck_mixer_controls_col1_left.xml"/>
           <WidgetGroup>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:deck_mixer_controls_col1_left.xml"/>
+              <Template src="skin:deck_mixer_controls_col2.xml"/>
+              <Template src="skin:deck_mixer_controls_col3.xml"/>
             </Children>
-            <Connection>
-              <ConfigKey>[Master],show_eqs</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
           </WidgetGroup>
-          <Template src="skin:deck_mixer_controls_col2.xml"/>
-          <Template src="skin:deck_mixer_controls_col3.xml"/>
         </Children>
         <Connection>
           <ConfigKey>[Master],show_4decks</ConfigKey>
@@ -41,16 +38,7 @@
       <WidgetGroup>
         <Layout>vertical</Layout>
         <Children>
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Children>
-              <Template src="skin:deck_mixer_controls_col1_left.xml"/>
-            </Children>
-            <Connection>
-              <ConfigKey>[Master],show_eqs</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
+          <Template src="skin:deck_mixer_controls_col1_left.xml"/>
           <WidgetGroup>
             <Layout>vertical</Layout>
             <ObjectName>4DecksMixerCol2ContainerLeft</ObjectName>
diff --git a/res/skins/Deere/right_deck_mixer_controls.xml b/res/skins/Deere/right_deck_mixer_controls.xml
index b97f652b7209..a87f41060329 100644
--- a/res/skins/Deere/right_deck_mixer_controls.xml
+++ b/res/skins/Deere/right_deck_mixer_controls.xml
@@ -15,18 +15,14 @@
       <WidgetGroup>
         <Layout>horizontal</Layout>
         <Children>
-          <Template src="skin:deck_mixer_controls_col3.xml"/>
-          <Template src="skin:deck_mixer_controls_col2.xml"/>
           <WidgetGroup>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:deck_mixer_controls_col1_right.xml"/>
+              <Template src="skin:deck_mixer_controls_col3.xml"/>
+              <Template src="skin:deck_mixer_controls_col2.xml"/>
             </Children>
-            <Connection>
-              <ConfigKey>[Master],show_eqs</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
           </WidgetGroup>
+          <Template src="skin:deck_mixer_controls_col1_right.xml"/>
         </Children>
         <Connection>
           <ConfigKey>[Master],show_4decks</ConfigKey>
@@ -41,16 +37,7 @@
       <WidgetGroup>
         <Layout>vertical</Layout>
         <Children>
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Children>
-              <Template src="skin:deck_mixer_controls_col1_right.xml"/>
-            </Children>
-            <Connection>
-              <ConfigKey>[Master],show_eqs</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
+          <Template src="skin:deck_mixer_controls_col1_right.xml"/>
           <WidgetGroup>
             <Layout>vertical</Layout>
             <ObjectName>4DecksMixerCol2ContainerRight</ObjectName>
diff --git a/res/skins/Deere/skin_settings.xml b/res/skins/Deere/skin_settings.xml
index 33618124fee4..1ee6f51df4e0 100644
--- a/res/skins/Deere/skin_settings.xml
+++ b/res/skins/Deere/skin_settings.xml
@@ -48,12 +48,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Stacked Waveforms</Text>
+              <Text>&#9898; Stacked Waveforms</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Stacked Waveforms</Text>
+              <Text>&#9899; Stacked Waveforms</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
@@ -67,12 +67,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; 4 Decks</Text>
+              <Text>&#9898; 4 Decks</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; 4 Decks</Text>
+              <Text>&#9899; 4 Decks</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
@@ -101,12 +101,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Cover Art</Text>
+              <Text>&#9898; Cover Art</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Cover Art</Text>
+              <Text>&#9899; Cover Art</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
@@ -119,12 +119,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Artist &amp; Track Title</Text>
+              <Text>&#9898; Artist &amp; Track Title</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Artist &amp; Track Title</Text>
+              <Text>&#9899; Artist &amp; Track Title</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
@@ -137,12 +137,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; BPM</Text>
+              <Text>&#9898; BPM</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; BPM</Text>
+              <Text>&#9899; BPM</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
@@ -155,12 +155,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Star Rating</Text>
+              <Text>&#9898; Star Rating</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Star Rating</Text>
+              <Text>&#9899; Star Rating</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
@@ -173,12 +173,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; More Hotcues</Text>
+              <Text>&#9898; More Hotcues</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; More Hotcues</Text>
+              <Text>&#9899; More Hotcues</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
@@ -191,12 +191,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Vinyl Control Options</Text>
+              <Text>&#9898; Vinyl Control Options</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Vinyl Control Options</Text>
+              <Text>&#9899; Vinyl Control Options</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
@@ -210,12 +210,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Minimal Controls</Text>
+              <Text>&#9898; Minimal Controls</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Minimal Controls</Text>
+              <Text>&#9899; Minimal Controls</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
@@ -241,12 +241,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Show</Text>
+              <Text>&#9898; Show</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Show</Text>
+              <Text>&#9899; Show</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
@@ -259,12 +259,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Crossfader</Text>
+              <Text>&#9898; Crossfader</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Crossfader</Text>
+              <Text>&#9899; Crossfader</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
@@ -278,12 +278,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; EQs</Text>
+              <Text>&#9898; EQs</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; EQs</Text>
+              <Text>&#9899; EQs</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
@@ -310,12 +310,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Show</Text>
+              <Text>&#9898; Show</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Show</Text>
+              <Text>&#9899; Show</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
@@ -328,12 +328,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Details</Text>
+              <Text>&#9898; Details</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Details</Text>
+              <Text>&#9899; Details</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
@@ -359,12 +359,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Show</Text>
+              <Text>&#9898; Show</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Show</Text>
+              <Text>&#9899; Show</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
@@ -391,12 +391,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Show</Text>
+              <Text>&#9898; Show</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Show</Text>
+              <Text>&#9899; Show</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
@@ -423,12 +423,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Preview Deck</Text>
+              <Text>&#9898; Preview Deck</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Preview Deck</Text>
+              <Text>&#9899; Preview Deck</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
@@ -442,12 +442,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Cover Art</Text>
+              <Text>&#9898; Cover Art</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Cover Art</Text>
+              <Text>&#9899; Cover Art</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
@@ -461,12 +461,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Maximize</Text>
+              <Text>&#9898; Maximize</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Maximize</Text>
+              <Text>&#9899; Maximize</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 7de6601588b0..d379c0abf75e 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -823,6 +823,7 @@ WWidget, QLabel {
   border: none;
   qproperty-alignment: 'AlignHCenter';
   font: 10px;
+  margin-top: -2px;
 }
 
 #SmallKnobLabel {