diff --git a/res/skins/Deere (64 Samplers)/skin.xml b/res/skins/Deere (64 Samplers)/skin.xml
index 41e4c8e9e04..71d32a8f96c 100644
--- a/res/skins/Deere (64 Samplers)/skin.xml	
+++ b/res/skins/Deere (64 Samplers)/skin.xml	
@@ -29,6 +29,7 @@
       <attribute persist="true" config_key="[Skin],show_eq_knobs">1</attribute>
       <attribute persist="true" config_key="[Skin],show_eq_kill_buttons">1</attribute>
       <attribute persist="true" config_key="[Skin],show_xfader">1</attribute>
+      <attribute persist="true" config_key="[Skin],large_vu">0</attribute>
       <!-- Effects -->
       <attribute persist="true" config_key="[EffectRack1],show">1</attribute>
       <attribute persist="true" config_key="[Skin],show_4effectunits">0</attribute>
diff --git a/res/skins/Deere/library.xml b/res/skins/Deere/library.xml
index fefcee7ac6f..d327477f6d4 100644
--- a/res/skins/Deere/library.xml
+++ b/res/skins/Deere/library.xml
@@ -71,7 +71,7 @@
 
               <Library>
                 <ShowButtonText>false</ShowButtonText>
-                <TrackTableBackgroundColorOpacity>0.125</TrackTableBackgroundColorOpacity>
+                <TrackTableBackgroundColorOpacity>0.175</TrackTableBackgroundColorOpacity>
               </Library>
 
             </Children>
diff --git a/res/skins/Deere/mixer_column_master_vu_2decks.xml b/res/skins/Deere/mixer_column_master_vu_2decks.xml
index d48be2e038d..8adf5d768b6 100644
--- a/res/skins/Deere/mixer_column_master_vu_2decks.xml
+++ b/res/skins/Deere/mixer_column_master_vu_2decks.xml
@@ -7,7 +7,14 @@
     <Children>
 
       <!-- 2 Decks: Spacer sized like channel Gain knob -->
-      <WidgetGroup><Size>0min,28f</Size></WidgetGroup>
+      <WidgetGroup>
+        <Size>0min,28f</Size>
+        <Connection>
+          <ConfigKey>[Skin],large_vu</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
 
       <WidgetGroup>
         <Layout>horizontal</Layout>
diff --git a/res/skins/Deere/mixer_column_master_vu_4decks.xml b/res/skins/Deere/mixer_column_master_vu_4decks.xml
index f058d2b508c..465592c13ac 100644
--- a/res/skins/Deere/mixer_column_master_vu_4decks.xml
+++ b/res/skins/Deere/mixer_column_master_vu_4decks.xml
@@ -8,86 +8,61 @@
       <Template src="skin:vumeter_master.xml"/>
     </Children>
   </SingletonDefinition>
-
   <WidgetGroup>
     <ObjectName>MixerStrip_4Decks</ObjectName>
     <Layout>vertical</Layout>
     <Children>
 
-      <Template src="skin:mixer_spacer_topbottom.xml" />
-
-      <!-- Gain knob spacer -->
-      <WidgetGroup><Size>0me,34f</Size></WidgetGroup>
-
-      <!-- EQ knobs spacer -->
       <WidgetGroup>
+        <ObjectName>MixerStrip_4Decks_large</ObjectName>
         <Layout>vertical</Layout>
-        <SizePolicy>me,max</SizePolicy>
+        <Connection>
+          <ConfigKey>[Skin],large_vu</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
         <Children>
-          <!-- 3 EQ knobs, 34px each -->
-          <WidgetGroup><Size>0min,102f</Size></WidgetGroup>
-          <!-- QuickEffect knob, 34px optional -->
+          <WidgetGroup><Size>0me,0min</Size></WidgetGroup>
           <WidgetGroup>
-            <Size>0min,34f</Size>
-            <Connection>
-              <ConfigKey>[QuickEffectRack1_[Channel1]_Effect1],loaded</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <MaximumSize>60,300</MaximumSize>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>StereoVUMeterMaster</ObjectName>
+              </SingletonContainer>
+            </Children>
           </WidgetGroup>
+          <WidgetGroup><Size>0me,25f</Size></WidgetGroup>
         </Children>
-        <Connection>
-          <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
       </WidgetGroup>
-
+      <!-- Same size as deck VU meters -->
       <WidgetGroup>
+        <ObjectName>MixerStrip_4Decks_small</ObjectName>
         <Layout>vertical</Layout>
-        <SizePolicy>min,me</SizePolicy>
+        <Connection>
+          <ConfigKey>[Skin],large_vu</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
         <Children>
 
-          <!-- Pfl button -->
-          <WidgetGroup><Size>0me,25f</Size></WidgetGroup>
+          <Template src="skin:mixer_spacer_topbottom.xml" />
 
-          <!-- EQs -->
+          <!-- Gain knob spacer -->
+          <WidgetGroup><Size>0me,34f</Size></WidgetGroup>
+
+          <!-- EQ knobs spacer -->
           <WidgetGroup>
-            <GroupName>VolFader_VUMeter_4Decks</GroupName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,me</SizePolicy>
-            <MaximumSize>60,-1</MaximumSize>
+            <Layout>vertical</Layout>
+            <SizePolicy>me,max</SizePolicy>
             <Children>
-              <!-- Faders 
-              Vol fader next to mono VU meter
-                  when EQs are shown -->
-              <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,me</SizePolicy>
-                <MaximumSize>60,180</MaximumSize>
-                <Children>
-                  <SingletonContainer>
-                    <ObjectName>StereoVUMeterMaster</ObjectName>
-                  </SingletonContainer>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Skin],show_faders</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <!-- no Faders 
-                  stereo VU meter -->
+              <!-- 3 EQ knobs, 34px each -->
+              <WidgetGroup><Size>0min,102f</Size></WidgetGroup>
+              <!-- QuickEffect knob, 34px optional -->
               <WidgetGroup>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,me</SizePolicy>
-                <MaximumSize>60,210</MaximumSize>
-                <Children>
-                  <SingletonContainer>
-                    <ObjectName>StereoVUMeterMaster</ObjectName>
-                  </SingletonContainer>
-                </Children>
+                <Size>0min,34f</Size>
                 <Connection>
-                  <ConfigKey>[Skin],show_faders</ConfigKey>
-                  <Transform><Not/></Transform>
+                  <ConfigKey>[QuickEffectRack1_[Channel1]_Effect1],loaded</ConfigKey>
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
@@ -98,46 +73,105 @@
             </Connection>
           </WidgetGroup>
 
-          <!-- no EQs -->
           <WidgetGroup>
             <Layout>vertical</Layout>
             <SizePolicy>min,me</SizePolicy>
             <Children>
+
+              <!-- Pfl button -->
+              <WidgetGroup><Size>0me,25f</Size></WidgetGroup>
+
+              <!-- EQs -->
               <WidgetGroup>
-                <Layout>vertical</Layout>
+                <GroupName>VolFader_VUMeter_4Decks</GroupName>
+                <Layout>horizontal</Layout>
                 <SizePolicy>min,me</SizePolicy>
-                <MaximumSize>60,210</MaximumSize>
+                <MaximumSize>60,-1</MaximumSize>
                 <Children>
-                  <SingletonContainer>
-                    <ObjectName>StereoVUMeterMaster</ObjectName>
-                  </SingletonContainer>
+                  <!-- Faders
+                  Vol fader next to mono VU meter
+                      when EQs are shown -->
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>min,me</SizePolicy>
+                    <MaximumSize>60,180</MaximumSize>
+                    <Children>
+                      <SingletonContainer>
+                        <ObjectName>StereoVUMeterMaster</ObjectName>
+                      </SingletonContainer>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Skin],show_faders</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+                  <!-- no Faders
+                      stereo VU meter -->
+                  <WidgetGroup>
+                    <Layout>vertical</Layout>
+                    <SizePolicy>min,me</SizePolicy>
+                    <MaximumSize>60,210</MaximumSize>
+                    <Children>
+                      <SingletonContainer>
+                        <ObjectName>StereoVUMeterMaster</ObjectName>
+                      </SingletonContainer>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Skin],show_faders</ConfigKey>
+                      <Transform><Not/></Transform>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
                 </Children>
+                <Connection>
+                  <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
               </WidgetGroup>
-              
+
+              <!-- no EQs -->
               <WidgetGroup>
                 <Layout>vertical</Layout>
                 <SizePolicy>min,me</SizePolicy>
-                <MaximumSize>60,180</MaximumSize>
+                <Children>
+                  <WidgetGroup>
+                    <Layout>vertical</Layout>
+                    <SizePolicy>min,me</SizePolicy>
+                    <MaximumSize>60,180</MaximumSize>
+                    <Children>
+                      <SingletonContainer>
+                        <ObjectName>StereoVUMeterMaster</ObjectName>
+                      </SingletonContainer>
+                    </Children>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <Layout>vertical</Layout>
+                    <SizePolicy>min,me</SizePolicy>
+                    <MaximumSize>60,180</MaximumSize>
+                    <Connection>
+                      <ConfigKey>[Skin],show_faders</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+                </Children>
                 <Connection>
-                  <ConfigKey>[Skin],show_faders</ConfigKey>
+                  <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
+                  <Transform><Not/></Transform>
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
+
+              <WidgetGroup><Size>0me,25f</Size></WidgetGroup>
+
             </Children>
-            <Connection>
-              <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
-              <Transform><Not/></Transform>
-              <BindProperty>visible</BindProperty>
-            </Connection>
           </WidgetGroup>
 
-          <WidgetGroup><Size>0me,25f</Size></WidgetGroup>
+          <Template src="skin:mixer_spacer_topbottom.xml" />
 
         </Children>
       </WidgetGroup>
-
-      <Template src="skin:mixer_spacer_topbottom.xml" />
-
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/mixer_controls_4decks_left.xml b/res/skins/Deere/mixer_controls_4decks_left.xml
index f25622f4740..0cece96a4cc 100644
--- a/res/skins/Deere/mixer_controls_4decks_left.xml
+++ b/res/skins/Deere/mixer_controls_4decks_left.xml
@@ -2,18 +2,18 @@
 <!--
   Description:
   A 4-deck mixer channel strip.
-  
+
   Structure:
   ⎡ Spacer that centers the level meter
   | vertically when neither EQs
   ⎣ nor Vol fader are shown
 
   [ Gain knob]
-  
+
   [ EQs + QuickEffect, optional ]
-  
+
   [ Pfl button ]
-  
+
   ⎡ with EQs                  ⎤
   | ⎡ with faders:
   | |   mono   + Vol
@@ -36,7 +36,7 @@
   ⎡ Spacer that centers the level meter
   | vertically when neither EQs
   ⎣ nor Vol fader are shown
-  
+
 -->
 <Template>
   <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
@@ -141,7 +141,7 @@
             <SizePolicy>min,me</SizePolicy>
             <MaximumSize>60,-1</MaximumSize>
             <Children>
-              <!-- Faders 
+              <!-- Faders
               Vol fader next to mono VU meter
                   when EQs are shown -->
               <WidgetGroup>
@@ -180,12 +180,12 @@
                 </Connection>
               </WidgetGroup>
 
-              <!-- no Faders 
+              <!-- no Faders
                   stereo VU meter -->
               <WidgetGroup>
                 <Layout>vertical</Layout>
                 <SizePolicy>min,me</SizePolicy>
-                <MaximumSize>60,210</MaximumSize>
+                <MaximumSize>60,180</MaximumSize>
                 <Children>
                   <SingletonContainer>
                     <ObjectName>StereoVUMeter<Variable name="i"/></ObjectName>
@@ -220,7 +220,7 @@
                   </SingletonContainer>
                 </Children>
               </WidgetGroup>
-              
+
               <WidgetGroup>
                 <Layout>vertical</Layout>
                 <SizePolicy>min,me</SizePolicy>
diff --git a/res/skins/Deere/mixer_controls_4decks_right.xml b/res/skins/Deere/mixer_controls_4decks_right.xml
index bcfca5d899a..5b58b6cc15b 100644
--- a/res/skins/Deere/mixer_controls_4decks_right.xml
+++ b/res/skins/Deere/mixer_controls_4decks_right.xml
@@ -2,18 +2,18 @@
 <!--
   Description:
   A 4-deck mixer channel strip.
-  
+
   Structure:
   ⎡ Spacer that centers the level meter
   | vertically when neither EQs
   ⎣ nor Vol fader are shown
 
   [ Gain knob]
-  
+
   [ EQs + QuickEffect, optional ]
-  
+
   [ Pfl button ]
-  
+
   ⎡ with EQs                  ⎤
   | ⎡ with faders:
   | |   mono   + Vol
@@ -36,7 +36,7 @@
   ⎡ Spacer that centers the level meter
   | vertically when neither EQs
   ⎣ nor Vol fader are shown
-  
+
 -->
 <Template>
   <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
@@ -141,7 +141,7 @@
             <SizePolicy>min,me</SizePolicy>
             <MaximumSize>60,-1</MaximumSize>
             <Children>
-              <!-- Faders 
+              <!-- Faders
               Vol fader next to mono VU meter
                   when EQs are shown -->
               <WidgetGroup>
@@ -179,12 +179,12 @@
                 </Connection>
               </WidgetGroup>
 
-              <!-- no Faders 
+              <!-- no Faders
                   stereo VU meter -->
               <WidgetGroup>
                 <Layout>vertical</Layout>
                 <SizePolicy>min,me</SizePolicy>
-                <MaximumSize>60,210</MaximumSize>
+                <MaximumSize>60,180</MaximumSize>
                 <Children>
                   <SingletonContainer>
                     <ObjectName>StereoVUMeter<Variable name="i"/></ObjectName>
@@ -219,7 +219,7 @@
                   </SingletonContainer>
                 </Children>
               </WidgetGroup>
-              
+
               <WidgetGroup>
                 <Layout>vertical</Layout>
                 <SizePolicy>min,me</SizePolicy>
diff --git a/res/skins/Deere/skin_settings.xml b/res/skins/Deere/skin_settings.xml
index 66584cd7d2e..a1c107a8a25 100644
--- a/res/skins/Deere/skin_settings.xml
+++ b/res/skins/Deere/skin_settings.xml
@@ -164,6 +164,12 @@
             <SetVariable name="skinsetting">[Skin],show_xfader</SetVariable>
           </Template>
 
+          <Template src="skin:../Deere/skinsettings_button.xml">
+            <SetVariable name="TooltipId"></SetVariable>
+            <SetVariable name="text">Large VU meter</SetVariable>
+            <SetVariable name="skinsetting">[Skin],large_vu</SetVariable>
+          </Template>
+
         </Children>
       </WidgetGroup>
 
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 709e975ed4a..2b1ccdd4c67 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -502,8 +502,6 @@ WSearchLineEdit {
   background-color: #1F1F1F;
   border: 1px solid #1A1A1A;
 }
-/* transition time in Auto DJ tab is styled pretty much the same as WBeatSpinBox above */
-#DlgAutoDJ QSpinBox {}
 
 /* Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome */
 WLibrary QLabel, WLibrary QRadioButton {
@@ -528,40 +526,26 @@ WLibrary QRadioButton::indicator:unchecked {
 }
 /* buttons in library (in hierarchical order of appearance)
    Style them just as the other regular buttons */
-#DlgMissing > QPushButton,
-#DlgHidden > QPushButton,
-#DlgAutoDJ > QPushButton,
-#DlgRecording > QPushButton,
-#DlgAnalysis > QPushButton {
+#LibraryFeatureControls QPushButton {
   margin: 9px 3px 6px 3px;
+  padding: 3px 4px;
   color: #D2D2D2;
   background-color: #4B4B4B;
   border: 1px solid #4B4B4B;
   border-radius: 2px;
   outline: none;
   }
-  #DlgMissing > QPushButton,
-  #DlgHidden > QPushButton,
-  #DlgRecording > QPushButton,
-  #DlgAnalysis > QPushButton {
-    padding: 3px 4px;
-  }
-  #DlgAutoDJ > QPushButton {
+  #DlgAutoDJ > #LibraryFeatureControls QPushButton {
     padding: 0px 1px;
-  }
-  #DlgAutoDJ > QPushButton {
     width: 34px;
     height: 20px;
-  }
-  QPushButton#pushButtonAutoDJ {
-    width: 42px;
-  }
+    }
+    QPushButton#pushButtonAutoDJ {
+      width: 42px;
+    }
 
 
-#DlgMissing > QPushButton:!enabled,
-#DlgHidden > QPushButton:!enabled,
-#DlgAutoDJ > QPushButton:!enabled,
-#DlgAnalysis > QPushButton:!enabled {
+#LibraryFeatureControls QPushButton:!enabled {
   /* buttons in "disabled" (not click-able) state. They are nearly invisible
      by default QT palette, so style accordingly */
   color: #808080; /* Default #A3A3A3 -90L HSL*/
@@ -572,30 +556,24 @@ WLibrary QRadioButton::indicator:unchecked {
   outline: none;
 }
 
-#DlgMissing > QPushButton:hover,
-#DlgHidden > QPushButton:hover,
-#DlgAutoDJ > QPushButton:hover,
-#DlgRecording > QPushButton:hover,
-#DlgAnalysis > QPushButton:hover {
+#LibraryFeatureControls QPushButton:hover {
   color: #D2D2D2;
   background-color: #5F5F5F;
   border: 1px solid #5F5F5F;
   outline: none;
 }
 
-#DlgMissing > QPushButton:focus,
-#DlgHidden > QPushButton:focus,
-#DlgAutoDJ > QPushButton:focus,
-#DlgRecording > QPushButton:focus,
-#DlgAnalysis > QPushButton:focus,
+#LibraryFeatureControls QPushButton:focus,
 #fadeModeCombobox:focus,
-#DlgAutoDJ QSpinBox:focus {
+#spinBoxTransition:focus {
   outline: none;
 }
 
-#DlgAutoDJ > QPushButton:checked,
-#DlgRecording > QPushButton:checked,
-#DlgAnalysis > QPushButton:checked {
+
+QPushButton#pushButtonAutoDJ:checked,
+QPushButton#pushButtonRepeatPlaylist:checked,
+QPushButton#pushButtonAnalyze:checked,
+QPushButton#pushButtonRecording:checked {
   /* checkbuttons in active state */
   color: #FDFDFD;
   background-color: #006596;
@@ -603,9 +581,10 @@ WLibrary QRadioButton::indicator:unchecked {
   outline: none;
 }
 
-#DlgAutoDJ > QPushButton:checked:hover,
-#DlgRecording > QPushButton:checked:hover,
-#DlgAnalysis > QPushButton:checked:hover {
+QPushButton#pushButtonAutoDJ:checked:hover,
+QPushButton#pushButtonRepeatPlaylist:checked:hover,
+QPushButton#pushButtonAnalyze:checked:hover,
+QPushButton#pushButtonRecording:checked:hover {
   /* checkbuttons hovered over in "active" state */
   margin: 9px 3px 6px 3px;
   color: #FDFDFD;
@@ -614,10 +593,7 @@ WLibrary QRadioButton::indicator:unchecked {
   outline: none;
 }
 
-#DlgMissing > QPushButton:pressed,
-#DlgHidden > QPushButton:pressed,
-#DlgAutoDJ > QPushButton:pressed,
-#DlgAnalysis > QPushButton:pressed {
+#LibraryFeatureControls QPushButton:pressed {
   /* pushbuttons in "down" state */
   margin: 9px 3px 6px 3px;
   color: #FDFDFD;
@@ -938,7 +914,7 @@ WOverview #PassthroughLabel {
 }
 
 WBeatSpinBox,
-#DlgAutoDJ QSpinBox {
+#spinBoxTransition {
   color: #c1cabe;
   background-color: #1f1e1e;
   border: 1px solid #444342;
@@ -948,18 +924,18 @@ WBeatSpinBox,
   WBeatSpinBox {
     padding: 2px;
   }
-  #DlgAutoDJ QSpinBox {
+  #spinBoxTransition {
     padding: 1px 2px 2px 2px;
     margin: 3px 0px 0px 2px;
   }
   WBeatSpinBox:hover,
-  #DlgAutoDJ QSpinBox:hover,
+  #spinBoxTransition:hover,
   WBeatSpinBox:focus,
-  #DlgAutoDJ QSpinBox:focus {
+  #spinBoxTransition:focus {
     border: 1px ridge #015d8d;
   }
   WBeatSpinBox::down-button,
-  #DlgAutoDJ QSpinBox::down-button {
+  #spinBoxTransition::down-button {
     subcontrol-origin: border;
     subcontrol-position: bottom right; /* position at the top right corner */
     padding-right: 4px;
@@ -967,17 +943,17 @@ WBeatSpinBox,
     border: 0;
   }
   WBeatSpinBox::down-arrow,
-  #DlgAutoDJ QSpinBox::down-arrow {
+  #spinBoxTransition::down-arrow {
     width: 9px;
     height: 7px;
     image: url(skin:/icon/ic_chevron_down_selector.svg);
   }
   WBeatSpinBox::down-arrow:hover,
-  #DlgAutoDJ QSpinBox::down-arrow:hover {
+  #spinBoxTransition::down-arrow:hover {
     image: url(skin:/icon/ic_chevron_down_selector_hover.svg);
   }
   WBeatSpinBox::up-button,
-  #DlgAutoDJ QSpinBox::up-button {
+  #spinBoxTransition::up-button {
     subcontrol-origin: border;
     subcontrol-position: top right; /* position at the top right corner */
     padding-right: 4px;
@@ -985,13 +961,13 @@ WBeatSpinBox,
     border: 0;
   }
   WBeatSpinBox::up-arrow,
-  #DlgAutoDJ QSpinBox::up-arrow {
+  #spinBoxTransition::up-arrow {
     width: 9px;
     height: 7px;
     image: url(skin:/icon/ic_chevron_up_selector.svg);
   }
   WBeatSpinBox::up-arrow:hover,
-  #DlgAutoDJ QSpinBox::up-arrow:hover {
+  #spinBoxTransition::up-arrow:hover {
     image: url(skin:/icon/ic_chevron_up_selector_hover.svg);
   }
 
diff --git a/res/skins/Deere/vumeter.svg b/res/skins/Deere/vumeter.svg
index 637f6d79849..a4eda6f4811 100644
--- a/res/skins/Deere/vumeter.svg
+++ b/res/skins/Deere/vumeter.svg
@@ -1 +1,19 @@
-<svg id="svg2" width="100" height="3" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="vumeterGrad" x2="17.321" gradientTransform="scale(5.7735 .17321)" gradientUnits="userSpaceOnUse"><stop id="stop7" stop-color="#0f0" offset="0"/><stop id="stop9" stop-color="#0f0" offset=".9"/><stop id="stop11" stop-color="#ff0" offset=".9"/><stop id="stop13" stop-color="#ff0" offset="1"/></linearGradient></defs><rect id="rect15" width="100" height="3" fill="url(#vumeterGrad)"/></svg>
+<svg id="svg2" width="100" height="3" version="1.1"
+    xmlns="http://www.w3.org/2000/svg">
+    <defs id="defs4">
+        <linearGradient id="vumeterGrad" x2="17.321" gradientTransform="scale(5.7735 .17321)" gradientUnits="userSpaceOnUse">
+            <stop id="stop7" stop-color="#0f0" offset="0"/>
+            <stop id="stop9" stop-color="#0f0" offset=".9"/>
+            <stop id="stop11" stop-color="#ff0" offset=".9"/>
+            <stop id="stop13" stop-color="#ff0" offset="1"/>
+        </linearGradient>
+        <linearGradient id="vumeterGradOff" x2="17.321" gradientTransform="scale(5.7735 .17321)" gradientUnits="userSpaceOnUse">
+            <stop id="stop7" stop-color="#004b00" offset="0"/>
+            <stop id="stop9" stop-color="#004b00" offset=".9"/>
+            <stop id="stop11" stop-color="#4f4f00" offset=".9"/>
+            <stop id="stop13" stop-color="#4f4f00" offset="1"/>
+        </linearGradient>
+    </defs>
+    <rect id="rectOn" width="100" height="3" fill="url(#vumeterGrad)"/>
+    <rect id="rectOff" width="100" height="3" fill="url(#vumeterGradOff)"/>
+</svg>
diff --git a/res/skins/Deere/vumeter.xml b/res/skins/Deere/vumeter.xml
index fafa70b3787..a3b0f549944 100644
--- a/res/skins/Deere/vumeter.xml
+++ b/res/skins/Deere/vumeter.xml
@@ -15,6 +15,7 @@
     <SizePolicy>f,me</SizePolicy>
     <!-- overwrites above properties. just used in auxiliary.xml for now -->
     <Size><Variable name="Size"/></Size>
+    <PathBack scalemode="STRETCH">vumeter_v_bg.png</PathBack>
     <PathVu>vumeter_v.png</PathVu>
     <Horizontal>false</Horizontal>
     <PeakHoldSize>5</PeakHoldSize>
diff --git a/res/skins/Deere/vumeter_bg.png b/res/skins/Deere/vumeter_bg.png
new file mode 100644
index 00000000000..e1e2df8038c
Binary files /dev/null and b/res/skins/Deere/vumeter_bg.png differ
diff --git a/res/skins/Deere/vumeter_h.xml b/res/skins/Deere/vumeter_h.xml
index cedbcf79a4d..50cc4bf4fe2 100644
--- a/res/skins/Deere/vumeter_h.xml
+++ b/res/skins/Deere/vumeter_h.xml
@@ -18,6 +18,7 @@
             <TooltipId><Variable name="tooltip_meter"/></TooltipId>
             <Size>9me,3me</Size>
             <MaximumSize>80,8</MaximumSize>
+            <PathBack scalemode="STRETCH">vumeter_bg.png</PathBack>
             <PathVu scalemode="STRETCH">vumeter.png</PathVu>
             <Horizontal>true</Horizontal>
             <PeakHoldSize>5</PeakHoldSize>
diff --git a/res/skins/Deere/vumeter_master.xml b/res/skins/Deere/vumeter_master.xml
index f719507b9a6..3c2b3de9daa 100644
--- a/res/skins/Deere/vumeter_master.xml
+++ b/res/skins/Deere/vumeter_master.xml
@@ -5,7 +5,7 @@
     <ObjectName>MasterVu</ObjectName>
     <Layout>vertical</Layout>
     <MinimumSize>28,60</MinimumSize>
-    <MaximumSize>28,210</MaximumSize>
+    <MaximumSize>28,300</MaximumSize>
     <SizePolicy>min,me</SizePolicy>
     <Children>
 
diff --git a/res/skins/Deere/vumeter_v.svg b/res/skins/Deere/vumeter_v.svg
index da29f1c2719..8d2b788645b 100644
--- a/res/skins/Deere/vumeter_v.svg
+++ b/res/skins/Deere/vumeter_v.svg
@@ -1 +1,110 @@
-<svg id="svg2" width="3" height="100" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="vumeterGrad" x2="0" y1="17.321" gradientTransform="scale(.17321 5.7735)" gradientUnits="userSpaceOnUse"><stop id="stop7" stop-color="#0f0" offset="0"/><stop id="stop9" stop-color="#0f0" offset=".9"/><stop id="stop11" stop-color="#ff0" offset=".9"/><stop id="stop13" stop-color="#ff0" offset="1"/></linearGradient></defs><rect id="rect15" width="3" height="100" fill="url(#vumeterGrad)"/></svg>
+<?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"
+   id="svg2"
+   width="3"
+   height="100"
+   version="1.1"
+   sodipodi:docname="vumeter_v.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata2191">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2092"
+     id="namedview2189"
+     showgrid="false"
+     inkscape:zoom="22.330432"
+     inkscape:cx="-36.198249"
+     inkscape:cy="34.061672"
+     inkscape:window-x="2560"
+     inkscape:window-y="28"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="vumeterGrad"
+       x2="0"
+       y1="17.321"
+       gradientTransform="scale(.17321 5.7735)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop7"
+         stop-color="#0f0"
+         offset="0" />
+      <stop
+         id="stop9"
+         stop-color="#0f0"
+         offset=".9" />
+      <stop
+         id="stop11"
+         stop-color="#ff0"
+         offset=".9" />
+      <stop
+         id="stop13"
+         stop-color="#ff0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="vumeterGradOff"
+       x2="0"
+       y1="17.321"
+       gradientTransform="matrix(0.17321,0,0,5.7735,5.2559299,-0.04019004)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop20"
+         stop-color="#004b00"
+         offset="0" />
+      <stop
+         id="stop21"
+         stop-color="#004b00"
+         offset=".9" />
+      <stop
+         id="stop22"
+         stop-color="#4f4f00"
+         offset=".9" />
+      <stop
+         id="stop23"
+         stop-color="#4f4f00"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <rect
+     id="rect15"
+     width="3"
+     height="100"
+     fill="url(#vumeterGrad)" />
+  <rect
+     fill="url(#vumeterGrad)"
+     height="100"
+     width="3"
+     id="rect15-6"
+     x="0"
+     y="0"
+     style="fill:url(#vumeterGradOff);fill-opacity:1" />
+</svg>
diff --git a/res/skins/Deere/vumeter_v.xml b/res/skins/Deere/vumeter_v.xml
index 7aface62a9d..46a6ed1c101 100644
--- a/res/skins/Deere/vumeter_v.xml
+++ b/res/skins/Deere/vumeter_v.xml
@@ -36,6 +36,7 @@
                     <Size>3me,me</Size>
                     <MinimumSize>8,40</MinimumSize>
                     <MaximumSize>8,-1</MaximumSize>
+                    <PathBack scalemode="STRETCH">vumeter_v_bg.png</PathBack>
                     <PathVu scalemode="STRETCH">vumeter_v.png</PathVu>
                     <Horizontal>false</Horizontal>
                     <PeakHoldSize>5</PeakHoldSize>
@@ -64,6 +65,7 @@
                     <Size>3me,me</Size>
                     <MinimumSize>8,60</MinimumSize>
                     <MaximumSize>8,-1</MaximumSize>
+                    <PathBack scalemode="STRETCH">vumeter_v_bg.png</PathBack>
                     <PathVu scalemode="STRETCH">vumeter_v.png</PathVu>
                     <Horizontal>false</Horizontal>
                     <PeakHoldSize>5</PeakHoldSize>
diff --git a/res/skins/Deere/vumeter_v_bg.png b/res/skins/Deere/vumeter_v_bg.png
new file mode 100644
index 00000000000..8ad3e70fd34
Binary files /dev/null and b/res/skins/Deere/vumeter_v_bg.png differ
diff --git a/res/skins/LateNight/library.xml b/res/skins/LateNight/library.xml
index 6cb0e50ba98..8b2c6abefc8 100644
--- a/res/skins/LateNight/library.xml
+++ b/res/skins/LateNight/library.xml
@@ -1,5 +1,8 @@
 <Template>
   <WidgetGroup>
+    <!-- This extra wrapper with 'ignore' size policy allows to
+      shrink the library to zero height, while the inner LibraryContainer
+      expands to fill the available vertical space. -->
     <SizePolicy>me,i</SizePolicy>
     <Layout>vertical</Layout>
     <Children>
@@ -21,8 +24,9 @@
             <SplitSizesConfigKey>[Skin],librarySidebar_splitsize</SplitSizesConfigKey>
             <Collapsible>1,0</Collapsible>
             <Children>
+
               <WidgetGroup>
-                <ObjectName>SidebarSearchPreviewContainer</ObjectName>
+                <ObjectName>LibSidebarContainer</ObjectName>
                 <Layout>vertical</Layout>
                 <SizePolicy>min,me</SizePolicy>
                 <MinimumSize>100,</MinimumSize>
@@ -30,8 +34,7 @@
 
                   <Template src="skin:/decks/preview_deck.xml"/>
 
-                  <!--Search Input Field + Library Expand toggle -->
-                  <WidgetGroup>
+                  <WidgetGroup><!--SearchBox + Library expand toggle -->
                     <ObjectName></ObjectName>
                     <Layout>horizontal</Layout>
                     <SizePolicy>min,max</SizePolicy>
@@ -50,26 +53,16 @@
                         <ObjectName>LibExpandBox</ObjectName>
                         <Layout>vertical</Layout>
                         <Children>
-                          <PushButton>
-                            <TooltipId>maximize_library</TooltipId>
-                            <ObjectName>LibExpand</ObjectName>
-                            <Size>16f,18me</Size>
-                            <NumberStates>2</NumberStates>
-                            <State>
-                              <Number>0</Number>
-                            </State>
-                            <State>
-                              <Number>1</Number>
-                            </State>
-                            <Connection>
-                              <ConfigKey>[Master],maximize_library</ConfigKey>
-                              <ButtonState>LeftButton</ButtonState>
-                            </Connection>
-                          </PushButton>
+                          <Template src="skin:/controls/button_2state.xml">
+                            <SetVariable name="TooltipId">maximize_library</SetVariable>
+                            <SetVariable name="ObjectName">LibExpand</SetVariable>
+                            <SetVariable name="Size">16f,18me</SetVariable>
+                            <SetVariable name="ConfigKey">[Master],maximize_library</SetVariable>
+                          </Template>
                         </Children>
                       </WidgetGroup><!-- LibExpandBox -->
                     </Children>
-                  </WidgetGroup><!-- SearchLineBox -->
+                  </WidgetGroup><!--SearchBox + Library expand toggle -->
 
                   <WidgetGroup>
                     <ObjectName>SearchTreeSpacer</ObjectName>
@@ -109,19 +102,19 @@
                         </Connection>
                       </WidgetGroup><!--Cover Art-->
                     </Children>
-                  </Splitter><!-- HorizontalSplitter -->
+                  </Splitter><!-- SidebarCoverSplitter -->
 
                 </Children>
-              </WidgetGroup><!-- SidebarSearchPreviewContainer -->
+              </WidgetGroup><!-- LibSidebarContainer -->
 
               <!-- Library Table-->
               <Library>
                 <ShowButtonText>false</ShowButtonText>
-                <TrackTableBackgroundColorOpacity>0.125</TrackTableBackgroundColorOpacity>
+                <TrackTableBackgroundColorOpacity>0.175</TrackTableBackgroundColorOpacity>
               </Library>
 
             </Children>
-          </Splitter><!-- VerticalSplitter -->
+          </Splitter><!-- LibrarySplitter -->
 
         </Children>
       </WidgetGroup><!-- LibraryContainer -->
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 2f947d9e8f4..0f5f9712873 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -2,7 +2,8 @@
 
 /************** font settings *************************************************/
 
-#Mixxx, WWidget,
+#Mixxx,
+WWidget,
 QToolTip,
 WLabel, QLabel,
 WNumber, WNumberPos,
@@ -28,7 +29,7 @@ WEffect,
 WEffectSelector,
 WEffectSelector QAbstractScrollArea,
 #fadeModeCombobox,
-#fadeModeCombobox QAbstractScrollArea
+#fadeModeCombobox QAbstractScrollArea,
 #LibraryContainer QPushButton,
 #LibraryContainer QLabel,
 #LibraryContainer QRadioButton,
@@ -59,12 +60,8 @@ WOverview #PassthroughLabel,
 /* SKin settings & Library */
 #SkinSettingsToggle,
 #SkinSettingsNumToggle[value="1"],
-#DlgMissing > QPushButton,
-#DlgHidden > QPushButton,
-#DlgAutoDJ > QPushButton,
-#DlgRecording > QPushButton,
-#DlgAnalysis > QPushButton,
-#labelRecFilename,
+#LibraryFeatureControls QPushButton,
+QLabel#labelRecFilename, /* needs QLabel to override previous QLabel font definition*/
 WEffectSelector,
 #fadeModeCombobox,
 WOverview #PassthroughLabel {
@@ -82,7 +79,7 @@ WOverview #PassthroughLabel {
 #RecFeedback, #RecDuration,
 #BroadcastButton,
 #SkinSettingsToggle,
-WLibrary QPushButton {
+#LibraryFeatureControls QPushButton {
   text-transform: uppercase;
 }
 /* regular font weight */
@@ -98,8 +95,8 @@ WCoverArtMenu,
 WTrackMenu,
 WTrackMenu QMenu,
 WBeatSpinBox QMenu,
-#labelRecPrefix,
-#labelRecStatistics {
+QLabel#labelRecPrefix,
+QLabel#labelRecStatistics {
   font-weight: normal;
 }
 
@@ -115,7 +112,8 @@ WBeatSpinBox QMenu,
   text-align: center;
 }
 
-WPushButton, WLibrary QPushButton,
+WPushButton,
+#LibraryFeatureControls QPushButton,
 #RecDuration[highlight="0"],
 #RecDuration[highlight="1"] {
   font-size: 11px;
@@ -127,7 +125,7 @@ WPushButton, WLibrary QPushButton,
 #RateText,
 #SamplerBpmMini,
 #PreviewBPM,
-WLibrary QRadioButton {
+#LibraryFeatureControls QRadioButton {
 	font-size: 12px;
 }
 
@@ -137,9 +135,7 @@ WEffectSelector,
 WEffectSelector QAbstractScrollArea,
 #fadeModeCombobox,
 #fadeModeCombobox QAbstractScrollArea,
-#labelRecPrefix,
-#labelRecFilename,
-#labelRecStatistics,
+#LibraryFeatureControls QLabel,
 #SkinSettingsButton,
 #SkinSettingsNumToggle,
 #SkinSettingsMixerToggle,
@@ -186,20 +182,17 @@ WRecordingDuration {
 #MicAuxLabel,
 #MicAuxLabelUnconfigured,
 #PreviewTitle,
-#PreviewLabel,
-WBeatSpinBox,
-#spinBoxTransition {
+#PreviewLabel {
   text-align: left;
 }
 
 #RateText,
 #MicAuxLabel,
-#PreviewBPM,
-WBeatSpinBox,
-#spinBoxTransition {
+#PreviewBPM {
   text-align: center;
   }
-  WBeatSpinBox,#spinBoxTransition {
+  WBeatSpinBox,
+  #spinBoxTransition {
     qproperty-alignment: 'AlignHCenter';
   }
 
@@ -698,66 +691,58 @@ WEffectSelector {
 
 /************ Library feature controls / tree view / table view *************/
 /* Extra declaration for QRadioButton otherwise it shows up with wrong colors in Linux with Gnome */
-WLibrary QLabel, WLibrary QRadioButton {
-  background: transparent;
-}
-
-/* Additional space for QRadionButtons */
-WLibrary QRadioButton {
-  /* bottom margin! */
-  margin: 2px 3px 2px 3px;
-}
-
-/* Additional space for QLabels */
-#DlgAnalysis QLabel,
-#DlgAutoDJ QLabel {
-  margin: 2px 5px 5px 1px;
-}
 
 /* Library feature pushbuttons
   Don't use 'WLibrary QPushButton' here, as this would apply padding
   to the Preview & BPM lock buttons as well.
   Define the buttons fore every Library feature instead. */
-#DlgMissing > QPushButton,
-#DlgHidden > QPushButton,
-#DlgAutoDJ > QPushButton,
-#DlgRecording > QPushButton,
-#DlgAnalysis > QPushButton {
+#LibraryFeatureControls QPushButton {
   margin: 0px 2px 3px 0px;
-  padding: 0px;
+  padding: 0px 5px;
   /* Note: border-width is added, so the effective minimal size
     is 24 x 36 px */
   height: 20px;
   min-width: 32px;
   }
-#DlgMissing > QPushButton,
-#DlgHidden > QPushButton,
-#DlgRecording > QPushButton,
-#DlgAnalysis > QPushButton {
-  padding: 0px 5px;
-  }
-  QPushButton#pushButtonAutoDJ {
-    min-width: 40px;
-  }
-  /* Space in between 'Enable AutoDJ' and transition time spinbox */
-  #DlgAutoDJ > #horizontalSpacer {
-    width: 100px;
+  #DlgAutoDJ #LibraryFeatureControls QPushButton {
+    padding: 0px;
+    }
+    QPushButton#pushButtonAutoDJ {
+      min-width: 40px;
+    }
+
+#LibraryFeatureControls QLabel,
+#LibraryFeatureControls QRadioButton {
+  background: transparent;
+}
+
+/* Additional space for QRadionButtons */
+#LibraryFeatureControls QRadioButton {
+  margin: 2px 3px 2px 3px;
   }
   /* Push 'New' radio button away from corner */
-  #radioButtonRecentlyAdded {
-    margin-left: 10px;
+  QRadioButton#radioButtonRecentlyAdded {
+    margin-left: 5px;
   }
   /* Space in between 'All' radio button and 'Select All' button */
-  QPushButton#pushButtonSelectAll {
-    margin-left: 12px;
+  QRadioButton#radioButtonAllSongs {
+    margin-right: 10px;
   }
 
-#labelRecPrefix,
-#labelRecFilename,
-#labelRecStatistics {
+/* Additional space for QLabels */
+QLabel#labelTransitionAppendix {
+  margin-left: 3px;
+}
+QLabel#labelProgress, /* Analysis progress */
+QLabel#labelSelectionInfo /* AutoDJ track selection info */ {
+  margin: 2px 5px 5px 1px;
+}
+QLabel#labelRecPrefix,
+QLabel#labelRecFilename,
+QLabel#labelRecStatistics {
   text-transform: none;
-  padding: 0px 0px 3px 0px;
-  }
+  margin: 3px 0px 3px 0px;
+}
 
 #LibraryContainer QTreeView {
   show-decoration-selected: 0;
diff --git a/res/skins/LateNight/style_classic.qss b/res/skins/LateNight/style_classic.qss
index 00b528b1f6a..d3fa4dd108a 100644
--- a/res/skins/LateNight/style_classic.qss
+++ b/res/skins/LateNight/style_classic.qss
@@ -1030,10 +1030,11 @@ WSearchLineEdit,
 #LibraryBPMSpinBox,
 #LibraryBPMButton::item,
 #LibraryContainer QTableView,
+#LibraryContainer QTableView::indicator,
 #LibraryContainer QTextBrowser,
 #LibraryContainer QTreeView,
-WLibrary QLabel, WLibrary QRadioButton,
-WLibrary QTableView::indicator,
+#LibraryFeatureControls QLabel,
+#LibraryFeatureControls QRadioButton,
 QToolTip,
 WBeatSpinBox QMenu,
 #LibraryContainer QMenu,
@@ -1096,7 +1097,8 @@ WTrackMenu QMenu QCheckBox,
 WEffectSelector, WEffectSelector QAbstractScrollArea,
 #fadeModeCombobox, #fadeModeCombobox QAbstractScrollArea,
 WBeatSpinBox, #spinBoxTransition,
-WLibrary QLabel, WLibrary QRadioButton {
+#LibraryFeatureControls QLabel,
+#LibraryFeatureControls QRadioButton {
   color: #888;
 }
 
@@ -1106,11 +1108,7 @@ WLibrary QLabel, WLibrary QRadioButton {
 #FxButtonLabel,
 #FxUnitLabel[highlight="0"],
 #MicAuxLabelUnconfigured,
-#DlgMissing > QPushButton:!enabled,
-#DlgHidden > QPushButton:!enabled,
-#DlgAutoDJ > QPushButton:!enabled,
-#DlgRecording > QPushButton:!enabled,
-#DlgAnalysis > QPushButton:!enabled {
+#LibraryFeatureControls QPushButton:!enabled {
   color: #666;
 }
 
@@ -1138,16 +1136,12 @@ WLibrary QLabel, WLibrary QRadioButton {
 #SkinSettingsToggle[displayValue="1"],
 QPushButton#pushButtonAutoDJ:checked,
 QPushButton#pushButtonRepeatPlaylist:checked,
-#DlgAnalysis > QPushButton:checked,
+QPushButton#pushButtonAnalyze:checked,
 QPushButton#pushButtonRecording:checked {
   color: #000;
 }
 
-#DlgMissing > QPushButton:pressed,
-#DlgHidden > QPushButton:pressed,
-#DlgAutoDJ > QPushButton:pressed,
-#DlgRecording > QPushButton:pressed,
-#DlgAnalysis > QPushButton:pressed {
+#LibraryFeatureControls QPushButton:pressed {
   color: #999;
 }
 
@@ -1197,11 +1191,7 @@ WOverview #PassthroughLabel {
 
 
 /* Library controls in AutoDJ etc. */
-#DlgMissing > QPushButton,
-#DlgHidden > QPushButton,
-#DlgAutoDJ > QPushButton,
-#DlgRecording > QPushButton,
-#DlgAnalysis > QPushButton {
+#LibraryFeatureControls QPushButton {
   color: #bbb;
   }
 
@@ -1238,11 +1228,7 @@ WPushButton#FxAssignButton1[displayValue="0"],
 #RecFeedback[displayValue="0"],
 #BroadcastButton[displayValue="0"],
 #SkinSettingsToggle[displayValue="0"],
-#DlgMissing > QPushButton,
-#DlgHidden > QPushButton,
-#DlgAutoDJ > QPushButton,
-#DlgRecording > QPushButton,
-#DlgAnalysis > QPushButton,
+#LibraryFeatureControls QPushButton,
 WEffectSelector,
 WEffectSelector:on {
   border-width: 2px;
@@ -1258,14 +1244,10 @@ WPushButton#FxAssignButton1[displayValue="1"],
 #BroadcastButton[displayValue="2"],
 #BroadcastButton[displayValue="3"],
 #SkinSettingsToggle[displayValue="1"],
-#DlgMissing > QPushButton:pressed,
-#DlgHidden > QPushButton:pressed,
-#DlgAutoDJ > QPushButton:pressed,
-#DlgRecording > QPushButton:pressed,
-#DlgAnalysis > QPushButton:pressed,
+#LibraryFeatureControls QPushButton:pressed,
 QPushButton#pushButtonAutoDJ:checked,
 QPushButton#pushButtonRepeatPlaylist:checked,
-#DlgAnalysis > QPushButton:checked,
+QPushButton#pushButtonAnalyze:checked,
 QPushButton#pushButtonRecording:checked {
   border-width: 2px;
   border-image: url(skin:/classic/buttons/btn_embedded_library_active.svg) 2 2 2 2;
@@ -1280,11 +1262,7 @@ QPushButton#pushButtonRecording:checked {
     }
 
 /* Library controls in AutoDJ etc. */
-  #DlgMissing > QPushButton:focus,
-  #DlgHidden > QPushButton:focus,
-  #DlgAutoDJ > QPushButton:focus,
-  #DlgRecording > QPushButton:focus,
-  #DlgAnalysis > QPushButton:focus {
+  #LibraryFeatureControls QPushButton:focus {
     outline: none;
   }
 
@@ -1373,11 +1351,7 @@ WPushButton#SyncDeck[value="0"],
 #MicAuxRack WPushButton[displayValue="0"],
 /* library buttons */
 QPushButton#pushButtonAutoDJ:enabled:!checked,
-#DlgMissing > QPushButton:enabled,
-#DlgHidden > QPushButton:enabled,
-#DlgAutoDJ > QPushButton:enabled,
-#DlgRecording > QPushButton:enabled,
-#DlgAnalysis > QPushButton:enabled,
+#LibraryFeatureControls QPushButton:enabled,
 WPushButton#GuiToggleButton[displayValue="0"],
 #RecFeedback[displayValue="0"],
 WPushButton#BroadcastButton[displayValue="0"],
@@ -1462,7 +1436,7 @@ QPushButton#pushButtonRepeatPlaylist:checked {
 #RecFeedback[displayValue="1"],   /* initialize recording */
 #SkinSettingsToggle[displayValue="1"],
 QPushButton#pushButtonAutoDJ:checked,
-#DlgAnalysis > QPushButton:checked {
+QPushButton#pushButtonAnalyze:checked {
   background-color: #d09300;
 }
 
diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss
index 8decacb728b..014f31b351d 100644
--- a/res/skins/LateNight/style_palemoon.qss
+++ b/res/skins/LateNight/style_palemoon.qss
@@ -76,6 +76,7 @@
 #SidebarCoverSplitter,
 #SidebarCoverSplitter:handle,
 #LibrarySplitter::handle,
+#LibraryFeatureControls,
 QAbstractScrollArea::corner {
   border-top: 1px solid #212123;
   border-right: 1px solid #111;
@@ -89,7 +90,7 @@ QAbstractScrollArea::corner {
     border-radius: 0px;
   }
 
-  #SidebarSearchPreviewContainer {
+  #LibSidebarContainer {
     margin-top: 1px;
   }
   #SidebarBox {
@@ -134,8 +135,15 @@ QAbstractScrollArea::corner {
         min-height: 3px;
         max-height: 3px;
       }
-#LibraryContainer {
-}
+  /* Controls row in AutoDJ, Recording and other library features */
+  #LibraryFeatureControls {
+    border-width: 1px 0px 0px 0px;
+    border-radius: 0px;
+    margin-top: 1px;
+  }
+
+#LibraryContainer {}
+
   #LibraryContainer QScrollBar::handle:horizontal,
   #LibraryContainer QScrollBar::handle:vertical,
   WEffectSelector QAbstractScrollArea QScrollBar::handle:horizontal,
@@ -196,11 +204,10 @@ WSearchLineEdit {
   #DeckSettingsContainer,
   #DeckSettingsContainerCompact,
   #SamplerSettingsContainer,
-  #spinBoxTransition,
   /* Prevent cut-off or shifted stars on macOS */
   WStarRating {
     background-color: #19191a;
-  }
+    }
     #DeckSettingsContainer,
     #DeckSettingsContainerCompact,
     #SamplerSettingsContainer {
@@ -1188,15 +1195,12 @@ WSearchLineEdit, WTime,
 #LibraryBPMSpinBox,
 #LibraryBPMButton::item,
 #LibraryContainer QTableView,
+#LibraryContainer QTableView::indicator,
 #LibraryContainer QTextBrowser,
 #LibraryContainer QTreeView,
-WLibrary QLabel, WLibrary QRadioButton,
-WLibrary QTableView::indicator,
-#DlgMissing > QPushButton,
-#DlgHidden > QPushButton,
-#DlgAutoDJ > QPushButton,
-#DlgRecording > QPushButton,
-#DlgAnalysis > QPushButton,
+#LibraryFeatureControls QLabel,
+#LibraryFeatureControls QPushButton,
+#LibraryFeatureControls QRadioButton,
 /* Tooltip and menus */
 QToolTip,
 WBeatSpinBox QMenu,
@@ -1333,7 +1337,7 @@ WEffectSelector QAbstractScrollArea,
 #RecDuration[highlight="0"],
 #BroadcastButton[displayValue="0"],
 #SkinSettingsToggle[displayValue="0"],
-WLibrary QLabel {
+#LibraryFeatureControls QLabel {
   color: #777;
 }
 
@@ -1371,16 +1375,12 @@ WLibrary QLabel {
 #SkinSettingsToggle[displayValue="1"],
 QPushButton#pushButtonAutoDJ:checked,
 QPushButton#pushButtonRepeatPlaylist:checked,
-#DlgAnalysis > QPushButton:checked,
+QPushButton#pushButtonAnalyze:checked,
 QPushButton#pushButtonRecording:checked {
   color: #000;
 }
 
-#DlgMissing > QPushButton:!enabled,
-#DlgHidden > QPushButton:!enabled,
-#DlgAutoDJ > QPushButton:!enabled,
-#DlgRecording > QPushButton:!enabled,
-#DlgAnalysis > QPushButton:!enabled {
+#LibraryFeatureControls QPushButton:!enabled {
   color: #444443;
 }
 
@@ -1437,14 +1437,9 @@ WOverview #PassthroughLabel {
 WPushButton#VinylButton[displayValue="0"],
 WPushButton#FxAssignButton1[displayValue="0"],
 WEffectSelector,
-#DlgMissing > QPushButton:enabled,
-#DlgHidden > QPushButton:enabled,
-#DlgAutoDJ > QPushButton:enabled,
-#DlgRecording > QPushButton:enabled,
-#DlgAnalysis > QPushButton:enabled,
+#LibraryFeatureControls QPushButton:enabled,
 #fadeModeCombobox,
-#CueDeleteButton,
-#LibraryContainer WBeatSpinBox {
+#CueDeleteButton {
   outline: none;
   border-width: 2px;
   border-image: url(skin:/palemoon/buttons/btn_embedded_library.svg) 2 2 2 2;
@@ -1462,14 +1457,10 @@ WEffectSelector,
   #BroadcastButton[displayValue="2"],
   #BroadcastButton[displayValue="3"],
   #SkinSettingsToggle[displayValue="1"],
-  #DlgMissing > QPushButton:pressed,
-  #DlgHidden > QPushButton:pressed,
-  #DlgAutoDJ > QPushButton:pressed,
-  #DlgRecording > QPushButton:pressed,
-  #DlgAnalysis > QPushButton:pressed
+  #LibraryFeatureControls QPushButton:pressed
   QPushButton#pushButtonAutoDJ:checked,
   QPushButton#pushButtonRepeatPlaylist:checked,
-  #DlgAnalysis > QPushButton:checked,
+  QPushButton#pushButtonAnalyze:checked,
   QPushButton#pushButtonRecording:checked,
   #fadeModeCombobox:on,
   WEffectSelector:on,
@@ -1495,11 +1486,7 @@ WEffectSelector,
     border-image: url(skin:/palemoon/buttons/btn_embedded_library_header_sort.svg) 1 2 1 1; */
   }
 
-  #DlgMissing > QPushButton:!enabled,
-  #DlgHidden > QPushButton:!enabled,
-  #DlgAutoDJ > QPushButton:!enabled,
-  #DlgRecording > QPushButton:!enabled,
-  #DlgAnalysis > QPushButton:!enabled {
+  #LibraryFeatureControls QPushButton:!enabled {
     outline: none;
     border-width: 2px;
     border-image: url(skin:/palemoon/buttons/btn_embedded_library_disabled.svg) 2 2 2 2;
@@ -1629,11 +1616,7 @@ WBeatSpinBox::down-button {
   #spinBoxTransition::up-button,
   #spinBoxTransition::down-button,
   QPushButton#pushButtonAutoDJ:enabled:!checked,
-  #DlgMissing > QPushButton:enabled,
-  #DlgHidden > QPushButton:enabled,
-  #DlgAutoDJ > QPushButton:enabled,
-  #DlgRecording > QPushButton:enabled,
-  #DlgAnalysis > QPushButton:enabled {
+  #LibraryFeatureControls QPushButton:enabled {
     background-color: #222;
   }
   /* dark buttons in toolbar */
@@ -1660,7 +1643,7 @@ WPushButton#Reverse[pressed="true"],
 #VinylButton[displayValue="1"],
 #PassthroughButton[displayValue="1"],
 QPushButton#pushButtonAutoDJ:checked,
-#DlgAnalysis > QPushButton:checked {
+QPushButton#pushButtonAnalyze:checked {
   background-color: #b24c12;
   }
   /* Orange border for Play buttons when previewing from
@@ -2815,54 +2798,22 @@ WLibrary QRadioButton::indicator:unchecked {
   Don't use 'WLibrary QPushButton' here, as this would apply padding
   to the Preview & BPM lock buttons as well.
   Define the buttons fore every Library feature instead. */
-#DlgMissing > QPushButton,
-#DlgHidden > QPushButton,
-#DlgAutoDJ > QPushButton,
-#DlgRecording > QPushButton,
-#DlgAnalysis > QPushButton {
+#LibraryFeatureControls QPushButton {
   margin: 0px 6px 3px 0px;
-  padding: 0px;
-  height: 20px;
   }
 /* add margin to compensate for frameless library table */
-#DlgMissing > QPushButton,
-#DlgHidden > QPushButton,
-#DlgAutoDJ > QPushButton,
-#DlgRecording > QPushButton,
-#DlgAnalysis > QPushButton,
+#LibraryFeatureControls QPushButton,
 #fadeModeCombobox,
 #spinBoxTransition {
   margin-top: 4px;
   }
-  WLibrary QRadioButton {
+  #LibraryFeatureControls QRadioButton {
     /* bottom margin! */
     margin: 6px 3px 4px 3px;
   }
-  #DlgAnalysis QLabel,
-  #DlgAutoDJ QLabel {
-    margin: 6px 5px 5px 1px;
-  }
-
-#DlgMissing > QPushButton,
-#DlgHidden > QPushButton,
-#DlgRecording > QPushButton,
-#DlgAnalysis > QPushButton {
-  padding: 0px 5px;
-  }
-  QPushButton#pushButtonAutoDJ {
-    min-width: 40px;
-  }
-  /* Space in between 'Enable AutoDJ' and transition time spinbox */
-  #DlgAutoDJ > #horizontalSpacer {
-    width: 100px;
-  }
-  /* Push 'New' radio button away from corner */
-  #radioButtonRecentlyAdded {
-    margin-left: 10px;
-  }
-  /* Space in between 'All' radio button and 'Select All' button */
-  QPushButton#pushButtonSelectAll {
-    margin-left: 12px;
+  QLabel#labelProgress, /* Analysis progress */
+  QLabel#labelSelectionInfo /* AutoDJ track selection info */ {
+    margin: 4px 5px 5px 1px;
   }
 
 #LibraryContainer QTreeView {
@@ -2933,7 +2884,8 @@ WTrackMenu QMenu {
 #LibraryContainer QTextBrowser,
 #LibraryContainer QTreeView,
 #SkinSettings,
-WSearchLineEdit {
+WSearchLineEdit,
+#spinBoxTransition {
   background-color: #0f0f0f;
 }
 
diff --git a/res/skins/Shade/library.xml b/res/skins/Shade/library.xml
index 00718a72d13..dd882b6828a 100644
--- a/res/skins/Shade/library.xml
+++ b/res/skins/Shade/library.xml
@@ -47,7 +47,7 @@
 
               <Library>
                 <ShowButtonText>false</ShowButtonText>
-                <TrackTableBackgroundColorOpacity>0.125</TrackTableBackgroundColorOpacity>
+                <TrackTableBackgroundColorOpacity>0.250</TrackTableBackgroundColorOpacity>
               </Library>
 
             </Children>
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index 249e9c54096..fc568e1560b 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -826,11 +826,7 @@ WLibrary QRadioButton::indicator:unchecked {
   image: url(skin:/btn/btn_lib_radio_button_off.svg) center center;
 }
 
-#DlgMissing > QPushButton,
-#DlgHidden > QPushButton,
-#DlgAutoDJ > QPushButton,
-#DlgRecording > QPushButton,
-#DlgAnalysis > QPushButton {
+#LibraryFeatureControls QPushButton {
   text-align: center;
   font-size: 9pt;
   font-weight: normal;
@@ -848,7 +844,7 @@ WLibrary QRadioButton::indicator:unchecked {
   background-color: #99a0a4;
   border: 1px solid #99a0a4;
   }
-  #DlgAutoDJ > QPushButton {
+  #DlgAutoDJ > #LibraryFeatureControls QPushButton {
     padding: 0px;
     width: 32px;
     height: 18px;
@@ -857,37 +853,20 @@ WLibrary QRadioButton::indicator:unchecked {
       width: 40px;
     }
 
-  #DlgMissing > QPushButton:!enabled,
-  #DlgHidden > QPushButton:!enabled,
-  #DlgAutoDJ > QPushButton:!enabled,
-  #DlgRecording > QPushButton:!enabled,
-  #DlgAnalysis > QPushButton:!enabled {
+  #LibraryFeatureControls QPushButton:!enabled {
     background-color: #72777A;
     border: 1px solid #72777A;
     }
-  #DlgMissing > QPushButton:unchecked,
-  #DlgHidden > QPushButton:unchecked,
-  #DlgAutoDJ > QPushButton:unchecked,
-  #DlgRecording > QPushButton:unchecked,
-  #DlgAnalysis > QPushButton:unchecked {
+  #LibraryFeatureControls QPushButton:unchecked {
     color: #888;
     background-color: #444;
     }
-  #DlgMissing > QPushButton:checked,
-  #DlgHidden > QPushButton:checked,
-  #DlgAutoDJ > QPushButton:checked,
-  #DlgRecording > QPushButton:checked,
-  #DlgAnalysis > QPushButton:checked {
+  #LibraryFeatureControls QPushButton:checked {
     color: #000;
     background-color: #F90562;
     border: 1px solid #F90562;
     }
-  #DlgAnalysis > QPushButton:focus,
-  #DlgMissing > QPushButton:focus,
-  #DlgHidden > QPushButton:focus,
-  #DlgAutoDJ > QPushButton:focus,
-  #DlgRecording > QPushButton:focus,
-  #DlgAnalysis > QPushButton:focus {
+  #LibraryFeatureControls QPushButton:focus {
     outline: none;
   }
   /* Space in between 'Recording'	button and recording label */
diff --git a/res/skins/Shade/style_dark.qss b/res/skins/Shade/style_dark.qss
index fdc1bd77641..f2d5a14122b 100644
--- a/res/skins/Shade/style_dark.qss
+++ b/res/skins/Shade/style_dark.qss
@@ -224,27 +224,15 @@ WEffectSelector QAbstractScrollArea QScrollBar::handle:horizontal,
   #LibraryContainer QHeaderView::down-arrow {
     image: url(skin:/btn/btn_lib_sort_down_green.png)
   }
-#DlgMissing > QPushButton:enabled,
-#DlgHidden > QPushButton:enabled,
-#DlgAutoDJ > QPushButton:enabled,
-#DlgRecording > QPushButton:enabled,
-#DlgAnalysis > QPushButton:enabled {
+#LibraryFeatureControls QPushButton:enabled {
   background-color: #5C5B5D;
   border: 1px solid #5C5B5D;
   }
-  #DlgMissing > QPushButton:!enabled,
-  #DlgHidden > QPushButton:!enabled,
-  #DlgAutoDJ > QPushButton:!enabled,
-  #DlgRecording > QPushButton:!enabled,
-  #DlgAnalysis > QPushButton:!enabled {
+  #LibraryFeatureControls QPushButton:!enabled {
     background-color: #3D3E3F;
     border: 1px solid #3D3E3F;
   }
-  #DlgMissing > QPushButton:checked,
-  #DlgHidden > QPushButton:checked,
-  #DlgAutoDJ > QPushButton:checked,
-  #DlgRecording > QPushButton:checked,
-  #DlgAnalysis > QPushButton:checked {
+  #LibraryFeatureControls QPushButton:checked {
     color: #000;
     background-color: #B79E00;
     border: 1px solid #B79E00;
diff --git a/res/skins/Shade/style_summer_sunset.qss b/res/skins/Shade/style_summer_sunset.qss
index 2eb7b2e7294..0e72ac37e16 100644
--- a/res/skins/Shade/style_summer_sunset.qss
+++ b/res/skins/Shade/style_summer_sunset.qss
@@ -119,31 +119,19 @@ WOverview #PassthroughLabel {
   color: #FF9900;
 }
 
-#DlgMissing > QPushButton:enabled,
-#DlgHidden > QPushButton:enabled,
-#DlgAutoDJ > QPushButton:enabled,
-#DlgRecording > QPushButton:enabled,
-#DlgAnalysis > QPushButton:enabled {
+#LibraryFeatureControls QPushButton:enabled {
   background-color: #998A3C;
   border: 1px solid #998A3C;
   }
-  #DlgMissing > QPushButton:!enabled,
-  #DlgHidden > QPushButton:!enabled,
-  #DlgAutoDJ > QPushButton:!enabled,
-  #DlgRecording > QPushButton:!enabled,
-  #DlgAnalysis > QPushButton:!enabled {
+  #LibraryFeatureControls QPushButton:!enabled {
     background-color: #706633;
     border: 1px solid #706633;
     }
-  WLibrary QPushButton:unchecked {
+  #LibraryFeatureControls QPushButton:unchecked {
     color: #888;
     background-color: #444;
     }
-  #DlgMissing > QPushButton:checked,
-  #DlgHidden > QPushButton:checked,
-  #DlgAutoDJ > QPushButton:checked,
-  #DlgRecording > QPushButton:checked,
-  #DlgAnalysis > QPushButton:checked {
+  #LibraryFeatureControls QPushButton:checked {
     color: #000;
     background-color: #52F904;
     border: 1px solid #52F904;
diff --git a/res/skins/Tango/library.xml b/res/skins/Tango/library.xml
index fb938b79023..b5510d28927 100644
--- a/res/skins/Tango/library.xml
+++ b/res/skins/Tango/library.xml
@@ -115,7 +115,7 @@ Description:
                     <BgColor>#585858</BgColor>
                     <FgColor>#eece33</FgColor>
                     <ShowButtonText>false</ShowButtonText>
-                    <TrackTableBackgroundColorOpacity>0.125</TrackTableBackgroundColorOpacity>
+                    <TrackTableBackgroundColorOpacity>0.2</TrackTableBackgroundColorOpacity>
                   </Library>
                 </Children>
               </WidgetGroup><!-- /Library Table -->
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 168a4a51a15..4f5c86e1fe4 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -1079,7 +1079,7 @@ WLabel#TrackComment {
     }
 
 WBeatSpinBox,
-#DlgAutoDJ QSpinBox {
+#spinBoxTransition {
   /* Note(ronso0):
   make it 2px smaller in each dimension,
   border is added for final size.
@@ -1103,26 +1103,26 @@ WBeatSpinBox,
     padding: 1px 0px 1px 3px;
     margin: 0px 15px 0px 0px;
   }
-  #DlgAutoDJ QSpinBox {
+  #spinBoxTransition {
     /* Note(ronso0):
     Individual padding/margin in AutoDJ feature */
     padding: -1px 3px -1px 3px;
     margin: 0px 17px 3px 3px;
   }
   WBeatSpinBox:hover,
-  #DlgAutoDJ QSpinBox:hover {
+  #spinBoxTransition:hover {
     border-color: #888;
   }
   WBeatSpinBox:focus,
-  #DlgAutoDJ QSpinBox:focus {
+  #spinBoxTransition:focus {
     border-color: #ff6600;
     color: #ccc;
   }
 
   WBeatSpinBox::up-button,
   WBeatSpinBox::down-button,
-  #DlgAutoDJ QSpinBox::up-button,
-  #DlgAutoDJ QSpinBox::down-button {
+  #spinBoxTransition::up-button,
+  #spinBoxTransition::down-button {
     subcontrol-origin: padding;
     position: relative;
     background-color: #1e1e1e;
@@ -1135,13 +1135,13 @@ WBeatSpinBox,
     }
     WBeatSpinBox::up-button:hover,
     WBeatSpinBox::down-button:hover,
-    #DlgAutoDJ QSpinBox::up-button:hover,
-    #DlgAutoDJ QSpinBox::down-button:hover {
+    #spinBoxTransition::up-button:hover,
+    #spinBoxTransition::down-button:hover {
       background-color: #0f0f0f;
       }
 
   WBeatSpinBox::up-button,
-  #DlgAutoDJ QSpinBox::up-button {
+  #spinBoxTransition::up-button {
     subcontrol-position: center right;
     /* Note(ronso0):
     Regularly, up/down buttons would be stacked vertically.
@@ -1152,18 +1152,18 @@ WBeatSpinBox,
     image: url(skin:/buttons/btn_beatbox_up.svg) no-repeat;
     }
     WBeatSpinBox::up-button:hover,
-    #DlgAutoDJ QSpinBox::up-button:hover {
+    #spinBoxTransition::up-button:hover {
       image: url(skin:/buttons/btn_beatbox_up_hover.svg) no-repeat;
     }
   WBeatSpinBox::down-button,
-  #DlgAutoDJ QSpinBox::down-button {
+  #spinBoxTransition::down-button {
     subcontrol-position: center right;
     border-top-left-radius: 3px;
     border-bottom-left-radius: 3px;
     image: url(skin:/buttons/btn_beatbox_down.svg) no-repeat;
     }
     WBeatSpinBox::down-button:hover,
-    #DlgAutoDJ QSpinBox::down-button:hover {
+    #spinBoxTransition::down-button:hover {
       image: url(skin:/buttons/btn_beatbox_down_hover.svg) no-repeat;
     }
 
@@ -2692,7 +2692,7 @@ Library features and their buttons:
     QPushButton#pushButtonRecording > un/checked
 
   	*/
-WLibrary QPushButton {
+#LibraryFeatureControls QPushButton {
   text-align: center;
   font-weight: normal;
   /* Note(ronso0)
@@ -2710,7 +2710,7 @@ WLibrary QPushButton {
   background-color: #333;
   background-position: center;
   }
-  #DlgAutoDJ > QPushButton {
+  #DlgAutoDJ > #LibraryFeatureControls QPushButton {
     padding: 1px 2px;
     height: 20px;
     min-width: 32px;
@@ -2719,22 +2719,22 @@ WLibrary QPushButton {
     width: 42px;
   }
 
-  WLibrary QPushButton:!enabled {
+  #LibraryFeatureControls QPushButton:!enabled {
     color: #888;
     }
-  WLibrary QPushButton:hover,
+  #LibraryFeatureControls QPushButton:hover,
   #fadeModeCombobox:hover {
     border: 1px solid #888;
     }
-  WLibrary QPushButton:unchecked {
+  #LibraryFeatureControls QPushButton:unchecked {
     color: #888;
     background-color: #444;
     }
-  WLibrary QPushButton:checked {
+  #LibraryFeatureControls QPushButton:checked {
     color: #000;
     background-color: #ff7b00;
     }
-  WLibrary QPushButton:checked:hover {
+  #LibraryFeatureControls QPushButton:checked:hover {
     border: 1px solid #fff;
     }
   QPushButton#pushButtonRecording:unchecked {
@@ -2825,12 +2825,12 @@ QPushButton#pushButtonRepeatPlaylist:!checked {
   }
 
   /* Recording info */
-  #labelRecFilename {
+  QLabel#labelRecFilename {
     font-weight: bold;
     margin: 0px 1px;
   }
-  #labelRecPrefix,
-  #labelRecStatistics {
+  QLabel#labelRecPrefix,
+  QLabel#labelRecStatistics {
     font-weight: normal;
   }
 
@@ -2951,13 +2951,13 @@ WLibrary QRadioButton {	/*
   color: #cfcfcf;
 }
 
-WLibrary QRadioButton#radioButtonRecentlyAdded,
-WLibrary QRadioButton#radioButtonAllSongs {
+QRadioButton#radioButtonRecentlyAdded,
+QRadioButton#radioButtonAllSongs {
   padding: 1px 3px 3px 1px;
   color: #cfcfcf;
 }
 
-WLibrary QRadioButton#radioButtonRecentlyAdded {
+QRadioButton#radioButtonRecentlyAdded {
   margin: 0px 3px 0px 5px;
 }
 
diff --git a/src/library/autodj/dlgautodj.ui b/src/library/autodj/dlgautodj.ui
index d32f4b72c92..b68c0144e31 100644
--- a/src/library/autodj/dlgautodj.ui
+++ b/src/library/autodj/dlgautodj.ui
@@ -30,195 +30,197 @@
     <number>0</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <property name="leftMargin">
-      <number>0</number>
-     </property>
-     <property name="topMargin">
-      <number>0</number>
-     </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <property name="bottomMargin">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QPushButton" name="pushButtonAutoDJ">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="checkable">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>10</width>
-         <height>1</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushButtonFadeNow">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushButtonSkipNext">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="checkable">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="fadeModeCombobox">
-      </widget>
-     </item>
-     <item>
-      <widget class="QSpinBox" name="spinBoxTransition">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="frame">
-        <bool>false</bool>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-       <property name="minimum">
-        <number>-9</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelTransitionAppendix">
-       <property name="text">
-        <string>sec.</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_3">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>10</width>
-         <height>1</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushButtonShuffle">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="checkable">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushButtonAddRandomTrack">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushButtonRepeatPlaylist">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="checkable">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>1</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelSelectionInfo">
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QWidget" name="LibraryFeatureControls">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QPushButton" name="pushButtonAutoDJ">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer_1">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>10</width>
+          <height>1</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pushButtonFadeNow">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pushButtonSkipNext">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="checkable">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="fadeModeCombobox">
+       </widget>
+      </item>
+      <item>
+       <widget class="QSpinBox" name="spinBoxTransition">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="frame">
+         <bool>false</bool>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="minimum">
+         <number>-9</number>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="labelTransitionAppendix">
+        <property name="text">
+         <string>sec.</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>10</width>
+          <height>1</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pushButtonShuffle">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="checkable">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pushButtonAddRandomTrack">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pushButtonRepeatPlaylist">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer_3">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>1</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLabel" name="labelSelectionInfo">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
    <item>
     <widget class="QTableView" name="m_pTrackTablePlaceholder">
diff --git a/src/library/dlganalysis.ui b/src/library/dlganalysis.ui
index aa5ce8bf01b..94a4481a35d 100644
--- a/src/library/dlganalysis.ui
+++ b/src/library/dlganalysis.ui
@@ -30,98 +30,100 @@
     <number>0</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <property name="leftMargin">
-      <number>0</number>
-     </property>
-     <property name="topMargin">
-      <number>0</number>
-     </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <property name="bottomMargin">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QRadioButton" name="radioButtonRecentlyAdded">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="toolTip">
-        <string>Shows tracks added to the library within the last 7 days.</string>
-       </property>
-       <property name="text">
-        <string>New</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QRadioButton" name="radioButtonAllSongs">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="toolTip">
-        <string>Shows all tracks in the library.</string>
-       </property>
-       <property name="text">
-        <string>All</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushButtonSelectAll">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="toolTip">
-        <string>Selects all tracks in the table below.</string>
-       </property>
-       <property name="text">
-        <string>Select All</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushButtonAnalyze">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="toolTip">
-        <string>Runs beatgrid, key, and ReplayGain detection on the selected tracks. Does not generate waveforms for the selected tracks to save disk space.</string>
-       </property>
-       <property name="text">
-        <string>Analyze</string>
-       </property>
-       <property name="checkable">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelProgress">
-       <property name="text">
-        <string>Progress</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
+    <widget class="QWidget" name="LibraryFeatureControls">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QRadioButton" name="radioButtonRecentlyAdded">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
+         <property name="toolTip">
+          <string>Shows tracks added to the library within the last 7 days.</string>
+         </property>
+         <property name="text">
+          <string>New</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QRadioButton" name="radioButtonAllSongs">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
+         <property name="toolTip">
+          <string>Shows all tracks in the library.</string>
+         </property>
+         <property name="text">
+          <string>All</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushButtonSelectAll">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
+         <property name="toolTip">
+          <string>Selects all tracks in the table below.</string>
+         </property>
+         <property name="text">
+          <string>Select All</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushButtonAnalyze">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
+         <property name="toolTip">
+          <string>Runs beatgrid, key, and ReplayGain detection on the selected tracks. Does not generate waveforms for the selected tracks to save disk space.</string>
+         </property>
+         <property name="text">
+          <string>Analyze</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelProgress">
+         <property name="text">
+          <string>Progress</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+    </widget>
    </item>
    <item>
     <widget class="QTableView" name="m_pTrackTablePlaceholder">
diff --git a/src/library/dlghidden.ui b/src/library/dlghidden.ui
index 7e8f3d47d66..3cbea274e82 100644
--- a/src/library/dlghidden.ui
+++ b/src/library/dlghidden.ui
@@ -30,84 +30,86 @@
     <number>0</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <property name="leftMargin">
-      <number>0</number>
-     </property>
-     <property name="topMargin">
-      <number>0</number>
-     </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <property name="bottomMargin">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QPushButton" name="btnSelect">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="toolTip">
-        <string>Selects all tracks in the table below.</string>
-       </property>
-       <property name="text">
-        <string>Select All</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnPurge">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+    <widget class="QWidget" name="LibraryFeatureControls">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <property name="spacing">
+        <number>0</number>
        </property>
-       <property name="toolTip">
-        <string>Purge selected tracks from the library.</string>
+       <property name="leftMargin">
+        <number>0</number>
        </property>
-       <property name="text">
-        <string>Purge</string>
+       <property name="topMargin">
+        <number>0</number>
        </property>
-       <property name="checkable">
-        <bool>false</bool>
+       <property name="rightMargin">
+        <number>0</number>
        </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnUnhide">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+       <property name="bottomMargin">
+        <number>0</number>
        </property>
-       <property name="toolTip">
-        <string>Unhide selected tracks from the library.</string>
-       </property>
-       <property name="text">
-        <string>Unhide</string>
-       </property>
-       <property name="shortcut">
-        <string>Ctrl+S</string>
-       </property>
-       <property name="checkable">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
+       <item>
+        <widget class="QPushButton" name="btnSelect">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
+         <property name="toolTip">
+          <string>Selects all tracks in the table below.</string>
+         </property>
+         <property name="text">
+          <string>Select All</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="btnPurge">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
+         <property name="toolTip">
+          <string>Purge selected tracks from the library.</string>
+         </property>
+         <property name="text">
+          <string>Purge</string>
+         </property>
+         <property name="checkable">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="btnUnhide">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
+         <property name="toolTip">
+          <string>Unhide selected tracks from the library.</string>
+         </property>
+         <property name="text">
+          <string>Unhide</string>
+         </property>
+         <property name="shortcut">
+          <string>Ctrl+S</string>
+         </property>
+         <property name="checkable">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+    </widget>
    </item>
    <item>
     <widget class="QTableView" name="m_pTrackTablePlaceholder">
diff --git a/src/library/dlgmissing.ui b/src/library/dlgmissing.ui
index b65658eaeb8..932ec8cf5fe 100644
--- a/src/library/dlgmissing.ui
+++ b/src/library/dlgmissing.ui
@@ -30,65 +30,67 @@
     <number>0</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <property name="leftMargin">
-      <number>0</number>
-     </property>
-     <property name="topMargin">
-      <number>0</number>
-     </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <property name="bottomMargin">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QPushButton" name="btnSelect">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+    <widget class="QWidget" name="LibraryFeatureControls">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <property name="spacing">
+        <number>0</number>
        </property>
-       <property name="toolTip">
-        <string>Selects all tracks in the table below.</string>
+       <property name="leftMargin">
+        <number>0</number>
        </property>
-       <property name="text">
-        <string>Select All</string>
+       <property name="topMargin">
+        <number>0</number>
        </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnPurge">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+       <property name="rightMargin">
+        <number>0</number>
        </property>
-       <property name="toolTip">
-        <string>Purge selected tracks from the library.</string>
+       <property name="bottomMargin">
+        <number>0</number>
        </property>
-       <property name="text">
-        <string>Purge</string>
-       </property>
-       <property name="checkable">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
+       <item>
+        <widget class="QPushButton" name="btnSelect">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
+         <property name="toolTip">
+          <string>Selects all tracks in the table below.</string>
+         </property>
+         <property name="text">
+          <string>Select All</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="btnPurge">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
+         <property name="toolTip">
+          <string>Purge selected tracks from the library.</string>
+         </property>
+         <property name="text">
+          <string>Purge</string>
+         </property>
+         <property name="checkable">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+    </widget>
    </item>
    <item>
     <widget class="QTableView" name="m_pTrackTablePlaceholder">
diff --git a/src/library/recording/dlgrecording.ui b/src/library/recording/dlgrecording.ui
index 98b23c4393c..087f1066fd7 100644
--- a/src/library/recording/dlgrecording.ui
+++ b/src/library/recording/dlgrecording.ui
@@ -30,58 +30,60 @@
     <number>0</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <property name="leftMargin">
-      <number>0</number>
-     </property>
-     <property name="topMargin">
-      <number>0</number>
-     </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <property name="bottomMargin">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QPushButton" name="pushButtonRecording">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+    <widget class="QWidget" name="LibraryFeatureControls">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <property name="spacing">
+        <number>0</number>
        </property>
-       <property name="text">
-        <string>Start Recording</string>
+       <property name="leftMargin">
+        <number>0</number>
        </property>
-       <property name="checkable">
-        <bool>true</bool>
+       <property name="topMargin">
+        <number>0</number>
        </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelRecPrefix"/>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelRecFilename"/>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelRecStatistics"/>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+       <property name="rightMargin">
+        <number>0</number>
        </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
+       <property name="bottomMargin">
+        <number>0</number>
        </property>
-      </spacer>
-     </item>
-    </layout>
+       <item>
+        <widget class="QPushButton" name="pushButtonRecording">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
+         <property name="text">
+          <string>Start Recording</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelRecPrefix"/>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelRecFilename"/>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelRecStatistics"/>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+    </widget>
    </item>
    <item>
     <widget class="QTableView" name="m_pTrackTablePlaceholder">