diff --git a/res/skins/Tango/mixer_channel_left.xml b/res/skins/Tango/mixer_channel_left.xml
index b02d131e454a..8e2c69eb0cfb 100644
--- a/res/skins/Tango/mixer_channel_left.xml
+++ b/res/skins/Tango/mixer_channel_left.xml
@@ -66,10 +66,11 @@ Variables:
         <SizePolicy>f,min</SizePolicy>
         <Children>
           <SliderComposed><!-- Volume slider -->
+            <Size>34f,103f</Size>
             <ObjectName>VolumeSlider</ObjectName>
             <TooltipId>channel_volume</TooltipId>
-            <Slider>knobs_sliders/volume_scale.svg</Slider>
-            <Handle>knobs_sliders/volume_handle.svg</Handle>
+            <Slider scalemode="STRETCH_ASPECT">knobs_sliders/volume_scale.svg</Slider>
+            <Handle scalemode="STRETCH_ASPECT">knobs_sliders/volume_handle.svg</Handle>
             <Horizontal>false</Horizontal>
             <Connection>
               <ConfigKey><Variable name="group"/>,volume</ConfigKey>
diff --git a/res/skins/Tango/mixer_channel_right.xml b/res/skins/Tango/mixer_channel_right.xml
index b71edbc06d2a..d5c383f09b60 100644
--- a/res/skins/Tango/mixer_channel_right.xml
+++ b/res/skins/Tango/mixer_channel_right.xml
@@ -54,10 +54,11 @@ Variables:
         <SizePolicy>f,min</SizePolicy>
         <Children>
           <SliderComposed><!-- Volume slider -->
+            <Size>34f,103f</Size>
             <ObjectName>VolumeSlider</ObjectName>
             <TooltipId>channel_volume</TooltipId>
-            <Slider>knobs_sliders/volume_scale.svg</Slider>
-            <Handle>knobs_sliders/volume_handle.svg</Handle>
+            <Slider scalemode="STRETCH_ASPECT">knobs_sliders/volume_scale.svg</Slider>
+            <Handle scalemode="STRETCH_ASPECT">knobs_sliders/volume_handle.svg</Handle>
             <Horizontal>false</Horizontal>
             <Connection>
               <ConfigKey><Variable name="group"/>,volume</ConfigKey>
diff --git a/res/skins/Tango/mixer_headphone.xml b/res/skins/Tango/mixer_headphone.xml
index 0269710c6000..b5252f3de183 100644
--- a/res/skins/Tango/mixer_headphone.xml
+++ b/res/skins/Tango/mixer_headphone.xml
@@ -73,9 +73,9 @@ Description:
               <SliderComposed>
                 <TooltipId>headMix</TooltipId>
                 <ObjectName>MixerbarSlider</ObjectName>
-                <SizePolicy>min,min</SizePolicy>
-                <Handle>knobs_sliders/headMix_handle.svg</Handle>
-                <Slider>knobs_sliders/headMix_scale.svg</Slider>
+                <Size>50f,24f</Size>
+                <Handle scalemode="STRETCH_ASPECT">knobs_sliders/headMix_handle.svg</Handle>
+                <Slider scalemode="STRETCH_ASPECT">knobs_sliders/headMix_scale.svg</Slider>
                 <Horizontal>true</Horizontal>
                 <Connection>
                   <ConfigKey>[Master],headMix</ConfigKey>
diff --git a/res/skins/Tango/mixer_master.xml b/res/skins/Tango/mixer_master.xml
index 66aeace58253..d74efff095f2 100644
--- a/res/skins/Tango/mixer_master.xml
+++ b/res/skins/Tango/mixer_master.xml
@@ -60,9 +60,9 @@ Description:
       <SliderComposed>
         <TooltipId>balance</TooltipId>
         <ObjectName>MixerbarSlider</ObjectName>
-        <SizePolicy>min,min</SizePolicy>
-        <Handle>knobs_sliders/balance_handle.svg</Handle>
-        <Slider>knobs_sliders/balance_scale.svg</Slider>
+        <Size>50f,24f</Size>
+        <Handle scalemode="STRETCH_ASPECT">knobs_sliders/balance_handle.svg</Handle>
+        <Slider scalemode="STRETCH_ASPECT">knobs_sliders/balance_scale.svg</Slider>
         <Horizontal>true</Horizontal>
         <Connection>
           <ConfigKey>[Master],balance</ConfigKey>
diff --git a/res/skins/Tango/rate_pitch_key.xml b/res/skins/Tango/rate_pitch_key.xml
index 6b5e6b11eb82..549471506870 100644
--- a/res/skins/Tango/rate_pitch_key.xml
+++ b/res/skins/Tango/rate_pitch_key.xml
@@ -169,7 +169,7 @@ Variables:
             <MaximumSize>50,136</MaximumSize>
             <SizePolicy>f,me</SizePolicy>
             <TooltipId>rate</TooltipId>
-            <Handle>knobs_sliders/pitch_handle.svg</Handle>
+            <Handle scalemode="STRETCH_ASPECT">knobs_sliders/pitch_handle.svg</Handle>
             <Slider scalemode="STRETCH">knobs_sliders/pitch_scale.svg</Slider>
             <Horizontal>false</Horizontal>
             <Connection>
diff --git a/res/skins/Tango/sampler.xml b/res/skins/Tango/sampler.xml
index 00e73db07ec0..98920fd31581 100644
--- a/res/skins/Tango/sampler.xml
+++ b/res/skins/Tango/sampler.xml
@@ -239,8 +239,8 @@ Variables:
             <ObjectName>SamplerPitchSlider</ObjectName>
             <TooltipId>rate</TooltipId>
             <Size>20f,54f</Size>
-            <Handle>knobs_sliders/pitch_sampler_handle.svg</Handle>
-            <Slider>knobs_sliders/pitch_sampler_scale.svg</Slider>
+            <Handle scalemode="STRETCH_ASPECT">knobs_sliders/pitch_sampler_handle.svg</Handle>
+            <Slider scalemode="STRETCH_ASPECT">knobs_sliders/pitch_sampler_scale.svg</Slider>
             <Horizontal>false</Horizontal>
             <Connection>
               <ConfigKey><Variable name="group"/>,rate</ConfigKey>
diff --git a/res/skins/Tango/spinny_cover_maxi.xml b/res/skins/Tango/spinny_cover_maxi.xml
index 17cef8f113ca..e01626a43388 100644
--- a/res/skins/Tango/spinny_cover_maxi.xml
+++ b/res/skins/Tango/spinny_cover_maxi.xml
@@ -74,7 +74,7 @@ Variables:
                 <TooltipId>coverart</TooltipId>
                 <Size>111f,111f</Size>
                 <Group><Variable name="group"/></Group>
-                <DefaultCover>skin:/graphics/cover_default.svg</DefaultCover>
+                <DefaultCover scalemode="STRETCH_ASPECT">skin:/graphics/cover_default.svg</DefaultCover>
                 <Connection>
                   <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
                   <BindProperty>visible</BindProperty>
diff --git a/res/skins/Tango/spinny_cover_mini.xml b/res/skins/Tango/spinny_cover_mini.xml
index 35a9d357693f..7e0baf554b9d 100644
--- a/res/skins/Tango/spinny_cover_mini.xml
+++ b/res/skins/Tango/spinny_cover_mini.xml
@@ -66,7 +66,7 @@ Variables:
             <TooltipId>coverart</TooltipId>
             <Size>40me,40me</Size>
             <Group>[Channel<Variable name="chanNum"/>]</Group>
-            <DefaultCover>skin:/graphics/cover_default_mini_<Variable name="SpinnyCoverColor"/>.svg</DefaultCover>
+            <DefaultCover scalemode="STRETCH_ASPECT">skin:/graphics/cover_default_mini_<Variable name="SpinnyCoverColor"/>.svg</DefaultCover>
             <Connection>
               <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
               <BindProperty>visible</BindProperty>
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index e1c9244fc169..c93fbf91298f 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -1233,12 +1233,8 @@ WBeatSpinBox,
   font-weight: bold;
   text-align: center;
   padding-top: 1px;
-  }
-  #BpmLabel {
-    background-color: #252525;
-  }
-  #BpmLabelMini {
-    background-color: #252525;
+  background-color: #252525;
+  border-radius: 2px;
   }
   #SyncButtonOverlay[displayValue="0"]:hover,
   #SyncButtonOverlayMini[displayValue="0"]:hover {
diff --git a/res/skins/Tango/topbar.xml b/res/skins/Tango/topbar.xml
index 8c20b5a6f2a6..4218156d43b9 100644
--- a/res/skins/Tango/topbar.xml
+++ b/res/skins/Tango/topbar.xml
@@ -104,8 +104,9 @@ Description:
 		                <Children>
 		                  <SliderComposed>
 		                    <TooltipId>crossfader</TooltipId>
-		                    <Handle>knobs_sliders/crossfader_handle.svg</Handle>
-		                    <Slider>knobs_sliders/crossfader_scale.svg</Slider>
+		                    <Size>108f,28f</Size>
+		                    <Handle scalemode="STRETCH_ASPECT">knobs_sliders/crossfader_handle.svg</Handle>
+		                    <Slider scalemode="STRETCH_ASPECT">knobs_sliders/crossfader_scale.svg</Slider>
 		                    <Horizontal>true</Horizontal>
 		                    <Connection>
 		                      <ConfigKey>[Master],crossfader</ConfigKey>