diff --git a/res/skins/Tango/button_1state.xml b/res/skins/Tango/button_1state.xml
index c63854b77460..71462e57e776 100644
--- a/res/skins/Tango/button_1state.xml
+++ b/res/skins/Tango/button_1state.xml
@@ -3,7 +3,7 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
diff --git a/res/skins/Tango/button_1state_right.xml b/res/skins/Tango/button_1state_right.xml
index b02f2d86d394..38639d8260a4 100644
--- a/res/skins/Tango/button_1state_right.xml
+++ b/res/skins/Tango/button_1state_right.xml
@@ -3,7 +3,7 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
@@ -11,7 +11,7 @@ Variables:
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
   ConfigKey         : left-click control
-  ConfigKeyRight    : left-click control
+  ConfigKeyRight    : right-click control
 -->
 <Template>
   <PushButton>
diff --git a/res/skins/Tango/button_1state_right_display.xml b/res/skins/Tango/button_1state_right_display.xml
index 1ce2d7184914..3fab0d1b1a19 100644
--- a/res/skins/Tango/button_1state_right_display.xml
+++ b/res/skins/Tango/button_1state_right_display.xml
@@ -3,7 +3,7 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
@@ -11,7 +11,7 @@ Variables:
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
   ConfigKey         : left-click control
-  ConfigKeyRight    : left-click control
+  ConfigKeyRight    : right-click control
   ConfigKeyDisp     : display control
 -->
 <Template>
diff --git a/res/skins/Tango/button_1state_right_persist.xml b/res/skins/Tango/button_1state_right_persist.xml
index b02f2d86d394..0a835c51aea6 100644
--- a/res/skins/Tango/button_1state_right_persist.xml
+++ b/res/skins/Tango/button_1state_right_persist.xml
@@ -3,7 +3,7 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
@@ -11,7 +11,7 @@ Variables:
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
   ConfigKey         : left-click control
-  ConfigKeyRight    : left-click control
+  ConfigKeyRight    : right-click control
 -->
 <Template>
   <PushButton>
@@ -28,11 +28,11 @@ Variables:
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <Connection>
-      <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
+      <ConfigKey persist="true"><Variable name="ConfigKey"/></ConfigKey>
       <ButtonState>LeftButton</ButtonState>
     </Connection>
     <Connection>
-      <ConfigKey><Variable name="ConfigKeyRight"/></ConfigKey>
+      <ConfigKey persist="true"><Variable name="ConfigKeyRight"/></ConfigKey>
       <ButtonState>RightButton</ButtonState>
     </Connection>
   </PushButton>
diff --git a/res/skins/Tango/button_2state.xml b/res/skins/Tango/button_2state.xml
index 92e7ccb48216..da312ddd750c 100644
--- a/res/skins/Tango/button_2state.xml
+++ b/res/skins/Tango/button_2state.xml
@@ -3,7 +3,7 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
diff --git a/res/skins/Tango/button_2state_display.xml b/res/skins/Tango/button_2state_display.xml
index d42669f6d79a..62b6e57b57f4 100644
--- a/res/skins/Tango/button_2state_display.xml
+++ b/res/skins/Tango/button_2state_display.xml
@@ -3,7 +3,7 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
diff --git a/res/skins/Tango/button_4state_persist.xml b/res/skins/Tango/button_2state_highlight.xml
similarity index 60%
rename from res/skins/Tango/button_4state_persist.xml
rename to res/skins/Tango/button_2state_highlight.xml
index 41b86d93005d..619b8beadc95 100644
--- a/res/skins/Tango/button_4state_persist.xml
+++ b/res/skins/Tango/button_2state_highlight.xml
@@ -3,52 +3,43 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
   state_X_pressed   : background graphic for pressed state X
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
-  ConfigKeyPerm     : persistent left-click control
+  ConfigKey         : left-click control
+  ConfigKeyDisp     : display control
 -->
 <Template>
   <PushButton>
     <TooltipId><Variable name="TooltipId"/></TooltipId>
     <ObjectName><Variable name="ObjectName"/></ObjectName>
     <Size><Variable name="Size"/></Size>
-    <NumberStates>4</NumberStates>
+    <NumberStates>2</NumberStates>
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
       <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
       <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
-      <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
       <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
       <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
-      <Alignment><Variable name="Align"/></Alignment>
-    </State>
-    <State>
-      <Number>2</Number>
-      <Text><Variable name="state_2_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_unpressed"/></Unpressed>
-      <Alignment><Variable name="Align"/></Alignment>
-    </State>
-    <State>
-      <Number>3</Number>
-      <Text><Variable name="state_3_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_3_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_3_unpressed"/></Unpressed>
-      <Alignment><Variable name="Align"/></Alignment>
     </State>
     <Connection>
-      <ConfigKey persist="true"><Variable name="ConfigKeyPerm"/></ConfigKey>
+      <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
       <ButtonState>LeftButton</ButtonState>
     </Connection>
+    <Connection>
+      <ConfigKey><Variable name="HighlightKey"/></ConfigKey>
+      <BindProperty>highlight</BindProperty>
+    </Connection>
   </PushButton>
 </Template>
diff --git a/res/skins/Tango/button_2state_persist.xml b/res/skins/Tango/button_2state_persist.xml
index 383f457baf11..8f41af8cc0a0 100644
--- a/res/skins/Tango/button_2state_persist.xml
+++ b/res/skins/Tango/button_2state_persist.xml
@@ -3,14 +3,14 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
   state_X_pressed   : background graphic for pressed state X
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
-  ConfigKeyPerm     : persistent left-click control
+  ConfigKey         : persistent left-click control
 -->
 <Template>
   <PushButton>
@@ -33,7 +33,7 @@ Variables:
       <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
     </State>
     <Connection>
-      <ConfigKey persist="true"><Variable name="ConfigKeyPerm"/></ConfigKey>
+      <ConfigKey persist="true"><Variable name="ConfigKey"/></ConfigKey>
       <ButtonState>LeftButton</ButtonState>
     </Connection>
   </PushButton>
diff --git a/res/skins/Tango/button_2state_right.xml b/res/skins/Tango/button_2state_right.xml
index d079af51f99e..d6bfec8d11a0 100644
--- a/res/skins/Tango/button_2state_right.xml
+++ b/res/skins/Tango/button_2state_right.xml
@@ -3,7 +3,7 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
@@ -11,7 +11,7 @@ Variables:
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
   ConfigKey         : left-click control
-  ConfigKeyRight    : left-click control
+  ConfigKeyRight    : right-click control
 -->
 <Template>
   <PushButton>
diff --git a/res/skins/Tango/button_2state_right_display.xml b/res/skins/Tango/button_2state_right_display.xml
index b41695a5e1cd..b0930d9485a7 100644
--- a/res/skins/Tango/button_2state_right_display.xml
+++ b/res/skins/Tango/button_2state_right_display.xml
@@ -3,7 +3,7 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
@@ -11,7 +11,7 @@ Variables:
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
   ConfigKey         : left-click control
-  ConfigKeyRight    : persistent left-click control
+  ConfigKeyRight    : right-click control
   ConfigKeyDisp     : display control
 -->
 <Template>
diff --git a/res/skins/Tango/button_3state.xml b/res/skins/Tango/button_3state.xml
index 76ddb9fc440f..ca996475141c 100644
--- a/res/skins/Tango/button_3state.xml
+++ b/res/skins/Tango/button_3state.xml
@@ -3,7 +3,7 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
diff --git a/res/skins/Tango/button_3state_display.xml b/res/skins/Tango/button_3state_display.xml
index 7897273d7053..c8d60c8cc91d 100644
--- a/res/skins/Tango/button_3state_display.xml
+++ b/res/skins/Tango/button_3state_display.xml
@@ -3,7 +3,7 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
@@ -46,7 +46,7 @@ Variables:
       <ButtonState>LeftButton</ButtonState>
     </Connection>
     <Connection>
-      <ConfigKey persist="true"><Variable name="ConfigKeyDisp"/></ConfigKey>
+      <ConfigKey><Variable name="ConfigKeyDisp"/></ConfigKey>
       <ConnectValueFromWidget>false</ConnectValueFromWidget>
     </Connection>
   </PushButton>
diff --git a/res/skins/Tango/button_3state_persist.xml b/res/skins/Tango/button_3state_persist.xml
index 869609eb9878..88ef95208307 100644
--- a/res/skins/Tango/button_3state_persist.xml
+++ b/res/skins/Tango/button_3state_persist.xml
@@ -3,14 +3,14 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
   state_X_pressed   : background graphic for pressed state X
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
-  ConfigKeyPerm     : persistent left-click control
+  ConfigKey         : persistent left-click control
 -->
 <Template>
   <PushButton>
@@ -40,7 +40,7 @@ Variables:
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <Connection>
-      <ConfigKey persist="true"><Variable name="ConfigKeyPerm"/></ConfigKey>
+      <ConfigKey persist="true"><Variable name="ConfigKey"/></ConfigKey>
       <ButtonState>LeftButton</ButtonState>
     </Connection>
   </PushButton>
diff --git a/res/skins/Tango/button_4state_display.xml b/res/skins/Tango/button_4state_display.xml
index 6acaf65c3bd2..a41013949f00 100644
--- a/res/skins/Tango/button_4state_display.xml
+++ b/res/skins/Tango/button_4state_display.xml
@@ -3,7 +3,7 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
diff --git a/res/skins/Tango/button_5state.xml b/res/skins/Tango/button_5state.xml
index 37855219e1bb..74a0dfb71412 100644
--- a/res/skins/Tango/button_5state.xml
+++ b/res/skins/Tango/button_5state.xml
@@ -3,7 +3,7 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
diff --git a/res/skins/Tango/button_beatjump.xml b/res/skins/Tango/button_beatjump.xml
deleted file mode 100644
index 23954b516f9a..000000000000
--- a/res/skins/Tango/button_beatjump.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
-Description:
-  An individual beatjump button:
-  * size display
-    left-click  : double beatjump size
-    right-click : halve beatjump size
-  * button to jump backward by beatjump size
-  * button to jump forward by beatjump size
-Variables:
-  group                 : [ChannelN]
-  BeatjumpLength_Text   : jump distance as text
-  BeatjumpLength_Control: jump distance as config value
--->
-<Template>
-  <WidgetGroup>
-    <ObjectName>LoopBeatJumpContainer</ObjectName>
-    <Layout>vertical</Layout>
-    <Children>
-    
-      <Template src="skin:button_1state_right.xml">
-        <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
-        <SetVariable name="Size">50f,22f</SetVariable>
-        <SetVariable name="state_0_text"><Variable name="BeatjumpLength_Text"/></SetVariable>
-        <SetVariable name="ConfigKey">[BeatJump],next</SetVariable>
-        <SetVariable name="ConfigKeyRight">[BeatJump],prev</SetVariable>
-      </Template>
-      
-        <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
-      
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:button_1state.xml">
-            <SetVariable name="TooltipId">beatjump_backward</SetVariable>
-            <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
-            <SetVariable name="Size">24f,22f</SetVariable>
-            <SetVariable name="state_0_pressed">backward_pressed.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">backward.svg</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,beatjump_<Variable name="BeatjumpLength_Control"/>_backward</SetVariable>
-          </Template>
-            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-          <Template src="skin:button_1state.xml">
-            <SetVariable name="TooltipId">beatjump_forward</SetVariable>
-            <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
-            <SetVariable name="Size">25f,22f</SetVariable>
-            <SetVariable name="state_0_pressed">forward_pressed.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">forward.svg</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,beatjump_<Variable name="BeatjumpLength_Control"/>_forward</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Tango/button_hotcue_deck.xml b/res/skins/Tango/button_hotcue_deck.xml
index a24a1846fedf..e2aa1130fe73 100644
--- a/res/skins/Tango/button_hotcue_deck.xml
+++ b/res/skins/Tango/button_hotcue_deck.xml
@@ -1,7 +1,8 @@
 <!--
 Description:
   A HotCue button for regular decks only.
-  Left-click activates/recalls HotCue, right-click deletes it
+  Left-click activates/recalls HotCue, right-click deletes it.
+  Can be squeezed to make room for more deck controls, or star rating widget.
 Variables:
   group : [ChannelN]
   HotCue: hotcue number
diff --git a/res/skins/Tango/button_loop.xml b/res/skins/Tango/button_loop.xml
deleted file mode 100644
index 234151be8b6d..000000000000
--- a/res/skins/Tango/button_loop.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-Description:
-  An individual beatloop button.
-Variables:
-  group             : [ChannelN]
-  LoopLength_Text   : length of the beat loop as text
-  LoopLength_Control: length of the beatloop as config value
--->
-<Template>
-  <Template src="skin:button_2state_right_display.xml">
-    <SetVariable name="TooltipId">beatloop_toggle</SetVariable>
-    <SetVariable name="ObjectName">LoopSizeButton</SetVariable>
-    <SetVariable name="Size">22f,22f</SetVariable>
-    <SetVariable name="state_0_text"><Variable name="LoopLength_Text"/></SetVariable>
-    <SetVariable name="state_1_text"><Variable name="LoopLength_Text"/></SetVariable>
-    <SetVariable name="ConfigKey"><Variable name="group"/>,beatloop_<Variable name="LoopLength_Control"/>_toggle</SetVariable>
-    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatlooproll_<Variable name="LoopLength_Control"/>_activate</SetVariable>
-    <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,beatloop_<Variable name="LoopLength_Control"/>_enabled</SetVariable>
-  </Template>
-</Template>
diff --git a/res/skins/Tango/button_loopmove.xml b/res/skins/Tango/button_loopmove.xml
deleted file mode 100644
index 7ea124a1fdb2..000000000000
--- a/res/skins/Tango/button_loopmove.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<!--
-Description:
-  An individual loopmove button:
-  * size display
-    left-click  : double loopmove size
-    right-click : halve loopmove size
-  * button to move backward by loopmove size
-  * button to move forward by loopmove size
-Variables:
-  group                   : [ChannelN]
-  LoopMoveLength_Text     : move distance as text
-  LoopMoveLength_Control  : move distance as config value
--->
-<Template>
-  <WidgetGroup>
-    <ObjectName>LoopBeatJumpContainer</ObjectName>
-    <Layout>vertical</Layout>
-    <!-- For some reason this button expands when SizePolicy is 'min,min',
-      although it's identical to button_beatjump.xml -->
-    <SizePolicy>min,min</SizePolicy>
-    <Children>
-    
-      <Template src="skin:button_1state_right.xml">
-        <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
-        <SetVariable name="Size">45f,22f</SetVariable>
-        <SetVariable name="state_0_text"><Variable name="LoopMoveLength_Text"/></SetVariable>
-        <SetVariable name="ConfigKey">[LoopMove],next</SetVariable>
-        <SetVariable name="ConfigKeyRight">[LoopMove],prev</SetVariable>
-      </Template>
-      
-        <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
-        
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:button_1state.xml">
-            <SetVariable name="TooltipId">loop_move_backward</SetVariable>
-            <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
-            <SetVariable name="Size">22f,22f</SetVariable>
-            <SetVariable name="state_0_pressed">backward_pressed.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">backward.svg</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,loop_move_<Variable name="LoopMoveLength_Control"/>_backward</SetVariable>
-          </Template>
-            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-          <Template src="skin:button_1state.xml">
-            <SetVariable name="TooltipId">loop_move_forward</SetVariable>
-            <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
-            <SetVariable name="Size">22f,22f</SetVariable>
-            <SetVariable name="state_0_pressed">forward_pressed.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">forward.svg</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,loop_move_<Variable name="LoopMoveLength_Control"/>_forward</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Tango/button_loopsize.xml b/res/skins/Tango/button_loopsize.xml
index 62625e67cd29..db51c07eb386 100644
--- a/res/skins/Tango/button_loopsize.xml
+++ b/res/skins/Tango/button_loopsize.xml
@@ -8,13 +8,13 @@ Variables:
 -->
 <Template>
   <Template src="skin:button_2state_right_display.xml">
-    <SetVariable name="TooltipId">beatloop_toggle</SetVariable>
+    <SetVariable name="TooltipId">beatloop_activate</SetVariable>
     <SetVariable name="ObjectName">LoopSizeButton</SetVariable>
     <SetVariable name="Size">22f,21f</SetVariable>
     <SetVariable name="state_0_text"><Variable name="LoopLength_Text"/></SetVariable>
     <SetVariable name="state_1_text"><Variable name="LoopLength_Text"/></SetVariable>
     <SetVariable name="ConfigKey"><Variable name="group"/>,beatloop_<Variable name="LoopLength_Control"/>_toggle</SetVariable>
-    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatloop_<Variable name="LoopLength_Control"/>_activate</SetVariable>
+    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatlooproll_<Variable name="LoopLength_Control"/>_activate</SetVariable>
     <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,beatloop_<Variable name="LoopLength_Control"/>_enabled</SetVariable>
   </Template>
 </Template>
diff --git a/res/skins/Tango/buttons/btn_ b/res/skins/Tango/buttons/btn_
deleted file mode 100644
index e80aa95aa378..000000000000
--- a/res/skins/Tango/buttons/btn_
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="1"
-   height="1"
-   viewBox="0 0 1 1"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview7"
-     showgrid="false"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:zoom="181.01934"
-     inkscape:cx="3.1991872"
-     inkscape:cy="1.3653741"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1-3"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer#1"
-     transform="translate(0,-47)">
-    <g
-       style="fill-rule:evenodd"
-       id="layer1-3"
-       transform="matrix(0.05269352,0,0,0.05273213,7.0048322,-14.498287)" />
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_.svg b/res/skins/Tango/buttons/btn_.svg
index e80aa95aa378..c886185764a4 100644
--- a/res/skins/Tango/buttons/btn_.svg
+++ b/res/skins/Tango/buttons/btn_.svg
@@ -1,68 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="1"
-   height="1"
-   viewBox="0 0 1 1"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview7"
-     showgrid="false"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:zoom="181.01934"
-     inkscape:cx="3.1991872"
-     inkscape:cy="1.3653741"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1-3"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer#1"
-     transform="translate(0,-47)">
-    <g
-       style="fill-rule:evenodd"
-       id="layer1-3"
-       transform="matrix(0.05269352,0,0,0.05273213,7.0048322,-14.498287)" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="1" height="1" viewBox="0 0 1 1"/>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_1x1_blank.png b/res/skins/Tango/buttons/btn_1x1_blank.png
deleted file mode 100644
index 6797b89e65dc..000000000000
Binary files a/res/skins/Tango/buttons/btn_1x1_blank.png and /dev/null differ
diff --git a/res/skins/Tango/buttons/btn_1x1_blank.svg b/res/skins/Tango/buttons/btn_1x1_blank.svg
deleted file mode 100644
index 1b611dbe7d5f..000000000000
--- a/res/skins/Tango/buttons/btn_1x1_blank.svg
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="1"
-   height="1"
-   viewBox="0 0 1 1"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_1x1_blank.svg"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview7"
-     showgrid="false"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:zoom="8"
-     inkscape:cx="49.86648"
-     inkscape:cy="19.762899"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1-3"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer#1"
-     transform="translate(0,-47)">
-    <g
-       style="fill-rule:evenodd"
-       id="layer1-3"
-       transform="matrix(0.05269352,0,0,0.05273213,7.0048322,-14.498287)" />
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_2decks.svg b/res/skins/Tango/buttons/btn_2decks.svg
index d5b29a518dbc..32710aed6656 100644
--- a/res/skins/Tango/buttons/btn_2decks.svg
+++ b/res/skins/Tango/buttons/btn_2decks.svg
@@ -1,84 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="20"
-   height="20"
-   viewBox="0 0 20 20"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_4decks.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview7"
-     showgrid="false"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:zoom="16"
-     inkscape:cx="3.9817897"
-     inkscape:cy="5.0414764"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer2"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="ON"
-     style="display:inline"
-     transform="translate(0,-28)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 3,31 0,2 6.15625,0 0,-2 L 3,31 z m 7.84375,0 0,2 6.15625,0 0,-2 -6.15625,0 z"
-       id="rect2983"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2983-6"
-       width="14"
-       height="6"
-       x="2.9999998"
-       y="38.999996" />
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       d="m 3,35 0,2 6.15625,0 0,-2 L 3,35 z m 7.84375,0 0,2 6.15625,0 0,-2 -6.15625,0 z"
-       id="rect2983-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><g fill="#888"><path d="M3 3v2h6.15625V3H3zm7.84375 0v2H17V3h-6.15625zM2.9999998 10.999996h14v6h-14zM3 7v2h6.15625V7H3zm7.84375 0v2H17V7h-6.15625z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_4decks.svg b/res/skins/Tango/buttons/btn_4decks.svg
index bb319418773a..ed152bc4e9df 100644
--- a/res/skins/Tango/buttons/btn_4decks.svg
+++ b/res/skins/Tango/buttons/btn_4decks.svg
@@ -1,79 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="20"
-   height="20"
-   viewBox="0 0 20 20"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_2decks.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview7"
-     showgrid="false"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:zoom="16"
-     inkscape:cx="3.9817897"
-     inkscape:cy="5.0414764"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer2"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="ON"
-     style="display:inline"
-     transform="translate(0,-28)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 3,31 0,2 6.15625,0 0,-2 L 3,31 z m 7.84375,0 0,2 6.15625,0 0,-2 -6.15625,0 z"
-       id="rect2983"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2983-6"
-       width="14"
-       height="10"
-       x="2.9999998"
-       y="34.999996" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><g fill="#888"><path d="M3 3v2h6.15625V3H3zm7.84375 0v2H17V3h-6.15625zM2.9999998 6.999996h14v10h-14z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_down.svg b/res/skins/Tango/buttons/btn_arrow_down.svg
index b90fca5069db..608743553d7c 100644
--- a/res/skins/Tango/buttons/btn_arrow_down.svg
+++ b/res/skins/Tango/buttons/btn_arrow_down.svg
@@ -1,87 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="18"
-   id="svg3769"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_arrow_down.svg">
-  <defs
-     id="defs3771" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="15.246759"
-     inkscape:cy="8.3778655"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-page="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true">
-    <sodipodi:guide
-       orientation="0,1"
-       position="13.196138,9"
-       id="guide2983" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="9,10"
-       id="guide2985" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.224983"
-       id="guide3166" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3774">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 9.0003033,1048.2803 4.5715187,-7.9181 -9.1430385,0 z"
-       id="path3018"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-y="0.57041933" />
-    <path
-       style="color:#000000;fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 9 0 C 4.0294373 0 0 4.0294 0 9 C 0 13.9706 4.0294373 18 9 18 C 11.55716 18 13.861527 16.931175 15.5 15.21875 L 15.5 13.65625 C 14.04822 15.679076 11.679878 17 9 17 C 4.581722 17 1 13.4183 1 9 C 1 4.5817 4.581722 1 9 1 C 11.679878 1 14.04822 2.3209236 15.5 4.34375 L 15.5 2.78125 C 13.861527 1.0688246 11.55716 0 9 0 z "
-       transform="translate(0,1034.3622)"
-       id="path3056" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="13" viewBox="0 0 16 13"><path d="M13.858667 2L7.999999 7.8586674 2.141333 2 .676666 3.464667l5.858666 5.858666L7.999999 10.788l1.464668-1.464667 5.858667-5.858666L13.858667 2z" fill="#888"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_down_black.svg b/res/skins/Tango/buttons/btn_arrow_down_black.svg
new file mode 100644
index 000000000000..86dc4f1dca90
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_arrow_down_black.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="13" viewBox="0 0 16 13"><path d="M13.858667 2L7.999999 7.8586674 2.141333 2 .676666 3.464667l5.858666 5.858666L7.999999 10.788l1.464668-1.464667 5.858667-5.858666L13.858667 2z" fill="#151515"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_down_black_hover.svg b/res/skins/Tango/buttons/btn_arrow_down_black_hover.svg
new file mode 100644
index 000000000000..9d44aad060dd
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_arrow_down_black_hover.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="13" viewBox="0 0 16 13"><path d="M13.8588 3.5L7.999999 9.3586674 2.1412002 3.5.6765 4.964667l5.8587988 5.858666L7.999999 12.288 9.4647 10.823333l5.8588-5.858666L13.8588 3.5z" fill="#151515"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_down_hover.svg b/res/skins/Tango/buttons/btn_arrow_down_hover.svg
index 00104fb0cf73..24e56204a366 100644
--- a/res/skins/Tango/buttons/btn_arrow_down_hover.svg
+++ b/res/skins/Tango/buttons/btn_arrow_down_hover.svg
@@ -1,87 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="18"
-   id="svg3769"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_arrow_down_hover.svg">
-  <defs
-     id="defs3771" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="8.3303708"
-     inkscape:cy="-2.0446528"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-page="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true">
-    <sodipodi:guide
-       orientation="0,1"
-       position="13.196138,9"
-       id="guide2983" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="9,10"
-       id="guide2985" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.224983"
-       id="guide3166" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3774">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 9.0003033,1048.2803 4.5715187,-7.9181 -9.1430385,0 z"
-       id="path3018"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-y="0.57041933" />
-    <path
-       style="color:#000000;fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 9 0 C 4.0294373 0 0 4.0294 0 9 C 0 13.9706 4.0294373 18 9 18 C 11.55716 18 13.861527 16.931175 15.5 15.21875 L 15.5 13.65625 C 14.04822 15.679076 11.679878 17 9 17 C 4.581722 17 1 13.4183 1 9 C 1 4.5817 4.581722 1 9 1 C 11.679878 1 14.04822 2.3209236 15.5 4.34375 L 15.5 2.78125 C 13.861527 1.0688246 11.55716 0 9 0 z "
-       transform="translate(0,1034.3622)"
-       id="path3056" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="13" viewBox="0 0 16 13"><path d="M13.8588 3.5L7.999999 9.3586674 2.1412002 3.5.6765 4.964667l5.8587988 5.858666L7.999999 12.288 9.4647 10.823333l5.8588-5.858666L13.8588 3.5z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_down_thin.svg b/res/skins/Tango/buttons/btn_arrow_down_thin.svg
deleted file mode 100644
index 61a0bcbd9543..000000000000
--- a/res/skins/Tango/buttons/btn_arrow_down_thin.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="22"
-   height="13"
-   viewBox="0 0 22 13"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_up_thin.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="5.656854"
-     inkscape:cx="-3.783637"
-     inkscape:cy="-7.6448263"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="false" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-35)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <path
-     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 16.858667,2 10.999999,7.8586674 5.141333,2 3.676666,3.464667 9.535332,9.323333 10.999999,10.788 12.464667,9.323333 18.323334,3.464667 16.858667,2 z"
-     id="rect2987-7-3"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/res/skins/Tango/buttons/btn_arrow_down_thin_hover.svg b/res/skins/Tango/buttons/btn_arrow_down_thin_hover.svg
deleted file mode 100644
index b8c642078420..000000000000
--- a/res/skins/Tango/buttons/btn_arrow_down_thin_hover.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="22"
-   height="13"
-   viewBox="0 0 22 13"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_down_thin_hover.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="15.999999"
-     inkscape:cx="3.4966484"
-     inkscape:cy="-2.4180824"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="false" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-35)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <path
-     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 16.858966,3.5 11.000165,9.3586674 5.1413662,3.5 3.676666,4.964667 9.5354648,10.823333 11.000165,12.288 12.464866,10.823333 18.323666,4.964667 16.858966,3.5 z"
-     id="rect2987-7-3"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/res/skins/Tango/buttons/btn_arrow_downleft.svg b/res/skins/Tango/buttons/btn_arrow_downleft.svg
new file mode 100644
index 000000000000..3eb43f74f428
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_arrow_downleft.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="32" viewBox="0 0 12 32"><path d="M10 8.4l-6.4000005.000001L3.6000005 2H2v8h8V8.4z" fill="#888"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_downleft_hover.svg b/res/skins/Tango/buttons/btn_arrow_downleft_hover.svg
new file mode 100644
index 000000000000..72f8716f6ea7
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_arrow_downleft_hover.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="32" viewBox="0 0 12 32"><path d="M9 9.4l-6.4000005.000001L2.6000005 3H1v8h8V9.4z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_downleft_thin.svg b/res/skins/Tango/buttons/btn_arrow_downleft_thin.svg
deleted file mode 100644
index f7e6a0191041..000000000000
--- a/res/skins/Tango/buttons/btn_arrow_downleft_thin.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="12"
-   height="32"
-   viewBox="0 0 12 32"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_arrow_downleft_thin_hover.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="7.9999999"
-     inkscape:cx="7.8060457"
-     inkscape:cy="23.10092"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-16)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <path
-     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 10,8.4 3.5999995,8.400001 3.6000005,2 2,2 2,8.4 2,10 3.6000005,10 10,10 10,8.4 z"
-     id="rect2987-7-3"
-     inkscape:connector-curvature="0"
-     inkscape:transform-center-x="-3.9999996"
-     inkscape:transform-center-y="-4.0000001" />
-</svg>
diff --git a/res/skins/Tango/buttons/btn_arrow_downleft_thin_hover.svg b/res/skins/Tango/buttons/btn_arrow_downleft_thin_hover.svg
deleted file mode 100644
index 12f19fc140cf..000000000000
--- a/res/skins/Tango/buttons/btn_arrow_downleft_thin_hover.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="12"
-   height="32"
-   viewBox="0 0 12 32"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_arrow_downleft_thin.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="7.9999999"
-     inkscape:cx="7.8060457"
-     inkscape:cy="23.10092"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-16)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <path
-     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 9,9.4 2.5999995,9.400001 2.6000005,3 1,3 1,9.4 1,11 2.6000005,11 9,11 9,9.4 z"
-     id="rect2987-7-3"
-     inkscape:connector-curvature="0"
-     inkscape:transform-center-x="-3.9999996"
-     inkscape:transform-center-y="-4.0000001" />
-</svg>
diff --git a/res/skins/Tango/buttons/btn_arrow_left.svg b/res/skins/Tango/buttons/btn_arrow_left.svg
index 855c891cf9a0..43c9c54268f4 100644
--- a/res/skins/Tango/buttons/btn_arrow_left.svg
+++ b/res/skins/Tango/buttons/btn_arrow_left.svg
@@ -1,73 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg3769"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_left.svg">
-  <defs
-     id="defs3771" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="0.10730634"
-     inkscape:cy="13.835582"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata3774">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1032.3622)">
-    <path
-       sodipodi:type="star"
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3018"
-       sodipodi:sides="3"
-       sodipodi:cx="3"
-       sodipodi:cy="5"
-       sodipodi:r1="15.119611"
-       sodipodi:r2="7.5598059"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 18.119611,5 -22.6794164,13.093967 0,-26.187934 z"
-       transform="matrix(-0.45822504,0,0,0.45822504,13.106721,1040.0711)"
-       inkscape:transform-center-x="1.7320465" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="11" height="22" viewBox="0 0 11 22"><path d="M8.8941125 15.525483L4.3686285 11l4.525484-4.5254834-1.131371-1.1313708-4.525483 4.5254828L2.1058875 11l1.131371 1.131371 4.525483 4.525483 1.131371-1.131371z" fill="#888"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_left_black.svg b/res/skins/Tango/buttons/btn_arrow_left_black.svg
new file mode 100644
index 000000000000..f319e4e8fdcf
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_arrow_left_black.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="11" height="22" viewBox="0 0 11 22"><path d="M8.8941125 15.525483L4.3686285 11l4.525484-4.5254834-1.131371-1.1313708-4.525483 4.5254828L2.1058875 11l1.131371 1.131371 4.525483 4.525483 1.131371-1.131371z" fill="#151515"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_left_black_hover.svg b/res/skins/Tango/buttons/btn_arrow_left_black_hover.svg
new file mode 100644
index 000000000000..58a4725c0b50
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_arrow_left_black_hover.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="11" height="22" viewBox="0 0 11 22"><path d="M7.894225 15.525483L3.368741 11l4.525484-4.5254834-1.131371-1.1313708-4.525483 4.5254828L1.106 11l1.131371 1.131371 4.525483 4.525483 1.131371-1.131371z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_left_hover.svg b/res/skins/Tango/buttons/btn_arrow_left_hover.svg
index 415e63fc018f..d0a5318b025b 100644
--- a/res/skins/Tango/buttons/btn_arrow_left_hover.svg
+++ b/res/skins/Tango/buttons/btn_arrow_left_hover.svg
@@ -1,73 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg3769"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_left_hover.svg">
-  <defs
-     id="defs3771" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="-0.7121887"
-     inkscape:cy="2.8858767"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata3774">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1032.3622)">
-    <path
-       sodipodi:type="star"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3018"
-       sodipodi:sides="3"
-       sodipodi:cx="3"
-       sodipodi:cy="5"
-       sodipodi:r1="15.119611"
-       sodipodi:r2="7.5598059"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 18.119611,5 -22.6794164,13.093967 0,-26.187934 z"
-       transform="matrix(-0.45822504,0,0,0.45822504,11.106721,1040.0711)"
-       inkscape:transform-center-x="1.7320465" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="11" height="22" viewBox="0 0 11 22"><path d="M7.894225 15.525483L3.368741 11l4.525484-4.5254834-1.131371-1.1313708-4.525483 4.5254828L1.106 11l1.131371 1.131371 4.525483 4.525483 1.131371-1.131371z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_left_thin.svg b/res/skins/Tango/buttons/btn_arrow_left_thin.svg
deleted file mode 100644
index b9833101bd2d..000000000000
--- a/res/skins/Tango/buttons/btn_arrow_left_thin.svg
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="11"
-   height="22"
-   viewBox="0 0 11 22"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_collapse.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="13.146541"
-     inkscape:cy="-3.6507576"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-26)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <path
-     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="m -15.5,6 0,4 -4,0 0,2 4,0 0,4 2,0 0,-4 4,0 0,-2 -4,0 0,-4 -2,0 z"
-     id="rect2987"
-     inkscape:connector-curvature="0" />
-  <path
-     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="m -8.4653586,-5.440233 -5.6568554,-5.656854 5.6568554,-5.656854 -1.414214,-1.414214 -5.6568544,5.656854 -1.414214,1.414214 1.414214,1.414214 5.6568544,5.656854 1.414214,-1.414214 z"
-     id="rect2987-7"
-     inkscape:connector-curvature="0" />
-  <path
-     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 8.8941125,15.525483 4.3686285,11 8.8941125,6.4745166 7.7627415,5.3431458 3.2372585,9.8686286 2.1058875,11 l 1.131371,1.131371 4.525483,4.525483 1.131371,-1.131371 z"
-     id="rect2987-7-3"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/res/skins/Tango/buttons/btn_arrow_left_thin_hover.svg b/res/skins/Tango/buttons/btn_arrow_left_thin_hover.svg
deleted file mode 100644
index 74d34df83215..000000000000
--- a/res/skins/Tango/buttons/btn_arrow_left_thin_hover.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="11"
-   height="22"
-   viewBox="0 0 11 22"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_left_thin.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="-14.519012"
-     inkscape:cy="-3.6507576"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-26)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <path
-     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 7.894225,15.525483 3.368741,11 7.894225,6.4745166 6.762854,5.3431458 2.237371,9.8686286 1.106,11 l 1.131371,1.131371 4.525483,4.525483 1.131371,-1.131371 z"
-     id="rect2987-7-3"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/res/skins/Tango/buttons/btn_arrow_right.svg b/res/skins/Tango/buttons/btn_arrow_right.svg
index 35ed505456f1..55565efdd520 100644
--- a/res/skins/Tango/buttons/btn_arrow_right.svg
+++ b/res/skins/Tango/buttons/btn_arrow_right.svg
@@ -1,73 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg3769"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_right.svg">
-  <defs
-     id="defs3771" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="16.433248"
-     inkscape:cy="13.806939"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata3774">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1032.3622)">
-    <path
-       sodipodi:type="star"
-       style="fill:#888888;fill-opacity:0.94117647;fill-rule:nonzero;stroke:none"
-       id="path3018"
-       sodipodi:sides="3"
-       sodipodi:cx="3"
-       sodipodi:cy="5"
-       sodipodi:r1="15.119611"
-       sodipodi:r2="7.5598059"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 18.119611,5 -22.6794164,13.093967 0,-26.187934 z"
-       transform="matrix(0.45822504,0,0,0.45822504,6.8932788,1040.0711)"
-       inkscape:transform-center-x="-1.7320461" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="11" height="22" viewBox="0 0 11 22"><path d="M2.1058875 6.4745169L6.6313715 11l-4.525484 4.525483 1.131371 1.131371 4.525483-4.525483L8.8941125 11l-1.131371-1.1313711-4.525483-4.525483-1.131371 1.131371z" fill="#888"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_right_black.svg b/res/skins/Tango/buttons/btn_arrow_right_black.svg
new file mode 100644
index 000000000000..adcab7894260
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_arrow_right_black.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="11" height="22" viewBox="0 0 11 22"><path d="M2.1058875 6.4745169L6.6313715 11l-4.525484 4.525483 1.131371 1.131371 4.525483-4.525483L8.8941125 11l-1.131371-1.1313711-4.525483-4.525483-1.131371 1.131371z" fill="#151515"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_right_black_hover.svg b/res/skins/Tango/buttons/btn_arrow_right_black_hover.svg
new file mode 100644
index 000000000000..d033b56bcea1
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_arrow_right_black_hover.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="11" height="22" viewBox="0 0 11 22"><path d="M3.106 6.4745169L7.631484 11 3.106 15.525483l1.131371 1.131371 4.525483-4.525483L9.894225 11 8.762854 9.8686289l-4.525483-4.525483L3.106 6.4745169z" fill="#0f0f0f"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_right_hover.svg b/res/skins/Tango/buttons/btn_arrow_right_hover.svg
index 2dc74c0ac4d0..5d04f10777c7 100644
--- a/res/skins/Tango/buttons/btn_arrow_right_hover.svg
+++ b/res/skins/Tango/buttons/btn_arrow_right_hover.svg
@@ -1,73 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg3769"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_right_hover.svg">
-  <defs
-     id="defs3771" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="42.875"
-     inkscape:cy="26.755249"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata3774">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1032.3622)">
-    <path
-       sodipodi:type="star"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3018"
-       sodipodi:sides="3"
-       sodipodi:cx="3"
-       sodipodi:cy="5"
-       sodipodi:r1="15.119611"
-       sodipodi:r2="7.5598059"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 18.119611,5 -22.6794164,13.093967 0,-26.187934 z"
-       transform="matrix(0.45822504,0,0,0.45822504,8.8932788,1040.0711)"
-       inkscape:transform-center-x="-1.7320461" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="11" height="22" viewBox="0 0 11 22"><path d="M3.106 6.4745169L7.631484 11 3.106 15.525483l1.131371 1.131371 4.525483-4.525483L9.894225 11 8.762854 9.8686289l-4.525483-4.525483L3.106 6.4745169z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_right_thin.svg b/res/skins/Tango/buttons/btn_arrow_right_thin.svg
deleted file mode 100644
index 6c6f3169ec7e..000000000000
--- a/res/skins/Tango/buttons/btn_arrow_right_thin.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="11"
-   height="22"
-   viewBox="0 0 11 22"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_collapse.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="13.146541"
-     inkscape:cy="-3.6507576"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-26)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <path
-     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 2.1058875,6.4745169 6.6313715,11 2.1058875,15.525483 3.2372585,16.656854 7.7627415,12.131371 8.8941125,11 7.7627415,9.8686289 3.2372585,5.3431459 2.1058875,6.4745169 z"
-     id="rect2987-7-3"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/res/skins/Tango/buttons/btn_arrow_right_thin_hover.svg b/res/skins/Tango/buttons/btn_arrow_right_thin_hover.svg
deleted file mode 100644
index d9d65da8976a..000000000000
--- a/res/skins/Tango/buttons/btn_arrow_right_thin_hover.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="11"
-   height="22"
-   viewBox="0 0 11 22"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_right_thin.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="22.627417"
-     inkscape:cx="0.43414043"
-     inkscape:cy="7.1418742"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-26)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <path
-     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 3.106,6.4745169 7.631484,11 3.106,15.525483 4.237371,16.656854 8.762854,12.131371 9.894225,11 8.762854,9.8686289 4.237371,5.3431459 3.106,6.4745169 z"
-     id="rect2987-7-3"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/res/skins/Tango/buttons/btn_arrow_up.svg b/res/skins/Tango/buttons/btn_arrow_up.svg
index c0690b33ac2a..8c56c1adf8d5 100644
--- a/res/skins/Tango/buttons/btn_arrow_up.svg
+++ b/res/skins/Tango/buttons/btn_arrow_up.svg
@@ -1,87 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="18"
-   id="svg3769"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_arrow_down.svg">
-  <defs
-     id="defs3771" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="15.246759"
-     inkscape:cy="8.3778655"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-page="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true">
-    <sodipodi:guide
-       orientation="0,1"
-       position="13.196138,9"
-       id="guide2983" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="9,10"
-       id="guide2985" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.224983"
-       id="guide3166" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3774">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 8.9996967,1038.4441 -4.5715187,7.9181 9.143038,0 z"
-       id="path3018"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-y="-0.57041933" />
-    <path
-       style="color:#000000;fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 9,1052.3622 c 4.970563,0 9,-4.0294 9,-9 0,-4.9706 -4.029437,-9 -9,-9 -2.55716,0 -4.861527,1.0688 -6.5,2.7813 l 0,1.5625 c 1.45178,-2.0229 3.820122,-3.3438 6.5,-3.3438 4.418278,0 8,3.5817 8,8 0,4.4183 -3.581722,8 -8,8 -2.679878,0 -5.04822,-1.3209 -6.5,-3.3437 l 0,1.5625 c 1.638473,1.7124 3.94284,2.7812 6.5,2.7812 z"
-       id="path3056"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="13" viewBox="0 0 16 13"><path d="M2.1413332 11l5.8586676-5.8586674L13.858667 11l1.464667-1.464667-5.8586662-5.858666L8.0000008 2.212 6.5353324 3.676667.6766662 9.535333 2.1413332 11z" fill="#888"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_up_black.svg b/res/skins/Tango/buttons/btn_arrow_up_black.svg
new file mode 100644
index 000000000000..ebdf7791e269
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_arrow_up_black.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="13" viewBox="0 0 16 13"><path d="M2.1413332 11l5.8586676-5.8586674L13.858667 11l1.464667-1.464667-5.8586662-5.858666L8.0000008 2.212 6.5353324 3.676667.6766662 9.535333 2.1413332 11z" fill="#151515"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_up_black_hover.svg b/res/skins/Tango/buttons/btn_arrow_up_black_hover.svg
new file mode 100644
index 000000000000..dd43775d2a17
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_arrow_up_black_hover.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="13" viewBox="0 0 16 13"><path d="M2.1413332 10l5.8586676-5.8586674L13.858667 10l1.464667-1.464667-5.8586662-5.858666L8.0000008 1.212 6.5353324 2.676667.6766662 8.535333 2.1413332 10z" fill="#151515"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_up_hover.svg b/res/skins/Tango/buttons/btn_arrow_up_hover.svg
index 0fce331bbc0e..7d300f6b3637 100644
--- a/res/skins/Tango/buttons/btn_arrow_up_hover.svg
+++ b/res/skins/Tango/buttons/btn_arrow_up_hover.svg
@@ -1,87 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="18"
-   id="svg3769"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_arrow_up_hover.svg">
-  <defs
-     id="defs3771" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="8.3303705"
-     inkscape:cy="7.9550607"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-page="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true">
-    <sodipodi:guide
-       orientation="0,1"
-       position="13.196138,9"
-       id="guide2983" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="9,10"
-       id="guide2985" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.5,15.224983"
-       id="guide3166" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3774">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 8.9996967,1038.4441 -4.5715187,7.9181 9.143038,0 z"
-       id="path3018"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-y="-0.57041933" />
-    <path
-       style="color:#000000;fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 9,1052.3622 c 4.970563,0 9,-4.0294 9,-9 0,-4.9706 -4.029437,-9 -9,-9 -2.55716,0 -4.861527,1.0688 -6.5,2.7813 l 0,1.5625 c 1.45178,-2.0229 3.820122,-3.3438 6.5,-3.3438 4.418278,0 8,3.5817 8,8 0,4.4183 -3.581722,8 -8,8 -2.679878,0 -5.04822,-1.3209 -6.5,-3.3437 l 0,1.5625 c 1.638473,1.7124 3.94284,2.7812 6.5,2.7812 z"
-       id="path3056"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="13" viewBox="0 0 16 13"><path d="M2.1413332 10l5.8586676-5.8586674L13.858667 10l1.464667-1.464667-5.8586662-5.858666L8.0000008 1.212 6.5353324 2.676667.6766662 8.535333 2.1413332 10z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_up_thin.svg b/res/skins/Tango/buttons/btn_arrow_up_thin.svg
deleted file mode 100644
index c918326a3f53..000000000000
--- a/res/skins/Tango/buttons/btn_arrow_up_thin.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="22"
-   height="13"
-   viewBox="0 0 22 13"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_up_thin.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="11.313708"
-     inkscape:cx="14.745468"
-     inkscape:cy="-8.1457674"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="false" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-35)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <path
-     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 5.1413334,11 11.000001,5.1413326 16.858667,11 18.323334,9.535333 12.464668,3.676667 11.000001,2.212 9.5353326,3.676667 3.6766664,9.535333 5.1413334,11 z"
-     id="rect2987-7-3"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/res/skins/Tango/buttons/btn_arrow_up_thin_hover.svg b/res/skins/Tango/buttons/btn_arrow_up_thin_hover.svg
deleted file mode 100644
index 9fb1ad418eaa..000000000000
--- a/res/skins/Tango/buttons/btn_arrow_up_thin_hover.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="22"
-   height="13"
-   viewBox="0 0 22 13"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_up_thin_hover.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="11.313708"
-     inkscape:cx="-0.19216341"
-     inkscape:cy="-8.1457674"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="false" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-35)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <path
-     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 5.1413334,10 11.000001,4.1413326 16.858667,10 18.323334,8.535333 12.464668,2.676667 11.000001,1.212 9.5353326,2.676667 3.6766664,8.535333 5.1413334,10 z"
-     id="rect2987-7-3"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/res/skins/Tango/buttons/btn_arrow_upright.svg b/res/skins/Tango/buttons/btn_arrow_upright.svg
new file mode 100644
index 000000000000..eb705de27094
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_arrow_upright.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="32" viewBox="0 0 12 32"><path d="M1 4.6l6.4000002-.000001L7.3999995 11h1.6000002V3H1v1.6z" fill="#888"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_upright_hover.svg b/res/skins/Tango/buttons/btn_arrow_upright_hover.svg
new file mode 100644
index 000000000000..8e7ae139fe13
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_arrow_upright_hover.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="32" viewBox="0 0 12 32"><path d="M2 3.6l6.4000002-.000001L8.3999995 10H10V2H2v1.6z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_arrow_upright_thin.svg b/res/skins/Tango/buttons/btn_arrow_upright_thin.svg
deleted file mode 100644
index e2c7733af171..000000000000
--- a/res/skins/Tango/buttons/btn_arrow_upright_thin.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="12"
-   height="32"
-   viewBox="0 0 12 32"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_arrow_right_thin.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="7.9999999"
-     inkscape:cx="28.931046"
-     inkscape:cy="23.10092"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-16)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <path
-     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="m 2,3.6 6.4000002,-1e-6 -7e-7,6.400001 1.6000002,0 0,-6.4 0,-1.6 L 8.3999995,2 2,2 2,3.6 z"
-     id="rect2987-7-3"
-     inkscape:connector-curvature="0"
-     inkscape:transform-center-x="3.9999998"
-     inkscape:transform-center-y="4.0000001" />
-</svg>
diff --git a/res/skins/Tango/buttons/btn_arrow_upright_thin_hover.svg b/res/skins/Tango/buttons/btn_arrow_upright_thin_hover.svg
deleted file mode 100644
index 9c49111c13ae..000000000000
--- a/res/skins/Tango/buttons/btn_arrow_upright_thin_hover.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="12"
-   height="32"
-   viewBox="0 0 12 32"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_arrow_upright_upthin_hover.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="7.9999999"
-     inkscape:cx="9.3685461"
-     inkscape:cy="23.10092"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-16)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <path
-     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="m 3,2.6 6.4000002,-1e-6 L 9.3999995,9 11,9 11,2.6 11,1 9.3999995,1 3,1 3,2.6 z"
-     id="rect2987-7-3"
-     inkscape:connector-curvature="0"
-     inkscape:transform-center-x="3.9999998"
-     inkscape:transform-center-y="4.0000001" />
-</svg>
diff --git a/res/skins/Tango/buttons/btn_aux.svg b/res/skins/Tango/buttons/btn_aux.svg
index ab2179e0392d..59e4b294af12 100644
--- a/res/skins/Tango/buttons/btn_aux.svg
+++ b/res/skins/Tango/buttons/btn_aux.svg
@@ -1,75 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="32"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_aux.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="10.509768"
-     inkscape:cy="20.843284"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <path
-       inkscape:connector-curvature="0"
-       id="rect3835-6"
-       d="m 8.160303,1022.9654 c -0.390055,0 -0.70407,0.314 -0.70407,0.704 l 0,6.6667 -2.948297,0 0,9.3068 2.112213,4.2247 0,5.7644 4.224425,0 0,-5.7644 2.112213,-4.2247 0,-9.3068 -2.948296,0 0,-6.6667 c 0,-0.39 -0.314017,-0.704 -0.704072,-0.704 l -1.144116,0 z"
-       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="32"><path d="M8.160303 2.6032c-.390055 0-.70407.314-.70407.704v6.6667H4.507936v9.3068l2.112213 4.2247v5.7644h4.224425v-5.7644l2.112213-4.2247V9.9739h-2.948296V3.3072c0-.39-.314017-.704-.704072-.704H8.160303z" style="line-height:125%;-inkscape-font-specification:Ubuntu" font-size="14" font-weight="400" letter-spacing="0" word-spacing="0" fill="#d2d2d2" font-family="Ubuntu"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_backward.svg b/res/skins/Tango/buttons/btn_backward.svg
index 091c5c3c8ad0..0cde3ec621dd 100644
--- a/res/skins/Tango/buttons/btn_backward.svg
+++ b/res/skins/Tango/buttons/btn_backward.svg
@@ -1,74 +1 @@
-<?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"
-   height="22"
-   width="22"
-   version="1.1"
-   viewBox="0 0 22 22"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_backward.svg">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="8"
-     inkscape:cx="8.4757822"
-     inkscape:cy="7.4927795"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-paths="false"
-     inkscape:bbox-paths="true" />
-  <path
-     style="fill:#888888;fill-opacity:1"
-     d="m 7,17 -2,0 0,-12.0000008 2,0 L 7,17 z"
-     id="path4-6"
-     inkscape:connector-curvature="0" />
-  <path
-     transform="matrix(-0.4535264,0,0,-0.45822629,14.932008,13.291132)"
-     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     inkscape:transform-center-x="1.714285"
-     d="m 17.489628,5.0000012 -22.0494334,13.0939658 0,-26.187934 z"
-     id="path3018"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccc" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="22" width="22" viewBox="0 0 22 22"><path d="M7 17H5V4.9999992h2V17z" fill="#888"/><path d="M6.9999999758 11.0000000001l10.000000152-5.9999993699v11.9999998396z" fill="#888"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_backward_pressed.svg b/res/skins/Tango/buttons/btn_backward_pressed.svg
index 175f5c05865a..7936b2d6505f 100644
--- a/res/skins/Tango/buttons/btn_backward_pressed.svg
+++ b/res/skins/Tango/buttons/btn_backward_pressed.svg
@@ -1,74 +1 @@
-<?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"
-   height="22"
-   width="22"
-   version="1.1"
-   viewBox="0 0 22 22"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_backward.svg">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="8"
-     inkscape:cx="-11.086718"
-     inkscape:cy="7.4927795"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-paths="false"
-     inkscape:bbox-paths="true" />
-  <path
-     style="fill:#d2d2d2;fill-opacity:1"
-     d="m 7,17 -2,0 0,-12.0000008 2,0 L 7,17 z"
-     id="path4-6"
-     inkscape:connector-curvature="0" />
-  <path
-     transform="matrix(-0.4535264,0,0,-0.45822629,14.932008,13.291132)"
-     style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     inkscape:transform-center-x="1.714285"
-     d="m 17.489628,5.0000012 -22.0494334,13.0939658 0,-26.187934 z"
-     id="path3018"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccc" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="22" width="22" viewBox="0 0 22 22"><path d="M7 17H5V4.9999992h2V17z" fill="#d2d2d2"/><path d="M6.9999999758 11.0000000001l10.000000152-5.9999993699v11.9999998396z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_beatbox_down.svg b/res/skins/Tango/buttons/btn_beatbox_down.svg
new file mode 100644
index 000000000000..f3e526667f39
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_beatbox_down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="20"><path d="M9.0003033 14.918l4.5715187-7.9181H4.4287835z" fill="#888"/><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M3.5 0C1.5696486 0 0 1.5696 0 3.5v13C0 18.4304 1.5696486 20 3.5 20h10c.980598 0 1.864042-.379628 2.5-1.03125V16.5c0 1.3936-1.106351 2.5-2.5 2.5h-10C2.1063514 19 1 17.8936 1 16.5v-13C1 2.1064 2.1063514 1 3.5 1h10C14.893649 1 16 2.1064 16 3.5V1.0625C15.364042.41087819 14.480598 0 13.5 0h-10z" font-weight="400" color="#000" fill="#666" overflow="visible" font-family="Sans"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_beatbox_down_hover.svg b/res/skins/Tango/buttons/btn_beatbox_down_hover.svg
new file mode 100644
index 000000000000..88f4ffa99d48
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_beatbox_down_hover.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="20"><g fill="#d2d2d2"><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M3.5 0C1.5696486 0 0 1.5696 0 3.5v13C0 18.4304 1.5696486 20 3.5 20h10c.980598 0 1.864042-.3796 2.5-1.0312V16.5c0 1.3936-1.106351 2.5-2.5 2.5h-10C2.1063514 19 1 17.8936 1 16.5v-13C1 2.1064 2.1063514 1 3.5 1h10C14.893649 1 16 2.1064 16 3.5V1.0625C15.364042.4109 14.480598 0 13.5 0h-10z" font-weight="400" color="#000" overflow="visible" font-family="Sans"/><path d="M9.0003033 14.918l4.5715187-7.9181H4.4287835z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_beatbox_up.svg b/res/skins/Tango/buttons/btn_beatbox_up.svg
new file mode 100644
index 000000000000..e2721f7a702d
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_beatbox_up.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="20"><path d="M6.9996967 5.0819L2.428178 13h9.143038z" fill="#888"/><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M12.5 0C14.430351 0 16 1.5696 16 3.5v13c0 1.9304-1.569649 3.5-3.5 3.5h-10c-.980598 0-1.864042-.3796-2.5-1.0312V16.5C0 17.8936 1.106351 19 2.5 19h10c1.393649 0 2.5-1.1064 2.5-2.5v-13C15 2.1064 13.893649 1 12.5 1h-10C1.106351 1 0 2.1064 0 3.5V1.0625C.635958.4109 1.519402 0 2.5 0h10z" font-weight="400" color="#000" fill="#666" overflow="visible" font-family="Sans"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_beatbox_up_hover.svg b/res/skins/Tango/buttons/btn_beatbox_up_hover.svg
new file mode 100644
index 000000000000..82aefea0c6f2
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_beatbox_up_hover.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="20"><g fill="#d2d2d2"><path d="M6.9996967 5.0819L2.428178 13h9.143038z"/><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M12.5 0C14.430351 0 16 1.5696 16 3.5v13c0 1.9304-1.569649 3.5-3.5 3.5h-10c-.980598 0-1.864042-.3796-2.5-1.0312V16.5C0 17.8936 1.106351 19 2.5 19h10c1.393649 0 2.5-1.1064 2.5-2.5v-13C15 2.1064 13.893649 1 12.5 1h-10C1.106351 1 0 2.1064 0 3.5V1.0625C.635958.4109 1.519402 0 2.5 0h10z" font-weight="400" color="#000" overflow="visible" font-family="Sans"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_beats_curpos.svg b/res/skins/Tango/buttons/btn_beats_curpos.svg
index 8a1861dcdb1b..b402beea9be9 100644
--- a/res/skins/Tango/buttons/btn_beats_curpos.svg
+++ b/res/skins/Tango/buttons/btn_beats_curpos.svg
@@ -1,70 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="49"
-   id="svg3769"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_beats_curpos.svg">
-  <defs
-     id="defs3771" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="-33.902109"
-     inkscape:cy="27.203256"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true" />
-  <metadata
-     id="metadata3774">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1003.3622)">
-    <g
-       transform="translate(-5.7226562,993.19599)"
-       style="font-size:48px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#aaaaaa;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       id="flowRoot2984">
-      <path
-         d="m 18.242187,43.429878 -1.039062,0 -2.40625,-22.148437 c -0.109381,-0.966113 -0.164069,-1.686165 -0.164062,-2.160156 -7e-6,-1.148403 0.300774,-2.068975 0.902343,-2.761719 0.619784,-0.692671 1.358065,-1.039025 2.214844,-1.039063 0.856761,3.8e-5 1.576812,0.346392 2.160156,1.039063 0.601551,0.692744 0.902332,1.722691 0.902344,3.089844 -1.2e-5,0.437533 -0.03647,1.048209 -0.109375,1.832031 l -2.460938,22.148437 m -0.546875,4.539063 c 0.838532,5e-6 1.549469,0.300786 2.132813,0.902344 0.60155,0.583337 0.902331,1.285159 0.902344,2.105468 -1.3e-5,0.838543 -0.300794,1.558595 -0.902344,2.160157 -0.583344,0.583332 -1.294281,0.874999 -2.132813,0.875 -0.83855,-10e-7 -1.558601,-0.291668 -2.160156,-0.875 -0.58334,-0.601562 -0.875006,-1.321614 -0.875,-2.160157 -6e-6,-0.820309 0.29166,-1.522131 0.875,-2.105468 0.601555,-0.601558 1.321606,-0.902339 2.160156,-0.902344"
-         style="font-size:56px;text-align:center;text-anchor:middle;font-family:Times New Roman;-inkscape-font-specification:Times New Roman;fill:#aaaaaa;fill-opacity:1"
-         id="path3761" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="49"><g style="line-height:125%;-inkscape-font-specification:Ubuntu"><path d="M12.5195308 33.263668h-1.039062l-2.40625-22.148437c-.109381-.966113-.164069-1.686165-.164062-2.160156-.000007-1.148403.300774-2.068975.902343-2.761719.619784-.692671 1.358065-1.039025 2.214844-1.039063.856761.000038 1.576812.346392 2.160156 1.039063.601551.692744.902332 1.722691.902344 3.089844-.000012.437533-.03647 1.048209-.109375 1.832031l-2.460938 22.148437m-.546875 4.539063c.838532.000005 1.549469.300786 2.132813.902344.60155.583337.902331 1.285159.902344 2.105468-.000013.838543-.300794 1.558595-.902344 2.160157-.583344.583332-1.294281.874999-2.132813.875-.83855-.000001-1.558601-.291668-2.160156-.875-.58334-.601562-.875006-1.321614-.875-2.160157-.000006-.820309.29166-1.522131.875-2.105468.601555-.601558 1.321606-.902339 2.160156-.902344" style="text-align:center;-inkscape-font-specification:Times New Roman" font-size="56" text-anchor="middle" font-family="Times New Roman" font-weight="400" letter-spacing="0" word-spacing="0" fill="#aaa"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_beats_earlier.svg b/res/skins/Tango/buttons/btn_beats_earlier.svg
index f3f39f2d3567..a0f9611e7509 100644
--- a/res/skins/Tango/buttons/btn_beats_earlier.svg
+++ b/res/skins/Tango/buttons/btn_beats_earlier.svg
@@ -1,108 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg3769"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_beats_earlier.svg">
-  <defs
-     id="defs3771" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="25.130052"
-     inkscape:cy="13.481968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true" />
-  <metadata
-     id="metadata3774">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1028.3622)">
-    <rect
-       style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3"
-       width="2"
-       height="18"
-       x="2"
-       y="1031.3622" />
-    <rect
-       style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3-6"
-       width="2"
-       height="18"
-       x="-16"
-       y="1031.3622"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3-6-85"
-       width="2"
-       height="18"
-       x="-10"
-       y="1031.3622"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3-6-8-7"
-       width="1"
-       height="18"
-       x="-18"
-       y="1031.3622"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#8c8c8c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3-6-8-9-4"
-       width="1"
-       height="18"
-       x="-20"
-       y="1031.3622"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#6e6e6e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3-6-8-9-3-1"
-       width="1"
-       height="18"
-       x="-22"
-       y="1031.3622"
-       transform="scale(-1,1)" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path fill="#aaa" d="M2 3h2v18H2zM16 3h-2v18h2zM10 3H8v18h2zM18 3h-1v18h1z"/><path fill="#8c8c8c" d="M20 3h-1v18h1z"/><path fill="#6e6e6e" d="M22 3h-1v18h1z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_beats_faster.svg b/res/skins/Tango/buttons/btn_beats_faster.svg
index 21af56f8bf62..10312c85b7f9 100644
--- a/res/skins/Tango/buttons/btn_beats_faster.svg
+++ b/res/skins/Tango/buttons/btn_beats_faster.svg
@@ -1,100 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg3769"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_beats_faster.svg">
-  <defs
-     id="defs3771" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="12.297169"
-     inkscape:cy="13.664699"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true" />
-  <metadata
-     id="metadata3774">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1028.3622)">
-    <rect
-       style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3"
-       width="2"
-       height="18"
-       x="2"
-       y="1031.3622" />
-    <rect
-       style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3-6"
-       width="2"
-       height="18"
-       x="-16"
-       y="1031.3622"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3-6-8-7"
-       width="1"
-       height="18"
-       x="-18"
-       y="1031.3622"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#8c8c8c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3-6-8-9-4"
-       width="1"
-       height="18"
-       x="-20"
-       y="1031.3622"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#6e6e6e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3-6-8-9-3-1"
-       width="1"
-       height="18"
-       x="-22"
-       y="1031.3622"
-       transform="scale(-1,1)" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path fill="#aaa" d="M2 3h2v18H2zM16 3h-2v18h2zM18 3h-1v18h1z"/><path fill="#8c8c8c" d="M20 3h-1v18h1z"/><path fill="#6e6e6e" d="M22 3h-1v18h1z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_beats_later.svg b/res/skins/Tango/buttons/btn_beats_later.svg
index a08b505c073a..bc9541d6487b 100644
--- a/res/skins/Tango/buttons/btn_beats_later.svg
+++ b/res/skins/Tango/buttons/btn_beats_later.svg
@@ -1,104 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg3769"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_beats_later.svg">
-  <defs
-     id="defs3771" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="10.449851"
-     inkscape:cy="8.5243646"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true" />
-  <metadata
-     id="metadata3774">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1028.3622)">
-    <rect
-       style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3"
-       width="2"
-       height="18"
-       x="-22"
-       y="1031.3622"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3-6"
-       width="2"
-       height="18"
-       x="8"
-       y="1031.3622" />
-    <rect
-       style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3-6-85"
-       width="2"
-       height="18"
-       x="14"
-       y="1031.3622" />
-    <rect
-       style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3-6-8-7-0"
-       width="1"
-       height="18"
-       x="6"
-       y="1031.3622" />
-    <rect
-       style="fill:#8c8c8c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3-6-8-9-4"
-       width="1"
-       height="18"
-       x="4"
-       y="1031.3622" />
-    <rect
-       style="fill:#6e6e6e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3-6-8-9-3-1"
-       width="1"
-       height="18"
-       x="2"
-       y="1031.3622" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path fill="#aaa" d="M22 3h-2v18h2zM8 3h2v18H8zM14 3h2v18h-2zM6 3h1v18H6z"/><path fill="#8c8c8c" d="M4 3h1v18H4z"/><path fill="#6e6e6e" d="M2 3h1v18H2z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_beats_slower.svg b/res/skins/Tango/buttons/btn_beats_slower.svg
index 665d4653a831..d89f9328dfce 100644
--- a/res/skins/Tango/buttons/btn_beats_slower.svg
+++ b/res/skins/Tango/buttons/btn_beats_slower.svg
@@ -1,96 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg3769"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_beats_slower.svg">
-  <defs
-     id="defs3771" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="49.065902"
-     inkscape:cy="-1.8330486"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true" />
-  <metadata
-     id="metadata3774">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1028.3622)">
-    <rect
-       style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3"
-       width="2"
-       height="18"
-       x="2"
-       y="1031.3622" />
-    <rect
-       style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3-6"
-       width="2"
-       height="18"
-       x="20"
-       y="1031.3622" />
-    <rect
-       style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3-6-8-7"
-       width="1"
-       height="18"
-       x="18"
-       y="1031.3622" />
-    <rect
-       style="fill:#8c8c8c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3-6-8-9-4"
-       width="1"
-       height="18"
-       x="16"
-       y="1031.3622" />
-    <rect
-       style="fill:#6e6e6e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3877-3-6-8-9-3-1"
-       width="1"
-       height="18"
-       x="14"
-       y="1031.3622" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path fill="#aaa" d="M2 3h2v18H2zM20 3h2v18h-2zM18 3h1v18h-1z"/><path fill="#8c8c8c" d="M16 3h1v18h-1z"/><path fill="#6e6e6e" d="M14 3h1v18h-1z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_booth.svg b/res/skins/Tango/buttons/btn_booth.svg
new file mode 100644
index 000000000000..fd228f4b3982
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_booth.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="32"><g fill="#d2d2d2"><g transform="matrix(1.06028 0 0 1.06028 -4.0836502 -1080.638836)"><path d="M21.177616 1022.034l-8.173954 8.1739v8.174l8.173954 8.174h1.021744v-24.5219h-1.021744z"/><rect ry=".94314992" rx=".94314992" y="1030.2079" x="7.624095" height="8.1739349" width="4.3036532"/></g><g style="line-height:125%;-inkscape-font-specification:Alpha Beta BRK"><path d="M31.5726648094 12.8166913917c-.0000105783.5077679559-.1057945406 1.0084719723-.317348361 1.5021155754-.211574977.479556862-.4866102231.9520533105-.8251057386 1.4174893458-.3244087744.4513469434-.6981746218.8956346488-1.1212975422 1.3328631162-.4231382002.4231370248-.8462693482.839215987-1.269393444 1.2482368866-.2256758224.2115702754-.4795545112.4654489642-.7616360664.7616360664-.2820933088.2961953297-.5500763692.5923871333-.8039491812.8885754108-.2538833903.2961953297-.47250115.5853337721-.6558532794.8674188534-.1833615323.2679854111-.2820921335.4936553567-.2961918036.6770098368h6.5162196792v2.1579688548h-9.3300418134c-.0141043716-.1128349728-.0211565574-.246826503-.0211565574-.4019745906-.0000011754-.1692524592-.0000011754-.2961918036 0-.3808180332-.0000011754-.6770086614.105782787-1.2975998365.317348361-1.8617770512.2256675949-.5782768849.5148072127-1.1142418303.8674188534-1.6078983624.3526069393-.4936483046.7475281687-.9590925674 1.1847672144-1.3963327884.4372319935-.4372296428.8744663377-.8674129766 1.3117065588-1.2905500014.3384990416-.3243934946.6628995884-.6417418556.9732016404-.952045083.3102902984-.3102879477.5782721834-.613531937.8039491812-.9097319682.239767265-.3102879477.4301762816-.6205829475.5712270498-.9308885256.1410366638-.3243911439.2115585218-.6558427011.211565574-.9943581978-.0000070522-.733416745-.2115726262-1.2552773188-.634696722-1.5655852476-.4231382002-.3102844216-.9379465882-.4654313338-1.5444286902-.4654442628-.3949271063.000012929-.7616407679.05642924-1.1001409848.1692524592-.3385084445.1128467264-.6417524339.2468382566-.9097319682.4019745906-.2538822149.1551598412-.4795509851.3173601146-.6770098368.4866008202-.1974635531.1551598412-.345559455.2820980103-.4442877054.3808180332l-1.269393444-1.798307379c.5923824318-.564161935 1.2834954649-1.0155006508 2.0733426252-1.3540196736.8039456551-.3525951856 1.6643111473-.528899243 2.5811000028-.5289142876 1.5655781954.0000150446 2.7150833054.3737803044 3.4485188562 1.1212978948.7475222919.7334402522 1.121286964 1.7419016462 1.1212975422 3.0253877082" style="-inkscape-font-specification:Ubuntu Medium" font-size="18" font-weight="500" font-family="Ubuntu" letter-spacing="0" word-spacing="0"/></g></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_broadcast_connected.svg b/res/skins/Tango/buttons/btn_broadcast_connected.svg
index 0e4353d45ab9..01f5131b669a 100644
--- a/res/skins/Tango/buttons/btn_broadcast_connected.svg
+++ b/res/skins/Tango/buttons/btn_broadcast_connected.svg
@@ -1,114 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="30"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_broadcast_connected.svg"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="12.452076"
-     inkscape:cy="14.717749"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox-edge-midpoints="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1022.3622)">
-    <path
-       sodipodi:type="arc"
-       style="fill:#00c800;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path2990"
-       sodipodi:cx="9.7333946"
-       sodipodi:cy="7.3453302"
-       sodipodi:rx="1.314405"
-       sodipodi:ry="1.2975045"
-       d="m 11.0478,7.3453302 c 0,0.716592 -0.58848,1.2975046 -1.3144054,1.2975046 -0.7259258,0 -1.3144049,-0.5809126 -1.3144049,-1.2975046 0,-0.7165919 0.5884791,-1.2975045 1.3144049,-1.2975045 0.7259254,0 1.3144054,0.5809126 1.3144054,1.2975045 z"
-       transform="matrix(1.5216011,0,0,1.5414204,-4.810344,1019.04)" />
-    <path
-       style="fill:#ff8605;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 3.782847,1025.3276 c -2.7805093,3.4338 -2.2510804,8.4713 1.182598,11.2519 l 0.7745451,-0.9565 c -2.905412,-2.3528 -3.3534014,-6.6154 -1.0006588,-9.5207 l -0.9564843,-0.7747 z m 10.477163,-0.2261 c 2.905412,2.3528 3.353401,6.6154 1.000659,9.5207 l 0.956485,0.7747 c 2.780508,-3.4338 2.25108,-8.4713 -1.182599,-11.2519 l -0.774545,0.9565 z"
-       id="path3809-3-3"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#e0c100;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 6.1740553,1027.2641 c -1.7110755,2.113 -1.3852107,5.2131 0.7277604,6.9241 l 0.774545,-0.9565 c -1.5848029,-1.2834 -1.8291194,-3.6083 -0.5458143,-5.1931 l -0.9564911,-0.7745 z m 6.1495847,0.2287 c 1.584708,1.2833 1.82912,3.6083 0.545815,5.1931 l 0.95649,0.7745 c 1.711075,-2.113 1.38521,-5.2131 -0.727761,-6.9241 l -0.774544,0.9565 z"
-       id="path3809-3-6-5"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="star"
-       style="fill:#00c800;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3039"
-       sodipodi:sides="3"
-       sodipodi:cx="-7.6250005"
-       sodipodi:cy="5.937499"
-       sodipodi:r1="9.5131493"
-       sodipodi:r2="4.7565746"
-       sodipodi:arg1="1.5707963"
-       sodipodi:arg2="2.6179939"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M -7.6250002,15.450648 -15.86363,1.1809246 l 16.47725833,-4e-7 z"
-       transform="matrix(-0.21846204,0,0,-1.5417196,8.3342268,1052.1828)"
-       inkscape:transform-center-y="-3.666742" />
-    <path
-       style="fill:#ff8605;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 16.217154,1025.3276 c 2.780508,3.4338 2.25108,8.4713 -1.182599,11.2519 l -0.774545,-0.9565 c 2.905412,-2.3528 3.353401,-6.6154 1.000659,-9.5207 l 0.956485,-0.7747 z M 5.73999,1025.1015 c -2.9054122,2.3528 -3.3534012,6.6154 -1.0006584,9.5207 l -0.9564851,0.7747 c -2.7805084,-3.4338 -2.2510801,-8.4713 1.1825987,-11.2519 l 0.7745448,0.9565 z"
-       id="path3809-3-3-7"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#e0c100;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 13.825945,1027.2641 c 1.711075,2.113 1.38521,5.2131 -0.72776,6.9241 l -0.774545,-0.9565 c 1.584803,-1.2834 1.829119,-3.6083 0.545814,-5.1931 l 0.956491,-0.7745 z m -6.1495848,0.2287 c -1.584708,1.2833 -1.8291196,3.6083 -0.5458146,5.1931 l -0.95649,0.7745 c -1.7110757,-2.113 -1.3852108,-5.2131 0.7277607,-6.9241 l 0.7745439,0.9565 z"
-       id="path3809-3-6-5-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="30"><path d="M12.0000006326 8.000041815c0 1.1045695273-.8954318153 2.0000000595-2.0000007025 2.0000000595-1.1045694958 0-1.9999999417-.8954305322-1.9999999417-2.0000000595 0-1.1045693731.8954304459-1.9999999054 1.9999999417-1.9999999054 1.1045688872 0 2.0000007025.8954305323 2.0000007025 1.9999999054z" fill="#00c800"/><path d="M3.782847 2.9654c-2.7805093 3.4338-2.2510804 8.4713 1.182598 11.2519l.7745451-.9565c-2.905412-2.3528-3.3534014-6.6154-1.0006588-9.5207l-.9564843-.7747zm10.477163-.2261c2.905412 2.3528 3.353401 6.6154 1.000659 9.5207l.956485.7747c2.780508-3.4338 2.25108-8.4713-1.182599-11.2519l-.774545.9565z" fill="#ff8605"/><path d="M6.1740553 4.9019c-1.7110755 2.113-1.3852107 5.2131.7277604 6.9241l.774545-.9565c-1.5848029-1.2834-1.8291194-3.6083-.5458143-5.1931l-.9564911-.7745zm6.1495847.2287c1.584708 1.2833 1.82912 3.6083.545815 5.1931l.95649.7745c1.711075-2.113 1.38521-5.2131-.727761-6.9241l-.774544.9565z" fill="#e0c100"/><path d="M9.9999998987 6.0000331457l1.799827873 21.9999122524-3.5996554685 6.166e-7z" fill="#00c800"/><path d="M16.217154 2.9654c2.780508 3.4338 2.25108 8.4713-1.182599 11.2519l-.774545-.9565c2.905412-2.3528 3.353401-6.6154 1.000659-9.5207l.956485-.7747zM5.73999 2.7393C2.8345778 5.0921 2.3865888 9.3547 4.7393316 12.26l-.9564851.7747C1.0023381 9.6009 1.5317664 4.5634 4.9654452 1.7828l.7745448.9565z" fill="#ff8605"/><path d="M13.825945 4.9019c1.711075 2.113 1.38521 5.2131-.72776 6.9241l-.774545-.9565c1.584803-1.2834 1.829119-3.6083.545814-5.1931l.956491-.7745zm-6.1495848.2287c-1.584708 1.2833-1.8291196 3.6083-.5458146 5.1931l-.95649.7745c-1.7110757-2.113-1.3852108-5.2131.7277607-6.9241l.7745439.9565z" fill="#e0c100"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_broadcast_connected_netbook.svg b/res/skins/Tango/buttons/btn_broadcast_connected_netbook.svg
new file mode 100644
index 000000000000..2f8802af1279
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_broadcast_connected_netbook.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="24"><path d="M12.0000006326 8.000041815a2.0000001336 2.000000322 0 1 1-4.0000006442 0 2.0000001336 2.000000322 0 1 1 4.0000006442 0z" fill="#00c800"/><path d="M3.782847 2.9654c-2.7805093 3.4338-2.2510804 8.4713 1.182598 11.2519l.7745451-.9565c-2.905412-2.3528-3.3534014-6.6154-1.0006588-9.5207l-.9564843-.7747zm10.477163-.2261c2.905412 2.3528 3.353401 6.6154 1.000659 9.5207l.956485.7747c2.780508-3.4338 2.25108-8.4713-1.182599-11.2519l-.774545.9565z" fill="#ff8605"/><path d="M6.1740553 4.9019c-1.7110755 2.113-1.3852107 5.2131.7277604 6.9241l.774545-.9565c-1.5848029-1.2834-1.8291194-3.6083-.5458143-5.1931l-.9564911-.7745zm6.1495847.2287c1.584708 1.2833 1.82912 3.6083.545815 5.1931l.95649.7745c1.711075-2.113 1.38521-5.2131-.727761-6.9241l-.774544.9565z" fill="#e0c100"/><path d="M9.9999998987.0000331457l1.799827873 21.9999122524-3.5996554685 6.166e-7z" fill="#00c800"/><path d="M16.217154 2.9654c2.780508 3.4338 2.25108 8.4713-1.182599 11.2519l-.774545-.9565c2.905412-2.3528 3.353401-6.6154 1.000659-9.5207l.956485-.7747zM5.73999 2.7393C2.8345778 5.0921 2.3865888 9.3547 4.7393316 12.26l-.9564851.7747C1.0023381 9.6009 1.5317664 4.5634 4.9654452 1.7828l.7745448.9565z" fill="#ff8605"/><path d="M13.825945 4.9019c1.711075 2.113 1.38521 5.2131-.72776 6.9241l-.774545-.9565c1.584803-1.2834 1.829119-3.6083.545814-5.1931l.956491-.7745zm-6.1495848.2287c-1.584708 1.2833-1.8291196 3.6083-.5458146 5.1931l-.95649.7745c-1.7110757-2.113-1.3852108-5.2131.7277607-6.9241l.7745439.9565z" fill="#e0c100"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_broadcast_connecting.svg b/res/skins/Tango/buttons/btn_broadcast_connecting.svg
index b5f7115f078f..5e7d95cd77a1 100644
--- a/res/skins/Tango/buttons/btn_broadcast_connecting.svg
+++ b/res/skins/Tango/buttons/btn_broadcast_connecting.svg
@@ -1,114 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="30"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_broadcast_connecting.svg"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="11.785256"
-     inkscape:cy="16.017761"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox-edge-midpoints="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1022.3622)">
-    <path
-       sodipodi:type="arc"
-       style="fill:#ffc105;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path2990"
-       sodipodi:cx="9.7333946"
-       sodipodi:cy="7.3453302"
-       sodipodi:rx="1.314405"
-       sodipodi:ry="1.2975045"
-       d="m 11.0478,7.3453302 c 0,0.716592 -0.58848,1.2975046 -1.3144054,1.2975046 -0.7259258,0 -1.3144049,-0.5809126 -1.3144049,-1.2975046 0,-0.7165919 0.5884791,-1.2975045 1.3144049,-1.2975045 0.7259254,0 1.3144054,0.5809126 1.3144054,1.2975045 z"
-       transform="matrix(1.5216011,0,0,1.5414204,-4.810344,1019.04)" />
-    <path
-       style="fill:#d8d8d8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 3.7828441,1025.3277 c -2.7805055,3.4336 -2.2510803,8.4712 1.1826037,11.2517 l 0.7745452,-0.9565 c -2.9054128,-2.3527 -3.3534029,-6.6153 -1.0006614,-9.5206 l -0.9564875,-0.7746 z m 10.4771629,-0.2261 c 2.905413,2.3527 3.353403,6.6153 1.000661,9.5206 l 0.956488,0.7746 c 2.780506,-3.4336 2.25108,-8.4712 -1.182604,-11.2517 l -0.774545,0.9565 z"
-       id="path3809-3-3"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#e6d290;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 6.1740568,1027.264 c -1.7110785,2.1131 -1.3852093,5.2132 0.7277585,6.9242 l 0.774545,-0.9565 c -1.5848031,-1.2834 -1.8291201,-3.6083 -0.5458162,-5.1931 l -0.9564873,-0.7746 z m 6.1495832,0.2288 c 1.584707,1.2833 1.829121,3.6083 0.545817,5.1931 l 0.956486,0.7746 c 1.711079,-2.1131 1.38521,-5.2132 -0.727758,-6.9242 l -0.774545,0.9565 z"
-       id="path3809-3-6-5"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffc105;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3039"
-       sodipodi:sides="3"
-       sodipodi:cx="-7.6250005"
-       sodipodi:cy="5.937499"
-       sodipodi:r1="9.5131493"
-       sodipodi:r2="4.7565746"
-       sodipodi:arg1="1.5707963"
-       sodipodi:arg2="2.6179939"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M -7.6250002,15.450648 -15.86363,1.1809246 l 16.47725833,-4e-7 z"
-       transform="matrix(-0.21846204,0,0,-1.5417196,8.3342268,1052.1828)"
-       inkscape:transform-center-y="-3.666742" />
-    <path
-       style="fill:#d8d8d8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 16.217155,1025.3277 c 2.780506,3.4336 2.25108,8.4712 -1.182604,11.2517 l -0.774545,-0.9565 c 2.905413,-2.3527 3.353403,-6.6153 1.000662,-9.5206 l 0.956487,-0.7746 z m -10.4771619,-0.2261 c -2.905413,2.3527 -3.353403,6.6153 -1.000661,9.5206 l -0.956488,0.7746 c -2.780506,-3.4336 -2.25108,-8.4712 1.182604,-11.2517 l 0.774545,0.9565 z"
-       id="path3809-3-3-6"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#e6d290;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 13.825942,1027.264 c 1.711079,2.1131 1.38521,5.2132 -0.727758,6.9242 l -0.774545,-0.9565 c 1.584803,-1.2834 1.82912,-3.6083 0.545816,-5.1931 l 0.956487,-0.7746 z m -6.1495819,0.2288 c -1.584707,1.2833 -1.829121,3.6083 -0.545817,5.1931 l -0.956486,0.7746 c -1.711079,-2.1131 -1.38521,-5.2132 0.727758,-6.9242 l 0.774545,0.9565 z"
-       id="path3809-3-6-5-2"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="30"><path d="M12.0000006326 8.000041815c0 1.1045695273-.8954318153 2.0000000595-2.0000007025 2.0000000595-1.1045694958 0-1.9999999417-.8954305322-1.9999999417-2.0000000595 0-1.1045693731.8954304459-1.9999999054 1.9999999417-1.9999999054 1.1045688872 0 2.0000007025.8954305323 2.0000007025 1.9999999054z" fill="#ffc105"/><path d="M3.7828441 2.9655c-2.7805055 3.4336-2.2510803 8.4712 1.1826037 11.2517l.7745452-.9565C2.8345802 10.908 2.3865901 6.6454 4.7393316 3.7401l-.9564875-.7746zm10.4771629-.2261c2.905413 2.3527 3.353403 6.6153 1.000661 9.5206l.956488.7746c2.780506-3.4336 2.25108-8.4712-1.182604-11.2517l-.774545.9565z" fill="#d8d8d8"/><path d="M6.1740568 4.9018c-1.7110785 2.1131-1.3852093 5.2132.7277585 6.9242l.774545-.9565c-1.5848031-1.2834-1.8291201-3.6083-.5458162-5.1931l-.9564873-.7746zm6.1495832.2288c1.584707 1.2833 1.829121 3.6083.545817 5.1931l.956486.7746c1.711079-2.1131 1.38521-5.2132-.727758-6.9242l-.774545.9565z" fill="#e6d290"/><path d="M9.9999998987 6.0000331457l1.799827873 21.9999122524-3.5996554685 6.166e-7z" fill="#ffc105"/><path d="M16.217155 2.9655c2.780506 3.4336 2.25108 8.4712-1.182604 11.2517l-.774545-.9565c2.905413-2.3527 3.353403-6.6153 1.000662-9.5206l.956487-.7746zM5.7399931 2.7394c-2.905413 2.3527-3.353403 6.6153-1.000661 9.5206l-.956488.7746c-2.780506-3.4336-2.25108-8.4712 1.182604-11.2517l.774545.9565z" fill="#d8d8d8"/><path d="M13.825942 4.9018c1.711079 2.1131 1.38521 5.2132-.727758 6.9242l-.774545-.9565c1.584803-1.2834 1.82912-3.6083.545816-5.1931l.956487-.7746zm-6.1495819.2288c-1.584707 1.2833-1.829121 3.6083-.545817 5.1931l-.956486.7746c-1.711079-2.1131-1.38521-5.2132.727758-6.9242l.774545.9565z" fill="#e6d290"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_broadcast_connecting_netbook.svg b/res/skins/Tango/buttons/btn_broadcast_connecting_netbook.svg
new file mode 100644
index 000000000000..f99777e5f1ad
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_broadcast_connecting_netbook.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="24"><path d="M12.0000006326 8.000041815c0 1.1045695273-.8954318153 2.0000000595-2.0000007025 2.0000000595-1.1045694958 0-1.9999999417-.8954305322-1.9999999417-2.0000000595 0-1.1045693731.8954304459-1.9999999054 1.9999999417-1.9999999054 1.1045688872 0 2.0000007025.8954305323 2.0000007025 1.9999999054z" fill="#ffc105"/><path d="M3.7828441 2.9655c-2.7805055 3.4336-2.2510803 8.4712 1.1826037 11.2517l.7745452-.9565C2.8345802 10.908 2.3865901 6.6454 4.7393316 3.7401l-.9564875-.7746zm10.4771629-.2261c2.905413 2.3527 3.353403 6.6153 1.000661 9.5206l.956488.7746c2.780506-3.4336 2.25108-8.4712-1.182604-11.2517l-.774545.9565z" fill="#d8d8d8"/><path d="M6.1740568 4.9018c-1.7110785 2.1131-1.3852093 5.2132.7277585 6.9242l.774545-.9565c-1.5848031-1.2834-1.8291201-3.6083-.5458162-5.1931l-.9564873-.7746zm6.1495832.2288c1.584707 1.2833 1.829121 3.6083.545817 5.1931l.956486.7746c1.711079-2.1131 1.38521-5.2132-.727758-6.9242l-.774545.9565z" fill="#e6d290"/><path d="M9.9999998987.0000331457l1.799827873 21.9999122524-3.5996554685 6.166e-7z" fill="#ffc105"/><path d="M16.217155 2.9655c2.780506 3.4336 2.25108 8.4712-1.182604 11.2517l-.774545-.9565c2.905413-2.3527 3.353403-6.6153 1.000662-9.5206l.956487-.7746zM5.7399931 2.7394c-2.905413 2.3527-3.353403 6.6153-1.000661 9.5206l-.956488.7746c-2.780506-3.4336-2.25108-8.4712 1.182604-11.2517l.774545.9565z" fill="#d8d8d8"/><path d="M13.825942 4.9018c1.711079 2.1131 1.38521 5.2132-.727758 6.9242l-.774545-.9565c1.584803-1.2834 1.82912-3.6083.545816-5.1931l.956487-.7746zm-6.1495819.2288c-1.584707 1.2833-1.829121 3.6083-.545817 5.1931l-.956486.7746c-1.711079-2.1131-1.38521-5.2132.727758-6.9242l.774545.9565z" fill="#e6d290"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_broadcast_failure.svg b/res/skins/Tango/buttons/btn_broadcast_failure.svg
index a77fc2903374..b0ebd4b5fac9 100644
--- a/res/skins/Tango/buttons/btn_broadcast_failure.svg
+++ b/res/skins/Tango/buttons/btn_broadcast_failure.svg
@@ -1,119 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="30"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_broadcast_failure.svg"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="-4.0609278"
-     inkscape:cy="16.161237"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-paths="false"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox-edge-midpoints="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1022.3622)">
-    <path
-       style="fill:#fa00ee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 6.9838968,1024.2788 c -4.0527222,1.7568 -5.914073,6.4662 -4.1573296,10.5189 l 1.1289444,-0.4893 c -1.4864586,-3.4292 0.088504,-7.4142 3.5177525,-8.9006 l -0.4893673,-1.129 z m 9.3899762,4.6466 c 1.486471,3.4294 -0.08849,7.4143 -3.517742,8.9007 l 0.489368,1.129 c 4.052721,-1.7567 5.914073,-6.4662 4.157319,-10.5189 l -1.128945,0.4892 z"
-       id="path3809-3"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-y="0.1009762"
-       inkscape:transform-center-x="0.039917279" />
-    <path
-       style="fill:#fa00ee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 8.2072658,1027.1012 c -2.4939941,1.081 -3.6393928,3.9792 -2.5583408,6.473 l 1.1289444,-0.4893 c -0.8108082,-1.8705 0.048243,-4.044 1.9187423,-4.8549 l -0.4893459,-1.1288 z m 5.3442282,3.0476 c 0.810788,1.8705 -0.04823,4.0441 -1.918743,4.8548 l 0.489367,1.1291 c 2.493984,-1.0812 3.639394,-3.9793 2.558321,-6.4732 l -1.128945,0.4893 z"
-       id="path3809-3-6"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-y="0.1010756"
-       inkscape:transform-center-x="0.039914379" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#fa00ee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path2990"
-       sodipodi:cx="9.7333946"
-       sodipodi:cy="7.3453302"
-       sodipodi:rx="1.314405"
-       sodipodi:ry="1.2975045"
-       d="m 11.0478,7.3453302 c 0,0.716592 -0.58848,1.2975046 -1.3144054,1.2975046 -0.7259258,0 -1.3144049,-0.5809126 -1.3144049,-1.2975046 0,-0.7165919 0.5884791,-1.2975045 1.3144049,-1.2975045 0.7259254,0 1.3144054,0.5809126 1.3144054,1.2975045 z"
-       transform="matrix(1.5216011,0,0,1.5414204,-4.6559956,1020.29)" />
-    <path
-       style="fill:#fa00ee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 6.7564123,1044.6128 5.4673217,6.7494 2.618359,-2.5069 -6.505651,-5.7554 -1.5800297,1.5129 z"
-       id="path3039"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-x="1.3811565"
-       inkscape:transform-center-y="-4.14035" />
-    <path
-       style="fill:#fa00ee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 11.162161,1029.9052 -7.9192178,10.7953 1.8636114,1.1455 6.0556064,-11.9408 z"
-       id="path3039-3"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-y="5.9704"
-       inkscape:transform-center-x="3.9596089" />
-    <path
-       style="fill:#fa00ee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 8.5589493,1023.7673 c -4.3294197,0.8758 -7.1292349,5.0953 -6.2534842,9.4247 l 1.2060054,-0.2439 c -0.7410051,-3.6633 1.6280688,-7.2338 5.29142,-7.9747 l -0.2439412,-1.2061 z m 8.2187007,6.4974 c 0.740975,3.6635 -1.628076,7.2339 -5.291431,7.9748 l 0.243942,1.2061 c 4.329398,-0.8757 7.129235,-5.0953 6.253474,-9.4247 l -1.205985,0.2438 z"
-       id="path3809-3-2"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-y="0.090476039"
-       inkscape:transform-center-x="0.060040727" />
-    <path
-       style="fill:#fa00ee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 9.1687748,1026.7824 c -2.6642469,0.5388 -4.3871855,3.1356 -3.8482473,5.7996 l 1.2060055,-0.2438 c -0.4041913,-1.9982 0.8879836,-3.9456 2.8862036,-4.3499 l -0.2439618,-1.2059 z m 4.5938122,4.0921 c 0.404172,1.9982 -0.887992,3.9457 -2.886183,4.3498 l 0.24392,1.2062 c 2.664278,-0.5391 4.387207,-3.1357 3.848269,-5.7999 l -1.206006,0.2439 z"
-       id="path3809-3-6-7"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-y="0.0905756"
-       inkscape:transform-center-x="0.060041324" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="30"><g fill="#fa00ee"><path d="M6.9838968 1.9166c-4.0527222 1.7568-5.914073 6.4662-4.1573296 10.5189l1.1289444-.4893C2.469053 8.517 4.0440156 4.532 7.4732641 3.0456l-.4893673-1.129zm9.3899762 4.6466c1.486471 3.4294-.08849 7.4143-3.517742 8.9007l.489368 1.129c4.052721-1.7567 5.914073-6.4662 4.157319-10.5189l-1.128945.4892z"/><path d="M8.2072658 4.739C5.7132717 5.82 4.567873 8.7182 5.648925 11.212l1.1289444-.4893c-.8108082-1.8705.048243-4.044 1.9187423-4.8549L8.2072658 4.739zm5.3442282 3.0476c.810788 1.8705-.04823 4.0441-1.918743 4.8548l.489367 1.1291c2.493984-1.0812 3.639394-3.9793 2.558321-6.4732l-1.128945.4893zM12.1543490326 9.250041815c0 1.1045695273-.8954318153 2.0000000595-2.0000007025 2.0000000595-1.1045694958 0-1.9999999417-.8954305322-1.9999999417-2.0000000595 0-1.1045693731.8954304459-1.9999999054 1.9999999417-1.9999999054 1.1045688872 0 2.0000007025.8954305323 2.0000007025 1.9999999054zM6.7564123 22.2506L12.223734 29l2.618359-2.5069-6.505651-5.7554-1.5800297 1.5129z"/><path d="M11.162161 7.543L3.2429432 18.3383l1.8636114 1.1455L11.162161 7.543zM8.5589493 1.4051c-4.3294197.8758-7.1292349 5.0953-6.2534842 9.4247l1.2060054-.2439c-.7410051-3.6633 1.6280688-7.2338 5.29142-7.9747l-.2439412-1.2061zM16.77765 7.9025c.740975 3.6635-1.628076 7.2339-5.291431 7.9748l.243942 1.2061c4.329398-.8757 7.129235-5.0953 6.253474-9.4247l-1.205985.2438z"/><path d="M9.1687748 4.4202c-2.6642469.5388-4.3871855 3.1356-3.8482473 5.7996L6.526533 9.976c-.4041913-1.9982.8879836-3.9456 2.8862036-4.3499l-.2439618-1.2059zm4.5938122 4.0921c.404172 1.9982-.887992 3.9457-2.886183 4.3498l.24392 1.2062c2.664278-.5391 4.387207-3.1357 3.848269-5.7999l-1.206006.2439z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_broadcast_failure_netbook.svg b/res/skins/Tango/buttons/btn_broadcast_failure_netbook.svg
new file mode 100644
index 000000000000..e747581c4ae6
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_broadcast_failure_netbook.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="24"><g fill="#fa00ee"><path d="M9.7911035 1.6789c-4.381951.5562-7.4833899 4.5592-6.9271932 8.9412l1.220633-.1549c-.4706142-3.7078 2.1536891-7.0951 5.8614806-7.5656l-.1549204-1.2207zm7.7205705 7.082c.470571 3.708-2.153703 7.0952-5.861498 7.5657l.154921 1.2207c4.381922-.5561 7.48339-4.5592 6.927183-8.9412l-1.220606.1548z"/><path d="M10.178385 4.7305c-2.6965659.3422-4.6051277 2.8057-4.2628256 5.5021l1.220633-.1548c-.2567032-2.0225 1.1746784-3.87 3.1971486-4.1268l-.154956-1.2205zm4.281648 4.4177c.256684 2.0225-1.174694 3.8701-3.197121 4.1267l.154892 1.2208c2.696612-.3424 4.605157-2.8058 4.262862-5.5023l-1.220633.1548z"/><path d="M12.7100483395 10.1636864248a2.0000001959 2.0000003705-74.4955830453 1 1-3.8411434779-1.1160746884 2.0000001959 2.0000003705-74.4955830453 1 1 3.841143478 1.1160746884zM3.5874861 17.2051l6.3117891 5.9672 2.2638828-2.8311-7.2095775-4.8446-1.3660944 1.7085z"/><path d="M16.249886 4.969l-10.6168 8.1569 1.4699835 1.62L16.249886 4.969zM11.446322 1.6272c-4.4018444-.367-8.2677859 2.9037-8.6347983 7.3055l1.2261623.1023c.3105524-3.7246 3.5817762-6.4922 7.306365-6.1816l.102271-1.2262zm6.079404 8.5325c-.310637 3.7247-3.581811 6.4923-7.306403 6.1817l-.10227 1.2262c4.401795.3671 8.267785-2.9037 8.634788-7.3055l-1.226115-.1024z"/><path d="M11.19066 4.6927c-2.7087739-.226-5.0878427 1.7869-5.3136137 4.4955l1.2261346.1024c.1693959-2.0316 1.9536138-3.5411 3.9852831-3.3718l.102196-1.2261zm3.269599 5.2113c-.169415 2.0316-1.95365 3.5412-3.985236 3.3718l-.102319 1.2263c2.708887.2257 5.087891-1.787 5.313718-4.4958l-1.226163-.1023z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_broadcast_mini_connected.svg b/res/skins/Tango/buttons/btn_broadcast_mini_connected.svg
deleted file mode 100644
index 9305685f7069..000000000000
--- a/res/skins/Tango/buttons/btn_broadcast_mini_connected.svg
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="24"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_broadcast_mini_connected.svg"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="12.452076"
-     inkscape:cy="14.717749"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox-edge-midpoints="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1028.3622)">
-    <path
-       sodipodi:type="arc"
-       style="fill:#00c800;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path2990"
-       sodipodi:cx="9.7333946"
-       sodipodi:cy="7.3453302"
-       sodipodi:rx="1.314405"
-       sodipodi:ry="1.2975045"
-       d="m 11.0478,7.3453302 a 1.314405,1.2975045 0 1 1 -2.6288103,0 1.314405,1.2975045 0 1 1 2.6288103,0 z"
-       transform="matrix(1.5216011,0,0,1.5414204,-4.810344,1025.04)" />
-    <path
-       style="fill:#ff8605;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 3.782847,1031.3276 c -2.7805093,3.4338 -2.2510804,8.4713 1.182598,11.2519 l 0.7745451,-0.9565 c -2.905412,-2.3528 -3.3534014,-6.6154 -1.0006588,-9.5207 l -0.9564843,-0.7747 z m 10.477163,-0.2261 c 2.905412,2.3528 3.353401,6.6154 1.000659,9.5207 l 0.956485,0.7747 c 2.780508,-3.4338 2.25108,-8.4713 -1.182599,-11.2519 l -0.774545,0.9565 z"
-       id="path3809-3-3"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#e0c100;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 6.1740553,1033.2641 c -1.7110755,2.113 -1.3852107,5.2131 0.7277604,6.9241 l 0.774545,-0.9565 c -1.5848029,-1.2834 -1.8291194,-3.6083 -0.5458143,-5.1931 l -0.9564911,-0.7745 z m 6.1495847,0.2287 c 1.584708,1.2833 1.82912,3.6083 0.545815,5.1931 l 0.95649,0.7745 c 1.711075,-2.113 1.38521,-5.2131 -0.727761,-6.9241 l -0.774544,0.9565 z"
-       id="path3809-3-6-5"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="star"
-       style="fill:#00c800;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3039"
-       sodipodi:sides="3"
-       sodipodi:cx="-7.6250005"
-       sodipodi:cy="5.937499"
-       sodipodi:r1="9.5131493"
-       sodipodi:r2="4.7565746"
-       sodipodi:arg1="1.5707963"
-       sodipodi:arg2="2.6179939"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M -7.6250002,15.450648 -15.86363,1.1809246 l 16.47725833,-4e-7 z"
-       transform="matrix(-0.21846204,0,0,-1.5417196,8.3342268,1052.1828)"
-       inkscape:transform-center-y="-3.666742" />
-    <path
-       style="fill:#ff8605;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 16.217154,1031.3276 c 2.780508,3.4338 2.25108,8.4713 -1.182599,11.2519 l -0.774545,-0.9565 c 2.905412,-2.3528 3.353401,-6.6154 1.000659,-9.5207 l 0.956485,-0.7747 z M 5.73999,1031.1015 c -2.9054122,2.3528 -3.3534012,6.6154 -1.0006584,9.5207 l -0.9564851,0.7747 c -2.7805084,-3.4338 -2.2510801,-8.4713 1.1825987,-11.2519 l 0.7745448,0.9565 z"
-       id="path3809-3-3-7"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#e0c100;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 13.825945,1033.2641 c 1.711075,2.113 1.38521,5.2131 -0.72776,6.9241 l -0.774545,-0.9565 c 1.584803,-1.2834 1.829119,-3.6083 0.545814,-5.1931 l 0.956491,-0.7745 z m -6.1495848,0.2287 c -1.584708,1.2833 -1.8291196,3.6083 -0.5458146,5.1931 l -0.95649,0.7745 c -1.7110757,-2.113 -1.3852108,-5.2131 0.7277607,-6.9241 l 0.7745439,0.9565 z"
-       id="path3809-3-6-5-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_broadcast_mini_connecting.svg b/res/skins/Tango/buttons/btn_broadcast_mini_connecting.svg
deleted file mode 100644
index 69e2d468ee58..000000000000
--- a/res/skins/Tango/buttons/btn_broadcast_mini_connecting.svg
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="24"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_broadcast_mini_connecting.svg"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="11.785256"
-     inkscape:cy="16.017761"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox-edge-midpoints="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1028.3622)">
-    <path
-       sodipodi:type="arc"
-       style="fill:#ffc105;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path2990"
-       sodipodi:cx="9.7333946"
-       sodipodi:cy="7.3453302"
-       sodipodi:rx="1.314405"
-       sodipodi:ry="1.2975045"
-       d="m 11.0478,7.3453302 c 0,0.716592 -0.58848,1.2975046 -1.3144054,1.2975046 -0.7259258,0 -1.3144049,-0.5809126 -1.3144049,-1.2975046 0,-0.7165919 0.5884791,-1.2975045 1.3144049,-1.2975045 0.7259254,0 1.3144054,0.5809126 1.3144054,1.2975045 z"
-       transform="matrix(1.5216011,0,0,1.5414204,-4.810344,1025.04)" />
-    <path
-       style="fill:#d8d8d8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 3.7828441,1031.3277 c -2.7805055,3.4336 -2.2510803,8.4712 1.1826037,11.2517 l 0.7745452,-0.9565 c -2.9054128,-2.3527 -3.3534029,-6.6153 -1.0006614,-9.5206 l -0.9564875,-0.7746 z m 10.4771629,-0.2261 c 2.905413,2.3527 3.353403,6.6153 1.000661,9.5206 l 0.956488,0.7746 c 2.780506,-3.4336 2.25108,-8.4712 -1.182604,-11.2517 l -0.774545,0.9565 z"
-       id="path3809-3-3"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#e6d290;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 6.1740568,1033.264 c -1.7110785,2.1131 -1.3852093,5.2132 0.7277585,6.9242 l 0.774545,-0.9565 c -1.5848031,-1.2834 -1.8291201,-3.6083 -0.5458162,-5.1931 l -0.9564873,-0.7746 z m 6.1495832,0.2288 c 1.584707,1.2833 1.829121,3.6083 0.545817,5.1931 l 0.956486,0.7746 c 1.711079,-2.1131 1.38521,-5.2132 -0.727758,-6.9242 l -0.774545,0.9565 z"
-       id="path3809-3-6-5"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffc105;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3039"
-       sodipodi:sides="3"
-       sodipodi:cx="-7.6250005"
-       sodipodi:cy="5.937499"
-       sodipodi:r1="9.5131493"
-       sodipodi:r2="4.7565746"
-       sodipodi:arg1="1.5707963"
-       sodipodi:arg2="2.6179939"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M -7.6250002,15.450648 -15.86363,1.1809246 l 16.47725833,-4e-7 z"
-       transform="matrix(-0.21846204,0,0,-1.5417196,8.3342268,1052.1828)"
-       inkscape:transform-center-y="-3.666742" />
-    <path
-       style="fill:#d8d8d8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 16.217155,1031.3277 c 2.780506,3.4336 2.25108,8.4712 -1.182604,11.2517 l -0.774545,-0.9565 c 2.905413,-2.3527 3.353403,-6.6153 1.000662,-9.5206 l 0.956487,-0.7746 z m -10.4771619,-0.2261 c -2.905413,2.3527 -3.353403,6.6153 -1.000661,9.5206 l -0.956488,0.7746 c -2.780506,-3.4336 -2.25108,-8.4712 1.182604,-11.2517 l 0.774545,0.9565 z"
-       id="path3809-3-3-6"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#e6d290;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 13.825942,1033.264 c 1.711079,2.1131 1.38521,5.2132 -0.727758,6.9242 l -0.774545,-0.9565 c 1.584803,-1.2834 1.82912,-3.6083 0.545816,-5.1931 l 0.956487,-0.7746 z m -6.1495819,0.2288 c -1.584707,1.2833 -1.829121,3.6083 -0.545817,5.1931 l -0.956486,0.7746 c -1.711079,-2.1131 -1.38521,-5.2132 0.727758,-6.9242 l 0.774545,0.9565 z"
-       id="path3809-3-6-5-2"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_broadcast_mini_failure.svg b/res/skins/Tango/buttons/btn_broadcast_mini_failure.svg
deleted file mode 100644
index 3604494badea..000000000000
--- a/res/skins/Tango/buttons/btn_broadcast_mini_failure.svg
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="24"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_broadcast_mini_failure.svg"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="15.259522"
-     inkscape:cy="6.1722298"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-paths="false"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox-edge-midpoints="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1028.3622)">
-    <path
-       style="fill:#fa00ee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 9.7911035,1030.0411 c -4.381951,0.5562 -7.4833899,4.5592 -6.9271932,8.9412 l 1.220633,-0.1549 c -0.4706142,-3.7078 2.1536891,-7.0951 5.8614806,-7.5656 l -0.1549204,-1.2207 z m 7.7205705,7.082 c 0.470571,3.708 -2.153703,7.0952 -5.861498,7.5657 l 0.154921,1.2207 c 4.381922,-0.5561 7.48339,-4.5592 6.927183,-8.9412 l -1.220606,0.1548 z"
-       id="path3809-3"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-y="0.0858262"
-       inkscape:transform-center-x="0.066508337" />
-    <path
-       style="fill:#fa00ee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 10.178385,1033.0927 c -2.6965659,0.3422 -4.6051277,2.8057 -4.2628256,5.5021 l 1.220633,-0.1548 c -0.2567032,-2.0225 1.1746784,-3.87 3.1971486,-4.1268 l -0.154956,-1.2205 z m 4.281648,4.4177 c 0.256684,2.0225 -1.174694,3.8701 -3.197121,4.1267 l 0.154892,1.2208 c 2.696612,-0.3424 4.605157,-2.8058 4.262862,-5.5023 l -1.220633,0.1548 z"
-       id="path3809-3-6"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-y="0.085924775"
-       inkscape:transform-center-x="0.066509276" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#fa00ee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path2990"
-       sodipodi:cx="9.7333946"
-       sodipodi:cy="7.3453302"
-       sodipodi:rx="1.314405"
-       sodipodi:ry="1.2975045"
-       d="m 11.0478,7.3453302 a 1.314405,1.2975045 0 1 1 -2.6288103,0 1.314405,1.2975045 0 1 1 2.6288103,0 z"
-       transform="matrix(1.4611718,0.42455505,-0.43008501,1.480204,-0.27356906,1022.9629)" />
-    <path
-       style="fill:#fa00ee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 3.5874861,1045.5673 6.3117891,5.9672 2.2638828,-2.8311 -7.2095775,-4.8446 -1.3660944,1.7085 z"
-       id="path3039"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-x="1.9822223"
-       inkscape:transform-center-y="-3.85275" />
-    <path
-       style="fill:#fa00ee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 16.249886,1033.3312 -10.6168,8.1569 1.4699835,1.62 9.1468165,-9.7769 z"
-       id="path3039-3"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-y="4.888486"
-       inkscape:transform-center-x="5.3084007" />
-    <path
-       style="fill:#fa00ee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 11.446322,1029.9894 c -4.4018444,-0.367 -8.2677859,2.9037 -8.6347983,7.3055 l 1.2261623,0.1023 c 0.3105524,-3.7246 3.5817762,-6.4922 7.306365,-6.1816 l 0.102271,-1.2262 z m 6.079404,8.5325 c -0.310637,3.7247 -3.581811,6.4923 -7.306403,6.1817 l -0.10227,1.2262 c 4.401795,0.3671 8.267785,-2.9037 8.634788,-7.3055 l -1.226115,-0.1024 z"
-       id="path3809-3-2"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-y="0.070138805"
-       inkscape:transform-center-x="0.082901907" />
-    <path
-       style="fill:#fa00ee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 11.19066,1033.0549 c -2.7087739,-0.226 -5.0878427,1.7869 -5.3136137,4.4955 l 1.2261346,0.1024 c 0.1693959,-2.0316 1.9536138,-3.5411 3.9852831,-3.3718 l 0.102196,-1.2261 z m 3.269599,5.2113 c -0.169415,2.0316 -1.95365,3.5412 -3.985236,3.3718 l -0.102319,1.2263 c 2.708887,0.2257 5.087891,-1.787 5.313718,-4.4958 l -1.226163,-0.1023 z"
-       id="path3809-3-6-7"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-y="0.070203584"
-       inkscape:transform-center-x="0.082887193" />
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_broadcast_mini_off.svg b/res/skins/Tango/buttons/btn_broadcast_mini_off.svg
deleted file mode 100644
index a746b278de3b..000000000000
--- a/res/skins/Tango/buttons/btn_broadcast_mini_off.svg
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="24"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_broadcast_mini_off.svg"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="18.421819"
-     inkscape:cy="20.061628"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1028.3622)">
-    <path
-       style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 3.7828439,1031.3276 c -2.7805057,3.4336 -2.25108,8.4712 1.1826037,11.2517 l 0.7745449,-0.9565 c -2.905423,-2.3528 -3.3534024,-6.6153 -1.0006614,-9.5206 l -0.9564872,-0.7746 z m 10.4771631,-0.2261 c 2.905413,2.3527 3.353392,6.6152 1.000661,9.5206 l 0.956488,0.7746 c 2.780506,-3.4336 2.25108,-8.4712 -1.182604,-11.2517 l -0.774545,0.9565 z"
-       id="path3809-3"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#a3a3a3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 6.1740775,1033.2641 c -1.7110787,2.1131 -1.3852193,5.2131 0.7277376,6.924 l 0.7745555,-0.9564 c -1.5848038,-1.2834 -1.82912,-3.6083 -0.5458163,-5.1931 l -0.9564768,-0.7745 z m 6.1495735,0.2287 c 1.584695,1.2832 1.829119,3.6083 0.545816,5.1931 l 0.956476,0.7745 c 1.711079,-2.1131 1.38522,-5.2131 -0.727737,-6.924 l -0.774555,0.9564 z"
-       id="path3809-3-6"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path2990"
-       sodipodi:cx="9.7333946"
-       sodipodi:cy="7.3453302"
-       sodipodi:rx="1.314405"
-       sodipodi:ry="1.2975045"
-       d="m 11.0478,7.3453302 c 0,0.716592 -0.58848,1.2975046 -1.3144054,1.2975046 -0.7259258,0 -1.3144049,-0.5809126 -1.3144049,-1.2975046 0,-0.7165919 0.5884791,-1.2975045 1.3144049,-1.2975045 0.7259254,0 1.3144054,0.5809126 1.3144054,1.2975045 z"
-       transform="matrix(1.5216011,0,0,1.5414204,-4.810344,1025.04)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3039"
-       sodipodi:sides="3"
-       sodipodi:cx="-7.6250005"
-       sodipodi:cy="5.937499"
-       sodipodi:r1="9.5131493"
-       sodipodi:r2="4.7565746"
-       sodipodi:arg1="1.5707963"
-       sodipodi:arg2="2.6179939"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M -7.6250002,15.450648 -15.86363,1.1809246 l 16.47725833,-4e-7 z"
-       transform="matrix(-0.21846204,0,0,-1.5417196,8.3342268,1052.1828)"
-       inkscape:transform-center-y="-3.666742" />
-    <path
-       style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 16.217156,1031.3276 c 2.780506,3.4336 2.25108,8.4712 -1.182604,11.2517 l -0.774544,-0.9565 c 2.905422,-2.3528 3.353402,-6.6153 1.000661,-9.5206 l 0.956487,-0.7746 z m -10.4771629,-0.2261 c -2.905413,2.3527 -3.353392,6.6152 -1.000661,9.5206 l -0.956488,0.7746 c -2.780506,-3.4336 -2.25108,-8.4712 1.182604,-11.2517 l 0.774545,0.9565 z"
-       id="path3809-3-3"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#a3a3a3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 13.825923,1033.2641 c 1.711078,2.1131 1.385219,5.2131 -0.727738,6.924 l -0.774556,-0.9564 c 1.584804,-1.2834 1.82912,-3.6083 0.545817,-5.1931 l 0.956477,-0.7745 z m -6.1495739,0.2287 c -1.584695,1.2832 -1.829119,3.6083 -0.545816,5.1931 l -0.956476,0.7745 c -1.711079,-2.1131 -1.38522,-5.2131 0.727737,-6.924 l 0.774555,0.9564 z"
-       id="path3809-3-6-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_broadcast_mini_off_hover.svg b/res/skins/Tango/buttons/btn_broadcast_mini_off_hover.svg
deleted file mode 100644
index 32e2d8a5dd4d..000000000000
--- a/res/skins/Tango/buttons/btn_broadcast_mini_off_hover.svg
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="24"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_broadcast_mini_off_hover.svg"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="-0.65789374"
-     inkscape:cy="20.65706"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1028.3622)">
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 3.7828439,1031.3276 c -2.7805057,3.4336 -2.25108,8.4712 1.1826037,11.2517 l 0.7745449,-0.9565 c -2.905423,-2.3528 -3.3534024,-6.6153 -1.0006614,-9.5206 l -0.9564872,-0.7746 z m 10.4771631,-0.2261 c 2.905413,2.3527 3.353392,6.6152 1.000661,9.5206 l 0.956488,0.7746 c 2.780506,-3.4336 2.25108,-8.4712 -1.182604,-11.2517 l -0.774545,0.9565 z"
-       id="path3809-3"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#c6c6c6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 6.1740775,1033.2641 c -1.7110787,2.1131 -1.3852193,5.2131 0.7277376,6.924 l 0.7745555,-0.9564 c -1.5848038,-1.2834 -1.82912,-3.6083 -0.5458163,-5.1931 l -0.9564768,-0.7745 z m 6.1495735,0.2287 c 1.584695,1.2832 1.829119,3.6083 0.545816,5.1931 l 0.956476,0.7745 c 1.711079,-2.1131 1.38522,-5.2131 -0.727737,-6.924 l -0.774555,0.9564 z"
-       id="path3809-3-6"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path2990"
-       sodipodi:cx="9.7333946"
-       sodipodi:cy="7.3453302"
-       sodipodi:rx="1.314405"
-       sodipodi:ry="1.2975045"
-       d="m 11.0478,7.3453302 c 0,0.716592 -0.58848,1.2975046 -1.3144054,1.2975046 -0.7259258,0 -1.3144049,-0.5809126 -1.3144049,-1.2975046 0,-0.7165919 0.5884791,-1.2975045 1.3144049,-1.2975045 0.7259254,0 1.3144054,0.5809126 1.3144054,1.2975045 z"
-       transform="matrix(1.5216011,0,0,1.5414204,-4.810344,1025.04)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3039"
-       sodipodi:sides="3"
-       sodipodi:cx="-7.6250005"
-       sodipodi:cy="5.937499"
-       sodipodi:r1="9.5131493"
-       sodipodi:r2="4.7565746"
-       sodipodi:arg1="1.5707963"
-       sodipodi:arg2="2.6179939"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M -7.6250002,15.450648 -15.86363,1.1809246 l 16.47725833,-4e-7 z"
-       transform="matrix(-0.21846204,0,0,-1.5417196,8.3342268,1052.1828)"
-       inkscape:transform-center-y="-3.666742" />
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 16.217156,1031.3276 c 2.780506,3.4336 2.25108,8.4712 -1.182604,11.2517 l -0.774544,-0.9565 c 2.905422,-2.3528 3.353402,-6.6153 1.000661,-9.5206 l 0.956487,-0.7746 z m -10.4771629,-0.2261 c -2.905413,2.3527 -3.353392,6.6152 -1.000661,9.5206 l -0.956488,0.7746 c -2.780506,-3.4336 -2.25108,-8.4712 1.182604,-11.2517 l 0.774545,0.9565 z"
-       id="path3809-3-3"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#c6c6c6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 13.825923,1033.2641 c 1.711078,2.1131 1.385219,5.2131 -0.727738,6.924 l -0.774556,-0.9564 c 1.584804,-1.2834 1.82912,-3.6083 0.545817,-5.1931 l 0.956477,-0.7745 z m -6.1495739,0.2287 c -1.584695,1.2832 -1.829119,3.6083 -0.545816,5.1931 l -0.956476,0.7745 c -1.711079,-2.1131 -1.38522,-5.2131 0.727737,-6.924 l 0.774555,0.9564 z"
-       id="path3809-3-6-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_broadcast_off.svg b/res/skins/Tango/buttons/btn_broadcast_off.svg
index 3e8d74bdf2c7..0f2af5f366b6 100644
--- a/res/skins/Tango/buttons/btn_broadcast_off.svg
+++ b/res/skins/Tango/buttons/btn_broadcast_off.svg
@@ -1,115 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="30"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_broadcast_off.svg"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="63.999997"
-     inkscape:cx="7.1877247"
-     inkscape:cy="21.888867"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1022.3622)">
-    <path
-       style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 3.7828439,1025.3276 c -2.7805057,3.4336 -2.25108,8.4712 1.1826037,11.2517 l 0.7745449,-0.9565 c -2.905423,-2.3528 -3.3534024,-6.6153 -1.0006614,-9.5206 l -0.9564872,-0.7746 z m 10.4771631,-0.2261 c 2.905413,2.3527 3.353392,6.6152 1.000661,9.5206 l 0.956488,0.7746 c 2.780506,-3.4336 2.25108,-8.4712 -1.182604,-11.2517 l -0.774545,0.9565 z"
-       id="path3809-3"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#a3a3a3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 6.1740775,1027.2641 c -1.7110787,2.1131 -1.3852193,5.2131 0.7277376,6.924 l 0.7745555,-0.9564 c -1.5848038,-1.2834 -1.82912,-3.6083 -0.5458163,-5.1931 l -0.9564768,-0.7745 z m 6.1495735,0.2287 c 1.584695,1.2832 1.829119,3.6083 0.545816,5.1931 l 0.956476,0.7745 c 1.711079,-2.1131 1.38522,-5.2131 -0.727737,-6.924 l -0.774555,0.9564 z"
-       id="path3809-3-6"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path2990"
-       sodipodi:cx="9.7333946"
-       sodipodi:cy="7.3453302"
-       sodipodi:rx="1.314405"
-       sodipodi:ry="1.2975045"
-       d="m 11.0478,7.3453302 c 0,0.716592 -0.58848,1.2975046 -1.3144054,1.2975046 -0.7259258,0 -1.3144049,-0.5809126 -1.3144049,-1.2975046 0,-0.7165919 0.5884791,-1.2975045 1.3144049,-1.2975045 0.7259254,0 1.3144054,0.5809126 1.3144054,1.2975045 z"
-       transform="matrix(1.5216011,0,0,1.5414204,-4.810344,1019.04)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3039"
-       sodipodi:sides="3"
-       sodipodi:cx="-7.6250005"
-       sodipodi:cy="5.937499"
-       sodipodi:r1="9.5131493"
-       sodipodi:r2="4.7565746"
-       sodipodi:arg1="1.5707963"
-       sodipodi:arg2="2.6179939"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M -7.6250002,15.450648 -15.86363,1.1809246 l 16.47725833,-4e-7 z"
-       transform="matrix(-0.21846204,0,0,-1.5417196,8.3342268,1052.1828)"
-       inkscape:transform-center-y="-3.666742" />
-    <path
-       style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 16.217156,1025.3276 c 2.780506,3.4336 2.25108,8.4712 -1.182604,11.2517 l -0.774544,-0.9565 c 2.905422,-2.3528 3.353402,-6.6153 1.000661,-9.5206 l 0.956487,-0.7746 z m -10.4771629,-0.2261 c -2.905413,2.3527 -3.353392,6.6152 -1.000661,9.5206 l -0.956488,0.7746 c -2.780506,-3.4336 -2.25108,-8.4712 1.182604,-11.2517 l 0.774545,0.9565 z"
-       id="path3809-3-3"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#a3a3a3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 13.825923,1027.2641 c 1.711078,2.1131 1.385219,5.2131 -0.727738,6.924 l -0.774556,-0.9564 c 1.584804,-1.2834 1.82912,-3.6083 0.545817,-5.1931 l 0.956477,-0.7745 z m -6.1495739,0.2287 c -1.584695,1.2832 -1.829119,3.6083 -0.545816,5.1931 l -0.956476,0.7745 c -1.711079,-2.1131 -1.38522,-5.2131 0.727737,-6.924 l 0.774555,0.9564 z"
-       id="path3809-3-6-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="30"><path d="M3.7828439 2.9654c-2.7805057 3.4336-2.25108 8.4712 1.1826037 11.2517l.7745449-.9565C2.8345695 10.9078 2.3865901 6.6453 4.7393311 3.74l-.9564872-.7746zm10.4771631-.2261c2.905413 2.3527 3.353392 6.6152 1.000661 9.5206l.956488.7746c2.780506-3.4336 2.25108-8.4712-1.182604-11.2517l-.774545.9565z" fill="#aaa"/><path d="M6.1740775 4.9019c-1.7110787 2.1131-1.3852193 5.2131.7277376 6.924l.7745555-.9564c-1.5848038-1.2834-1.82912-3.6083-.5458163-5.1931l-.9564768-.7745zm6.1495735.2287c1.584695 1.2832 1.829119 3.6083.545816 5.1931l.956476.7745c1.711079-2.1131 1.38522-5.2131-.727737-6.924l-.774555.9564z" fill="#a3a3a3"/><path d="M12.0000006326 8.000041815c0 1.1045695273-.8954318153 2.0000000595-2.0000007025 2.0000000595-1.1045694958 0-1.9999999417-.8954305322-1.9999999417-2.0000000595 0-1.1045693731.8954304459-1.9999999054 1.9999999417-1.9999999054 1.1045688872 0 2.0000007025.8954305323 2.0000007025 1.9999999054z" fill="#888"/><path d="M9.9999998987 6.0000331457l1.799827873 21.9999122524-3.5996554685 6.166e-7z" fill="#888"/><path d="M16.217156 2.9654c2.780506 3.4336 2.25108 8.4712-1.182604 11.2517l-.774544-.9565c2.905422-2.3528 3.353402-6.6153 1.000661-9.5206l.956487-.7746zM5.7399931 2.7393c-2.905413 2.3527-3.353392 6.6152-1.000661 9.5206l-.956488.7746c-2.780506-3.4336-2.25108-8.4712 1.182604-11.2517l.774545.9565z" fill="#aaa"/><path d="M13.825923 4.9019c1.711078 2.1131 1.385219 5.2131-.727738 6.924l-.774556-.9564c1.584804-1.2834 1.82912-3.6083.545817-5.1931l.956477-.7745zm-6.1495739.2287c-1.584695 1.2832-1.829119 3.6083-.545816 5.1931l-.956476.7745c-1.711079-2.1131-1.38522-5.2131.727737-6.924l.774555.9564z" fill="#a3a3a3"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_broadcast_off_hover.svg b/res/skins/Tango/buttons/btn_broadcast_off_hover.svg
index d71d3e87eff6..2e7e2e5fc263 100644
--- a/res/skins/Tango/buttons/btn_broadcast_off_hover.svg
+++ b/res/skins/Tango/buttons/btn_broadcast_off_hover.svg
@@ -1,115 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="30"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_broadcast_off.svg"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="63.999997"
-     inkscape:cx="7.1877247"
-     inkscape:cy="21.888867"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1022.3622)">
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 3.7828439,1025.3276 c -2.7805057,3.4336 -2.25108,8.4712 1.1826037,11.2517 l 0.7745449,-0.9565 c -2.905423,-2.3528 -3.3534024,-6.6153 -1.0006614,-9.5206 l -0.9564872,-0.7746 z m 10.4771631,-0.2261 c 2.905413,2.3527 3.353392,6.6152 1.000661,9.5206 l 0.956488,0.7746 c 2.780506,-3.4336 2.25108,-8.4712 -1.182604,-11.2517 l -0.774545,0.9565 z"
-       id="path3809-3"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#c6c6c6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 6.1740775,1027.2641 c -1.7110787,2.1131 -1.3852193,5.2131 0.7277376,6.924 l 0.7745555,-0.9564 c -1.5848038,-1.2834 -1.82912,-3.6083 -0.5458163,-5.1931 l -0.9564768,-0.7745 z m 6.1495735,0.2287 c 1.584695,1.2832 1.829119,3.6083 0.545816,5.1931 l 0.956476,0.7745 c 1.711079,-2.1131 1.38522,-5.2131 -0.727737,-6.924 l -0.774555,0.9564 z"
-       id="path3809-3-6"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path2990"
-       sodipodi:cx="9.7333946"
-       sodipodi:cy="7.3453302"
-       sodipodi:rx="1.314405"
-       sodipodi:ry="1.2975045"
-       d="m 11.0478,7.3453302 c 0,0.716592 -0.58848,1.2975046 -1.3144054,1.2975046 -0.7259258,0 -1.3144049,-0.5809126 -1.3144049,-1.2975046 0,-0.7165919 0.5884791,-1.2975045 1.3144049,-1.2975045 0.7259254,0 1.3144054,0.5809126 1.3144054,1.2975045 z"
-       transform="matrix(1.5216011,0,0,1.5414204,-4.810344,1019.04)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3039"
-       sodipodi:sides="3"
-       sodipodi:cx="-7.6250005"
-       sodipodi:cy="5.937499"
-       sodipodi:r1="9.5131493"
-       sodipodi:r2="4.7565746"
-       sodipodi:arg1="1.5707963"
-       sodipodi:arg2="2.6179939"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M -7.6250002,15.450648 -15.86363,1.1809246 l 16.47725833,-4e-7 z"
-       transform="matrix(-0.21846204,0,0,-1.5417196,8.3342268,1052.1828)"
-       inkscape:transform-center-y="-3.666742" />
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 16.217156,1025.3276 c 2.780506,3.4336 2.25108,8.4712 -1.182604,11.2517 l -0.774544,-0.9565 c 2.905422,-2.3528 3.353402,-6.6153 1.000661,-9.5206 l 0.956487,-0.7746 z m -10.4771629,-0.2261 c -2.905413,2.3527 -3.353392,6.6152 -1.000661,9.5206 l -0.956488,0.7746 c -2.780506,-3.4336 -2.25108,-8.4712 1.182604,-11.2517 l 0.774545,0.9565 z"
-       id="path3809-3-3"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#c6c6c6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 13.825923,1027.2641 c 1.711078,2.1131 1.385219,5.2131 -0.727738,6.924 l -0.774556,-0.9564 c 1.584804,-1.2834 1.82912,-3.6083 0.545817,-5.1931 l 0.956477,-0.7745 z m -6.1495739,0.2287 c -1.584695,1.2832 -1.829119,3.6083 -0.545816,5.1931 l -0.956476,0.7745 c -1.711079,-2.1131 -1.38522,-5.2131 0.727737,-6.924 l 0.774555,0.9564 z"
-       id="path3809-3-6-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="30"><path d="M3.7828439 2.9654c-2.7805057 3.4336-2.25108 8.4712 1.1826037 11.2517l.7745449-.9565C2.8345695 10.9078 2.3865901 6.6453 4.7393311 3.74l-.9564872-.7746zm10.4771631-.2261c2.905413 2.3527 3.353392 6.6152 1.000661 9.5206l.956488.7746c2.780506-3.4336 2.25108-8.4712-1.182604-11.2517l-.774545.9565z" fill="#d2d2d2"/><path d="M6.1740775 4.9019c-1.7110787 2.1131-1.3852193 5.2131.7277376 6.924l.7745555-.9564c-1.5848038-1.2834-1.82912-3.6083-.5458163-5.1931l-.9564768-.7745zm6.1495735.2287c1.584695 1.2832 1.829119 3.6083.545816 5.1931l.956476.7745c1.711079-2.1131 1.38522-5.2131-.727737-6.924l-.774555.9564z" fill="#c6c6c6"/><path d="M12.0000006326 8.000041815c0 1.1045695273-.8954318153 2.0000000595-2.0000007025 2.0000000595-1.1045694958 0-1.9999999417-.8954305322-1.9999999417-2.0000000595 0-1.1045693731.8954304459-1.9999999054 1.9999999417-1.9999999054 1.1045688872 0 2.0000007025.8954305323 2.0000007025 1.9999999054z" fill="#d2d2d2"/><path d="M9.9999998987 6.0000331457l1.799827873 21.9999122524-3.5996554685 6.166e-7zM16.217156 2.9654c2.780506 3.4336 2.25108 8.4712-1.182604 11.2517l-.774544-.9565c2.905422-2.3528 3.353402-6.6153 1.000661-9.5206l.956487-.7746zM5.7399931 2.7393c-2.905413 2.3527-3.353392 6.6152-1.000661 9.5206l-.956488.7746c-2.780506-3.4336-2.25108-8.4712 1.182604-11.2517l.774545.9565z" fill="#d2d2d2"/><path d="M13.825923 4.9019c1.711078 2.1131 1.385219 5.2131-.727738 6.924l-.774556-.9564c1.584804-1.2834 1.82912-3.6083.545817-5.1931l.956477-.7745zm-6.1495739.2287c-1.584695 1.2832-1.829119 3.6083-.545816 5.1931l-.956476.7745c-1.711079-2.1131-1.38522-5.2131.727737-6.924l.774555.9564z" fill="#c6c6c6"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_broadcast_off_hover_netbook.svg b/res/skins/Tango/buttons/btn_broadcast_off_hover_netbook.svg
new file mode 100644
index 000000000000..53bb00c4f70c
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_broadcast_off_hover_netbook.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="24"><path d="M3.7828439 2.9654c-2.7805057 3.4336-2.25108 8.4712 1.1826037 11.2517l.7745449-.9565C2.8345695 10.9078 2.3865901 6.6453 4.7393311 3.74l-.9564872-.7746zm10.4771631-.2261c2.905413 2.3527 3.353392 6.6152 1.000661 9.5206l.956488.7746c2.780506-3.4336 2.25108-8.4712-1.182604-11.2517l-.774545.9565z" fill="#d2d2d2"/><path d="M6.1740775 4.9019c-1.7110787 2.1131-1.3852193 5.2131.7277376 6.924l.7745555-.9564c-1.5848038-1.2834-1.82912-3.6083-.5458163-5.1931l-.9564768-.7745zm6.1495735.2287c1.584695 1.2832 1.829119 3.6083.545816 5.1931l.956476.7745c1.711079-2.1131 1.38522-5.2131-.727737-6.924l-.774555.9564z" fill="#c6c6c6"/><path d="M12.0000006326 8.000041815c0 1.1045695273-.8954318153 2.0000000595-2.0000007025 2.0000000595-1.1045694958 0-1.9999999417-.8954305322-1.9999999417-2.0000000595 0-1.1045693731.8954304459-1.9999999054 1.9999999417-1.9999999054 1.1045688872 0 2.0000007025.8954305323 2.0000007025 1.9999999054z" fill="#d2d2d2"/><path d="M9.9999998987.0000331457l1.799827873 21.9999122524-3.5996554685 6.166e-7zM16.217156 2.9654c2.780506 3.4336 2.25108 8.4712-1.182604 11.2517l-.774544-.9565c2.905422-2.3528 3.353402-6.6153 1.000661-9.5206l.956487-.7746zM5.7399931 2.7393c-2.905413 2.3527-3.353392 6.6152-1.000661 9.5206l-.956488.7746c-2.780506-3.4336-2.25108-8.4712 1.182604-11.2517l.774545.9565z" fill="#d2d2d2"/><path d="M13.825923 4.9019c1.711078 2.1131 1.385219 5.2131-.727738 6.924l-.774556-.9564c1.584804-1.2834 1.82912-3.6083.545817-5.1931l.956477-.7745zm-6.1495739.2287c-1.584695 1.2832-1.829119 3.6083-.545816 5.1931l-.956476.7745c-1.711079-2.1131-1.38522-5.2131.727737-6.924l.774555.9564z" fill="#c6c6c6"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_broadcast_off_netbook.svg b/res/skins/Tango/buttons/btn_broadcast_off_netbook.svg
new file mode 100644
index 000000000000..433c4f6a2234
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_broadcast_off_netbook.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="24"><path d="M3.7828439 2.9654c-2.7805057 3.4336-2.25108 8.4712 1.1826037 11.2517l.7745449-.9565C2.8345695 10.9078 2.3865901 6.6453 4.7393311 3.74l-.9564872-.7746zm10.4771631-.2261c2.905413 2.3527 3.353392 6.6152 1.000661 9.5206l.956488.7746c2.780506-3.4336 2.25108-8.4712-1.182604-11.2517l-.774545.9565z" fill="#aaa"/><path d="M6.1740775 4.9019c-1.7110787 2.1131-1.3852193 5.2131.7277376 6.924l.7745555-.9564c-1.5848038-1.2834-1.82912-3.6083-.5458163-5.1931l-.9564768-.7745zm6.1495735.2287c1.584695 1.2832 1.829119 3.6083.545816 5.1931l.956476.7745c1.711079-2.1131 1.38522-5.2131-.727737-6.924l-.774555.9564z" fill="#a3a3a3"/><path d="M12.0000006326 8.000041815c0 1.1045695273-.8954318153 2.0000000595-2.0000007025 2.0000000595-1.1045694958 0-1.9999999417-.8954305322-1.9999999417-2.0000000595 0-1.1045693731.8954304459-1.9999999054 1.9999999417-1.9999999054 1.1045688872 0 2.0000007025.8954305323 2.0000007025 1.9999999054z" fill="#888"/><path d="M9.9999998987.0000331457l1.799827873 21.9999122524-3.5996554685 6.166e-7z" fill="#888"/><path d="M16.217156 2.9654c2.780506 3.4336 2.25108 8.4712-1.182604 11.2517l-.774544-.9565c2.905422-2.3528 3.353402-6.6153 1.000661-9.5206l.956487-.7746zM5.7399931 2.7393c-2.905413 2.3527-3.353392 6.6152-1.000661 9.5206l-.956488.7746c-2.780506-3.4336-2.25108-8.4712 1.182604-11.2517l.774545.9565z" fill="#aaa"/><path d="M13.825923 4.9019c1.711078 2.1131 1.385219 5.2131-.727738 6.924l-.774556-.9564c1.584804-1.2834 1.82912-3.6083.545817-5.1931l.956477-.7745zm-6.1495739.2287c-1.584695 1.2832-1.829119 3.6083-.545816 5.1931l-.956476.7745c-1.711079-2.1131-1.38522-5.2131.727737-6.924l.774555.9564z" fill="#a3a3a3"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_cf_center.svg b/res/skins/Tango/buttons/btn_cf_center.svg
deleted file mode 100644
index 5228241d39a7..000000000000
--- a/res/skins/Tango/buttons/btn_cf_center.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_cf_center.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="45.254832"
-     inkscape:cx="1.8369548"
-     inkscape:cy="6.8924075"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3989"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1032.3622)">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1">
-      <rect
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046"
-         width="14"
-         height="2"
-         x="-1049.3622"
-         y="9"
-         transform="matrix(0,-1,1,0,0,0)" />
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7"
-         width="7"
-         height="2"
-         x="11"
-         y="1041.3622" />
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7-5"
-         width="7"
-         height="2"
-         x="2"
-         y="1041.3622" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_cf_center_attention.svg b/res/skins/Tango/buttons/btn_cf_center_attention.svg
deleted file mode 100644
index 988e12f436e8..000000000000
--- a/res/skins/Tango/buttons/btn_cf_center_attention.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_cf_center_attention.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="-6.1816801"
-     inkscape:cy="8.1956914"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3989"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1032.3622)">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1">
-      <rect
-         style="fill:#ffb401;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046"
-         width="14"
-         height="2"
-         x="-1049.3622"
-         y="9"
-         transform="matrix(0,-1,1,0,0,0)" />
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7"
-         width="7"
-         height="2"
-         x="11"
-         y="1041.3622" />
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7-5"
-         width="7"
-         height="2"
-         x="2"
-         y="1041.3622" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_cf_left.svg b/res/skins/Tango/buttons/btn_cf_left.svg
deleted file mode 100644
index 1afe143629ad..000000000000
--- a/res/skins/Tango/buttons/btn_cf_left.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_cf_left.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="3.4493066"
-     inkscape:cy="6.9292066"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3989"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1032.3622)">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1">
-      <rect
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046"
-         width="14"
-         height="2"
-         x="1035.3622"
-         y="-4"
-         transform="matrix(0,1,-1,0,0,0)" />
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7-6"
-         width="7"
-         height="2"
-         x="11"
-         y="1041.3622" />
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7-5-2"
-         width="5"
-         height="2"
-         x="4"
-         y="1041.3622" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_cf_left_attention.svg b/res/skins/Tango/buttons/btn_cf_left_attention.svg
deleted file mode 100644
index bff91d38b0a0..000000000000
--- a/res/skins/Tango/buttons/btn_cf_left_attention.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_cf_left_attention.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.999999"
-     inkscape:cx="-8.3161038"
-     inkscape:cy="5.6828654"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3989"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1032.3622)">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1">
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7"
-         width="7"
-         height="2"
-         x="11"
-         y="1041.3622" />
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7-5"
-         width="6.09375"
-         height="2"
-         x="2.90625"
-         y="1041.3622" />
-      <rect
-         style="fill:#dc0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046"
-         width="14"
-         height="2"
-         x="1035.3622"
-         y="-4"
-         transform="matrix(0,1,-1,0,0,0)" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_cf_right.svg b/res/skins/Tango/buttons/btn_cf_right.svg
deleted file mode 100644
index eba9110abee1..000000000000
--- a/res/skins/Tango/buttons/btn_cf_right.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_cf_right.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="-12.794203"
-     inkscape:cy="-1.8661398"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3989"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1032.3622)">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1">
-      <rect
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046"
-         width="14"
-         height="2"
-         x="-1049.3622"
-         y="16"
-         transform="matrix(0,-1,1,0,0,0)" />
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7"
-         width="5"
-         height="2"
-         x="11"
-         y="1041.3622" />
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7-5"
-         width="7"
-         height="2"
-         x="2"
-         y="1041.3622" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_cf_right_attention.svg b/res/skins/Tango/buttons/btn_cf_right_attention.svg
deleted file mode 100644
index e5a71ed9a005..000000000000
--- a/res/skins/Tango/buttons/btn_cf_right_attention.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_cf_right_attention.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="-16.815872"
-     inkscape:cy="-1.8661398"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3989"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1032.3622)">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1">
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7"
-         width="5"
-         height="2"
-         x="11"
-         y="1041.3622" />
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7-5"
-         width="7"
-         height="2"
-         x="2"
-         y="1041.3622" />
-      <rect
-         style="fill:#dc0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046"
-         width="14"
-         height="2"
-         x="-1049.3622"
-         y="16"
-         transform="matrix(0,-1,1,0,0,0)" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_cf_visible.svg b/res/skins/Tango/buttons/btn_cf_visible.svg
deleted file mode 100644
index 6041d07f803b..000000000000
--- a/res/skins/Tango/buttons/btn_cf_visible.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_cf_center.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="-17.591059"
-     inkscape:cy="15.97165"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3989"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1032.3622)">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1">
-      <rect
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046"
-         width="14"
-         height="2"
-         x="-1049.3622"
-         y="9"
-         transform="matrix(0,-1,1,0,0,0)" />
-      <rect
-         style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7"
-         width="7"
-         height="2"
-         x="11"
-         y="1041.3622" />
-      <rect
-         style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7-5"
-         width="7"
-         height="2"
-         x="2"
-         y="1041.3622" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_cover.svg b/res/skins/Tango/buttons/btn_cover.svg
deleted file mode 100644
index 41df7610c2fb..000000000000
--- a/res/skins/Tango/buttons/btn_cover.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_coverart_off.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview7"
-     showgrid="false"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:zoom="8"
-     inkscape:cx="49.86648"
-     inkscape:cy="19.762899"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1-3"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer#1">
-    <g
-       style="opacity:1;fill-rule:evenodd"
-       id="layer1-3"
-       transform="matrix(0.05269352,0,0,0.05273213,7.0048322,-14.498287)">
-      <path
-         style="color:#000000;fill:#888888;fill-opacity:1;enable-background:accumulate"
-         d="M 5 5 L 5 43 L 43 43 L 43 5 L 5 5 z M 24.03125 13.4375 C 29.857808 13.458517 34.583516 18.204692 34.5625 24.03125 C 34.541482 29.857808 29.794607 34.583516 23.96875 34.5625 C 18.142193 34.541483 13.416484 29.794608 13.4375 23.96875 C 13.458517 18.142193 18.204692 13.416484 24.03125 13.4375 z "
-         transform="matrix(18.977666,0,0,18.96377,-132.93536,274.94218)"
-         id="path4417" />
-      <path
-         style="color:#000000;fill:#888888;fill-opacity:1;enable-background:accumulate"
-         d="m 322.69873,685.07273 c 24.8903,0.0953 44.98054,20.29791 44.88518,45.16997 -0.0635,24.87206 -20.31278,44.9476 -45.17127,44.8523 -24.89028,-0.0635 -45.01232,-20.2979 -44.91696,-45.1382 0.0954,-24.87205 20.31278,-44.97936 45.20305,-44.88407 z"
-         id="label-cutout"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_cover_off.svg b/res/skins/Tango/buttons/btn_cover_off.svg
deleted file mode 100644
index 8014892733d2..000000000000
--- a/res/skins/Tango/buttons/btn_cover_off.svg
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_cover_off.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview7"
-     showgrid="false"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:zoom="8"
-     inkscape:cx="-15.200016"
-     inkscape:cy="18.15452"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1-3"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-nodes="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer#1">
-    <g
-       style="opacity:1;fill-rule:evenodd"
-       id="layer1-3"
-       transform="matrix(0.05269352,0,0,0.05273213,7.0048322,-14.498287)">
-      <path
-         style="color:#000000;fill:#888888;fill-opacity:1;enable-background:accumulate"
-         d="M 5 5 L 5 43 L 43 43 L 43 5 L 5 5 z M 24.03125 13.4375 C 29.857808 13.458517 34.583516 18.204692 34.5625 24.03125 C 34.541482 29.857808 29.794607 34.583516 23.96875 34.5625 C 18.142193 34.541483 13.416484 29.794608 13.4375 23.96875 C 13.458517 18.142193 18.204692 13.416484 24.03125 13.4375 z "
-         transform="matrix(18.977666,0,0,18.96377,-132.93536,274.94218)"
-         id="path4417" />
-      <path
-         style="color:#000000;fill:#888888;fill-opacity:1;enable-background:accumulate"
-         d="m 322.69873,685.07273 c 24.8903,0.0953 44.98054,20.29791 44.88518,45.16997 -0.0635,24.87206 -20.31278,44.9476 -45.17127,44.8523 -24.89028,-0.0635 -45.01232,-20.2979 -44.91696,-45.1382 0.0954,-24.87205 20.31278,-44.97936 45.20305,-44.88407 z"
-         id="label-cutout"
-         inkscape:connector-curvature="0" />
-      <g
-         id="g3755"
-         style="fill:none;stroke:#bfbfbf;stroke-opacity:1">
-        <path
-           sodipodi:nodetypes="cc"
-           transform="matrix(18.977666,0,0,18.96377,-132.93536,274.94218)"
-           inkscape:connector-curvature="0"
-           id="path4049"
-           d="M 5,43 43,5"
-           style="fill:none;stroke:#bfbfbf;stroke-width:3.99999998000000012;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
-        <path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
-           id="path4049-7"
-           d="M 683.10426,1090.3843 -38.04703,369.76103"
-           style="fill:none;stroke:#bfbfbf;stroke-width:75.88286591000000669;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_eject.svg b/res/skins/Tango/buttons/btn_eject.svg
index ac8e64bba52c..d185c7a7f0ce 100644
--- a/res/skins/Tango/buttons/btn_eject.svg
+++ b/res/skins/Tango/buttons/btn_eject.svg
@@ -1,96 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_eject.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-12.807007"
-     inkscape:cy="11.865257"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3989"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1032.3622)">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1">
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046"
-         width="12"
-         height="2"
-         x="4"
-         y="1046.3622" />
-      <path
-         sodipodi:type="star"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4048"
-         sodipodi:sides="3"
-         sodipodi:cx="3"
-         sodipodi:cy="10.5625"
-         sodipodi:r1="9.6718035"
-         sodipodi:r2="4.8359022"
-         sodipodi:arg1="0.52359878"
-         sodipodi:arg2="1.5707963"
-         inkscape:flatsided="false"
-         inkscape:rounded="0"
-         inkscape:randomized="0"
-         d="m 11.376027,15.398402 -8.3760269,0 -8.3760276,0 L -1.1880142,8.144549 3,0.89069653 7.1880141,8.1445488 z"
-         transform="matrix(0.71633003,0,0,0.54765418,7.85101,1035.9292)"
-         inkscape:transform-center-y="-1.3242038" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><g fill="#888"><path d="M4 14h12v2H4zM15.9999997622 11.9999992206H4.0000000596l2.9999996929-3.9726029165L10.00000009 4.0547936778l3.0000002659 3.9726025167z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_eject_hover.svg b/res/skins/Tango/buttons/btn_eject_hover.svg
deleted file mode 100644
index 2a6a91c836a2..000000000000
--- a/res/skins/Tango/buttons/btn_eject_hover.svg
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_eject_hover.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.0000004"
-     inkscape:cx="14.059327"
-     inkscape:cy="13.438201"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3989"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1032.3622)">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1">
-      <rect
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046"
-         width="12"
-         height="2"
-         x="4"
-         y="1046.3622" />
-      <path
-         sodipodi:type="star"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4048"
-         sodipodi:sides="3"
-         sodipodi:cx="3"
-         sodipodi:cy="10.5625"
-         sodipodi:r1="9.6718035"
-         sodipodi:r2="4.8359022"
-         sodipodi:arg1="0.52359878"
-         sodipodi:arg2="1.5707963"
-         inkscape:flatsided="false"
-         inkscape:rounded="0"
-         inkscape:randomized="0"
-         d="m 11.376027,15.398402 -8.3760269,0 -8.3760276,0 L -1.1880142,8.144549 3,0.89069653 7.1880141,8.1445488 z"
-         transform="matrix(0.71633003,0,0,0.54765418,7.85101,1034.9292)"
-         inkscape:transform-center-y="-1.3242038" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_eject_pressed.svg b/res/skins/Tango/buttons/btn_eject_pressed.svg
index 2ea0c8628e37..c578d6dbf0e5 100644
--- a/res/skins/Tango/buttons/btn_eject_pressed.svg
+++ b/res/skins/Tango/buttons/btn_eject_pressed.svg
@@ -1,96 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_eject_pressed.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-27.745472"
-     inkscape:cy="11.856148"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3989"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1032.3622)">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1">
-      <rect
-         style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046"
-         width="12"
-         height="2"
-         x="4"
-         y="1046.3622" />
-      <path
-         sodipodi:type="star"
-         style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4048"
-         sodipodi:sides="3"
-         sodipodi:cx="3"
-         sodipodi:cy="10.5625"
-         sodipodi:r1="9.6718035"
-         sodipodi:r2="4.8359022"
-         sodipodi:arg1="0.52359878"
-         sodipodi:arg2="1.5707963"
-         inkscape:flatsided="false"
-         inkscape:rounded="0"
-         inkscape:randomized="0"
-         d="m 11.376027,15.398402 -8.3760269,0 -8.3760276,0 L -1.1880142,8.144549 3,0.89069653 7.1880141,8.1445488 z"
-         transform="matrix(0.71633003,0,0,0.54765418,7.85101,1034.9292)"
-         inkscape:transform-center-y="-1.3242038" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><g fill="#d2d2d2"><path d="M4 14h12v2H4zM15.9999997622 10.9999992206H4.0000000596l2.9999996929-3.9726029165L10.00000009 3.0547936778l3.0000002659 3.9726025167z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_forward.svg b/res/skins/Tango/buttons/btn_forward.svg
index 734a25a7e2c8..2f3f14e520ee 100644
--- a/res/skins/Tango/buttons/btn_forward.svg
+++ b/res/skins/Tango/buttons/btn_forward.svg
@@ -1,73 +1 @@
-<?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"
-   height="22"
-   width="22"
-   version="1.1"
-   viewBox="0 0 22 22"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_backward.svg">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="8"
-     inkscape:cx="8.4757822"
-     inkscape:cy="7.4927795"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-paths="false"
-     inkscape:bbox-paths="true" />
-  <path
-     style="fill:#888888;fill-opacity:1"
-     d="m 15,4.9999997 2,0 L 17,17 15,17 15,4.9999997 z"
-     id="path4-6"
-     inkscape:connector-curvature="0" />
-  <path
-     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     inkscape:transform-center-x="-1.7142849"
-     d="M 15,11 5,16.999999 5,4.9999992 z"
-     id="path3018"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccc" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="22" width="22" viewBox="0 0 22 22"><path d="M15 4.9999997h2V17h-2V4.9999997zM15 11L5 16.999999V4.9999992z" fill="#888"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_forward_pressed.svg b/res/skins/Tango/buttons/btn_forward_pressed.svg
index f661c03b478d..d4baa3b36e5a 100644
--- a/res/skins/Tango/buttons/btn_forward_pressed.svg
+++ b/res/skins/Tango/buttons/btn_forward_pressed.svg
@@ -1,73 +1 @@
-<?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"
-   height="22"
-   width="22"
-   version="1.1"
-   viewBox="0 0 22 22"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_forward.svg">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="8"
-     inkscape:cx="-11.086718"
-     inkscape:cy="7.4927795"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-paths="false"
-     inkscape:bbox-paths="true" />
-  <path
-     style="fill:#d2d2d2;fill-opacity:1"
-     d="m 15,4.9999997 2,0 L 17,17 15,17 15,4.9999997 z"
-     id="path4-6"
-     inkscape:connector-curvature="0" />
-  <path
-     style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     inkscape:transform-center-x="-1.7142849"
-     d="M 15,11 5,16.999999 5,4.9999992 z"
-     id="path3018"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccc" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="22" width="22" viewBox="0 0 22 22"><path d="M15 4.9999997h2V17h-2V4.9999997zM15 11L5 16.999999V4.9999992z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_fx_aux1_off.svg b/res/skins/Tango/buttons/btn_fx_aux1_off.svg
deleted file mode 100644
index aa7f15613e1d..000000000000
--- a/res/skins/Tango/buttons/btn_fx_aux1_off.svg
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_aux1_on.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="15.956979"
-     inkscape:cy="13.776538"
-     inkscape:document-units="px"
-     inkscape:current-layer="flowRoot3890"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <g
-       id="g2989"
-       transform="translate(-88.571429,8.1332715)" />
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 9.1803415,1019.2908 c -0.4388121,0 -0.7920793,0.3532 -0.7920793,0.792 l 0,7.5001 -3.3168336,0 0,10.4702 2.376239,4.7526 0,6.4851 4.7524784,0 0,-6.4851 2.376239,-4.7526 0,-10.4702 -3.316833,0 0,-7.5001 c 0,-0.4388 -0.353269,-0.792 -0.792081,-0.792 l -1.2871295,0 z"
-       id="rect3835"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="translate(30.84525,1007.0622)"
-       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#888888;fill-opacity:1;stroke:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       id="flowRoot3890">
-      <path
-         d="m -7.81725,40.444 0,-9.688 c -0.5226721,0.373346 -1.1200048,0.709345 -1.792,1.008 -0.672004,0.280011 -1.241336,0.504011 -1.708,0.672 l -1.12,-2.856 c 0.447998,-0.167986 0.933331,-0.382653 1.456,-0.644 0.522663,-0.261319 1.0453295,-0.550652 1.568,-0.868 0.5226618,-0.317318 1.0173279,-0.653317 1.484,-1.008 0.4666603,-0.35465 0.8679933,-0.71865 1.204,-1.092 l 2.352,0 0,14.476 3.444,0 0,2.856 -10.528,0 0,-2.856 3.64,0"
-         style="font-size:28px;font-weight:bold;font-family:Ubuntu Mono;-inkscape-font-specification:Ubuntu Mono Bold;fill:#888888;fill-opacity:1"
-         id="path2989" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_fx_aux1_on.svg b/res/skins/Tango/buttons/btn_fx_aux1_on.svg
deleted file mode 100644
index 91a37fd235c2..000000000000
--- a/res/skins/Tango/buttons/btn_fx_aux1_on.svg
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_aux1.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="15.956979"
-     inkscape:cy="13.776538"
-     inkscape:document-units="px"
-     inkscape:current-layer="flowRoot3890"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <g
-       id="g2989"
-       transform="translate(-88.571429,8.1332715)" />
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 9.1803415,1019.2908 c -0.4388121,0 -0.7920793,0.3532 -0.7920793,0.792 l 0,7.5001 -3.3168336,0 0,10.4702 2.376239,4.7526 0,6.4851 4.7524784,0 0,-6.4851 2.376239,-4.7526 0,-10.4702 -3.316833,0 0,-7.5001 c 0,-0.4388 -0.353269,-0.792 -0.792081,-0.792 l -1.2871295,0 z"
-       id="rect3835"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="translate(30.84525,1007.0622)"
-       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       id="flowRoot3890">
-      <path
-         d="m -7.81725,40.444 0,-9.688 c -0.5226721,0.373346 -1.1200048,0.709345 -1.792,1.008 -0.672004,0.280011 -1.241336,0.504011 -1.708,0.672 l -1.12,-2.856 c 0.447998,-0.167986 0.933331,-0.382653 1.456,-0.644 0.522663,-0.261319 1.0453295,-0.550652 1.568,-0.868 0.5226618,-0.317318 1.0173279,-0.653317 1.484,-1.008 0.4666603,-0.35465 0.8679933,-0.71865 1.204,-1.092 l 2.352,0 0,14.476 3.444,0 0,2.856 -10.528,0 0,-2.856 3.64,0"
-         style="font-size:28px;font-weight:bold;font-family:Ubuntu Mono;-inkscape-font-specification:Ubuntu Mono Bold;fill:#000000;fill-opacity:1"
-         id="path2989" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_fx_aux2_off.svg b/res/skins/Tango/buttons/btn_fx_aux2_off.svg
deleted file mode 100644
index 8b147888c129..000000000000
--- a/res/skins/Tango/buttons/btn_fx_aux2_off.svg
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_aux2.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="45.832241"
-     inkscape:cy="13.776538"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <g
-       id="g2989"
-       transform="translate(-88.571429,8.1332715)" />
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 9.1803415,1019.2908 c -0.4388121,0 -0.7920793,0.3532 -0.7920793,0.792 l 0,7.5001 -3.3168336,0 0,10.4702 2.376239,4.7526 0,6.4851 4.7524784,0 0,-6.4851 2.376239,-4.7526 0,-10.4702 -3.316833,0 0,-7.5001 c 0,-0.4388 -0.353269,-0.792 -0.792081,-0.792 l -1.2871295,0 z"
-       id="rect3835"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="translate(30.84525,1007.0622)"
-       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#888888;fill-opacity:1;stroke:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       id="flowRoot3890-1">
-      <path
-         inkscape:connector-curvature="0"
-         d="m -1.62925,30.532 c -1.22e-5,0.597346 -0.112012,1.176012 -0.336,1.736 -0.2240116,0.541344 -0.522678,1.073343 -0.896,1.596 -0.3733439,0.522676 -0.7933435,1.026675 -1.26,1.512 -0.4666759,0.485341 -0.9426754,0.952007 -1.428,1.4 -0.2426747,0.224006 -0.5226744,0.494673 -0.84,0.812 -0.3173404,0.298672 -0.6160068,0.616005 -0.896,0.952 -0.2800062,0.317338 -0.5226726,0.644004 -0.728,0.98 -0.1866722,0.336003 -0.2800055,0.644003 -0.28,0.924 l 7.448,0 0,2.856 -11.312,0 c -0.056,-0.186666 -0.084,-0.42 -0.084,-0.7 0.01867,-0.279999 0.028,-0.475999 0.028,-0.588 -2e-6,-0.933331 0.167998,-1.791997 0.504,-2.576 0.354664,-0.783995 0.79333,-1.502661 1.316,-2.156 0.5413294,-0.671993 1.1106622,-1.287993 1.708,-1.848 0.6159943,-0.578658 1.1853271,-1.129324 1.708,-1.652 0.541326,-0.522657 0.9799922,-1.026656 1.316,-1.512 0.3546582,-0.485322 0.5319913,-0.979988 0.532,-1.484 -8.7e-6,-0.70932 -0.2146751,-1.250653 -0.644,-1.624 -0.4293409,-0.391985 -0.9706737,-0.587985 -1.624,-0.588 -0.5413392,1.5e-5 -1.1106719,0.130681 -1.708,0.392 -0.5973374,0.261347 -1.185337,0.700014 -1.764,1.316 l -1.708,-2.408 c 0.746665,-0.783984 1.605331,-1.36265 2.576,-1.736 0.9893286,-0.373316 1.9693276,-0.559982 2.94,-0.56 0.7093259,1.8e-5 1.3906586,0.102684 2.044,0.308 0.6533239,0.205351 1.23199,0.51335 1.736,0.924 0.503989,0.410683 0.9053219,0.933349 1.204,1.568 0.2986547,0.616014 0.4479878,1.33468 0.448,2.156"
-         style="font-size:28px;font-weight:bold;fill:#888888;fill-opacity:1;font-family:Ubuntu Mono;-inkscape-font-specification:Ubuntu Mono Bold"
-         id="path3899" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_fx_aux2_on.svg b/res/skins/Tango/buttons/btn_fx_aux2_on.svg
deleted file mode 100644
index bbe6ddb6f143..000000000000
--- a/res/skins/Tango/buttons/btn_fx_aux2_on.svg
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_aux2_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="45.832241"
-     inkscape:cy="13.776538"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <g
-       id="g2989"
-       transform="translate(-88.571429,8.1332715)" />
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 9.1803415,1019.2908 c -0.4388121,0 -0.7920793,0.3532 -0.7920793,0.792 l 0,7.5001 -3.3168336,0 0,10.4702 2.376239,4.7526 0,6.4851 4.7524784,0 0,-6.4851 2.376239,-4.7526 0,-10.4702 -3.316833,0 0,-7.5001 c 0,-0.4388 -0.353269,-0.792 -0.792081,-0.792 l -1.2871295,0 z"
-       id="rect3835"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="translate(30.84525,1007.0622)"
-       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       id="flowRoot3890-1">
-      <path
-         inkscape:connector-curvature="0"
-         d="m -1.62925,30.532 c -1.22e-5,0.597346 -0.112012,1.176012 -0.336,1.736 -0.2240116,0.541344 -0.522678,1.073343 -0.896,1.596 -0.3733439,0.522676 -0.7933435,1.026675 -1.26,1.512 -0.4666759,0.485341 -0.9426754,0.952007 -1.428,1.4 -0.2426747,0.224006 -0.5226744,0.494673 -0.84,0.812 -0.3173404,0.298672 -0.6160068,0.616005 -0.896,0.952 -0.2800062,0.317338 -0.5226726,0.644004 -0.728,0.98 -0.1866722,0.336003 -0.2800055,0.644003 -0.28,0.924 l 7.448,0 0,2.856 -11.312,0 c -0.056,-0.186666 -0.084,-0.42 -0.084,-0.7 0.01867,-0.279999 0.028,-0.475999 0.028,-0.588 -2e-6,-0.933331 0.167998,-1.791997 0.504,-2.576 0.354664,-0.783995 0.79333,-1.502661 1.316,-2.156 0.5413294,-0.671993 1.1106622,-1.287993 1.708,-1.848 0.6159943,-0.578658 1.1853271,-1.129324 1.708,-1.652 0.541326,-0.522657 0.9799922,-1.026656 1.316,-1.512 0.3546582,-0.485322 0.5319913,-0.979988 0.532,-1.484 -8.7e-6,-0.70932 -0.2146751,-1.250653 -0.644,-1.624 -0.4293409,-0.391985 -0.9706737,-0.587985 -1.624,-0.588 -0.5413392,1.5e-5 -1.1106719,0.130681 -1.708,0.392 -0.5973374,0.261347 -1.185337,0.700014 -1.764,1.316 l -1.708,-2.408 c 0.746665,-0.783984 1.605331,-1.36265 2.576,-1.736 0.9893286,-0.373316 1.9693276,-0.559982 2.94,-0.56 0.7093259,1.8e-5 1.3906586,0.102684 2.044,0.308 0.6533239,0.205351 1.23199,0.51335 1.736,0.924 0.503989,0.410683 0.9053219,0.933349 1.204,1.568 0.2986547,0.616014 0.4479878,1.33468 0.448,2.156"
-         style="font-size:28px;font-weight:bold;fill:#000000;fill-opacity:1;font-family:Ubuntu Mono;-inkscape-font-specification:Ubuntu Mono Bold"
-         id="path3899" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_fx_aux3_off.svg b/res/skins/Tango/buttons/btn_fx_aux3_off.svg
deleted file mode 100644
index e7ebb95c2016..000000000000
--- a/res/skins/Tango/buttons/btn_fx_aux3_off.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_fx_aux2_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="45.832241"
-     inkscape:cy="13.776538"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <g
-       id="g2989"
-       transform="translate(-88.571429,8.1332715)" />
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 9.1803415,1019.2908 c -0.4388121,0 -0.7920793,0.3532 -0.7920793,0.792 l 0,7.5001 -3.3168336,0 0,10.4702 2.376239,4.7526 0,6.4851 4.7524784,0 0,-6.4851 2.376239,-4.7526 0,-10.4702 -3.316833,0 0,-7.5001 c 0,-0.4388 -0.353269,-0.792 -0.792081,-0.792 l -1.2871295,0 z"
-       id="rect3835"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       d="m 23.027995,1050.7262 c -0.429338,0 -0.886671,-0.037 -1.371998,-0.112 -0.466671,-0.056 -0.924003,-0.1307 -1.371999,-0.224 -0.429336,-0.093 -0.830668,-0.196 -1.203999,-0.308 -0.373334,-0.112 -0.662667,-0.2147 -0.867999,-0.308 l 0.671999,-2.884 c 0.429331,0.1867 0.979997,0.3827 1.651999,0.588 0.690662,0.2053 1.511993,0.308 2.463997,0.308 1.175992,0 1.997324,-0.252 2.463998,-0.756 0.485324,-0.504 0.72799,-1.1293 0.727999,-1.876 -9e-6,-0.9147 -0.364008,-1.5493 -1.091999,-1.904 -0.728006,-0.3733 -1.652004,-0.56 -2.771997,-0.56 l -1.063999,0 0,-2.856 1.287999,0 c 0.35466,0 0.709326,-0.037 1.063999,-0.112 0.354659,-0.075 0.671992,-0.196 0.951999,-0.364 0.279992,-0.168 0.503991,-0.392 0.671999,-0.672 0.186658,-0.28 0.279992,-0.6347 0.28,-1.064 -8e-6,-0.6347 -0.196008,-1.1293 -0.587999,-1.484 -0.373341,-0.3733 -0.896007,-0.56 -1.567999,-0.56 -0.653338,0 -1.30667,0.112 -1.959998,0.336 -0.63467,0.2053 -1.185335,0.4667 -1.651998,0.784 l -1.231999,-2.52 c 0.503997,-0.336 1.166663,-0.672 1.987998,-1.008 0.839995,-0.3546 1.78266,-0.532 2.827997,-0.532 0.970659,0 1.810657,0.1214 2.519998,0.364 0.727989,0.2427 1.325322,0.588 1.791998,1.036 0.466655,0.4293 0.811988,0.9427 1.035999,1.54 0.223988,0.5973 0.335988,1.2413 0.336,1.932 -1.2e-5,0.6907 -0.196012,1.3533 -0.588,1.988 -0.39201,0.6347 -0.914676,1.12 -1.567998,1.456 0.895988,0.3733 1.586654,0.924 2.071998,1.652 0.503987,0.728 0.755986,1.596 0.755999,2.604 -1.3e-5,0.8027 -0.130679,1.54 -0.392,2.212 -0.261345,0.672 -0.662677,1.26 -1.203998,1.764 -0.541344,0.4853 -1.232009,0.868 -2.071998,1.148 -0.840008,0.2613 -1.838672,0.392 -2.995998,0.392"
-       style="font-size:27.9999733px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#888888;fill-opacity:1;stroke:none;display:inline;font-family:Ubuntu Mono;-inkscape-font-specification:Ubuntu Mono Bold"
-       id="path3761" />
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_fx_aux3_on.svg b/res/skins/Tango/buttons/btn_fx_aux3_on.svg
deleted file mode 100644
index cdce90cd8c19..000000000000
--- a/res/skins/Tango/buttons/btn_fx_aux3_on.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_fx_aux3_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="18.166688"
-     inkscape:cy="13.776538"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <g
-       id="g2989"
-       transform="translate(-88.571429,8.1332715)" />
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 9.1803415,1019.2908 c -0.4388121,0 -0.7920793,0.3532 -0.7920793,0.792 l 0,7.5001 -3.3168336,0 0,10.4702 2.376239,4.7526 0,6.4851 4.7524784,0 0,-6.4851 2.376239,-4.7526 0,-10.4702 -3.316833,0 0,-7.5001 c 0,-0.4388 -0.353269,-0.792 -0.792081,-0.792 l -1.2871295,0 z"
-       id="rect3835"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       d="m 23.027995,1050.7262 c -0.429338,0 -0.886671,-0.037 -1.371998,-0.112 -0.466671,-0.056 -0.924003,-0.1307 -1.371999,-0.224 -0.429336,-0.093 -0.830668,-0.196 -1.203999,-0.308 -0.373334,-0.112 -0.662667,-0.2147 -0.867999,-0.308 l 0.671999,-2.884 c 0.429331,0.1867 0.979997,0.3827 1.651999,0.588 0.690662,0.2053 1.511993,0.308 2.463997,0.308 1.175992,0 1.997324,-0.252 2.463998,-0.756 0.485324,-0.504 0.72799,-1.1293 0.727999,-1.876 -9e-6,-0.9147 -0.364008,-1.5493 -1.091999,-1.904 -0.728006,-0.3733 -1.652004,-0.56 -2.771997,-0.56 l -1.063999,0 0,-2.856 1.287999,0 c 0.35466,0 0.709326,-0.037 1.063999,-0.112 0.354659,-0.075 0.671992,-0.196 0.951999,-0.364 0.279992,-0.168 0.503991,-0.392 0.671999,-0.672 0.186658,-0.28 0.279992,-0.6347 0.28,-1.064 -8e-6,-0.6347 -0.196008,-1.1293 -0.587999,-1.484 -0.373341,-0.3733 -0.896007,-0.56 -1.567999,-0.56 -0.653338,0 -1.30667,0.112 -1.959998,0.336 -0.63467,0.2053 -1.185335,0.4667 -1.651998,0.784 l -1.231999,-2.52 c 0.503997,-0.336 1.166663,-0.672 1.987998,-1.008 0.839995,-0.3546 1.78266,-0.532 2.827997,-0.532 0.970659,0 1.810657,0.1214 2.519998,0.364 0.727989,0.2427 1.325322,0.588 1.791998,1.036 0.466655,0.4293 0.811988,0.9427 1.035999,1.54 0.223988,0.5973 0.335988,1.2413 0.336,1.932 -1.2e-5,0.6907 -0.196012,1.3533 -0.588,1.988 -0.39201,0.6347 -0.914676,1.12 -1.567998,1.456 0.895988,0.3733 1.586654,0.924 2.071998,1.652 0.503987,0.728 0.755986,1.596 0.755999,2.604 -1.3e-5,0.8027 -0.130679,1.54 -0.392,2.212 -0.261345,0.672 -0.662677,1.26 -1.203998,1.764 -0.541344,0.4853 -1.232009,0.868 -2.071998,1.148 -0.840008,0.2613 -1.838672,0.392 -2.995998,0.392"
-       style="font-size:27.99997330000000062px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Ubuntu Mono;-inkscape-font-specification:Ubuntu Mono Bold"
-       id="path3761" />
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_fx_aux4_off.svg b/res/skins/Tango/buttons/btn_fx_aux4_off.svg
deleted file mode 100644
index ae1f612f71a8..000000000000
--- a/res/skins/Tango/buttons/btn_fx_aux4_off.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_fx_aux4_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="18.166688"
-     inkscape:cy="13.776538"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <g
-       id="g2989"
-       transform="translate(-88.571429,8.1332715)" />
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 9.1803415,1019.2908 c -0.4388121,0 -0.7920793,0.3532 -0.7920793,0.792 l 0,7.5001 -3.3168336,0 0,10.4702 2.376239,4.7526 0,6.4851 4.7524784,0 0,-6.4851 2.376239,-4.7526 0,-10.4702 -3.316833,0 0,-7.5001 c 0,-0.4388 -0.353269,-0.792 -0.792081,-0.792 l -1.2871295,0 z"
-       id="rect3835"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       d="m 25.043993,1037.3422 c -0.336007,0.4293 -0.68134,0.8867 -1.035999,1.372 -0.354672,0.4853 -0.709338,0.9987 -1.063999,1.54 -0.336005,0.5227 -0.662671,1.0547 -0.979999,1.596 -0.317337,0.5413 -0.597337,1.0733 -0.839999,1.596 l 3.919996,0 0,-6.104 m 3.443997,-4.312 0,10.416 1.875998,0 0,2.828 -1.875998,0 0,4.088 -3.443997,0 0,-4.088 -7.223993,0 0,-2.52 c 0.354666,-0.728 0.811998,-1.5493 1.371999,-2.464 0.559997,-0.9333 1.175996,-1.8853 1.847998,-2.856 0.671995,-0.9707 1.381327,-1.9227 2.127998,-2.856 0.746659,-0.952 1.493325,-1.8013 2.239998,-2.548 l 3.079997,0"
-       style="font-size:27.99997330000000062px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#888888;fill-opacity:1;stroke:none;display:inline;font-family:Ubuntu Mono;-inkscape-font-specification:Ubuntu Mono Bold"
-       id="path5009" />
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_fx_aux4_on.svg b/res/skins/Tango/buttons/btn_fx_aux4_on.svg
deleted file mode 100644
index 91afcb097c22..000000000000
--- a/res/skins/Tango/buttons/btn_fx_aux4_on.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_fx_aux4_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="18.166688"
-     inkscape:cy="13.776538"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <g
-       id="g2989"
-       transform="translate(-88.571429,8.1332715)" />
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 9.1803415,1019.2908 c -0.4388121,0 -0.7920793,0.3532 -0.7920793,0.792 l 0,7.5001 -3.3168336,0 0,10.4702 2.376239,4.7526 0,6.4851 4.7524784,0 0,-6.4851 2.376239,-4.7526 0,-10.4702 -3.316833,0 0,-7.5001 c 0,-0.4388 -0.353269,-0.792 -0.792081,-0.792 l -1.2871295,0 z"
-       id="rect3835"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       d="m 25.043993,1037.3422 c -0.336007,0.4293 -0.68134,0.8867 -1.035999,1.372 -0.354672,0.4853 -0.709338,0.9987 -1.063999,1.54 -0.336005,0.5227 -0.662671,1.0547 -0.979999,1.596 -0.317337,0.5413 -0.597337,1.0733 -0.839999,1.596 l 3.919996,0 0,-6.104 m 3.443997,-4.312 0,10.416 1.875998,0 0,2.828 -1.875998,0 0,4.088 -3.443997,0 0,-4.088 -7.223993,0 0,-2.52 c 0.354666,-0.728 0.811998,-1.5493 1.371999,-2.464 0.559997,-0.9333 1.175996,-1.8853 1.847998,-2.856 0.671995,-0.9707 1.381327,-1.9227 2.127998,-2.856 0.746659,-0.952 1.493325,-1.8013 2.239998,-2.548 l 3.079997,0"
-       style="font-size:27.99997330000000062px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Ubuntu Mono;-inkscape-font-specification:Ubuntu Mono Bold"
-       id="path5009" />
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_fx_focus_off.svg b/res/skins/Tango/buttons/btn_fx_focus_off.svg
index c0853b8e8495..04d92210bf32 100644
--- a/res/skins/Tango/buttons/btn_fx_focus_off.svg
+++ b/res/skins/Tango/buttons/btn_fx_focus_off.svg
@@ -1,61 +1 @@
-<?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"
-   version="1.1"
-   viewBox="0 0 18 18"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_fx_focus_on.svg"
-   width="100%"
-   height="100%">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="13.111111"
-     inkscape:cx="-3.4322035"
-     inkscape:cy="9.3050846"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-page="true" />
-  <path
-     d="M 9,2 C 5.1323,2 2,5.1323 2,9 c 0,3.8677 3.1323,7 7,7 3.8677,0 7,-3.1323 7,-7 C 16,5.1323 12.868,2 9,2 Z M 9,14.6 C 5.906,14.6 3.4,12.094 3.4,9 3.4,5.906 5.906,3.4 9,3.4 c 3.094,0 5.6,2.506 5.6,5.6 0,3.094 -2.506,5.6 -5.6,5.6 z"
-     id="path4"
-     inkscape:connector-curvature="0"
-     style="fill:#888888;fill-opacity:1" />
-  <path
-     fill="none"
-     d="m0-30h48v48h-48z"
-     id="path6" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><path d="M4.53125 3.5625l-.96875.96875C4.6563942 5.625144 5.6875 7.569258 5.6875 9s-1.0311058 3.374856-2.125 4.46875l.96875.96875C5.625144 13.343606 7.569258 12.3125 9 12.3125s3.374856 1.031106 4.46875 2.125l.96875-.96875c-1.093894-1.093894-2.125-3.038008-2.125-4.46875s1.031106-3.374856 2.125-4.46875l-.96875-.96875C12.374856 4.6563942 10.430742 5.6875 9 5.6875c-1.4307421 0-3.3748558-1.0311058-4.46875-2.125zM6.5 6.5c.8471501.3669366 1.7222372.5937385 2.5.59375.7777629-.0000115 1.65285-.2268134 2.5-.59375-.366937.8471501-.593738 1.7222371-.59375 2.5.000012.7777629.226813 1.65285.59375 2.5-.84715-.366937-1.7222371-.593738-2.5-.59375-.7777629.000012-1.6528499.226813-2.5.59375.3669366-.84715.5937383-1.7222371.59375-2.5-.0000117-.7777629-.2268134-1.6528499-.59375-2.5z" fill="#b2b2b2"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_fx_focus_off_hover.svg b/res/skins/Tango/buttons/btn_fx_focus_off_hover.svg
index c40038940512..b9d1a8ccf1b3 100644
--- a/res/skins/Tango/buttons/btn_fx_focus_off_hover.svg
+++ b/res/skins/Tango/buttons/btn_fx_focus_off_hover.svg
@@ -1,60 +1 @@
-<?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"
-   version="1.1"
-   viewBox="0 0 18 18"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_fx_focus_on.svg"
-   width="100%"
-   height="100%">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="13.111111"
-     inkscape:cx="-16.322034"
-     inkscape:cy="9.3050845"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-page="true" />
-  <path
-     style="fill:#ffffff;fill-opacity:1"
-     d="M 9 2 C 5.1323 2 2 5.1323 2 9 C 2 12.8677 5.1323 16 9 16 C 12.8677 16 16 12.8677 16 9 C 16 5.1323 12.868 2 9 2 z M 9 3.40625 C 12.094 3.40625 14.59375 5.906 14.59375 9 C 14.59375 12.094 12.094 14.59375 9 14.59375 C 5.906 14.59375 3.40625 12.094 3.40625 9 C 3.40625 5.906 5.906 3.40625 9 3.40625 z "
-     id="path3909" />
-  <path
-     fill="none"
-     d="m0-30h48v48h-48z"
-     id="path6" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M4.53125 2.84375l-1.6875 1.6875L7.34375 9l-4.5 4.46875 1.6875 1.6875L9 10.65625l4.46875 4.5 1.6875-1.6875L10.65625 9l4.5-4.46875-1.6875-1.6875L9 7.34375z" font-weight="400" color="#000" fill="#fff" overflow="visible" font-family="Sans"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_fx_focus_on.svg b/res/skins/Tango/buttons/btn_fx_focus_on.svg
index 2e7d95820cd2..d2317264afac 100644
--- a/res/skins/Tango/buttons/btn_fx_focus_on.svg
+++ b/res/skins/Tango/buttons/btn_fx_focus_on.svg
@@ -1,64 +1 @@
-<?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"
-   version="1.1"
-   viewBox="0 0 18 18"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_fx_focus_off.svg"
-   width="100%"
-   height="100%">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="13.111111"
-     inkscape:cx="-3.4322035"
-     inkscape:cy="9.3050846"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-page="true" />
-  <path
-     style="fill:#888888;fill-opacity:1"
-     d="M 9,2 C 5.1323,2 2,5.1323 2,9 c 0,3.8677 3.1323,7 7,7 3.8677,0 7,-3.1323 7,-7 C 16,5.1323 12.868,2 9,2 z"
-     id="path3909" />
-  <path
-     style="fill:#d2d2d2;fill-opacity:1"
-     d="M 9,14.6 C 5.906,14.6 3.4,12.094 3.4,9 3.4,5.906 5.906,3.4 9,3.4 c 3.094,0 5.6,2.506 5.6,5.6 0,3.094 -2.506,5.6 -5.6,5.6 z"
-     id="path4" />
-  <path
-     fill="none"
-     d="m0-30h48v48h-48z"
-     id="path6" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M4.53125 2.84375l-1.6875 1.6875L7.34375 9l-4.5 4.46875 1.6875 1.6875L9 10.65625l4.46875 4.5 1.6875-1.6875L10.65625 9l4.5-4.46875-1.6875-1.6875L9 7.34375z" font-weight="400" color="#000" fill="#ffb901" overflow="visible" font-family="Sans"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_fx_focus_on_hover.svg b/res/skins/Tango/buttons/btn_fx_focus_on_hover.svg
index fba176f2a66a..c38700fe0b1b 100644
--- a/res/skins/Tango/buttons/btn_fx_focus_on_hover.svg
+++ b/res/skins/Tango/buttons/btn_fx_focus_on_hover.svg
@@ -1,64 +1 @@
-<?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"
-   version="1.1"
-   viewBox="0 0 18 18"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_fx_focus_on.svg"
-   width="100%"
-   height="100%">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="13.111111"
-     inkscape:cx="-3.4322035"
-     inkscape:cy="9.3050846"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-page="true" />
-  <path
-     style="fill:#ffffff;fill-opacity:1"
-     d="M 9,2 C 5.1323,2 2,5.1323 2,9 c 0,3.8677 3.1323,7 7,7 3.8677,0 7,-3.1323 7,-7 C 16,5.1323 12.868,2 9,2 z"
-     id="path3909" />
-  <path
-     style="fill:#d2d2d2;fill-opacity:1"
-     d="M 9,14.6 C 5.906,14.6 3.4,12.094 3.4,9 3.4,5.906 5.906,3.4 9,3.4 c 3.094,0 5.6,2.506 5.6,5.6 0,3.094 -2.506,5.6 -5.6,5.6 z"
-     id="path4" />
-  <path
-     fill="none"
-     d="m0-30h48v48h-48z"
-     id="path6" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><path d="M4.53125 3.5625l-.96875.96875C4.6563942 5.625144 5.6875 7.569258 5.6875 9s-1.0311058 3.374856-2.125 4.46875l.96875.96875C5.625144 13.343606 7.569258 12.3125 9 12.3125s3.374856 1.031106 4.46875 2.125l.96875-.96875c-1.093894-1.093894-2.125-3.038008-2.125-4.46875s1.031106-3.374856 2.125-4.46875l-.96875-.96875C12.374856 4.6563942 10.430742 5.6875 9 5.6875c-1.4307421 0-3.3748558-1.0311058-4.46875-2.125zM6.5 6.5c.8471501.3669366 1.7222372.5937385 2.5.59375.7777629-.0000115 1.65285-.2268134 2.5-.59375-.366937.8471501-.593738 1.7222371-.59375 2.5.000012.7777629.226813 1.65285.59375 2.5-.84715-.366937-1.7222371-.593738-2.5-.59375-.7777629.000012-1.6528499.226813-2.5.59375.3669366-.84715.5937383-1.7222371.59375-2.5-.0000117-.7777629-.2268134-1.6528499-.59375-2.5z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_fx_head_off.svg b/res/skins/Tango/buttons/btn_fx_head_off.svg
index 469f65cd7ec2..b4adaad67b5d 100644
--- a/res/skins/Tango/buttons/btn_fx_head_off.svg
+++ b/res/skins/Tango/buttons/btn_fx_head_off.svg
@@ -1,74 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="36"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_fx_head_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="-163.48162"
-     inkscape:cy="25.550003"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#888888;fill:#888888;fill-opacity:1;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 18 4.96875 C 10.815353 4.96875 4.96875 10.8152 4.96875 18 C 4.96875 18.8215 5.0414719 19.62735 5.1875 20.40625 L 5.4375 21.71875 C 5.0025079 22.167972 4.7806893 22.836197 4.90625 23.5 L 6.1875 30.21875 C 6.3929061 31.304673 7.4453275 32.017906 8.53125 31.8125 L 10 31.53125 C 11.085923 31.325844 11.799156 30.273423 11.59375 29.1875 L 10.3125 22.46875 C 10.118875 21.445108 9.2036889 20.778566 8.1875 20.875 L 8 19.875 L 7.96875 19.6875 L 8 19.6875 C 7.905199 19.1348 7.84375 18.5846 7.84375 18 C 7.84375 12.379 12.379026 7.84375 18 7.84375 C 23.620974 7.84375 28.15625 12.379 28.15625 18 C 28.15625 18.647 28.082413 19.2655 27.96875 19.875 L 27.78125 20.875 C 26.753141 20.761459 25.789342 21.434728 25.59375 22.46875 L 24.34375 29.1875 C 24.13834 30.273423 24.820308 31.325844 25.90625 31.53125 L 27.40625 31.8125 C 28.492192 32.017906 29.51334 31.304673 29.71875 30.21875 L 31 23.5 C 31.117109 22.880892 30.940195 22.25549 30.5625 21.8125 L 30.78125 20.59375 L 30.75 20.59375 L 30.8125 20.40625 C 30.959014 19.62485 31.03125 18.8189 31.03125 18 C 31.03125 10.8152 25.184647 4.96875 18 4.96875 z "
-       transform="translate(0,1016.3622)"
-       id="path3925" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><g fill="#888"><path d="M3.9015194 14.1646l2.9491731-.5499c.4668122-.087.9126914.2187.9997298.6855l1.0212068 5.4771c.087038.4668-.2186999.9126-.685512.9997l-2.9491724.5498c-.4668119.087-.9126908-.2187-.9997296-.6855l-1.0212076-5.477c-.087038-.4668.2187001-.9127.6855119-.9997z"/><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M11.999991 3.3081c-4.7897612 0-8.6919577 3.9021-8.6919577 8.6919 0 .5476.049969 1.0745.1473213 1.5937.414522 2.2572.843617 4.5115 1.2857134 6.7634l1.8883917-.3616c-.4077182-2.3044-.9587743-4.7542-1.2857136-6.8705-.063201-.3685-.1071429-.7353-.1071429-1.125 0-3.7473 3.0160743-6.7634 6.7633878-6.7634 3.747314 0 6.763388 3.0161 6.763388 6.7634 0 .3897-.04394.7565-.107143 1.125-.326939 2.1163-.877995 4.5661-1.285713 6.8705l1.888392.3616c.442096-2.2519.871191-4.5062 1.285713-6.7634.09735-.5192.147322-1.0461.147322-1.5937 0-4.7898-3.902197-8.6919-8.691959-8.6919z" font-weight="400" color="#000" overflow="visible" font-family="Sans"/><path d="M20.098463 14.1646l-2.949173-.5499c-.466812-.087-.912691.2187-.99973.6855l-1.021206 5.4771c-.08704.4668.218699.9127.685512.9997l2.949172.5499c.466812.087.912691-.2187.999729-.6856l1.021208-5.4771c.08704-.4667-.2187-.9126-.685512-.9996z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_fx_head_on.svg b/res/skins/Tango/buttons/btn_fx_head_on.svg
index 22b42c554bd6..bc25694ffeef 100644
--- a/res/skins/Tango/buttons/btn_fx_head_on.svg
+++ b/res/skins/Tango/buttons/btn_fx_head_on.svg
@@ -1,115 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="36"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_head_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="-107.58876"
-     inkscape:cy="25.550003"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <sodipodi:guide
-       orientation="1,0"
-       position="3.4642849,24.0089"
-       id="guide3828" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="8.4642849,2.272843"
-       id="guide3830" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="8.73181,21.1386"
-       id="guide3850" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="34.976532,21.1386"
-       id="guide3852" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <path
-       id="path3925"
-       d="m 18,1021.3243 c -7.184647,0 -13.0379464,5.8531 -13.0379464,13.0379 0,0.8215 0.074954,1.6118 0.2209821,2.3907 l 1.2857143,6.8705 0.6428571,3.2745 2.8325893,-0.5424 -0.6227678,-3.2544 -1.3058036,-6.8706 -0.040179,-0.1808 0.040179,0 c -0.094801,-0.5527 -0.1607143,-1.1029 -0.1607143,-1.6875 0,-5.621 4.5241153,-10.1451 10.1450893,-10.1451 5.620974,0 10.145089,4.5241 10.145089,10.1451 0,0.647 -0.06714,1.2588 -0.180803,1.8683 l -1.285715,6.8706 -0.622767,3.2745 2.832589,0.5223 0.642857,-3.2745 1.245536,-6.6696 -0.02009,0 0.04018,-0.2009 c 0.146514,-0.7814 0.241071,-1.5718 0.241071,-2.3907 0,-7.1848 -5.853299,-13.0379 -13.037946,-13.0379 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#eeeeee;fill:#eeeeee;fill-opacity:1;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       inkscape:connector-curvature="0" />
-    <rect
-       inkscape:transform-center-y="-1.3601952"
-       inkscape:transform-center-x="3.0845198"
-       transform="matrix(0.98257665,-0.18585783,0.18585783,0.98257665,0,0)"
-       ry="1.9949069"
-       rx="1.9949069"
-       y="1020.6563"
-       x="-188.43132"
-       height="10.839673"
-       width="5.496172"
-       id="rect3927"
-       style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <rect
-       inkscape:transform-center-y="-1.360275"
-       inkscape:transform-center-x="-3.0845807"
-       transform="matrix(-0.98257725,-0.18585464,-0.18586102,0.98257604,0,0)"
-       ry="1.9949083"
-       rx="1.9949412"
-       y="1013.98"
-       x="-223.73351"
-       height="10.839681"
-       width="5.4962664"
-       id="rect3929"
-       style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><g fill="#0f0f0f"><path d="M3.9015194 14.1646l2.9491731-.5499c.4668122-.087.9126914.2187.9997298.6855l1.0212068 5.4771c.087038.4668-.2186999.9126-.685512.9997l-2.9491724.5498c-.4668119.087-.9126908-.2187-.9997296-.6855l-1.0212076-5.477c-.087038-.4668.2187001-.9127.6855119-.9997z"/><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M11.999991 3.3081c-4.7897612 0-8.6919577 3.9021-8.6919577 8.6919 0 .5476.049969 1.0745.1473213 1.5937.414522 2.2572.843617 4.5115 1.2857134 6.7634l1.8883917-.3616c-.4077182-2.3044-.9587743-4.7542-1.2857136-6.8705-.063201-.3685-.1071429-.7353-.1071429-1.125 0-3.7473 3.0160743-6.7634 6.7633878-6.7634 3.747314 0 6.763388 3.0161 6.763388 6.7634 0 .3897-.04394.7565-.107143 1.125-.326939 2.1163-.877995 4.5661-1.285713 6.8705l1.888392.3616c.442096-2.2519.871191-4.5062 1.285713-6.7634.09735-.5192.147322-1.0461.147322-1.5937 0-4.7898-3.902197-8.6919-8.691959-8.6919z" font-weight="400" color="#000" overflow="visible" font-family="Sans"/><path d="M20.098463 14.1646l-2.949173-.5499c-.466812-.087-.912691.2187-.99973.6855l-1.021206 5.4771c-.08704.4668.218699.9127.685512.9997l2.949172.5499c.466812.087.912691-.2187.999729-.6856l1.021208-5.4771c.08704-.4667-.2187-.9126-.685512-.9996z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_fx_master_off.svg b/res/skins/Tango/buttons/btn_fx_master_off.svg
index 8d3d17f00f72..8d3fb22fa711 100644
--- a/res/skins/Tango/buttons/btn_fx_master_off.svg
+++ b/res/skins/Tango/buttons/btn_fx_master_off.svg
@@ -1,115 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="36"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_master_on.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="-77.150561"
-     inkscape:cy="23.152517"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="headphone"
-     style="display:none"
-     transform="translate(0,-20)">
-    <path
-       inkscape:connector-curvature="0"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#888888;fill:#888888;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 28,7.71875 C 16.823882,7.71875 7.71875,16.8237 7.71875,28 c 0,1.2779 0.1165944,2.50725 0.34375,3.71875 l 0.3125,1.6875 c -0.6845218,0.420478 -1.0961337,1.22385 -0.9375,2.0625 l 2.40625,12.625 c 0.205406,1.085923 1.226577,1.799156 2.3125,1.59375 l 4.5,-0.84375 C 17.742173,48.638344 18.455406,47.585923 18.25,46.5 L 15.84375,33.875 c -0.205406,-1.085923 -1.226577,-1.799156 -2.3125,-1.59375 L 12.75,32.4375 12.46875,30.90625 12.40625,30.625 l 0.0625,0 c -0.147469,-0.8597 -0.25,-1.7157 -0.25,-2.625 0,-8.7438 7.037512,-15.78125 15.78125,-15.78125 8.743738,-10e-5 15.78125,7.03745 15.78125,15.78125 0,1.0064 -0.104443,1.95805 -0.28125,2.90625 L 43.21875,32.4375 42.375,32.28125 c -1.085942,-0.205406 -2.13834,0.507827 -2.34375,1.59375 l -2.375,12.625 c -0.20541,1.085923 0.476558,2.138344 1.5625,2.34375 l 4.5,0.84375 c 1.085942,0.205406 2.10709,-0.507827 2.3125,-1.59375 l 2.40625,-12.625 C 48.58978,34.663705 48.258808,33.870614 47.625,33.4375 l 0.25,-1.40625 -0.03125,0 0.0625,-0.3125 C 48.134161,30.50325 48.28125,29.2738 48.28125,28 48.28125,16.8237 39.176117,7.71875 28,7.71875 z"
-       id="path3925" />
-  </g>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <path
-       style="fill:#888888;fill-opacity:1;stroke:none"
-       d="m 19.177616,1022.034 -8.173954,8.1739 0,8.174 8.173954,8.174 1.021744,0 0,-24.5219 -1.021744,0 z"
-       id="path2991"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect3783-5"
-       width="4.3036532"
-       height="8.1739349"
-       x="5.624095"
-       y="1030.2079"
-       rx="0.99999994"
-       ry="0.99999994" />
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 23.86419,1024.2419 -0.571579,1.5298 c 3.527546,1.2668 6.052012,4.6253 6.052012,8.5905 0,3.9466 -2.49993,7.2932 -6.001579,8.5737 l 0.554768,1.5298 c 4.116668,-1.5117 7.060681,-5.4646 7.060681,-10.1035 0,-4.6522 -2.959115,-8.6183 -7.094303,-10.1203 z"
-       id="path4069"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       d="m 22.754654,1027.2847 -0.554768,1.513 c 2.278889,0.8223 3.916997,3.002 3.916997,5.5645 0,2.5436 -1.614012,4.7117 -3.866564,5.5477 l 0.537957,1.513 c 2.883343,-1.055 4.942477,-3.812 4.942477,-7.0607 0,-3.2621 -2.074159,-6.0323 -4.976099,-7.0775 z"
-       id="path4069-6"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect4933"
-       width="2.1518266"
-       height="27.973747"
-       x="19.123447"
-       y="1020.3753"
-       rx="1.9999999"
-       ry="1.9999999" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36"><g transform="matrix(1.2313 0 0 1.2313 -.36073999 -1255.52251)" fill="#888"><path d="M21.177616 1022.034l-8.173954 8.1739v8.174l8.173954 8.174h1.021744v-24.5219h-1.021744z"/><rect ry=".8121528" rx=".8121528" y="1030.2079" x="7.624095" height="8.1739349" width="4.3036532"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_fx_master_on.svg b/res/skins/Tango/buttons/btn_fx_master_on.svg
index e2cce76ec95a..9d417169104a 100644
--- a/res/skins/Tango/buttons/btn_fx_master_on.svg
+++ b/res/skins/Tango/buttons/btn_fx_master_on.svg
@@ -1,115 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="36"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_master_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="-77.150561"
-     inkscape:cy="23.152517"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="headphone"
-     style="display:none"
-     transform="translate(0,-20)">
-    <path
-       inkscape:connector-curvature="0"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#eeeeee;fill:#0f0f0f;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 28,7.71875 C 16.823882,7.71875 7.71875,16.8237 7.71875,28 c 0,1.2779 0.1165944,2.50725 0.34375,3.71875 l 0.3125,1.6875 c -0.6845218,0.420478 -1.0961337,1.22385 -0.9375,2.0625 l 2.40625,12.625 c 0.205406,1.085923 1.226577,1.799156 2.3125,1.59375 l 4.5,-0.84375 C 17.742173,48.638344 18.455406,47.585923 18.25,46.5 L 15.84375,33.875 c -0.205406,-1.085923 -1.226577,-1.799156 -2.3125,-1.59375 L 12.75,32.4375 12.46875,30.90625 12.40625,30.625 l 0.0625,0 c -0.147469,-0.8597 -0.25,-1.7157 -0.25,-2.625 0,-8.7438 7.037512,-15.78125 15.78125,-15.78125 8.743738,-10e-5 15.78125,7.03745 15.78125,15.78125 0,1.0064 -0.104443,1.95805 -0.28125,2.90625 L 43.21875,32.4375 42.375,32.28125 c -1.085942,-0.205406 -2.13834,0.507827 -2.34375,1.59375 l -2.375,12.625 c -0.20541,1.085923 0.476558,2.138344 1.5625,2.34375 l 4.5,0.84375 c 1.085942,0.205406 2.10709,-0.507827 2.3125,-1.59375 l 2.40625,-12.625 C 48.58978,34.663705 48.258808,33.870614 47.625,33.4375 l 0.25,-1.40625 -0.03125,0 0.0625,-0.3125 C 48.134161,30.50325 48.28125,29.2738 48.28125,28 48.28125,16.8237 39.176117,7.71875 28,7.71875 z"
-       id="path3925" />
-  </g>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <path
-       style="fill:#eeeeee;fill-opacity:1;stroke:none"
-       d="m 19.177616,1022.034 -8.173954,8.1739 0,8.174 8.173954,8.174 1.021744,0 0,-24.5219 -1.021744,0 z"
-       id="path2991"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect3783-5"
-       width="4.3036532"
-       height="8.1739349"
-       x="5.624095"
-       y="1030.2079"
-       rx="0.99999994"
-       ry="0.99999994" />
-    <path
-       style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 23.86419,1024.2419 -0.571579,1.5298 c 3.527546,1.2668 6.052012,4.6253 6.052012,8.5905 0,3.9466 -2.49993,7.2932 -6.001579,8.5737 l 0.554768,1.5298 c 4.116668,-1.5117 7.060681,-5.4646 7.060681,-10.1035 0,-4.6522 -2.959115,-8.6183 -7.094303,-10.1203 z"
-       id="path4069"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       d="m 22.754654,1027.2847 -0.554768,1.513 c 2.278889,0.8223 3.916997,3.002 3.916997,5.5645 0,2.5436 -1.614012,4.7117 -3.866564,5.5477 l 0.537957,1.513 c 2.883343,-1.055 4.942477,-3.812 4.942477,-7.0607 0,-3.2621 -2.074159,-6.0323 -4.976099,-7.0775 z"
-       id="path4069-6"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect4933"
-       width="2.1518266"
-       height="27.973747"
-       x="19.123447"
-       y="1020.3753"
-       rx="1.9999999"
-       ry="1.9999999" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36"><g transform="matrix(1.2313 0 0 1.2313 -.36073996 -1255.52251)" fill="#0f0f0f"><path d="M21.177616 1022.034l-8.173954 8.1739v8.174l8.173954 8.174h1.021744v-24.5219h-1.021744z"/><rect ry=".8121528" rx=".8121528" y="1030.2079" x="7.624095" height="8.1739349" width="4.3036532"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_fx_mic1_off.svg b/res/skins/Tango/buttons/btn_fx_mic1_off.svg
deleted file mode 100644
index f9c05ea5e726..000000000000
--- a/res/skins/Tango/buttons/btn_fx_mic1_off.svg
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_mic1.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="-7.5458428"
-     inkscape:cy="14.100021"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <g
-       id="g2989"
-       transform="translate(-88.571429,8.1332715)" />
-    <g
-       id="g3785"
-       transform="matrix(0.580304,0.26552477,-0.26552477,0.580304,273.32209,435.11622)"
-       style="fill:#888888;fill-opacity:1">
-      <path
-         inkscape:connector-curvature="0"
-         id="path2994"
-         d="m 18,1000.1524 c -4.336479,0 -7.84375,3.5072 -7.84375,7.8437 0,1.8238 0.613137,3.5109 1.65625,4.8438 l 12.375,0 c 1.043113,-1.3329 1.65625,-3.02 1.65625,-4.8438 0,-4.3365 -3.507271,-7.8437 -7.84375,-7.8437 z"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3024"
-         d="m 12.53125,1013.9247 2.21875,33.7813 6.5,0 2.21875,-33.7813 -10.9375,0 z M 18,1017.5497 c 0.829921,0 1.5,0.669 1.5,1.5 l 0,5.0313 c 0,0.831 -0.670079,1.5 -1.5,1.5 -0.829921,0 -1.5,-0.669 -1.5,-1.5 l 0,-5.0313 c 0,-0.831 0.670079,-1.5 1.5,-1.5 z"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-    </g>
-    <g
-       transform="translate(30.84525,1007.0622)"
-       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#888888;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       id="flowRoot3890">
-      <path
-         d="m -7.81725,40.444 0,-9.688 c -0.5226721,0.373346 -1.1200048,0.709345 -1.792,1.008 -0.672004,0.280011 -1.241336,0.504011 -1.708,0.672 l -1.12,-2.856 c 0.447998,-0.167986 0.933331,-0.382653 1.456,-0.644 0.522663,-0.261319 1.0453295,-0.550652 1.568,-0.868 0.5226618,-0.317318 1.0173279,-0.653317 1.484,-1.008 0.4666603,-0.35465 0.8679933,-0.71865 1.204,-1.092 l 2.352,0 0,14.476 3.444,0 0,2.856 -10.528,0 0,-2.856 3.64,0"
-         style="font-size:28px;font-weight:bold;font-family:Ubuntu Mono;-inkscape-font-specification:Ubuntu Mono Bold;fill:#888888;fill-opacity:1"
-         id="path3902" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_fx_mic1_on.svg b/res/skins/Tango/buttons/btn_fx_mic1_on.svg
deleted file mode 100644
index 824c5d7ecc1e..000000000000
--- a/res/skins/Tango/buttons/btn_fx_mic1_on.svg
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_mic1_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="-7.5458428"
-     inkscape:cy="14.100021"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <g
-       id="g2989"
-       transform="translate(-88.571429,8.1332715)" />
-    <g
-       id="g3785"
-       transform="matrix(0.580304,0.26552477,-0.26552477,0.580304,273.32209,435.11622)"
-       style="fill:#000000;fill-opacity:1">
-      <path
-         inkscape:connector-curvature="0"
-         id="path2994"
-         d="m 18,1000.1524 c -4.336479,0 -7.84375,3.5072 -7.84375,7.8437 0,1.8238 0.613137,3.5109 1.65625,4.8438 l 12.375,0 c 1.043113,-1.3329 1.65625,-3.02 1.65625,-4.8438 0,-4.3365 -3.507271,-7.8437 -7.84375,-7.8437 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3024"
-         d="m 12.53125,1013.9247 2.21875,33.7813 6.5,0 2.21875,-33.7813 -10.9375,0 z M 18,1017.5497 c 0.829921,0 1.5,0.669 1.5,1.5 l 0,5.0313 c 0,0.831 -0.670079,1.5 -1.5,1.5 -0.829921,0 -1.5,-0.669 -1.5,-1.5 l 0,-5.0313 c 0,-0.831 0.670079,-1.5 1.5,-1.5 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-    </g>
-    <g
-       transform="translate(30.84525,1007.0622)"
-       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       id="flowRoot3890">
-      <path
-         d="m -7.81725,40.444 0,-9.688 c -0.5226721,0.373346 -1.1200048,0.709345 -1.792,1.008 -0.672004,0.280011 -1.241336,0.504011 -1.708,0.672 l -1.12,-2.856 c 0.447998,-0.167986 0.933331,-0.382653 1.456,-0.644 0.522663,-0.261319 1.0453295,-0.550652 1.568,-0.868 0.5226618,-0.317318 1.0173279,-0.653317 1.484,-1.008 0.4666603,-0.35465 0.8679933,-0.71865 1.204,-1.092 l 2.352,0 0,14.476 3.444,0 0,2.856 -10.528,0 0,-2.856 3.64,0"
-         style="font-size:28px;font-weight:bold;font-family:Ubuntu Mono;-inkscape-font-specification:Ubuntu Mono Bold;fill:#000000;fill-opacity:1"
-         id="path3902" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_fx_mic2_off.svg b/res/skins/Tango/buttons/btn_fx_mic2_off.svg
deleted file mode 100644
index 5dc3489954cd..000000000000
--- a/res/skins/Tango/buttons/btn_fx_mic2_off.svg
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_mic2.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="-7.5458428"
-     inkscape:cy="14.100021"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <g
-       id="g2989"
-       transform="translate(-88.571429,8.1332715)" />
-    <g
-       id="g3785"
-       transform="matrix(0.580304,0.26552477,-0.26552477,0.580304,273.32209,435.11622)"
-       style="fill:#888888;fill-opacity:1">
-      <path
-         inkscape:connector-curvature="0"
-         id="path2994"
-         d="m 18,1000.1524 c -4.336479,0 -7.84375,3.5072 -7.84375,7.8437 0,1.8238 0.613137,3.5109 1.65625,4.8438 l 12.375,0 c 1.043113,-1.3329 1.65625,-3.02 1.65625,-4.8438 0,-4.3365 -3.507271,-7.8437 -7.84375,-7.8437 z"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3024"
-         d="m 12.53125,1013.9247 2.21875,33.7813 6.5,0 2.21875,-33.7813 -10.9375,0 z M 18,1017.5497 c 0.829921,0 1.5,0.669 1.5,1.5 l 0,5.0313 c 0,0.831 -0.670079,1.5 -1.5,1.5 -0.829921,0 -1.5,-0.669 -1.5,-1.5 l 0,-5.0313 c 0,-0.831 0.670079,-1.5 1.5,-1.5 z"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-    </g>
-    <g
-       transform="translate(30.84525,1007.0622)"
-       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#888888;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       id="flowRoot3890">
-      <path
-         d="m -1.62925,30.532 c -1.22e-5,0.597346 -0.112012,1.176012 -0.336,1.736 -0.2240116,0.541344 -0.522678,1.073343 -0.896,1.596 -0.3733439,0.522676 -0.7933435,1.026675 -1.26,1.512 -0.4666759,0.485341 -0.9426754,0.952007 -1.428,1.4 -0.2426747,0.224006 -0.5226744,0.494673 -0.84,0.812 -0.3173404,0.298672 -0.6160068,0.616005 -0.896,0.952 -0.2800062,0.317338 -0.5226726,0.644004 -0.728,0.98 -0.1866722,0.336003 -0.2800055,0.644003 -0.28,0.924 l 7.448,0 0,2.856 -11.312,0 c -0.056,-0.186666 -0.084,-0.42 -0.084,-0.7 0.01867,-0.279999 0.028,-0.475999 0.028,-0.588 -2e-6,-0.933331 0.167998,-1.791997 0.504,-2.576 0.354664,-0.783995 0.79333,-1.502661 1.316,-2.156 0.5413294,-0.671993 1.1106622,-1.287993 1.708,-1.848 0.6159943,-0.578658 1.1853271,-1.129324 1.708,-1.652 0.541326,-0.522657 0.9799922,-1.026656 1.316,-1.512 0.3546582,-0.485322 0.5319913,-0.979988 0.532,-1.484 -8.7e-6,-0.70932 -0.2146751,-1.250653 -0.644,-1.624 -0.4293409,-0.391985 -0.9706737,-0.587985 -1.624,-0.588 -0.5413392,1.5e-5 -1.1106719,0.130681 -1.708,0.392 -0.5973374,0.261347 -1.185337,0.700014 -1.764,1.316 l -1.708,-2.408 c 0.746665,-0.783984 1.605331,-1.36265 2.576,-1.736 0.9893286,-0.373316 1.9693276,-0.559982 2.94,-0.56 0.7093259,1.8e-5 1.3906586,0.102684 2.044,0.308 0.6533239,0.205351 1.23199,0.51335 1.736,0.924 0.503989,0.410683 0.9053219,0.933349 1.204,1.568 0.2986547,0.616014 0.4479878,1.33468 0.448,2.156"
-         style="font-size:28px;font-weight:bold;font-family:Ubuntu Mono;-inkscape-font-specification:Ubuntu Mono Bold;fill:#888888;fill-opacity:1"
-         id="path3899" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_fx_mic2_on.svg b/res/skins/Tango/buttons/btn_fx_mic2_on.svg
deleted file mode 100644
index d55fd0611072..000000000000
--- a/res/skins/Tango/buttons/btn_fx_mic2_on.svg
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_mic2_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="-7.5458428"
-     inkscape:cy="14.100021"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <g
-       id="g2989"
-       transform="translate(-88.571429,8.1332715)" />
-    <g
-       id="g3785"
-       transform="matrix(0.580304,0.26552477,-0.26552477,0.580304,273.32209,435.11622)"
-       style="fill:#000000;fill-opacity:1">
-      <path
-         inkscape:connector-curvature="0"
-         id="path2994"
-         d="m 18,1000.1524 c -4.336479,0 -7.84375,3.5072 -7.84375,7.8437 0,1.8238 0.613137,3.5109 1.65625,4.8438 l 12.375,0 c 1.043113,-1.3329 1.65625,-3.02 1.65625,-4.8438 0,-4.3365 -3.507271,-7.8437 -7.84375,-7.8437 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3024"
-         d="m 12.53125,1013.9247 2.21875,33.7813 6.5,0 2.21875,-33.7813 -10.9375,0 z M 18,1017.5497 c 0.829921,0 1.5,0.669 1.5,1.5 l 0,5.0313 c 0,0.831 -0.670079,1.5 -1.5,1.5 -0.829921,0 -1.5,-0.669 -1.5,-1.5 l 0,-5.0313 c 0,-0.831 0.670079,-1.5 1.5,-1.5 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-    </g>
-    <g
-       transform="translate(30.84525,1007.0622)"
-       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       id="flowRoot3890">
-      <path
-         d="m -1.62925,30.532 c -1.22e-5,0.597346 -0.112012,1.176012 -0.336,1.736 -0.2240116,0.541344 -0.522678,1.073343 -0.896,1.596 -0.3733439,0.522676 -0.7933435,1.026675 -1.26,1.512 -0.4666759,0.485341 -0.9426754,0.952007 -1.428,1.4 -0.2426747,0.224006 -0.5226744,0.494673 -0.84,0.812 -0.3173404,0.298672 -0.6160068,0.616005 -0.896,0.952 -0.2800062,0.317338 -0.5226726,0.644004 -0.728,0.98 -0.1866722,0.336003 -0.2800055,0.644003 -0.28,0.924 l 7.448,0 0,2.856 -11.312,0 c -0.056,-0.186666 -0.084,-0.42 -0.084,-0.7 0.01867,-0.279999 0.028,-0.475999 0.028,-0.588 -2e-6,-0.933331 0.167998,-1.791997 0.504,-2.576 0.354664,-0.783995 0.79333,-1.502661 1.316,-2.156 0.5413294,-0.671993 1.1106622,-1.287993 1.708,-1.848 0.6159943,-0.578658 1.1853271,-1.129324 1.708,-1.652 0.541326,-0.522657 0.9799922,-1.026656 1.316,-1.512 0.3546582,-0.485322 0.5319913,-0.979988 0.532,-1.484 -8.7e-6,-0.70932 -0.2146751,-1.250653 -0.644,-1.624 -0.4293409,-0.391985 -0.9706737,-0.587985 -1.624,-0.588 -0.5413392,1.5e-5 -1.1106719,0.130681 -1.708,0.392 -0.5973374,0.261347 -1.185337,0.700014 -1.764,1.316 l -1.708,-2.408 c 0.746665,-0.783984 1.605331,-1.36265 2.576,-1.736 0.9893286,-0.373316 1.9693276,-0.559982 2.94,-0.56 0.7093259,1.8e-5 1.3906586,0.102684 2.044,0.308 0.6533239,0.205351 1.23199,0.51335 1.736,0.924 0.503989,0.410683 0.9053219,0.933349 1.204,1.568 0.2986547,0.616014 0.4479878,1.33468 0.448,2.156"
-         style="font-size:28px;font-weight:bold;font-family:Ubuntu Mono;-inkscape-font-specification:Ubuntu Mono Bold;fill:#000000;fill-opacity:1"
-         id="path3899" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_fx_mic3_off.svg b/res/skins/Tango/buttons/btn_fx_mic3_off.svg
deleted file mode 100644
index 2823554f0d19..000000000000
--- a/res/skins/Tango/buttons/btn_fx_mic3_off.svg
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_fx_mic2_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="9.1553639"
-     inkscape:cy="4.5405856"
-     inkscape:document-units="px"
-     inkscape:current-layer="text2988"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <g
-       id="g2989"
-       transform="translate(-88.571429,8.1332715)" />
-    <g
-       id="g3785"
-       transform="matrix(0.580304,0.26552477,-0.26552477,0.580304,273.32209,435.11622)"
-       style="fill:#888888;fill-opacity:1">
-      <path
-         inkscape:connector-curvature="0"
-         id="path2994"
-         d="m 18,1000.1524 c -4.336479,0 -7.84375,3.5072 -7.84375,7.8437 0,1.8238 0.613137,3.5109 1.65625,4.8438 l 12.375,0 c 1.043113,-1.3329 1.65625,-3.02 1.65625,-4.8438 0,-4.3365 -3.507271,-7.8437 -7.84375,-7.8437 z"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3024"
-         d="m 12.53125,1013.9247 2.21875,33.7813 6.5,0 2.21875,-33.7813 -10.9375,0 z M 18,1017.5497 c 0.829921,0 1.5,0.669 1.5,1.5 l 0,5.0313 c 0,0.831 -0.670079,1.5 -1.5,1.5 -0.829921,0 -1.5,-0.669 -1.5,-1.5 l 0,-5.0313 c 0,-0.831 0.670079,-1.5 1.5,-1.5 z"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-    </g>
-    <g
-       style="font-size:27.9999733px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#888888;fill-opacity:1;stroke:none;font-family:Times New Roman;-inkscape-font-specification:Times New Roman"
-       id="text2988">
-      <path
-         d="m 23.027995,1050.7262 c -0.429338,0 -0.886671,-0.037 -1.371998,-0.112 -0.466671,-0.056 -0.924003,-0.1307 -1.371999,-0.224 -0.429336,-0.093 -0.830668,-0.196 -1.203999,-0.308 -0.373334,-0.112 -0.662667,-0.2147 -0.867999,-0.308 l 0.671999,-2.884 c 0.429331,0.1867 0.979997,0.3827 1.651999,0.588 0.690662,0.2053 1.511993,0.308 2.463997,0.308 1.175992,0 1.997324,-0.252 2.463998,-0.756 0.485324,-0.504 0.72799,-1.1293 0.727999,-1.876 -9e-6,-0.9147 -0.364008,-1.5493 -1.091999,-1.904 -0.728006,-0.3733 -1.652004,-0.56 -2.771997,-0.56 l -1.063999,0 0,-2.856 1.287999,0 c 0.35466,0 0.709326,-0.037 1.063999,-0.112 0.354659,-0.075 0.671992,-0.196 0.951999,-0.364 0.279992,-0.168 0.503991,-0.392 0.671999,-0.672 0.186658,-0.28 0.279992,-0.6347 0.28,-1.064 -8e-6,-0.6347 -0.196008,-1.1293 -0.587999,-1.484 -0.373341,-0.3733 -0.896007,-0.56 -1.567999,-0.56 -0.653338,0 -1.30667,0.112 -1.959998,0.336 -0.63467,0.2053 -1.185335,0.4667 -1.651998,0.784 l -1.231999,-2.52 c 0.503997,-0.336 1.166663,-0.672 1.987998,-1.008 0.839995,-0.3546 1.78266,-0.532 2.827997,-0.532 0.970659,0 1.810657,0.1214 2.519998,0.364 0.727989,0.2427 1.325322,0.588 1.791998,1.036 0.466655,0.4293 0.811988,0.9427 1.035999,1.54 0.223988,0.5973 0.335988,1.2413 0.336,1.932 -1.2e-5,0.6907 -0.196012,1.3533 -0.588,1.988 -0.39201,0.6347 -0.914676,1.12 -1.567998,1.456 0.895988,0.3733 1.586654,0.924 2.071998,1.652 0.503987,0.728 0.755986,1.596 0.755999,2.604 -1.3e-5,0.8027 -0.130679,1.54 -0.392,2.212 -0.261345,0.672 -0.662677,1.26 -1.203998,1.764 -0.541344,0.4853 -1.232009,0.868 -2.071998,1.148 -0.840008,0.2613 -1.838672,0.392 -2.995998,0.392"
-         style="font-variant:normal;font-weight:bold;font-stretch:normal;fill:#888888;font-family:Ubuntu Mono;-inkscape-font-specification:Ubuntu Mono Bold"
-         id="path3761" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_fx_mic3_on.svg b/res/skins/Tango/buttons/btn_fx_mic3_on.svg
deleted file mode 100644
index 4eacf41f4739..000000000000
--- a/res/skins/Tango/buttons/btn_fx_mic3_on.svg
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_fx_mic3_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="9.1553639"
-     inkscape:cy="15.147187"
-     inkscape:document-units="px"
-     inkscape:current-layer="text2988"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <g
-       id="g2989"
-       transform="translate(-88.571429,8.1332715)" />
-    <g
-       id="g3785"
-       transform="matrix(0.580304,0.26552477,-0.26552477,0.580304,273.32209,435.11622)"
-       style="fill:#000000;fill-opacity:1">
-      <path
-         inkscape:connector-curvature="0"
-         id="path2994"
-         d="m 18,1000.1524 c -4.336479,0 -7.84375,3.5072 -7.84375,7.8437 0,1.8238 0.613137,3.5109 1.65625,4.8438 l 12.375,0 c 1.043113,-1.3329 1.65625,-3.02 1.65625,-4.8438 0,-4.3365 -3.507271,-7.8437 -7.84375,-7.8437 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3024"
-         d="m 12.53125,1013.9247 2.21875,33.7813 6.5,0 2.21875,-33.7813 -10.9375,0 z M 18,1017.5497 c 0.829921,0 1.5,0.669 1.5,1.5 l 0,5.0313 c 0,0.831 -0.670079,1.5 -1.5,1.5 -0.829921,0 -1.5,-0.669 -1.5,-1.5 l 0,-5.0313 c 0,-0.831 0.670079,-1.5 1.5,-1.5 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-    </g>
-    <g
-       style="font-size:27.9999733px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#888888;fill-opacity:1;stroke:none;font-family:Times New Roman;-inkscape-font-specification:Times New Roman"
-       id="text2988">
-      <path
-         d="m 23.027995,1050.7262 c -0.429338,0 -0.886671,-0.037 -1.371998,-0.112 -0.466671,-0.056 -0.924003,-0.1307 -1.371999,-0.224 -0.429336,-0.093 -0.830668,-0.196 -1.203999,-0.308 -0.373334,-0.112 -0.662667,-0.2147 -0.867999,-0.308 l 0.671999,-2.884 c 0.429331,0.1867 0.979997,0.3827 1.651999,0.588 0.690662,0.2053 1.511993,0.308 2.463997,0.308 1.175992,0 1.997324,-0.252 2.463998,-0.756 0.485324,-0.504 0.72799,-1.1293 0.727999,-1.876 -9e-6,-0.9147 -0.364008,-1.5493 -1.091999,-1.904 -0.728006,-0.3733 -1.652004,-0.56 -2.771997,-0.56 l -1.063999,0 0,-2.856 1.287999,0 c 0.35466,0 0.709326,-0.037 1.063999,-0.112 0.354659,-0.075 0.671992,-0.196 0.951999,-0.364 0.279992,-0.168 0.503991,-0.392 0.671999,-0.672 0.186658,-0.28 0.279992,-0.6347 0.28,-1.064 -8e-6,-0.6347 -0.196008,-1.1293 -0.587999,-1.484 -0.373341,-0.3733 -0.896007,-0.56 -1.567999,-0.56 -0.653338,0 -1.30667,0.112 -1.959998,0.336 -0.63467,0.2053 -1.185335,0.4667 -1.651998,0.784 l -1.231999,-2.52 c 0.503997,-0.336 1.166663,-0.672 1.987998,-1.008 0.839995,-0.3546 1.78266,-0.532 2.827997,-0.532 0.970659,0 1.810657,0.1214 2.519998,0.364 0.727989,0.2427 1.325322,0.588 1.791998,1.036 0.466655,0.4293 0.811988,0.9427 1.035999,1.54 0.223988,0.5973 0.335988,1.2413 0.336,1.932 -1.2e-5,0.6907 -0.196012,1.3533 -0.588,1.988 -0.39201,0.6347 -0.914676,1.12 -1.567998,1.456 0.895988,0.3733 1.586654,0.924 2.071998,1.652 0.503987,0.728 0.755986,1.596 0.755999,2.604 -1.3e-5,0.8027 -0.130679,1.54 -0.392,2.212 -0.261345,0.672 -0.662677,1.26 -1.203998,1.764 -0.541344,0.4853 -1.232009,0.868 -2.071998,1.148 -0.840008,0.2613 -1.838672,0.392 -2.995998,0.392"
-         style="font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;font-family:Ubuntu Mono;-inkscape-font-specification:Ubuntu Mono Bold;fill-opacity:1"
-         id="path3761" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_fx_mic4_off.svg b/res/skins/Tango/buttons/btn_fx_mic4_off.svg
deleted file mode 100644
index 1976203dcf35..000000000000
--- a/res/skins/Tango/buttons/btn_fx_mic4_off.svg
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_fx_mic4_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="9.1553639"
-     inkscape:cy="15.147187"
-     inkscape:document-units="px"
-     inkscape:current-layer="text2988"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <g
-       id="g2989"
-       transform="translate(-88.571429,8.1332715)" />
-    <g
-       id="g3785"
-       transform="matrix(0.580304,0.26552477,-0.26552477,0.580304,273.32209,435.11622)"
-       style="fill:#888888;fill-opacity:1">
-      <path
-         inkscape:connector-curvature="0"
-         id="path2994"
-         d="m 18,1000.1524 c -4.336479,0 -7.84375,3.5072 -7.84375,7.8437 0,1.8238 0.613137,3.5109 1.65625,4.8438 l 12.375,0 c 1.043113,-1.3329 1.65625,-3.02 1.65625,-4.8438 0,-4.3365 -3.507271,-7.8437 -7.84375,-7.8437 z"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3024"
-         d="m 12.53125,1013.9247 2.21875,33.7813 6.5,0 2.21875,-33.7813 -10.9375,0 z M 18,1017.5497 c 0.829921,0 1.5,0.669 1.5,1.5 l 0,5.0313 c 0,0.831 -0.670079,1.5 -1.5,1.5 -0.829921,0 -1.5,-0.669 -1.5,-1.5 l 0,-5.0313 c 0,-0.831 0.670079,-1.5 1.5,-1.5 z"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-    </g>
-    <g
-       style="font-size:27.9999733px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#888888;fill-opacity:0.94117647;stroke:none;font-family:Times New Roman;-inkscape-font-specification:Times New Roman"
-       id="text2988">
-      <path
-         d="m 25.043993,1037.3422 c -0.336007,0.4293 -0.68134,0.8867 -1.035999,1.372 -0.354672,0.4853 -0.709338,0.9987 -1.063999,1.54 -0.336005,0.5227 -0.662671,1.0547 -0.979999,1.596 -0.317337,0.5413 -0.597337,1.0733 -0.839999,1.596 l 3.919996,0 0,-6.104 m 3.443997,-4.312 0,10.416 1.875998,0 0,2.828 -1.875998,0 0,4.088 -3.443997,0 0,-4.088 -7.223993,0 0,-2.52 c 0.354666,-0.728 0.811998,-1.5493 1.371999,-2.464 0.559997,-0.9333 1.175996,-1.8853 1.847998,-2.856 0.671995,-0.9707 1.381327,-1.9227 2.127998,-2.856 0.746659,-0.952 1.493325,-1.8013 2.239998,-2.548 l 3.079997,0"
-         style="font-variant:normal;font-weight:bold;font-stretch:normal;fill:#888888;font-family:Ubuntu Mono;-inkscape-font-specification:Ubuntu Mono Bold;fill-opacity:1"
-         id="path5009" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_fx_mic4_on.svg b/res/skins/Tango/buttons/btn_fx_mic4_on.svg
deleted file mode 100644
index 7ea6aff0d290..000000000000
--- a/res/skins/Tango/buttons/btn_fx_mic4_on.svg
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_fx_mic4_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="9.1553639"
-     inkscape:cy="15.147187"
-     inkscape:document-units="px"
-     inkscape:current-layer="text2988"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1016.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <g
-       id="g2989"
-       transform="translate(-88.571429,8.1332715)" />
-    <g
-       id="g3785"
-       transform="matrix(0.580304,0.26552477,-0.26552477,0.580304,273.32209,435.11622)"
-       style="fill:#000000;fill-opacity:1">
-      <path
-         inkscape:connector-curvature="0"
-         id="path2994"
-         d="m 18,1000.1524 c -4.336479,0 -7.84375,3.5072 -7.84375,7.8437 0,1.8238 0.613137,3.5109 1.65625,4.8438 l 12.375,0 c 1.043113,-1.3329 1.65625,-3.02 1.65625,-4.8438 0,-4.3365 -3.507271,-7.8437 -7.84375,-7.8437 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3024"
-         d="m 12.53125,1013.9247 2.21875,33.7813 6.5,0 2.21875,-33.7813 -10.9375,0 z M 18,1017.5497 c 0.829921,0 1.5,0.669 1.5,1.5 l 0,5.0313 c 0,0.831 -0.670079,1.5 -1.5,1.5 -0.829921,0 -1.5,-0.669 -1.5,-1.5 l 0,-5.0313 c 0,-0.831 0.670079,-1.5 1.5,-1.5 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-    </g>
-    <g
-       style="font-size:27.9999733px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#888888;fill-opacity:0.94117647;stroke:none;font-family:Times New Roman;-inkscape-font-specification:Times New Roman"
-       id="text2988">
-      <path
-         d="m 25.043993,1037.3422 c -0.336007,0.4293 -0.68134,0.8867 -1.035999,1.372 -0.354672,0.4853 -0.709338,0.9987 -1.063999,1.54 -0.336005,0.5227 -0.662671,1.0547 -0.979999,1.596 -0.317337,0.5413 -0.597337,1.0733 -0.839999,1.596 l 3.919996,0 0,-6.104 m 3.443997,-4.312 0,10.416 1.875998,0 0,2.828 -1.875998,0 0,4.088 -3.443997,0 0,-4.088 -7.223993,0 0,-2.52 c 0.354666,-0.728 0.811998,-1.5493 1.371999,-2.464 0.559997,-0.9333 1.175996,-1.8853 1.847998,-2.856 0.671995,-0.9707 1.381327,-1.9227 2.127998,-2.856 0.746659,-0.952 1.493325,-1.8013 2.239998,-2.548 l 3.079997,0"
-         style="font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;font-family:Ubuntu Mono;-inkscape-font-specification:Ubuntu Mono Bold;fill-opacity:1"
-         id="path5009" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_fx_selector.svg b/res/skins/Tango/buttons/btn_fx_selector.svg
deleted file mode 100644
index a15f1ddc831f..000000000000
--- a/res/skins/Tango/buttons/btn_fx_selector.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_fx_selector_hover.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="7.4830901"
-     inkscape:cy="4.9715273"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="false" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-32)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <path
-     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 12.8,3.1940007 7.9999992,7.994 3.2000002,3.1940007 2,4.3940008 6.799999,9.194 l 1.2000002,1.2 1.200001,-1.2 L 14,4.3940008 12.8,3.1940007 z"
-     id="rect2987-7-3"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/res/skins/Tango/buttons/btn_fx_selector_hover.svg b/res/skins/Tango/buttons/btn_fx_selector_hover.svg
deleted file mode 100644
index 579133215382..000000000000
--- a/res/skins/Tango/buttons/btn_fx_selector_hover.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_fx_selector_hover.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="7.4830901"
-     inkscape:cy="4.9715273"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="false" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-32)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <path
-     style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 12.8,4.1940007 7.9999992,8.994 3.2000002,4.1940007 2,5.3940008 6.799999,10.194 l 1.2000002,1.2 1.200001,-1.2 L 14,5.3940008 12.8,4.1940007 z"
-     id="rect2987-7-3"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/res/skins/Tango/buttons/btn_fx_selector_list.svg b/res/skins/Tango/buttons/btn_fx_selector_list.svg
new file mode 100644
index 000000000000..21f00122bb33
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_fx_selector_list.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="20"><g fill="#888"><path d="M2 1h6v2H2zM2 5h6v2H2zM2 9h6v2H2zM2 13h6v2H2zM2 17h6v2H2z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_fx_selector_list_hover.svg b/res/skins/Tango/buttons/btn_fx_selector_list_hover.svg
new file mode 100644
index 000000000000..5264a0c4a1c1
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_fx_selector_list_hover.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="20"><g fill="#eee"><path d="M2 1h6v2H2zM2 5h6v2H2zM2 9h6v2H2zM2 13h6v2H2zM2 17h6v2H2z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_head.svg b/res/skins/Tango/buttons/btn_head.svg
index 2f1305f5497c..f9e54f69ebd0 100644
--- a/res/skins/Tango/buttons/btn_head.svg
+++ b/res/skins/Tango/buttons/btn_head.svg
@@ -1,98 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="56"
-   height="56"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_head.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="-107.58876"
-     inkscape:cy="25.550003"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-996.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <path
-       id="path3925"
-       d="m 28,1004.081 c -11.176118,0 -20.28125,9.1049 -20.28125,20.2812 0,1.2779 0.1165944,2.5073 0.34375,3.7188 l 2,10.6875 1,5.0937 4.40625,-0.8437 -0.96875,-5.0625 -2.03125,-10.6875 -0.0625,-0.2813 0.0625,0 c -0.147469,-0.8597 -0.25,-1.7157 -0.25,-2.625 0,-8.7438 7.037512,-15.7812 15.78125,-15.7812 8.743738,-10e-5 15.78125,7.0374 15.78125,15.7812 0,1.0064 -0.104443,1.9581 -0.28125,2.9063 l -2,10.6875 -0.96875,5.0937 4.40625,0.8125 1,-5.0937 1.9375,-10.375 -0.03125,0 0.0625,-0.3125 c 0.227911,-1.2155 0.375,-2.445 0.375,-3.7188 0,-11.1763 -9.105133,-20.2812 -20.28125,-20.2812 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#d2d2d2;fill-opacity:1;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       inkscape:connector-curvature="0" />
-    <rect
-       inkscape:transform-center-y="-2.1158793"
-       inkscape:transform-center-x="4.7981406"
-       transform="matrix(0.98257665,-0.18585783,0.18585783,0.98257665,0,0)"
-       ry="1.9949069"
-       rx="1.9949069"
-       y="1013.2284"
-       x="-184.45441"
-       height="16.861713"
-       width="8.5496006"
-       id="rect3927"
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <rect
-       inkscape:transform-center-y="-2.1159343"
-       inkscape:transform-center-x="-4.7982362"
-       transform="matrix(-0.98257725,-0.18585464,-0.18586102,0.98257604,0,0)"
-       ry="1.9949082"
-       rx="1.9949412"
-       y="1002.8427"
-       x="-239.36707"
-       height="16.861725"
-       width="8.5497475"
-       id="rect3929"
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48"><g fill="#d2d2d2"><path d="M7.8030445 28.3292l5.8983505-1.0997c.933625-.1741 1.825384.4374 1.999461 1.371l2.042415 10.9541c.174077.9336-.4374 1.8253-1.371025 1.9994l-5.898349 1.0997c-.9336244.1741-1.825383-.4374-1.9994607-1.371L6.4320196 30.3286c-.1740766-.9336.4374005-1.8253 1.3710249-1.9994z"/><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M24 6.6161C14.42047 6.6161 6.6160714 14.4203 6.6160714 24c0 1.0953.099938 2.1491.2946429 3.1875.8290445 4.5144 1.6872351 9.0229 2.5714286 13.5268l3.7767861-.7232c-.815437-4.6088-1.91755-9.5084-2.571429-13.7411-.126402-.7369-.214286-1.4706-.214286-2.25 0-7.4947 6.032153-13.5268 13.526786-13.5268 7.494633 0 13.526786 6.0321 13.526786 13.5268 0 .7794-.08788 1.5131-.214286 2.25-.653879 4.2327-1.755992 9.1323-2.571429 13.7411l3.776786.7232c.884194-4.5039 1.742384-9.0124 2.571429-13.5268.194704-1.0384.294643-2.0922.294643-3.1875 0-9.5797-7.804399-17.3839-17.383929-17.3839z" font-weight="400" color="#000" overflow="visible" font-family="Sans"/><path d="M40.196955 28.3293l-5.89835-1.0998c-.933625-.174-1.825384.4374-1.999461 1.371l-2.042415 10.9542c-.174077.9336.4374 1.8253 1.371025 1.9994l5.898349 1.0997c.933624.1739 1.825383-.4374 1.99946-1.3711l2.042417-10.9542c.174077-.9334-.437401-1.8253-1.371025-1.9992z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_headSplit_off.svg b/res/skins/Tango/buttons/btn_headSplit_off.svg
index b672702df33b..7655c0112616 100644
--- a/res/skins/Tango/buttons/btn_headSplit_off.svg
+++ b/res/skins/Tango/buttons/btn_headSplit_off.svg
@@ -1,275 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3242"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="38"
-   height="24"
-   sodipodi:docname="btn_headSplit_off.svg"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata3248">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3246">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3805"
-       id="linearGradient5279"
-       x1="98"
-       y1="-18"
-       x2="103"
-       y2="-18"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.72222222,-98,103)" />
-    <linearGradient
-       id="linearGradient3805">
-      <stop
-         id="stop3807"
-         offset="0"
-         style="stop-color:#002464;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.18000001"
-         id="stop3809" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.81819808"
-         id="stop3811" />
-      <stop
-         id="stop3813"
-         offset="1"
-         style="stop-color:#002f64;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       y2="-18"
-       x2="103"
-       y1="-18"
-       x1="98"
-       gradientTransform="matrix(1,0,0,0.72222222,-98,26)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3799"
-       xlink:href="#linearGradient3805"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="-18"
-       x2="103"
-       y1="-18"
-       x1="98"
-       gradientTransform="matrix(1,0,0,0.72222222,-98,26)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3799-0"
-       xlink:href="#linearGradient3805-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3805-2">
-      <stop
-         id="stop3807-3"
-         offset="0"
-         style="stop-color:#002464;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.18000001"
-         id="stop3809-7" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.81819808"
-         id="stop3811-5" />
-      <stop
-         id="stop3813-9"
-         offset="1"
-         style="stop-color:#002f64;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       y2="-18"
-       x2="103"
-       y1="-18"
-       x1="98"
-       gradientTransform="matrix(1,0,0,0.72222222,-98,26)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4027"
-       xlink:href="#linearGradient3805-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3805"
-       id="linearGradient4130"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.72222222,-98,26)"
-       x1="98"
-       y1="-18"
-       x2="103"
-       y2="-18" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3805-2"
-       id="linearGradient4143"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.72222222,-98.000002,20)"
-       x1="98"
-       y1="-18"
-       x2="103"
-       y2="-18" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3805-28"
-       id="linearGradient3847"
-       x1="7.5"
-       y1="90"
-       x2="12.5"
-       y2="90"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.3339844e-7,-83.000001)" />
-    <linearGradient
-       id="linearGradient3805-28">
-      <stop
-         id="stop3807-9"
-         offset="0"
-         style="stop-color:#002464;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.18000001"
-         id="stop3809-73" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.81819808"
-         id="stop3811-6" />
-      <stop
-         id="stop3813-1"
-         offset="1"
-         style="stop-color:#002f64;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3805-28"
-       id="linearGradient4211"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.3339844e-7,-83.000001)"
-       x1="7.5"
-       y1="90"
-       x2="12.5"
-       y2="90" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview3244"
-     showgrid="false"
-     inkscape:zoom="8"
-     inkscape:cx="7.9307234"
-     inkscape:cy="13.971075"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer4"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:snap-global="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="vector"
-     style="display:inline"
-     transform="translate(0,-2)">
-    <g
-       transform="translate(5.3250102,22)"
-       id="g7034-3"
-       style="fill:#888888;fill-opacity:1;display:inline" />
-    <g
-       style="fill:#888888;fill-opacity:1;stroke:none"
-       id="g3936"
-       transform="matrix(0.50601886,0,0,0.50601885,21.819289,7.2092037)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path2991"
-         d="m 15.333333,8.089758 -7.9999998,8 0,8 7.9999998,8 1,0 0,-24 -1,0 z"
-         style="fill:#888888;fill-opacity:1;stroke:none;display:inline" />
-      <rect
-         y="15.894254"
-         x="2.3333333"
-         height="8.0000019"
-         width="4"
-         id="rect3783-5"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-      <path
-         id="path4069"
-         d="m 19.739583,10.683508 -0.53125,1.421875 c 3.278653,1.177443 5.625,4.298954 5.625,7.984375 0,3.668195 -2.323543,6.778634 -5.578125,7.96875 l 0.515625,1.421875 c 3.826208,-1.405023 6.5625,-5.079045 6.5625,-9.390625 0,-4.323922 -2.750329,-8.010259 -6.59375,-9.40625 z"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path4069-6"
-         d="m 18.708333,13.511633 -0.515625,1.40625 c 2.118097,0.764246 3.640625,2.790185 3.640625,5.171875 0,2.364147 -1.500133,4.379234 -3.59375,5.15625 l 0.5,1.40625 c 2.679902,-0.980521 4.59375,-3.542951 4.59375,-6.5625 0,-3.031939 -1.927812,-5.606681 -4.625,-6.578125 z"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-    <path
-       inkscape:connector-curvature="0"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#888888;fill-opacity:1;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 10.106811,4.1479408 c -3.3137001,0 -6.0133569,2.6996029 -6.0133569,6.0133572 0,0.378896 0.03457,0.743396 0.1019214,1.102604 l 0.092656,0.500341 c -0.2029596,0.124671 -0.3250017,0.362869 -0.2779671,0.611528 l 0.7134492,3.743293 c 0.060902,0.321974 0.3636778,0.533447 0.6856526,0.472543 l 1.3342424,-0.25017 c 0.3219748,-0.0609 0.533447,-0.372944 0.4725446,-0.694918 L 6.5025034,11.903227 C 6.441601,11.581253 6.138825,11.36978 5.8168507,11.430682 l -0.2316392,0.04633 -0.08339,-0.454012 -0.01853,-0.08339 0.01853,0 c -0.043724,-0.2549 -0.074125,-0.508703 -0.074125,-0.778308 0,-2.592523 2.0866116,-4.6791154 4.6791145,-4.6791154 2.592505,-2.96e-5 4.679116,2.0865924 4.679116,4.6791154 0,0.298395 -0.03097,0.580558 -0.08339,0.861698 l -0.08339,0.454013 -0.25017,-0.04633 c -0.321981,-0.0609 -0.634016,0.15057 -0.69492,0.472544 l -0.704183,3.743292 c -0.0609,0.321974 0.141299,0.634015 0.463279,0.694918 l 1.334243,0.25017 c 0.321979,0.0609 0.624748,-0.150569 0.685652,-0.472543 l 0.713449,-3.743293 c 0.04515,-0.238695 -0.05298,-0.473844 -0.240904,-0.602262 l 0.07412,-0.416951 -0.0093,0 0.01853,-0.09266 c 0.06758,-0.360395 0.111186,-0.724924 0.111186,-1.102604 -4e-6,-3.3137545 -2.699661,-6.0133573 -6.013361,-6.0133573 z"
-       id="path3925" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#888888;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 26.53125,3.625 a 0.50005,0.50005 0 0 0 -0.25,0.21875 l -13.375,19.75 a 0.50005,0.50005 0 1 0 0.8125,0.5625 l 13.375,-19.75 A 0.50005,0.50005 0 0 0 26.53125,3.625 z"
-       id="path3786"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Layer"
-     style="display:none"
-     transform="translate(0,-8)">
-    <path
-       style="fill:#828282;fill-opacity:1;stroke:none;display:inline"
-       d="M 17.091637,27.579474 18.48848,28.548769 32.594662,4.4205251 31.197819,3.45123 z"
-       id="path6524"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="38" height="24"><defs><linearGradient id="a"><stop offset="0" stop-color="#002464"/><stop offset=".18000001" stop-color="#0872e9"/><stop offset=".81819808" stop-color="#0872e9"/><stop offset="1" stop-color="#002f64"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#002464"/><stop offset=".18000001" stop-color="#0872e9"/><stop offset=".81819808" stop-color="#0872e9"/><stop offset="1" stop-color="#002f64"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#002464"/><stop offset=".18000001" stop-color="#0872e9"/><stop offset=".81819808" stop-color="#0872e9"/><stop offset="1" stop-color="#002f64"/></linearGradient></defs><g fill="#888"><path d="M32.666666816 5.4472264854l-5.333333399 5.333333427v5.3333334271l5.333333399 5.3333334271h.6666666916V5.4472264854h-.6666666915zM24.0000000258 10.6502239102h2.6666667662v5.3333346937h-2.6666667662zM4.5441582225 9.6185770426l2.0332562583-.3790842402c.3218355222-.0600150643.6292391622.1507788003.689246298.4726057046l.7040532313 3.7760540833c.0600071358.3218269043-.1507788003.629210206-.4726143225.6892252704l-2.0332557411.3790842401c-.3218353154.0600150643-.6292388175-.1507788002-.6892461947-.4726057045l-.7040538172-3.7760540833c-.060006998-.3218269043.1507789726-.629210206.472614288-.6892252704z"/><path d="M10.1275089169 2.1337230118c-3.3022177425 0-5.9925193728 2.6902329974-5.9925193728 5.9925093072 0 .3775674895.0344502326.740829263.1015681366 1.0987824093.2857849453 1.5561861362.5816170191 3.1103384476.8864127099 4.6629050652l1.3019189584-.2492986474c-.2810942217-1.5887273312-.6610102617-3.2776980898-.8864130201-4.7367777146-.0435727981-.2540212573-.0738678235-.5069394232-.0738678235-.7756111125 0-2.5835433455 2.0793801275-4.6629050307 4.6629004115-4.6629050307S14.790409156 5.5426889735 14.790409156 8.126232319c0 .2686716893-.0302936465.5215898552-.0738678235.7756111125-.225402586 1.4590796248-.605318626 3.1480503834-.8864128477 4.7367777146l1.3019187516.2492986474c.3047958631-1.5525666176.60062773-3.106718929.8864128477-4.6629050652.0671175938-.3579531463.1015681711-.7212149198.1015681711-1.0987824093 0-3.3022763098-2.6903015959-5.9925093072-5.9925193383-5.9925093072z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" font-weight="400" color="#000" overflow="visible" font-family="Sans"/><path d="M15.7108592665 9.6186115142l-2.0332559135-.3791187118c-.3218355222-.0599805927-.6292391622.1507788003-.689246298.4726057046l-.7040532313 3.7760885549c-.0600071358.3218269043.1507788003.629210206.4726143224.6892252704l2.0332555688.3790842401c.3218351775.0599461211.6292388175-.1507788002.6892459534-.4726401761l.7040539207-3.776088555c.0600071358-.321757961-.150779145-.629210206-.4726143225-.689156327z"/><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M26.53125 1.625a.50005.50005 0 0 0-.25.21875l-13.375 19.75a.50005.50005 0 1 0 .8125.5625l13.375-19.75a.50005.50005 0 0 0-.5625-.78125z" font-weight="400" color="#000" overflow="visible" font-family="Sans"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_headSplit_on.svg b/res/skins/Tango/buttons/btn_headSplit_on.svg
index 535898551ced..0177bf70aafb 100644
--- a/res/skins/Tango/buttons/btn_headSplit_on.svg
+++ b/res/skins/Tango/buttons/btn_headSplit_on.svg
@@ -1,277 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3242"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="38"
-   height="24"
-   sodipodi:docname="btn_headSplit_on.svg"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata3248">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3246">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3805"
-       id="linearGradient5279"
-       x1="98"
-       y1="-18"
-       x2="103"
-       y2="-18"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.72222222,-98,103)" />
-    <linearGradient
-       id="linearGradient3805">
-      <stop
-         id="stop3807"
-         offset="0"
-         style="stop-color:#002464;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.18000001"
-         id="stop3809" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.81819808"
-         id="stop3811" />
-      <stop
-         id="stop3813"
-         offset="1"
-         style="stop-color:#002f64;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       y2="-18"
-       x2="103"
-       y1="-18"
-       x1="98"
-       gradientTransform="matrix(1,0,0,0.72222222,-98,26)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3799"
-       xlink:href="#linearGradient3805"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="-18"
-       x2="103"
-       y1="-18"
-       x1="98"
-       gradientTransform="matrix(1,0,0,0.72222222,-98,26)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3799-0"
-       xlink:href="#linearGradient3805-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3805-2">
-      <stop
-         id="stop3807-3"
-         offset="0"
-         style="stop-color:#002464;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.18000001"
-         id="stop3809-7" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.81819808"
-         id="stop3811-5" />
-      <stop
-         id="stop3813-9"
-         offset="1"
-         style="stop-color:#002f64;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       y2="-18"
-       x2="103"
-       y1="-18"
-       x1="98"
-       gradientTransform="matrix(1,0,0,0.72222222,-98,26)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4027"
-       xlink:href="#linearGradient3805-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3805"
-       id="linearGradient4130"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.72222222,-98,26)"
-       x1="98"
-       y1="-18"
-       x2="103"
-       y2="-18" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3805-2"
-       id="linearGradient4143"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.72222222,-98.000002,20)"
-       x1="98"
-       y1="-18"
-       x2="103"
-       y2="-18" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3805-28"
-       id="linearGradient3847"
-       x1="7.5"
-       y1="90"
-       x2="12.5"
-       y2="90"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.3339844e-7,-83.000001)" />
-    <linearGradient
-       id="linearGradient3805-28">
-      <stop
-         id="stop3807-9"
-         offset="0"
-         style="stop-color:#002464;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.18000001"
-         id="stop3809-73" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.81819808"
-         id="stop3811-6" />
-      <stop
-         id="stop3813-1"
-         offset="1"
-         style="stop-color:#002f64;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3805-28"
-       id="linearGradient4211"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.3339844e-7,-83.000001)"
-       x1="7.5"
-       y1="90"
-       x2="12.5"
-       y2="90" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview3244"
-     showgrid="false"
-     inkscape:zoom="8"
-     inkscape:cx="12.302369"
-     inkscape:cy="27.051613"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer4"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:snap-global="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="vector"
-     style="display:inline"
-     transform="translate(0,-2)">
-    <g
-       transform="translate(5.3250102,22)"
-       id="g7034-3"
-       style="fill:#828282;fill-opacity:1;display:inline" />
-    <g
-       style="fill:#eeeeee;fill-opacity:1;stroke:none"
-       id="g3936"
-       transform="matrix(0.50601886,0,0,0.50601885,21.819289,7.2092037)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path2991"
-         d="m 15.333333,8.089758 -7.9999998,8 0,8 7.9999998,8 1,0 0,-24 -1,0 z"
-         style="fill:#eeeeee;fill-opacity:1;stroke:none;display:inline" />
-      <rect
-         y="15.894254"
-         x="2.3333333"
-         height="8.0000019"
-         width="4"
-         id="rect3783-5"
-         style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-      <path
-         id="path4069"
-         d="m 19.739583,10.683508 -0.53125,1.421875 c 3.278653,1.177443 5.625,4.298954 5.625,7.984375 0,3.668195 -2.323543,6.778634 -5.578125,7.96875 l 0.515625,1.421875 c 3.826208,-1.405023 6.5625,-5.079045 6.5625,-9.390625 0,-4.323922 -2.750329,-8.010259 -6.59375,-9.40625 z"
-         style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path4069-6"
-         d="m 18.708333,13.511633 -0.515625,1.40625 c 2.118097,0.764246 3.640625,2.790185 3.640625,5.171875 0,2.364147 -1.500133,4.379234 -3.59375,5.15625 l 0.5,1.40625 c 2.679902,-0.980521 4.59375,-3.542951 4.59375,-6.5625 0,-3.031939 -1.927812,-5.606681 -4.625,-6.578125 z"
-         style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-    <path
-       inkscape:connector-curvature="0"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#eeeeee;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 10.106811,4.1479408 c -3.3137001,0 -6.0133569,2.6996029 -6.0133569,6.0133572 0,0.378896 0.03457,0.743396 0.1019214,1.102604 l 0.092656,0.500341 c -0.2029596,0.124671 -0.3250017,0.362869 -0.2779671,0.611528 l 0.7134492,3.743293 c 0.060902,0.321974 0.3636778,0.533447 0.6856526,0.472543 l 1.3342424,-0.25017 c 0.3219748,-0.0609 0.533447,-0.372944 0.4725446,-0.694918 L 6.5025034,11.903227 C 6.441601,11.581253 6.138825,11.36978 5.8168507,11.430682 l -0.2316392,0.04633 -0.08339,-0.454012 -0.01853,-0.08339 0.01853,0 c -0.043724,-0.2549 -0.074125,-0.508703 -0.074125,-0.778308 0,-2.592523 2.0866116,-4.6791154 4.6791145,-4.6791154 2.592505,-2.96e-5 4.679116,2.0865924 4.679116,4.6791154 0,0.298395 -0.03097,0.580558 -0.08339,0.861698 l -0.08339,0.454013 -0.25017,-0.04633 c -0.321981,-0.0609 -0.634016,0.15057 -0.69492,0.472544 l -0.704183,3.743292 c -0.0609,0.321974 0.141299,0.634015 0.463279,0.694918 l 1.334243,0.25017 c 0.321979,0.0609 0.624748,-0.150569 0.685652,-0.472543 l 0.713449,-3.743293 c 0.04515,-0.238695 -0.05298,-0.473844 -0.240904,-0.602262 l 0.07412,-0.416951 -0.0093,0 0.01853,-0.09266 c 0.06758,-0.360395 0.111186,-0.724924 0.111186,-1.102604 -4e-6,-3.3137545 -2.699661,-6.0133573 -6.013361,-6.0133573 z"
-       id="path3925" />
-    <path
-       style="fill:none;stroke:#eeeeee;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 13.311096,23.881366 26.688904,4.1186343"
-       id="path3786"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-y="-9.8813655"
-       inkscape:transform-center-x="-6.688904" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Layer"
-     style="display:none"
-     transform="translate(0,-8)">
-    <path
-       style="fill:#828282;fill-opacity:1;stroke:none;display:inline"
-       d="M 17.091637,27.579474 18.48848,28.548769 32.594662,4.4205251 31.197819,3.45123 z"
-       id="path6524"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="38" height="24"><defs><linearGradient id="a"><stop offset="0" stop-color="#002464"/><stop offset=".18000001" stop-color="#0872e9"/><stop offset=".81819808" stop-color="#0872e9"/><stop offset="1" stop-color="#002f64"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#002464"/><stop offset=".18000001" stop-color="#0872e9"/><stop offset=".81819808" stop-color="#0872e9"/><stop offset="1" stop-color="#002f64"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#002464"/><stop offset=".18000001" stop-color="#0872e9"/><stop offset=".81819808" stop-color="#0872e9"/><stop offset="1" stop-color="#002f64"/></linearGradient></defs><g fill="#d2d2d2"><path d="M32.666666816 5.4472267854l-5.333333399 5.333333427v5.3333334271l5.333333399 5.3333334271h.6666666916V5.4472267854h-.6666666915zM24.0000000258 10.6502242102h2.6666667662v5.3333346937h-2.6666667662zM4.5441582225 9.6185766426l2.0332562583-.3790842402c.3218355222-.0600150643.6292391622.1507788003.689246298.4726057046l.7040532313 3.7760540833c.0600071358.3218269043-.1507788003.629210206-.4726143225.6892252704l-2.0332557411.3790842401c-.3218353154.0600150643-.6292388175-.1507788002-.6892461947-.4726057045l-.7040538172-3.7760540833c-.060006998-.3218269043.1507789726-.629210206.472614288-.6892252704z"/><path d="M10.1275089169 2.1337226118c-3.3022177425 0-5.9925193728 2.6902329974-5.9925193728 5.9925093072 0 .3775674895.0344502326.740829263.1015681366 1.0987824093.2857849453 1.5561861362.5816170191 3.1103384476.8864127099 4.6629050652l1.3019189584-.2492986474c-.2810942217-1.5887273312-.6610102617-3.2776980898-.8864130201-4.7367777146-.0435727981-.2540212573-.0738678235-.5069394232-.0738678235-.7756111125 0-2.5835433455 2.0793801275-4.6629050307 4.6629004115-4.6629050307S14.790409156 5.5426885735 14.790409156 8.126231919c0 .2686716893-.0302936465.5215898552-.0738678235.7756111125-.225402586 1.4590796248-.605318626 3.1480503834-.8864128477 4.7367777146l1.3019187516.2492986474c.3047958631-1.5525666176.60062773-3.106718929.8864128477-4.6629050652.0671175938-.3579531463.1015681711-.7212149198.1015681711-1.0987824093 0-3.3022763098-2.6903015959-5.9925093072-5.9925193383-5.9925093072z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" font-weight="400" color="#000" overflow="visible" font-family="Sans"/><path d="M15.7108592665 9.6186111142l-2.0332559135-.3791187118c-.3218355222-.0599805927-.6292391622.1507788003-.689246298.4726057046l-.7040532313 3.7760885549c-.0600071358.3218269043.1507788003.629210206.4726143224.6892252704l2.0332555688.3790842401c.3218351775.0599461211.6292388175-.1507788002.6892459534-.4726401761l.7040539207-3.776088555c.0600071358-.321757961-.150779145-.629210206-.4726143225-.689156327z"/><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M26.53125 1.625a.50005.50005 0 0 0-.25.21875l-13.375 19.75a.50005.50005 0 1 0 .8125.5625l13.375-19.75a.50005.50005 0 0 0-.5625-.78125z" font-weight="400" color="#000" overflow="visible" font-family="Sans"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_hotcues_off.svg b/res/skins/Tango/buttons/btn_hotcues_off.svg
index 92b2d5c34730..ce3a0a1802bb 100644
--- a/res/skins/Tango/buttons/btn_hotcues_off.svg
+++ b/res/skins/Tango/buttons/btn_hotcues_off.svg
@@ -1,897 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_mixer_off.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4574">
-      <stop
-         style="stop-color:#ffb401;stop-opacity:1;"
-         offset="0"
-         id="stop4576" />
-      <stop
-         style="stop-color:#c68c00;stop-opacity:1;"
-         offset="1"
-         id="stop4578" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3846">
-      <stop
-         style="stop-color:#b0b0b0;stop-opacity:1;"
-         offset="0"
-         id="stop3848" />
-      <stop
-         style="stop-color:#585858;stop-opacity:0;"
-         offset="1"
-         id="stop3850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4937">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3939">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941" />
-      <stop
-         id="stop5813"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5461">
-      <stop
-         id="stop5463"
-         offset="0"
-         style="stop-color:#b9dcff;stop-opacity:1;" />
-      <stop
-         id="stop5465"
-         offset="1"
-         style="stop-color:#0d0d0d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443" />
-      <stop
-         style="stop-color:#343434;stop-opacity:1;"
-         offset="1"
-         id="stop5445" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5483-8"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5441-4">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441-7">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-4" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4-6"
-       id="linearGradient5573-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692" />
-    <linearGradient
-       id="linearGradient5441-4-6">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2-5" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3945"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5024"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(54.522364,18.173742)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5032"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-57.471498)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5265"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5267"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5791"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5847"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3837"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3839"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3841"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937"
-       id="linearGradient4945"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48778"
-       y2="634.36542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient4947"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3"
-       id="radialGradient4947-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2" />
-      <stop
-         id="stop5813-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6"
-       id="linearGradient3142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-234.5901,-615.11102)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.257316,0,0,1,-252.5901,-618.29518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3935"
-       xlink:href="#linearGradient4937-6"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9"
-       xlink:href="#Grad0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5"
-         style="stop-color:#060606;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop12-7"
-         style="stop-color:#343434;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846"
-       id="linearGradient3852"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9-5"
-       xlink:href="#Grad0-8-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929" />
-      <stop
-         id="stop12-7-9"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846-6"
-       id="linearGradient3852-5"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3846-6">
-      <stop
-         id="stop3927"
-         offset="0"
-         style="stop-color:#7c7c7c;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3850-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898"
-       xlink:href="#Grad0-8-9"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-2"
-       id="radialGradient4006-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-1" />
-      <stop
-         id="stop5813-8-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9"
-       id="linearGradient4004-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898-0"
-       xlink:href="#Grad0-8-9-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9-5"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4-7"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929-9" />
-      <stop
-         id="stop12-7-9-6"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9-7"
-       id="linearGradient4004-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9-7">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0-9" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7-5" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4006-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5" />
-      <stop
-         id="stop5813-8-1"
-         offset="0.51428574"
-         style="stop-color:#e85708;stop-opacity:0.95686275;" />
-      <stop
-         style="stop-color:#e80808;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-6"
-       id="linearGradient4004-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-13.919877,95.08267)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7-5"
-       id="radialGradient4337-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7-5">
-      <stop
-         style="stop-color:#33aaee;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-0" />
-      <stop
-         id="stop5813-8-1-6"
-         offset="0.61061949"
-         style="stop-color:#4ebeff;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#2db2ff;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-4"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3939-3-7-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-05" />
-      <stop
-         id="stop5813-8-1-2"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-1" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-6"
-       xlink:href="#linearGradient4937-6-6-24"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-24">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-4" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130-8"
-       xlink:href="#linearGradient4937-6-6-2-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2-7">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2-4" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="621.81409"
-       x1="202.48863"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4865"
-       xlink:href="#linearGradient4574"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="40.214084"
-     inkscape:cy="11.321085"
-     inkscape:document-units="px"
-     inkscape:current-layer="svg2"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     fit-margin-top="2.7755576e-17"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-global="false">
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999767,15.965812"
-       id="guide3057" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="16,31.634722"
-       id="guide3884" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="14.30161,27.52903"
-       id="guide3888" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="17.7,29.915521"
-       id="guide3896" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="20.1875,24.625"
-       id="guide3898" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="17.70149,27.52903"
-       id="guide3900" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="11.8125,25.84375"
-       id="guide3182" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="20.1875,25.8125"
-       id="guide3184" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="16,31.634722"
-       id="guide3940" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="6.3497669,15.470406"
-       id="guide3942" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="25.649687,15.470406"
-       id="guide3944" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999727,6.3158122"
-       id="guide3946" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999767,25.615812"
-       id="guide3950" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     inkscape:connector-curvature="0"
-     id="path3955"
-     style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#888888;fill-opacity:1;stroke:none;font-family:Biting My Nails;-inkscape-font-specification:Biting My Nails"
-     d="m 5,9 0,-6.9994068 1.311,0 L 6.311,9 5,9" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path3957"
-     style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#888888;fill-opacity:1;stroke:none;font-family:Biting My Nails;-inkscape-font-specification:Biting My Nails"
-     d="m 11,9 0,-1.3555555 1.4,-2.8 2.866666,0 0,-1.5333334 -3.577777,0 L 11.033333,2 l 4.844445,0 0.7,1.3777778 0,2.7777778 -3.455556,0 -0.766666,1.5333333 3.877777,0 L 16.888888,9 11,9" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path3959"
-     style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#888888;fill-opacity:1;stroke:none;font-family:Biting My Nails;-inkscape-font-specification:Biting My Nails"
-     d="M 6.8555555,18 2,18 l 0.6555555,-1.311111 3.5777778,0 0,-1.533334 -2.0666666,0 -0.7333334,-1.31111 2.8,0 0,-1.533334 -3.5777778,0 L 2,11 l 4.8555555,0 0.6888889,1.377778 0,4.244444 L 6.8555555,18" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path3961"
-     style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#888888;fill-opacity:1;stroke:none;font-family:Biting My Nails;-inkscape-font-specification:Biting My Nails"
-     d="m 15.266932,18 0,-2.844445 -4.266932,0 0,-1.333333 L 15.222485,11 l 1.35564,0 0,7 -1.311193,0 m 0,-5.466667 -2.022348,1.311112 2.022348,0 0,-1.311112" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><defs><linearGradient id="v"><stop offset="0" stop-color="#ffb401"/><stop offset="1" stop-color="#c68c00"/></linearGradient><linearGradient id="i"><stop offset="0" stop-color="#b0b0b0"/><stop offset="1" stop-color="#585858" stop-opacity="0"/></linearGradient><linearGradient id="e"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="d"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="f"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="g"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="h" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="j" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="k"><stop offset="0" stop-color="#7c7c7c" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="l"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="m"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="n" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="o"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="p"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".51428574" stop-color="#e85708" stop-opacity=".95686275"/><stop offset="1" stop-color="#e80808" stop-opacity="0"/></linearGradient><linearGradient id="q"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="r"><stop offset="0" stop-color="#3ae" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#4ebeff" stop-opacity=".8186813"/><stop offset="1" stop-color="#2db2ff" stop-opacity="0"/></linearGradient><linearGradient id="s"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient><linearGradient id="t"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="u"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient></defs><path style="line-height:125%;-inkscape-font-specification:Biting My Nails" d="M5 9V2.0005932h1.311V9H5M11 9V7.6444445l1.4-2.8h2.866666V3.3111111h-3.577777L11.033333 2h4.844445l.7 1.3777778v2.7777778h-3.455556l-.766666 1.5333333h3.877777L16.888888 9H11M7.8555555 18H3l.6555555-1.311111h3.5777778v-1.533334H5.1666667l-.7333334-1.31111h2.8v-1.533334H3.6555555L3 11h4.8555555l.6888889 1.377778v4.244444L7.8555555 18M15.266932 18v-2.844445H11v-1.333333L15.222485 11h1.35564v7h-1.311193m0-5.466667l-2.022348 1.311112h2.022348v-1.311112" font-size="13" font-weight="400" letter-spacing="0" word-spacing="0" fill="#888" font-family="Biting My Nails"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_hotcues_on.svg b/res/skins/Tango/buttons/btn_hotcues_on.svg
index 0b2e30bf12e8..7964c299e58a 100644
--- a/res/skins/Tango/buttons/btn_hotcues_on.svg
+++ b/res/skins/Tango/buttons/btn_hotcues_on.svg
@@ -1,897 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_hotcues_off.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4574">
-      <stop
-         style="stop-color:#ffb401;stop-opacity:1;"
-         offset="0"
-         id="stop4576" />
-      <stop
-         style="stop-color:#c68c00;stop-opacity:1;"
-         offset="1"
-         id="stop4578" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3846">
-      <stop
-         style="stop-color:#b0b0b0;stop-opacity:1;"
-         offset="0"
-         id="stop3848" />
-      <stop
-         style="stop-color:#585858;stop-opacity:0;"
-         offset="1"
-         id="stop3850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4937">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3939">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941" />
-      <stop
-         id="stop5813"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5461">
-      <stop
-         id="stop5463"
-         offset="0"
-         style="stop-color:#b9dcff;stop-opacity:1;" />
-      <stop
-         id="stop5465"
-         offset="1"
-         style="stop-color:#0d0d0d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443" />
-      <stop
-         style="stop-color:#343434;stop-opacity:1;"
-         offset="1"
-         id="stop5445" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5483-8"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5441-4">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441-7">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-4" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4-6"
-       id="linearGradient5573-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692" />
-    <linearGradient
-       id="linearGradient5441-4-6">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2-5" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3945"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5024"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(54.522364,18.173742)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5032"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-57.471498)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5265"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5267"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5791"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5847"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3837"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3839"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3841"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937"
-       id="linearGradient4945"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48778"
-       y2="634.36542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient4947"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3"
-       id="radialGradient4947-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2" />
-      <stop
-         id="stop5813-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6"
-       id="linearGradient3142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-234.5901,-615.11102)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.257316,0,0,1,-252.5901,-618.29518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3935"
-       xlink:href="#linearGradient4937-6"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9"
-       xlink:href="#Grad0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5"
-         style="stop-color:#060606;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop12-7"
-         style="stop-color:#343434;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846"
-       id="linearGradient3852"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9-5"
-       xlink:href="#Grad0-8-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929" />
-      <stop
-         id="stop12-7-9"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846-6"
-       id="linearGradient3852-5"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3846-6">
-      <stop
-         id="stop3927"
-         offset="0"
-         style="stop-color:#7c7c7c;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3850-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898"
-       xlink:href="#Grad0-8-9"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-2"
-       id="radialGradient4006-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-1" />
-      <stop
-         id="stop5813-8-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9"
-       id="linearGradient4004-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898-0"
-       xlink:href="#Grad0-8-9-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9-5"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4-7"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929-9" />
-      <stop
-         id="stop12-7-9-6"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9-7"
-       id="linearGradient4004-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9-7">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0-9" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7-5" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4006-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5" />
-      <stop
-         id="stop5813-8-1"
-         offset="0.51428574"
-         style="stop-color:#e85708;stop-opacity:0.95686275;" />
-      <stop
-         style="stop-color:#e80808;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-6"
-       id="linearGradient4004-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-13.919877,95.08267)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7-5"
-       id="radialGradient4337-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7-5">
-      <stop
-         style="stop-color:#33aaee;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-0" />
-      <stop
-         id="stop5813-8-1-6"
-         offset="0.61061949"
-         style="stop-color:#4ebeff;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#2db2ff;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-4"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3939-3-7-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-05" />
-      <stop
-         id="stop5813-8-1-2"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-1" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-6"
-       xlink:href="#linearGradient4937-6-6-24"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-24">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-4" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130-8"
-       xlink:href="#linearGradient4937-6-6-2-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2-7">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2-4" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="621.81409"
-       x1="202.48863"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4865"
-       xlink:href="#linearGradient4574"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="40.214084"
-     inkscape:cy="11.321085"
-     inkscape:document-units="px"
-     inkscape:current-layer="svg2"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     fit-margin-top="2.7755576e-17"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-global="false">
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999767,15.965812"
-       id="guide3057" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="16,31.634722"
-       id="guide3884" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="14.30161,27.52903"
-       id="guide3888" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="17.7,29.915521"
-       id="guide3896" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="20.1875,24.625"
-       id="guide3898" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="17.70149,27.52903"
-       id="guide3900" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="11.8125,25.84375"
-       id="guide3182" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="20.1875,25.8125"
-       id="guide3184" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="16,31.634722"
-       id="guide3940" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="6.3497669,15.470406"
-       id="guide3942" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="25.649687,15.470406"
-       id="guide3944" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999727,6.3158122"
-       id="guide3946" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999767,25.615812"
-       id="guide3950" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     inkscape:connector-curvature="0"
-     id="path3955"
-     style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#d2d2d2;fill-opacity:1;stroke:none;font-family:Biting My Nails;-inkscape-font-specification:Biting My Nails"
-     d="m 5,9 0,-6.9994068 1.311,0 L 6.311,9 5,9" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path3957"
-     style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#d2d2d2;fill-opacity:1;stroke:none;font-family:Biting My Nails;-inkscape-font-specification:Biting My Nails"
-     d="m 11,9 0,-1.3555555 1.4,-2.8 2.866666,0 0,-1.5333334 -3.577777,0 L 11.033333,2 l 4.844445,0 0.7,1.3777778 0,2.7777778 -3.455556,0 -0.766666,1.5333333 3.877777,0 L 16.888888,9 11,9" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path3959"
-     style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#d2d2d2;fill-opacity:1;stroke:none;font-family:Biting My Nails;-inkscape-font-specification:Biting My Nails"
-     d="M 6.8555555,18 2,18 l 0.6555555,-1.311111 3.5777778,0 0,-1.533334 -2.0666666,0 -0.7333334,-1.31111 2.8,0 0,-1.533334 -3.5777778,0 L 2,11 l 4.8555555,0 0.6888889,1.377778 0,4.244444 L 6.8555555,18" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path3961"
-     style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#d2d2d2;fill-opacity:1;stroke:none;font-family:Biting My Nails;-inkscape-font-specification:Biting My Nails"
-     d="m 15.266932,18 0,-2.844445 -4.266932,0 0,-1.333333 L 15.222485,11 l 1.35564,0 0,7 -1.311193,0 m 0,-5.466667 -2.022348,1.311112 2.022348,0 0,-1.311112" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><defs><linearGradient id="v"><stop offset="0" stop-color="#ffb401"/><stop offset="1" stop-color="#c68c00"/></linearGradient><linearGradient id="i"><stop offset="0" stop-color="#b0b0b0"/><stop offset="1" stop-color="#585858" stop-opacity="0"/></linearGradient><linearGradient id="e"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="d"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="f"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="g"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="h" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="j" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="k"><stop offset="0" stop-color="#7c7c7c" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="l"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="m"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="n" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="o"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="p"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".51428574" stop-color="#e85708" stop-opacity=".95686275"/><stop offset="1" stop-color="#e80808" stop-opacity="0"/></linearGradient><linearGradient id="q"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="r"><stop offset="0" stop-color="#3ae" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#4ebeff" stop-opacity=".8186813"/><stop offset="1" stop-color="#2db2ff" stop-opacity="0"/></linearGradient><linearGradient id="s"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient><linearGradient id="t"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="u"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient></defs><path style="line-height:125%;-inkscape-font-specification:Biting My Nails" d="M5 9V2.0005932h1.311V9H5M11 9V7.6444445l1.4-2.8h2.866666V3.3111111h-3.577777L11.033333 2h4.844445l.7 1.3777778v2.7777778h-3.455556l-.766666 1.5333333h3.877777L16.888888 9H11M7.8555555 18H3l.6555555-1.311111h3.5777778v-1.533334H5.1666667l-.7333334-1.31111h2.8v-1.533334H3.6555555L3 11h4.8555555l.6888889 1.377778v4.244444L7.8555555 18M15.266932 18v-2.844445H11v-1.333333L15.222485 11h1.35564v7h-1.311193m0-5.466667l-2.022348 1.311112h2.022348v-1.311112" font-size="13" font-weight="400" letter-spacing="0" word-spacing="0" fill="#d2d2d2" font-family="Biting My Nails"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_key_down.svg b/res/skins/Tango/buttons/btn_key_down.svg
index 25fa77ce4283..f54272d2a7eb 100644
--- a/res/skins/Tango/buttons/btn_key_down.svg
+++ b/res/skins/Tango/buttons/btn_key_down.svg
@@ -1,76 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="12"
-   height="13"
-   id="svg3769"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_key_up.svg">
-  <defs
-     id="defs3771" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.678384"
-     inkscape:cx="-2.6657648"
-     inkscape:cy="5.9153285"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true" />
-  <metadata
-     id="metadata3774">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1039.3622)">
-    <path
-       sodipodi:type="star"
-       style="fill:#ff4800;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3018"
-       sodipodi:sides="3"
-       sodipodi:cx="3"
-       sodipodi:cy="5"
-       sodipodi:r1="15.119611"
-       sodipodi:r2="7.5598059"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 18.119611,5 -22.6794164,13.093967 0,-26.187934 z"
-       transform="matrix(0,0.38185525,0.38185525,0,4.0907237,1043.2733)" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="13"><path d="M5.99999995 10.6602685883l5.0000000423-8.6602542193H.9999999077z" fill="#ff4800"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_key_up.svg b/res/skins/Tango/buttons/btn_key_up.svg
index 1d0d5466f88e..77e6d5bc7a22 100644
--- a/res/skins/Tango/buttons/btn_key_up.svg
+++ b/res/skins/Tango/buttons/btn_key_up.svg
@@ -1,76 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="12"
-   height="13"
-   id="svg3769"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_key_up.svg">
-  <defs
-     id="defs3771" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.678384"
-     inkscape:cx="-2.6657648"
-     inkscape:cy="5.9153285"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true" />
-  <metadata
-     id="metadata3774">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1039.3622)">
-    <path
-       sodipodi:type="star"
-       style="fill:#ff4800;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3018"
-       sodipodi:sides="3"
-       sodipodi:cx="3"
-       sodipodi:cy="5"
-       sodipodi:r1="15.119611"
-       sodipodi:r2="7.5598059"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 18.119611,5 -22.6794164,13.093967 0,-26.187934 z"
-       transform="matrix(0,-0.38185525,-0.38185525,0,7.9092763,1048.4511)" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="13"><path d="M6.00000005 2.3397314117L1.0000000077 10.999985631h10.0000000846z" fill="#ff4800"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_keylock_off.svg b/res/skins/Tango/buttons/btn_keylock_off.svg
index 731f358c4c50..6771f5698f00 100644
--- a/res/skins/Tango/buttons/btn_keylock_off.svg
+++ b/res/skins/Tango/buttons/btn_keylock_off.svg
@@ -1,83 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="20"
-   height="22"
-   viewBox="0 0 20 22"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_keylock_on.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="4.9166667"
-     inkscape:cx="-42.20339"
-     inkscape:cy="24"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-26)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <g
-     id="layer1"
-     style="fill:#888888;fill-opacity:1;display:inline"
-     transform="matrix(0.45833333,0,0,0.45833333,-0.99966663,0)">
-    <g
-       id="g3886-3"
-       style="fill:#888888;fill-opacity:1;display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888-6"
-         style="fill:#888888;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="22" viewBox="0 0 20 22"><path d="M10.91699995 2.74999998v10.7868749215c-.7553333278-.4519166633-1.734791654-.7026249948-2.74999998-.7035416615-2.2781916501 0-4.12499997 1.2312208244-4.12499997 2.74999998s1.8468083199 2.74999998 4.12499997 2.74999998 4.12499997-1.2312208244 4.12499997-2.74999998V5.49999996l4.12499997.91666666V3.66666664l-4.12499997-.91666666z" fill="#888"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_keylock_on.svg b/res/skins/Tango/buttons/btn_keylock_on.svg
index d80257cae3b3..69da3707e134 100644
--- a/res/skins/Tango/buttons/btn_keylock_on.svg
+++ b/res/skins/Tango/buttons/btn_keylock_on.svg
@@ -1,85 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="20"
-   height="22"
-   viewBox="0 0 20 22"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_keylock_on.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="16"
-     inkscape:cx="6.9766055"
-     inkscape:cy="7.3558958"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-26)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <g
-     id="layer1"
-     style="fill:#cccccc;fill-opacity:1;display:inline"
-     transform="matrix(0.45833333,0,0,0.45833333,-0.99966663,0)">
-    <g
-       id="g3886-3"
-       style="fill:#dc0000;fill-opacity:1;display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888-6"
-         style="fill:#dc0000;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="22" viewBox="0 0 20 22"><path d="M10.91699995 2.74999998v10.7868749215c-.7553333278-.4519166633-1.734791654-.7026249948-2.74999998-.7035416615-2.2781916501 0-4.12499997 1.2312208244-4.12499997 2.74999998s1.8468083199 2.74999998 4.12499997 2.74999998 4.12499997-1.2312208244 4.12499997-2.74999998V5.49999996l4.12499997.91666666V3.66666664l-4.12499997-.91666666z" fill="#dc0000"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_lib_cover_off.svg b/res/skins/Tango/buttons/btn_lib_cover_off.svg
index ab4a2e4b484d..33cf3fa69711 100644
--- a/res/skins/Tango/buttons/btn_lib_cover_off.svg
+++ b/res/skins/Tango/buttons/btn_lib_cover_off.svg
@@ -1,78 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_lib_cover_on.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview7"
-     showgrid="false"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="33.924807"
-     inkscape:cy="21.667435"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1-3"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer#1">
-    <g
-       style="opacity:1;fill-rule:evenodd"
-       id="layer1-3"
-       transform="matrix(0.05269352,0,0,0.05273213,7.0048322,-14.498287)">
-      <path
-         style="color:#000000;fill:#888888;fill-opacity:1;enable-background:accumulate"
-         d="m -19.069369,388.72479 0,682.69581 683.195959,0 0,-682.69581 -683.195959,0 z m 342.159809,151.5854 c 104.75478,0.37759 189.71752,85.64584 189.33968,190.3239 -0.37788,104.67806 -85.72119,189.5786 -190.46334,189.20104 C 217.21203,919.45754 132.24926,834.17672 132.62711,729.51123 133.00496,624.8332 218.33569,539.93262 323.09044,540.31019 z"
-         id="path4417"
-         inkscape:connector-curvature="0" />
-      <path
-         style="color:#000000;fill:#888888;fill-opacity:1;enable-background:accumulate"
-         d="m 322.67918,687.43054 c 23.58028,0.0903 42.61315,19.22959 42.5228,42.7926 -0.0601,23.563 -19.24368,42.58194 -42.79383,42.49166 -23.58027,-0.0601 -42.64325,-19.22959 -42.55291,-42.76251 0.0904,-23.563 19.24369,-42.61203 42.82394,-42.52175 z"
-         id="label-cutout"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><g fill-rule="evenodd" color="#000" fill="#888"><path d="M6.0000000232 5.9999991605v36.0000042034h35.9999999295V5.9999991605H6.0000000232zm18.0296047387 7.9934210189c5.519898095.019911125 9.9968839345 4.5162875688 9.976974215 10.036184637-.0199118274 5.519897068-4.5169512398 9.9968833803-10.0361838156 9.9769738373-5.5198965143-.019911125-9.9968839345-4.5169504117-9.976973688-10.0361846369.0199102466-5.519895486 4.5162867744-9.9968839077 10.0361832886-9.9769738374z"/><path d="M24.007934025 21.7513896013c1.2425279557.0047617113 2.2454368717 1.0140172397 2.2406760122 2.2565449462-.0031668806 1.2425271792-1.014017237 2.2454363957-2.254957537 2.240675739-1.2425274289-.003169201-2.2470229468-1.0140172397-2.2422626142-2.2549582364.0047634943-1.2425271792 1.014017764-2.2470231055 2.256544139-2.2422624488z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_lib_cover_on.svg b/res/skins/Tango/buttons/btn_lib_cover_on.svg
index 5a3bc635aebf..18d25096ad7b 100644
--- a/res/skins/Tango/buttons/btn_lib_cover_on.svg
+++ b/res/skins/Tango/buttons/btn_lib_cover_on.svg
@@ -1,78 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_lib_cover_on.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview7"
-     showgrid="false"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="33.924807"
-     inkscape:cy="21.667435"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1-3"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer#1">
-    <g
-       style="opacity:1;fill-rule:evenodd"
-       id="layer1-3"
-       transform="matrix(0.05269352,0,0,0.05273213,7.0048322,-14.498287)">
-      <path
-         style="color:#000000;fill:#d2d2d2;fill-opacity:1;enable-background:accumulate"
-         d="m -19.069369,388.72479 0,682.69581 683.195959,0 0,-682.69581 -683.195959,0 z m 342.159809,151.5854 c 104.75478,0.37759 189.71752,85.64584 189.33968,190.3239 -0.37788,104.67806 -85.72119,189.5786 -190.46334,189.20104 C 217.21203,919.45754 132.24926,834.17672 132.62711,729.51123 133.00496,624.8332 218.33569,539.93262 323.09044,540.31019 z"
-         id="path4417"
-         inkscape:connector-curvature="0" />
-      <path
-         style="color:#000000;fill:#d2d2d2;fill-opacity:1;enable-background:accumulate"
-         d="m 322.67918,687.43054 c 23.58028,0.0903 42.61315,19.22959 42.5228,42.7926 -0.0601,23.563 -19.24368,42.58194 -42.79383,42.49166 -23.58027,-0.0601 -42.64325,-19.22959 -42.55291,-42.76251 0.0904,-23.563 19.24369,-42.61203 42.82394,-42.52175 z"
-         id="label-cutout"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><g fill-rule="evenodd" color="#000" fill="#d2d2d2"><path d="M6.0000000232 5.9999991605v36.0000042034h35.9999999295V5.9999991605H6.0000000232zm18.0296047387 7.9934210189c5.519898095.019911125 9.9968839345 4.5162875688 9.976974215 10.036184637-.0199118274 5.519897068-4.5169512398 9.9968833803-10.0361838156 9.9769738373-5.5198965143-.019911125-9.9968839345-4.5169504117-9.976973688-10.0361846369.0199102466-5.519895486 4.5162867744-9.9968839077 10.0361832886-9.9769738374z"/><path d="M24.007934025 21.7513896013c1.2425279557.0047617113 2.2454368717 1.0140172397 2.2406760122 2.2565449462-.0031668806 1.2425271792-1.014017237 2.2454363957-2.254957537 2.240675739-1.2425274289-.003169201-2.2470229468-1.0140172397-2.2422626142-2.2549582364.0047634943-1.2425271792 1.014017764-2.2470231055 2.256544139-2.2422624488z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_lib_maxi.svg b/res/skins/Tango/buttons/btn_lib_maxi.svg
index c8ac4f37f883..0d0b4be96a81 100644
--- a/res/skins/Tango/buttons/btn_lib_maxi.svg
+++ b/res/skins/Tango/buttons/btn_lib_maxi.svg
@@ -1,78 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="19"
-   height="13"
-   viewBox="0 0 19 13"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_arrow_up_thin.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="11.313708"
-     inkscape:cx="14.745468"
-     inkscape:cy="-8.1457674"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="false" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-35)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <path
-     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 5.1413334,11 11.000001,5.1413326 16.858667,11 18.323334,9.535333 12.464668,3.676667 11.000001,2.212 9.5353326,3.676667 3.6766664,9.535333 5.1413334,11 z"
-     id="rect2987-7-3"
-     inkscape:connector-curvature="0" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="19" height="13" viewBox="0 0 19 13"><path d="M5.1413334 11l5.8586676-5.8586674L16.858667 11l1.464667-1.464667-5.858666-5.858666L11.000001 2.212 9.5353326 3.676667 3.6766664 9.535333 5.1413334 11z" fill="#888"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_lib_maxi_hover.svg b/res/skins/Tango/buttons/btn_lib_maxi_hover.svg
index 21a376cffa54..3d58bac8bb2f 100644
--- a/res/skins/Tango/buttons/btn_lib_maxi_hover.svg
+++ b/res/skins/Tango/buttons/btn_lib_maxi_hover.svg
@@ -1,78 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="19"
-   height="13"
-   viewBox="0 0 19 13"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_arrow_up_thin_hover.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="11.313708"
-     inkscape:cx="-0.19216341"
-     inkscape:cy="-8.1457674"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="false" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-35)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <path
-     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 5.1413334,10 11.000001,4.1413326 16.858667,10 18.323334,8.535333 12.464668,2.676667 11.000001,1.212 9.5353326,2.676667 3.6766664,8.535333 5.1413334,10 z"
-     id="rect2987-7-3"
-     inkscape:connector-curvature="0" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="19" height="13" viewBox="0 0 19 13"><path d="M5.1413334 10l5.8586676-5.8586674L16.858667 10l1.464667-1.464667-5.858666-5.858666L11.000001 1.212 9.5353326 2.676667 3.6766664 8.535333 5.1413334 10z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_lib_mini.svg b/res/skins/Tango/buttons/btn_lib_mini.svg
index 99f3f1a379e1..aacd4e62ed94 100644
--- a/res/skins/Tango/buttons/btn_lib_mini.svg
+++ b/res/skins/Tango/buttons/btn_lib_mini.svg
@@ -1,78 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="19"
-   height="13"
-   viewBox="0 0 19 13"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_arrow_down_thin.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="31.999999"
-     inkscape:cx="14.618211"
-     inkscape:cy="1.6386772"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="false" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-35)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <path
-     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 16.858667,2 10.999999,7.8586674 5.141333,2 3.676666,3.464667 9.535332,9.323333 10.999999,10.788 12.464667,9.323333 18.323334,3.464667 16.858667,2 z"
-     id="rect2987-7-3"
-     inkscape:connector-curvature="0" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="19" height="13" viewBox="0 0 19 13"><path d="M16.858667 2l-5.858668 5.8586674L5.141333 2 3.676666 3.464667l5.858666 5.858666L10.999999 10.788l1.464668-1.464667 5.858667-5.858666L16.858667 2z" fill="#888"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_lib_mini_hover.svg b/res/skins/Tango/buttons/btn_lib_mini_hover.svg
index 6db5375d9908..fce64e0325fa 100644
--- a/res/skins/Tango/buttons/btn_lib_mini_hover.svg
+++ b/res/skins/Tango/buttons/btn_lib_mini_hover.svg
@@ -1,78 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="19"
-   height="13"
-   viewBox="0 0 19 13"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_arrow_down_thin_hover.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="15.999999"
-     inkscape:cx="3.4966484"
-     inkscape:cy="-2.4180824"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="false" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="layer2"
-     style="display:none"
-     transform="translate(0,-35)">
-    <g
-       id="g3886"
-       style="display:inline">
-      <path
-         d="m 26,6 0,23.535 C 24.352,28.549 22.215,28.002 20,28 c -4.9706,0 -9,2.6863 -9,6 0,3.3137 4.0294,6 9,6 4.9706,0 9,-2.6863 9,-6 l 0,-22 9,2 0,-6 -9,-2 z"
-         id="path3888"
-         style="fill:#666666;fill-opacity:1;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <path
-     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 16.858966,3.5 11.000165,9.3586674 5.1413662,3.5 3.676666,4.964667 9.5354648,10.823333 11.000165,12.288 12.464866,10.823333 18.323666,4.964667 16.858966,3.5 z"
-     id="rect2987-7-3"
-     inkscape:connector-curvature="0" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="19" height="13" viewBox="0 0 19 13"><path d="M16.858966 3.5l-5.858801 5.8586674L5.1413662 3.5 3.676666 4.964667l5.8587988 5.858666L11.000165 12.288l1.464701-1.464667 5.8588-5.858666L16.858966 3.5z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_logo_104x26.svg b/res/skins/Tango/buttons/btn_logo_104x26.svg
index 4b2cabde8008..910da6f91f82 100644
--- a/res/skins/Tango/buttons/btn_logo_104x26.svg
+++ b/res/skins/Tango/buttons/btn_logo_104x26.svg
@@ -1,984 +1 @@
-<?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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="104"
-   height="26"
-   version="1.1"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_logo_104x26.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview3310"
-     showgrid="false"
-     inkscape:zoom="7.2614428"
-     inkscape:cx="66.204896"
-     inkscape:cy="12.755019"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <metadata
-     id="metadata209">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <linearGradient
-       id="Grad0"
-       y1="-0.1462"
-       x1="74.992996"
-       y2="88.766998"
-       gradientUnits="userSpaceOnUse"
-       x2="13.4863">
-      <stop
-         offset="47.8%"
-         stop-color="#39b549"
-         stop-opacity="1"
-         id="stop7" />
-      <stop
-         offset="100%"
-         stop-color="#1a76bc"
-         stop-opacity="1"
-         id="stop9" />
-    </linearGradient>
-    <linearGradient
-       id="Grad1"
-       y1="-0.15009999"
-       x1="74.997902"
-       y2="88.767303"
-       gradientUnits="userSpaceOnUse"
-       x2="13.4883">
-      <stop
-         offset="0%"
-         stop-color="#381f1f"
-         stop-opacity="1"
-         id="stop12" />
-      <stop
-         offset="0.17%"
-         stop-color="#3a1f20"
-         stop-opacity="1"
-         id="stop14" />
-      <stop
-         offset="3.76%"
-         stop-color="#5b2825"
-         stop-opacity="1"
-         id="stop16" />
-      <stop
-         offset="7.57%"
-         stop-color="#7c2f28"
-         stop-opacity="1"
-         id="stop18" />
-      <stop
-         offset="11.73%"
-         stop-color="#9b2e28"
-         stop-opacity="1"
-         id="stop20" />
-      <stop
-         offset="16.26%"
-         stop-color="#b62c28"
-         stop-opacity="1"
-         id="stop22" />
-      <stop
-         offset="21.29%"
-         stop-color="#cc2626"
-         stop-opacity="1"
-         id="stop24" />
-      <stop
-         offset="27.1%"
-         stop-color="#dc2225"
-         stop-opacity="1"
-         id="stop26" />
-      <stop
-         offset="34.38%"
-         stop-color="#e81f25"
-         stop-opacity="1"
-         id="stop28" />
-      <stop
-         offset="47.8%"
-         stop-color="#ed1b26"
-         stop-opacity="1"
-         id="stop30" />
-      <stop
-         offset="100%"
-         stop-color="#f7921e"
-         stop-opacity="1"
-         id="stop32" />
-    </linearGradient>
-    <linearGradient
-       id="Grad2"
-       y1="-0.1471"
-       x1="74.991898"
-       y2="88.765999"
-       gradientUnits="userSpaceOnUse"
-       x2="13.4852">
-      <stop
-         offset="0%"
-         stop-color="#120e1e"
-         stop-opacity="1"
-         id="stop35" />
-      <stop
-         offset="2.31%"
-         stop-color="#1b1426"
-         stop-opacity="1"
-         id="stop37" />
-      <stop
-         offset="14.46%"
-         stop-color="#442349"
-         stop-opacity="1"
-         id="stop39" />
-      <stop
-         offset="25.52%"
-         stop-color="#652866"
-         stop-opacity="1"
-         id="stop41" />
-      <stop
-         offset="35.11%"
-         stop-color="#7c287b"
-         stop-opacity="1"
-         id="stop43" />
-      <stop
-         offset="42.86%"
-         stop-color="#8b2589"
-         stop-opacity="1"
-         id="stop45" />
-      <stop
-         offset="47.8%"
-         stop-color="#91268f"
-         stop-opacity="1"
-         id="stop47" />
-      <stop
-         offset="100%"
-         stop-color="#ed1b26"
-         stop-opacity="1"
-         id="stop49" />
-    </linearGradient>
-    <clipPath
-       id="Clip0">
-      <path
-         d="m 0,0 358.182,0 0,89.118 L 0,89.118 0,0 z"
-         transform="translate(0,0.028)"
-         id="path52"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       id="Grad3"
-       y1="0.24690001"
-       x1="44.0611"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.0611">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop55" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop57" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop59" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop61" />
-    </linearGradient>
-    <linearGradient
-       id="Grad4"
-       y1="0.24690001"
-       x1="44.066101"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.066101">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop64" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop66" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop68" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop70" />
-    </linearGradient>
-    <linearGradient
-       id="Grad5"
-       y1="0.24690001"
-       x1="44.066299"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.066299">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop73" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop75" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop77" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop79" />
-    </linearGradient>
-    <linearGradient
-       id="Grad6"
-       y1="0.24690001"
-       x1="11.5568"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="11.5568">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop82" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop84" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop86" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop88" />
-    </linearGradient>
-    <linearGradient
-       id="Grad7"
-       y1="0.24690001"
-       x1="52.543499"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="52.543499">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop91" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop93" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop95" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop97" />
-    </linearGradient>
-    <linearGradient
-       id="Grad8"
-       y1="90.636597"
-       x1="0.34819999"
-       y2="-2.3324001"
-       gradientUnits="userSpaceOnUse"
-       x2="0.34819999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop100" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop102" />
-    </linearGradient>
-    <linearGradient
-       id="Grad9"
-       y1="90.636597"
-       x1="0.34799999"
-       y2="-2.3324001"
-       gradientUnits="userSpaceOnUse"
-       x2="0.34799999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop105" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop107" />
-    </linearGradient>
-    <linearGradient
-       id="Grad10"
-       y1="88.656097"
-       x1="0.31259999"
-       y2="1.1722"
-       gradientUnits="userSpaceOnUse"
-       x2="0.31259999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop110" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop112" />
-    </linearGradient>
-    <linearGradient
-       id="Grad11"
-       y1="88.656097"
-       x1="0.31209999"
-       y2="1.1722"
-       gradientUnits="userSpaceOnUse"
-       x2="0.31209999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop115" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop117" />
-    </linearGradient>
-    <clipPath
-       id="Clip1">
-      <path
-         d="m 0,0 88.123,0 0,89.118 L 0,89.118 0,0 z"
-         transform="translate(147.641,0.028)"
-         id="path120"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       id="Grad12"
-       y1="89.1185"
-       x1="30.5499"
-       y2="-3.2409"
-       gradientUnits="userSpaceOnUse"
-       x2="30.5499">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop123" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop125" />
-    </linearGradient>
-    <linearGradient
-       id="Grad13"
-       y1="90.025703"
-       x1="30.547501"
-       y2="0.1055"
-       gradientUnits="userSpaceOnUse"
-       x2="30.547501">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop128" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop130" />
-    </linearGradient>
-    <clipPath
-       id="Clip2">
-      <path
-         d="m 0,0 88.123,0 0,89.118 L 0,89.118 0,0 z"
-         transform="translate(208.823,0)"
-         id="path133"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       id="Grad14"
-       y1="89.118202"
-       x1="30.5495"
-       y2="-3.2412"
-       gradientUnits="userSpaceOnUse"
-       x2="30.5495">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop136" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop138" />
-    </linearGradient>
-    <linearGradient
-       id="Grad15"
-       y1="90.025398"
-       x1="30.549101"
-       y2="0.1052"
-       gradientUnits="userSpaceOnUse"
-       x2="30.549101">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop141" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop143" />
-    </linearGradient>
-    <clipPath
-       id="Clip3">
-      <path
-         d="m 0,0 88.123,0 0,89.118 L 0,89.118 0,0 z"
-         transform="translate(270.034,0)"
-         id="path146"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       id="Grad16"
-       y1="89.118202"
-       x1="30.5494"
-       y2="-3.2412"
-       gradientUnits="userSpaceOnUse"
-       x2="30.5494">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop149" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop151" />
-    </linearGradient>
-    <linearGradient
-       id="Grad17"
-       y1="90.025398"
-       x1="30.549"
-       y2="0.1052"
-       gradientUnits="userSpaceOnUse"
-       x2="30.549">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop154" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop156" />
-    </linearGradient>
-    <linearGradient
-       id="Grad18"
-       y1="52.640499"
-       x1="0.29169801"
-       y2="-37.8988"
-       gradientUnits="userSpaceOnUse"
-       x2="0.29169801">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop159" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop161" />
-    </linearGradient>
-    <linearGradient
-       id="Grad19"
-       y1="52.9165"
-       x1="0.2481"
-       y2="-35.325699"
-       gradientUnits="userSpaceOnUse"
-       x2="0.2481">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop164" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop166" />
-    </linearGradient>
-    <linearGradient
-       id="Grad20"
-       y1="89.119904"
-       x1="27.6264"
-       y2="0.1302"
-       gradientUnits="userSpaceOnUse"
-       x2="27.6264">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop169" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop171" />
-    </linearGradient>
-    <linearGradient
-       id="Grad21"
-       y1="53.389"
-       x1="29.726101"
-       y2="-36.621201"
-       gradientUnits="userSpaceOnUse"
-       x2="29.726101">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop174" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop176" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8"
-       id="linearGradient3169"
-       gradientUnits="userSpaceOnUse"
-       x1="0.34819999"
-       y1="90.636597"
-       x2="0.34819999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad9"
-       id="linearGradient3171"
-       gradientUnits="userSpaceOnUse"
-       x1="0.34799999"
-       y1="90.636597"
-       x2="0.34799999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad10"
-       id="linearGradient3173"
-       gradientUnits="userSpaceOnUse"
-       x1="0.31259999"
-       y1="88.656097"
-       x2="0.31259999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad11"
-       id="linearGradient3175"
-       gradientUnits="userSpaceOnUse"
-       x1="0.31209999"
-       y1="88.656097"
-       x2="0.31209999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad12"
-       id="linearGradient3177"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5499"
-       y1="89.1185"
-       x2="30.5499"
-       y2="-3.2409" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad13"
-       id="linearGradient3179"
-       gradientUnits="userSpaceOnUse"
-       x1="30.547501"
-       y1="90.025703"
-       x2="30.547501"
-       y2="0.1055" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad14"
-       id="linearGradient3181"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5495"
-       y1="89.118202"
-       x2="30.5495"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad15"
-       id="linearGradient3183"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549101"
-       y1="90.025398"
-       x2="30.549101"
-       y2="0.1052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad16"
-       id="linearGradient3185"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5494"
-       y1="89.118202"
-       x2="30.5494"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad17"
-       id="linearGradient3187"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549"
-       y1="90.025398"
-       x2="30.549"
-       y2="0.1052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad18"
-       id="linearGradient3189"
-       gradientUnits="userSpaceOnUse"
-       x1="0.29169801"
-       y1="52.640499"
-       x2="0.29169801"
-       y2="-37.8988" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad19"
-       id="linearGradient3191"
-       gradientUnits="userSpaceOnUse"
-       x1="0.2481"
-       y1="52.9165"
-       x2="0.2481"
-       y2="-35.325699" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad20"
-       id="linearGradient3193"
-       gradientUnits="userSpaceOnUse"
-       x1="27.6264"
-       y1="89.119904"
-       x2="27.6264"
-       y2="0.1302" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad21"
-       id="linearGradient3195"
-       gradientUnits="userSpaceOnUse"
-       x1="29.726101"
-       y1="53.389"
-       x2="29.726101"
-       y2="-36.621201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad21"
-       id="linearGradient3198"
-       gradientUnits="userSpaceOnUse"
-       x1="29.726101"
-       y1="53.389"
-       x2="29.726101"
-       y2="-36.621201"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.2647203,8.517766)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad20"
-       id="linearGradient3201"
-       gradientUnits="userSpaceOnUse"
-       x1="27.6264"
-       y1="89.119904"
-       x2="27.6264"
-       y2="0.1302"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.7882887,0.0065326)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad19"
-       id="linearGradient3204"
-       gradientUnits="userSpaceOnUse"
-       x1="0.2481"
-       y1="52.9165"
-       x2="0.2481"
-       y2="-35.325699"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.1481136,8.4533682)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad18"
-       id="linearGradient3207"
-       gradientUnits="userSpaceOnUse"
-       x1="0.29169801"
-       y1="52.640499"
-       x2="0.29169801"
-       y2="-37.8988"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,19.07471,8.5177656)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad11"
-       id="linearGradient3219"
-       gradientUnits="userSpaceOnUse"
-       x1="0.31209999"
-       y1="88.656097"
-       x2="0.31209999"
-       y2="1.1722"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,0,0.00653218)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad10"
-       id="linearGradient3222"
-       gradientUnits="userSpaceOnUse"
-       x1="0.31259999"
-       y1="88.656097"
-       x2="0.31259999"
-       y2="1.1722"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,26.783988,0.00653235)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad9"
-       id="linearGradient3225"
-       gradientUnits="userSpaceOnUse"
-       x1="0.34799999"
-       y1="90.636597"
-       x2="0.34799999"
-       y2="-2.3324001"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,24.236528,0.0065326)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8"
-       id="linearGradient3228"
-       gradientUnits="userSpaceOnUse"
-       x1="0.34819999"
-       y1="90.636597"
-       x2="0.34819999"
-       y2="-2.3324001"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,31.991335,0.0065326)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad16"
-       id="linearGradient3230"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5494"
-       y1="89.118202"
-       x2="30.5494"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad17"
-       id="linearGradient3232"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549"
-       y1="90.025398"
-       x2="30.549"
-       y2="0.1052" />
-  </defs>
-  <g
-     id="g3234"
-     transform="scale(1.25,1.25)">
-    <g
-       transform="matrix(0.23228415,0,0,0.23332511,0,-5.02e-7)"
-       id="Background">
-      <path
-         inkscape:connector-curvature="0"
-         transform="translate(270.048,0.028)"
-         d="M 0,89.118 61.111,0 88.123,0 27.023,89.118 0,89.118 z"
-         id=" polygon460"
-         style="fill:url(#Grad0);fill-rule:nonzero;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         transform="translate(147.63,0.028)"
-         d="M 0,89.118 61.107,0 88.134,0 27.034,89.118 0,89.118 z"
-         id=" polygon485"
-         style="fill:url(#Grad1);fill-rule:nonzero;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         transform="translate(208.845,0.028)"
-         d="M 0,89.118 61.11,0 88.123,0 27.022,89.118 0,89.118 z"
-         id=" polygon504"
-         style="fill:url(#Grad2);fill-rule:nonzero;stroke:none" />
-    </g>
-    <g
-       transform="matrix(0.23228415,0,0,0.23332511,0,-5.02e-7)"
-       id="New Layer 1">
-      <g
-         clip-path="url(#Clip0)"
-         id="Group9">
-        <path
-           inkscape:connector-curvature="0"
-           transform="translate(147.641,0.028)"
-           d="M 88.123,89.118 27.023,0 0,0 l 61.096,89.118 27.027,0 z"
-           id=" polygon515"
-           style="fill:url(#Grad3);fill-rule:nonzero;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           transform="translate(208.845,0.028)"
-           d="M 88.133,89.118 27.022,0 0,0 l 61.11,89.118 27.023,0 z"
-           id=" polygon524"
-           style="fill:url(#Grad4);fill-rule:nonzero;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           transform="translate(270.048,0.028)"
-           d="M 88.134,89.118 27.023,0 0,0 l 61.111,89.118 27.023,0 z"
-           id=" polygon533"
-           style="fill:url(#Grad5);fill-rule:nonzero;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           transform="translate(115.307,0.028)"
-           d="m 0,0 23.115,0 0,89.118 L 0,89.118 0,0 z"
-           id=" rect542"
-           style="fill:url(#Grad6);fill-rule:evenodd;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           transform="translate(0,0.028)"
-           d="m 22.665,89.118 0,-52.188 29.276,44.438 0.597,0 29.58,-44.89 0,52.64 22.969,0 L 105.087,0 80.171,0 52.538,44.437 24.919,0 0,0 l 0,89.118 22.665,0 z"
-           id=" polygon551"
-           style="fill:url(#Grad7);fill-rule:nonzero;stroke:none" />
-      </g>
-    </g>
-    <path
-       style="fill:url(#linearGradient3228);fill-rule:nonzero;stroke:none"
-       id=" polygon569"
-       d="m 32.153005,20.8 0,-20.7934674 -0.16167,0 L 32.153005,20.8 z"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:url(#linearGradient3225);fill-rule:nonzero;stroke:none"
-       id=" polygon576"
-       d="m 24.39843,20.8 0,-20.7934674 -0.161902,0 L 24.39843,20.8 z"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:url(#linearGradient3222);fill-rule:nonzero;stroke:none"
-       id=" polygon583"
-       d="m 26.929166,20.8 -0.145178,-20.79346765 0,20.79346765 0.145178,0 z"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:url(#linearGradient3219);fill-rule:nonzero;stroke:none"
-       id=" polygon590"
-       d="M 0.14517759,20.8 0,0.00653218 0,20.8 l 0.14517759,0 z"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="matrix(0.23228415,0,0,0.23332511,0,-5.02e-7)"
-       id="g592"
-       clip-path="url(#Clip1)">
-      <path
-         style="fill:url(#linearGradient3177);fill-rule:nonzero;stroke:none"
-         id=" polygon599"
-         d="M 61.1,89.118 0,0 l 60.524,89.118 0.576,0 z"
-         transform="translate(174.664,0.028)"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:url(#linearGradient3179);fill-rule:nonzero;stroke:none"
-         id=" polygon606"
-         d="M 0.821,0 0,0 61.096,89.118 0.821,0 z"
-         transform="translate(147.641,0.028)"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="matrix(0.23228415,0,0,0.23332511,0,-5.02e-7)"
-       id="g608"
-       clip-path="url(#Clip2)">
-      <path
-         style="fill:url(#linearGradient3181);fill-rule:nonzero;stroke:none"
-         id=" polygon615"
-         d="M 61.1,89.118 0,0 l 60.525,89.118 0.575,0 z"
-         transform="translate(235.846,0)"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:url(#linearGradient3183);fill-rule:nonzero;stroke:none"
-         id=" polygon622"
-         d="M 0.822,0 0,0 61.097,89.118 0.822,0 z"
-         transform="translate(208.823,0)"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="matrix(0.23228415,0,0,0.23332511,0.0058071,0.0065326)"
-       id="g624"
-       clip-path="url(#Clip3)">
-      <path
-         style="fill:url(#linearGradient3230);fill-rule:nonzero;stroke:none"
-         id=" polygon631"
-         d="M 61.1,89.118 0,0 l 60.525,89.118 0.575,0 z"
-         transform="translate(297.057,0)"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:url(#linearGradient3232);fill-rule:nonzero;stroke:none"
-         id=" polygon638"
-         d="M 0.821,0 0,0 61.097,89.118 0.821,0 z"
-         transform="translate(270.034,0)"
-         inkscape:connector-curvature="0" />
-    </g>
-    <path
-       style="fill:url(#linearGradient3207);fill-rule:nonzero;stroke:none"
-       id=" polygon645"
-       d="m 19.07471,8.5177656 0,12.2822344 0.135422,0 L 19.07471,8.5177656 z"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:url(#linearGradient3204);fill-rule:nonzero;stroke:none"
-       id=" polygon652"
-       d="m 5.2635588,20.8 0,-12.1767711 L 5.1481136,8.4533682 5.2635588,20.8 z"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:url(#linearGradient3201);fill-rule:nonzero;stroke:none"
-       id=" polygon659"
-       d="M 12.204441,10.527162 18.622453,0.0065326 12.203745,10.374801 5.7882887,0.0065326 12.204441,10.527162 z"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:url(#linearGradient3198);fill-rule:nonzero;stroke:none"
-       id=" polygon666"
-       d="m 5.2647203,8.6232289 6.8003507,10.3685011 0.138674,0 L 19.07471,8.517766 12.141028,18.917066 5.2647203,8.6232289 z"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="104" height="26"><defs><linearGradient x1="74.992996" y1="-.1462" x2="13.4863" y2="88.766998" id="o" gradientUnits="userSpaceOnUse"><stop offset=".47799999" stop-color="#39b549"/><stop offset="1" stop-color="#1a76bc"/></linearGradient><linearGradient x1="74.997902" y1="-.15009999" x2="13.4883" y2="88.767303" id="p" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#381f1f"/><stop offset=".0017" stop-color="#3a1f20"/><stop offset=".0376" stop-color="#5b2825"/><stop offset=".0757" stop-color="#7c2f28"/><stop offset=".1173" stop-color="#9b2e28"/><stop offset=".1626" stop-color="#b62c28"/><stop offset=".2129" stop-color="#cc2626"/><stop offset=".271" stop-color="#dc2225"/><stop offset=".34380001" stop-color="#e81f25"/><stop offset=".47799999" stop-color="#ed1b26"/><stop offset="1" stop-color="#f7921e"/></linearGradient><linearGradient x1="74.991898" y1="-.1471" x2="13.4852" y2="88.765999" id="q" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#120e1e"/><stop offset=".0231" stop-color="#1b1426"/><stop offset=".1446" stop-color="#442349"/><stop offset=".2552" stop-color="#652866"/><stop offset=".3511" stop-color="#7c287b"/><stop offset=".42860001" stop-color="#8b2589"/><stop offset=".47799999" stop-color="#91268f"/><stop offset="1" stop-color="#ed1b26"/></linearGradient><clipPath id="z"><path d="M0 0h358.182v89.118H0V0z" transform="translate(0 .028)"/></clipPath><linearGradient x1="44.0611" y1=".24690001" x2="44.0611" y2="93.877998" id="r" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1f1f20"/><stop offset=".00555556" stop-color="#1f1f20"/><stop offset=".63333303" stop-color="#58595b"/><stop offset="1" stop-color="#a5a8aa"/></linearGradient><linearGradient x1="44.066101" y1=".24690001" x2="44.066101" y2="93.877998" id="s" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1f1f20"/><stop offset=".00555556" stop-color="#1f1f20"/><stop offset=".63333303" stop-color="#58595b"/><stop offset="1" stop-color="#a5a8aa"/></linearGradient><linearGradient x1="44.066299" y1=".24690001" x2="44.066299" y2="93.877998" id="t" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1f1f20"/><stop offset=".00555556" stop-color="#1f1f20"/><stop offset=".63333303" stop-color="#58595b"/><stop offset="1" stop-color="#a5a8aa"/></linearGradient><linearGradient x1="11.5568" y1=".24690001" x2="11.5568" y2="93.877998" id="u" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1f1f20"/><stop offset=".00555556" stop-color="#1f1f20"/><stop offset=".63333303" stop-color="#58595b"/><stop offset="1" stop-color="#a5a8aa"/></linearGradient><linearGradient x1="52.543499" y1=".24690001" x2="52.543499" y2="93.877998" id="v" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1f1f20"/><stop offset=".00555556" stop-color="#1f1f20"/><stop offset=".63333303" stop-color="#58595b"/><stop offset="1" stop-color="#a5a8aa"/></linearGradient><linearGradient x1=".34819999" y1="90.636597" x2=".34819999" y2="-2.3324001" id="a" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1=".34799999" y1="90.636597" x2=".34799999" y2="-2.3324001" id="b" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1=".31259999" y1="88.656097" x2=".31259999" y2="1.1722" id="c" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1=".31209999" y1="88.656097" x2=".31209999" y2="1.1722" id="d" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1="30.5499" y1="89.1185" x2="30.5499" y2="-3.2409" id="e" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1="30.547501" y1="90.025703" x2="30.547501" y2=".1055" id="f" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><clipPath id="L"><path d="M0 0h88.123v89.118H0V0z" transform="translate(208.823)"/></clipPath><linearGradient x1="30.5495" y1="89.118202" x2="30.5495" y2="-3.2412" id="g" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1="30.549101" y1="90.025398" x2="30.549101" y2=".1052" id="h" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><clipPath id="O"><path d="M0 0h88.123v89.118H0V0z" transform="translate(270.034)"/></clipPath><linearGradient x1="30.5494" y1="89.118202" x2="30.5494" y2="-3.2412" id="i" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1="30.549" y1="90.025398" x2="30.549" y2=".1052" id="j" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1=".29169801" y1="52.640499" x2=".29169801" y2="-37.8988" id="k" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1=".2481" y1="52.9165" x2=".2481" y2="-35.325699" id="l" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1="27.6264" y1="89.119904" x2="27.6264" y2=".1302" id="m" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1="29.726101" y1="53.389" x2="29.726101" y2="-36.621201" id="n" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1="74.992996" y1="-.1462" x2="13.4863" y2="88.766998" id="w" xlink:href="#o" gradientUnits="userSpaceOnUse"/><linearGradient x1="74.997902" y1="-.15009999" x2="13.4883" y2="88.767303" id="x" xlink:href="#p" gradientUnits="userSpaceOnUse"/><linearGradient x1="74.991898" y1="-.1471" x2="13.4852" y2="88.765999" id="y" xlink:href="#q" gradientUnits="userSpaceOnUse"/><linearGradient x1="44.0611" y1=".24690001" x2="44.0611" y2="93.877998" id="A" xlink:href="#r" gradientUnits="userSpaceOnUse"/><linearGradient x1="44.066101" y1=".24690001" x2="44.066101" y2="93.877998" id="B" xlink:href="#s" gradientUnits="userSpaceOnUse"/><linearGradient x1="44.066299" y1=".24690001" x2="44.066299" y2="93.877998" id="C" xlink:href="#t" gradientUnits="userSpaceOnUse"/><linearGradient x1="11.5568" y1=".24690001" x2="11.5568" y2="93.877998" id="D" xlink:href="#u" gradientUnits="userSpaceOnUse"/><linearGradient x1="52.543499" y1=".24690001" x2="52.543499" y2="93.877998" id="E" xlink:href="#v" gradientUnits="userSpaceOnUse"/><linearGradient x1=".34819999" y1="90.636597" x2=".34819999" y2="-2.3324001" id="F" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.29036 0 0 .29166 39.989169 .00816575)"/><linearGradient x1=".34799999" y1="90.636597" x2=".34799999" y2="-2.3324001" id="G" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.29036 0 0 .29166 30.29566 .00816575)"/><linearGradient x1=".31259999" y1="88.656097" x2=".31259999" y2="1.1722" id="H" xlink:href="#c" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.29036 0 0 .29166 33.479985 .00816544)"/><linearGradient x1=".31209999" y1="88.656097" x2=".31209999" y2="1.1722" id="I" xlink:href="#d" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.29036 0 0 .29166 0 .00816523)"/><linearGradient x1="30.5499" y1="89.1185" x2="30.5499" y2="-3.2409" id="J" xlink:href="#e" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.29036 0 0 .29166 50.714599 .00816575)"/><linearGradient x1="30.547501" y1="90.025703" x2="30.547501" y2=".1055" id="K" xlink:href="#f" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.29036 0 0 .29166 42.868331 .00816575)"/><linearGradient x1="30.5495" y1="89.118202" x2="30.5495" y2="-3.2412" id="M" xlink:href="#g" gradientUnits="userSpaceOnUse"/><linearGradient x1="30.549101" y1="90.025398" x2="30.549101" y2=".1052" id="N" xlink:href="#h" gradientUnits="userSpaceOnUse"/><linearGradient x1="30.5494" y1="89.118202" x2="30.5494" y2="-3.2412" id="P" xlink:href="#i" gradientUnits="userSpaceOnUse"/><linearGradient x1="30.549" y1="90.025398" x2="30.549" y2=".1052" id="Q" xlink:href="#j" gradientUnits="userSpaceOnUse"/><linearGradient x1=".29169801" y1="52.640499" x2=".29169801" y2="-37.8988" id="R" xlink:href="#k" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.29036 0 0 .29166 23.843387 10.647207)"/><linearGradient x1=".2481" y1="52.9165" x2=".2481" y2="-35.325699" id="S" xlink:href="#l" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.29036 0 0 .29166 6.435142 10.56671)"/><linearGradient x1="27.6264" y1="89.119904" x2="27.6264" y2=".1302" id="T" xlink:href="#m" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.29036 0 0 .29166 7.2353609 .00816575)"/><linearGradient x1="29.726101" y1="53.389" x2="29.726101" y2="-36.621201" id="U" xlink:href="#n" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.29036 0 0 .29166 6.5809004 10.647208)"/></defs><path d="M0 89.118L61.111 0h27.012l-61.1 89.118H0z" transform="matrix(.26802 0 0 .26922 76.8783105128 .0075381957)" fill="url(#w)"/><path d="M0 89.118L61.107 0h27.027l-61.1 89.118H0z" transform="matrix(.26802 0 0 .26922 44.0678175028 .0075381957)" fill="url(#x)"/><path d="M0 89.118L61.11 0h27.013L27.022 89.118H0z" transform="matrix(.26802 0 0 .26922 60.4746721288 .0075381957)" fill="url(#y)"/><g clip-path="url(#z)" transform="matrix(.26802 0 0 .26922 4.5 0)"><path d="M88.123 89.118L27.023 0H0l61.096 89.118h27.027z" transform="translate(147.641 .028)" fill="url(#A)"/><path d="M88.133 89.118L27.022 0H0l61.11 89.118h27.023z" transform="translate(208.845 .028)" fill="url(#B)"/><path d="M88.134 89.118L27.023 0H0l61.111 89.118h27.023z" transform="translate(270.048 .028)" fill="url(#C)"/><path d="M0 0h23.115v89.118H0V0z" transform="translate(115.307 .028)" fill="url(#D)" fill-rule="evenodd"/><path d="M22.665 89.118V36.93l29.276 44.438h.597l29.58-44.89v52.64h22.969V0H80.171L52.538 44.437 24.919 0H0v89.118h22.665z" transform="translate(0 .028)" fill="url(#E)"/></g><path d="M40.191256 26V.00816575h-.202087L40.191256 26z" fill="url(#F)" transform="matrix(.92308 0 0 .92308 4.5 5.792e-7)"/><path d="M30.498038 26V.00816575h-.202378L30.498038 26z" fill="url(#G)" transform="matrix(.92308 0 0 .92308 4.5 5.792e-7)"/><path d="M33.661457 26L33.479985.00816544V26h.181472z" fill="url(#H)" transform="matrix(.92308 0 0 .92308 4.5 5.792e-7)"/><path d="M.18147199 26L0 .00816523V26h.18147199z" fill="url(#I)" transform="matrix(.92308 0 0 .92308 4.5 5.792e-7)"/><path d="M68.455301 26L50.714599.00816575 68.288057 26h.167244z" fill="url(#J)" transform="matrix(.92308 0 0 .92308 4.5 5.792e-7)"/><path d="M43.106713.00816575h-.238382L60.607872 26 43.106713.00816575z" fill="url(#K)" transform="matrix(.92308 0 0 .92308 4.5 5.792e-7)"/><g transform="matrix(.26802 0 0 .26922 4.5 0)" clip-path="url(#L)"><path d="M61.1 89.118L0 0l60.525 89.118h.575z" transform="translate(235.846)" fill="url(#M)"/><path d="M.822 0H0l61.097 89.118L.822 0z" transform="translate(208.823)" fill="url(#N)"/></g><g transform="matrix(.26802 0 0 .26922 4.5067004952 .0075381944)" clip-path="url(#O)"><path d="M61.1 89.118L0 0l60.525 89.118h.575z" transform="translate(297.057)" fill="url(#P)"/><path d="M.821 0H0l61.097 89.118L.821 0z" transform="translate(270.034)" fill="url(#Q)"/></g><path d="M23.843387 10.647207V26h.169278l-.169278-15.352793z" fill="url(#R)" transform="matrix(.92308 0 0 .92308 4.5 5.792e-7)"/><path d="M6.5794485 26V10.779036l-.1443065-.212326L6.5794485 26z" fill="url(#S)" transform="matrix(.92308 0 0 .92308 4.5 5.792e-7)"/><path d="M15.255551 13.158953L23.278066.00816575 15.254681 12.968501 7.2353609.00816575 15.255551 13.158953z" fill="url(#T)" transform="matrix(.92308 0 0 .92308 4.5 5.792e-7)"/><path d="M6.5809004 10.779036l8.5004386 12.960627h.173342l8.588706-13.092455-8.667102 12.999124-8.5953846-12.867296z" fill="url(#U)" transform="matrix(.92308 0 0 .92308 4.5 5.792e-7)"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_logo_104x26_grey.svg b/res/skins/Tango/buttons/btn_logo_104x26_grey.svg
index 8b52d4507889..207c79362bd5 100644
--- a/res/skins/Tango/buttons/btn_logo_104x26_grey.svg
+++ b/res/skins/Tango/buttons/btn_logo_104x26_grey.svg
@@ -1,1563 +1 @@
-<?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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="104"
-   height="26"
-   version="1.1"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_logo_104x26_grey.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview3310"
-     showgrid="false"
-     inkscape:zoom="8"
-     inkscape:cx="49.375871"
-     inkscape:cy="21.605439"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true" />
-  <metadata
-     id="metadata209">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <linearGradient
-       id="Grad0"
-       y1="-0.1462"
-       x1="74.992996"
-       y2="88.766998"
-       gradientUnits="userSpaceOnUse"
-       x2="13.4863">
-      <stop
-         offset="47.8%"
-         stop-color="#39b549"
-         stop-opacity="1"
-         id="stop7" />
-      <stop
-         offset="100%"
-         stop-color="#1a76bc"
-         stop-opacity="1"
-         id="stop9" />
-    </linearGradient>
-    <linearGradient
-       id="Grad1"
-       y1="-0.15009999"
-       x1="74.997902"
-       y2="88.767303"
-       gradientUnits="userSpaceOnUse"
-       x2="13.4883">
-      <stop
-         offset="0%"
-         stop-color="#381f1f"
-         stop-opacity="1"
-         id="stop12" />
-      <stop
-         offset="7.57%"
-         stop-color="#7c2f28"
-         stop-opacity="1"
-         id="stop18" />
-      <stop
-         offset="11.73%"
-         stop-color="#9b2e28"
-         stop-opacity="1"
-         id="stop20" />
-      <stop
-         offset="16.26%"
-         stop-color="#b62c28"
-         stop-opacity="1"
-         id="stop22" />
-      <stop
-         offset="21.29%"
-         stop-color="#cc2626"
-         stop-opacity="1"
-         id="stop24" />
-      <stop
-         offset="27.1%"
-         stop-color="#dc2225"
-         stop-opacity="1"
-         id="stop26" />
-      <stop
-         offset="34.38%"
-         stop-color="#e81f25"
-         stop-opacity="1"
-         id="stop28" />
-      <stop
-         offset="47.8%"
-         stop-color="#ed1b26"
-         stop-opacity="1"
-         id="stop30" />
-      <stop
-         offset="100%"
-         stop-color="#f7921e"
-         stop-opacity="1"
-         id="stop32" />
-    </linearGradient>
-    <linearGradient
-       id="Grad2"
-       y1="-0.1471"
-       x1="74.991898"
-       y2="88.765999"
-       gradientUnits="userSpaceOnUse"
-       x2="13.4852">
-      <stop
-         offset="0%"
-         stop-color="#120e1e"
-         stop-opacity="1"
-         id="stop35" />
-      <stop
-         offset="2.31%"
-         stop-color="#1b1426"
-         stop-opacity="1"
-         id="stop37" />
-      <stop
-         offset="14.46%"
-         stop-color="#442349"
-         stop-opacity="1"
-         id="stop39" />
-      <stop
-         offset="25.52%"
-         stop-color="#652866"
-         stop-opacity="1"
-         id="stop41" />
-      <stop
-         offset="35.11%"
-         stop-color="#7c287b"
-         stop-opacity="1"
-         id="stop43" />
-      <stop
-         offset="42.86%"
-         stop-color="#8b2589"
-         stop-opacity="1"
-         id="stop45" />
-      <stop
-         offset="47.8%"
-         stop-color="#91268f"
-         stop-opacity="1"
-         id="stop47" />
-      <stop
-         offset="100%"
-         stop-color="#ed1b26"
-         stop-opacity="1"
-         id="stop49" />
-    </linearGradient>
-    <clipPath
-       id="Clip0">
-      <path
-         d="m 0,0 358.182,0 0,89.118 L 0,89.118 0,0 z"
-         transform="translate(0,0.028)"
-         id="path52"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       id="Grad3"
-       y1="0.24690001"
-       x1="44.0611"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.0611">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop55" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop57" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop59" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop61" />
-    </linearGradient>
-    <linearGradient
-       id="Grad4"
-       y1="0.24690001"
-       x1="44.066101"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.066101">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop64" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop66" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop68" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop70" />
-    </linearGradient>
-    <linearGradient
-       id="Grad5"
-       y1="0.24690001"
-       x1="44.066299"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.066299">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop73" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop75" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop77" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop79" />
-    </linearGradient>
-    <linearGradient
-       id="Grad6"
-       y1="0.24690001"
-       x1="11.5568"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="11.5568">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop82" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop84" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop86" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop88" />
-    </linearGradient>
-    <linearGradient
-       id="Grad7"
-       y1="0.24690001"
-       x1="52.543499"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="52.543499">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop91" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop93" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop95" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop97" />
-    </linearGradient>
-    <linearGradient
-       id="Grad8"
-       y1="90.636597"
-       x1="0.34819999"
-       y2="-2.3324001"
-       gradientUnits="userSpaceOnUse"
-       x2="0.34819999">
-      <stop
-         offset="0"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop100"
-         style="stop-color:#a2a2a2;stop-opacity:1;" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop102" />
-    </linearGradient>
-    <linearGradient
-       id="Grad9"
-       y1="90.636597"
-       x1="0.34799999"
-       y2="-2.3324001"
-       gradientUnits="userSpaceOnUse"
-       x2="0.34799999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop105" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop107" />
-    </linearGradient>
-    <linearGradient
-       id="Grad10"
-       y1="88.656097"
-       x1="0.31259999"
-       y2="1.1722"
-       gradientUnits="userSpaceOnUse"
-       x2="0.31259999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop110" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop112" />
-    </linearGradient>
-    <linearGradient
-       id="Grad11"
-       y1="88.656097"
-       x1="0.31209999"
-       y2="1.1722"
-       gradientUnits="userSpaceOnUse"
-       x2="0.31209999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop115" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop117" />
-    </linearGradient>
-    <clipPath
-       id="Clip1">
-      <path
-         d="m 0,0 88.123,0 0,89.118 L 0,89.118 0,0 z"
-         transform="translate(147.641,0.028)"
-         id="path120"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       id="Grad12"
-       y1="89.1185"
-       x1="30.5499"
-       y2="-3.2409"
-       gradientUnits="userSpaceOnUse"
-       x2="30.5499">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop123" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop125" />
-    </linearGradient>
-    <linearGradient
-       id="Grad13"
-       y1="90.025703"
-       x1="30.547501"
-       y2="0.1055"
-       gradientUnits="userSpaceOnUse"
-       x2="30.547501">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop128" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop130" />
-    </linearGradient>
-    <clipPath
-       id="Clip2">
-      <path
-         d="m 0,0 88.123,0 0,89.118 L 0,89.118 0,0 z"
-         transform="translate(208.823,0)"
-         id="path133"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       id="Grad14"
-       y1="89.118202"
-       x1="30.5495"
-       y2="-3.2412"
-       gradientUnits="userSpaceOnUse"
-       x2="30.5495">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop136" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop138" />
-    </linearGradient>
-    <linearGradient
-       id="Grad15"
-       y1="90.025398"
-       x1="30.549101"
-       y2="0.1052"
-       gradientUnits="userSpaceOnUse"
-       x2="30.549101">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop141" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop143" />
-    </linearGradient>
-    <clipPath
-       id="Clip3">
-      <path
-         d="m 0,0 88.123,0 0,89.118 L 0,89.118 0,0 z"
-         transform="translate(270.034,0)"
-         id="path146"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       id="Grad16"
-       y1="89.118202"
-       x1="30.5494"
-       y2="-3.2412"
-       gradientUnits="userSpaceOnUse"
-       x2="30.5494">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop149" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop151" />
-    </linearGradient>
-    <linearGradient
-       id="Grad17"
-       y1="90.025398"
-       x1="30.549"
-       y2="0.1052"
-       gradientUnits="userSpaceOnUse"
-       x2="30.549">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop154" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop156" />
-    </linearGradient>
-    <linearGradient
-       id="Grad18"
-       y1="52.640499"
-       x1="0.29169801"
-       y2="-37.8988"
-       gradientUnits="userSpaceOnUse"
-       x2="0.29169801">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop159" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop161" />
-    </linearGradient>
-    <linearGradient
-       id="Grad19"
-       y1="52.9165"
-       x1="0.2481"
-       y2="-35.325699"
-       gradientUnits="userSpaceOnUse"
-       x2="0.2481">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop164" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop166" />
-    </linearGradient>
-    <linearGradient
-       id="Grad20"
-       y1="89.119904"
-       x1="27.6264"
-       y2="0.1302"
-       gradientUnits="userSpaceOnUse"
-       x2="27.6264">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop169" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop171" />
-    </linearGradient>
-    <linearGradient
-       id="Grad21"
-       y1="53.389"
-       x1="29.726101"
-       y2="-36.621201"
-       gradientUnits="userSpaceOnUse"
-       x2="29.726101">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop174" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop176" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8"
-       id="linearGradient3169"
-       gradientUnits="userSpaceOnUse"
-       x1="0.34819999"
-       y1="90.636597"
-       x2="0.34819999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad9"
-       id="linearGradient3171"
-       gradientUnits="userSpaceOnUse"
-       x1="0.34799999"
-       y1="90.636597"
-       x2="0.34799999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad10"
-       id="linearGradient3173"
-       gradientUnits="userSpaceOnUse"
-       x1="0.31259999"
-       y1="88.656097"
-       x2="0.31259999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad11"
-       id="linearGradient3175"
-       gradientUnits="userSpaceOnUse"
-       x1="0.31209999"
-       y1="88.656097"
-       x2="0.31209999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad12"
-       id="linearGradient3177"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5499"
-       y1="89.1185"
-       x2="30.5499"
-       y2="-3.2409" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad13"
-       id="linearGradient3179"
-       gradientUnits="userSpaceOnUse"
-       x1="30.547501"
-       y1="90.025703"
-       x2="30.547501"
-       y2="0.1055" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad14"
-       id="linearGradient3181"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5495"
-       y1="89.118202"
-       x2="30.5495"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad15"
-       id="linearGradient3183"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549101"
-       y1="90.025398"
-       x2="30.549101"
-       y2="0.1052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad16"
-       id="linearGradient3185"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5494"
-       y1="89.118202"
-       x2="30.5494"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad17"
-       id="linearGradient3187"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549"
-       y1="90.025398"
-       x2="30.549"
-       y2="0.1052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad18"
-       id="linearGradient3189"
-       gradientUnits="userSpaceOnUse"
-       x1="0.29169801"
-       y1="52.640499"
-       x2="0.29169801"
-       y2="-37.8988" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad19"
-       id="linearGradient3191"
-       gradientUnits="userSpaceOnUse"
-       x1="0.2481"
-       y1="52.9165"
-       x2="0.2481"
-       y2="-35.325699" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad20"
-       id="linearGradient3193"
-       gradientUnits="userSpaceOnUse"
-       x1="27.6264"
-       y1="89.119904"
-       x2="27.6264"
-       y2="0.1302" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad21"
-       id="linearGradient3195"
-       gradientUnits="userSpaceOnUse"
-       x1="29.726101"
-       y1="53.389"
-       x2="29.726101"
-       y2="-36.621201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad21"
-       id="linearGradient4148"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,8.2997503,10.721979)"
-       x1="29.726101"
-       y1="53.389"
-       x2="29.726101"
-       y2="-36.621201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad20"
-       id="linearGradient4151"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,8.933412,0.42104726)"
-       x1="27.6264"
-       y1="89.119904"
-       x2="27.6264"
-       y2="0.1302" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad19"
-       id="linearGradient4154"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,8.1586242,10.64404)"
-       x1="0.2481"
-       y1="52.9165"
-       x2="0.2481"
-       y2="-35.325699" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad18"
-       id="linearGradient4157"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,25.013634,10.721979)"
-       x1="0.29169801"
-       y1="52.640499"
-       x2="0.29169801"
-       y2="-37.8988" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad11"
-       id="linearGradient4169"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,1.9279915,0.42104675)"
-       x1="0.31209999"
-       y1="88.656097"
-       x2="0.31209999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad10"
-       id="linearGradient4172"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,34.34398,0.42104696)"
-       x1="0.31259999"
-       y1="88.656097"
-       x2="0.31259999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad9"
-       id="linearGradient4175"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,31.260853,0.42104726)"
-       x1="0.34799999"
-       y1="90.636597"
-       x2="0.34799999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8"
-       id="linearGradient4178"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,40.646301,0.42104726)"
-       x1="0.34819999"
-       y1="90.636597"
-       x2="0.34819999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8-6"
-       id="linearGradient4724-3"
-       gradientUnits="userSpaceOnUse"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,43.430871,0.42104726)" />
-    <linearGradient
-       id="Grad8-6"
-       y1="90.636597"
-       x1="0.34819999"
-       y2="-2.3324001"
-       gradientUnits="userSpaceOnUse"
-       x2="0.34819999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop100-7" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop102-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8-62"
-       id="linearGradient4724-5"
-       gradientUnits="userSpaceOnUse"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,43.430871,0.42104726)" />
-    <linearGradient
-       id="Grad8-62"
-       y1="90.636597"
-       x1="0.34819999"
-       y2="-2.3324001"
-       gradientUnits="userSpaceOnUse"
-       x2="0.34819999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop100-9" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop102-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8-9"
-       id="linearGradient4724-51"
-       gradientUnits="userSpaceOnUse"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,43.430871,0.42104726)" />
-    <linearGradient
-       id="Grad8-9"
-       y1="90.636597"
-       x1="0.34819999"
-       y2="-2.3324001"
-       gradientUnits="userSpaceOnUse"
-       x2="0.34819999">
-      <stop
-         offset="0"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop100-71"
-         style="stop-color:#a2a2a2;stop-opacity:1;" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop102-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8-0"
-       id="linearGradient4724-2"
-       gradientUnits="userSpaceOnUse"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,43.430871,0.42104726)" />
-    <linearGradient
-       id="Grad8-0"
-       y1="90.636597"
-       x1="0.34819999"
-       y2="-2.3324001"
-       gradientUnits="userSpaceOnUse"
-       x2="0.34819999">
-      <stop
-         offset="0"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop100-6"
-         style="stop-color:#a2a2a2;stop-opacity:1;" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop102-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3"
-       id="linearGradient5079"
-       gradientUnits="userSpaceOnUse"
-       x1="44.0611"
-       y1="0.24690001"
-       x2="44.0611"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad4"
-       id="linearGradient5081"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066101"
-       y1="0.24690001"
-       x2="44.066101"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad5"
-       id="linearGradient5083"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066299"
-       y1="0.24690001"
-       x2="44.066299"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad6"
-       id="linearGradient5085"
-       gradientUnits="userSpaceOnUse"
-       x1="11.5568"
-       y1="0.24690001"
-       x2="11.5568"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad7"
-       id="linearGradient5087"
-       gradientUnits="userSpaceOnUse"
-       x1="52.543499"
-       y1="0.24690001"
-       x2="52.543499"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad7"
-       id="linearGradient5090"
-       gradientUnits="userSpaceOnUse"
-       x1="52.543499"
-       y1="0.24690001"
-       x2="52.543499"
-       y2="93.877998"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,1.9279915,0.42104726)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad6"
-       id="linearGradient5093"
-       gradientUnits="userSpaceOnUse"
-       x1="11.5568"
-       y1="0.24690001"
-       x2="11.5568"
-       y2="93.877998"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,34.343981,0.42104726)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad5"
-       id="linearGradient5096"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066299"
-       y1="0.24690001"
-       x2="44.066299"
-       y2="93.877998"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,77.845959,0.42104726)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad4"
-       id="linearGradient5099"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066101"
-       y1="0.24690001"
-       x2="44.066101"
-       y2="93.877998"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,60.640102,0.42104726)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3"
-       id="linearGradient5102"
-       gradientUnits="userSpaceOnUse"
-       x1="44.0611"
-       y1="0.24690001"
-       x2="44.0611"
-       y2="93.877998"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,43.433963,0.42104726)" />
-    <linearGradient
-       id="Grad3-2-8"
-       y1="0.24690001"
-       x1="44.0611"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.0611">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop55-4-9" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop57-4-6" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop59-5-0" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop61-9-6" />
-    </linearGradient>
-    <linearGradient
-       id="Grad3-2"
-       y1="0.24690001"
-       x1="44.0611"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.0611">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop55-4" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop57-4" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop59-5" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop61-9" />
-    </linearGradient>
-    <linearGradient
-       y2="0.14363858"
-       x2="74.105591"
-       y1="89.163239"
-       x1="12.995073"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,71.448276,58.467323)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4845-0"
-       xlink:href="#Grad3-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="Grad3-9"
-       y1="0.24690001"
-       x1="44.0611"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.0611">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop55-45" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop57-46" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop59-6" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop61-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-9"
-       id="linearGradient5304"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,99.63733,64.832905)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-2"
-       id="linearGradient5306"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,116.84543,64.832905)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-2-8"
-       id="linearGradient5308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,82.43147,64.832905)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-9"
-       id="linearGradient3170"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,99.63733,64.832905)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-2"
-       id="linearGradient3172"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,116.84543,64.832905)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-2-8"
-       id="linearGradient3174"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,82.43147,64.832905)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3"
-       id="linearGradient3176"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,43.433963,0.42104726)"
-       x1="44.0611"
-       y1="0.24690001"
-       x2="44.0611"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad4"
-       id="linearGradient3178"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,60.640102,0.42104726)"
-       x1="44.066101"
-       y1="0.24690001"
-       x2="44.066101"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad5"
-       id="linearGradient3180"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,77.845959,0.42104726)"
-       x1="44.066299"
-       y1="0.24690001"
-       x2="44.066299"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad6"
-       id="linearGradient3182"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,34.343981,0.42104726)"
-       x1="11.5568"
-       y1="0.24690001"
-       x2="11.5568"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad7"
-       id="linearGradient3184"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,1.9279915,0.42104726)"
-       x1="52.543499"
-       y1="0.24690001"
-       x2="52.543499"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8"
-       id="linearGradient3186"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,40.646301,0.42104726)"
-       x1="0.34819999"
-       y1="90.636597"
-       x2="0.34819999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad9"
-       id="linearGradient3188"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,31.260853,0.42104726)"
-       x1="0.34799999"
-       y1="90.636597"
-       x2="0.34799999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad10"
-       id="linearGradient3190"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,34.34398,0.42104696)"
-       x1="0.31259999"
-       y1="88.656097"
-       x2="0.31259999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad11"
-       id="linearGradient3192"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,1.9279915,0.42104675)"
-       x1="0.31209999"
-       y1="88.656097"
-       x2="0.31209999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad12"
-       id="linearGradient3194"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5499"
-       y1="89.1185"
-       x2="30.5499"
-       y2="-3.2409" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad13"
-       id="linearGradient3196"
-       gradientUnits="userSpaceOnUse"
-       x1="30.547501"
-       y1="90.025703"
-       x2="30.547501"
-       y2="0.1055" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad14"
-       id="linearGradient3198"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5495"
-       y1="89.118202"
-       x2="30.5495"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad15"
-       id="linearGradient3200"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549101"
-       y1="90.025398"
-       x2="30.549101"
-       y2="0.1052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad18"
-       id="linearGradient3202"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,25.013634,10.721979)"
-       x1="0.29169801"
-       y1="52.640499"
-       x2="0.29169801"
-       y2="-37.8988" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad19"
-       id="linearGradient3204"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,8.1586242,10.64404)"
-       x1="0.2481"
-       y1="52.9165"
-       x2="0.2481"
-       y2="-35.325699" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad20"
-       id="linearGradient3206"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,8.933412,0.42104726)"
-       x1="27.6264"
-       y1="89.119904"
-       x2="27.6264"
-       y2="0.1302" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad21"
-       id="linearGradient3208"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,8.2997503,10.721979)"
-       x1="29.726101"
-       y1="53.389"
-       x2="29.726101"
-       y2="-36.621201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad21"
-       id="linearGradient3211"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,8.2997503,10.721979)"
-       x1="29.726101"
-       y1="53.389"
-       x2="29.726101"
-       y2="-36.621201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad20"
-       id="linearGradient3214"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,8.933412,0.42104726)"
-       x1="27.6264"
-       y1="89.119904"
-       x2="27.6264"
-       y2="0.1302" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad19"
-       id="linearGradient3217"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,8.1586242,10.64404)"
-       x1="0.2481"
-       y1="52.9165"
-       x2="0.2481"
-       y2="-35.325699" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad18"
-       id="linearGradient3220"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,25.013634,10.721979)"
-       x1="0.29169801"
-       y1="52.640499"
-       x2="0.29169801"
-       y2="-37.8988" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad11"
-       id="linearGradient3229"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,1.9279915,0.42104675)"
-       x1="0.31209999"
-       y1="88.656097"
-       x2="0.31209999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad10"
-       id="linearGradient3232"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,34.34398,0.42104696)"
-       x1="0.31259999"
-       y1="88.656097"
-       x2="0.31259999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad9"
-       id="linearGradient3235"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,31.260853,0.42104726)"
-       x1="0.34799999"
-       y1="90.636597"
-       x2="0.34799999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8"
-       id="linearGradient3238"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29034903,0,0,0.29149679,39.98832,0.01527459)"
-       x1="0.34819999"
-       y1="90.636597"
-       x2="0.34819999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad7"
-       id="linearGradient3241"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29034903,0,0,0.29149679,0,0.01527459)"
-       x1="52.543499"
-       y1="0.24690001"
-       x2="52.543499"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad6"
-       id="linearGradient3244"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,34.343981,0.42104726)"
-       x1="11.5568"
-       y1="0.24690001"
-       x2="11.5568"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad5"
-       id="linearGradient3247"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,77.845959,0.42104726)"
-       x1="44.066299"
-       y1="0.24690001"
-       x2="44.066299"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad4"
-       id="linearGradient3250"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,60.640102,0.42104726)"
-       x1="44.066101"
-       y1="0.24690001"
-       x2="44.066101"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3"
-       id="linearGradient3253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,43.433963,0.42104726)"
-       x1="44.0611"
-       y1="0.24690001"
-       x2="44.0611"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-9"
-       id="linearGradient3284"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,99.63733,64.832905)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-2"
-       id="linearGradient3286"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,116.84543,64.832905)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-2-8"
-       id="linearGradient3288"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,82.43147,64.832905)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-2-8"
-       id="linearGradient3291"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,68.209743,25.586858)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-2"
-       id="linearGradient3294"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,102.6237,25.586858)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-9"
-       id="linearGradient3297"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,85.415603,25.586858)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-2-8"
-       id="linearGradient3300"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,68.209743,25.586858)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-9"
-       id="linearGradient3304"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,85.415603,25.586858)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-9"
-       id="linearGradient3309"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,85.415603,25.586858)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-  </defs>
-  <path
-     id=" polygon551"
-     style="fill:url(#linearGradient3241);fill-rule:nonzero;stroke:none"
-     d="m 6.5807607,25.992886 0,-15.212635 8.5002583,12.953535 0.173339,0 8.588522,-13.085292 0,15.344392 6.669028,0 0,-25.97761141 -7.234337,0 L 15.254358,12.968517 7.2352074,0.01527459 0,0.01527459 0,25.992886 l 6.5807607,0 z M 33.479276,0.01527459 l 6.711417,0 0,25.97761141 -6.711417,0 0,-25.97761141 z M 42.871074,0 51.74671,13 42.871074,26 50.713908,26 55.651989,18.741935 60.622346,26 l 7.842833,0 0.03227,0 L 73.43553,18.741935 78.373611,26 l 0.03227,0 7.81056,0 0.03227,0 4.970356,-7.258065 L 96.157163,26 104,26 95.124362,13 104,0 96.157163,0 91.219082,7.2580645 86.248726,0 86.216456,0 78.405896,0 78.373626,0 73.435545,7.2258065 68.497464,0 68.465194,0 60.622361,0 55.652004,7.2580645 50.713923,0 42.871089,0 z M 82.311171,5.7096774 87.281527,13 82.311171,20.290323 77.340815,13 82.311171,5.7096774 z M 64.5599,5.7419355 69.49798,13 64.5599,20.258065 59.589544,13 64.5599,5.7419355 z"
-     inkscape:connector-curvature="0" />
-  <path
-     inkscape:connector-curvature="0"
-     d="m 40.190403,25.992887 0,-25.97761241 -0.202083,0 0.202083,25.97761241 z"
-     id=" polygon569"
-     style="fill:url(#linearGradient3238);fill-rule:nonzero;stroke:none" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="104" height="26"><defs><linearGradient x1="44.0611" y1=".24690001" x2="44.0611" y2="93.877998" id="s" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1f1f20"/><stop offset=".00555556" stop-color="#1f1f20"/><stop offset=".63333303" stop-color="#58595b"/><stop offset="1" stop-color="#a5a8aa"/></linearGradient><linearGradient x1="44.066101" y1=".24690001" x2="44.066101" y2="93.877998" id="t" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1f1f20"/><stop offset=".00555556" stop-color="#1f1f20"/><stop offset=".63333303" stop-color="#58595b"/><stop offset="1" stop-color="#a5a8aa"/></linearGradient><linearGradient x1="44.066299" y1=".24690001" x2="44.066299" y2="93.877998" id="u" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1f1f20"/><stop offset=".00555556" stop-color="#1f1f20"/><stop offset=".63333303" stop-color="#58595b"/><stop offset="1" stop-color="#a5a8aa"/></linearGradient><linearGradient x1="11.5568" y1=".24690001" x2="11.5568" y2="93.877998" id="v" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1f1f20"/><stop offset=".00555556" stop-color="#1f1f20"/><stop offset=".63333303" stop-color="#58595b"/><stop offset="1" stop-color="#a5a8aa"/></linearGradient><linearGradient x1="52.543499" y1=".24690001" x2="52.543499" y2="93.877998" id="w" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1f1f20"/><stop offset=".00555556" stop-color="#1f1f20"/><stop offset=".63333303" stop-color="#58595b"/><stop offset="1" stop-color="#a5a8aa"/></linearGradient><linearGradient x1=".34819999" y1="90.636597" x2=".34819999" y2="-2.3324001" id="a" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a2a2a2"/><stop offset="1"/></linearGradient><linearGradient x1=".34799999" y1="90.636597" x2=".34799999" y2="-2.3324001" id="b" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1=".31259999" y1="88.656097" x2=".31259999" y2="1.1722" id="c" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1=".31209999" y1="88.656097" x2=".31209999" y2="1.1722" id="d" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1="30.5499" y1="89.1185" x2="30.5499" y2="-3.2409" id="e" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1="30.547501" y1="90.025703" x2="30.547501" y2=".1055" id="f" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1="30.5495" y1="89.118202" x2="30.5495" y2="-3.2412" id="g" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1="30.549101" y1="90.025398" x2="30.549101" y2=".1052" id="h" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1="30.5494" y1="89.118202" x2="30.5494" y2="-3.2412" id="i" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1="30.549" y1="90.025398" x2="30.549" y2=".1052" id="j" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1=".29169801" y1="52.640499" x2=".29169801" y2="-37.8988" id="k" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1=".2481" y1="52.9165" x2=".2481" y2="-35.325699" id="l" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1="27.6264" y1="89.119904" x2="27.6264" y2=".1302" id="m" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1="29.726101" y1="53.389" x2="29.726101" y2="-36.621201" id="n" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1=".34819999" y1="90.636597" x2=".34819999" y2="-2.3324001" id="o" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1=".34819999" y1="90.636597" x2=".34819999" y2="-2.3324001" id="p" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1"/></linearGradient><linearGradient x1=".34819999" y1="90.636597" x2=".34819999" y2="-2.3324001" id="q" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a2a2a2"/><stop offset="1"/></linearGradient><linearGradient x1=".34819999" y1="90.636597" x2=".34819999" y2="-2.3324001" id="r" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a2a2a2"/><stop offset="1"/></linearGradient><linearGradient x1="44.0611" y1=".24690001" x2="44.0611" y2="93.877998" id="z" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1f1f20"/><stop offset=".00555556" stop-color="#1f1f20"/><stop offset=".63333303" stop-color="#58595b"/><stop offset="1" stop-color="#a5a8aa"/></linearGradient><linearGradient x1="44.0611" y1=".24690001" x2="44.0611" y2="93.877998" id="y" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1f1f20"/><stop offset=".00555556" stop-color="#1f1f20"/><stop offset=".63333303" stop-color="#58595b"/><stop offset="1" stop-color="#a5a8aa"/></linearGradient><linearGradient x1="44.0611" y1=".24690001" x2="44.0611" y2="93.877998" id="x" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1f1f20"/><stop offset=".00555556" stop-color="#1f1f20"/><stop offset=".63333303" stop-color="#58595b"/><stop offset="1" stop-color="#a5a8aa"/></linearGradient><linearGradient x1="52.543499" y1=".24690001" x2="52.543499" y2="93.877998" id="A" xlink:href="#w" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.26801 0 0 .26907 4.5 .0141)"/></defs><path d="M10.574548 23.993434V9.951001l7.846393 11.957109h.160005l7.927866-12.078731v14.164055h6.156026V.0141h-6.677849l-7.406043 11.956839L11.178653.0141H4.5v23.979334h6.074548zM35.403948.0141h6.195153v23.979334h-6.195153V.0141zM44.0733 0l8.192894 12L44.0733 24h7.239538l4.558229-6.699753L60.459088 24h7.269329l4.558228-6.699753L76.844871 24H84.114199l4.58802-6.699753L93.260459 24H100.5l-8.192896-12L100.5 0h-7.239541L88.70223 6.699752 84.114208 0h-7.269324l-4.558227 6.669975L67.728428 0h-7.269325L55.87108 6.699752 51.312852 0h-7.239539zm36.406243 5.270471L85.067563 12l-4.58802 6.729529L75.891521 12l4.588022-6.729529zm-16.385789.029777L68.651982 12l-4.558228 6.699753L59.505732 12l4.588022-6.699752z" fill="url(#A)"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_logo_52x13.svg b/res/skins/Tango/buttons/btn_logo_52x13.svg
index 5e0d97ab38b6..46f1b501c8a0 100644
--- a/res/skins/Tango/buttons/btn_logo_52x13.svg
+++ b/res/skins/Tango/buttons/btn_logo_52x13.svg
@@ -1,1463 +1 @@
-<?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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="52"
-   version="1.1"
-   height="13"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="mixxx_logo_52x13_grey.svg">
-  <metadata
-     id="metadata209">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview207"
-     showgrid="false"
-     height="744.09px"
-     inkscape:zoom="11.313709"
-     inkscape:cx="37.172069"
-     inkscape:cy="23.029209"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true" />
-  <defs
-     id="defs4">
-    <linearGradient
-       id="Grad0"
-       y1="-0.1462"
-       x1="74.992996"
-       y2="88.766998"
-       gradientUnits="userSpaceOnUse"
-       x2="13.4863">
-      <stop
-         offset="47.8%"
-         stop-color="#39b549"
-         stop-opacity="1"
-         id="stop7" />
-      <stop
-         offset="100%"
-         stop-color="#1a76bc"
-         stop-opacity="1"
-         id="stop9" />
-    </linearGradient>
-    <linearGradient
-       id="Grad1"
-       y1="-0.15009999"
-       x1="74.997902"
-       y2="88.767303"
-       gradientUnits="userSpaceOnUse"
-       x2="13.4883">
-      <stop
-         offset="0%"
-         stop-color="#381f1f"
-         stop-opacity="1"
-         id="stop12" />
-      <stop
-         offset="0.17%"
-         stop-color="#3a1f20"
-         stop-opacity="1"
-         id="stop14" />
-      <stop
-         offset="3.76%"
-         stop-color="#5b2825"
-         stop-opacity="1"
-         id="stop16" />
-      <stop
-         offset="7.57%"
-         stop-color="#7c2f28"
-         stop-opacity="1"
-         id="stop18" />
-      <stop
-         offset="11.73%"
-         stop-color="#9b2e28"
-         stop-opacity="1"
-         id="stop20" />
-      <stop
-         offset="16.26%"
-         stop-color="#b62c28"
-         stop-opacity="1"
-         id="stop22" />
-      <stop
-         offset="21.29%"
-         stop-color="#cc2626"
-         stop-opacity="1"
-         id="stop24" />
-      <stop
-         offset="27.1%"
-         stop-color="#dc2225"
-         stop-opacity="1"
-         id="stop26" />
-      <stop
-         offset="34.38%"
-         stop-color="#e81f25"
-         stop-opacity="1"
-         id="stop28" />
-      <stop
-         offset="47.8%"
-         stop-color="#ed1b26"
-         stop-opacity="1"
-         id="stop30" />
-      <stop
-         offset="100%"
-         stop-color="#f7921e"
-         stop-opacity="1"
-         id="stop32" />
-    </linearGradient>
-    <linearGradient
-       id="Grad2"
-       y1="-0.1471"
-       x1="74.991898"
-       y2="88.765999"
-       gradientUnits="userSpaceOnUse"
-       x2="13.4852">
-      <stop
-         offset="0%"
-         stop-color="#120e1e"
-         stop-opacity="1"
-         id="stop35" />
-      <stop
-         offset="2.31%"
-         stop-color="#1b1426"
-         stop-opacity="1"
-         id="stop37" />
-      <stop
-         offset="14.46%"
-         stop-color="#442349"
-         stop-opacity="1"
-         id="stop39" />
-      <stop
-         offset="25.52%"
-         stop-color="#652866"
-         stop-opacity="1"
-         id="stop41" />
-      <stop
-         offset="35.11%"
-         stop-color="#7c287b"
-         stop-opacity="1"
-         id="stop43" />
-      <stop
-         offset="42.86%"
-         stop-color="#8b2589"
-         stop-opacity="1"
-         id="stop45" />
-      <stop
-         offset="47.8%"
-         stop-color="#91268f"
-         stop-opacity="1"
-         id="stop47" />
-      <stop
-         offset="100%"
-         stop-color="#ed1b26"
-         stop-opacity="1"
-         id="stop49" />
-    </linearGradient>
-    <clipPath
-       id="Clip0">
-      <path
-         d="m 0,0 358.182,0 0,89.118 L 0,89.118 0,0 z"
-         transform="translate(0,0.028)"
-         id="path52"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       id="Grad3"
-       y1="0.24690001"
-       x1="44.0611"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.0611">
-      <stop
-         offset="0"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop59" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop61" />
-    </linearGradient>
-    <linearGradient
-       id="Grad4"
-       y1="0.24690001"
-       x1="44.066101"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.066101">
-      <stop
-         offset="0"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop68" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop70" />
-    </linearGradient>
-    <linearGradient
-       id="Grad5"
-       y1="0.24690001"
-       x1="44.066299"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.066299">
-      <stop
-         offset="0"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop77" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop79" />
-    </linearGradient>
-    <linearGradient
-       id="Grad6"
-       y1="0.24690001"
-       x1="11.5568"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="11.5568">
-      <stop
-         offset="0"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop86" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop88" />
-    </linearGradient>
-    <linearGradient
-       id="Grad7"
-       y1="0.24690001"
-       x1="52.543499"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="52.543499">
-      <stop
-         offset="0"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop95" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop97" />
-    </linearGradient>
-    <linearGradient
-       id="Grad8"
-       y1="90.636597"
-       x1="0.34819999"
-       y2="-2.3324001"
-       gradientUnits="userSpaceOnUse"
-       x2="0.34819999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop100" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop102" />
-    </linearGradient>
-    <linearGradient
-       id="Grad9"
-       y1="90.636597"
-       x1="0.34799999"
-       y2="-2.3324001"
-       gradientUnits="userSpaceOnUse"
-       x2="0.34799999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop105" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop107" />
-    </linearGradient>
-    <linearGradient
-       id="Grad10"
-       y1="88.656097"
-       x1="0.31259999"
-       y2="1.1722"
-       gradientUnits="userSpaceOnUse"
-       x2="0.31259999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop110" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop112" />
-    </linearGradient>
-    <linearGradient
-       id="Grad11"
-       y1="88.656097"
-       x1="0.31209999"
-       y2="1.1722"
-       gradientUnits="userSpaceOnUse"
-       x2="0.31209999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop115" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop117" />
-    </linearGradient>
-    <clipPath
-       id="Clip1">
-      <path
-         d="m 0,0 88.123,0 0,89.118 L 0,89.118 0,0 z"
-         transform="translate(147.641,0.028)"
-         id="path120"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       id="Grad12"
-       y1="89.1185"
-       x1="30.5499"
-       y2="-3.2409"
-       gradientUnits="userSpaceOnUse"
-       x2="30.5499">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop123" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop125" />
-    </linearGradient>
-    <linearGradient
-       id="Grad13"
-       y1="90.025703"
-       x1="30.547501"
-       y2="0.1055"
-       gradientUnits="userSpaceOnUse"
-       x2="30.547501">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop128" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop130" />
-    </linearGradient>
-    <clipPath
-       id="Clip2">
-      <path
-         d="m 0,0 88.123,0 0,89.118 L 0,89.118 0,0 z"
-         transform="translate(208.823,0)"
-         id="path133"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       id="Grad14"
-       y1="89.118202"
-       x1="30.5495"
-       y2="-3.2412"
-       gradientUnits="userSpaceOnUse"
-       x2="30.5495">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop136" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop138" />
-    </linearGradient>
-    <linearGradient
-       id="Grad15"
-       y1="90.025398"
-       x1="30.549101"
-       y2="0.1052"
-       gradientUnits="userSpaceOnUse"
-       x2="30.549101">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop141" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop143" />
-    </linearGradient>
-    <clipPath
-       id="Clip3">
-      <path
-         d="m 0,0 88.123,0 0,89.118 L 0,89.118 0,0 z"
-         transform="translate(270.034,0)"
-         id="path146"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       id="Grad16"
-       y1="89.118202"
-       x1="30.5494"
-       y2="-3.2412"
-       gradientUnits="userSpaceOnUse"
-       x2="30.5494">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop149" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop151" />
-    </linearGradient>
-    <linearGradient
-       id="Grad17"
-       y1="90.025398"
-       x1="30.549"
-       y2="0.1052"
-       gradientUnits="userSpaceOnUse"
-       x2="30.549">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop154" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop156" />
-    </linearGradient>
-    <linearGradient
-       id="Grad18"
-       y1="52.640499"
-       x1="0.29169801"
-       y2="-37.8988"
-       gradientUnits="userSpaceOnUse"
-       x2="0.29169801">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop159" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop161" />
-    </linearGradient>
-    <linearGradient
-       id="Grad19"
-       y1="52.9165"
-       x1="0.2481"
-       y2="-35.325699"
-       gradientUnits="userSpaceOnUse"
-       x2="0.2481">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop164" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop166" />
-    </linearGradient>
-    <linearGradient
-       id="Grad20"
-       y1="89.119904"
-       x1="27.6264"
-       y2="0.1302"
-       gradientUnits="userSpaceOnUse"
-       x2="27.6264">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop169" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop171" />
-    </linearGradient>
-    <linearGradient
-       id="Grad21"
-       y1="53.389"
-       x1="29.726101"
-       y2="-36.621201"
-       gradientUnits="userSpaceOnUse"
-       x2="29.726101">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop174" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop176" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8"
-       id="linearGradient3169"
-       gradientUnits="userSpaceOnUse"
-       x1="0.34819999"
-       y1="90.636597"
-       x2="0.34819999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad9"
-       id="linearGradient3171"
-       gradientUnits="userSpaceOnUse"
-       x1="0.34799999"
-       y1="90.636597"
-       x2="0.34799999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad10"
-       id="linearGradient3173"
-       gradientUnits="userSpaceOnUse"
-       x1="0.31259999"
-       y1="88.656097"
-       x2="0.31259999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad11"
-       id="linearGradient3175"
-       gradientUnits="userSpaceOnUse"
-       x1="0.31209999"
-       y1="88.656097"
-       x2="0.31209999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad12"
-       id="linearGradient3177"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5499"
-       y1="89.1185"
-       x2="30.5499"
-       y2="-3.2409" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad13"
-       id="linearGradient3179"
-       gradientUnits="userSpaceOnUse"
-       x1="30.547501"
-       y1="90.025703"
-       x2="30.547501"
-       y2="0.1055" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad14"
-       id="linearGradient3181"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5495"
-       y1="89.118202"
-       x2="30.5495"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad15"
-       id="linearGradient3183"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549101"
-       y1="90.025398"
-       x2="30.549101"
-       y2="0.1052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad16"
-       id="linearGradient3185"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5494"
-       y1="89.118202"
-       x2="30.5494"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad17"
-       id="linearGradient3187"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549"
-       y1="90.025398"
-       x2="30.549"
-       y2="0.1052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad18"
-       id="linearGradient3189"
-       gradientUnits="userSpaceOnUse"
-       x1="0.29169801"
-       y1="52.640499"
-       x2="0.29169801"
-       y2="-37.8988" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad19"
-       id="linearGradient3191"
-       gradientUnits="userSpaceOnUse"
-       x1="0.2481"
-       y1="52.9165"
-       x2="0.2481"
-       y2="-35.325699" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad20"
-       id="linearGradient3193"
-       gradientUnits="userSpaceOnUse"
-       x1="27.6264"
-       y1="89.119904"
-       x2="27.6264"
-       y2="0.1302" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad21"
-       id="linearGradient3195"
-       gradientUnits="userSpaceOnUse"
-       x1="29.726101"
-       y1="53.389"
-       x2="29.726101"
-       y2="-36.621201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad21"
-       id="linearGradient3198"
-       gradientUnits="userSpaceOnUse"
-       x1="29.726101"
-       y1="53.389"
-       x2="29.726101"
-       y2="-36.621201"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.2647203,8.517766)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad20"
-       id="linearGradient3201"
-       gradientUnits="userSpaceOnUse"
-       x1="27.6264"
-       y1="89.119904"
-       x2="27.6264"
-       y2="0.1302"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.7882887,0.0065326)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad19"
-       id="linearGradient3204"
-       gradientUnits="userSpaceOnUse"
-       x1="0.2481"
-       y1="52.9165"
-       x2="0.2481"
-       y2="-35.325699"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.1481136,8.4533682)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad18"
-       id="linearGradient3207"
-       gradientUnits="userSpaceOnUse"
-       x1="0.29169801"
-       y1="52.640499"
-       x2="0.29169801"
-       y2="-37.8988"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,19.07471,8.5177656)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad11"
-       id="linearGradient3219"
-       gradientUnits="userSpaceOnUse"
-       x1="0.31209999"
-       y1="88.656097"
-       x2="0.31209999"
-       y2="1.1722"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,0,0.00653218)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad10"
-       id="linearGradient3222"
-       gradientUnits="userSpaceOnUse"
-       x1="0.31259999"
-       y1="88.656097"
-       x2="0.31259999"
-       y2="1.1722"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,26.783988,0.00653235)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad9"
-       id="linearGradient3225"
-       gradientUnits="userSpaceOnUse"
-       x1="0.34799999"
-       y1="90.636597"
-       x2="0.34799999"
-       y2="-2.3324001"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,24.236528,0.0065326)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8"
-       id="linearGradient3228"
-       gradientUnits="userSpaceOnUse"
-       x1="0.34819999"
-       y1="90.636597"
-       x2="0.34819999"
-       y2="-2.3324001"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,31.991335,0.0065326)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad16"
-       id="linearGradient3230"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5494"
-       y1="89.118202"
-       x2="30.5494"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad17"
-       id="linearGradient3232"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549"
-       y1="90.025398"
-       x2="30.549"
-       y2="0.1052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad0"
-       id="linearGradient3264"
-       gradientUnits="userSpaceOnUse"
-       x1="74.992996"
-       y1="-0.1462"
-       x2="13.4863"
-       y2="88.766998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad1"
-       id="linearGradient3266"
-       gradientUnits="userSpaceOnUse"
-       x1="74.997902"
-       y1="-0.15009999"
-       x2="13.4883"
-       y2="88.767303" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad2"
-       id="linearGradient3268"
-       gradientUnits="userSpaceOnUse"
-       x1="74.991898"
-       y1="-0.1471"
-       x2="13.4852"
-       y2="88.765999" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3"
-       id="linearGradient3270"
-       gradientUnits="userSpaceOnUse"
-       x1="44.0611"
-       y1="0.24690001"
-       x2="44.0611"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad4"
-       id="linearGradient3272"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066101"
-       y1="0.24690001"
-       x2="44.066101"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad5"
-       id="linearGradient3274"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066299"
-       y1="0.24690001"
-       x2="44.066299"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad6"
-       id="linearGradient3276"
-       gradientUnits="userSpaceOnUse"
-       x1="11.5568"
-       y1="0.24690001"
-       x2="11.5568"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad7"
-       id="linearGradient3278"
-       gradientUnits="userSpaceOnUse"
-       x1="52.543499"
-       y1="0.24690001"
-       x2="52.543499"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8"
-       id="linearGradient3280"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,31.991335,0.0065326)"
-       x1="0.34819999"
-       y1="90.636597"
-       x2="0.34819999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad9"
-       id="linearGradient3282"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,24.236528,0.0065326)"
-       x1="0.34799999"
-       y1="90.636597"
-       x2="0.34799999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad10"
-       id="linearGradient3284"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,26.783988,0.00653235)"
-       x1="0.31259999"
-       y1="88.656097"
-       x2="0.31259999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad11"
-       id="linearGradient3286"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,0,0.00653218)"
-       x1="0.31209999"
-       y1="88.656097"
-       x2="0.31209999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad12"
-       id="linearGradient3288"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5499"
-       y1="89.1185"
-       x2="30.5499"
-       y2="-3.2409" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad13"
-       id="linearGradient3290"
-       gradientUnits="userSpaceOnUse"
-       x1="30.547501"
-       y1="90.025703"
-       x2="30.547501"
-       y2="0.1055" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad14"
-       id="linearGradient3292"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5495"
-       y1="89.118202"
-       x2="30.5495"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad15"
-       id="linearGradient3294"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549101"
-       y1="90.025398"
-       x2="30.549101"
-       y2="0.1052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad16"
-       id="linearGradient3296"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5494"
-       y1="89.118202"
-       x2="30.5494"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad17"
-       id="linearGradient3298"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549"
-       y1="90.025398"
-       x2="30.549"
-       y2="0.1052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad18"
-       id="linearGradient3300"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,19.07471,8.5177656)"
-       x1="0.29169801"
-       y1="52.640499"
-       x2="0.29169801"
-       y2="-37.8988" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad19"
-       id="linearGradient3302"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.1481136,8.4533682)"
-       x1="0.2481"
-       y1="52.9165"
-       x2="0.2481"
-       y2="-35.325699" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad20"
-       id="linearGradient3304"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.7882887,0.0065326)"
-       x1="27.6264"
-       y1="89.119904"
-       x2="27.6264"
-       y2="0.1302" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad21"
-       id="linearGradient3306"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.2647203,8.517766)"
-       x1="29.726101"
-       y1="53.389"
-       x2="29.726101"
-       y2="-36.621201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad0"
-       id="linearGradient4002"
-       gradientUnits="userSpaceOnUse"
-       x1="74.992996"
-       y1="-0.1462"
-       x2="13.4863"
-       y2="88.766998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad1"
-       id="linearGradient4004"
-       gradientUnits="userSpaceOnUse"
-       x1="74.997902"
-       y1="-0.15009999"
-       x2="13.4883"
-       y2="88.767303" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad2"
-       id="linearGradient4006"
-       gradientUnits="userSpaceOnUse"
-       x1="74.991898"
-       y1="-0.1471"
-       x2="13.4852"
-       y2="88.765999" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3"
-       id="linearGradient4008"
-       gradientUnits="userSpaceOnUse"
-       x1="44.0611"
-       y1="0.24690001"
-       x2="44.0611"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad4"
-       id="linearGradient4010"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066101"
-       y1="0.24690001"
-       x2="44.066101"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad5"
-       id="linearGradient4012"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066299"
-       y1="0.24690001"
-       x2="44.066299"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad6"
-       id="linearGradient4014"
-       gradientUnits="userSpaceOnUse"
-       x1="11.5568"
-       y1="0.24690001"
-       x2="11.5568"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad7"
-       id="linearGradient4016"
-       gradientUnits="userSpaceOnUse"
-       x1="52.543499"
-       y1="0.24690001"
-       x2="52.543499"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8"
-       id="linearGradient4018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,31.991335,0.0065326)"
-       x1="0.34819999"
-       y1="90.636597"
-       x2="0.34819999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad9"
-       id="linearGradient4020"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,24.236528,0.0065326)"
-       x1="0.34799999"
-       y1="90.636597"
-       x2="0.34799999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad10"
-       id="linearGradient4022"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,26.783988,0.00653235)"
-       x1="0.31259999"
-       y1="88.656097"
-       x2="0.31259999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad11"
-       id="linearGradient4024"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,0,0.00653218)"
-       x1="0.31209999"
-       y1="88.656097"
-       x2="0.31209999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad12"
-       id="linearGradient4026"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5499"
-       y1="89.1185"
-       x2="30.5499"
-       y2="-3.2409" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad13"
-       id="linearGradient4028"
-       gradientUnits="userSpaceOnUse"
-       x1="30.547501"
-       y1="90.025703"
-       x2="30.547501"
-       y2="0.1055" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad14"
-       id="linearGradient4030"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5495"
-       y1="89.118202"
-       x2="30.5495"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad15"
-       id="linearGradient4032"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549101"
-       y1="90.025398"
-       x2="30.549101"
-       y2="0.1052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad16"
-       id="linearGradient4034"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5494"
-       y1="89.118202"
-       x2="30.5494"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad17"
-       id="linearGradient4036"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549"
-       y1="90.025398"
-       x2="30.549"
-       y2="0.1052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad18"
-       id="linearGradient4038"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,19.07471,8.5177656)"
-       x1="0.29169801"
-       y1="52.640499"
-       x2="0.29169801"
-       y2="-37.8988" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad19"
-       id="linearGradient4040"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.1481136,8.4533682)"
-       x1="0.2481"
-       y1="52.9165"
-       x2="0.2481"
-       y2="-35.325699" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad20"
-       id="linearGradient4042"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.7882887,0.0065326)"
-       x1="27.6264"
-       y1="89.119904"
-       x2="27.6264"
-       y2="0.1302" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad21"
-       id="linearGradient4044"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.2647203,8.517766)"
-       x1="29.726101"
-       y1="53.389"
-       x2="29.726101"
-       y2="-36.621201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad21"
-       id="linearGradient4047"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,3.2904501,5.3236036)"
-       x1="29.726101"
-       y1="53.389"
-       x2="29.726101"
-       y2="-36.621201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad20"
-       id="linearGradient4050"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,3.6176804,0.00408287)"
-       x1="27.6264"
-       y1="89.119904"
-       x2="27.6264"
-       y2="0.1302" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad19"
-       id="linearGradient4053"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,3.2175709,5.283355)"
-       x1="0.2481"
-       y1="52.9165"
-       x2="0.2481"
-       y2="-35.325699" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad18"
-       id="linearGradient4056"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,11.921694,5.3236033)"
-       x1="0.29169801"
-       y1="52.640499"
-       x2="0.29169801"
-       y2="-37.8988" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad11"
-       id="linearGradient4068"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,0,0.00408261)"
-       x1="0.31209999"
-       y1="88.656097"
-       x2="0.31209999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad10"
-       id="linearGradient4071"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,16.739992,0.00408272)"
-       x1="0.31259999"
-       y1="88.656097"
-       x2="0.31259999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad9"
-       id="linearGradient4074"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,15.14783,0.00408287)"
-       x1="0.34799999"
-       y1="90.636597"
-       x2="0.34799999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8"
-       id="linearGradient4077"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,19.994584,0.00408287)"
-       x1="0.34819999"
-       y1="90.636597"
-       x2="0.34819999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3"
-       id="linearGradient4131"
-       gradientUnits="userSpaceOnUse"
-       x1="44.0611"
-       y1="0.24690001"
-       x2="44.0611"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad4"
-       id="linearGradient4133"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066101"
-       y1="0.24690001"
-       x2="44.066101"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad5"
-       id="linearGradient4135"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066299"
-       y1="0.24690001"
-       x2="44.066299"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad6"
-       id="linearGradient4137"
-       gradientUnits="userSpaceOnUse"
-       x1="11.5568"
-       y1="0.24690001"
-       x2="11.5568"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad7"
-       id="linearGradient4139"
-       gradientUnits="userSpaceOnUse"
-       x1="52.543499"
-       y1="0.24690001"
-       x2="52.543499"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3"
-       id="linearGradient4147"
-       gradientUnits="userSpaceOnUse"
-       x1="44.0611"
-       y1="0.24690001"
-       x2="44.0611"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad4"
-       id="linearGradient4149"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066101"
-       y1="0.24690001"
-       x2="44.066101"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad5"
-       id="linearGradient4151"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066299"
-       y1="0.24690001"
-       x2="44.066299"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad6"
-       id="linearGradient4153"
-       gradientUnits="userSpaceOnUse"
-       x1="11.5568"
-       y1="0.24690001"
-       x2="11.5568"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad7"
-       id="linearGradient4155"
-       gradientUnits="userSpaceOnUse"
-       x1="52.543499"
-       y1="0.24690001"
-       x2="52.543499"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad7"
-       id="linearGradient4158"
-       gradientUnits="userSpaceOnUse"
-       x1="52.543499"
-       y1="0.24690001"
-       x2="52.543499"
-       y2="93.877998"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,0,0.00408288)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad6"
-       id="linearGradient4161"
-       gradientUnits="userSpaceOnUse"
-       x1="11.5568"
-       y1="0.24690001"
-       x2="11.5568"
-       y2="93.877998"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,16.739992,0.00408288)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad5"
-       id="linearGradient4164"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066299"
-       y1="0.24690001"
-       x2="44.066299"
-       y2="93.877998"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,39.204918,0.00408288)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad4"
-       id="linearGradient4167"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066101"
-       y1="0.24690001"
-       x2="44.066101"
-       y2="93.877998"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,30.319614,0.00408288)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3"
-       id="linearGradient4170"
-       gradientUnits="userSpaceOnUse"
-       x1="44.0611"
-       y1="0.24690001"
-       x2="44.0611"
-       y2="93.877998"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,21.434165,0.00408288)" />
-  </defs>
-  <g
-     id="Background"
-     transform="matrix(0.14517759,0,0,0.14582819,0,-3.1374999e-7)">
-    <path
-       style="fill:url(#linearGradient4002);fill-rule:nonzero;stroke:none"
-       id=" polygon460"
-       d="M 0,89.118 61.111,0 88.123,0 27.023,89.118 0,89.118 z"
-       transform="translate(270.048,0.028)"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:url(#linearGradient4004);fill-rule:nonzero;stroke:none"
-       id=" polygon485"
-       d="M 0,89.118 61.107,0 88.134,0 27.034,89.118 0,89.118 z"
-       transform="translate(147.63,0.028)"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:url(#linearGradient4006);fill-rule:nonzero;stroke:none"
-       id=" polygon504"
-       d="M 0,89.118 61.11,0 88.123,0 27.022,89.118 0,89.118 z"
-       transform="translate(208.845,0.028)"
-       inkscape:connector-curvature="0" />
-  </g>
-  <path
-     style="fill:url(#linearGradient4170);fill-rule:nonzero;stroke:none"
-     id=" polygon515"
-     d="m 34.22765,13 -8.870351,-12.99591712 -3.923134,0 L 30.303935,13 34.22765,13 z"
-     inkscape:connector-curvature="0" />
-  <path
-     style="fill:url(#linearGradient4167);fill-rule:nonzero;stroke:none"
-     id=" polygon524"
-     d="m 43.114551,13 -8.871948,-12.99591712 -3.922989,0 L 39.191417,13 l 3.923134,0 z"
-     inkscape:connector-curvature="0" />
-  <path
-     style="fill:url(#linearGradient4164);fill-rule:nonzero;stroke:none"
-     id=" polygon533"
-     d="m 52,13 -8.871948,-12.99591712 -3.923134,0 L 48.076866,13 52,13 z"
-     inkscape:connector-curvature="0" />
-  <path
-     style="fill:url(#linearGradient4161);fill-rule:evenodd;stroke:none"
-     id=" rect542"
-     d="m 16.739992,0.00408288 3.35578,0 0,12.99591712 -3.35578,0 0,-12.99591712 z"
-     inkscape:connector-curvature="0" />
-  <path
-     style="fill:url(#linearGradient4158);fill-rule:nonzero;stroke:none"
-     id=" polygon551"
-     d="m 3.2904501,13 0,-7.6104821 4.2502191,6.4803131 0.086671,0 4.2943528,-6.5462274 0,7.6763964 3.334584,0 0,-12.99591712 -3.617244,0 L 7.6273402,6.4842502 3.6176804,0.00408288 0,0.00408288 0,13 3.2904501,13 z"
-     inkscape:connector-curvature="0" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="52" height="13"><defs><linearGradient id="o" y1="-.1462" x1="74.992996" y2="88.766998" gradientUnits="userSpaceOnUse" x2="13.4863"><stop offset="47.8%" stop-color="#39b549"/><stop offset="100%" stop-color="#1a76bc"/></linearGradient><linearGradient id="p" y1="-.15009999" x1="74.997902" y2="88.767303" gradientUnits="userSpaceOnUse" x2="13.4883"><stop offset="0%" stop-color="#381f1f"/><stop offset=".17%" stop-color="#3a1f20"/><stop offset="3.76%" stop-color="#5b2825"/><stop offset="7.57%" stop-color="#7c2f28"/><stop offset="11.73%" stop-color="#9b2e28"/><stop offset="16.26%" stop-color="#b62c28"/><stop offset="21.29%" stop-color="#cc2626"/><stop offset="27.1%" stop-color="#dc2225"/><stop offset="34.38%" stop-color="#e81f25"/><stop offset="47.8%" stop-color="#ed1b26"/><stop offset="100%" stop-color="#f7921e"/></linearGradient><linearGradient id="q" y1="-.1471" x1="74.991898" y2="88.765999" gradientUnits="userSpaceOnUse" x2="13.4852"><stop offset="0%" stop-color="#120e1e"/><stop offset="2.31%" stop-color="#1b1426"/><stop offset="14.46%" stop-color="#442349"/><stop offset="25.52%" stop-color="#652866"/><stop offset="35.11%" stop-color="#7c287b"/><stop offset="42.86%" stop-color="#8b2589"/><stop offset="47.8%" stop-color="#91268f"/><stop offset="100%" stop-color="#ed1b26"/></linearGradient><linearGradient id="r" y1=".24690001" x1="44.0611" y2="93.877998" gradientUnits="userSpaceOnUse" x2="44.0611"><stop offset="0" stop-color="#58595b"/><stop offset="100%" stop-color="#a5a8aa"/></linearGradient><linearGradient id="s" y1=".24690001" x1="44.066101" y2="93.877998" gradientUnits="userSpaceOnUse" x2="44.066101"><stop offset="0" stop-color="#58595b"/><stop offset="100%" stop-color="#a5a8aa"/></linearGradient><linearGradient id="t" y1=".24690001" x1="44.066299" y2="93.877998" gradientUnits="userSpaceOnUse" x2="44.066299"><stop offset="0" stop-color="#58595b"/><stop offset="100%" stop-color="#a5a8aa"/></linearGradient><linearGradient id="u" y1=".24690001" x1="11.5568" y2="93.877998" gradientUnits="userSpaceOnUse" x2="11.5568"><stop offset="0" stop-color="#58595b"/><stop offset="100%" stop-color="#a5a8aa"/></linearGradient><linearGradient id="v" y1=".24690001" x1="52.543499" y2="93.877998" gradientUnits="userSpaceOnUse" x2="52.543499"><stop offset="0" stop-color="#58595b"/><stop offset="100%" stop-color="#a5a8aa"/></linearGradient><linearGradient id="a" y1="90.636597" x1=".34819999" y2="-2.3324001" gradientUnits="userSpaceOnUse" x2=".34819999"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="b" y1="90.636597" x1=".34799999" y2="-2.3324001" gradientUnits="userSpaceOnUse" x2=".34799999"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="c" y1="88.656097" x1=".31259999" y2="1.1722" gradientUnits="userSpaceOnUse" x2=".31259999"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="d" y1="88.656097" x1=".31209999" y2="1.1722" gradientUnits="userSpaceOnUse" x2=".31209999"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="e" y1="89.1185" x1="30.5499" y2="-3.2409" gradientUnits="userSpaceOnUse" x2="30.5499"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="f" y1="90.025703" x1="30.547501" y2=".1055" gradientUnits="userSpaceOnUse" x2="30.547501"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="g" y1="89.118202" x1="30.5495" y2="-3.2412" gradientUnits="userSpaceOnUse" x2="30.5495"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="h" y1="90.025398" x1="30.549101" y2=".1052" gradientUnits="userSpaceOnUse" x2="30.549101"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="i" y1="89.118202" x1="30.5494" y2="-3.2412" gradientUnits="userSpaceOnUse" x2="30.5494"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="j" y1="90.025398" x1="30.549" y2=".1052" gradientUnits="userSpaceOnUse" x2="30.549"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="k" y1="52.640499" x1=".29169801" y2="-37.8988" gradientUnits="userSpaceOnUse" x2=".29169801"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="l" y1="52.9165" x1=".2481" y2="-35.325699" gradientUnits="userSpaceOnUse" x2=".2481"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="m" y1="89.119904" x1="27.6264" y2=".1302" gradientUnits="userSpaceOnUse" x2="27.6264"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="n" y1="53.389" x1="29.726101" y2="-36.621201" gradientUnits="userSpaceOnUse" x2="29.726101"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient xlink:href="#o" id="w" gradientUnits="userSpaceOnUse" x1="74.992996" y1="-.1462" x2="13.4863" y2="88.766998"/><linearGradient xlink:href="#p" id="x" gradientUnits="userSpaceOnUse" x1="74.997902" y1="-.15009999" x2="13.4883" y2="88.767303"/><linearGradient xlink:href="#q" id="y" gradientUnits="userSpaceOnUse" x1="74.991898" y1="-.1471" x2="13.4852" y2="88.765999"/><linearGradient xlink:href="#v" id="D" gradientUnits="userSpaceOnUse" x1="52.543499" y1=".24690001" x2="52.543499" y2="93.877998" gradientTransform="matrix(.14518 0 0 .14583 0 .00408288)"/><linearGradient xlink:href="#u" id="C" gradientUnits="userSpaceOnUse" x1="11.5568" y1=".24690001" x2="11.5568" y2="93.877998" gradientTransform="matrix(.14518 0 0 .14583 16.739992 .00408288)"/><linearGradient xlink:href="#t" id="B" gradientUnits="userSpaceOnUse" x1="44.066299" y1=".24690001" x2="44.066299" y2="93.877998" gradientTransform="matrix(.14518 0 0 .14583 39.204918 .00408288)"/><linearGradient xlink:href="#s" id="A" gradientUnits="userSpaceOnUse" x1="44.066101" y1=".24690001" x2="44.066101" y2="93.877998" gradientTransform="matrix(.14518 0 0 .14583 30.319614 .00408288)"/><linearGradient xlink:href="#r" id="z" gradientUnits="userSpaceOnUse" x1="44.0611" y1=".24690001" x2="44.0611" y2="93.877998" gradientTransform="matrix(.14518 0 0 .14583 21.434165 .00408288)"/></defs><path d="M0 89.118L61.111 0h27.012l-61.1 89.118H0z" transform="matrix(.14518 0 0 .14583 39.2049178243 .0040828756)" fill="url(#w)"/><path d="M0 89.118L61.107 0h27.027l-61.1 89.118H0z" transform="matrix(.14518 0 0 .14583 21.4325676117 .0040828756)" fill="url(#x)"/><path d="M0 89.118L61.11 0h27.013L27.022 89.118H0z" transform="matrix(.14518 0 0 .14583 30.3196137836 .0040828756)" fill="url(#y)"/><path d="M34.22765 13L25.357299.00408288h-3.923134L30.303935 13h3.923715z" fill="url(#z)"/><path d="M43.114551 13L34.242603.00408288h-3.922989L39.191417 13h3.923134z" fill="url(#A)"/><path d="M52 13L43.128052.00408288h-3.923134L48.076866 13H52z" fill="url(#B)"/><path d="M16.739992.00408288h3.35578V13h-3.35578V.00408288z" fill="url(#C)" fill-rule="evenodd"/><path d="M3.2904501 13V5.3895179l4.2502191 6.4803131h.086671l4.2943528-6.5462274V13h3.334584V.00408288h-3.617244L7.6273402 6.4842502 3.6176804.00408288H0V13h3.2904501z" fill="url(#D)"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_logo_52x13_grey.svg b/res/skins/Tango/buttons/btn_logo_52x13_grey.svg
index d9119883a69d..dea7ef11f7f5 100644
--- a/res/skins/Tango/buttons/btn_logo_52x13_grey.svg
+++ b/res/skins/Tango/buttons/btn_logo_52x13_grey.svg
@@ -1,2420 +1 @@
-<?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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="52"
-   version="1.1"
-   height="13"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="mixxx_logo_52x13_grey.svg">
-  <metadata
-     id="metadata209">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview207"
-     showgrid="false"
-     height="744.09px"
-     inkscape:zoom="8"
-     inkscape:cx="20.916528"
-     inkscape:cy="4.153992"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true" />
-  <defs
-     id="defs4">
-    <linearGradient
-       x2="52.543499"
-       gradientUnits="userSpaceOnUse"
-       y2="93.877998"
-       x1="52.543499"
-       y1="0.24690001"
-       id="linearGradient4332">
-      <stop
-         id="stop4334"
-         stop-opacity="1"
-         stop-color="#1f1f20"
-         offset="0%" />
-      <stop
-         id="stop4336"
-         stop-opacity="1"
-         stop-color="#1f1f20"
-         offset="0.00816632" />
-      <stop
-         id="stop4338"
-         stop-opacity="1"
-         stop-color="#58595b"
-         offset="63.3333%" />
-      <stop
-         id="stop4340"
-         stop-opacity="1"
-         stop-color="#a5a8aa"
-         offset="100%" />
-    </linearGradient>
-    <linearGradient
-       id="Grad0"
-       y1="-0.1462"
-       x1="74.992996"
-       y2="88.766998"
-       gradientUnits="userSpaceOnUse"
-       x2="13.4863">
-      <stop
-         offset="47.8%"
-         stop-color="#39b549"
-         stop-opacity="1"
-         id="stop7" />
-      <stop
-         offset="100%"
-         stop-color="#1a76bc"
-         stop-opacity="1"
-         id="stop9" />
-    </linearGradient>
-    <linearGradient
-       id="Grad1"
-       y1="-0.15009999"
-       x1="74.997902"
-       y2="88.767303"
-       gradientUnits="userSpaceOnUse"
-       x2="13.4883">
-      <stop
-         offset="0%"
-         stop-color="#381f1f"
-         stop-opacity="1"
-         id="stop12" />
-      <stop
-         offset="0.17%"
-         stop-color="#3a1f20"
-         stop-opacity="1"
-         id="stop14" />
-      <stop
-         offset="3.76%"
-         stop-color="#5b2825"
-         stop-opacity="1"
-         id="stop16" />
-      <stop
-         offset="7.57%"
-         stop-color="#7c2f28"
-         stop-opacity="1"
-         id="stop18" />
-      <stop
-         offset="11.73%"
-         stop-color="#9b2e28"
-         stop-opacity="1"
-         id="stop20" />
-      <stop
-         offset="16.26%"
-         stop-color="#b62c28"
-         stop-opacity="1"
-         id="stop22" />
-      <stop
-         offset="21.29%"
-         stop-color="#cc2626"
-         stop-opacity="1"
-         id="stop24" />
-      <stop
-         offset="27.1%"
-         stop-color="#dc2225"
-         stop-opacity="1"
-         id="stop26" />
-      <stop
-         offset="34.38%"
-         stop-color="#e81f25"
-         stop-opacity="1"
-         id="stop28" />
-      <stop
-         offset="47.8%"
-         stop-color="#ed1b26"
-         stop-opacity="1"
-         id="stop30" />
-      <stop
-         offset="100%"
-         stop-color="#f7921e"
-         stop-opacity="1"
-         id="stop32" />
-    </linearGradient>
-    <linearGradient
-       id="Grad2"
-       y1="-0.1471"
-       x1="74.991898"
-       y2="88.765999"
-       gradientUnits="userSpaceOnUse"
-       x2="13.4852">
-      <stop
-         offset="0%"
-         stop-color="#120e1e"
-         stop-opacity="1"
-         id="stop35" />
-      <stop
-         offset="2.31%"
-         stop-color="#1b1426"
-         stop-opacity="1"
-         id="stop37" />
-      <stop
-         offset="14.46%"
-         stop-color="#442349"
-         stop-opacity="1"
-         id="stop39" />
-      <stop
-         offset="25.52%"
-         stop-color="#652866"
-         stop-opacity="1"
-         id="stop41" />
-      <stop
-         offset="35.11%"
-         stop-color="#7c287b"
-         stop-opacity="1"
-         id="stop43" />
-      <stop
-         offset="42.86%"
-         stop-color="#8b2589"
-         stop-opacity="1"
-         id="stop45" />
-      <stop
-         offset="47.8%"
-         stop-color="#91268f"
-         stop-opacity="1"
-         id="stop47" />
-      <stop
-         offset="100%"
-         stop-color="#ed1b26"
-         stop-opacity="1"
-         id="stop49" />
-    </linearGradient>
-    <clipPath
-       id="Clip0">
-      <path
-         d="m 0,0 358.182,0 0,89.118 L 0,89.118 0,0 z"
-         transform="translate(0,0.028)"
-         id="path52"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       id="Grad3"
-       y1="0.24690001"
-       x1="44.0611"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.0611">
-      <stop
-         offset="0"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop59" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop61" />
-    </linearGradient>
-    <linearGradient
-       id="Grad4"
-       y1="0.24690001"
-       x1="44.066101"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.066101">
-      <stop
-         offset="0"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop68" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop70" />
-    </linearGradient>
-    <linearGradient
-       id="Grad5"
-       y1="0.24690001"
-       x1="44.066299"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.066299">
-      <stop
-         offset="0"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop77" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop79" />
-    </linearGradient>
-    <linearGradient
-       id="Grad6"
-       y1="0.24690001"
-       x1="11.5568"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="11.5568">
-      <stop
-         offset="0"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop86" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop88" />
-    </linearGradient>
-    <linearGradient
-       id="Grad7"
-       y1="0.24690001"
-       x1="52.543499"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="52.543499">
-      <stop
-         offset="0"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop95" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop97" />
-    </linearGradient>
-    <linearGradient
-       id="Grad8"
-       y1="90.636597"
-       x1="0.34819999"
-       y2="-2.3324001"
-       gradientUnits="userSpaceOnUse"
-       x2="0.34819999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop100" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop102" />
-    </linearGradient>
-    <linearGradient
-       id="Grad9"
-       y1="90.636597"
-       x1="0.34799999"
-       y2="-2.3324001"
-       gradientUnits="userSpaceOnUse"
-       x2="0.34799999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop105" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop107" />
-    </linearGradient>
-    <linearGradient
-       id="Grad10"
-       y1="88.656097"
-       x1="0.31259999"
-       y2="1.1722"
-       gradientUnits="userSpaceOnUse"
-       x2="0.31259999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop110" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop112" />
-    </linearGradient>
-    <linearGradient
-       id="Grad11"
-       y1="88.656097"
-       x1="0.31209999"
-       y2="1.1722"
-       gradientUnits="userSpaceOnUse"
-       x2="0.31209999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop115" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop117" />
-    </linearGradient>
-    <clipPath
-       id="Clip1">
-      <path
-         d="m 0,0 88.123,0 0,89.118 L 0,89.118 0,0 z"
-         transform="translate(147.641,0.028)"
-         id="path120"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       id="Grad12"
-       y1="89.1185"
-       x1="30.5499"
-       y2="-3.2409"
-       gradientUnits="userSpaceOnUse"
-       x2="30.5499">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop123" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop125" />
-    </linearGradient>
-    <linearGradient
-       id="Grad13"
-       y1="90.025703"
-       x1="30.547501"
-       y2="0.1055"
-       gradientUnits="userSpaceOnUse"
-       x2="30.547501">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop128" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop130" />
-    </linearGradient>
-    <clipPath
-       id="Clip2">
-      <path
-         d="m 0,0 88.123,0 0,89.118 L 0,89.118 0,0 z"
-         transform="translate(208.823,0)"
-         id="path133"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       id="Grad14"
-       y1="89.118202"
-       x1="30.5495"
-       y2="-3.2412"
-       gradientUnits="userSpaceOnUse"
-       x2="30.5495">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop136" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop138" />
-    </linearGradient>
-    <linearGradient
-       id="Grad15"
-       y1="90.025398"
-       x1="30.549101"
-       y2="0.1052"
-       gradientUnits="userSpaceOnUse"
-       x2="30.549101">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop141" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop143" />
-    </linearGradient>
-    <clipPath
-       id="Clip3">
-      <path
-         d="m 0,0 88.123,0 0,89.118 L 0,89.118 0,0 z"
-         transform="translate(270.034,0)"
-         id="path146"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       id="Grad16"
-       y1="89.118202"
-       x1="30.5494"
-       y2="-3.2412"
-       gradientUnits="userSpaceOnUse"
-       x2="30.5494">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop149" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop151" />
-    </linearGradient>
-    <linearGradient
-       id="Grad17"
-       y1="90.025398"
-       x1="30.549"
-       y2="0.1052"
-       gradientUnits="userSpaceOnUse"
-       x2="30.549">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop154" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop156" />
-    </linearGradient>
-    <linearGradient
-       id="Grad18"
-       y1="52.640499"
-       x1="0.29169801"
-       y2="-37.8988"
-       gradientUnits="userSpaceOnUse"
-       x2="0.29169801">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop159" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop161" />
-    </linearGradient>
-    <linearGradient
-       id="Grad19"
-       y1="52.9165"
-       x1="0.2481"
-       y2="-35.325699"
-       gradientUnits="userSpaceOnUse"
-       x2="0.2481">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop164" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop166" />
-    </linearGradient>
-    <linearGradient
-       id="Grad20"
-       y1="89.119904"
-       x1="27.6264"
-       y2="0.1302"
-       gradientUnits="userSpaceOnUse"
-       x2="27.6264">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop169" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop171" />
-    </linearGradient>
-    <linearGradient
-       id="Grad21"
-       y1="53.389"
-       x1="29.726101"
-       y2="-36.621201"
-       gradientUnits="userSpaceOnUse"
-       x2="29.726101">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop174" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop176" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8"
-       id="linearGradient3169"
-       gradientUnits="userSpaceOnUse"
-       x1="0.34819999"
-       y1="90.636597"
-       x2="0.34819999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad9"
-       id="linearGradient3171"
-       gradientUnits="userSpaceOnUse"
-       x1="0.34799999"
-       y1="90.636597"
-       x2="0.34799999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad10"
-       id="linearGradient3173"
-       gradientUnits="userSpaceOnUse"
-       x1="0.31259999"
-       y1="88.656097"
-       x2="0.31259999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad11"
-       id="linearGradient3175"
-       gradientUnits="userSpaceOnUse"
-       x1="0.31209999"
-       y1="88.656097"
-       x2="0.31209999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad12"
-       id="linearGradient3177"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5499"
-       y1="89.1185"
-       x2="30.5499"
-       y2="-3.2409" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad13"
-       id="linearGradient3179"
-       gradientUnits="userSpaceOnUse"
-       x1="30.547501"
-       y1="90.025703"
-       x2="30.547501"
-       y2="0.1055" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad14"
-       id="linearGradient3181"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5495"
-       y1="89.118202"
-       x2="30.5495"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad15"
-       id="linearGradient3183"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549101"
-       y1="90.025398"
-       x2="30.549101"
-       y2="0.1052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad16"
-       id="linearGradient3185"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5494"
-       y1="89.118202"
-       x2="30.5494"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad17"
-       id="linearGradient3187"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549"
-       y1="90.025398"
-       x2="30.549"
-       y2="0.1052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad18"
-       id="linearGradient3189"
-       gradientUnits="userSpaceOnUse"
-       x1="0.29169801"
-       y1="52.640499"
-       x2="0.29169801"
-       y2="-37.8988" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad19"
-       id="linearGradient3191"
-       gradientUnits="userSpaceOnUse"
-       x1="0.2481"
-       y1="52.9165"
-       x2="0.2481"
-       y2="-35.325699" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad20"
-       id="linearGradient3193"
-       gradientUnits="userSpaceOnUse"
-       x1="27.6264"
-       y1="89.119904"
-       x2="27.6264"
-       y2="0.1302" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad21"
-       id="linearGradient3195"
-       gradientUnits="userSpaceOnUse"
-       x1="29.726101"
-       y1="53.389"
-       x2="29.726101"
-       y2="-36.621201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad21"
-       id="linearGradient3198"
-       gradientUnits="userSpaceOnUse"
-       x1="29.726101"
-       y1="53.389"
-       x2="29.726101"
-       y2="-36.621201"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.2647203,8.517766)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad20"
-       id="linearGradient3201"
-       gradientUnits="userSpaceOnUse"
-       x1="27.6264"
-       y1="89.119904"
-       x2="27.6264"
-       y2="0.1302"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.7882887,0.0065326)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad19"
-       id="linearGradient3204"
-       gradientUnits="userSpaceOnUse"
-       x1="0.2481"
-       y1="52.9165"
-       x2="0.2481"
-       y2="-35.325699"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.1481136,8.4533682)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad18"
-       id="linearGradient3207"
-       gradientUnits="userSpaceOnUse"
-       x1="0.29169801"
-       y1="52.640499"
-       x2="0.29169801"
-       y2="-37.8988"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,19.07471,8.5177656)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad11"
-       id="linearGradient3219"
-       gradientUnits="userSpaceOnUse"
-       x1="0.31209999"
-       y1="88.656097"
-       x2="0.31209999"
-       y2="1.1722"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,0,0.00653218)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad10"
-       id="linearGradient3222"
-       gradientUnits="userSpaceOnUse"
-       x1="0.31259999"
-       y1="88.656097"
-       x2="0.31259999"
-       y2="1.1722"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,26.783988,0.00653235)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad9"
-       id="linearGradient3225"
-       gradientUnits="userSpaceOnUse"
-       x1="0.34799999"
-       y1="90.636597"
-       x2="0.34799999"
-       y2="-2.3324001"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,24.236528,0.0065326)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8"
-       id="linearGradient3228"
-       gradientUnits="userSpaceOnUse"
-       x1="0.34819999"
-       y1="90.636597"
-       x2="0.34819999"
-       y2="-2.3324001"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,31.991335,0.0065326)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad16"
-       id="linearGradient3230"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5494"
-       y1="89.118202"
-       x2="30.5494"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad17"
-       id="linearGradient3232"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549"
-       y1="90.025398"
-       x2="30.549"
-       y2="0.1052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad0"
-       id="linearGradient3264"
-       gradientUnits="userSpaceOnUse"
-       x1="74.992996"
-       y1="-0.1462"
-       x2="13.4863"
-       y2="88.766998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad1"
-       id="linearGradient3266"
-       gradientUnits="userSpaceOnUse"
-       x1="74.997902"
-       y1="-0.15009999"
-       x2="13.4883"
-       y2="88.767303" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad2"
-       id="linearGradient3268"
-       gradientUnits="userSpaceOnUse"
-       x1="74.991898"
-       y1="-0.1471"
-       x2="13.4852"
-       y2="88.765999" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3"
-       id="linearGradient3270"
-       gradientUnits="userSpaceOnUse"
-       x1="44.0611"
-       y1="0.24690001"
-       x2="44.0611"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad4"
-       id="linearGradient3272"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066101"
-       y1="0.24690001"
-       x2="44.066101"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad5"
-       id="linearGradient3274"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066299"
-       y1="0.24690001"
-       x2="44.066299"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad6"
-       id="linearGradient3276"
-       gradientUnits="userSpaceOnUse"
-       x1="11.5568"
-       y1="0.24690001"
-       x2="11.5568"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad7"
-       id="linearGradient3278"
-       gradientUnits="userSpaceOnUse"
-       x1="52.543499"
-       y1="0.24690001"
-       x2="52.543499"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8"
-       id="linearGradient3280"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,31.991335,0.0065326)"
-       x1="0.34819999"
-       y1="90.636597"
-       x2="0.34819999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad9"
-       id="linearGradient3282"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,24.236528,0.0065326)"
-       x1="0.34799999"
-       y1="90.636597"
-       x2="0.34799999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad10"
-       id="linearGradient3284"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,26.783988,0.00653235)"
-       x1="0.31259999"
-       y1="88.656097"
-       x2="0.31259999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad11"
-       id="linearGradient3286"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,0,0.00653218)"
-       x1="0.31209999"
-       y1="88.656097"
-       x2="0.31209999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad12"
-       id="linearGradient3288"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5499"
-       y1="89.1185"
-       x2="30.5499"
-       y2="-3.2409" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad13"
-       id="linearGradient3290"
-       gradientUnits="userSpaceOnUse"
-       x1="30.547501"
-       y1="90.025703"
-       x2="30.547501"
-       y2="0.1055" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad14"
-       id="linearGradient3292"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5495"
-       y1="89.118202"
-       x2="30.5495"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad15"
-       id="linearGradient3294"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549101"
-       y1="90.025398"
-       x2="30.549101"
-       y2="0.1052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad16"
-       id="linearGradient3296"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5494"
-       y1="89.118202"
-       x2="30.5494"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad17"
-       id="linearGradient3298"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549"
-       y1="90.025398"
-       x2="30.549"
-       y2="0.1052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad18"
-       id="linearGradient3300"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,19.07471,8.5177656)"
-       x1="0.29169801"
-       y1="52.640499"
-       x2="0.29169801"
-       y2="-37.8988" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad19"
-       id="linearGradient3302"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.1481136,8.4533682)"
-       x1="0.2481"
-       y1="52.9165"
-       x2="0.2481"
-       y2="-35.325699" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad20"
-       id="linearGradient3304"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.7882887,0.0065326)"
-       x1="27.6264"
-       y1="89.119904"
-       x2="27.6264"
-       y2="0.1302" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad21"
-       id="linearGradient3306"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.2647203,8.517766)"
-       x1="29.726101"
-       y1="53.389"
-       x2="29.726101"
-       y2="-36.621201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad0"
-       id="linearGradient4002"
-       gradientUnits="userSpaceOnUse"
-       x1="74.992996"
-       y1="-0.1462"
-       x2="13.4863"
-       y2="88.766998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad1"
-       id="linearGradient4004"
-       gradientUnits="userSpaceOnUse"
-       x1="74.997902"
-       y1="-0.15009999"
-       x2="13.4883"
-       y2="88.767303" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad2"
-       id="linearGradient4006"
-       gradientUnits="userSpaceOnUse"
-       x1="74.991898"
-       y1="-0.1471"
-       x2="13.4852"
-       y2="88.765999" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3"
-       id="linearGradient4008"
-       gradientUnits="userSpaceOnUse"
-       x1="44.0611"
-       y1="0.24690001"
-       x2="44.0611"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad4"
-       id="linearGradient4010"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066101"
-       y1="0.24690001"
-       x2="44.066101"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad5"
-       id="linearGradient4012"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066299"
-       y1="0.24690001"
-       x2="44.066299"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad6"
-       id="linearGradient4014"
-       gradientUnits="userSpaceOnUse"
-       x1="11.5568"
-       y1="0.24690001"
-       x2="11.5568"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad7"
-       id="linearGradient4016"
-       gradientUnits="userSpaceOnUse"
-       x1="52.543499"
-       y1="0.24690001"
-       x2="52.543499"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8"
-       id="linearGradient4018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,31.991335,0.0065326)"
-       x1="0.34819999"
-       y1="90.636597"
-       x2="0.34819999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad9"
-       id="linearGradient4020"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,24.236528,0.0065326)"
-       x1="0.34799999"
-       y1="90.636597"
-       x2="0.34799999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad10"
-       id="linearGradient4022"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,26.783988,0.00653235)"
-       x1="0.31259999"
-       y1="88.656097"
-       x2="0.31259999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad11"
-       id="linearGradient4024"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,0,0.00653218)"
-       x1="0.31209999"
-       y1="88.656097"
-       x2="0.31209999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad12"
-       id="linearGradient4026"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5499"
-       y1="89.1185"
-       x2="30.5499"
-       y2="-3.2409" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad13"
-       id="linearGradient4028"
-       gradientUnits="userSpaceOnUse"
-       x1="30.547501"
-       y1="90.025703"
-       x2="30.547501"
-       y2="0.1055" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad14"
-       id="linearGradient4030"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5495"
-       y1="89.118202"
-       x2="30.5495"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad15"
-       id="linearGradient4032"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549101"
-       y1="90.025398"
-       x2="30.549101"
-       y2="0.1052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad16"
-       id="linearGradient4034"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5494"
-       y1="89.118202"
-       x2="30.5494"
-       y2="-3.2412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad17"
-       id="linearGradient4036"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549"
-       y1="90.025398"
-       x2="30.549"
-       y2="0.1052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad18"
-       id="linearGradient4038"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,19.07471,8.5177656)"
-       x1="0.29169801"
-       y1="52.640499"
-       x2="0.29169801"
-       y2="-37.8988" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad19"
-       id="linearGradient4040"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.1481136,8.4533682)"
-       x1="0.2481"
-       y1="52.9165"
-       x2="0.2481"
-       y2="-35.325699" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad20"
-       id="linearGradient4042"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.7882887,0.0065326)"
-       x1="27.6264"
-       y1="89.119904"
-       x2="27.6264"
-       y2="0.1302" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad21"
-       id="linearGradient4044"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23228415,0,0,0.23332511,5.2647203,8.517766)"
-       x1="29.726101"
-       y1="53.389"
-       x2="29.726101"
-       y2="-36.621201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad21"
-       id="linearGradient4047"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,3.2904501,5.3236036)"
-       x1="29.726101"
-       y1="53.389"
-       x2="29.726101"
-       y2="-36.621201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad20"
-       id="linearGradient4050"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,3.6176804,0.00408287)"
-       x1="27.6264"
-       y1="89.119904"
-       x2="27.6264"
-       y2="0.1302" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad19"
-       id="linearGradient4053"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,3.2175709,5.283355)"
-       x1="0.2481"
-       y1="52.9165"
-       x2="0.2481"
-       y2="-35.325699" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad18"
-       id="linearGradient4056"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,11.921694,5.3236033)"
-       x1="0.29169801"
-       y1="52.640499"
-       x2="0.29169801"
-       y2="-37.8988" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad11"
-       id="linearGradient4068"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,0,0.00408261)"
-       x1="0.31209999"
-       y1="88.656097"
-       x2="0.31209999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad10"
-       id="linearGradient4071"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,16.739992,0.00408272)"
-       x1="0.31259999"
-       y1="88.656097"
-       x2="0.31259999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad9"
-       id="linearGradient4074"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,15.14783,0.00408287)"
-       x1="0.34799999"
-       y1="90.636597"
-       x2="0.34799999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8"
-       id="linearGradient4077"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,19.994584,0.00408287)"
-       x1="0.34819999"
-       y1="90.636597"
-       x2="0.34819999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3"
-       id="linearGradient4131"
-       gradientUnits="userSpaceOnUse"
-       x1="44.0611"
-       y1="0.24690001"
-       x2="44.0611"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad4"
-       id="linearGradient4133"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066101"
-       y1="0.24690001"
-       x2="44.066101"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad5"
-       id="linearGradient4135"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066299"
-       y1="0.24690001"
-       x2="44.066299"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad6"
-       id="linearGradient4137"
-       gradientUnits="userSpaceOnUse"
-       x1="11.5568"
-       y1="0.24690001"
-       x2="11.5568"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad7"
-       id="linearGradient4139"
-       gradientUnits="userSpaceOnUse"
-       x1="52.543499"
-       y1="0.24690001"
-       x2="52.543499"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3"
-       id="linearGradient4147"
-       gradientUnits="userSpaceOnUse"
-       x1="44.0611"
-       y1="0.24690001"
-       x2="44.0611"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad4"
-       id="linearGradient4149"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066101"
-       y1="0.24690001"
-       x2="44.066101"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad5"
-       id="linearGradient4151"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066299"
-       y1="0.24690001"
-       x2="44.066299"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad6"
-       id="linearGradient4153"
-       gradientUnits="userSpaceOnUse"
-       x1="11.5568"
-       y1="0.24690001"
-       x2="11.5568"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad7"
-       id="linearGradient4155"
-       gradientUnits="userSpaceOnUse"
-       x1="52.543499"
-       y1="0.24690001"
-       x2="52.543499"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad7"
-       id="linearGradient4158"
-       gradientUnits="userSpaceOnUse"
-       x1="52.543499"
-       y1="0.24690001"
-       x2="52.543499"
-       y2="93.877998"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,0,0.00408288)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad6"
-       id="linearGradient4161"
-       gradientUnits="userSpaceOnUse"
-       x1="11.5568"
-       y1="0.24690001"
-       x2="11.5568"
-       y2="93.877998"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,16.739992,0.00408288)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad5"
-       id="linearGradient4164"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066299"
-       y1="0.24690001"
-       x2="44.066299"
-       y2="93.877998"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,39.204918,0.00408288)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad4"
-       id="linearGradient4167"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066101"
-       y1="0.24690001"
-       x2="44.066101"
-       y2="93.877998"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,30.319614,0.00408288)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3"
-       id="linearGradient4170"
-       gradientUnits="userSpaceOnUse"
-       x1="44.0611"
-       y1="0.24690001"
-       x2="44.0611"
-       y2="93.877998"
-       gradientTransform="matrix(0.14517759,0,0,0.14582819,21.434165,0.00408288)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-9"
-       id="linearGradient5304"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,99.63733,64.832905)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       id="Grad3-9"
-       y1="0.24690001"
-       x1="44.0611"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.0611">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop55-45" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop57-46" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop59-6" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop61-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-2"
-       id="linearGradient5306"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,116.84543,64.832905)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       id="Grad3-2"
-       y1="0.24690001"
-       x1="44.0611"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.0611">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop55-4" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop57-4" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop59-5" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop61-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-2-8"
-       id="linearGradient5308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,82.43147,64.832905)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       id="Grad3-2-8"
-       y1="0.24690001"
-       x1="44.0611"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.0611">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop55-4-9" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop57-4-6" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop59-5-0" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop61-9-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-95"
-       id="linearGradient5102"
-       gradientUnits="userSpaceOnUse"
-       x1="44.0611"
-       y1="0.24690001"
-       x2="44.0611"
-       y2="93.877998"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,43.433963,0.42104726)" />
-    <linearGradient
-       id="Grad3-95"
-       y1="0.24690001"
-       x1="44.0611"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.0611">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop55" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop57" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop59-2" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop61-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad4-3"
-       id="linearGradient5099"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066101"
-       y1="0.24690001"
-       x2="44.066101"
-       y2="93.877998"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,60.640102,0.42104726)" />
-    <linearGradient
-       id="Grad4-3"
-       y1="0.24690001"
-       x1="44.066101"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.066101">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop64" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop66" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop68-0" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop70-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad5-9"
-       id="linearGradient5096"
-       gradientUnits="userSpaceOnUse"
-       x1="44.066299"
-       y1="0.24690001"
-       x2="44.066299"
-       y2="93.877998"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,77.845959,0.42104726)" />
-    <linearGradient
-       id="Grad5-9"
-       y1="0.24690001"
-       x1="44.066299"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="44.066299">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop73" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop75" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop77-1" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop79-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad6-4"
-       id="linearGradient5093"
-       gradientUnits="userSpaceOnUse"
-       x1="11.5568"
-       y1="0.24690001"
-       x2="11.5568"
-       y2="93.877998"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,34.343981,0.42104726)" />
-    <linearGradient
-       id="Grad6-4"
-       y1="0.24690001"
-       x1="11.5568"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="11.5568">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop82" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop84" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop86-5" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop88-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad7-5"
-       id="linearGradient5090"
-       gradientUnits="userSpaceOnUse"
-       x1="52.543499"
-       y1="0.24690001"
-       x2="52.543499"
-       y2="93.877998"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,1.9279915,0.42104726)" />
-    <linearGradient
-       id="Grad7-5"
-       y1="0.24690001"
-       x1="52.543499"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="52.543499">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop91" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop93" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop95-7" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop97-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8-3"
-       id="linearGradient4178"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,40.646301,0.42104726)"
-       x1="0.34819999"
-       y1="90.636597"
-       x2="0.34819999"
-       y2="-2.3324001" />
-    <linearGradient
-       id="Grad8-3"
-       y1="90.636597"
-       x1="0.34819999"
-       y2="-2.3324001"
-       gradientUnits="userSpaceOnUse"
-       x2="0.34819999">
-      <stop
-         offset="0"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop100-8"
-         style="stop-color:#a2a2a2;stop-opacity:1;" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop102-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad9-5"
-       id="linearGradient4175"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,31.260853,0.42104726)"
-       x1="0.34799999"
-       y1="90.636597"
-       x2="0.34799999"
-       y2="-2.3324001" />
-    <linearGradient
-       id="Grad9-5"
-       y1="90.636597"
-       x1="0.34799999"
-       y2="-2.3324001"
-       gradientUnits="userSpaceOnUse"
-       x2="0.34799999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop105-5" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop107-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad10-8"
-       id="linearGradient4172"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,34.34398,0.42104696)"
-       x1="0.31259999"
-       y1="88.656097"
-       x2="0.31259999"
-       y2="1.1722" />
-    <linearGradient
-       id="Grad10-8"
-       y1="88.656097"
-       x1="0.31259999"
-       y2="1.1722"
-       gradientUnits="userSpaceOnUse"
-       x2="0.31259999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop110-6" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop112-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad11-3"
-       id="linearGradient4169"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,1.9279915,0.42104675)"
-       x1="0.31209999"
-       y1="88.656097"
-       x2="0.31209999"
-       y2="1.1722" />
-    <linearGradient
-       id="Grad11-3"
-       y1="88.656097"
-       x1="0.31209999"
-       y2="1.1722"
-       gradientUnits="userSpaceOnUse"
-       x2="0.31209999">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop115-3" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop117-6" />
-    </linearGradient>
-    <clipPath
-       id="Clip1-1">
-      <path
-         d="m 0,0 88.123,0 0,89.118 L 0,89.118 0,0 z"
-         transform="translate(147.641,0.028)"
-         id="path120-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad12-0"
-       id="linearGradient3177-7"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5499"
-       y1="89.1185"
-       x2="30.5499"
-       y2="-3.2409" />
-    <linearGradient
-       id="Grad12-0"
-       y1="89.1185"
-       x1="30.5499"
-       y2="-3.2409"
-       gradientUnits="userSpaceOnUse"
-       x2="30.5499">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop123-5" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop125-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad13-0"
-       id="linearGradient3179-1"
-       gradientUnits="userSpaceOnUse"
-       x1="30.547501"
-       y1="90.025703"
-       x2="30.547501"
-       y2="0.1055" />
-    <linearGradient
-       id="Grad13-0"
-       y1="90.025703"
-       x1="30.547501"
-       y2="0.1055"
-       gradientUnits="userSpaceOnUse"
-       x2="30.547501">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop128-3" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop130-0" />
-    </linearGradient>
-    <clipPath
-       id="Clip2-0">
-      <path
-         d="m 0,0 88.123,0 0,89.118 L 0,89.118 0,0 z"
-         transform="translate(208.823,0)"
-         id="path133-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad14-4"
-       id="linearGradient3181-5"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5495"
-       y1="89.118202"
-       x2="30.5495"
-       y2="-3.2412" />
-    <linearGradient
-       id="Grad14-4"
-       y1="89.118202"
-       x1="30.5495"
-       y2="-3.2412"
-       gradientUnits="userSpaceOnUse"
-       x2="30.5495">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop136-2" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop138-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad15-9"
-       id="linearGradient3183-9"
-       gradientUnits="userSpaceOnUse"
-       x1="30.549101"
-       y1="90.025398"
-       x2="30.549101"
-       y2="0.1052" />
-    <linearGradient
-       id="Grad15-9"
-       y1="90.025398"
-       x1="30.549101"
-       y2="0.1052"
-       gradientUnits="userSpaceOnUse"
-       x2="30.549101">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop141-9" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop143-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad18-9"
-       id="linearGradient4157"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,25.013634,10.721979)"
-       x1="0.29169801"
-       y1="52.640499"
-       x2="0.29169801"
-       y2="-37.8988" />
-    <linearGradient
-       id="Grad18-9"
-       y1="52.640499"
-       x1="0.29169801"
-       y2="-37.8988"
-       gradientUnits="userSpaceOnUse"
-       x2="0.29169801">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop159-8" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop161-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad19-6"
-       id="linearGradient4154"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,8.1586242,10.64404)"
-       x1="0.2481"
-       y1="52.9165"
-       x2="0.2481"
-       y2="-35.325699" />
-    <linearGradient
-       id="Grad19-6"
-       y1="52.9165"
-       x1="0.2481"
-       y2="-35.325699"
-       gradientUnits="userSpaceOnUse"
-       x2="0.2481">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop164-3" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop166-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad20-3"
-       id="linearGradient4151-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,8.933412,0.42104726)"
-       x1="27.6264"
-       y1="89.119904"
-       x2="27.6264"
-       y2="0.1302" />
-    <linearGradient
-       id="Grad20-3"
-       y1="89.119904"
-       x1="27.6264"
-       y2="0.1302"
-       gradientUnits="userSpaceOnUse"
-       x2="27.6264">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop169-4" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop171-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad21-1"
-       id="linearGradient4148"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,8.2997503,10.721979)"
-       x1="29.726101"
-       y1="53.389"
-       x2="29.726101"
-       y2="-36.621201" />
-    <linearGradient
-       id="Grad21-1"
-       y1="53.389"
-       x1="29.726101"
-       y2="-36.621201"
-       gradientUnits="userSpaceOnUse"
-       x2="29.726101">
-      <stop
-         offset="0%"
-         stop-color="#ffffff"
-         stop-opacity="1"
-         id="stop174-5" />
-      <stop
-         offset="100%"
-         stop-color="#000000"
-         stop-opacity="1"
-         id="stop176-6" />
-    </linearGradient>
-    <linearGradient
-       y2="-36.621201"
-       x2="29.726101"
-       y1="53.389"
-       x1="29.726101"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,8.2997503,10.721979)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5943"
-       xlink:href="#Grad21-1"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad21-1"
-       id="linearGradient6201"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,6.9093105,-18.391981)"
-       x1="29.726101"
-       y1="53.389"
-       x2="29.726101"
-       y2="-36.621201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad20-3"
-       id="linearGradient6204"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,7.5429722,-28.692913)"
-       x1="27.6264"
-       y1="89.119904"
-       x2="27.6264"
-       y2="0.1302" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad19-6"
-       id="linearGradient6207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,7.9835242,-18.182658)"
-       x1="0.2481"
-       y1="52.9165"
-       x2="0.2481"
-       y2="-35.325699" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad18-9"
-       id="linearGradient6210"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,23.623194,-18.391981)"
-       x1="0.29169801"
-       y1="52.640499"
-       x2="0.29169801"
-       y2="-37.8988" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad11-3"
-       id="linearGradient6219"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,-1.7436983,-28.646038)"
-       x1="0.31209999"
-       y1="88.656097"
-       x2="0.31209999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad10-8"
-       id="linearGradient6222"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,32.95354,-28.692913)"
-       x1="0.31259999"
-       y1="88.656097"
-       x2="0.31259999"
-       y2="1.1722" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad9-5"
-       id="linearGradient6225"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,29.870413,-28.692913)"
-       x1="0.34799999"
-       y1="90.636597"
-       x2="0.34799999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad8-3"
-       id="linearGradient6228"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,39.255861,-28.692913)"
-       x1="0.34819999"
-       y1="90.636597"
-       x2="0.34819999"
-       y2="-2.3324001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad7-5"
-       id="linearGradient6231"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,0.5375517,-28.692913)"
-       x1="52.543499"
-       y1="0.24690001"
-       x2="52.543499"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad6-4"
-       id="linearGradient6234"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,32.953541,-28.692913)"
-       x1="11.5568"
-       y1="0.24690001"
-       x2="11.5568"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad5-9"
-       id="linearGradient6237"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,76.455519,-28.692913)"
-       x1="44.066299"
-       y1="0.24690001"
-       x2="44.066299"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad4-3"
-       id="linearGradient6240"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,59.249662,-28.692913)"
-       x1="44.066101"
-       y1="0.24690001"
-       x2="44.066101"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-95"
-       id="linearGradient6243"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,42.043523,-28.692913)"
-       x1="44.0611"
-       y1="0.24690001"
-       x2="44.0611"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-9"
-       id="linearGradient6260"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,99.63733,64.832905)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-2"
-       id="linearGradient6262"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,116.84543,64.832905)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-2-8"
-       id="linearGradient6264"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.28112768,0,0,-0.28238752,82.43147,64.832905)"
-       x1="12.995073"
-       y1="89.163239"
-       x2="74.105591"
-       y2="0.14363858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-95"
-       id="linearGradient6266"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,42.043523,-28.692913)"
-       x1="44.0611"
-       y1="0.24690001"
-       x2="44.0611"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad4-3"
-       id="linearGradient6268"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,59.249662,-28.692913)"
-       x1="44.066101"
-       y1="0.24690001"
-       x2="44.066101"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad5-9"
-       id="linearGradient6270"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,76.455519,-28.692913)"
-       x1="44.066299"
-       y1="0.24690001"
-       x2="44.066299"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad6-4"
-       id="linearGradient6272"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,32.953541,-28.692913)"
-       x1="11.5568"
-       y1="0.24690001"
-       x2="11.5568"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad7-5"
-       id="linearGradient6274"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,0.5375517,-28.692913)"
-       x1="52.543499"
-       y1="0.24690001"
-       x2="52.543499"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad7-3"
-       id="linearGradient3241"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28112768,0,0,0.28238752,1.9279915,0.42104726)"
-       x1="52.543499"
-       y1="0.24690001"
-       x2="52.543499"
-       y2="93.877998" />
-    <linearGradient
-       id="Grad7-3"
-       y1="0.24690001"
-       x1="52.543499"
-       y2="93.877998"
-       gradientUnits="userSpaceOnUse"
-       x2="52.543499">
-      <stop
-         offset="0%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop91-6" />
-      <stop
-         offset="0.555556%"
-         stop-color="#1f1f20"
-         stop-opacity="1"
-         id="stop93-7" />
-      <stop
-         offset="63.3333%"
-         stop-color="#58595b"
-         stop-opacity="1"
-         id="stop95-5" />
-      <stop
-         offset="100%"
-         stop-color="#a5a8aa"
-         stop-opacity="1"
-         id="stop97-35" />
-    </linearGradient>
-    <linearGradient
-       y2="18.166697"
-       x2="52.543499"
-       y1="-118.08931"
-       x1="52.543499"
-       gradientTransform="matrix(0.14517451,0,0,0.14582509,21.107566,10.225012)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3522"
-       xlink:href="#linearGradient4332"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad7-5"
-       id="linearGradient3546"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517639,0,0,0.14582698,0,0.00419127)"
-       x1="52.543499"
-       y1="0.24690001"
-       x2="52.543499"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad6-4"
-       id="linearGradient3549"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517639,0,0,0.14582698,16.739854,0.00419127)"
-       x1="11.5568"
-       y1="0.24690001"
-       x2="11.5568"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad5-9"
-       id="linearGradient3552"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517639,0,0,0.14582698,39.204593,0.00419127)"
-       x1="44.066299"
-       y1="0.24690001"
-       x2="44.066299"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad4-3"
-       id="linearGradient3555"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517639,0,0,0.14582698,30.319362,0.00419127)"
-       x1="44.066101"
-       y1="0.24690001"
-       x2="44.066101"
-       y2="93.877998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grad3-95"
-       id="linearGradient3558"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14517639,0,0,0.14582698,21.433987,0.00419127)"
-       x1="44.0611"
-       y1="0.24690001"
-       x2="44.0611"
-       y2="93.877998" />
-  </defs>
-  <path
-     inkscape:connector-curvature="0"
-     id=" polygon551"
-     style="fill:url(#linearGradient3522);fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="m 3.2903804,12.996442 0,-7.6103201 4.2501291,6.4801761 0.08667,0 4.2942605,-6.546089 0,7.676233 3.334515,0 0,-12.99564029 -3.617168,0 L 7.627179,6.4808308 3.6176033,8.0171e-4 0,8.0171e-4 0,12.996442 l 3.2903804,0 z M 16.739638,8.0171e-4 l 3.355709,0 0,12.99564029 -3.355709,0 0,-12.99564029 z M 21.435537,-0.00684102 25.873355,6.4965795 21.435537,13 25.356954,13 27.825995,9.369058 30.311173,13 34.23259,13 34.24873,13 36.717771,9.369058 39.186811,13 l 0.01614,0 3.90528,0 0.01614,0 L 45.609549,9.369058 48.07859,13 52.000008,13 47.562181,6.4965795 52,-0.00684102 l -3.921418,0 -2.469041,3.63094182 -2.485178,-3.63094182 -0.01614,0 -3.90528,0 -0.01614,0 -2.469035,3.61480432 -2.469041,-3.61480432 -0.01614,0 -3.921417,0 -2.485175,3.63094182 -2.469041,-3.63094182 -3.921417,0 z M 41.155586,2.8494998 43.640764,6.4965795 41.155586,10.143659 38.670408,6.4965795 41.155586,2.8494998 z M 32.27995,2.8656374 34.74899,6.4965795 32.27995,10.127521 29.794772,6.4965795 32.27995,2.8656374 z" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="52" height="13"><defs><linearGradient x2="52.543499" gradientUnits="userSpaceOnUse" y2="93.877998" x1="52.543499" y1=".24690001" id="R"><stop stop-color="#1f1f20" offset="0%"/><stop stop-color="#1f1f20" offset=".00816632"/><stop stop-color="#58595b" offset="63.3333%"/><stop stop-color="#a5a8aa" offset="100%"/></linearGradient><linearGradient id="o" y1="-.1462" x1="74.992996" y2="88.766998" gradientUnits="userSpaceOnUse" x2="13.4863"><stop offset="47.8%" stop-color="#39b549"/><stop offset="100%" stop-color="#1a76bc"/></linearGradient><linearGradient id="p" y1="-.15009999" x1="74.997902" y2="88.767303" gradientUnits="userSpaceOnUse" x2="13.4883"><stop offset="0%" stop-color="#381f1f"/><stop offset=".17%" stop-color="#3a1f20"/><stop offset="3.76%" stop-color="#5b2825"/><stop offset="7.57%" stop-color="#7c2f28"/><stop offset="11.73%" stop-color="#9b2e28"/><stop offset="16.26%" stop-color="#b62c28"/><stop offset="21.29%" stop-color="#cc2626"/><stop offset="27.1%" stop-color="#dc2225"/><stop offset="34.38%" stop-color="#e81f25"/><stop offset="47.8%" stop-color="#ed1b26"/><stop offset="100%" stop-color="#f7921e"/></linearGradient><linearGradient id="q" y1="-.1471" x1="74.991898" y2="88.765999" gradientUnits="userSpaceOnUse" x2="13.4852"><stop offset="0%" stop-color="#120e1e"/><stop offset="2.31%" stop-color="#1b1426"/><stop offset="14.46%" stop-color="#442349"/><stop offset="25.52%" stop-color="#652866"/><stop offset="35.11%" stop-color="#7c287b"/><stop offset="42.86%" stop-color="#8b2589"/><stop offset="47.8%" stop-color="#91268f"/><stop offset="100%" stop-color="#ed1b26"/></linearGradient><linearGradient id="r" y1=".24690001" x1="44.0611" y2="93.877998" gradientUnits="userSpaceOnUse" x2="44.0611"><stop offset="0" stop-color="#58595b"/><stop offset="100%" stop-color="#a5a8aa"/></linearGradient><linearGradient id="s" y1=".24690001" x1="44.066101" y2="93.877998" gradientUnits="userSpaceOnUse" x2="44.066101"><stop offset="0" stop-color="#58595b"/><stop offset="100%" stop-color="#a5a8aa"/></linearGradient><linearGradient id="t" y1=".24690001" x1="44.066299" y2="93.877998" gradientUnits="userSpaceOnUse" x2="44.066299"><stop offset="0" stop-color="#58595b"/><stop offset="100%" stop-color="#a5a8aa"/></linearGradient><linearGradient id="u" y1=".24690001" x1="11.5568" y2="93.877998" gradientUnits="userSpaceOnUse" x2="11.5568"><stop offset="0" stop-color="#58595b"/><stop offset="100%" stop-color="#a5a8aa"/></linearGradient><linearGradient id="v" y1=".24690001" x1="52.543499" y2="93.877998" gradientUnits="userSpaceOnUse" x2="52.543499"><stop offset="0" stop-color="#58595b"/><stop offset="100%" stop-color="#a5a8aa"/></linearGradient><linearGradient id="a" y1="90.636597" x1=".34819999" y2="-2.3324001" gradientUnits="userSpaceOnUse" x2=".34819999"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="b" y1="90.636597" x1=".34799999" y2="-2.3324001" gradientUnits="userSpaceOnUse" x2=".34799999"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="c" y1="88.656097" x1=".31259999" y2="1.1722" gradientUnits="userSpaceOnUse" x2=".31259999"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="d" y1="88.656097" x1=".31209999" y2="1.1722" gradientUnits="userSpaceOnUse" x2=".31209999"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="e" y1="89.1185" x1="30.5499" y2="-3.2409" gradientUnits="userSpaceOnUse" x2="30.5499"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="f" y1="90.025703" x1="30.547501" y2=".1055" gradientUnits="userSpaceOnUse" x2="30.547501"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="g" y1="89.118202" x1="30.5495" y2="-3.2412" gradientUnits="userSpaceOnUse" x2="30.5495"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="h" y1="90.025398" x1="30.549101" y2=".1052" gradientUnits="userSpaceOnUse" x2="30.549101"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="i" y1="89.118202" x1="30.5494" y2="-3.2412" gradientUnits="userSpaceOnUse" x2="30.5494"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="j" y1="90.025398" x1="30.549" y2=".1052" gradientUnits="userSpaceOnUse" x2="30.549"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="k" y1="52.640499" x1=".29169801" y2="-37.8988" gradientUnits="userSpaceOnUse" x2=".29169801"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="l" y1="52.9165" x1=".2481" y2="-35.325699" gradientUnits="userSpaceOnUse" x2=".2481"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="m" y1="89.119904" x1="27.6264" y2=".1302" gradientUnits="userSpaceOnUse" x2="27.6264"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="n" y1="53.389" x1="29.726101" y2="-36.621201" gradientUnits="userSpaceOnUse" x2="29.726101"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="w" y1=".24690001" x1="44.0611" y2="93.877998" gradientUnits="userSpaceOnUse" x2="44.0611"><stop offset="0%" stop-color="#1f1f20"/><stop offset=".555556%" stop-color="#1f1f20"/><stop offset="63.3333%" stop-color="#58595b"/><stop offset="100%" stop-color="#a5a8aa"/></linearGradient><linearGradient id="x" y1=".24690001" x1="44.0611" y2="93.877998" gradientUnits="userSpaceOnUse" x2="44.0611"><stop offset="0%" stop-color="#1f1f20"/><stop offset=".555556%" stop-color="#1f1f20"/><stop offset="63.3333%" stop-color="#58595b"/><stop offset="100%" stop-color="#a5a8aa"/></linearGradient><linearGradient id="y" y1=".24690001" x1="44.0611" y2="93.877998" gradientUnits="userSpaceOnUse" x2="44.0611"><stop offset="0%" stop-color="#1f1f20"/><stop offset=".555556%" stop-color="#1f1f20"/><stop offset="63.3333%" stop-color="#58595b"/><stop offset="100%" stop-color="#a5a8aa"/></linearGradient><linearGradient id="z" y1=".24690001" x1="44.0611" y2="93.877998" gradientUnits="userSpaceOnUse" x2="44.0611"><stop offset="0%" stop-color="#1f1f20"/><stop offset=".555556%" stop-color="#1f1f20"/><stop offset="63.3333%" stop-color="#58595b"/><stop offset="100%" stop-color="#a5a8aa"/></linearGradient><linearGradient id="A" y1=".24690001" x1="44.066101" y2="93.877998" gradientUnits="userSpaceOnUse" x2="44.066101"><stop offset="0%" stop-color="#1f1f20"/><stop offset=".555556%" stop-color="#1f1f20"/><stop offset="63.3333%" stop-color="#58595b"/><stop offset="100%" stop-color="#a5a8aa"/></linearGradient><linearGradient id="B" y1=".24690001" x1="44.066299" y2="93.877998" gradientUnits="userSpaceOnUse" x2="44.066299"><stop offset="0%" stop-color="#1f1f20"/><stop offset=".555556%" stop-color="#1f1f20"/><stop offset="63.3333%" stop-color="#58595b"/><stop offset="100%" stop-color="#a5a8aa"/></linearGradient><linearGradient id="C" y1=".24690001" x1="11.5568" y2="93.877998" gradientUnits="userSpaceOnUse" x2="11.5568"><stop offset="0%" stop-color="#1f1f20"/><stop offset=".555556%" stop-color="#1f1f20"/><stop offset="63.3333%" stop-color="#58595b"/><stop offset="100%" stop-color="#a5a8aa"/></linearGradient><linearGradient id="D" y1=".24690001" x1="52.543499" y2="93.877998" gradientUnits="userSpaceOnUse" x2="52.543499"><stop offset="0%" stop-color="#1f1f20"/><stop offset=".555556%" stop-color="#1f1f20"/><stop offset="63.3333%" stop-color="#58595b"/><stop offset="100%" stop-color="#a5a8aa"/></linearGradient><linearGradient id="E" y1="90.636597" x1=".34819999" y2="-2.3324001" gradientUnits="userSpaceOnUse" x2=".34819999"><stop offset="0" stop-color="#a2a2a2"/><stop offset="100%"/></linearGradient><linearGradient id="F" y1="90.636597" x1=".34799999" y2="-2.3324001" gradientUnits="userSpaceOnUse" x2=".34799999"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="G" y1="88.656097" x1=".31259999" y2="1.1722" gradientUnits="userSpaceOnUse" x2=".31259999"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="H" y1="88.656097" x1=".31209999" y2="1.1722" gradientUnits="userSpaceOnUse" x2=".31209999"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="I" y1="89.1185" x1="30.5499" y2="-3.2409" gradientUnits="userSpaceOnUse" x2="30.5499"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="J" y1="90.025703" x1="30.547501" y2=".1055" gradientUnits="userSpaceOnUse" x2="30.547501"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="K" y1="89.118202" x1="30.5495" y2="-3.2412" gradientUnits="userSpaceOnUse" x2="30.5495"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="L" y1="90.025398" x1="30.549101" y2=".1052" gradientUnits="userSpaceOnUse" x2="30.549101"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="M" y1="52.640499" x1=".29169801" y2="-37.8988" gradientUnits="userSpaceOnUse" x2=".29169801"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="N" y1="52.9165" x1=".2481" y2="-35.325699" gradientUnits="userSpaceOnUse" x2=".2481"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="O" y1="89.119904" x1="27.6264" y2=".1302" gradientUnits="userSpaceOnUse" x2="27.6264"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="P" y1="53.389" x1="29.726101" y2="-36.621201" gradientUnits="userSpaceOnUse" x2="29.726101"><stop offset="0%" stop-color="#fff"/><stop offset="100%"/></linearGradient><linearGradient id="Q" y1=".24690001" x1="52.543499" y2="93.877998" gradientUnits="userSpaceOnUse" x2="52.543499"><stop offset="0%" stop-color="#1f1f20"/><stop offset=".555556%" stop-color="#1f1f20"/><stop offset="63.3333%" stop-color="#58595b"/><stop offset="100%" stop-color="#a5a8aa"/></linearGradient><linearGradient y2="18.166697" x2="52.543499" y1="-118.08931" x1="52.543499" gradientTransform="matrix(.14517 0 0 .14583 21.107566 10.225012)" gradientUnits="userSpaceOnUse" id="S" xlink:href="#R"/></defs><path d="M3.2903804 12.996442V5.3861219l4.2501291 6.4801761h.08667L11.92144 5.320209v7.676233h3.334515V.00080171h-3.617168L7.627179 6.4808308 3.6176033.00080171H0V12.996442h3.2903804zM16.739638.00080171h3.355709V12.996442h-3.355709V.00080171zm4.695899-.00764273l4.437818 6.50342052L21.435537 13h3.921417l2.469041-3.630942L30.311173 13h3.937557l2.469041-3.630942L39.186811 13h3.93756l2.485178-3.630942L48.07859 13h3.921418l-4.437827-6.5034205L52-.00684102h-3.921418L45.609541 3.6241008 43.124363-.00684102h-3.93756L36.717768 3.6079633 34.248727-.00684102H30.31117L27.825995 3.6241008 25.356954-.00684102h-3.921417zM41.155586 2.8494998l2.485178 3.6470797-2.485178 3.6470795-2.485178-3.6470795 2.485178-3.6470797zm-8.875636.0161376l2.46904 3.6309421-2.46904 3.6309415-2.485178-3.6309415 2.485178-3.6309421z" fill="url(#S)"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_loop.svg b/res/skins/Tango/buttons/btn_loop.svg
index 1ed52107e3ce..cd9b7acbde7d 100644
--- a/res/skins/Tango/buttons/btn_loop.svg
+++ b/res/skins/Tango/buttons/btn_loop.svg
@@ -1,123 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="30"
-   height="22"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_loop.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview4353"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="19.745031"
-     inkscape:cy="12.268713"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer2"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-center="false"
-     inkscape:object-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       type="xygrid"
-       id="grid2985" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-15,18"
-       id="guide3836" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15,12.64"
-       id="guide3838" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-2.2097087,4"
-       id="guide3924" />
-  </sodipodi:namedview>
-  <defs
-     id="defs4" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Layer"
-     style="opacity:0.34090911;display:none"
-     sodipodi:insensitive="true">
-    <g
-       transform="matrix(1.2438616,0,0,1.2438616,3.2292779,-1284.3648)"
-       id="layer1-3">
-      <g
-         id="g3989"
-         style="fill:#888888;fill-opacity:1">
-        <path
-           d="m 18.375,1038.9561 -1.09375,0.7812 -0.53125,0.375 c 0.174912,0.3826 0.25,0.8022 0.25,1.25 0,1.6569 -1.343146,3 -3,3 l -5.4375,0 0,-2.625 -1.5625,1.125 -1,0.6875 -0.75,0.5625 -1.75,1.25 1.75,1.25 0.75,0.5625 1,0.6875 1.5625,1.125 0,-2.625 5.4375,0 c 1.326074,0 2.593574,-0.531 3.53125,-1.4687 1.610902,-1.6109 1.890837,-4.0396 0.84375,-5.9375 z"
-           id="path3832-5"
-           style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 3.625,1043.7685 1.09375,-0.7813 0.53125,-0.375 c -0.174912,-0.3826 -0.25,-0.8023 -0.25,-1.25 0,-1.6569 1.343146,-3 3,-3 l 5.4375,0 0,2.625 1.5625,-1.125 1,-0.6875 0.75,-0.5625 1.75,-1.25 -1.75,-1.25 -0.75,-0.5625 -1,-0.6875 -1.5625,-1.125 0,2.625 -5.4375,0 c -1.326074,0 -2.593574,0.531 -3.53125,1.4688 -1.610902,1.6109 -1.890837,4.0396 -0.84375,5.9375 z"
-           id="path3832-5-7"
-           style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer#1"
-     style="display:inline">
-    <path
-       style="color:#000000;fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 5.094,7.187875 6.50025,8.000375 7.094,8.344125 7.09375,15 c -2.15e-5,0.571293 0.428698,1 1,1 l 9.9375,0 0,-3 3.46875,2 3.46875,2 -3.46875,2 -3.46875,2 0,-3 -9.9375,0 c -1.644706,0 -3,-1.355295 -3,-3 z"
-       id="path2995-3-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccsscccccccssc" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#888888;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 11.96875,1 0,3 9.9375,0 c 1.644703,0 3,1.3552971 3,3 l 0,7.812125 -1.40625,-0.8125 -0.59375,-0.34375 0,-6.655875 c 0,-0.5712971 -0.428703,-1 -1,-1 l -9.9375,0 0,3 L 8.5,7 5.03125,5 8.5,3 z"
-       id="path3832"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccsscccsscccccc" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="30" height="22"><g color="#000" fill="#888"><path style="marker:none" d="M5.094 7.187875l1.40625.8125.59375.34375L7.09375 15c-.0000215.571293.428698 1 1 1h9.9375v-3L21.5 15l3.46875 2L21.5 19l-3.46875 2v-3h-9.9375c-1.644706 0-3-1.355295-3-3z" overflow="visible"/><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M11.96875 1v3h9.9375c1.644703 0 3 1.3552971 3 3v7.812125l-1.40625-.8125-.59375-.34375V7c0-.5712971-.428703-1-1-1h-9.9375v3L8.5 7 5.03125 5 8.5 3z" font-weight="400" overflow="visible" font-family="Sans"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_loop_in.svg b/res/skins/Tango/buttons/btn_loop_in.svg
index d9f5746313ad..1dc4a0555cce 100644
--- a/res/skins/Tango/buttons/btn_loop_in.svg
+++ b/res/skins/Tango/buttons/btn_loop_in.svg
@@ -1,59 +1 @@
-<?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"
-   version="1.1"
-   viewBox="0 0 22 22"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_loop_in.svg">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="9.8333334"
-     inkscape:cx="-10.124514"
-     inkscape:cy="14.97112"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <path
-     d="m 7,10 6,0 0,9 2,0 0,-16 -8,0 z"
-     id="path4"
-     inkscape:connector-curvature="0"
-     style="fill:#888888;fill-opacity:1"
-     sodipodi:nodetypes="ccccccc" />
-  <path
-     d="M 0,-26 H 48 V 22 H 0 z"
-     id="path6"
-     inkscape:connector-curvature="0"
-     style="fill:none" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22"><path d="M15 3H8v16h7v-2h-5V5h5z" fill="#888"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_loop_in_active.svg b/res/skins/Tango/buttons/btn_loop_in_active.svg
index 06f36db313df..576eb38d0ba8 100644
--- a/res/skins/Tango/buttons/btn_loop_in_active.svg
+++ b/res/skins/Tango/buttons/btn_loop_in_active.svg
@@ -1,60 +1 @@
-<?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"
-   version="1.1"
-   viewBox="0 0 22 22"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_loop_in_active.svg">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="9.8333334"
-     inkscape:cx="-26.039768"
-     inkscape:cy="14.97112"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <path
-     d="m 7,10 6,0 0,9 2,0 0,-16 -8,0 z"
-     id="path4"
-     inkscape:connector-curvature="0"
-     style="fill:#d2d2d2;fill-opacity:1"
-     sodipodi:nodetypes="ccccccc" />
-  <path
-     d="M 0,-26 H 48 V 22 H 0 z"
-     id="path6"
-     inkscape:connector-curvature="0"
-     style="fill:none" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22"><path d="M15 3H8v16h7v-2h-5V5h5z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_loop_indicator_off.svg b/res/skins/Tango/buttons/btn_loop_indicator_off.svg
deleted file mode 100644
index 16742cb13d80..000000000000
--- a/res/skins/Tango/buttons/btn_loop_indicator_off.svg
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="48"
-   height="48"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_loop_indicator_off.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview9"
-     showgrid="false"
-     inkscape:zoom="5.3636364"
-     inkscape:cx="20.088748"
-     inkscape:cy="26.750827"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-page="true" />
-  <defs
-     id="defs4" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="matrix(2.1818181,0,0,2.1818181,0,-2248.0629)"
-     id="layer1"
-     style="fill:#888888;fill-opacity:1;stroke:none">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1;stroke:none">
-      <path
-         d="m 18.375,1038.9561 -1.09375,0.7812 -0.53125,0.375 c 0.174912,0.3826 0.25,0.8022 0.25,1.25 0,1.6569 -1.343146,3 -3,3 l -5.4375,0 0,-2.625 -1.5625,1.125 -1,0.6875 -0.75,0.5625 -1.75,1.25 1.75,1.25 0.75,0.5625 1,0.6875 1.5625,1.125 0,-2.625 5.4375,0 c 1.326074,0 2.593574,-0.531 3.53125,-1.4687 1.610902,-1.6109 1.890837,-4.0396 0.84375,-5.9375 z"
-         id="path3832-5"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3.625,1043.7685 1.09375,-0.7813 0.53125,-0.375 c -0.174912,-0.3826 -0.25,-0.8023 -0.25,-1.25 0,-1.6569 1.343146,-3 3,-3 l 5.4375,0 0,2.625 1.5625,-1.125 1,-0.6875 0.75,-0.5625 1.75,-1.25 -1.75,-1.25 -0.75,-0.5625 -1,-0.6875 -1.5625,-1.125 0,2.625 -5.4375,0 c -1.326074,0 -2.593574,0.531 -3.53125,1.4688 -1.610902,1.6109 -1.890837,4.0396 -0.84375,5.9375 z"
-         id="path3832-5-7"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_loop_indicator_on.svg b/res/skins/Tango/buttons/btn_loop_indicator_on.svg
index ca237eed1b06..cfc2e4d54f2b 100644
--- a/res/skins/Tango/buttons/btn_loop_indicator_on.svg
+++ b/res/skins/Tango/buttons/btn_loop_indicator_on.svg
@@ -1,74 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="48"
-   height="48"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_loop_indicator_on.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview4353"
-     showgrid="true"
-     inkscape:snap-page="true"
-     inkscape:zoom="8"
-     inkscape:cx="33.526524"
-     inkscape:cy="11.41443"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-center="false"
-     inkscape:object-nodes="true" />
-  <defs
-     id="defs4" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="matrix(2.1818182,0,0,2.1818182,0,-2248.063)"
-     id="layer1">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1">
-      <path
-         d="m 18.375,1038.9561 -1.09375,0.7812 -0.53125,0.375 c 0.174912,0.3826 0.25,0.8022 0.25,1.25 0,1.6569 -1.343146,3 -3,3 l -5.4375,0 0,-2.625 -1.5625,1.125 -1,0.6875 -0.75,0.5625 -1.75,1.25 1.75,1.25 0.75,0.5625 1,0.6875 1.5625,1.125 0,-2.625 5.4375,0 c 1.326074,0 2.593574,-0.531 3.53125,-1.4687 1.610902,-1.6109 1.890837,-4.0396 0.84375,-5.9375 z"
-         id="path3832-5"
-         style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3.625,1043.7685 1.09375,-0.7813 0.53125,-0.375 c -0.174912,-0.3826 -0.25,-0.8023 -0.25,-1.25 0,-1.6569 1.343146,-3 3,-3 l 5.4375,0 0,2.625 1.5625,-1.125 1,-0.6875 0.75,-0.5625 1.75,-1.25 -1.75,-1.25 -0.75,-0.5625 -1,-0.6875 -1.5625,-1.125 0,2.625 -5.4375,0 c -1.326074,0 -2.593574,0.531 -3.53125,1.4688 -1.610902,1.6109 -1.890837,4.0396 -0.84375,5.9375 z"
-         id="path3832-5-7"
-         style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><g color="#000" fill="#0f0f0f"><path d="M3.5845579993 8.7614862874l1.1946512531.6902429463.504408307.2920258618-.0002123825 5.6543640245c-.000018265.4853304166.3641917176.84952978.84952978.84952978h8.4422021887v-2.54858934l2.9468064244 1.69905956 2.9468064244 1.69905956-2.9468064244 1.69905956-2.9468064244 1.69905956v-2.54858934H6.132934957c-1.3972267264 0-2.54858934-1.1513634632-2.54858934-2.54858934z" style="marker:none" overflow="visible"/><path d="M9.4248628544 3.5047022v2.54858934h8.4422021887c1.3972241778 0 2.54858934 1.1513651622 2.54858934 2.54858934v6.6366328326l-1.1946512531-.6902429463-.5044083069-.2920258618V8.60188088c0-.4853338147-.3641959653-.84952978-.84952978-.84952978H9.4248628544v2.54858934L6.47805643 8.60188088 3.5312500056 6.90282132 6.47805643 5.20376176z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" font-weight="400" overflow="visible" font-family="Sans"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_loop_on.svg b/res/skins/Tango/buttons/btn_loop_on.svg
index 64cdfa4a5c4d..63d94e4e53dd 100644
--- a/res/skins/Tango/buttons/btn_loop_on.svg
+++ b/res/skins/Tango/buttons/btn_loop_on.svg
@@ -1,123 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="30"
-   height="22"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_loop.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview4353"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="19.745031"
-     inkscape:cy="12.268713"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer2"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-center="false"
-     inkscape:object-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       type="xygrid"
-       id="grid2985" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-15,18"
-       id="guide3836" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15,12.64"
-       id="guide3838" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-2.2097087,4"
-       id="guide3924" />
-  </sodipodi:namedview>
-  <defs
-     id="defs4" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Layer"
-     style="opacity:0.34090911;display:none"
-     sodipodi:insensitive="true">
-    <g
-       transform="matrix(1.2438616,0,0,1.2438616,3.2292779,-1284.3648)"
-       id="layer1-3">
-      <g
-         id="g3989"
-         style="fill:#888888;fill-opacity:1">
-        <path
-           d="m 18.375,1038.9561 -1.09375,0.7812 -0.53125,0.375 c 0.174912,0.3826 0.25,0.8022 0.25,1.25 0,1.6569 -1.343146,3 -3,3 l -5.4375,0 0,-2.625 -1.5625,1.125 -1,0.6875 -0.75,0.5625 -1.75,1.25 1.75,1.25 0.75,0.5625 1,0.6875 1.5625,1.125 0,-2.625 5.4375,0 c 1.326074,0 2.593574,-0.531 3.53125,-1.4687 1.610902,-1.6109 1.890837,-4.0396 0.84375,-5.9375 z"
-           id="path3832-5"
-           style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 3.625,1043.7685 1.09375,-0.7813 0.53125,-0.375 c -0.174912,-0.3826 -0.25,-0.8023 -0.25,-1.25 0,-1.6569 1.343146,-3 3,-3 l 5.4375,0 0,2.625 1.5625,-1.125 1,-0.6875 0.75,-0.5625 1.75,-1.25 -1.75,-1.25 -0.75,-0.5625 -1,-0.6875 -1.5625,-1.125 0,2.625 -5.4375,0 c -1.326074,0 -2.593574,0.531 -3.53125,1.4688 -1.610902,1.6109 -1.890837,4.0396 -0.84375,5.9375 z"
-           id="path3832-5-7"
-           style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer#1"
-     style="display:inline">
-    <path
-       style="color:#000000;fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 5.094,7.187875 6.50025,8.000375 7.094,8.344125 7.09375,15 c -2.15e-5,0.571293 0.428698,1 1,1 l 9.9375,0 0,-3 3.46875,2 3.46875,2 -3.46875,2 -3.46875,2 0,-3 -9.9375,0 c -1.644706,0 -3,-1.355295 -3,-3 z"
-       id="path2995-3-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccsscccccccssc" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#d2d2d2;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 11.96875,1 0,3 9.9375,0 c 1.644703,0 3,1.3552971 3,3 l 0,7.812125 -1.40625,-0.8125 -0.59375,-0.34375 0,-6.655875 c 0,-0.5712971 -0.428703,-1 -1,-1 l -9.9375,0 0,3 L 8.5,7 5.03125,5 8.5,3 z"
-       id="path3832"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccsscccsscccccc" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="30" height="22"><g color="#000" fill="#d2d2d2"><path style="marker:none" d="M5.094 7.187875l1.40625.8125.59375.34375L7.09375 15c-.0000215.571293.428698 1 1 1h9.9375v-3L21.5 15l3.46875 2L21.5 19l-3.46875 2v-3h-9.9375c-1.644706 0-3-1.355295-3-3z" overflow="visible"/><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M11.96875 1v3h9.9375c1.644703 0 3 1.3552971 3 3v7.812125l-1.40625-.8125-.59375-.34375V7c0-.5712971-.428703-1-1-1h-9.9375v3L8.5 7 5.03125 5 8.5 3z" font-weight="400" overflow="visible" font-family="Sans"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_loop_out.svg b/res/skins/Tango/buttons/btn_loop_out.svg
index 3e65fb33b463..810a4ae05bbe 100644
--- a/res/skins/Tango/buttons/btn_loop_out.svg
+++ b/res/skins/Tango/buttons/btn_loop_out.svg
@@ -1,60 +1 @@
-<?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"
-   version="1.1"
-   viewBox="0 0 22 22"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_loop_out.svg">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="9.8333334"
-     inkscape:cx="-10.124514"
-     inkscape:cy="14.97112"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M 15,10 9,10 9,19 7,19 7,3 15,3 z"
-     id="path4"
-     inkscape:connector-curvature="0"
-     style="fill:#888888;fill-opacity:1"
-     sodipodi:nodetypes="ccccccc" />
-  <path
-     d="M 0,-26 H 48 V 22 H 0 z"
-     id="path6"
-     inkscape:connector-curvature="0"
-     style="fill:none" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22"><path d="M7 3h7v16H7v-2h5V5H7z" fill="#888"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_loop_out_active.svg b/res/skins/Tango/buttons/btn_loop_out_active.svg
index 65bd5d32c164..f7c4878e3a55 100644
--- a/res/skins/Tango/buttons/btn_loop_out_active.svg
+++ b/res/skins/Tango/buttons/btn_loop_out_active.svg
@@ -1,60 +1 @@
-<?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"
-   version="1.1"
-   viewBox="0 0 22 22"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_loop_out_active.svg">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="9.8333334"
-     inkscape:cx="-26.039768"
-     inkscape:cy="9.6933388"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M 15,10 9,10 9,19 7,19 7,3 15,3 z"
-     id="path4"
-     inkscape:connector-curvature="0"
-     style="fill:#d2d2d2;fill-opacity:1"
-     sodipodi:nodetypes="ccccccc" />
-  <path
-     d="M 0,-26 H 48 V 22 H 0 z"
-     id="path6"
-     inkscape:connector-curvature="0"
-     style="fill:none" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22"><path d="M7 3h7v16H7v-2h5V5H7z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_master.svg b/res/skins/Tango/buttons/btn_master.svg
index 96eb5b4a5eea..2f07efefb46b 100644
--- a/res/skins/Tango/buttons/btn_master.svg
+++ b/res/skins/Tango/buttons/btn_master.svg
@@ -1,115 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_master.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="-28.688285"
-     inkscape:cy="17.649698"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="headphone"
-     style="display:none"
-     transform="translate(0,-24)">
-    <path
-       inkscape:connector-curvature="0"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#0f0f0f;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 28,7.71875 C 16.823882,7.71875 7.71875,16.8237 7.71875,28 c 0,1.2779 0.1165944,2.50725 0.34375,3.71875 l 0.3125,1.6875 c -0.6845218,0.420478 -1.0961337,1.22385 -0.9375,2.0625 l 2.40625,12.625 c 0.205406,1.085923 1.226577,1.799156 2.3125,1.59375 l 4.5,-0.84375 C 17.742173,48.638344 18.455406,47.585923 18.25,46.5 L 15.84375,33.875 c -0.205406,-1.085923 -1.226577,-1.799156 -2.3125,-1.59375 L 12.75,32.4375 12.46875,30.90625 12.40625,30.625 l 0.0625,0 c -0.147469,-0.8597 -0.25,-1.7157 -0.25,-2.625 0,-8.7438 7.037512,-15.78125 15.78125,-15.78125 8.743738,-10e-5 15.78125,7.03745 15.78125,15.78125 0,1.0064 -0.104443,1.95805 -0.28125,2.90625 L 43.21875,32.4375 42.375,32.28125 c -1.085942,-0.205406 -2.13834,0.507827 -2.34375,1.59375 l -2.375,12.625 c -0.20541,1.085923 0.476558,2.138344 1.5625,2.34375 l 4.5,0.84375 c 1.085942,0.205406 2.10709,-0.507827 2.3125,-1.59375 l 2.40625,-12.625 C 48.58978,34.663705 48.258808,33.870614 47.625,33.4375 l 0.25,-1.40625 -0.03125,0 0.0625,-0.3125 C 48.134161,30.50325 48.28125,29.2738 48.28125,28 48.28125,16.8237 39.176117,7.71875 28,7.71875 z"
-       id="path3925" />
-  </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;stroke:none"
-       d="m 17.04677,1025.4038 -7.2657371,7.2657 0,7.2658 7.2657371,7.2657 0.908217,0 0,-21.7972 -0.908217,0 z"
-       id="path2991"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect3783-5"
-       width="3.8254695"
-       height="7.2657199"
-       x="4.9991956"
-       y="1032.6694"
-       rx="0.99999988"
-       ry="0.99999988" />
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 21.212613,1027.3664 -0.50807,1.3598 c 3.135597,1.126 5.379566,4.1114 5.379566,7.636 0,3.5081 -2.22216,6.4828 -5.334737,7.6211 l 0.493128,1.3598 c 3.65926,-1.3437 6.27616,-4.8574 6.27616,-8.9809 0,-4.1353 -2.630324,-7.6607 -6.306047,-8.9958 z"
-       id="path4069"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       d="m 20.226359,1030.0711 -0.493127,1.3449 c 2.025679,0.7309 3.481775,2.6684 3.481775,4.9462 0,2.261 -1.434677,4.1882 -3.436946,4.9313 l 0.478184,1.3449 c 2.562972,-0.9378 4.393313,-3.3885 4.393313,-6.2762 0,-2.8996 -1.843697,-5.362 -4.423199,-6.2911 z"
-       id="path4069-6"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect4933"
-       width="1.9127347"
-       height="24.865553"
-       x="16.998619"
-       y="1023.9294"
-       rx="1.9999998"
-       ry="1.9999998" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="32"><g transform="matrix(1.06028 0 0 1.06028 -4.0836502 -1080.638836)" fill="#d2d2d2"><path d="M21.177616 1022.034l-8.173954 8.1739v8.174l8.173954 8.174h1.021744v-24.5219h-1.021744z"/><rect ry=".94314992" rx=".94314992" y="1030.2079" x="7.624095" height="8.1739349" width="4.3036532"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_master_vu_label.svg b/res/skins/Tango/buttons/btn_master_vu_label.svg
new file mode 100644
index 000000000000..02a83a6a032f
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_master_vu_label.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="20" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata14">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="g4" fill="#d2d2d2" transform="matrix(0.6118,0,0,0.6118,-1.2804245,-622.7769)">
+  <path id="path6" d="m21.178,1022-8.174,8.1739v8.174l8.174,8.174h1.0217v-24.522h-1.022z"/>
+  <rect id="rect8" rx="1.6345" ry="1.6345" height="8.1739" width="4.3037" y="1030.2" x="7.6241"/>
+ </g>
+</svg>
diff --git a/res/skins/Tango/buttons/btn_mic.svg b/res/skins/Tango/buttons/btn_mic.svg
index bb90f514c566..fc71315f0879 100644
--- a/res/skins/Tango/buttons/btn_mic.svg
+++ b/res/skins/Tango/buttons/btn_mic.svg
@@ -1,88 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="32"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_mic.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9999996"
-     inkscape:cx="-14.367699"
-     inkscape:cy="14.244237"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <g
-       id="g2989"
-       transform="translate(-88.571429,8.1332715)" />
-    <g
-       id="g3785"
-       transform="matrix(0.51582577,0.23602201,-0.23602201,0.51582577,242.67325,503.6991)"
-       style="fill:#d2d2d2;fill-opacity:1">
-      <path
-         inkscape:connector-curvature="0"
-         id="path2994"
-         d="m 18,1000.1524 c -4.336479,0 -7.84375,3.5072 -7.84375,7.8437 0,1.8238 0.613137,3.5109 1.65625,4.8438 l 12.375,0 c 1.043113,-1.3329 1.65625,-3.02 1.65625,-4.8438 0,-4.3365 -3.507271,-7.8437 -7.84375,-7.8437 z"
-         style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3024"
-         d="m 12.53125,1013.9247 2.21875,33.7813 6.5,0 2.21875,-33.7813 -10.9375,0 z M 18,1017.5497 c 0.829921,0 1.5,0.669 1.5,1.5 l 0,5.0313 c 0,0.831 -0.670079,1.5 -1.5,1.5 -0.829921,0 -1.5,-0.669 -1.5,-1.5 l 0,-5.0313 c 0,-0.831 0.670079,-1.5 1.5,-1.5 z"
-         style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="32"><g fill="#d2d2d2"><path d="M15.9001341057 3.4896780273c-2.2368676193-1.0235044899-4.873784777-.0421935003-5.8972942233 2.1946849513-.4304569418.9407630393-.5123778098 1.955726523-.2889069805 2.8894683187l6.3833439038 2.9207723738c.8526583035-.441346542 1.5671229017-1.1668823713 1.9975798436-2.1076454107 1.0235094463-2.2368784516.0421450756-4.8737757431-2.1947225436-5.897280233zM9.8286459977 9.3030399123L3.0000040984 27.2519788311l3.352867505 1.534143065 9.1176187536-16.9015912494-5.6418443593-2.5814907344zm1.9653423934 3.1606137835c.4280946389.1958796225.6158399303.6991204551.41970564 1.12777167l-1.187497539 2.5952741966c-.1961342902.4286512148-.699677031.6155852625-1.12777167.41970564-.4280946388-.1958796226-.6158399302-.6991204552-.41970564-1.12777167l1.187497539-2.5952741966c.1961342903-.4286512149.6996770311-.6155852626 1.12777167-.41970564z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_mic_off.svg b/res/skins/Tango/buttons/btn_mic_off.svg
index c6b1222a8364..4e7fc55d023a 100644
--- a/res/skins/Tango/buttons/btn_mic_off.svg
+++ b/res/skins/Tango/buttons/btn_mic_off.svg
@@ -1,78 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="32"
-   id="svg2989"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_mic_on.svg">
-  <defs
-     id="defs2991" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="11.730952"
-     inkscape:cy="12.380168"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2994">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1020.3622)">
-    <path
-       style="fill:none;stroke:#888888;stroke-width:2.15524745000000006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 13.473027,1027.6985 c 0,0 6.374971,7.7227 0,17.3273"
-       id="path4559"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#888888;stroke-width:2.15524745000000006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 9.0404538,1030.9222 c 0,0 4.0546682,4.9022 0,10.8801"
-       id="path4561"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#888888;stroke-width:2.15524745000000006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 4.9310893,1033.9109 c 0,0 1.8006732,2.2018 0,4.9027"
-       id="path4563"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="28" width="17.5"><g stroke-linejoin="round" stroke="#888" stroke-linecap="round" stroke-width="2.15524745" fill="none"><path d="M12.407618 6.4193s5.5781 6.7573 0 15.1613M8.5291155 9.24s3.5478355 4.2894 0 9.5201M4.9334216 11.8551s1.575589 1.9266 0 4.2899"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_mic_off_hover.svg b/res/skins/Tango/buttons/btn_mic_off_hover.svg
deleted file mode 100644
index 9a4b5e0bcfcb..000000000000
--- a/res/skins/Tango/buttons/btn_mic_off_hover.svg
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="28"
-   height="32"
-   id="svg2989"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_mic_off_hover.svg">
-  <defs
-     id="defs2991" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="10.741267"
-     inkscape:cy="9.6514737"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2994">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1020.3622)">
-    <path
-       sodipodi:type="arc"
-       style="fill:#888888;stroke:#f11717;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
-       id="path4517"
-       sodipodi:cx="6"
-       sodipodi:cy="16"
-       sodipodi:rx="17.494993"
-       sodipodi:ry="10.8125"
-       d="m 19.401942,22.950141 a 17.494993,10.8125 0 1 1 0,0 17.494993,10.8125 0 1 1 0,0 z"
-       transform="translate(0,1020.3622)" />
-    <g
-       id="g4565"
-       transform="matrix(1.2714269,0,0,1.2714269,-6.3202765,-281.29663)">
-      <path
-         transform="translate(0,1020.3622)"
-         inkscape:connector-curvature="0"
-         id="path4559"
-         d="m 19.041785,6.5150655 c 0,0 6.979285,8.4548035 0,18.9698695"
-         style="fill:none;stroke:#fe7800;stroke-width:2.35955358;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         transform="translate(0,1020.3622)"
-         inkscape:connector-curvature="0"
-         id="path4561"
-         d="m 14.189028,10.044343 c 0,0 4.439028,5.36697 0,11.911314"
-         style="fill:none;stroke:#fe7800;stroke-width:2.35955358;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         transform="translate(0,1020.3622)"
-         inkscape:connector-curvature="0"
-         id="path4563"
-         d="m 9.6901175,13.316278 c 0,0 1.9713675,2.410541 0,5.367444"
-         style="fill:none;stroke:#fe7800;stroke-width:2.35955358;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_mic_on.svg b/res/skins/Tango/buttons/btn_mic_on.svg
index 0802e097226b..9d7889888c28 100644
--- a/res/skins/Tango/buttons/btn_mic_on.svg
+++ b/res/skins/Tango/buttons/btn_mic_on.svg
@@ -1,78 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="32"
-   id="svg2989"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_mic_on.svg">
-  <defs
-     id="defs2991" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="11.730952"
-     inkscape:cy="12.380168"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2994">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1020.3622)">
-    <path
-       style="fill:none;stroke:#fe7800;stroke-width:2.15524745;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 13.473027,1027.6985 c 0,0 6.374971,7.7227 0,17.3273"
-       id="path4559"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#fe7800;stroke-width:2.15524745;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 9.0404538,1030.9222 c 0,0 4.0546682,4.9022 0,10.8801"
-       id="path4561"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#fe7800;stroke-width:2.15524745;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 4.9310893,1033.9109 c 0,0 1.8006732,2.2018 0,4.9027"
-       id="path4563"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="28" width="17.5"><g fill="#0f0f0f" color="#000"><path d="M12.441406 5.4526a.94301506.94301506 0 0 0-.710937 1.5586s1.240718 1.5358 1.886719 4.0742c.646 2.5384.675819 5.9962-1.96875 9.9805a.94800431.94800431 0 1 0 1.585937 1.039c2.93353-4.4197 2.963369-8.543 2.214844-11.4843s-2.269531-4.8125-2.269531-4.8125a.94301506.94301506 0 0 0-.738282-.3555zM8.3671875 8.2964a.94301506.94301506 0 0 0-.5195313 1.5312s.7569349.9097 1.1484376 2.4336c.391503 1.5239.421617 3.5655-1.2031251 5.9609a.944248854.944248854 0 0 0 1.5585938 1.0664c1.9230925-2.8353 1.9446745-5.5636 1.4492185-7.4921-.495455-1.9286-1.503906-3.1446-1.503906-3.1446a.94301506.94301506 0 0 0-.9296875-.3554zM4.8671875 10.894a.94301506.94301506 0 0 0-.6289063 1.5586s.2639721.3255.4101563.9023.1768791 1.307-.4648438 2.2696a.94301506.94301506 0 1 0 1.5585938 1.039c.9338661-1.4007.9859943-2.7961.7382812-3.7734-.247713-.9773-.7929687-1.6407-.7929687-1.6406a.94301506.94301506 0 0 0-.8203125-.3555z" style="block-progression:tb;text-indent:0;text-align:start;text-transform:none"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_micaux_off.svg b/res/skins/Tango/buttons/btn_micaux_off.svg
deleted file mode 100644
index 897085669781..000000000000
--- a/res/skins/Tango/buttons/btn_micaux_off.svg
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="32"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_micaux_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="13.336326"
-     inkscape:cy="10.432279"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <g
-       id="g2989"
-       transform="translate(-88.571429,8.1332715)" />
-    <g
-       id="g4836"
-       transform="matrix(1.0000073,0,0,1.2500037,-2.0000875,-259.09438)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4400"
-         d="M 3.9999999,1044.3622 20,1028.3622"
-         style="fill:none;stroke:#fe7800;stroke-width:1.78884554;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4402"
-         d="M 3.9999999,1028.3622 20,1044.3622"
-         style="fill:none;stroke:#fe7800;stroke-width:1.78884554;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_mixer_off.svg b/res/skins/Tango/buttons/btn_mixer_off.svg
index c626db2305d0..6d8360be6006 100644
--- a/res/skins/Tango/buttons/btn_mixer_off.svg
+++ b/res/skins/Tango/buttons/btn_mixer_off.svg
@@ -1,925 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_hotcues_4_8.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4574">
-      <stop
-         style="stop-color:#ffb401;stop-opacity:1;"
-         offset="0"
-         id="stop4576" />
-      <stop
-         style="stop-color:#c68c00;stop-opacity:1;"
-         offset="1"
-         id="stop4578" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3846">
-      <stop
-         style="stop-color:#b0b0b0;stop-opacity:1;"
-         offset="0"
-         id="stop3848" />
-      <stop
-         style="stop-color:#585858;stop-opacity:0;"
-         offset="1"
-         id="stop3850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4937">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3939">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941" />
-      <stop
-         id="stop5813"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5461">
-      <stop
-         id="stop5463"
-         offset="0"
-         style="stop-color:#b9dcff;stop-opacity:1;" />
-      <stop
-         id="stop5465"
-         offset="1"
-         style="stop-color:#0d0d0d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443" />
-      <stop
-         style="stop-color:#343434;stop-opacity:1;"
-         offset="1"
-         id="stop5445" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5483-8"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5441-4">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441-7">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-4" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4-6"
-       id="linearGradient5573-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692" />
-    <linearGradient
-       id="linearGradient5441-4-6">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2-5" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3945"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5024"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(54.522364,18.173742)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5032"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-57.471498)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5265"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5267"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5791"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5847"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3837"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3839"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3841"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937"
-       id="linearGradient4945"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48778"
-       y2="634.36542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient4947"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3"
-       id="radialGradient4947-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2" />
-      <stop
-         id="stop5813-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6"
-       id="linearGradient3142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-234.5901,-615.11102)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.257316,0,0,1,-252.5901,-618.29518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3935"
-       xlink:href="#linearGradient4937-6"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9"
-       xlink:href="#Grad0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5"
-         style="stop-color:#060606;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop12-7"
-         style="stop-color:#343434;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846"
-       id="linearGradient3852"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9-5"
-       xlink:href="#Grad0-8-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929" />
-      <stop
-         id="stop12-7-9"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846-6"
-       id="linearGradient3852-5"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3846-6">
-      <stop
-         id="stop3927"
-         offset="0"
-         style="stop-color:#7c7c7c;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3850-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898"
-       xlink:href="#Grad0-8-9"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-2"
-       id="radialGradient4006-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-1" />
-      <stop
-         id="stop5813-8-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9"
-       id="linearGradient4004-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898-0"
-       xlink:href="#Grad0-8-9-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9-5"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4-7"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929-9" />
-      <stop
-         id="stop12-7-9-6"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9-7"
-       id="linearGradient4004-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9-7">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0-9" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7-5" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4006-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5" />
-      <stop
-         id="stop5813-8-1"
-         offset="0.51428574"
-         style="stop-color:#e85708;stop-opacity:0.95686275;" />
-      <stop
-         style="stop-color:#e80808;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-6"
-       id="linearGradient4004-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-13.919877,95.08267)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7-5"
-       id="radialGradient4337-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7-5">
-      <stop
-         style="stop-color:#33aaee;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-0" />
-      <stop
-         id="stop5813-8-1-6"
-         offset="0.61061949"
-         style="stop-color:#4ebeff;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#2db2ff;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-4"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3939-3-7-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-05" />
-      <stop
-         id="stop5813-8-1-2"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-1" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-6"
-       xlink:href="#linearGradient4937-6-6-24"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-24">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-4" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130-8"
-       xlink:href="#linearGradient4937-6-6-2-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2-7">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2-4" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="621.81409"
-       x1="202.48863"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4865"
-       xlink:href="#linearGradient4574"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="40.214084"
-     inkscape:cy="11.321085"
-     inkscape:document-units="px"
-     inkscape:current-layer="svg2"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     fit-margin-top="2.7755576e-17"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-global="false">
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999767,15.965812"
-       id="guide3057" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="16,31.634722"
-       id="guide3884" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="14.30161,27.52903"
-       id="guide3888" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="17.7,29.915521"
-       id="guide3896" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="20.1875,24.625"
-       id="guide3898" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="17.70149,27.52903"
-       id="guide3900" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="11.8125,25.84375"
-       id="guide3182" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="20.1875,25.8125"
-       id="guide3184" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="16,31.634722"
-       id="guide3940" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="6.3497669,15.470406"
-       id="guide3942" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="25.649687,15.470406"
-       id="guide3944" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999727,6.3158122"
-       id="guide3946" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999767,25.615812"
-       id="guide3950" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <rect
-     style="fill:#888888;fill-opacity:1;stroke:none;display:inline"
-     id="rect3893"
-     width="1"
-     height="14"
-     x="13.5"
-     y="3"
-     rx="0.5"
-     ry="0.5" />
-  <rect
-     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="rect3895"
-     width="8"
-     height="2"
-     x="10"
-     y="6"
-     rx="1"
-     ry="1" />
-  <path
-     sodipodi:type="arc"
-     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="path3897"
-     sodipodi:cx="5.8336306"
-     sodipodi:cy="5.8370504"
-     sodipodi:rx="1.5909902"
-     sodipodi:ry="1.5909902"
-     d="m 7.4246207,5.8370504 a 1.5909902,1.5909902 0 1 1 -3.1819803,0 1.5909902,1.5909902 0 1 1 3.1819803,0 z"
-     transform="matrix(0.94280908,0,0,0.94280908,1.3024679e-7,-1.003224)" />
-  <path
-     sodipodi:type="arc"
-     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="path3897-5"
-     sodipodi:cx="5.8336306"
-     sodipodi:cy="5.8370504"
-     sodipodi:rx="1.5909902"
-     sodipodi:ry="1.5909902"
-     d="m 7.4246207,5.8370504 a 1.5909902,1.5909902 0 1 1 -3.1819803,0 1.5909902,1.5909902 0 1 1 3.1819803,0 z"
-     transform="matrix(0.94280908,0,0,0.94280908,1.3024679e-7,4.496776)" />
-  <path
-     sodipodi:type="arc"
-     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="path3897-5-6"
-     sodipodi:cx="5.8336306"
-     sodipodi:cy="5.8370504"
-     sodipodi:rx="1.5909902"
-     sodipodi:ry="1.5909902"
-     d="m 7.4246207,5.8370504 a 1.5909902,1.5909902 0 1 1 -3.1819803,0 1.5909902,1.5909902 0 1 1 3.1819803,0 z"
-     transform="matrix(0.94280908,0,0,0.94280908,1.3024679e-7,9.996776)" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><defs><linearGradient id="v"><stop offset="0" stop-color="#ffb401"/><stop offset="1" stop-color="#c68c00"/></linearGradient><linearGradient id="i"><stop offset="0" stop-color="#b0b0b0"/><stop offset="1" stop-color="#585858" stop-opacity="0"/></linearGradient><linearGradient id="e"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="d"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="f"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="g"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="h" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="j" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="k"><stop offset="0" stop-color="#7c7c7c" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="l"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="m"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="n" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="o"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="p"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".51428574" stop-color="#e85708" stop-opacity=".95686275"/><stop offset="1" stop-color="#e80808" stop-opacity="0"/></linearGradient><linearGradient id="q"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="r"><stop offset="0" stop-color="#3ae" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#4ebeff" stop-opacity=".8186813"/><stop offset="1" stop-color="#2db2ff" stop-opacity="0"/></linearGradient><linearGradient id="s"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient><linearGradient id="t"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="u"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient></defs><rect width="1" height="14" x="13.5" y="3" rx=".5" ry=".5" fill="#888"/><rect width="8" height="2" x="10" y="6" rx="1" ry="1" fill="#888"/><path d="M6.9999999418 4.5000001175a1.5000000068 1.5000000068 0 1 1-2.9999999193 0 1.5000000068 1.5000000068 0 1 1 2.9999999193 0zM6.9999999418 10.0000001175a1.5000000068 1.5000000068 0 1 1-2.9999999193 0 1.5000000068 1.5000000068 0 1 1 2.9999999193 0zM6.9999999418 15.5000001175a1.5000000068 1.5000000068 0 1 1-2.9999999193 0 1.5000000068 1.5000000068 0 1 1 2.9999999193 0z" fill="#888"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_mixer_on.svg b/res/skins/Tango/buttons/btn_mixer_on.svg
index e61180edb8d2..26d83320f5b5 100644
--- a/res/skins/Tango/buttons/btn_mixer_on.svg
+++ b/res/skins/Tango/buttons/btn_mixer_on.svg
@@ -1,924 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="_btn_mixer_off.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4574">
-      <stop
-         style="stop-color:#ffb401;stop-opacity:1;"
-         offset="0"
-         id="stop4576" />
-      <stop
-         style="stop-color:#c68c00;stop-opacity:1;"
-         offset="1"
-         id="stop4578" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3846">
-      <stop
-         style="stop-color:#b0b0b0;stop-opacity:1;"
-         offset="0"
-         id="stop3848" />
-      <stop
-         style="stop-color:#585858;stop-opacity:0;"
-         offset="1"
-         id="stop3850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4937">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3939">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941" />
-      <stop
-         id="stop5813"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5461">
-      <stop
-         id="stop5463"
-         offset="0"
-         style="stop-color:#b9dcff;stop-opacity:1;" />
-      <stop
-         id="stop5465"
-         offset="1"
-         style="stop-color:#0d0d0d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443" />
-      <stop
-         style="stop-color:#343434;stop-opacity:1;"
-         offset="1"
-         id="stop5445" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5483-8"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5441-4">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441-7">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-4" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4-6"
-       id="linearGradient5573-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692" />
-    <linearGradient
-       id="linearGradient5441-4-6">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2-5" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3945"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5024"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(54.522364,18.173742)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5032"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-57.471498)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5265"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5267"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5791"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5847"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3837"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3839"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3841"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937"
-       id="linearGradient4945"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48778"
-       y2="634.36542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient4947"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3"
-       id="radialGradient4947-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2" />
-      <stop
-         id="stop5813-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6"
-       id="linearGradient3142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-234.5901,-615.11102)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.257316,0,0,1,-252.5901,-618.29518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3935"
-       xlink:href="#linearGradient4937-6"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9"
-       xlink:href="#Grad0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5"
-         style="stop-color:#060606;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop12-7"
-         style="stop-color:#343434;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846"
-       id="linearGradient3852"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9-5"
-       xlink:href="#Grad0-8-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929" />
-      <stop
-         id="stop12-7-9"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846-6"
-       id="linearGradient3852-5"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3846-6">
-      <stop
-         id="stop3927"
-         offset="0"
-         style="stop-color:#7c7c7c;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3850-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898"
-       xlink:href="#Grad0-8-9"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-2"
-       id="radialGradient4006-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-1" />
-      <stop
-         id="stop5813-8-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9"
-       id="linearGradient4004-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898-0"
-       xlink:href="#Grad0-8-9-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9-5"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4-7"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929-9" />
-      <stop
-         id="stop12-7-9-6"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9-7"
-       id="linearGradient4004-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9-7">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0-9" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7-5" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4006-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5" />
-      <stop
-         id="stop5813-8-1"
-         offset="0.51428574"
-         style="stop-color:#e85708;stop-opacity:0.95686275;" />
-      <stop
-         style="stop-color:#e80808;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-6"
-       id="linearGradient4004-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-13.919877,95.08267)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7-5"
-       id="radialGradient4337-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7-5">
-      <stop
-         style="stop-color:#33aaee;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-0" />
-      <stop
-         id="stop5813-8-1-6"
-         offset="0.61061949"
-         style="stop-color:#4ebeff;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#2db2ff;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-4"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3939-3-7-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-05" />
-      <stop
-         id="stop5813-8-1-2"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-1" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-6"
-       xlink:href="#linearGradient4937-6-6-24"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-24">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-4" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130-8"
-       xlink:href="#linearGradient4937-6-6-2-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2-7">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2-4" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="621.81409"
-       x1="202.48863"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4865"
-       xlink:href="#linearGradient4574"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="10.673864"
-     inkscape:cy="8.6884948"
-     inkscape:document-units="px"
-     inkscape:current-layer="svg2"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     fit-margin-top="2.7755576e-17"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true">
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999767,15.965812"
-       id="guide3057" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="16,31.634722"
-       id="guide3884" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="14.30161,27.52903"
-       id="guide3888" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="17.7,29.915521"
-       id="guide3896" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="20.1875,24.625"
-       id="guide3898" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="17.70149,27.52903"
-       id="guide3900" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="11.8125,25.84375"
-       id="guide3182" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="20.1875,25.8125"
-       id="guide3184" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="16,31.634722"
-       id="guide3940" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="6.3497669,15.470406"
-       id="guide3942" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="25.649687,15.470406"
-       id="guide3944" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999727,6.3158122"
-       id="guide3946" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999767,25.615812"
-       id="guide3950" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <rect
-     style="fill:#d2d2d2;fill-opacity:1;stroke:none;display:inline"
-     id="rect3893"
-     width="1"
-     height="14"
-     x="13.5"
-     y="3"
-     rx="0.5"
-     ry="0.5" />
-  <rect
-     style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="rect3895"
-     width="8"
-     height="2"
-     x="10"
-     y="6"
-     rx="1"
-     ry="1" />
-  <path
-     sodipodi:type="arc"
-     style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="path3897"
-     sodipodi:cx="5.8336306"
-     sodipodi:cy="5.8370504"
-     sodipodi:rx="1.5909902"
-     sodipodi:ry="1.5909902"
-     d="m 7.4246207,5.8370504 a 1.5909902,1.5909902 0 1 1 -3.1819803,0 1.5909902,1.5909902 0 1 1 3.1819803,0 z"
-     transform="matrix(0.94280908,0,0,0.94280908,1.3024679e-7,-1.003224)" />
-  <path
-     sodipodi:type="arc"
-     style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="path3897-5"
-     sodipodi:cx="5.8336306"
-     sodipodi:cy="5.8370504"
-     sodipodi:rx="1.5909902"
-     sodipodi:ry="1.5909902"
-     d="m 7.4246207,5.8370504 a 1.5909902,1.5909902 0 1 1 -3.1819803,0 1.5909902,1.5909902 0 1 1 3.1819803,0 z"
-     transform="matrix(0.94280908,0,0,0.94280908,1.3024679e-7,4.496776)" />
-  <path
-     sodipodi:type="arc"
-     style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="path3897-5-6"
-     sodipodi:cx="5.8336306"
-     sodipodi:cy="5.8370504"
-     sodipodi:rx="1.5909902"
-     sodipodi:ry="1.5909902"
-     d="m 7.4246207,5.8370504 a 1.5909902,1.5909902 0 1 1 -3.1819803,0 1.5909902,1.5909902 0 1 1 3.1819803,0 z"
-     transform="matrix(0.94280908,0,0,0.94280908,1.3024679e-7,9.996776)" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><defs><linearGradient id="v"><stop offset="0" stop-color="#ffb401"/><stop offset="1" stop-color="#c68c00"/></linearGradient><linearGradient id="i"><stop offset="0" stop-color="#b0b0b0"/><stop offset="1" stop-color="#585858" stop-opacity="0"/></linearGradient><linearGradient id="e"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="d"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="f"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="g"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="h" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="j" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="k"><stop offset="0" stop-color="#7c7c7c" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="l"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="m"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="n" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="o"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="p"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".51428574" stop-color="#e85708" stop-opacity=".95686275"/><stop offset="1" stop-color="#e80808" stop-opacity="0"/></linearGradient><linearGradient id="q"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="r"><stop offset="0" stop-color="#3ae" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#4ebeff" stop-opacity=".8186813"/><stop offset="1" stop-color="#2db2ff" stop-opacity="0"/></linearGradient><linearGradient id="s"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient><linearGradient id="t"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="u"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient></defs><rect width="1" height="14" x="13.5" y="3" rx=".5" ry=".5" fill="#d2d2d2"/><rect width="8" height="2" x="10" y="6" rx="1" ry="1" fill="#d2d2d2"/><path d="M6.9999999418 4.5000001175a1.5000000068 1.5000000068 0 1 1-2.9999999193 0 1.5000000068 1.5000000068 0 1 1 2.9999999193 0zM6.9999999418 10.0000001175a1.5000000068 1.5000000068 0 1 1-2.9999999193 0 1.5000000068 1.5000000068 0 1 1 2.9999999193 0zM6.9999999418 15.5000001175a1.5000000068 1.5000000068 0 1 1-2.9999999193 0 1.5000000068 1.5000000068 0 1 1 2.9999999193 0z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_mixerbar_off.svg b/res/skins/Tango/buttons/btn_mixerbar_off.svg
index 0da54e3ea933..68203992e183 100644
--- a/res/skins/Tango/buttons/btn_mixerbar_off.svg
+++ b/res/skins/Tango/buttons/btn_mixerbar_off.svg
@@ -1,909 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_mixerbar_off.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4574">
-      <stop
-         style="stop-color:#ffb401;stop-opacity:1;"
-         offset="0"
-         id="stop4576" />
-      <stop
-         style="stop-color:#c68c00;stop-opacity:1;"
-         offset="1"
-         id="stop4578" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3846">
-      <stop
-         style="stop-color:#b0b0b0;stop-opacity:1;"
-         offset="0"
-         id="stop3848" />
-      <stop
-         style="stop-color:#585858;stop-opacity:0;"
-         offset="1"
-         id="stop3850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4937">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3939">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941" />
-      <stop
-         id="stop5813"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5461">
-      <stop
-         id="stop5463"
-         offset="0"
-         style="stop-color:#b9dcff;stop-opacity:1;" />
-      <stop
-         id="stop5465"
-         offset="1"
-         style="stop-color:#0d0d0d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443" />
-      <stop
-         style="stop-color:#343434;stop-opacity:1;"
-         offset="1"
-         id="stop5445" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5483-8"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5441-4">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441-7">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-4" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4-6"
-       id="linearGradient5573-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692" />
-    <linearGradient
-       id="linearGradient5441-4-6">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2-5" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3945"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5024"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(54.522364,18.173742)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5032"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-57.471498)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5265"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5267"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5791"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5847"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3837"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3839"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3841"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937"
-       id="linearGradient4945"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48778"
-       y2="634.36542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient4947"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3"
-       id="radialGradient4947-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2" />
-      <stop
-         id="stop5813-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6"
-       id="linearGradient3142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-234.5901,-615.11102)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.257316,0,0,1,-252.5901,-618.29518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3935"
-       xlink:href="#linearGradient4937-6"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9"
-       xlink:href="#Grad0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5"
-         style="stop-color:#060606;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop12-7"
-         style="stop-color:#343434;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846"
-       id="linearGradient3852"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9-5"
-       xlink:href="#Grad0-8-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929" />
-      <stop
-         id="stop12-7-9"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846-6"
-       id="linearGradient3852-5"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3846-6">
-      <stop
-         id="stop3927"
-         offset="0"
-         style="stop-color:#7c7c7c;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3850-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898"
-       xlink:href="#Grad0-8-9"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-2"
-       id="radialGradient4006-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-1" />
-      <stop
-         id="stop5813-8-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9"
-       id="linearGradient4004-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898-0"
-       xlink:href="#Grad0-8-9-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9-5"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4-7"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929-9" />
-      <stop
-         id="stop12-7-9-6"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9-7"
-       id="linearGradient4004-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9-7">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0-9" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7-5" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4006-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5" />
-      <stop
-         id="stop5813-8-1"
-         offset="0.51428574"
-         style="stop-color:#e85708;stop-opacity:0.95686275;" />
-      <stop
-         style="stop-color:#e80808;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-6"
-       id="linearGradient4004-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-13.919877,95.08267)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7-5"
-       id="radialGradient4337-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7-5">
-      <stop
-         style="stop-color:#33aaee;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-0" />
-      <stop
-         id="stop5813-8-1-6"
-         offset="0.61061949"
-         style="stop-color:#4ebeff;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#2db2ff;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-4"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3939-3-7-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-05" />
-      <stop
-         id="stop5813-8-1-2"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-1" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-6"
-       xlink:href="#linearGradient4937-6-6-24"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-24">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-4" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130-8"
-       xlink:href="#linearGradient4937-6-6-2-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2-7">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2-4" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="621.81409"
-       x1="202.48863"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4865"
-       xlink:href="#linearGradient4574"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="17.307611"
-     inkscape:cy="3.5232359"
-     inkscape:document-units="px"
-     inkscape:current-layer="svg2"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     fit-margin-top="2.7755576e-17"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-global="false">
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999767,15.965812"
-       id="guide3057" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="16,31.634722"
-       id="guide3884" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="14.30161,27.52903"
-       id="guide3888" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="17.7,29.915521"
-       id="guide3896" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="20.1875,24.625"
-       id="guide3898" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="17.70149,27.52903"
-       id="guide3900" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="11.8125,25.84375"
-       id="guide3182" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="20.1875,25.8125"
-       id="guide3184" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="16,31.634722"
-       id="guide3940" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="6.3497669,15.470406"
-       id="guide3942" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="25.649687,15.470406"
-       id="guide3944" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999727,6.3158122"
-       id="guide3946" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999767,25.615812"
-       id="guide3950" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <rect
-     style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="rect2989-0-5-7"
-     width="2"
-     height="14"
-     x="-17"
-     y="2.999999"
-     transform="scale(-1,1)" />
-  <rect
-     style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="rect2989-0-3-3-0"
-     width="2"
-     height="10"
-     x="-13"
-     y="7"
-     transform="scale(-1,1)" />
-  <rect
-     style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="rect2989-0-6-5-9"
-     width="2"
-     height="7"
-     x="-9"
-     y="9.999999"
-     transform="scale(-1,1)" />
-  <rect
-     style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="rect2989-0-3-7-6-3"
-     width="2"
-     height="4"
-     x="-5"
-     y="13"
-     transform="scale(-1,1)" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><defs><linearGradient id="v"><stop offset="0" stop-color="#ffb401"/><stop offset="1" stop-color="#c68c00"/></linearGradient><linearGradient id="i"><stop offset="0" stop-color="#b0b0b0"/><stop offset="1" stop-color="#585858" stop-opacity="0"/></linearGradient><linearGradient id="e"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="d"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="f"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="g"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="h" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="j" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="k"><stop offset="0" stop-color="#7c7c7c" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="l"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="m"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="n" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="o"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="p"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".51428574" stop-color="#e85708" stop-opacity=".95686275"/><stop offset="1" stop-color="#e80808" stop-opacity="0"/></linearGradient><linearGradient id="q"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="r"><stop offset="0" stop-color="#3ae" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#4ebeff" stop-opacity=".8186813"/><stop offset="1" stop-color="#2db2ff" stop-opacity="0"/></linearGradient><linearGradient id="s"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient><linearGradient id="t"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="u"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient></defs><path fill="#828282" d="M17 2.999999h-2v14h2zM13 7h-2v10h2zM9 9.999999H7v7h2zM5 13H3v4h2z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_mixerbar_on.svg b/res/skins/Tango/buttons/btn_mixerbar_on.svg
index ccd71ccbe04e..541561c9efa2 100644
--- a/res/skins/Tango/buttons/btn_mixerbar_on.svg
+++ b/res/skins/Tango/buttons/btn_mixerbar_on.svg
@@ -1,909 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_mixerbar_on.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4574">
-      <stop
-         style="stop-color:#ffb401;stop-opacity:1;"
-         offset="0"
-         id="stop4576" />
-      <stop
-         style="stop-color:#c68c00;stop-opacity:1;"
-         offset="1"
-         id="stop4578" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3846">
-      <stop
-         style="stop-color:#b0b0b0;stop-opacity:1;"
-         offset="0"
-         id="stop3848" />
-      <stop
-         style="stop-color:#585858;stop-opacity:0;"
-         offset="1"
-         id="stop3850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4937">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3939">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941" />
-      <stop
-         id="stop5813"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5461">
-      <stop
-         id="stop5463"
-         offset="0"
-         style="stop-color:#b9dcff;stop-opacity:1;" />
-      <stop
-         id="stop5465"
-         offset="1"
-         style="stop-color:#0d0d0d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443" />
-      <stop
-         style="stop-color:#343434;stop-opacity:1;"
-         offset="1"
-         id="stop5445" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5483-8"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5441-4">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441-7">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-4" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4-6"
-       id="linearGradient5573-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692" />
-    <linearGradient
-       id="linearGradient5441-4-6">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2-5" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3945"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5024"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(54.522364,18.173742)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5032"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-57.471498)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5265"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5267"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5791"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5847"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3837"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3839"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3841"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937"
-       id="linearGradient4945"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48778"
-       y2="634.36542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient4947"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3"
-       id="radialGradient4947-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2" />
-      <stop
-         id="stop5813-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6"
-       id="linearGradient3142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-234.5901,-615.11102)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.257316,0,0,1,-252.5901,-618.29518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3935"
-       xlink:href="#linearGradient4937-6"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9"
-       xlink:href="#Grad0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5"
-         style="stop-color:#060606;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop12-7"
-         style="stop-color:#343434;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846"
-       id="linearGradient3852"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9-5"
-       xlink:href="#Grad0-8-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929" />
-      <stop
-         id="stop12-7-9"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846-6"
-       id="linearGradient3852-5"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3846-6">
-      <stop
-         id="stop3927"
-         offset="0"
-         style="stop-color:#7c7c7c;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3850-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898"
-       xlink:href="#Grad0-8-9"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-2"
-       id="radialGradient4006-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-1" />
-      <stop
-         id="stop5813-8-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9"
-       id="linearGradient4004-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898-0"
-       xlink:href="#Grad0-8-9-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9-5"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4-7"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929-9" />
-      <stop
-         id="stop12-7-9-6"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9-7"
-       id="linearGradient4004-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9-7">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0-9" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7-5" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4006-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5" />
-      <stop
-         id="stop5813-8-1"
-         offset="0.51428574"
-         style="stop-color:#e85708;stop-opacity:0.95686275;" />
-      <stop
-         style="stop-color:#e80808;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-6"
-       id="linearGradient4004-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-13.919877,95.08267)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7-5"
-       id="radialGradient4337-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7-5">
-      <stop
-         style="stop-color:#33aaee;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-0" />
-      <stop
-         id="stop5813-8-1-6"
-         offset="0.61061949"
-         style="stop-color:#4ebeff;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#2db2ff;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-4"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3939-3-7-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-05" />
-      <stop
-         id="stop5813-8-1-2"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-1" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-6"
-       xlink:href="#linearGradient4937-6-6-24"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-24">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-4" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130-8"
-       xlink:href="#linearGradient4937-6-6-2-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2-7">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2-4" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="621.81409"
-       x1="202.48863"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4865"
-       xlink:href="#linearGradient4574"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="11.499152"
-     inkscape:cy="-7.0715669"
-     inkscape:document-units="px"
-     inkscape:current-layer="svg2"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     fit-margin-top="2.7755576e-17"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-global="false">
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999767,15.965812"
-       id="guide3057" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="16,31.634722"
-       id="guide3884" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="14.30161,27.52903"
-       id="guide3888" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="17.7,29.915521"
-       id="guide3896" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="20.1875,24.625"
-       id="guide3898" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="17.70149,27.52903"
-       id="guide3900" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="11.8125,25.84375"
-       id="guide3182" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="20.1875,25.8125"
-       id="guide3184" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="16,31.634722"
-       id="guide3940" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="6.3497669,15.470406"
-       id="guide3942" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="25.649687,15.470406"
-       id="guide3944" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999727,6.3158122"
-       id="guide3946" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999767,25.615812"
-       id="guide3950" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <rect
-     style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="rect2989-0-5-7"
-     width="2"
-     height="14"
-     x="-17"
-     y="2.999999"
-     transform="scale(-1,1)" />
-  <rect
-     style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="rect2989-0-3-3-0"
-     width="2"
-     height="10"
-     x="-13"
-     y="7"
-     transform="scale(-1,1)" />
-  <rect
-     style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="rect2989-0-6-5-9"
-     width="2"
-     height="7"
-     x="-9"
-     y="9.999999"
-     transform="scale(-1,1)" />
-  <rect
-     style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     id="rect2989-0-3-7-6-3"
-     width="2"
-     height="4"
-     x="-5"
-     y="13"
-     transform="scale(-1,1)" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><defs><linearGradient id="v"><stop offset="0" stop-color="#ffb401"/><stop offset="1" stop-color="#c68c00"/></linearGradient><linearGradient id="i"><stop offset="0" stop-color="#b0b0b0"/><stop offset="1" stop-color="#585858" stop-opacity="0"/></linearGradient><linearGradient id="e"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="d"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="f"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="g"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="h" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="j" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="k"><stop offset="0" stop-color="#7c7c7c" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="l"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="m"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="n" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="o"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="p"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".51428574" stop-color="#e85708" stop-opacity=".95686275"/><stop offset="1" stop-color="#e80808" stop-opacity="0"/></linearGradient><linearGradient id="q"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="r"><stop offset="0" stop-color="#3ae" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#4ebeff" stop-opacity=".8186813"/><stop offset="1" stop-color="#2db2ff" stop-opacity="0"/></linearGradient><linearGradient id="s"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient><linearGradient id="t"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="u"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient></defs><path fill="#d2d2d2" d="M17 2.999999h-2v14h2zM13 7h-2v10h2zM9 9.999999H7v7h2zM5 13H3v4h2z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_mixerbar_xfader_center.svg b/res/skins/Tango/buttons/btn_mixerbar_xfader_center.svg
new file mode 100644
index 000000000000..3ed0f59b0c98
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_mixerbar_xfader_center.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="12"><g fill="#888"><path fill="#b3b3b3" d="M8 11V1h2v10z"/><path d="M10 7h7v2h-7zM1 7h7v2H1z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_mixerbar_xfader_left.svg b/res/skins/Tango/buttons/btn_mixerbar_xfader_left.svg
new file mode 100644
index 000000000000..f8e5d8d9e215
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_mixerbar_xfader_left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="12"><g fill="#888"><path d="M10 7h7v2h-7zM3 7h5v2H3z"/><path fill="#fff" d="M3 1v10H1V1z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_mixerbar_xfader_right.svg b/res/skins/Tango/buttons/btn_mixerbar_xfader_right.svg
new file mode 100644
index 000000000000..faf844338f07
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_mixerbar_xfader_right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="12"><g fill="#888"><path d="M10 7h5v2h-5zM1 7h7v2H1z"/><path fill="#fff" d="M15 11V1h2v10z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_off.svg b/res/skins/Tango/buttons/btn_off.svg
deleted file mode 100644
index a9fbe002cd0e..000000000000
--- a/res/skins/Tango/buttons/btn_off.svg
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="8.5892516"
-     inkscape:cy="13.610806"
-     inkscape:document-units="px"
-     inkscape:current-layer="svg2"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 6.90625 3.75 C 4.5964224 4.8913778 3 7.247975 3 10 C 3 13.865994 6.1340068 17 10 17 C 13.865994 17 17 13.865994 17 10 C 17 7.247975 15.403578 4.8913778 13.09375 3.75 L 13.09375 5.53125 C 14.514996 6.5117142 15.4375 8.1419847 15.4375 10 C 15.4375 13.006884 13.006884 15.4375 10 15.4375 C 6.9931164 15.4375 4.5625 13.006884 4.5625 10 C 4.5625 8.1419847 5.4850044 6.5117142 6.90625 5.53125 L 6.90625 3.75 z "
-     id="path2983" />
-  <rect
-     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     id="rect3004"
-     width="1.5555555"
-     height="6"
-     x="9.2222214"
-     y="2" />
-</svg>
diff --git a/res/skins/Tango/buttons/btn_on.svg b/res/skins/Tango/buttons/btn_on.svg
deleted file mode 100644
index 93cfc73c34ad..000000000000
--- a/res/skins/Tango/buttons/btn_on.svg
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="-2.1615791"
-     inkscape:cy="8.7449675"
-     inkscape:document-units="px"
-     inkscape:current-layer="svg2"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 6.90625 3.75 C 4.5964224 4.8913778 3 7.247975 3 10 C 3 13.865994 6.1340068 17 10 17 C 13.865994 17 17 13.865994 17 10 C 17 7.247975 15.403578 4.8913778 13.09375 3.75 L 13.09375 5.53125 C 14.514996 6.5117142 15.4375 8.1419847 15.4375 10 C 15.4375 13.006884 13.006884 15.4375 10 15.4375 C 6.9931164 15.4375 4.5625 13.006884 4.5625 10 C 4.5625 8.1419847 5.4850044 6.5117142 6.90625 5.53125 L 6.90625 3.75 z "
-     id="path2983" />
-  <rect
-     style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     id="rect3004"
-     width="1.5555555"
-     height="6"
-     x="9.2222214"
-     y="2" />
-</svg>
diff --git a/res/skins/Tango/buttons/btn_paused.svg b/res/skins/Tango/buttons/btn_paused.svg
index d327bf498d3f..f178e8f4dad3 100644
--- a/res/skins/Tango/buttons/btn_paused.svg
+++ b/res/skins/Tango/buttons/btn_paused.svg
@@ -1,91 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg3769"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_paused.svg">
-  <defs
-     id="defs3771" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.678384"
-     inkscape:cx="-3.0615365"
-     inkscape:cy="10.381579"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata3774">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1028.3622)">
-    <path
-       sodipodi:type="star"
-       style="fill:#181818;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3018-3"
-       sodipodi:sides="3"
-       sodipodi:cx="3"
-       sodipodi:cy="5"
-       sodipodi:r1="15.119611"
-       sodipodi:r2="7.5598059"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 18.119611,5 -22.6794164,13.093967 0,-26.187934 z"
-       transform="matrix(0.53537147,0,0,0.53537147,9.8579777,1037.6854)"
-       inkscape:transform-center-x="-2.0236521"
-       inkscape:transform-center-y="3.215e-05" />
-    <path
-       sodipodi:type="star"
-       style="fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3018"
-       sodipodi:sides="3"
-       sodipodi:cx="3"
-       sodipodi:cy="5"
-       sodipodi:r1="15.119611"
-       sodipodi:r2="7.5598059"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 18.119611,5 -22.6794164,13.093967 0,-26.187934 z"
-       transform="matrix(0.45822504,0,0,0.45822504,10.089417,1038.0711)"
-       inkscape:transform-center-x="-1.7320461" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M19.5587004769 12.00005735L7.4167879801 19.010193711V4.989920989z" fill="#181818"/><path d="M18.3922764753 12.0000252L7.9999999882 18.0000087523V6.0000416477z" fill="#ccc"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_paused_hover.svg b/res/skins/Tango/buttons/btn_paused_hover.svg
index 34bd4f6e84c3..e390a1c5d915 100644
--- a/res/skins/Tango/buttons/btn_paused_hover.svg
+++ b/res/skins/Tango/buttons/btn_paused_hover.svg
@@ -1,91 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg3769"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_paused.svg">
-  <defs
-     id="defs3771" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.678384"
-     inkscape:cx="1.8787408"
-     inkscape:cy="10.381579"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata3774">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1028.3622)">
-    <path
-       sodipodi:type="star"
-       style="fill:#555555;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3018-3"
-       sodipodi:sides="3"
-       sodipodi:cx="3"
-       sodipodi:cy="5"
-       sodipodi:r1="15.119611"
-       sodipodi:r2="7.5598059"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 18.119611,5 -22.6794164,13.093967 0,-26.187934 z"
-       transform="matrix(0.53537147,0,0,0.53537147,9.8579777,1037.6854)"
-       inkscape:transform-center-x="-2.0236521"
-       inkscape:transform-center-y="3.215e-05" />
-    <path
-       sodipodi:type="star"
-       style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3018"
-       sodipodi:sides="3"
-       sodipodi:cx="3"
-       sodipodi:cy="5"
-       sodipodi:r1="15.119611"
-       sodipodi:r2="7.5598059"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 18.119611,5 -22.6794164,13.093967 0,-26.187934 z"
-       transform="matrix(0.45822504,0,0,0.45822504,10.089417,1038.0711)"
-       inkscape:transform-center-x="-1.7320461" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M18.3922764753 12.0000252L7.9999999882 18.0000087523V6.0000416477z" fill="#eee"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_pfl_off.svg b/res/skins/Tango/buttons/btn_pfl_off.svg
index 375013a6b5e2..623e11034b5a 100644
--- a/res/skins/Tango/buttons/btn_pfl_off.svg
+++ b/res/skins/Tango/buttons/btn_pfl_off.svg
@@ -1,74 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="56"
-   height="56"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_pfl_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="46.367197"
-     inkscape:cy="34.424414"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-996.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#777777;fill-opacity:1;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 28 7.71875 C 16.823882 7.71875 7.71875 16.8237 7.71875 28 C 7.71875 29.2779 7.8353444 30.50725 8.0625 31.71875 L 8.375 33.40625 C 7.6904782 33.826728 7.2788663 34.6301 7.4375 35.46875 L 9.84375 48.09375 C 10.049156 49.179673 11.070327 49.892906 12.15625 49.6875 L 16.65625 48.84375 C 17.742173 48.638344 18.455406 47.585923 18.25 46.5 L 15.84375 33.875 C 15.638344 32.789077 14.617173 32.075844 13.53125 32.28125 L 12.75 32.4375 L 12.46875 30.90625 L 12.40625 30.625 L 12.46875 30.625 C 12.321281 29.7653 12.21875 28.9093 12.21875 28 C 12.21875 19.2562 19.256262 12.21875 28 12.21875 C 36.743738 12.21865 43.78125 19.2562 43.78125 28 C 43.78125 29.0064 43.676807 29.95805 43.5 30.90625 L 43.21875 32.4375 L 42.375 32.28125 C 41.289058 32.075844 40.23666 32.789077 40.03125 33.875 L 37.65625 46.5 C 37.45084 47.585923 38.132808 48.638344 39.21875 48.84375 L 43.71875 49.6875 C 44.804692 49.892906 45.82584 49.179673 46.03125 48.09375 L 48.4375 35.46875 C 48.58978 34.663705 48.258808 33.870614 47.625 33.4375 L 47.875 32.03125 L 47.84375 32.03125 L 47.90625 31.71875 C 48.134161 30.50325 48.28125 29.2738 48.28125 28 C 48.28125 16.8237 39.176117 7.71875 28 7.71875 z "
-       transform="translate(0,996.3622)"
-       id="path3925" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><g fill="#777"><path d="M3.9015223 14.1646l2.9491752-.5499c.4668125-.087.912692.2187.9997305.6855l1.0212075 5.4771c.087039.4668-.2187.9126-.6855125.9997l-2.9491745.5498c-.4668122.087-.9126915-.2187-.9997303-.6855l-1.0212084-5.477c-.087038-.4668.2187003-.9127.6855125-.9997z"/><path d="M12 3.308c-4.789765 0-8.6919643 3.9021-8.6919643 8.692 0 .5476.049969 1.0745.1473214 1.5937.4145223 2.2572.8436176 4.5115 1.2857143 6.7634l1.8883931-.3616c-.4077185-2.3044-.958775-4.7542-1.2857145-6.8705-.063201-.3685-.107143-.7353-.107143-1.125 0-3.7474 3.0160765-6.7634 6.763393-6.7634 3.747317 0 6.763393 3.016 6.763393 6.7634 0 .3897-.04394.7565-.107143 1.125-.32694 2.1163-.877996 4.5661-1.285715 6.8705l1.888393.3616c.442097-2.2519.871192-4.5062 1.285715-6.7634.09735-.5192.147321-1.0461.147321-1.5937 0-4.7899-3.902199-8.692-8.691964-8.692z" style="block-progression:tb;text-indent:0;text-align:start;text-transform:none" color="#000"/><path d="M20.098478 14.1646l-2.949176-.5499c-.466812-.087-.912692.2187-.99973.6855l-1.021207 5.4771c-.08704.4668.2187.9127.685512.9997l2.949175.5499c.466812.087.912691-.2187.99973-.6856l1.021208-5.4771c.08704-.4667-.2187-.9126-.685512-.9996z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_pfl_on.svg b/res/skins/Tango/buttons/btn_pfl_on.svg
index 1bbb14c201ef..9a89d696ee21 100644
--- a/res/skins/Tango/buttons/btn_pfl_on.svg
+++ b/res/skins/Tango/buttons/btn_pfl_on.svg
@@ -1,75 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="56"
-   height="56"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_pfl_on.svg BAK">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="23.267458"
-     inkscape:cy="33.880886"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3923"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-996.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <path
-       inkscape:connector-curvature="0"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 28,1004.0809 c -11.176118,0 -20.28125,9.105 -20.28125,20.2813 0,1.2779 0.1165944,2.5072 0.34375,3.7187 l 0.3125,1.6875 c -0.6845218,0.4205 -1.0961337,1.2238 -0.9375,2.0625 l 2.40625,12.625 c 0.205406,1.0859 1.226577,1.7992 2.3125,1.5938 l 4.5,-0.8438 c 1.085923,-0.2054 1.799156,-1.2578 1.59375,-2.3437 l -2.40625,-12.625 c -0.205406,-1.086 -1.226004,-1.7961 -2.3125,-1.5938 l -0.734375,0.1368 c 0,0 -0.0065,0 -0.328125,-1.793 -0.153931,-0.8586 -0.25,-1.7157 -0.25,-2.625 0,-8.7438 7.037512,-15.7813 15.78125,-15.7813 8.743738,-1e-4 15.78125,7.0375 15.78125,15.7813 0,1.0064 -0.104443,1.958 -0.28125,2.9062 l -0.28125,1.5313 -0.84375,-0.1563 c -1.085942,-0.2054 -2.13834,0.5078 -2.34375,1.5938 l -2.375,12.625 c -0.20541,1.0859 0.476558,2.1383 1.5625,2.3437 l 4.5,0.8438 c 1.085942,0.2054 2.10709,-0.5079 2.3125,-1.5938 l 2.40625,-12.625 c 0.15228,-0.805 -0.209942,-1.5982 -0.84375,-2.0312 0.3125,-1.7188 -0.0039,-7e-4 0.3125,-1.7188 0.223993,-1.2162 0.375,-2.4449 0.375,-3.7187 0,-11.1763 -9.105133,-20.2813 -20.28125,-20.2813 z"
-       id="path3925-9"
-       sodipodi:nodetypes="ssccccccccscsscsccccccccccsss" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><g fill="#d2d2d2"><path d="M3.9015223 14.1646l2.9491752-.5498c.4668125-.087.912692.2187.9997305.6855l1.0212075 5.477c.087039.4668-.2187.9127-.6855125.9997l-2.9491745.5499c-.4668122.087-.9126915-.2187-.9997303-.6855l-1.0212084-5.4771c-.087038-.4668.2187003-.9126.6855125-.9997z"/><path style="block-progression:tb;text-indent:0;text-align:start;text-transform:none" d="M12 3.3081c-4.789765 0-8.6919643 3.9021-8.6919643 8.6919 0 .5477.049969 1.0746.1473214 1.5938.4145223 2.2572.8436176 4.5114 1.2857143 6.7634l1.8883931-.3616c-.4077185-2.3044-.958775-4.7542-1.2857145-6.8706-.063201-.3684-.107143-.7353-.107143-1.125 0-3.7473 3.0160765-6.7634 6.763393-6.7634 3.747317 0 6.763393 3.0161 6.763393 6.7634 0 .3897-.04394.7566-.107143 1.125-.32694 2.1164-.877996 4.5662-1.285715 6.8706l1.888393.3616c.442097-2.252.871192-4.5062 1.285715-6.7634.09735-.5192.147321-1.0461.147321-1.5938 0-4.7898-3.902199-8.6919-8.691964-8.6919z" color="#000"/><path d="M20.098478 14.1647l-2.949176-.5499c-.466812-.087-.912692.2187-.99973.6855l-1.021207 5.477c-.08704.4669.2187.9127.685512.9998l2.949175.5498c.466812.087.912691-.2187.99973-.6855l1.021208-5.4772c.08704-.4667-.2187-.9126-.685512-.9995z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_playing.svg b/res/skins/Tango/buttons/btn_playing.svg
index 0ebd1b142763..73b915f04c33 100644
--- a/res/skins/Tango/buttons/btn_playing.svg
+++ b/res/skins/Tango/buttons/btn_playing.svg
@@ -1,70 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg3769"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_playing.svg">
-  <defs
-     id="defs3771" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="0.22152954"
-     inkscape:cy="12.046302"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata3774">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1028.3622)">
-    <rect
-       style="opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect4333"
-       width="3"
-       height="12"
-       x="13"
-       y="1034.3622" />
-    <rect
-       style="opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect4333-3"
-       width="3"
-       height="12"
-       x="7"
-       y="1034.3622" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><g fill="#ccc"><path d="M13 6h3v12h-3zM7 6h3v12H7z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_playing_hover.svg b/res/skins/Tango/buttons/btn_playing_hover.svg
new file mode 100644
index 000000000000..7c831b9b71f2
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_playing_hover.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><g fill="#eee"><path d="M13 6h3v12h-3zM7 6h3v12H7z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_quantize_hidden.svg b/res/skins/Tango/buttons/btn_quantize_hidden.svg
new file mode 100644
index 000000000000..8ea22f94d7b6
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_quantize_hidden.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15"><path d="M4 3v1.8h5.1468752c1.4911668 0 2.6999998 1.208832 2.6999998 2.7 0 1.491168-1.208833 2.7-2.6999998 2.7H4V12h5.259375c2.48528 0 4.5-2.01472 4.5-4.5 0-2.485281-2.01472-4.5-4.5-4.5H4z" fill="#888"/><path fill="#fff" d="M2.2093756 10.199999h1.7999986v1.7999986H2.2093756zM2.200001 3h1.7999986v1.7999986H2.200001z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_quantize_off.svg b/res/skins/Tango/buttons/btn_quantize_off.svg
index 45a12bcda8aa..5f5f26c51ef7 100644
--- a/res/skins/Tango/buttons/btn_quantize_off.svg
+++ b/res/skins/Tango/buttons/btn_quantize_off.svg
@@ -1,87 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_quantize_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-9.1583291"
-     inkscape:cy="19.165423"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer3"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox-edge-midpoints="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="22x22">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 6.9999987,6.0000001 0,1.9999999 5.7187503,0 c 1.656853,0 3,1.343146 3,3 0,1.656854 -1.343147,3 -3,3 l -5.7187503,0 0,2 5.8437503,0 c 2.761423,0 5,-2.238577 5,-5 0,-2.761424 -2.238577,-4.9999998 -5,-4.9999999 l -5.8437503,0 z"
-       id="path2992-3"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect2998-3-7-67"
-       width="1.9999986"
-       height="1.9999986"
-       x="5.010416"
-       y="13.999999" />
-    <rect
-       style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect2998-3-7-6"
-       width="1.9999986"
-       height="1.9999986"
-       x="5"
-       y="6" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22"><path d="M6.9999987 6.0000001V8h5.7187503c1.656853 0 3 1.343146 3 3s-1.343147 3-3 3H6.9999987v2h5.8437503c2.761423 0 5-2.238577 5-5 0-2.761424-2.238577-4.9999998-5-4.9999999H6.9999987z" fill="#888"/><path fill="#eee" d="M5.010416 13.999999h1.9999986v1.9999986H5.010416zM5 6h1.9999986v1.9999986H5z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_quantize_on.svg b/res/skins/Tango/buttons/btn_quantize_on.svg
index 1421e50110fd..45f5a2b87f12 100644
--- a/res/skins/Tango/buttons/btn_quantize_on.svg
+++ b/res/skins/Tango/buttons/btn_quantize_on.svg
@@ -1,87 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_quantize_on.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="10.335627"
-     inkscape:cy="12.611636"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer3"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox-edge-midpoints="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="22x22">
-    <path
-       style="fill:#dc0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 6.9999986,6 0,2 5.7187504,0 c 1.656853,0 3,1.3431463 3,3 0,1.656854 -1.343147,3 -3,3 l -5.7187504,0 0,2 5.8437504,0 c 2.761423,0 5,-2.238577 5,-5 0,-2.761424 -2.238577,-4.9999999 -5,-5 L 6.9999986,6 z"
-       id="path2992"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect2998-3-7"
-       width="1.9999986"
-       height="1.9999986"
-       x="5.010416"
-       y="13.999999" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect2998-3-7-6"
-       width="1.9999986"
-       height="1.9999986"
-       x="5"
-       y="6" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22"><path d="M6.9999986 6v2h5.7187504c1.656853 0 3 1.3431463 3 3 0 1.656854-1.343147 3-3 3H6.9999986v2h5.8437504c2.761423 0 5-2.238577 5-5 0-2.761424-2.238577-4.9999999-5-5H6.9999986z" fill="#dc0000"/><path fill="#fff" d="M5.010416 13.999999h1.9999986v1.9999986H5.010416zM5 6h1.9999986v1.9999986H5z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_quantize_visible.svg b/res/skins/Tango/buttons/btn_quantize_visible.svg
index ce817394162c..14e2a5abe958 100644
--- a/res/skins/Tango/buttons/btn_quantize_visible.svg
+++ b/res/skins/Tango/buttons/btn_quantize_visible.svg
@@ -1,87 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_quantize_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-18.939579"
-     inkscape:cy="19.165423"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer3"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox-edge-midpoints="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="22x22">
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 6.9999987,6.0000001 0,1.9999999 5.7187503,0 c 1.656853,0 3,1.343146 3,3 0,1.656854 -1.343147,3 -3,3 l -5.7187503,0 0,2 5.8437503,0 c 2.761423,0 5,-2.238577 5,-5 0,-2.761424 -2.238577,-4.9999998 -5,-4.9999999 l -5.8437503,0 z"
-       id="path2992-3"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect2998-3-7-67"
-       width="1.9999986"
-       height="1.9999986"
-       x="5.010416"
-       y="13.999999" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect2998-3-7-6"
-       width="1.9999986"
-       height="1.9999986"
-       x="5"
-       y="6" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15"><path d="M4 3v1.8h5.1468752c1.4911668 0 2.6999998 1.208832 2.6999998 2.7 0 1.491168-1.208833 2.7-2.6999998 2.7H4V12h5.259375c2.48528 0 4.5-2.01472 4.5-4.5 0-2.485281-2.01472-4.5-4.5-4.5H4z" fill="#dc0000"/><path fill="#fff" d="M2.2093756 10.199999h1.7999986v1.7999986H2.2093756zM2.200001 3h1.7999986v1.7999986H2.200001z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_rec_dot.svg b/res/skins/Tango/buttons/btn_rec_dot.svg
new file mode 100644
index 000000000000..503eec5f797f
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_rec_dot.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10"><path d="M9 5.0000000025a4 3.999999985 NaN 1 1-8 0 4 3.999999985 NaN 1 1 8 0z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_reloop_off.svg b/res/skins/Tango/buttons/btn_reloop_off.svg
index 01410c6995bc..9f7f64056c0d 100644
--- a/res/skins/Tango/buttons/btn_reloop_off.svg
+++ b/res/skins/Tango/buttons/btn_reloop_off.svg
@@ -1,141 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="30"
-   height="22"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_reloop_on.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview4353"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:zoom="8"
-     inkscape:cx="33.829703"
-     inkscape:cy="-1.0333201"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer2"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-center="false"
-     inkscape:object-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       type="xygrid"
-       id="grid2985" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-15,18"
-       id="guide3836" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15,12.64"
-       id="guide3838" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-2.2097087,4"
-       id="guide3924" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="7,12.9375"
-       id="guide3837" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23,8.75"
-       id="guide3839" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="11,9"
-       id="guide3918" />
-  </sodipodi:namedview>
-  <defs
-     id="defs4" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Layer"
-     style="opacity:0.34090911;display:none"
-     sodipodi:insensitive="true">
-    <g
-       transform="matrix(1.2438616,0,0,1.2438616,3.2292779,-1284.3648)"
-       id="layer1-3">
-      <g
-         id="g3989"
-         style="fill:#888888;fill-opacity:1">
-        <path
-           d="m 18.375,1038.9561 -1.09375,0.7812 -0.53125,0.375 c 0.174912,0.3826 0.25,0.8022 0.25,1.25 0,1.6569 -1.343146,3 -3,3 l -5.4375,0 0,-2.625 -1.5625,1.125 -1,0.6875 -0.75,0.5625 -1.75,1.25 1.75,1.25 0.75,0.5625 1,0.6875 1.5625,1.125 0,-2.625 5.4375,0 c 1.326074,0 2.593574,-0.531 3.53125,-1.4687 1.610902,-1.6109 1.890837,-4.0396 0.84375,-5.9375 z"
-           id="path3832-5"
-           style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 3.625,1043.7685 1.09375,-0.7813 0.53125,-0.375 c -0.174912,-0.3826 -0.25,-0.8023 -0.25,-1.25 0,-1.6569 1.343146,-3 3,-3 l 5.4375,0 0,2.625 1.5625,-1.125 1,-0.6875 0.75,-0.5625 1.75,-1.25 -1.75,-1.25 -0.75,-0.5625 -1,-0.6875 -1.5625,-1.125 0,2.625 -5.4375,0 c -1.326074,0 -2.593574,0.531 -3.53125,1.4688 -1.610902,1.6109 -1.890837,4.0396 -0.84375,5.9375 z"
-           id="path3832-5-7"
-           style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer#1"
-     style="display:inline">
-    <path
-       style="color:#000000;fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 10,4.999875 c -1.644703,-1.028e-4 -3,1.3552971 -3,3 l 0,7.00025 c 0,1.644705 1.355294,3.000023 3,3 L 11.00025,18 l 0,3 3.46875,-2 3.46875,-2 -3.46875,-2 -3.46875,-2 0,3 L 10,16.000125 c -0.571302,7.1e-5 -1.0000215,-0.428707 -1,-1 l 0,-7.00025 c 0,-0.5712971 0.428703,-0.9999817 1,-1 L 12,7 12,5 z"
-       id="path3006"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sssccccccccscscccs" />
-    <path
-       style="color:#000000;fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 14,1.99975 2,0 0,8 -2,0 z"
-       id="rect3980"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="color:#000000;fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 20,4.999875 c 1.644703,-1.028e-4 3,1.3552971 3,3 l 0,7.00025 c 0,1.644705 -1.355294,3.000023 -3,3 l -1.031,0 0,-2 1.031,0 c 0.571302,0 1.000022,-0.428707 1,-1 l 0,-7.00025 c 0,-0.5712971 -0.428703,-0.9999817 -1,-1 L 18.00025,7 l 0,-2 z"
-       id="path3029"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssscccscscccs" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="30" height="22"><g color="#000" fill="#888"><path style="marker:none" d="M10 4.999875c-1.644703-.0001028-3 1.3552971-3 3v7.00025c0 1.644705 1.355294 3.000023 3 3L11.00025 18v3l3.46875-2 3.46875-2-3.46875-2-3.46875-2v3L10 16.000125c-.571302.000071-1.0000215-.428707-1-1v-7.00025c0-.5712971.428703-.9999817 1-1L12 7V5z" overflow="visible"/><path style="marker:none" d="M14 1.99975h2v8h-2zM20 4.999875c1.644703-.0001028 3 1.3552971 3 3v7.00025c0 1.644705-1.355294 3.000023-3 3h-1.031v-2H20c.571302 0 1.000022-.428707 1-1v-7.00025c0-.5712971-.428703-.9999817-1-1L18.00025 7V5z" overflow="visible"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_reloop_on.svg b/res/skins/Tango/buttons/btn_reloop_on.svg
index 8e5eaef50979..9bc83a40baa8 100644
--- a/res/skins/Tango/buttons/btn_reloop_on.svg
+++ b/res/skins/Tango/buttons/btn_reloop_on.svg
@@ -1,141 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="30"
-   height="22"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_reloop_on.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview4353"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:zoom="8"
-     inkscape:cx="33.829703"
-     inkscape:cy="-1.0333201"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer2"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-center="false"
-     inkscape:object-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       type="xygrid"
-       id="grid2985" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-15,18"
-       id="guide3836" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="15,12.64"
-       id="guide3838" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-2.2097087,4"
-       id="guide3924" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="7,12.9375"
-       id="guide3837" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="23,8.75"
-       id="guide3839" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="11,9"
-       id="guide3918" />
-  </sodipodi:namedview>
-  <defs
-     id="defs4" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Layer"
-     style="opacity:0.34090911;display:none"
-     sodipodi:insensitive="true">
-    <g
-       transform="matrix(1.2438616,0,0,1.2438616,3.2292779,-1284.3648)"
-       id="layer1-3">
-      <g
-         id="g3989"
-         style="fill:#888888;fill-opacity:1">
-        <path
-           d="m 18.375,1038.9561 -1.09375,0.7812 -0.53125,0.375 c 0.174912,0.3826 0.25,0.8022 0.25,1.25 0,1.6569 -1.343146,3 -3,3 l -5.4375,0 0,-2.625 -1.5625,1.125 -1,0.6875 -0.75,0.5625 -1.75,1.25 1.75,1.25 0.75,0.5625 1,0.6875 1.5625,1.125 0,-2.625 5.4375,0 c 1.326074,0 2.593574,-0.531 3.53125,-1.4687 1.610902,-1.6109 1.890837,-4.0396 0.84375,-5.9375 z"
-           id="path3832-5"
-           style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 3.625,1043.7685 1.09375,-0.7813 0.53125,-0.375 c -0.174912,-0.3826 -0.25,-0.8023 -0.25,-1.25 0,-1.6569 1.343146,-3 3,-3 l 5.4375,0 0,2.625 1.5625,-1.125 1,-0.6875 0.75,-0.5625 1.75,-1.25 -1.75,-1.25 -0.75,-0.5625 -1,-0.6875 -1.5625,-1.125 0,2.625 -5.4375,0 c -1.326074,0 -2.593574,0.531 -3.53125,1.4688 -1.610902,1.6109 -1.890837,4.0396 -0.84375,5.9375 z"
-           id="path3832-5-7"
-           style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer#1"
-     style="display:inline">
-    <path
-       style="color:#000000;fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 10,4.999875 c -1.644703,-1.028e-4 -3,1.3552971 -3,3 l 0,7.00025 c 0,1.644705 1.355294,3.000023 3,3 L 11.00025,18 l 0,3 3.46875,-2 3.46875,-2 -3.46875,-2 -3.46875,-2 0,3 L 10,16.000125 c -0.571302,7.1e-5 -1.0000215,-0.428707 -1,-1 l 0,-7.00025 c 0,-0.5712971 0.428703,-0.9999817 1,-1 L 12,7 12,5 z"
-       id="path3006"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sssccccccccscscccs" />
-    <path
-       style="color:#000000;fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 14,1.99975 2,0 0,8 -2,0 z"
-       id="rect3980"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="color:#000000;fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 20,4.999875 c 1.644703,-1.028e-4 3,1.3552971 3,3 l 0,7.00025 c 0,1.644705 -1.355294,3.000023 -3,3 l -1.031,0 0,-2 1.031,0 c 0.571302,0 1.000022,-0.428707 1,-1 l 0,-7.00025 c 0,-0.5712971 -0.428703,-0.9999817 -1,-1 L 18.00025,7 l 0,-2 z"
-       id="path3029"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssscccscscccs" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="30" height="22"><g color="#000" fill="#0f0f0f"><path style="marker:none" d="M10 4.999875c-1.644703-.0001028-3 1.3552971-3 3v7.00025c0 1.644705 1.355294 3.000023 3 3L11.00025 18v3l3.46875-2 3.46875-2-3.46875-2-3.46875-2v3L10 16.000125c-.571302.000071-1.0000215-.428707-1-1v-7.00025c0-.5712971.428703-.9999817 1-1L12 7V5z" overflow="visible"/><path style="marker:none" d="M14 1.99975h2v8h-2zM20 4.999875c1.644703-.0001028 3 1.3552971 3 3v7.00025c0 1.644705-1.355294 3.000023-3 3h-1.031v-2H20c.571302 0 1.000022-.428707 1-1v-7.00025c0-.5712971-.428703-.9999817-1-1L18.00025 7V5z" overflow="visible"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_repeat_hidden.svg b/res/skins/Tango/buttons/btn_repeat_hidden.svg
new file mode 100644
index 000000000000..cce8dbf0bcc6
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_repeat_hidden.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="15" width="15"><g font-weight="400" color="#000" fill="#888" font-family="Sans"><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M13 10.375V4.5c0-.8285-.671573-1.5-1.5-1.5H6V1.2187L2.03125 3.5 6 5.7812V4h5.5c.276142 0 .5.2239.5.5v5.2812zM2 4.625V10.5c0 .8285.671573 1.5 1.5 1.5H9v1.78125L12.96875 11.5 9 9.21875V11H3.5c-.276142 0-.5-.2239-.5-.5V5.21875z" overflow="visible"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_repeat_off.svg b/res/skins/Tango/buttons/btn_repeat_off.svg
index f23548fc175f..33faf3360fbf 100644
--- a/res/skins/Tango/buttons/btn_repeat_off.svg
+++ b/res/skins/Tango/buttons/btn_repeat_off.svg
@@ -1,84 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_repeat_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="4.8300048"
-     inkscape:cy="7.6407363"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3989"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1030.3622)">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1">
-      <path
-         id="path3832-5"
-         d="m 3.625,1038.9561 1.09375,0.7812 0.53125,0.375 c -0.174912,0.3826 -0.25,0.8022 -0.25,1.25 0,1.6569 1.343146,3 3,3 l 5.4375,0 0,-2.625 1.5625,1.125 1,0.6875 0.75,0.5625 1.75,1.25 -1.75,1.25 -0.75,0.5625 -1,0.6875 -1.5625,1.125 0,-2.625 -5.4375,0 c -1.326074,0 -2.593574,-0.531 -3.53125,-1.4687 -1.610902,-1.6109 -1.890837,-4.0396 -0.84375,-5.9375 z"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:transform-center-y="-2.60945"
-         inkscape:transform-center-x="-0.24720557"
-         id="path3832-5-7"
-         d="m 18.375,1043.7685 -1.09375,-0.7813 -0.53125,-0.375 c 0.174912,-0.3826 0.25,-0.8023 0.25,-1.25 0,-1.6569 -1.343146,-3 -3,-3 l -5.4375,0 0,2.625 -1.5625,-1.125 -1,-0.6875 -0.75,-0.5625 -1.75,-1.25 1.75,-1.25 0.75,-0.5625 1,-0.6875 1.5625,-1.125 0,2.625 5.4375,0 c 1.326074,0 2.593574,0.531 3.53125,1.4688 1.610902,1.6109 1.890837,4.0396 0.84375,5.9375 z"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22"><g fill="#888" color="#000"><path style="marker:none" d="M4 8.7111l1.0780907.6229.4551939.2634-.0001916 5.1027c-.0000165.438.328658.7667.7666423.7667L14 15.4667v-2.2999l2.577534 1.5333 2.659291 1.5333-2.659291 1.5333L14 19.2999V17l-7.7002647.0001c-1.2609013 0-2.299927-1.0391-2.299927-2.3z" overflow="visible"/><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M8 2.7001V5h7.70009c1.260899 0 2.299927 1.039 2.299927 2.2999v5.9891l-1.078091-.6229-.455194-.2635V7.2999c0-.438-.328662-.7666-.766642-.7666H8v2.2999L5.3407094 7.2999 2.6814189 5.7666l2.6592905-1.5333z" font-weight="400" overflow="visible" font-family="Sans"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_repeat_on.svg b/res/skins/Tango/buttons/btn_repeat_on.svg
index 61a735fac9f9..308cc4983870 100644
--- a/res/skins/Tango/buttons/btn_repeat_on.svg
+++ b/res/skins/Tango/buttons/btn_repeat_on.svg
@@ -1,84 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_repeat_on.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4.0000002"
-     inkscape:cx="11.391089"
-     inkscape:cy="11.652897"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3989"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1030.3622)">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1">
-      <path
-         id="path3832-5"
-         d="m 3.625,1038.9561 1.09375,0.7812 0.53125,0.375 c -0.174912,0.3826 -0.25,0.8022 -0.25,1.25 0,1.6569 1.343146,3 3,3 l 5.4375,0 0,-2.625 1.5625,1.125 1,0.6875 0.75,0.5625 1.75,1.25 -1.75,1.25 -0.75,0.5625 -1,0.6875 -1.5625,1.125 0,-2.625 -5.4375,0 c -1.326074,0 -2.593574,-0.531 -3.53125,-1.4687 -1.610902,-1.6109 -1.890837,-4.0396 -0.84375,-5.9375 z"
-         style="fill:#dc0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:transform-center-y="-2.60945"
-         inkscape:transform-center-x="-0.24720557"
-         id="path3832-5-7"
-         d="m 18.375,1043.7685 -1.09375,-0.7813 -0.53125,-0.375 c 0.174912,-0.3826 0.25,-0.8023 0.25,-1.25 0,-1.6569 -1.343146,-3 -3,-3 l -5.4375,0 0,2.625 -1.5625,-1.125 -1,-0.6875 -0.75,-0.5625 -1.75,-1.25 1.75,-1.25 0.75,-0.5625 1,-0.6875 1.5625,-1.125 0,2.625 5.4375,0 c 1.326074,0 2.593574,0.531 3.53125,1.4688 1.610902,1.6109 1.890837,4.0396 0.84375,5.9375 z"
-         style="fill:#dc0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22"><g fill="#dc0000" color="#000"><path style="marker:none" d="M4 8.7111l1.0780907.6229.4551939.2634-.0001916 5.1027c-.0000165.438.328658.7667.7666423.7667L14 15.4667v-2.2999l2.577534 1.5333 2.659291 1.5333-2.659291 1.5333L14 19.2999V17l-7.7002647.0001c-1.2609013 0-2.299927-1.0391-2.299927-2.3z" overflow="visible"/><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M8 2.7001V5h7.70009c1.260899 0 2.299927 1.039 2.299927 2.2999v5.9891l-1.078091-.6229-.455194-.2635V7.2999c0-.438-.328662-.7666-.766642-.7666H8v2.2999L5.4222905 7.2999 2.763 5.7666l2.6592905-1.5333z" font-weight="400" overflow="visible" font-family="Sans"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_repeat_visible.svg b/res/skins/Tango/buttons/btn_repeat_visible.svg
index eb2e8c81ad76..3ef928aa9dc3 100644
--- a/res/skins/Tango/buttons/btn_repeat_visible.svg
+++ b/res/skins/Tango/buttons/btn_repeat_visible.svg
@@ -1,84 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_repeat_visible.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-9.002771"
-     inkscape:cy="7.6407363"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3989"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1030.3622)">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1">
-      <path
-         id="path3832-5"
-         d="m 3.625,1038.9561 1.09375,0.7812 0.53125,0.375 c -0.174912,0.3826 -0.25,0.8022 -0.25,1.25 0,1.6569 1.343146,3 3,3 l 5.4375,0 0,-2.625 1.5625,1.125 1,0.6875 0.75,0.5625 1.75,1.25 -1.75,1.25 -0.75,0.5625 -1,0.6875 -1.5625,1.125 0,-2.625 -5.4375,0 c -1.326074,0 -2.593574,-0.531 -3.53125,-1.4687 -1.610902,-1.6109 -1.890837,-4.0396 -0.84375,-5.9375 z"
-         style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:transform-center-y="-2.60945"
-         inkscape:transform-center-x="-0.24720557"
-         id="path3832-5-7"
-         d="m 18.375,1043.7685 -1.09375,-0.7813 -0.53125,-0.375 c 0.174912,-0.3826 0.25,-0.8023 0.25,-1.25 0,-1.6569 -1.343146,-3 -3,-3 l -5.4375,0 0,2.625 -1.5625,-1.125 -1,-0.6875 -0.75,-0.5625 -1.75,-1.25 1.75,-1.25 0.75,-0.5625 1,-0.6875 1.5625,-1.125 0,2.625 5.4375,0 c 1.326074,0 2.593574,0.531 3.53125,1.4688 1.610902,1.6109 1.890837,4.0396 0.84375,5.9375 z"
-         style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="15" width="15"><g font-weight="400" color="#000" fill="#d2d2d2" font-family="Sans"><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M13 10.375V4.5c0-.8285-.671573-1.5-1.5-1.5H6V1.2187L2.03125 3.5 6 5.7812V4h5.5c.276142 0 .5.2239.5.5v5.2812zM2 4.625V10.5c0 .8285.671573 1.5 1.5 1.5H9v1.7813L12.96875 11.5 9 9.2188V11H3.5c-.276142 0-.5-.2239-.5-.5V5.2188z" overflow="visible"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_reset.svg b/res/skins/Tango/buttons/btn_reset.svg
deleted file mode 100644
index e5996b137f58..000000000000
--- a/res/skins/Tango/buttons/btn_reset.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="26"
-   height="13"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_reset.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="10.552118"
-     inkscape:cy="-0.5729377"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-center="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-page="true">
-    <sodipodi:guide
-       orientation="1,0"
-       position="13,4.356"
-       id="guide3984" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="26,5.0507627"
-       id="guide4008" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1039.3622)">
-    <path
-       style="fill:#eeeeee;fill-opacity:1"
-       d="m 12.65625,1042.4872 c -2.639618,0.077 -5.2616058,1.0861 -7.3125,3.0625 l -1.03125,-1.0937 -0.6875,2.375 -0.71875,2.4375 2.4375,-0.625 2.4375,-0.5625 -1.0625,-1.0938 c 3.579376,-3.4488 9.301146,-3.3606 12.75,0.2188 0.633198,0.6571 1.137598,1.3838 1.53125,2.1562 l 1.78125,-0.875 c -0.481593,-0.9438 -1.101561,-1.8535 -1.875,-2.6562 -1.053815,-1.0937 -2.279819,-1.9073 -3.59375,-2.4688 -1.478173,-0.6318 -3.072479,-0.9212 -4.65625,-0.875 z"
-       id="path3883"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_sampler_cf_center.svg b/res/skins/Tango/buttons/btn_sampler_cf_center.svg
deleted file mode 100644
index 273dbe80c53d..000000000000
--- a/res/skins/Tango/buttons/btn_sampler_cf_center.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_sampler_cf_center.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="2.9209116"
-     inkscape:cy="9.5513392"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3989"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1">
-      <rect
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046"
-         width="14"
-         height="2"
-         x="-1050.3622"
-         y="8"
-         transform="matrix(0,-1,1,0,0,0)" />
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7"
-         width="7"
-         height="2"
-         x="10"
-         y="1042.3622" />
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7-5"
-         width="7"
-         height="2"
-         x="1"
-         y="1042.3622" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_sampler_cf_left_white.svg b/res/skins/Tango/buttons/btn_sampler_cf_left_white.svg
deleted file mode 100644
index 844c1d144b60..000000000000
--- a/res/skins/Tango/buttons/btn_sampler_cf_left_white.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_sampler_cf_left_white.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="-0.24535214"
-     inkscape:cy="7.2782734"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3989"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1">
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7"
-         width="7"
-         height="2"
-         x="10"
-         y="1042.3622" />
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7-5"
-         width="5"
-         height="2"
-         x="3"
-         y="1042.3622" />
-      <rect
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046"
-         width="14"
-         height="2"
-         x="1036.3622"
-         y="-3"
-         transform="matrix(0,1,-1,0,0,0)" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_sampler_cf_right_white.svg b/res/skins/Tango/buttons/btn_sampler_cf_right_white.svg
deleted file mode 100644
index 886535d48436..000000000000
--- a/res/skins/Tango/buttons/btn_sampler_cf_right_white.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_sampler_cf_right_white.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="45.254832"
-     inkscape:cx="8.5515136"
-     inkscape:cy="6.1601744"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3989"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1">
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7"
-         width="5"
-         height="2"
-         x="10"
-         y="1042.3622" />
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046-7-5"
-         width="7"
-         height="2"
-         x="1"
-         y="1042.3622" />
-      <rect
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046"
-         width="14"
-         height="2"
-         x="-1050.3622"
-         y="15"
-         transform="matrix(0,-1,1,0,0,0)" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_sampler_eject.svg b/res/skins/Tango/buttons/btn_sampler_eject.svg
index f1adf67352a5..eec57812a05b 100644
--- a/res/skins/Tango/buttons/btn_sampler_eject.svg
+++ b/res/skins/Tango/buttons/btn_sampler_eject.svg
@@ -1,95 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="14"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_sampler_eject_pressed.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="3.2337342"
-     inkscape:cy="7.3221387"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3989"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1">
-      <rect
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046"
-         width="12"
-         height="2"
-         x="1"
-         y="1048.3622" />
-      <path
-         sodipodi:type="star"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4048"
-         sodipodi:sides="3"
-         sodipodi:cx="3"
-         sodipodi:cy="10.5625"
-         sodipodi:r1="9.6718035"
-         sodipodi:r2="4.8359022"
-         sodipodi:arg1="0.52359878"
-         sodipodi:arg2="1.5707963"
-         inkscape:flatsided="false"
-         inkscape:rounded="0"
-         inkscape:randomized="0"
-         d="m 11.376027,15.398402 -8.3760269,0 -8.3760276,0 L -1.1880142,8.144549 3,0.89069653 7.1880141,8.1445488 z"
-         transform="matrix(0.71633003,0,0,0.54765418,4.85101,1037.9292)"
-         inkscape:transform-center-y="-1.3242038" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16"><g fill="#888"><path d="M2 11h10v2H2zM11.9999996829 8.9999992992H1.9999999587l2.499999737-3.3105024063L6.99999997 2.3789947285l2.5000002146 3.3105020731z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_sampler_eject_pressed.svg b/res/skins/Tango/buttons/btn_sampler_eject_pressed.svg
index 5d7907e3bfb4..0a409c6fae02 100644
--- a/res/skins/Tango/buttons/btn_sampler_eject_pressed.svg
+++ b/res/skins/Tango/buttons/btn_sampler_eject_pressed.svg
@@ -1,95 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="14"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_sampler_eject.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="3.2337342"
-     inkscape:cy="7.3221387"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3989"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1">
-      <rect
-         style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4046"
-         width="12"
-         height="2"
-         x="1"
-         y="1048.3622" />
-      <path
-         sodipodi:type="star"
-         style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4048"
-         sodipodi:sides="3"
-         sodipodi:cx="3"
-         sodipodi:cy="10.5625"
-         sodipodi:r1="9.6718035"
-         sodipodi:r2="4.8359022"
-         sodipodi:arg1="0.52359878"
-         sodipodi:arg2="1.5707963"
-         inkscape:flatsided="false"
-         inkscape:rounded="0"
-         inkscape:randomized="0"
-         d="m 11.376027,15.398402 -8.3760269,0 -8.3760276,0 L -1.1880142,8.144549 3,0.89069653 7.1880141,8.1445488 z"
-         transform="matrix(0.71633003,0,0,0.54765418,4.85101,1036.9292)"
-         inkscape:transform-center-y="-1.3242038" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16"><g fill="#d2d2d2"><path d="M2 11h10v2H2zM11.9999996829 7.9999992992H1.9999999587l2.499999737-3.3105024063L6.99999997 1.3789947285l2.5000002146 3.3105020731z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_sampler_keylock_off.svg b/res/skins/Tango/buttons/btn_sampler_keylock_off.svg
index b4759127cd0a..e82f3482f087 100644
--- a/res/skins/Tango/buttons/btn_sampler_keylock_off.svg
+++ b/res/skins/Tango/buttons/btn_sampler_keylock_off.svg
@@ -1,65 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="14"
-   height="16"
-   viewBox="0 0 14 16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_sampler_keylock_off.svg"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview2993"
-     showgrid="false"
-     inkscape:zoom="11.313708"
-     inkscape:cx="-15.914243"
-     inkscape:cy="3.4941284"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3886" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="g3886"
-     style="display:inline"
-     transform="translate(0,-32)">
-    <path
-       d="m 8.0414031,33.935813 0,8.70287 C 7.4319983,42.274076 6.6417693,42.071804 5.8226975,42.071065 c -1.8380489,0 -3.3280574,0.993351 -3.3280574,2.218705 0,1.225354 1.4900085,2.218705 3.3280574,2.218705 1.8380497,0 3.3280582,-0.993351 3.3280582,-2.218705 l 0,-8.135252 3.3280573,0.739568 0,-2.218704 -3.3280573,-0.739569 z"
-       id="path3888"
-       style="fill:#888888;fill-opacity:1;display:inline"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path d="M8.0414031 1.935813v8.70287c-.6094048-.364607-1.3996338-.566879-2.2187056-.567618-1.8380489 0-3.3280574.993351-3.3280574 2.218705 0 1.225354 1.4900085 2.218705 3.3280574 2.218705 1.8380497 0 3.3280582-.993351 3.3280582-2.218705V4.154518l3.3280573.739568V2.675382l-3.3280573-.739569z" fill="#888"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_sampler_keylock_on.svg b/res/skins/Tango/buttons/btn_sampler_keylock_on.svg
index ebf12fc49c7e..c371046d69c7 100644
--- a/res/skins/Tango/buttons/btn_sampler_keylock_on.svg
+++ b/res/skins/Tango/buttons/btn_sampler_keylock_on.svg
@@ -1,65 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="14"
-   height="16"
-   viewBox="0 0 14 16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_sampler_keylock_on.svg"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview2993"
-     showgrid="false"
-     inkscape:zoom="5.656854"
-     inkscape:cx="-25.1494"
-     inkscape:cy="3.7263249"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3886" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="g3886"
-     style="display:inline"
-     transform="translate(0,-32)">
-    <path
-       d="m 8.0414031,33.935813 0,8.70287 C 7.4319983,42.274076 6.6417693,42.071804 5.8226975,42.071065 c -1.8380489,0 -3.3280574,0.993351 -3.3280574,2.218705 0,1.225354 1.4900085,2.218705 3.3280574,2.218705 1.8380497,0 3.3280582,-0.993351 3.3280582,-2.218705 l 0,-8.135252 3.3280573,0.739568 0,-2.218704 -3.3280573,-0.739569 z"
-       id="path3888"
-       style="fill:#dc0000;fill-opacity:1;display:inline"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path d="M8.0414031 1.935813v8.70287c-.6094048-.364607-1.3996338-.566879-2.2187056-.567618-1.8380489 0-3.3280574.993351-3.3280574 2.218705 0 1.225354 1.4900085 2.218705 3.3280574 2.218705 1.8380497 0 3.3280582-.993351 3.3280582-2.218705V4.154518l3.3280573.739568V2.675382l-3.3280573-.739569z" fill="#dc0000"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_sampler_playing.svg b/res/skins/Tango/buttons/btn_sampler_playing.svg
index 176de032a950..df1d6f33370b 100644
--- a/res/skins/Tango/buttons/btn_sampler_playing.svg
+++ b/res/skins/Tango/buttons/btn_sampler_playing.svg
@@ -1,137 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="34"
-   height="34"
-   id="svg3769"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_sampler_playing.svg"
-   inkscape:export-filename="/media/ronso/STUDIO14.04/home/ronso/.mixxx/skins/Tango/buttons/btn_sampler_playing.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3771">
-    <linearGradient
-       id="linearGradient4407"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#ff2323;stop-opacity:1;"
-         offset="1"
-         id="stop4409" />
-      <stop
-         id="stop4432"
-         offset="1"
-         style="stop-color:#f40a0a;stop-opacity:0.56896549;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4411" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4407"
-       id="radialGradient4413"
-       cx="11.5"
-       cy="1040.3622"
-       fx="11.5"
-       fy="1040.3622"
-       r="4.5"
-       gradientTransform="matrix(0.56624103,0,0,0.75498802,4.9882282,254.90118)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4407"
-       id="radialGradient4415"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56624103,0,0,0.75498802,4.9882282,254.90118)"
-       cx="11.5"
-       cy="1040.3622"
-       fx="11.5"
-       fy="1040.3622"
-       r="4.5" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4407"
-       id="radialGradient4417"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56624103,0,0,0.75498802,4.9882282,254.90118)"
-       cx="11.5"
-       cy="1040.3622"
-       fx="11.5"
-       fy="1040.3622"
-       r="4.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4407"
-       id="linearGradient4434"
-       x1="1.4315338"
-       y1="1040.5343"
-       x2="21.595881"
-       y2="1040.5343"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="15.719487"
-     inkscape:cy="-3.6119867"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata3774">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1018.3622)">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect4333-3"
-       width="4"
-       height="16"
-       x="12"
-       y="1027.3622" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect4333-3-1"
-       width="4"
-       height="16"
-       x="19"
-       y="1027.3622" />
-  </g>
-</svg>
+<svg xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" xmlns="http://www.w3.org/2000/svg" width="34" height="34"><defs><linearGradient id="a" osb:paint="gradient"><stop offset="1" stop-color="#ff2323"/><stop offset="1" stop-color="#f40a0a" stop-opacity=".56896549"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs><g fill="#fff"><path d="M12 9h4v16h-4zM19 9h4v16h-4z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_sampler_quantize_off.svg b/res/skins/Tango/buttons/btn_sampler_quantize_off.svg
index 7bb5c0d4d355..219d250c39b6 100644
--- a/res/skins/Tango/buttons/btn_sampler_quantize_off.svg
+++ b/res/skins/Tango/buttons/btn_sampler_quantize_off.svg
@@ -1,121 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_sampler_quantize_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="5.7047901"
-     inkscape:cy="11.340093"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer3"
-     showgrid="false"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox-edge-midpoints="true">
-    <sodipodi:guide
-       orientation="0,1"
-       position="14.666655,7"
-       id="guide3027" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="5.9999996,11"
-       id="guide3826" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="5.9999996,15"
-       id="guide3828" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="1,12.643"
-       id="guide3834" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="13.979156,17"
-       id="guide3820" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.070213,5"
-       id="guide3824" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="11,16.53125"
-       id="guide3827" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="21,9.753"
-       id="guide3829" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="22x22"
-     transform="translate(0,-4)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4.999999,8.0000001 0,1.9999999 5.718751,0 c 1.656853,0 3,1.343146 3,3 0,1.656854 -1.343147,3 -3,3 l -5.718751,0 0,2 5.843751,0 c 2.761423,0 5,-2.238577 5,-5 0,-2.761424 -2.238577,-4.9999998 -5,-4.9999999 l -5.843751,0 z"
-       id="path2992-3"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect2998-3-7-67"
-       width="1.9999986"
-       height="1.9999986"
-       x="3.010416"
-       y="15.999999" />
-    <rect
-       style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect2998-3-7-6"
-       width="1.9999986"
-       height="1.9999986"
-       x="3"
-       y="8" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18"><path d="M4.999999 4.0000001V6h5.718751c1.656853 0 3 1.343146 3 3s-1.343147 3-3 3H4.999999v2h5.843751c2.761423 0 5-2.238577 5-5 0-2.761424-2.238577-4.9999998-5-4.9999999H4.999999z" fill="#888"/><path fill="#eee" d="M3.010416 11.999999h1.9999986v1.9999986H3.010416zM3 4h1.9999986v1.9999986H3z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_sampler_quantize_on.svg b/res/skins/Tango/buttons/btn_sampler_quantize_on.svg
index abb548ff7570..f47b327bf2bf 100644
--- a/res/skins/Tango/buttons/btn_sampler_quantize_on.svg
+++ b/res/skins/Tango/buttons/btn_sampler_quantize_on.svg
@@ -1,121 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_sampler_quantize_on.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="4.6547767"
-     inkscape:cy="12.944044"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer3"
-     showgrid="false"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox-edge-midpoints="true">
-    <sodipodi:guide
-       orientation="0,1"
-       position="14.666655,7"
-       id="guide3027" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="5.9999996,11"
-       id="guide3826" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="5.9999996,15"
-       id="guide3828" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="1,12.643"
-       id="guide3834" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="13.979156,17"
-       id="guide3820" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.070213,5"
-       id="guide3824" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="11,16.53125"
-       id="guide3827" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="21,9.753"
-       id="guide3829" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="22x22"
-     transform="translate(0,-4)">
-    <path
-       style="fill:#dc0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4.9999985,8.0000001 0,1.9999999 5.7187505,0 c 1.656853,0 3,1.343146 3,3 0,1.656854 -1.343147,3 -3,3 l -5.7187505,0 0,2 5.8437505,0 c 2.761423,0 5,-2.238577 5,-5 0,-2.761424 -2.238577,-4.9999998 -5,-4.9999999 l -5.8437505,0 z"
-       id="path2992-3"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect2998-3-7-67"
-       width="1.9999986"
-       height="1.9999986"
-       x="3.010416"
-       y="15.999999" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect2998-3-7-6"
-       width="1.9999986"
-       height="1.9999986"
-       x="3"
-       y="8" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18"><path d="M4.9999985 4.0000001V6h5.7187505c1.656853 0 3 1.343146 3 3s-1.343147 3-3 3H4.9999985v2h5.8437505c2.761423 0 5-2.238577 5-5 0-2.761424-2.238577-4.9999998-5-4.9999999H4.9999985z" fill="#dc0000"/><path fill="#fff" d="M3.010416 11.999999h1.9999986v1.9999986H3.010416zM3 4h1.9999986v1.9999986H3z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_sampler_repeat_off.svg b/res/skins/Tango/buttons/btn_sampler_repeat_off.svg
index 01b6f8f822cf..4c3687ce77ed 100644
--- a/res/skins/Tango/buttons/btn_sampler_repeat_off.svg
+++ b/res/skins/Tango/buttons/btn_sampler_repeat_off.svg
@@ -1,87 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_sampler_repeat_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="6.4178317"
-     inkscape:cy="7.4600867"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)"
-     style="display:inline">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1"
-       transform="matrix(-0.80596688,0,0,0.80596688,15.253702,203.44681)">
-      <path
-         id="path3832-5"
-         transform="translate(0,1034.3622)"
-         d="M 16.375,6.59375 15.28125,7.375 14.75,7.75 C 14.924912,8.1326362 15,8.5522162 15,9 c 0,1.6569 -1.343146,3 -3,3 l -5.4375,0 0,-2.625 L 5,10.5 4,11.1875 3.25,11.75 1.5,13 3.25,14.25 4,14.8125 5,15.5 6.5625,16.625 6.5625,14 12,14 c 1.326074,0 2.593574,-0.53105 3.53125,-1.46875 1.610902,-1.610895 1.890837,-4.0395905 0.84375,-5.9375 z"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:transform-center-y="-2.60945"
-         inkscape:transform-center-x="0.24720557"
-         id="path3832-5-7"
-         d="m 1.625,1045.7684 1.09375,-0.7813 0.53125,-0.375 c -0.174912,-0.3826 -0.25,-0.8022 -0.25,-1.25 0,-1.6569 1.343146,-3 3,-3 l 5.4375,0 0,2.625 1.5625,-1.125 1,-0.6875 0.75,-0.5625 1.75,-1.25 -1.75,-1.25 -0.75,-0.5625 -1,-0.6875 -1.5625,-1.125 0,2.625 -5.4375,0 c -1.326074,0 -2.593574,0.5311 -3.53125,1.4688 -1.61090199,1.6109 -1.89083699,4.0396 -0.84375,5.9375 z"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g font-weight="400" color="#000" fill="#888" font-family="Sans"><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M6 1.5L1.65625 4 6 6.5V4.5313h5.6875c.437979 0 .78125.3432.78125.7812V9.125l.46875.25L14 10V5.3125C14 4.0516 12.948399 3 11.6875 3H6zM10 14.5001l4.34375-2.5L10 9.5001v1.9687H4.3125c-.437979 0-.78125-.3432-.78125-.7812V6.875l-.46875-.25L2 6v4.6876c0 1.2609 1.051601 2.3125 2.3125 2.3125H10z" overflow="visible"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_sampler_repeat_on.svg b/res/skins/Tango/buttons/btn_sampler_repeat_on.svg
index 63cced4d81f6..e5dca1059e1b 100644
--- a/res/skins/Tango/buttons/btn_sampler_repeat_on.svg
+++ b/res/skins/Tango/buttons/btn_sampler_repeat_on.svg
@@ -1,87 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_sampler_repeat_on.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="-0.49855643"
-     inkscape:cy="7.4600867"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)"
-     style="display:inline">
-    <g
-       id="g3989"
-       style="fill:#dc0000;fill-opacity:1"
-       transform="matrix(-0.80596688,0,0,0.80596688,15.253702,203.44681)">
-      <path
-         id="path3832-5"
-         transform="translate(0,1034.3622)"
-         d="M 16.375,6.59375 15.28125,7.375 14.75,7.75 C 14.924912,8.1326362 15,8.5522162 15,9 c 0,1.6569 -1.343146,3 -3,3 l -5.4375,0 0,-2.625 L 5,10.5 4,11.1875 3.25,11.75 1.5,13 3.25,14.25 4,14.8125 5,15.5 6.5625,16.625 6.5625,14 12,14 c 1.326074,0 2.593574,-0.53105 3.53125,-1.46875 1.610902,-1.610895 1.890837,-4.0395905 0.84375,-5.9375 z"
-         style="fill:#dc0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:transform-center-y="-2.60945"
-         inkscape:transform-center-x="0.24720557"
-         id="path3832-5-7"
-         d="m 1.625,1045.7684 1.09375,-0.7813 0.53125,-0.375 c -0.174912,-0.3826 -0.25,-0.8022 -0.25,-1.25 0,-1.6569 1.343146,-3 3,-3 l 5.4375,0 0,2.625 1.5625,-1.125 1,-0.6875 0.75,-0.5625 1.75,-1.25 -1.75,-1.25 -0.75,-0.5625 -1,-0.6875 -1.5625,-1.125 0,2.625 -5.4375,0 c -1.326074,0 -2.593574,0.5311 -3.53125,1.4688 -1.61090199,1.6109 -1.89083699,4.0396 -0.84375,5.9375 z"
-         style="fill:#dc0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g font-weight="400" color="#000" fill="#dc0000" font-family="Sans"><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M6 1.5L1.65625 4 6 6.5V4.53125h5.6875c.437979 0 .78125.34325.78125.78125V9.125l.46875.25L14 10V5.3125C14 4.0516 12.948399 3 11.6875 3H6zM10 14.5001l4.34375-2.5L10 9.5001v1.9687H4.3125c-.437979 0-.78125-.3432-.78125-.7812V6.875l-.46875-.25L2 6v4.6876c0 1.2609 1.051601 2.3125 2.3125 2.3125H10z" overflow="visible"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_sampler_sync_off.svg b/res/skins/Tango/buttons/btn_sampler_sync_off.svg
index f0542ab1da2e..686186b32ba9 100644
--- a/res/skins/Tango/buttons/btn_sampler_sync_off.svg
+++ b/res/skins/Tango/buttons/btn_sampler_sync_off.svg
@@ -1,125 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_sampler_eject.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="12.067796"
-     inkscape:cy="5.6912373"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <sodipodi:guide
-       orientation="0,1"
-       position="99,9"
-       id="guide3010" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="9,7.7578125"
-       id="guide3012" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <g
-       id="g3989"
-       style="fill:#888888;fill-opacity:1"
-       inkscape:transform-center-x="4.6894977"
-       transform="translate(1,0)">
-      <path
-         sodipodi:type="star"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4048"
-         sodipodi:sides="3"
-         sodipodi:cx="3"
-         sodipodi:cy="10.5625"
-         sodipodi:r1="9.6718035"
-         sodipodi:r2="4.8359022"
-         sodipodi:arg1="0.52359878"
-         sodipodi:arg2="1.5707963"
-         inkscape:flatsided="false"
-         inkscape:rounded="0"
-         inkscape:randomized="0"
-         d="m 11.376027,15.398402 -8.3760269,0 -8.3760276,0 L -1.1880142,8.144549 3,0.89069653 7.1880141,8.1445488 z"
-         transform="matrix(0,0.59694169,-0.45637848,0,8.0274994,1041.5714)"
-         inkscape:transform-center-x="4.3808148"
-         inkscape:transform-center-y="-0.76559006" />
-    </g>
-    <g
-       id="g3989-5"
-       style="fill:#888888;fill-opacity:1"
-       inkscape:transform-center-x="-4.6894976"
-       transform="matrix(-1,0,0,-1,17.000005,2086.7245)"
-       inkscape:transform-center-y="4.9885413e-05">
-      <path
-         sodipodi:type="star"
-         style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4048-3"
-         sodipodi:sides="3"
-         sodipodi:cx="3"
-         sodipodi:cy="10.5625"
-         sodipodi:r1="9.6718035"
-         sodipodi:r2="4.8359022"
-         sodipodi:arg1="0.52359878"
-         sodipodi:arg2="1.5707963"
-         inkscape:flatsided="false"
-         inkscape:rounded="0"
-         inkscape:randomized="0"
-         d="m 11.376027,15.398402 -8.3760269,0 -8.3760276,0 L -1.1880142,8.144549 3,0.89069653 7.1880141,8.1445488 z"
-         transform="matrix(0,0.59694169,-0.45637848,0,8.0274994,1041.5714)"
-         inkscape:transform-center-x="4.3808148"
-         inkscape:transform-center-y="-0.76559006" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18"><g fill="#888"><path d="M2.0000001008 14.0000247829V4.0000250587l3.3105024063 2.499999737L8.6210046715 9.00002507l-3.3105020731 2.5000002146zM16.0000048992 4.0000752171V14.0000749413l-3.3105024063-2.499999737L9.3790003285 9.00007493l3.3105020731-2.5000002146z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_sampler_sync_on.svg b/res/skins/Tango/buttons/btn_sampler_sync_on.svg
index 0b92d79834c0..d95e089ef8f9 100644
--- a/res/skins/Tango/buttons/btn_sampler_sync_on.svg
+++ b/res/skins/Tango/buttons/btn_sampler_sync_on.svg
@@ -1,125 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="btn_sampler_sync_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-156.9322"
-     inkscape:cy="5.6912373"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <sodipodi:guide
-       orientation="0,1"
-       position="99,9"
-       id="guide3010" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="9,7.7578125"
-       id="guide3012" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <g
-       id="g3989"
-       style="fill:#d2d2d2;fill-opacity:1"
-       inkscape:transform-center-x="4.6894977"
-       transform="translate(1,0)">
-      <path
-         sodipodi:type="star"
-         style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4048"
-         sodipodi:sides="3"
-         sodipodi:cx="3"
-         sodipodi:cy="10.5625"
-         sodipodi:r1="9.6718035"
-         sodipodi:r2="4.8359022"
-         sodipodi:arg1="0.52359878"
-         sodipodi:arg2="1.5707963"
-         inkscape:flatsided="false"
-         inkscape:rounded="0"
-         inkscape:randomized="0"
-         d="m 11.376027,15.398402 -8.3760269,0 -8.3760276,0 L -1.1880142,8.144549 3,0.89069653 7.1880141,8.1445488 z"
-         transform="matrix(0,0.59694169,-0.45637848,0,8.0274994,1041.5714)"
-         inkscape:transform-center-x="4.3808148"
-         inkscape:transform-center-y="-0.76559006" />
-    </g>
-    <g
-       id="g3989-5"
-       style="fill:#d2d2d2;fill-opacity:1"
-       inkscape:transform-center-x="-4.6894976"
-       transform="matrix(-1,0,0,-1,17.000005,2086.7245)"
-       inkscape:transform-center-y="4.9885413e-05">
-      <path
-         sodipodi:type="star"
-         style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4048-3"
-         sodipodi:sides="3"
-         sodipodi:cx="3"
-         sodipodi:cy="10.5625"
-         sodipodi:r1="9.6718035"
-         sodipodi:r2="4.8359022"
-         sodipodi:arg1="0.52359878"
-         sodipodi:arg2="1.5707963"
-         inkscape:flatsided="false"
-         inkscape:rounded="0"
-         inkscape:randomized="0"
-         d="m 11.376027,15.398402 -8.3760269,0 -8.3760276,0 L -1.1880142,8.144549 3,0.89069653 7.1880141,8.1445488 z"
-         transform="matrix(0,0.59694169,-0.45637848,0,8.0274994,1041.5714)"
-         inkscape:transform-center-x="4.3808148"
-         inkscape:transform-center-y="-0.76559006" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18"><g fill="#d2d2d2"><path d="M2.0000001008 14.0000247829V4.0000250587l3.3105024063 2.499999737L8.6210046715 9.00002507l-3.3105020731 2.5000002146zM16.0000048992 4.0000752171V14.0000749413l-3.3105024063-2.499999737L9.3790003285 9.00007493l3.3105020731-2.5000002146z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_sampler_xfader_center.svg b/res/skins/Tango/buttons/btn_sampler_xfader_center.svg
new file mode 100644
index 000000000000..7d1cb5e398ea
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_sampler_xfader_center.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18"><g fill="#888"><path fill="#b3b3b3" d="M8 16V2h2v14z"/><path d="M10 8h7v2h-7zM1 8h7v2H1z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_sampler_xfader_left_white.svg b/res/skins/Tango/buttons/btn_sampler_xfader_left_white.svg
new file mode 100644
index 000000000000..53fe3462d5a4
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_sampler_xfader_left_white.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18"><g fill="#888"><path d="M10 8h7v2h-7zM3 8h5v2H3z"/><path fill="#fff" d="M3 2v14H1V2z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_sampler_xfader_right_white.svg b/res/skins/Tango/buttons/btn_sampler_xfader_right_white.svg
new file mode 100644
index 000000000000..476672ca8ecf
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_sampler_xfader_right_white.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18"><g fill="#888"><path d="M10 8h5v2h-5zM1 8h7v2H1z"/><path fill="#fff" d="M15 16V2h2v14z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_samplers_load.svg b/res/skins/Tango/buttons/btn_samplers_load.svg
deleted file mode 100644
index 5d79f85a3e7c..000000000000
--- a/res/skins/Tango/buttons/btn_samplers_load.svg
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-
-<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"
-   xml:space="preserve"
-   height="22"
-   width="22"
-   version="1.0"
-   viewBox="0 0 22 22"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_samplers_load.svg"><defs
-     id="defs13" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview11"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:zoom="16"
-     inkscape:cx="20.743083"
-     inkscape:cy="10.417012"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer2"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true" /><metadata
-     id="metadata19"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="bak"
-     style="opacity:0.31468584;display:none"
-     transform="translate(0,-16)"><g
-       id="Layer_x0020_4"
-       style="stroke:#000000;stroke-width:1.51660764"
-       transform="matrix(0.66070257,0,0,0.65803279,4.5351031,8.5499156)"><g
-         id="g5"
-         style="stroke-width:1.51660764"><path
-           id="path7"
-           style="fill:none;stroke:#ffffff;stroke-width:10.17492104"
-           d="m 7.1,10.6 c -1.3,0 -2.3,1 -2.3,2.3 l 0.1,22.3 c 0,1.4 0.9,2.3 2.3,2.3 h 0.1 27.5 c 1.1,0 2.1,-0.6 2.9,-1.6 0.6,-0.9 2.2,-4.5 3.1,-6.8 1.6,-4.1 2.5,-6.7 2.5,-7.9 0,-0.3 0,-1.2 -0.7,-1.7 C 42,19 41.2,18.9 40.4,18.9 h -4 V 17.2 C 36.4,15.9 35.5,15 34.2,15 h -14 v -2.2 c 0,-1.2 -1,-2.2 -2.3,-2.2 H 7.1 z"
-           inkscape:connector-curvature="0" /><path
-           id="path9"
-           d="m 7.1,10.6 c -1.3,0 -2.3,1 -2.3,2.3 l 0.1,22.3 c 0,1.4 0.9,2.3 2.3,2.3 h 0.1 27.5 c 1.1,0 2.1,-0.6 2.9,-1.6 0.6,-0.9 2.2,-4.5 3.1,-6.8 1.6,-4.1 2.5,-6.7 2.5,-7.9 0,-0.3 0,-1.2 -0.7,-1.7 C 42,19 41.2,18.9 40.4,18.9 h -4 V 17.2 C 36.4,15.9 35.5,15 34.2,15 h -14 v -2.2 c 0,-1.2 -1,-2.2 -2.3,-2.2 H 7.1 z"
-           inkscape:connector-curvature="0"
-           style="stroke-width:1.51660764" /><path
-           id="path11"
-           style="fill:#ffffff;stroke-width:1.51660764"
-           d="M 8.9,35.3 H 34 c 0.6,0 1.2,-0.4 1.5,-0.9 0.7,-1 4.8,-10.6 4.8,-12.5 0,-0.4 0,-0.7 -1.3,-0.7 H 14.9 c -0.4,0 -0.8,0.1 -0.9,0.7 -0.1,1.5 -3.2,11.8 -4.3,13.1 -0.3,0.4 -0.9,0.4 -0.9,0.4 l 0.1,-0.1 z"
-           inkscape:connector-curvature="0" /></g></g></g><g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="btn"
-     transform="translate(0,-16)"><path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 10.84375 2.03125 A 0.86449351 0.86449351 0 0 0 10.21875 2.46875 L 6.5 9 C 5.3567782 8.9981786 4.613191 9.0075707 2.71875 9 C 2.6961 8.9989 2.6789 8.9989 2.65625 9 C 2.6336 8.9989 2.6164 8.9989 2.59375 9 C 2.26125 9.06245 1.9940349 9.385623 2 9.71875 L 2 19.28125 C 2.0000376 19.65506 2.3389705 19.999963 2.71875 20 L 3.40625 20 L 16.59375 20 C 16.613856 19.999998 16.636382 20.001863 16.65625 20 A 0.72541726 0.71401504 0 0 0 16.8125 19.96875 C 16.879014 19.946499 16.942099 19.914971 17 19.875 A 0.72541726 0.71401504 0 0 0 17.09375 19.78125 A 0.72541726 0.71401504 0 0 0 17.15625 19.71875 A 0.72541726 0.71401504 0 0 0 17.25 19.59375 A 0.72541726 0.71401504 0 0 0 17.25 19.5625 L 20.65625 11.78125 A 0.72541726 0.71401504 0 0 0 19.96875 10.75 L 17.3125 10.75 L 17.3125 9.71875 C 17.312462 9.34494 16.973529 9.000037 16.59375 9 C 16.048435 9.0007331 15.966202 8.99918 15.5 9 L 11.71875 2.46875 A 0.86449351 0.86449351 0 0 0 10.84375 2.03125 z M 7.40625 12.1875 L 17.3125 12.1875 L 18.875 12.1875 L 17.3125 15.8125 L 16.125 18.5625 L 4.625 18.5625 L 7.40625 12.1875 z "
-       transform="translate(0,16)"
-       id="path3852" /></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_samplers_load_hover.svg b/res/skins/Tango/buttons/btn_samplers_load_hover.svg
deleted file mode 100644
index 15708afd3394..000000000000
--- a/res/skins/Tango/buttons/btn_samplers_load_hover.svg
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-
-<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"
-   xml:space="preserve"
-   height="22"
-   width="22"
-   version="1.0"
-   viewBox="0 0 22 22"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_samplers_load_hover.svg"><defs
-     id="defs13" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview11"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:zoom="22.627416"
-     inkscape:cx="5.8059894"
-     inkscape:cy="12.45485"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer2"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true" /><metadata
-     id="metadata19"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="bak"
-     style="opacity:0.31468584;display:none"
-     transform="translate(0,-16)"><g
-       id="Layer_x0020_4"
-       style="stroke:#000000;stroke-width:1.51660764"
-       transform="matrix(0.66070257,0,0,0.65803279,4.5351031,8.5499156)"><g
-         id="g5"
-         style="stroke-width:1.51660764"><path
-           id="path7"
-           style="fill:none;stroke:#ffffff;stroke-width:10.17492104"
-           d="m 7.1,10.6 c -1.3,0 -2.3,1 -2.3,2.3 l 0.1,22.3 c 0,1.4 0.9,2.3 2.3,2.3 h 0.1 27.5 c 1.1,0 2.1,-0.6 2.9,-1.6 0.6,-0.9 2.2,-4.5 3.1,-6.8 1.6,-4.1 2.5,-6.7 2.5,-7.9 0,-0.3 0,-1.2 -0.7,-1.7 C 42,19 41.2,18.9 40.4,18.9 h -4 V 17.2 C 36.4,15.9 35.5,15 34.2,15 h -14 v -2.2 c 0,-1.2 -1,-2.2 -2.3,-2.2 H 7.1 z"
-           inkscape:connector-curvature="0" /><path
-           id="path9"
-           d="m 7.1,10.6 c -1.3,0 -2.3,1 -2.3,2.3 l 0.1,22.3 c 0,1.4 0.9,2.3 2.3,2.3 h 0.1 27.5 c 1.1,0 2.1,-0.6 2.9,-1.6 0.6,-0.9 2.2,-4.5 3.1,-6.8 1.6,-4.1 2.5,-6.7 2.5,-7.9 0,-0.3 0,-1.2 -0.7,-1.7 C 42,19 41.2,18.9 40.4,18.9 h -4 V 17.2 C 36.4,15.9 35.5,15 34.2,15 h -14 v -2.2 c 0,-1.2 -1,-2.2 -2.3,-2.2 H 7.1 z"
-           inkscape:connector-curvature="0"
-           style="stroke-width:1.51660764" /><path
-           id="path11"
-           style="fill:#ffffff;stroke-width:1.51660764"
-           d="M 8.9,35.3 H 34 c 0.6,0 1.2,-0.4 1.5,-0.9 0.7,-1 4.8,-10.6 4.8,-12.5 0,-0.4 0,-0.7 -1.3,-0.7 H 14.9 c -0.4,0 -0.8,0.1 -0.9,0.7 -0.1,1.5 -3.2,11.8 -4.3,13.1 -0.3,0.4 -0.9,0.4 -0.9,0.4 l 0.1,-0.1 z"
-           inkscape:connector-curvature="0" /></g></g></g><g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="btn"
-     transform="translate(0,-16)"><path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 2.59375 9 C 2.26125 9.06245 1.9940349 9.385623 2 9.71875 L 2 19.28125 C 2.0000376 19.65506 2.3389705 19.999963 2.71875 20 L 3.40625 20 L 16.59375 20 C 16.613856 19.999998 16.636382 20.001863 16.65625 20 A 0.72541726 0.71401504 0 0 0 16.8125 19.96875 C 16.879014 19.946499 16.942099 19.914971 17 19.875 A 0.72541726 0.71401504 0 0 0 17.09375 19.78125 A 0.72541726 0.71401504 0 0 0 17.15625 19.71875 A 0.72541726 0.71401504 0 0 0 17.25 19.59375 A 0.72541726 0.71401504 0 0 0 17.25 19.5625 L 20.65625 11.78125 A 0.72541726 0.71401504 0 0 0 19.96875 10.75 L 17.3125 10.75 L 17.3125 9.71875 C 17.312462 9.34494 16.973529 9.000037 16.59375 9 C 9.6760444 9.0093 9.6702524 9.02778 2.71875 9 C 2.6961 8.9989 2.6789 8.9989 2.65625 9 C 2.6336 8.9989 2.6164 8.9989 2.59375 9 z M 7.40625 12.1875 L 17.3125 12.1875 L 18.875 12.1875 L 17.3125 15.8125 L 16.125 18.5625 L 4.625 18.5625 L 7.40625 12.1875 z "
-       id="path3852"
-       transform="translate(0,16)" /><path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 10.871989,16.277227 A 0.68301385,0.68301385 0 0 0 10.381122,16.6187 l -3.0519134,5.356855 a 0.68301385,0.68301385 0 0 0 0.5762354,1.024418 l 6.167852,0 a 0.68301385,0.68301385 0 0 0 0.597578,-1.024418 L 11.576276,16.6187 a 0.68301385,0.68301385 0 0 0 -0.704287,-0.341473 z"
-       id="path3001"
-       inkscape:connector-curvature="0" /></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_samplers_save.svg b/res/skins/Tango/buttons/btn_samplers_save.svg
deleted file mode 100644
index da9c22e77e6e..000000000000
--- a/res/skins/Tango/buttons/btn_samplers_save.svg
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-
-<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"
-   xml:space="preserve"
-   height="22"
-   width="22"
-   version="1.0"
-   viewBox="0 0 22 22"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_samplers_save.svg"><defs
-     id="defs13" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview11"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:zoom="11.313708"
-     inkscape:cx="1.8314029"
-     inkscape:cy="21.962509"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer2"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true" /><metadata
-     id="metadata19"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="bak"
-     style="opacity:0.31468584;display:none"
-     transform="translate(0,-16)"><g
-       id="Layer_x0020_4"
-       style="stroke:#000000;stroke-width:1.51660764"
-       transform="matrix(0.66070257,0,0,0.65803279,4.5351031,8.5499156)"><g
-         id="g5"
-         style="stroke-width:1.51660764"><path
-           id="path7"
-           style="fill:none;stroke:#ffffff;stroke-width:10.17492104"
-           d="m 7.1,10.6 c -1.3,0 -2.3,1 -2.3,2.3 l 0.1,22.3 c 0,1.4 0.9,2.3 2.3,2.3 h 0.1 27.5 c 1.1,0 2.1,-0.6 2.9,-1.6 0.6,-0.9 2.2,-4.5 3.1,-6.8 1.6,-4.1 2.5,-6.7 2.5,-7.9 0,-0.3 0,-1.2 -0.7,-1.7 C 42,19 41.2,18.9 40.4,18.9 h -4 V 17.2 C 36.4,15.9 35.5,15 34.2,15 h -14 v -2.2 c 0,-1.2 -1,-2.2 -2.3,-2.2 H 7.1 z"
-           inkscape:connector-curvature="0" /><path
-           id="path9"
-           d="m 7.1,10.6 c -1.3,0 -2.3,1 -2.3,2.3 l 0.1,22.3 c 0,1.4 0.9,2.3 2.3,2.3 h 0.1 27.5 c 1.1,0 2.1,-0.6 2.9,-1.6 0.6,-0.9 2.2,-4.5 3.1,-6.8 1.6,-4.1 2.5,-6.7 2.5,-7.9 0,-0.3 0,-1.2 -0.7,-1.7 C 42,19 41.2,18.9 40.4,18.9 h -4 V 17.2 C 36.4,15.9 35.5,15 34.2,15 h -14 v -2.2 c 0,-1.2 -1,-2.2 -2.3,-2.2 H 7.1 z"
-           inkscape:connector-curvature="0"
-           style="stroke-width:1.51660764" /><path
-           id="path11"
-           style="fill:#ffffff;stroke-width:1.51660764"
-           d="M 8.9,35.3 H 34 c 0.6,0 1.2,-0.4 1.5,-0.9 0.7,-1 4.8,-10.6 4.8,-12.5 0,-0.4 0,-0.7 -1.3,-0.7 H 14.9 c -0.4,0 -0.8,0.1 -0.9,0.7 -0.1,1.5 -3.2,11.8 -4.3,13.1 -0.3,0.4 -0.9,0.4 -0.9,0.4 l 0.1,-0.1 z"
-           inkscape:connector-curvature="0" /></g></g></g><g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="btn"
-     transform="translate(0,-16)"><path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 11.128011,22.722746 a 0.68301385,0.68301385 0 0 0 0.490867,-0.341473 l 3.051913,-5.356855 A 0.68301385,0.68301385 0 0 0 14.094556,16 l -6.1678521,0 a 0.68301385,0.68301385 0 0 0 -0.597578,1.024418 l 3.0945981,5.356855 a 0.68301385,0.68301385 0 0 0 0.704287,0.341473 z"
-       id="path3001-3"
-       inkscape:connector-curvature="0" /><g
-       id="g3016"
-       style="fill:#888888;fill-opacity:1"><path
-         sodipodi:nodetypes="cccccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path3852"
-         d="m 2.5894551,24.746224 c -0.3325,0.06389 -0.5953076,0.389632 -0.5893425,0.730469 l 0,9.792838 C 2.0001502,35.651993 2.3456778,35.999962 2.7254573,36 l 13.8722167,0 c 0.37978,-3.8e-5 0.725307,-0.348007 0.725345,-0.730469 l 0,-3.561032 -1.201352,2.830564 -11.4921798,0 2.7880438,-6.52856 9.905488,0 0,-2.533811 c -3.8e-5,-0.382462 -0.345566,-0.73043 -0.725345,-0.730468 -6.9177056,0.0095 -6.9207143,0.02842 -13.8722167,0 -0.02265,-0.0011 -0.045351,-0.0011 -0.068001,0 -0.02265,-0.0011 -0.045351,-0.0011 -0.068001,0 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /><path
-         inkscape:connector-curvature="0"
-         id="path3804-3"
-         d="M 6.8508555,26.549567 A 0.72541726,0.73054131 0 0 0 6.2615128,27.00611 L 2.8841265,34.972778 A 0.72541726,0.73054131 0 0 0 3.5414702,36 l 13.0562038,0 a 0.72541726,0.73054131 0 0 0 0.657344,-0.433716 l 3.400054,-7.989496 a 0.72541726,0.73054131 0 0 0 -0.680011,-1.027221 l -13.0562045,0 a 0.72541726,0.73054131 0 0 0 -0.068001,0 z m 0.5666755,1.460936 11.469513,0 -2.765377,6.52856 -11.4921798,0 2.7880438,-6.52856 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#888888;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /></g></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_samplers_save_hover.svg b/res/skins/Tango/buttons/btn_samplers_save_hover.svg
deleted file mode 100644
index 6de21ba24a28..000000000000
--- a/res/skins/Tango/buttons/btn_samplers_save_hover.svg
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-
-<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"
-   xml:space="preserve"
-   height="22"
-   width="22"
-   version="1.0"
-   viewBox="0 0 22 22"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_samplers_save.svg"><defs
-     id="defs13" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview11"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:zoom="11.313708"
-     inkscape:cx="-13.106229"
-     inkscape:cy="21.962509"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer2"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true" /><metadata
-     id="metadata19"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="bak"
-     style="opacity:0.31468584;display:none"
-     transform="translate(0,-16)"><g
-       id="Layer_x0020_4"
-       style="stroke:#000000;stroke-width:1.51660764"
-       transform="matrix(0.66070257,0,0,0.65803279,4.5351031,8.5499156)"><g
-         id="g5"
-         style="stroke-width:1.51660764"><path
-           id="path7"
-           style="fill:none;stroke:#ffffff;stroke-width:10.17492104"
-           d="m 7.1,10.6 c -1.3,0 -2.3,1 -2.3,2.3 l 0.1,22.3 c 0,1.4 0.9,2.3 2.3,2.3 h 0.1 27.5 c 1.1,0 2.1,-0.6 2.9,-1.6 0.6,-0.9 2.2,-4.5 3.1,-6.8 1.6,-4.1 2.5,-6.7 2.5,-7.9 0,-0.3 0,-1.2 -0.7,-1.7 C 42,19 41.2,18.9 40.4,18.9 h -4 V 17.2 C 36.4,15.9 35.5,15 34.2,15 h -14 v -2.2 c 0,-1.2 -1,-2.2 -2.3,-2.2 H 7.1 z"
-           inkscape:connector-curvature="0" /><path
-           id="path9"
-           d="m 7.1,10.6 c -1.3,0 -2.3,1 -2.3,2.3 l 0.1,22.3 c 0,1.4 0.9,2.3 2.3,2.3 h 0.1 27.5 c 1.1,0 2.1,-0.6 2.9,-1.6 0.6,-0.9 2.2,-4.5 3.1,-6.8 1.6,-4.1 2.5,-6.7 2.5,-7.9 0,-0.3 0,-1.2 -0.7,-1.7 C 42,19 41.2,18.9 40.4,18.9 h -4 V 17.2 C 36.4,15.9 35.5,15 34.2,15 h -14 v -2.2 c 0,-1.2 -1,-2.2 -2.3,-2.2 H 7.1 z"
-           inkscape:connector-curvature="0"
-           style="stroke-width:1.51660764" /><path
-           id="path11"
-           style="fill:#ffffff;stroke-width:1.51660764"
-           d="M 8.9,35.3 H 34 c 0.6,0 1.2,-0.4 1.5,-0.9 0.7,-1 4.8,-10.6 4.8,-12.5 0,-0.4 0,-0.7 -1.3,-0.7 H 14.9 c -0.4,0 -0.8,0.1 -0.9,0.7 -0.1,1.5 -3.2,11.8 -4.3,13.1 -0.3,0.4 -0.9,0.4 -0.9,0.4 l 0.1,-0.1 z"
-           inkscape:connector-curvature="0" /></g></g></g><g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="btn"
-     transform="translate(0,-16)"><path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 11.128011,24.722746 a 0.68301385,0.68301385 0 0 0 0.490867,-0.341473 l 3.051913,-5.356855 A 0.68301385,0.68301385 0 0 0 14.094556,18 l -6.1678521,0 a 0.68301385,0.68301385 0 0 0 -0.597578,1.024418 l 3.0945981,5.356855 a 0.68301385,0.68301385 0 0 0 0.704287,0.341473 z"
-       id="path3001-3"
-       inkscape:connector-curvature="0" /><g
-       id="g3016"
-       style="fill:#d2d2d2;fill-opacity:1"><path
-         sodipodi:nodetypes="cccccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path3852"
-         d="m 2.5894551,24.746224 c -0.3325,0.06389 -0.5953076,0.389632 -0.5893425,0.730469 l 0,9.792838 C 2.0001502,35.651993 2.3456778,35.999962 2.7254573,36 l 13.8722167,0 c 0.37978,-3.8e-5 0.725307,-0.348007 0.725345,-0.730469 l 0,-3.561032 -1.201352,2.830564 -11.4921798,0 2.7880438,-6.52856 9.905488,0 0,-2.533811 c -3.8e-5,-0.382462 -0.345566,-0.73043 -0.725345,-0.730468 -6.9177056,0.0095 -6.9207143,0.02842 -13.8722167,0 -0.02265,-0.0011 -0.045351,-0.0011 -0.068001,0 -0.02265,-0.0011 -0.045351,-0.0011 -0.068001,0 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /><path
-         inkscape:connector-curvature="0"
-         id="path3804-3"
-         d="M 6.8508555,26.549567 A 0.72541726,0.73054131 0 0 0 6.2615128,27.00611 L 2.8841265,34.972778 A 0.72541726,0.73054131 0 0 0 3.5414702,36 l 13.0562038,0 a 0.72541726,0.73054131 0 0 0 0.657344,-0.433716 l 3.400054,-7.989496 a 0.72541726,0.73054131 0 0 0 -0.680011,-1.027221 l -13.0562045,0 a 0.72541726,0.73054131 0 0 0 -0.068001,0 z m 0.5666755,1.460936 11.469513,0 -2.765377,6.52856 -11.4921798,0 2.7880438,-6.52856 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#d2d2d2;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /></g></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_skinsettings_checked.svg b/res/skins/Tango/buttons/btn_skinsettings_checked.svg
deleted file mode 100644
index d95ada487554..000000000000
--- a/res/skins/Tango/buttons/btn_skinsettings_checked.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="17"
-   height="17"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_skinsettings_checked.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="10.226595"
-     inkscape:cy="1.592157"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2996"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1035.3622)">
-    <path
-       style="fill:none;stroke:#eeeeee;stroke-width:1.79999994999999990;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 6.9044324,1046.4239 3,3 3.9999976,-6"
-       id="path2998"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_skinsettings_close.svg b/res/skins/Tango/buttons/btn_skinsettings_close.svg
index 62934f57378a..530c5e820d40 100644
--- a/res/skins/Tango/buttons/btn_skinsettings_close.svg
+++ b/res/skins/Tango/buttons/btn_skinsettings_close.svg
@@ -1,100 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="20"
-   height="20"
-   viewBox="0 0 20 20"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_skinsettings_close.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview7"
-     showgrid="false"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:zoom="16"
-     inkscape:cx="-0.1924847"
-     inkscape:cy="7.8510284"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer2"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       orientation="1,0"
-       position="3,14.125"
-       id="guide2983" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="17,14.125"
-       id="guide2985" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="13.0625,17"
-       id="guide2987" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="12.75,3"
-       id="guide2989" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="ON"
-     style="display:inline"
-     transform="translate(0,-28)">
-    <rect
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2983"
-       width="14"
-       height="1.5"
-       x="-26.79899"
-       y="33.191124"
-       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-    <rect
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2983-3"
-       width="14"
-       height="1.5"
-       x="26.941126"
-       y="19.04899"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><path d="M5.5286634122 4.7729213872c-.2006436316-.0065044188-.397012833.0611415364-.545796962.2099215574-.2975681438.2975680297-.275421739.7951800292.0419843115 1.1125865362l3.9045478135 3.9045478136-3.9045478135 3.9045478135c-.3174061647.3174053659-.3395525695.8150173654-.0419843115 1.1125853952.2975681438.2975691708.7951801434.2754221955 1.1125861939-.0419820293l3.9045478136-3.9045478135 3.9045481559 3.9045478135c.3174053658.317406507.8150173654.3395534824 1.112585395.0419820293.297569171-.2975680298.2754221956-.7951800293-.0419820291-1.1125853952l-3.9045478136-3.9045478135 3.9045478136-3.9045478136c.317406507-.317406507.3395534823-.8150185065.0419820292-1.1125865362-.2975680297-.2975680298-.7951800293-.2754221955-1.1125853951.0419820292l-3.904548156 3.9045500958L6.0954526442 5.024827256c-.1587030253-.1587032535-.3661454862-.2454334016-.5667892319-.2519058688z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_skinsettings_close_hover.svg b/res/skins/Tango/buttons/btn_skinsettings_close_hover.svg
new file mode 100644
index 000000000000..9511aef09986
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_skinsettings_close_hover.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><path d="M5.5286634122 4.7729213872c-.2006436316-.0065044188-.397012833.0611415364-.545796962.2099215574-.2975681438.2975680297-.275421739.7951800292.0419843115 1.1125865362l3.9045478135 3.9045478136-3.9045478135 3.9045478135c-.3174061647.3174053659-.3395525695.8150173654-.0419843115 1.1125853952.2975681438.2975691708.7951801434.2754221955 1.1125861939-.0419820293l3.9045478136-3.9045478135 3.9045481559 3.9045478135c.3174053658.317406507.8150173654.3395534824 1.112585395.0419820293.297569171-.2975680298.2754221956-.7951800293-.0419820291-1.1125853952l-3.9045478136-3.9045478135 3.9045478136-3.9045478136c.317406507-.317406507.3395534823-.8150185065.0419820292-1.1125865362-.2975680297-.2975680298-.7951800293-.2754221955-1.1125853951.0419820292l-3.904548156 3.9045500958L6.0954526442 5.024827256c-.1587030253-.1587032535-.3661454862-.2454334016-.5667892319-.2519058688z" fill="#eee"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_skinsettings_off.svg b/res/skins/Tango/buttons/btn_skinsettings_off.svg
index 3db75a1e31cb..51c41687c67d 100644
--- a/res/skins/Tango/buttons/btn_skinsettings_off.svg
+++ b/res/skins/Tango/buttons/btn_skinsettings_off.svg
@@ -1,70 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="20"
-   height="20"
-   viewBox="0 0 20 20"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_skinsettings_off.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview7"
-     showgrid="false"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:zoom="16"
-     inkscape:cx="-3.0428594"
-     inkscape:cy="10.583762"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer2"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="ON"
-     style="display:inline"
-     transform="translate(0,-28)">
-    <path
-       d="m 3,43 14,0 0,-1.6666 -14,0 L 3,43 z m 0,-4.1666 14,0 0,-1.6667 -14,0 0,1.6667 z M 3,33 l 0,1.6667 14,0 L 17,33 3,33 z"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#888888;fill-opacity:1" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><rect width="16" height="1.99985" x="2" y="3.99985" rx="1" ry="1" fill="#888"/><rect width="16" height="1.99985" x="2" y="9.0001497" rx="1" ry="1" fill="#888"/><rect width="16" height="1.99985" x="2" y="14.00015" rx="1" ry="1" fill="#888"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_skinsettings_on.svg b/res/skins/Tango/buttons/btn_skinsettings_on.svg
index f810973173d6..6c7dd62959f9 100644
--- a/res/skins/Tango/buttons/btn_skinsettings_on.svg
+++ b/res/skins/Tango/buttons/btn_skinsettings_on.svg
@@ -1,71 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="20"
-   height="20"
-   viewBox="0 0 20 20"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_skinsettings_off.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview7"
-     showgrid="false"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:zoom="11.313708"
-     inkscape:cx="0.46320313"
-     inkscape:cy="8.6971515"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer2"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="ON"
-     style="display:inline"
-     transform="translate(0,-28)">
-    <path
-       d="m 3,43 14,0 0,-2 -14,0 z m 0,-4 14,0 0,-2 -14,0 z m 0,-6 0,2.00015 14,-3e-4 L 17,33 z"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#d2d2d2;fill-opacity:1"
-       sodipodi:nodetypes="ccccccccccccccc" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><g transform="translate(0 -28)" fill="#d2d2d2"><rect width="16" height="1.99985" x="2" y="31.000151" rx="1" ry="1"/><rect width="15.3125" height="1.99985" x="2.34375" y="37.000149" rx="1" ry="1"/><rect width="16" height="1.99985" x="2" y="43.000149" rx="1" ry="1"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_slipmode_hidden.svg b/res/skins/Tango/buttons/btn_slipmode_hidden.svg
new file mode 100644
index 000000000000..8c52457bb3f0
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_slipmode_hidden.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15"><path d="M9.159977717 4.0002652436l-4.0799890028 7.0667479222L.9999999929 4.0002651694z" fill="#666"/><path d="M14.000000017 4.0002652436l-4.0799890028 7.0667479222-4.0799887213-7.0667479964z" fill="#999"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_slipmode_off.svg b/res/skins/Tango/buttons/btn_slipmode_off.svg
index 0f4fee397e82..0ee609a5d6c8 100644
--- a/res/skins/Tango/buttons/btn_slipmode_off.svg
+++ b/res/skins/Tango/buttons/btn_slipmode_off.svg
@@ -1,100 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_slipmode_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="8.72901"
-     inkscape:cy="11.676973"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1030.3622)">
-    <path
-       sodipodi:type="star"
-       style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3018-5-2"
-       sodipodi:sides="3"
-       sodipodi:cx="3"
-       sodipodi:cy="5"
-       sodipodi:r1="15.119611"
-       sodipodi:r2="7.5598059"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 18.119611,5 -22.6794164,13.093967 0,-26.187934 z"
-       transform="matrix(0.39683453,-0.22911252,0.22911252,0.39683453,5.6639174,1038.1372)"
-       inkscape:transform-center-y="1.732056" />
-    <path
-       sodipodi:type="star"
-       style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3018"
-       sodipodi:sides="3"
-       sodipodi:cx="3"
-       sodipodi:cy="5"
-       sodipodi:r1="15.119611"
-       sodipodi:r2="7.5598059"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 18.119611,5 -22.6794164,13.093967 0,-26.187934 z"
-       transform="matrix(0.39683453,-0.22911252,0.22911252,0.39683453,11.663882,1038.1372)"
-       inkscape:transform-center-y="1.732056" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22"><path d="M13.999967315 6.0000429124L7.9999835434 16.3923193962 1.999999991 6.0000429156z" fill="#666"/><path d="M19.999999915 6.0000429124l-5.9999837716 10.3922764838L8.000032591 6.0000429156z" fill="#999"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_slipmode_on.svg b/res/skins/Tango/buttons/btn_slipmode_on.svg
index aeb29962f4aa..a4adc6b51ed3 100644
--- a/res/skins/Tango/buttons/btn_slipmode_on.svg
+++ b/res/skins/Tango/buttons/btn_slipmode_on.svg
@@ -1,117 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_slipmode_on.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="20.197091"
-     inkscape:cy="12.768082"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <sodipodi:guide
-       orientation="0,1"
-       position="13.4375,17"
-       id="guide3012" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="14.499983,6.6076806"
-       id="guide3014" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="13.5,6.6076806"
-       id="guide3826" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="8.4999998,6.6076806"
-       id="guide3828" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1030.3622)">
-    <path
-       sodipodi:type="star"
-       style="fill:#dc0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3018"
-       sodipodi:sides="3"
-       sodipodi:cx="3"
-       sodipodi:cy="5"
-       sodipodi:r1="15.119611"
-       sodipodi:r2="7.5598059"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 18.119611,5 -22.6794164,13.093967 0,-26.187934 z"
-       transform="matrix(0.39683453,-0.22911252,0.22911252,0.39683453,5.6639174,1038.1372)"
-       inkscape:transform-center-y="1.732056" />
-    <path
-       sodipodi:type="star"
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3018-5-2"
-       sodipodi:sides="3"
-       sodipodi:cx="3"
-       sodipodi:cy="5"
-       sodipodi:r1="15.119611"
-       sodipodi:r2="7.5598059"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 18.119611,5 -22.6794164,13.093967 0,-26.187934 z"
-       transform="matrix(0.39683453,-0.22911252,0.22911252,0.39683453,11.663933,1038.1372)"
-       inkscape:transform-center-y="1.732056" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22"><path d="M13.999967315 6.0000429124L7.9999835434 16.3923193962 1.999999991 6.0000429156z" fill="#dc0000"/><path d="M19.999999915 6.0000429124l-5.9999837716 10.3922764838L8.000032591 6.0000429156z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_slipmode_visible.svg b/res/skins/Tango/buttons/btn_slipmode_visible.svg
index 354b42025e82..4c940b6c6a1a 100644
--- a/res/skins/Tango/buttons/btn_slipmode_visible.svg
+++ b/res/skins/Tango/buttons/btn_slipmode_visible.svg
@@ -1,100 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_slipmode_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="3.838385"
-     inkscape:cy="11.676973"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1030.3622)">
-    <path
-       sodipodi:type="star"
-       style="fill:#9f9f9f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3018-5-2"
-       sodipodi:sides="3"
-       sodipodi:cx="3"
-       sodipodi:cy="5"
-       sodipodi:r1="15.119611"
-       sodipodi:r2="7.5598059"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 18.119611,5 -22.6794164,13.093967 0,-26.187934 z"
-       transform="matrix(0.39683453,-0.22911252,0.22911252,0.39683453,5.6639174,1038.1372)"
-       inkscape:transform-center-y="1.732056" />
-    <path
-       sodipodi:type="star"
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3018"
-       sodipodi:sides="3"
-       sodipodi:cx="3"
-       sodipodi:cy="5"
-       sodipodi:r1="15.119611"
-       sodipodi:r2="7.5598059"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 18.119611,5 -22.6794164,13.093967 0,-26.187934 z"
-       transform="matrix(0.39683453,-0.22911252,0.22911252,0.39683453,11.663882,1038.1372)"
-       inkscape:transform-center-y="1.732056" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15"><path d="M9.159977717 4.0002652436l-4.0799890028 7.0667479222L.9999999929 4.0002651694z" fill="#9f9f9f"/><path d="M14.000000017 4.0002652436l-4.0799890028 7.0667479222-4.0799887213-7.0667479964z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_speaker_off.svg b/res/skins/Tango/buttons/btn_speaker_off.svg
deleted file mode 100644
index 1d3c2ea731de..000000000000
--- a/res/skins/Tango/buttons/btn_speaker_off.svg
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="56"
-   height="56"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_speaker_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="13.230841"
-     inkscape:cy="14.332361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="headphone"
-     style="display:none">
-    <path
-       inkscape:connector-curvature="0"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#0f0f0f;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 28,7.71875 C 16.823882,7.71875 7.71875,16.8237 7.71875,28 c 0,1.2779 0.1165944,2.50725 0.34375,3.71875 l 0.3125,1.6875 c -0.6845218,0.420478 -1.0961337,1.22385 -0.9375,2.0625 l 2.40625,12.625 c 0.205406,1.085923 1.226577,1.799156 2.3125,1.59375 l 4.5,-0.84375 C 17.742173,48.638344 18.455406,47.585923 18.25,46.5 L 15.84375,33.875 c -0.205406,-1.085923 -1.226577,-1.799156 -2.3125,-1.59375 L 12.75,32.4375 12.46875,30.90625 12.40625,30.625 l 0.0625,0 c -0.147469,-0.8597 -0.25,-1.7157 -0.25,-2.625 0,-8.7438 7.037512,-15.78125 15.78125,-15.78125 8.743738,-10e-5 15.78125,7.03745 15.78125,15.78125 0,1.0064 -0.104443,1.95805 -0.28125,2.90625 L 43.21875,32.4375 42.375,32.28125 c -1.085942,-0.205406 -2.13834,0.507827 -2.34375,1.59375 l -2.375,12.625 c -0.20541,1.085923 0.476558,2.138344 1.5625,2.34375 l 4.5,0.84375 c 1.085942,0.205406 2.10709,-0.507827 2.3125,-1.59375 l 2.40625,-12.625 C 48.58978,34.663705 48.258808,33.870614 47.625,33.4375 l 0.25,-1.40625 -0.03125,0 0.0625,-0.3125 C 48.134161,30.50325 48.28125,29.2738 48.28125,28 48.28125,16.8237 39.176117,7.71875 28,7.71875 z"
-       id="path3925" />
-  </g>
-  <g
-     transform="translate(0,-996.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <path
-       style="fill:#0f0f0f;fill-opacity:1;stroke:none"
-       d="m 30,1000.3622 -16,16 0,16 16,16 2,0 0,-48 -2,0 z"
-       id="path2991"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect3783-5"
-       width="8"
-       height="16.000004"
-       x="4"
-       y="1015.9712" />
-    <path
-       style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 38.8125,9.1875 37.75,12.03125 C 44.307305,14.386136 49,20.629158 49,28 49,35.336389 44.352915,41.557268 37.84375,43.9375 L 38.875,46.78125 C 46.527416,43.971203 52,36.62316 52,28 52,19.352157 46.499342,11.979482 38.8125,9.1875 z"
-       transform="translate(0,996.3622)"
-       id="path4069"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       d="m 36.75,14.84375 -1.03125,2.8125 C 39.954943,19.184741 43,23.23662 43,28 c 0,4.728294 -3.000265,8.758468 -7.1875,10.3125 l 1,2.8125 C 42.172304,39.163959 46,34.039098 46,28 46,21.936122 42.144376,16.786637 36.75,14.84375 z"
-       transform="translate(0,996.3622)"
-       id="path4069-6"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_speaker_on.svg b/res/skins/Tango/buttons/btn_speaker_on.svg
deleted file mode 100644
index 5bfe9de1a6a1..000000000000
--- a/res/skins/Tango/buttons/btn_speaker_on.svg
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="56"
-   height="56"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_speaker_off.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="13.230841"
-     inkscape:cy="14.332361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-paths="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="headphone"
-     style="display:none">
-    <path
-       inkscape:connector-curvature="0"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#0f0f0f;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 28,7.71875 C 16.823882,7.71875 7.71875,16.8237 7.71875,28 c 0,1.2779 0.1165944,2.50725 0.34375,3.71875 l 0.3125,1.6875 c -0.6845218,0.420478 -1.0961337,1.22385 -0.9375,2.0625 l 2.40625,12.625 c 0.205406,1.085923 1.226577,1.799156 2.3125,1.59375 l 4.5,-0.84375 C 17.742173,48.638344 18.455406,47.585923 18.25,46.5 L 15.84375,33.875 c -0.205406,-1.085923 -1.226577,-1.799156 -2.3125,-1.59375 L 12.75,32.4375 12.46875,30.90625 12.40625,30.625 l 0.0625,0 c -0.147469,-0.8597 -0.25,-1.7157 -0.25,-2.625 0,-8.7438 7.037512,-15.78125 15.78125,-15.78125 8.743738,-10e-5 15.78125,7.03745 15.78125,15.78125 0,1.0064 -0.104443,1.95805 -0.28125,2.90625 L 43.21875,32.4375 42.375,32.28125 c -1.085942,-0.205406 -2.13834,0.507827 -2.34375,1.59375 l -2.375,12.625 c -0.20541,1.085923 0.476558,2.138344 1.5625,2.34375 l 4.5,0.84375 c 1.085942,0.205406 2.10709,-0.507827 2.3125,-1.59375 l 2.40625,-12.625 C 48.58978,34.663705 48.258808,33.870614 47.625,33.4375 l 0.25,-1.40625 -0.03125,0 0.0625,-0.3125 C 48.134161,30.50325 48.28125,29.2738 48.28125,28 48.28125,16.8237 39.176117,7.71875 28,7.71875 z"
-       id="path3925" />
-  </g>
-  <g
-     transform="translate(0,-996.3622)"
-     id="g3923"
-     inkscape:groupmode="layer"
-     inkscape:label="OFF"
-     style="display:inline">
-    <path
-       style="fill:#888888;fill-opacity:1;stroke:none"
-       d="m 30,1000.3622 -16,16 0,16 16,16 2,0 0,-48 -2,0 z"
-       id="path2991"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect3783-5"
-       width="8"
-       height="16.000004"
-       x="4"
-       y="1015.9712" />
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 38.8125,9.1875 37.75,12.03125 C 44.307305,14.386136 49,20.629158 49,28 49,35.336389 44.352915,41.557268 37.84375,43.9375 L 38.875,46.78125 C 46.527416,43.971203 52,36.62316 52,28 52,19.352157 46.499342,11.979482 38.8125,9.1875 z"
-       transform="translate(0,996.3622)"
-       id="path4069"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       d="m 36.75,14.84375 -1.03125,2.8125 C 39.954943,19.184741 43,23.23662 43,28 c 0,4.728294 -3.000265,8.758468 -7.1875,10.3125 l 1,2.8125 C 42.172304,39.163959 46,34.039098 46,28 46,21.936122 42.144376,16.786637 36.75,14.84375 z"
-       transform="translate(0,996.3622)"
-       id="path4069-6"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_spinny.svg b/res/skins/Tango/buttons/btn_spinny.svg
deleted file mode 100644
index 8add14392662..000000000000
--- a/res/skins/Tango/buttons/btn_spinny.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_spinny.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview7"
-     showgrid="false"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:zoom="5.656854"
-     inkscape:cx="52.304015"
-     inkscape:cy="19.158334"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer3"
-     inkscape:bbox-paths="true"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="On"
-     style="display:inline">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#888888;fill-opacity:1;display:inline"
-       d="m 23.25,7.0000008 c -1.232669,0.052704 -2.47287,0.2454144 -3.65625,0.5625 -4.207573,1.1274144 -7.968544,3.8770822 -10.3125,7.9374982 -4.6885044,8.120163 -1.9016945,18.530736 6.21875,23.21875 8.120059,4.688119 18.530632,1.901311 23.218749,-6.218748 0.260215,-0.450706 0.504348,-0.880476 0.718752,-1.343751 0.179064,-0.386515 0.321578,-0.825252 0.468749,-1.218751 0.0348,-0.0942 0.09144,-0.155064 0.124992,-0.249998 0.153312,-0.432415 0.289668,-0.874399 0.40625,-1.3125 0.0091,-0.03557 -0.0091,-0.08942 0,-0.124992 0.122088,-0.471672 0.232944,-0.930444 0.312502,-1.406249 1.146376,-6.806628 -1.931801,-13.915502 -8.25,-17.5624992 -2.537585,-1.4652792 -5.28895,-2.2052688 -8.03125,-2.2812504 -0.411346,-0.01128 -0.807861,-0.01752 -1.218751,0 z m 7.65625,2.625 c 0.149616,0.072048 0.290073,0.142032 0.4375,0.21876 0.341441,0.1776482 0.671712,0.3606362 1.000001,0.5624972 C 32.564599,10.54205 32.785582,10.72781 33,10.87501 L 27.124999,21.03126 C 26.785361,20.675611 26.390014,20.381654 25.937501,20.156258 25.68241,20.029202 25.412395,19.952018 25.125,19.87501 25.083,19.86373 25.04196,19.85365 25.000008,19.843762 L 30.90625,9.6250128 z M 23.875,21.656249 c 0.466388,-0.0287 0.89312,0.08842 1.28125,0.312501 0.517505,0.298781 0.9254,0.809204 1.09375,1.4375 0.123576,0.461217 0.106728,0.894122 -0.03125,1.3125 -0.0079,0.02304 0.0084,0.07111 0,0.09374 -0.03636,0.09941 -0.106944,0.188568 -0.15624,0.281248 -0.01392,0.02599 -0.01632,0.0367 -0.03125,0.0625 -0.0132,0.02328 -0.01728,0.07159 -0.03125,0.09374 -0.06204,0.09948 -0.142344,0.191952 -0.218736,0.281252 -0.005,0.0062 -0.02611,-0.0062 -0.03125,0 -0.294931,0.337329 -0.687377,0.593107 -1.156282,0.718749 -0.463932,0.12432 -0.922835,0.10896 -1.34375,-0.03125 -0.0273,-0.0096 -0.03541,-0.02064 -0.0625,-0.03125 -0.07976,-0.03 -0.174295,-0.05539 -0.25,-0.09374 -0.0371,-0.0192 -0.05705,-0.04133 -0.09375,-0.0625 -0.03784,-0.02184 -0.0886,-0.07006 -0.124999,-0.09374 -0.06808,-0.04428 -0.124289,-0.07361 -0.1875,-0.124992 -0.0259,-0.02064 -0.06909,-0.04099 -0.09375,-0.0625 C 22.106773,25.456236 21.874067,25.056775 21.75,24.59375 21.625932,24.130723 21.641718,23.66977 21.78125,23.25 c 0.01061,-0.03096 0.01918,-0.06288 0.03125,-0.09374 0.02904,-0.07613 0.05693,-0.146376 0.09375,-0.21876 0.01968,-0.03869 0.04065,-0.05592 0.0625,-0.09374 0.02516,-0.04356 0.06651,-0.08376 0.09375,-0.124992 0.04121,-0.06144 0.07838,-0.129936 0.124999,-0.187512 0.02692,-0.03338 0.06577,-0.06252 0.09375,-0.09374 0.291664,-0.32047 0.671469,-0.565975 1.125,-0.687499 0.157073,-0.0421 0.313287,-0.08417 0.46875,-0.09374 z"
-       id="path3800-3" />
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_stars_hidden.svg b/res/skins/Tango/buttons/btn_stars_hidden.svg
new file mode 100644
index 000000000000..0eaa6433251e
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_stars_hidden.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15"><path d="M9.9988547457 14.3114278715L7.0273872294 10.175568297l-4.8448570326 1.5691765199 3.0152023305-4.1040844403-2.9895186789-4.1228306295 4.8349649037 1.599395911L10.0404117437.999999676l-.0270296248 5.0925654527 4.8419104551 1.5782451031-4.851670091 1.5479826631z" fill="#888"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_stars_off.svg b/res/skins/Tango/buttons/btn_stars_off.svg
deleted file mode 100644
index 317790bf02d4..000000000000
--- a/res/skins/Tango/buttons/btn_stars_off.svg
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="15"
-   height="15"
-   viewBox="0 0 15 15"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_stars_off.svg"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview2993"
-     showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="-0.8146331"
-     inkscape:cy="1.8206048"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3886"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       orientation="0,1"
-       position="8.0545172,9.1656634"
-       id="guide6037" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="8.1266506,3.6667958"
-       id="guide6039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="4.0492994,6.2517022"
-       id="guide6041" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="12.292,6.4718247"
-       id="guide6043" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="g3886"
-     style="display:inline"
-     transform="translate(0,-33)">
-    <path
-       sodipodi:type="star"
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path2989"
-       sodipodi:sides="5"
-       sodipodi:cx="3.1819806"
-       sodipodi:cy="0"
-       sodipodi:r1="5.7914376"
-       sodipodi:r2="2.2007463"
-       sodipodi:arg1="1.4330036"
-       sodipodi:arg2="2.0613221"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M 3.9774757,5.736544 2.1452316,1.9412459 -2.0279755,2.5292504 1.015373,-0.38612889 -0.8334444,-4.1733813 2.8796924,-2.1798867 5.9102676,-5.1085419 5.1617639,-0.9611152 8.8835797,1.0161288 4.7078422,1.5858849 z"
-       transform="matrix(1.1854537,-0.23427619,0.23427619,1.1854537,4.5402447,41.285998)"
-       inkscape:transform-center-x="-0.62960604"
-       inkscape:transform-center-y="-0.040535298" />
-  </g>
-</svg>
diff --git a/res/skins/Tango/buttons/btn_stars_visible.svg b/res/skins/Tango/buttons/btn_stars_visible.svg
index 1d111fa21cae..2a8cbc12f582 100644
--- a/res/skins/Tango/buttons/btn_stars_visible.svg
+++ b/res/skins/Tango/buttons/btn_stars_visible.svg
@@ -1,100 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="15"
-   height="15"
-   viewBox="0 0 15 15"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_stars_off.svg"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview2993"
-     showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="-46.314633"
-     inkscape:cy="1.8206048"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3886"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       orientation="0,1"
-       position="8.0545172,9.1656634"
-       id="guide6037" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="8.1266506,3.6667958"
-       id="guide6039" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="4.0492994,6.2517022"
-       id="guide6041" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="12.292,6.4718247"
-       id="guide6043" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     id="g3886"
-     style="display:inline"
-     transform="translate(0,-33)">
-    <path
-       sodipodi:type="star"
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path2989"
-       sodipodi:sides="5"
-       sodipodi:cx="3.1819806"
-       sodipodi:cy="0"
-       sodipodi:r1="5.7914376"
-       sodipodi:r2="2.2007463"
-       sodipodi:arg1="1.4330036"
-       sodipodi:arg2="2.0613221"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M 3.9774757,5.736544 2.1452316,1.9412459 -2.0279755,2.5292504 1.015373,-0.38612889 -0.8334444,-4.1733813 2.8796924,-2.1798867 5.9102676,-5.1085419 5.1617639,-0.9611152 8.8835797,1.0161288 4.7078422,1.5858849 z"
-       transform="matrix(1.1854537,-0.23427619,0.23427619,1.1854537,4.5402447,41.285998)"
-       inkscape:transform-center-x="-0.62960604"
-       inkscape:transform-center-y="-0.040535298" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15"><path d="M9.9988547457 14.3114278715L7.0273872294 10.175568297l-4.8448570326 1.5691765199 3.0152023305-4.1040844403-2.9895186789-4.1228306295 4.8349649037 1.599395911L10.0404117437.999999676l-.0270296248 5.0925654527 4.8419104551 1.5782451031-4.851670091 1.5479826631z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_wave_off.svg b/res/skins/Tango/buttons/btn_wave_off.svg
index a149e4bc136f..8ff4731f6377 100644
--- a/res/skins/Tango/buttons/btn_wave_off.svg
+++ b/res/skins/Tango/buttons/btn_wave_off.svg
@@ -1,866 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_wave_off.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4574">
-      <stop
-         style="stop-color:#ffb401;stop-opacity:1;"
-         offset="0"
-         id="stop4576" />
-      <stop
-         style="stop-color:#c68c00;stop-opacity:1;"
-         offset="1"
-         id="stop4578" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3846">
-      <stop
-         style="stop-color:#b0b0b0;stop-opacity:1;"
-         offset="0"
-         id="stop3848" />
-      <stop
-         style="stop-color:#585858;stop-opacity:0;"
-         offset="1"
-         id="stop3850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4937">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3939">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941" />
-      <stop
-         id="stop5813"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5461">
-      <stop
-         id="stop5463"
-         offset="0"
-         style="stop-color:#b9dcff;stop-opacity:1;" />
-      <stop
-         id="stop5465"
-         offset="1"
-         style="stop-color:#0d0d0d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443" />
-      <stop
-         style="stop-color:#343434;stop-opacity:1;"
-         offset="1"
-         id="stop5445" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5483-8"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5441-4">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441-7">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-4" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4-6"
-       id="linearGradient5573-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692" />
-    <linearGradient
-       id="linearGradient5441-4-6">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2-5" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3945"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5024"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(54.522364,18.173742)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5032"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-57.471498)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5265"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5267"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5791"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5847"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3837"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3839"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3841"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937"
-       id="linearGradient4945"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48778"
-       y2="634.36542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient4947"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3"
-       id="radialGradient4947-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2" />
-      <stop
-         id="stop5813-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6"
-       id="linearGradient3142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-234.5901,-615.11102)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.257316,0,0,1,-252.5901,-618.29518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3935"
-       xlink:href="#linearGradient4937-6"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9"
-       xlink:href="#Grad0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5"
-         style="stop-color:#060606;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop12-7"
-         style="stop-color:#343434;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846"
-       id="linearGradient3852"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9-5"
-       xlink:href="#Grad0-8-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929" />
-      <stop
-         id="stop12-7-9"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846-6"
-       id="linearGradient3852-5"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3846-6">
-      <stop
-         id="stop3927"
-         offset="0"
-         style="stop-color:#7c7c7c;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3850-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898"
-       xlink:href="#Grad0-8-9"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-2"
-       id="radialGradient4006-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-1" />
-      <stop
-         id="stop5813-8-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9"
-       id="linearGradient4004-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898-0"
-       xlink:href="#Grad0-8-9-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9-5"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4-7"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929-9" />
-      <stop
-         id="stop12-7-9-6"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9-7"
-       id="linearGradient4004-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9-7">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0-9" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7-5" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4006-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5" />
-      <stop
-         id="stop5813-8-1"
-         offset="0.51428574"
-         style="stop-color:#e85708;stop-opacity:0.95686275;" />
-      <stop
-         style="stop-color:#e80808;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-6"
-       id="linearGradient4004-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-13.919877,95.08267)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7-5"
-       id="radialGradient4337-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7-5">
-      <stop
-         style="stop-color:#33aaee;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-0" />
-      <stop
-         id="stop5813-8-1-6"
-         offset="0.61061949"
-         style="stop-color:#4ebeff;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#2db2ff;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-4"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3939-3-7-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-05" />
-      <stop
-         id="stop5813-8-1-2"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-1" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-6"
-       xlink:href="#linearGradient4937-6-6-24"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-24">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-4" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130-8"
-       xlink:href="#linearGradient4937-6-6-2-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2-7">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2-4" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="621.81409"
-       x1="202.48863"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4865"
-       xlink:href="#linearGradient4574"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="-5.6105867"
-     inkscape:cy="8.1683629"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     fit-margin-top="2.7755576e-17"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true">
-    <sodipodi:guide
-       orientation="0,1"
-       position="20.1875,3"
-       id="guide3898" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="10,25.84375"
-       id="guide3182" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999767,17"
-       id="guide3950" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="0,10"
-       id="guide3139" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="3,13.700194"
-       id="guide3141" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="17,12.904699"
-       id="guide3143" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="1">
-    <rect
-       style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3888"
-       width="18"
-       height="1"
-       x="1"
-       y="9.5" />
-    <path
-       style="fill:none;stroke:#888888;stroke-width:1.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 3.875,10 c 0,0 0.7798472,-6.125 3.0625,-6.125 4.565306,0 1.5596946,12.25 6.125,12.25 2.282653,0 3.0625,-6.125 3.0625,-6.125"
-       id="path3145"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="caac" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><defs><linearGradient id="v"><stop offset="0" stop-color="#ffb401"/><stop offset="1" stop-color="#c68c00"/></linearGradient><linearGradient id="i"><stop offset="0" stop-color="#b0b0b0"/><stop offset="1" stop-color="#585858" stop-opacity="0"/></linearGradient><linearGradient id="e"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="d"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="f"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="g"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="h" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="j" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="k"><stop offset="0" stop-color="#7c7c7c" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="l"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="m"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="n" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="o"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="p"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".51428574" stop-color="#e85708" stop-opacity=".95686275"/><stop offset="1" stop-color="#e80808" stop-opacity="0"/></linearGradient><linearGradient id="q"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="r"><stop offset="0" stop-color="#3ae" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#4ebeff" stop-opacity=".8186813"/><stop offset="1" stop-color="#2db2ff" stop-opacity="0"/></linearGradient><linearGradient id="s"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient><linearGradient id="t"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="u"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient></defs><path fill="#0f0f0f" d="M1 9h18v1H1z"/><path d="M3.875 9.5s.7798472-6.125 3.0625-6.125c4.565306 0 1.5596946 12.25 6.125 12.25 2.282653 0 3.0625-6.125 3.0625-6.125" fill="none" stroke="#888" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_wave_on.svg b/res/skins/Tango/buttons/btn_wave_on.svg
index 39c2b4756fd3..682672bd3390 100644
--- a/res/skins/Tango/buttons/btn_wave_on.svg
+++ b/res/skins/Tango/buttons/btn_wave_on.svg
@@ -1,866 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="btn_wave_off.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4574">
-      <stop
-         style="stop-color:#ffb401;stop-opacity:1;"
-         offset="0"
-         id="stop4576" />
-      <stop
-         style="stop-color:#c68c00;stop-opacity:1;"
-         offset="1"
-         id="stop4578" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3846">
-      <stop
-         style="stop-color:#b0b0b0;stop-opacity:1;"
-         offset="0"
-         id="stop3848" />
-      <stop
-         style="stop-color:#585858;stop-opacity:0;"
-         offset="1"
-         id="stop3850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4937">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3939">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941" />
-      <stop
-         id="stop5813"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5461">
-      <stop
-         id="stop5463"
-         offset="0"
-         style="stop-color:#b9dcff;stop-opacity:1;" />
-      <stop
-         id="stop5465"
-         offset="1"
-         style="stop-color:#0d0d0d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443" />
-      <stop
-         style="stop-color:#343434;stop-opacity:1;"
-         offset="1"
-         id="stop5445" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5483-8"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5441-4">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441-7">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-4" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4-6"
-       id="linearGradient5573-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692" />
-    <linearGradient
-       id="linearGradient5441-4-6">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2-5" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3945"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5024"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(54.522364,18.173742)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5032"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-57.471498)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5265"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5267"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5791"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5847"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3837"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3839"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3841"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937"
-       id="linearGradient4945"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48778"
-       y2="634.36542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient4947"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3"
-       id="radialGradient4947-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2" />
-      <stop
-         id="stop5813-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6"
-       id="linearGradient3142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-234.5901,-615.11102)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.257316,0,0,1,-252.5901,-618.29518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3935"
-       xlink:href="#linearGradient4937-6"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9"
-       xlink:href="#Grad0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5"
-         style="stop-color:#060606;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop12-7"
-         style="stop-color:#343434;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846"
-       id="linearGradient3852"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9-5"
-       xlink:href="#Grad0-8-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929" />
-      <stop
-         id="stop12-7-9"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846-6"
-       id="linearGradient3852-5"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3846-6">
-      <stop
-         id="stop3927"
-         offset="0"
-         style="stop-color:#7c7c7c;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3850-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898"
-       xlink:href="#Grad0-8-9"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-2"
-       id="radialGradient4006-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-1" />
-      <stop
-         id="stop5813-8-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9"
-       id="linearGradient4004-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898-0"
-       xlink:href="#Grad0-8-9-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9-5"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4-7"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929-9" />
-      <stop
-         id="stop12-7-9-6"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9-7"
-       id="linearGradient4004-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9-7">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0-9" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7-5" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4006-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5" />
-      <stop
-         id="stop5813-8-1"
-         offset="0.51428574"
-         style="stop-color:#e85708;stop-opacity:0.95686275;" />
-      <stop
-         style="stop-color:#e80808;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-6"
-       id="linearGradient4004-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-13.919877,95.08267)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7-5"
-       id="radialGradient4337-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7-5">
-      <stop
-         style="stop-color:#33aaee;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-0" />
-      <stop
-         id="stop5813-8-1-6"
-         offset="0.61061949"
-         style="stop-color:#4ebeff;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#2db2ff;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-4"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3939-3-7-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-05" />
-      <stop
-         id="stop5813-8-1-2"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-1" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-6"
-       xlink:href="#linearGradient4937-6-6-24"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-24">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-4" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130-8"
-       xlink:href="#linearGradient4937-6-6-2-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2-7">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2-4" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="621.81409"
-       x1="202.48863"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4865"
-       xlink:href="#linearGradient4574"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="-5.5001012"
-     inkscape:cy="8.1683629"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     fit-margin-top="2.7755576e-17"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true">
-    <sodipodi:guide
-       orientation="0,1"
-       position="20.1875,3"
-       id="guide3898" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="10,25.84375"
-       id="guide3182" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="15.999767,17"
-       id="guide3950" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="0,10"
-       id="guide3139" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="3,13.700194"
-       id="guide3141" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="17,12.904699"
-       id="guide3143" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="1">
-    <rect
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3888"
-       width="18"
-       height="1"
-       x="1"
-       y="9.5" />
-    <path
-       style="fill:none;stroke:#d2d2d2;stroke-width:1.75000000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 3.875,10 c 0,0 0.7798472,-6.125 3.0625,-6.125 4.565306,0 1.5596946,12.25 6.125,12.25 2.282653,0 3.0625,-6.125 3.0625,-6.125"
-       id="path3145"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="caac" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><defs><linearGradient id="v"><stop offset="0" stop-color="#ffb401"/><stop offset="1" stop-color="#c68c00"/></linearGradient><linearGradient id="i"><stop offset="0" stop-color="#b0b0b0"/><stop offset="1" stop-color="#585858" stop-opacity="0"/></linearGradient><linearGradient id="e"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="d"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="f"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="g"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="h" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="j" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="k"><stop offset="0" stop-color="#7c7c7c" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="l"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="m"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="n" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="o"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="p"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".51428574" stop-color="#e85708" stop-opacity=".95686275"/><stop offset="1" stop-color="#e80808" stop-opacity="0"/></linearGradient><linearGradient id="q"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="r"><stop offset="0" stop-color="#3ae" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#4ebeff" stop-opacity=".8186813"/><stop offset="1" stop-color="#2db2ff" stop-opacity="0"/></linearGradient><linearGradient id="s"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient><linearGradient id="t"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="u"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient></defs><path fill="#d2d2d2" d="M1 9h18v1H1z"/><path d="M3.875 9.5s.7798472-6.125 3.0625-6.125c4.565306 0 1.5596946 12.25 6.125 12.25 2.282653 0 3.0625-6.125 3.0625-6.125" fill="none" stroke="#d2d2d2" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_xfader_center.svg b/res/skins/Tango/buttons/btn_xfader_center.svg
new file mode 100644
index 000000000000..218e9a316e7e
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_xfader_center.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><g fill="#888"><path fill="#b3b3b3" d="M9 17V3h2v14z"/><path d="M11 9h7v2h-7zM2 9h7v2H2z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_xfader_center_attention.svg b/res/skins/Tango/buttons/btn_xfader_center_attention.svg
new file mode 100644
index 000000000000..f1fb41c9ab33
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_xfader_center_attention.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><g fill="#888"><path fill="#ffb401" d="M9 17V3h2v14z"/><path d="M11 9h7v2h-7zM2 9h7v2H2z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_xfader_left.svg b/res/skins/Tango/buttons/btn_xfader_left.svg
new file mode 100644
index 000000000000..1f6ea9bf55b9
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_xfader_left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><g fill="#888"><path fill="#b3b3b3" d="M4 3v14H2V3z"/><path d="M11 9h7v2h-7zM4 9h5v2H4z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_xfader_left_attention.svg b/res/skins/Tango/buttons/btn_xfader_left_attention.svg
new file mode 100644
index 000000000000..b39b8d9db336
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_xfader_left_attention.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><g fill="#888"><path d="M11 9h7v2h-7zM2.90625 9H9v2H2.90625z"/><path fill="#dc0000" d="M4 3v14H2V3z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_xfader_right.svg b/res/skins/Tango/buttons/btn_xfader_right.svg
new file mode 100644
index 000000000000..e646d2fc0f51
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_xfader_right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><g fill="#888"><path fill="#b3b3b3" d="M16 17V3h2v14z"/><path d="M11 9h5v2h-5zM2 9h7v2H2z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_xfader_right_attention.svg b/res/skins/Tango/buttons/btn_xfader_right_attention.svg
new file mode 100644
index 000000000000..ececd4c6912d
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_xfader_right_attention.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><g fill="#888"><path d="M11 9h5v2h-5zM2 9h7v2H2z"/><path fill="#dc0000" d="M16 17V3h2v14z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/buttons/btn_xfader_visible.svg b/res/skins/Tango/buttons/btn_xfader_visible.svg
new file mode 100644
index 000000000000..d554ce172f8b
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_xfader_visible.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><g fill="#888"><path fill="#fff" d="M9 17V3h2v14z"/><path fill="#d2d2d2" d="M11 9h7v2h-7zM2 9h7v2H2z"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/crossfader12_skincontrols.xml b/res/skins/Tango/centerbox_deck12.xml
similarity index 69%
rename from res/skins/Tango/crossfader12_skincontrols.xml
rename to res/skins/Tango/centerbox_deck12.xml
index d2bf509e29f6..75f426f81b21 100644
--- a/res/skins/Tango/crossfader12_skincontrols.xml
+++ b/res/skins/Tango/centerbox_deck12.xml
@@ -1,6 +1,6 @@
 <!--
 Description:
-  Box in between decks (displayed in normal mode) with
+  Box in between decks in normal mode.
   * GUI toggle buttons (FX, Sampler, Lib, Wave ...)
   * Crossfader (if enabled)
   * Logo
@@ -16,7 +16,7 @@ Description:
     <Size>104f,1me</Size>
     <Children>
 
-      <WidgetGroup><!-- 4 Decks / Wave / Spinny / HotCues / Mixer -->
+      <WidgetGroup><!-- 4 Decks / Wave / MixerBar / HotCues / Mixer -->
         <Layout>horizontal</Layout>
         <ObjectName>SkinControlsRow</ObjectName>
         <Size>104f,21f</Size>
@@ -30,10 +30,10 @@ Description:
             <SetVariable name="state_0_unpressed">2decks.svg</SetVariable>
             <SetVariable name="state_1_pressed">4decks.svg</SetVariable>
             <SetVariable name="state_1_unpressed">4decks.svg</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Master],show_4decks</SetVariable>
+            <SetVariable name="ConfigKey">[Master],show_4decks</SetVariable>
           </Template>
 
-          <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
+          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
           <Template src="skin:button_2state_persist.xml"><!-- Waveforms -->
             <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
@@ -42,35 +42,34 @@ Description:
             <SetVariable name="state_0_unpressed">wave_off.svg</SetVariable>
             <SetVariable name="state_1_pressed">wave_on.svg</SetVariable>
             <SetVariable name="state_1_unpressed">wave_on.svg</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Tango],stacked_waveforms</SetVariable>
+            <SetVariable name="ConfigKey">[Tango],stacked_waveforms</SetVariable>
           </Template>
 
-          <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
+          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
-          <Template src="skin:button_2state_persist.xml"><!-- Spinny -->
+          <Template src="skin:button_2state_persist.xml"><!-- MixerBar -->
             <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
             <SetVariable name="Size">20f,20f</SetVariable>
             <SetVariable name="state_0_pressed">mixerbar_off.svg</SetVariable>
             <SetVariable name="state_0_unpressed">mixerbar_off.svg</SetVariable>
             <SetVariable name="state_1_pressed">mixerbar_on.svg</SetVariable>
             <SetVariable name="state_1_unpressed">mixerbar_on.svg</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Tango],mixerbar</SetVariable>
+            <SetVariable name="ConfigKey">[Tango],mixerbar</SetVariable>
           </Template>
 
-          <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
+          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
-          <Template src="skin:button_2state_persist.xml">
-              <SetVariable name="TooltipId"></SetVariable>
-              <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
-              <SetVariable name="Size">20f,20f</SetVariable>
-              <SetVariable name="state_0_unpressed">hotcues_off.svg</SetVariable>
-              <SetVariable name="state_0_pressed">hotcues_off.svg</SetVariable>
-              <SetVariable name="state_1_unpressed">hotcues_on.svg</SetVariable>
-              <SetVariable name="state_1_pressed">hotcues_on.svg</SetVariable>
-              <SetVariable name="ConfigKeyPerm">[Tango],hotcues</SetVariable>
+          <Template src="skin:button_2state_persist.xml"><!-- HotCues -->
+            <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
+            <SetVariable name="Size">20f,20f</SetVariable>
+            <SetVariable name="state_0_unpressed">hotcues_off.svg</SetVariable>
+            <SetVariable name="state_0_pressed">hotcues_off.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">hotcues_on.svg</SetVariable>
+            <SetVariable name="state_1_pressed">hotcues_on.svg</SetVariable>
+            <SetVariable name="ConfigKey">[Tango],hotcues</SetVariable>
           </Template>
 
-          <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
+          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
           <Template src="skin:button_2state_persist.xml"><!-- Mixer -->
             <SetVariable name="TooltipId">show_mixer</SetVariable>
@@ -80,13 +79,13 @@ Description:
             <SetVariable name="state_0_unpressed">mixer_off.svg</SetVariable>
             <SetVariable name="state_1_pressed">mixer_on.svg</SetVariable>
             <SetVariable name="state_1_unpressed">mixer_on.svg</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Tango],channel_mixer</SetVariable>
+            <SetVariable name="ConfigKey">[Tango],channel_mixer</SetVariable>
           </Template>
 
         </Children>
-      </WidgetGroup><!-- 4 Decks / Wave / Spinny / HotCues / Mixer -->
+      </WidgetGroup><!-- /4 Decks / Wave / MixerBar / HotCues / Mixer -->
 
-      <WidgetGroup><!-- Lib / FX / Sampler-->
+      <WidgetGroup><!-- FX / Samplers / Library-->
         <Layout>horizontal</Layout>
         <ObjectName>SkinControlsRow</ObjectName>
         <Size>104f,21f</Size>
@@ -98,10 +97,10 @@ Description:
             <SetVariable name="Size">34f,20f</SetVariable>
             <SetVariable name="state_0_text">FX</SetVariable>
             <SetVariable name="state_1_text">FX</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[EffectRack1],show</SetVariable>
+            <SetVariable name="ConfigKey">[EffectRack1],show</SetVariable>
           </Template>
 
-          <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
+          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
           <Template src="skin:button_2state_persist.xml"><!-- Samplers -->
             <SetVariable name="TooltipId">show_samplers</SetVariable>
@@ -109,10 +108,10 @@ Description:
             <SetVariable name="Size">34f,20f</SetVariable>
             <SetVariable name="state_0_text">SAM</SetVariable>
             <SetVariable name="state_1_text">SAM</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Samplers],show_samplers</SetVariable>
+            <SetVariable name="ConfigKey">[Samplers],show_samplers</SetVariable>
           </Template>
 
-          <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
+          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
           <Template src="skin:button_2state_persist.xml"><!-- Library -->
             <SetVariable name="TooltipId">show_library</SetVariable>
@@ -120,11 +119,11 @@ Description:
             <SetVariable name="Size">34f,20f</SetVariable>
             <SetVariable name="state_0_text">LIB</SetVariable>
             <SetVariable name="state_1_text">LIB</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Library],show_library</SetVariable>
+            <SetVariable name="ConfigKey">[Library],show_library</SetVariable>
           </Template>
 
         </Children>
-      </WidgetGroup><!-- /Lib / FX / Sampler-->
+      </WidgetGroup><!-- /FX / Samplers / Library -->
 
       <WidgetGroup><!-- Recording button & recording duration label -->
         <Layout>stacked</Layout>
@@ -132,27 +131,42 @@ Description:
         <Children>
           <Template src="skin:button_3state_display.xml">
             <SetVariable name="ObjectName">RecordingButton</SetVariable>
+            <SetVariable name="TooltipId">toggle_recording</SetVariable>
             <SetVariable name="Size">104f,20f</SetVariable>
-            <SetVariable name="state_0_text">START REC</SetVariable>
+            <SetVariable name="state_0_text">REC START</SetVariable>
             <SetVariable name="state_1_text">. . .</SetVariable>
+            <!-- Empty to show the RecordingDuration underneath -->
+            <SetVariable name="state_2_text"></SetVariable>
             <SetVariable name="ConfigKey">[Recording],toggle_recording</SetVariable>
             <SetVariable name="ConfigKeyDisp">[Recording],status</SetVariable>
           </Template>
-          <RecordingDuration>
-            <ObjectName>RecDurationLabel</ObjectName>
+          <WidgetGroup><!-- 'REC' + RecDuration -->
+            <Layout>horizontal</Layout>
             <Size>104f,20f</Size>
-            <Alignment>center</Alignment>
-          </RecordingDuration>
+            <Children>
+              <Label>
+                <ObjectName>RecRec</ObjectName>
+                <Size>40f,20f</Size>
+                <Text>REC</Text>
+                <Alignment>center</Alignment>
+              </Label>
+
+              <RecordingDuration>
+                <ObjectName>RecDurationLabel</ObjectName>
+                <Size>64f,20f</Size>
+                <Alignment>center</Alignment>
+              </RecordingDuration>
+            </Children>
+          </WidgetGroup><!-- /'REC' + RecDuration -->
         </Children>
       </WidgetGroup><!-- /Recording button & recording duration label -->
 
-      <WidgetGroup><!-- Broadcast + Clock + Skin Settings -->
+      <WidgetGroup><!-- Broadcast + Clock/Logo + Skin Settings -->
         <ObjectName>ClockBox</ObjectName>
         <Layout>horizontal</Layout>
         <Size>104f,30me</Size>
         <Children>
-
-          <Template src="skin:button_4state_display.xml"><!-- Recording -->
+          <Template src="skin:button_4state_display.xml"><!-- Broadcast -->
             <SetVariable name="TooltipId">broadcast_enabled</SetVariable>
             <SetVariable name="ObjectName">BroadcastButton</SetVariable>
             <SetVariable name="Size">24f,34f</SetVariable>
@@ -160,27 +174,55 @@ Description:
             <SetVariable name="ConfigKeyDisp">[Shoutcast],status</SetVariable>
           </Template>
 
-          <WidgetGroup><!-- Clock (& Logo when Crossfader is visible in 2-decks mode) -->
-            <ObjectName>AlignVCenter</ObjectName>
+          <WidgetGroup><!-- Clock & Latency diplay (& small Logo when Crossfader is enabled) -->
+            <ObjectName>AlignCenter</ObjectName>
             <Size>56me,43me</Size>
             <Layout>vertical</Layout>
             <Children>
               <WidgetGroup><!-- Clock container -->
                 <ObjectName>AlignCenter</ObjectName>
                 <Size>me,min</Size>
-                <Layout>horizontal</Layout>
+                <Layout>vertical</Layout>
                 <Children>
                   <Time>
                     <TooltipId>time</TooltipId>
                     <ObjectName>Clock</ObjectName>
-                    <Size>30min,20f</Size>
+                    <Size>30min,14f</Size>
+                    <!-- Disabled. With this seconds would show up in Windows anyway.
+                    TODO: check if it works without this tag
+                    Clock also appears in topbar_netbook.xml. -->
                     <ShowSeconds>false</ShowSeconds>
-                    <!-- This has no effect, neither has 'text-align' in qss.
+                    <!-- This has no effect, neither has 'text-align' in qss,
+                    that's why clock needs an extra container...
                     <Align>center</Align>   -->
                   </Time>
                 </Children>
               </WidgetGroup><!-- Clock container -->
 
+              <WidgetGroup><!-- audio latency usage & overload display -->
+                <ObjectName>AlignCenter</ObjectName>
+                <Size>31me,3f</Size>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <VuMeter><!-- latency usage -->
+                    <Size>31f,3f</Size>
+                    <TooltipId>audio_latency_usage</TooltipId>
+                    <PathVu>skin:/graphics/latency_usage_over.png</PathVu>
+                    <PathBack>skin:/graphics/latency_usage.png</PathBack>
+                    <Horizontal>true</Horizontal>
+                    <PeakHoldSize>5</PeakHoldSize>
+                    <PeakHoldTime>1000</PeakHoldTime>
+                    <PeakFallTime>100</PeakFallTime>
+                    <PeakFallStep>1</PeakFallStep>
+                    <Connection>
+                      <ConfigKey>[Master],audio_latency_usage</ConfigKey>
+                    </Connection>
+                  </VuMeter>
+                </Children>
+              </WidgetGroup><!-- /audio latency usage & overload display -->
+
+              <WidgetGroup><Size>1me,2f</Size></WidgetGroup>
+
               <WidgetGroup><!-- LogoMini container -->
                 <ObjectName>AlignCenter</ObjectName>
                 <SizePolicy>me,min</SizePolicy>
@@ -189,16 +231,14 @@ Description:
                   <WidgetGroup>
                     <Size>52f,13f</Size>
                     <Layout>vertical</Layout>
-                    <ObjectName>LogoMiniBox</ObjectName>
                     <Children>
                       <Template src="skin:button_2state_persist.xml">
-                        <SetVariable name="ObjectName">LogoMini</SetVariable>
                         <SetVariable name="Size">52f,13f</SetVariable>
                         <SetVariable name="state_0_pressed">logo_52x13_grey.svg</SetVariable>
                         <SetVariable name="state_0_unpressed">logo_52x13_grey.svg</SetVariable>
                         <SetVariable name="state_1_pressed">logo_52x13.svg</SetVariable>
                         <SetVariable name="state_1_unpressed">logo_52x13.svg</SetVariable>
-                        <SetVariable name="ConfigKeyPerm">[Tango],colorLogo</SetVariable>
+                        <SetVariable name="ConfigKey">[Tango],colorLogo</SetVariable>
                       </Template>
                     </Children>
                     <Connection>
@@ -212,10 +252,9 @@ Description:
                   <Transform><Not/></Transform>
                   <BindProperty>visible</BindProperty>
                 </Connection>
-              </WidgetGroup><!-- LogoMini container -->
-
+              </WidgetGroup><!-- /LogoMini container -->
             </Children>
-          </WidgetGroup><!-- Clock (& Logo when Crossfader is visible in 2-decks mode) -->
+          </WidgetGroup><!-- /Clock (& Logo when Crossfader is visible in 2-decks mode) -->
 
           <WidgetGroup><!-- Toggler for skin settings menu -->
             <ObjectName>AlignVCenter</ObjectName>
@@ -239,33 +278,28 @@ Description:
               </Template>
             </Children>
           </WidgetGroup><!-- /Toggler for skin settings menu -->
-
         </Children>
-      </WidgetGroup><!-- /Broadcast + Clock Skin + Settings -->
+      </WidgetGroup><!-- /Broadcast + Clock/Logo + Skin Settings -->
 
-      <!-- LogoCrossfaderBox 2 Decks-->
-      <WidgetGroup>
+      <WidgetGroup><!-- Logo + Crossfader 2 Decks-->
         <Layout>horizontal</Layout>
         <Size>104f,28max</Size>
         <Children>
-
-          <WidgetGroup>
+          <WidgetGroup><!-- show only without crossfader -->
             <Layout>horizontal</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
-              <WidgetGroup>
-                <ObjectName>LogoMaxiBox</ObjectName>
+              <WidgetGroup><!-- show only with 2 decks -->
                 <Layout>horizontal</Layout>
                 <Size>104f,26f</Size>
                 <Children>
                   <Template src="skin:button_2state_persist.xml">
-                    <SetVariable name="ObjectName">LogoMaxi</SetVariable>
                     <SetVariable name="Size">102f,26f</SetVariable>
                     <SetVariable name="state_0_pressed">logo_104x26_grey.svg</SetVariable>
                     <SetVariable name="state_0_unpressed">logo_104x26_grey.svg</SetVariable>
                     <SetVariable name="state_1_pressed">logo_104x26.svg</SetVariable>
                     <SetVariable name="state_1_unpressed">logo_104x26.svg</SetVariable>
-                    <SetVariable name="ConfigKeyPerm">[Tango],colorLogo</SetVariable>
+                    <SetVariable name="ConfigKey">[Tango],colorLogo</SetVariable>
                   </Template>
                 </Children>
                 <Connection>
@@ -296,10 +330,8 @@ Description:
               <BindProperty>visible</BindProperty>
             </Connection>
           </SliderComposed>
-
         </Children>
-      </WidgetGroup><!-- /LogoCrossfaderBox 2 Decks -->
-
+      </WidgetGroup><!-- /Logo + Crossfader 2 Decks-->
     </Children>
     <Connection>
       <ConfigKey>[Tango],normal_mode</ConfigKey>
diff --git a/res/skins/Tango/centerbox_deck34.xml b/res/skins/Tango/centerbox_deck34.xml
new file mode 100644
index 000000000000..f7027415965a
--- /dev/null
+++ b/res/skins/Tango/centerbox_deck34.xml
@@ -0,0 +1,92 @@
+<!--
+Description:
+  Shows Logo in normal mode if 4 decks are enabled.
+-->
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+      <WidgetGroup><!-- spacer to compensate master VU -->
+        <Layout>horizontal</Layout>
+        <Size>11f,0min</Size>
+        <Connection>
+          <ConfigKey>[Tango],channel_mixer</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /spacer to compensate master VU with mixer -->
+
+      <WidgetGroup><!-- spacer to compensate master VU without mixer -->
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,me</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Size>11f,0min</Size>
+            <Children/>
+            <Connection>
+              <ConfigKey>[Tango],vumeter</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey>[Tango],channel_mixer</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /spacer to compensate master VU without mixer -->
+
+      <WidgetGroup><!-- Mixxx logo, hidden in netboook mode -->
+        <Layout>vertical</Layout>
+        <Size>104f,26me</Size>
+        <Children>
+          <WidgetGroup><Size>1min,1me</Size></WidgetGroup>
+
+          <Template src="skin:button_2state_persist.xml">
+            <SetVariable name="Size">104f,26f</SetVariable>
+            <SetVariable name="state_0_pressed">logo_104x26_grey.svg</SetVariable>
+            <SetVariable name="state_0_unpressed">logo_104x26_grey.svg</SetVariable>
+            <SetVariable name="state_1_pressed">logo_104x26.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">logo_104x26.svg</SetVariable>
+            <SetVariable name="ConfigKey">[Tango],colorLogo</SetVariable>
+          </Template>
+        </Children>
+        <Connection>
+          <ConfigKey>[Tango],normal_mode</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- Mixxx logo, hidden in netboook mode -->
+
+      <WidgetGroup><!-- spacer to compensate master VU -->
+        <Layout>horizontal</Layout>
+        <Size>11f,0min</Size>
+        <Connection>
+          <ConfigKey>[Tango],channel_mixer</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /spacer to compensate master VU with mixer -->
+
+      <WidgetGroup><!-- spacer to compensate master VU without mixer -->
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,me</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Size>11f,0min</Size>
+            <Children/>
+            <Connection>
+              <ConfigKey>[Tango],vumeter</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey>[Tango],channel_mixer</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /spacer to compensate master VU without mixer -->
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Tango/crossfader34.xml b/res/skins/Tango/crossfader34.xml
deleted file mode 100644
index 786568f93314..000000000000
--- a/res/skins/Tango/crossfader34.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-Description:
-  Shows Logo if 4 decks and crossfader are enabled (in normal mode)
--->
-<Template>
-  <WidgetGroup><!-- Skin Controls -->
-    <Layout>vertical</Layout>
-    <ObjectName>SkinControls</ObjectName>
-    <SizePolicy>min,min</SizePolicy>
-    <Children>
-      
-      <WidgetGroup><Size>1min,1me</Size></WidgetGroup>
-      
-      <WidgetGroup>
-        <ObjectName>LogoMaxiBox</ObjectName>
-        <Layout>horizontal</Layout>
-        <Size>104f,26f</Size>
-        <Children>
-          <Template src="skin:button_2state_persist.xml">
-            <SetVariable name="ObjectName">LogoMaxi</SetVariable>
-            <SetVariable name="Size">102f,26f</SetVariable>
-            <SetVariable name="state_0_pressed">logo_104x26_grey.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">logo_104x26_grey.svg</SetVariable>
-            <SetVariable name="state_1_pressed">logo_104x26.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">logo_104x26.svg</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Tango],colorLogo</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-      
-    </Children>
-    <Connection>
-      <ConfigKey>[Tango],normal_mode</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Tango/deck_artist_title_left.xml b/res/skins/Tango/deck_artist_title_left.xml
index 19a44c912a82..a5539f9c54cc 100644
--- a/res/skins/Tango/deck_artist_title_left.xml
+++ b/res/skins/Tango/deck_artist_title_left.xml
@@ -2,7 +2,7 @@
 Description:
   Container for:
   * artist/title
-  * play position (elapsed/remaining)
+  * play position (elapsed/remaining/both)
   * track duration
   * indicator for enabled loop (if loop controls are hidden)
 Variables:
@@ -10,88 +10,109 @@ Variables:
   chanNum : channel number
 -->
 <Template>
-  <WidgetGroup><!-- DeckArtistTitle -->
-    <ObjectName>DeckArtistTitleLeft</ObjectName>
+  <WidgetGroup>
+    <ObjectName>ArtistTitleTime</ObjectName>
     <Layout>horizontal</Layout>
     <SizePolicy>me,me</SizePolicy>
     <Children>
       <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
 
-      <WidgetGroup><!-- Artist & Title rows -->
+      <WidgetGroup><!-- Title/Artist -->
         <Layout>vertical</Layout>
-        <SizePolicy>me,me</SizePolicy>
+        <SizePolicy>min,me</SizePolicy>
         <Children>
-          <WidgetGroup><!-- TitleTimeRow -->
-            <ObjectName>TitleTimeRow</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,me</SizePolicy>
-            <Children>
-              <TrackProperty>
-                <ObjectName>TrackTitle</ObjectName>
-                <TooltipId>track_title</TooltipId>
-                <Property>title</Property>
-                <Alignment>Left</Alignment>
-                <Elide>right</Elide>
-                <Size>1me,22f</Size>
-                <Channel><Variable name="chanNum"/></Channel>
-              </TrackProperty>
-
-              <WidgetGroup><Size>10f,1min</Size></WidgetGroup>
-
-              <NumberPos>
-                <ObjectName>TrackTime</ObjectName>
-                <TooltipId>track_time</TooltipId>
-                <Size>80min,22f</Size>
-                <Alignment>right</Alignment>
-                <Channel><Variable name="chanNum"/></Channel>
-                <NumberOfDigits>1</NumberOfDigits>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
-                </Connection>
-              </NumberPos>
-            </Children>
-          </WidgetGroup><!-- /TitleTimeRow -->
+          <TrackProperty>
+            <TooltipId>track_title</TooltipId>
+            <ObjectName>TrackTitle</ObjectName>
+            <Property>title</Property>
+            <Alignment>Left</Alignment>
+            <Elide>right</Elide>
+            <Size>1me,22f</Size>
+            <Channel><Variable name="chanNum"/></Channel>
+          </TrackProperty>
 
-          <WidgetGroup><!-- ArtistDurationRow -->
-            <ObjectName>ArtistDurationRow</ObjectName>
+          <WidgetGroup><!-- by Artist -->
+            <SizePolicy>min,me</SizePolicy>
             <Layout>horizontal</Layout>
-            <SizePolicy>me,me</SizePolicy>
             <Children>
               <Label>
                 <ObjectName>TrackBy</ObjectName>
-                <Size>22f,20me</Size>
+                <Size>22f,22f</Size>
                 <Text>by </Text>
                 <Alignment>left</Alignment>
               </Label>
 
               <TrackProperty>
+                <TooltipId>track_artist</TooltipId>
                 <ObjectName>TrackArtist</ObjectName>
                 <Elide>right</Elide>
-                <Size>1me,20me</Size>
-                <TooltipId>track_artist</TooltipId>
+                <Size>1me,22f</Size>
                 <Property>artist</Property>
                 <Channel><Variable name="chanNum"/></Channel>
               </TrackProperty>
+            </Children>
+          </WidgetGroup><!-- /by Artist -->
+        </Children>
+      </WidgetGroup><!-- /Title/Artist -->
 
-              <TrackProperty>
-                <ObjectName>TrackDuration</ObjectName>
-                <Size>50min,20me</Size>
-                <TooltipId>track_duration</TooltipId>
-                <Property>durationFormatted</Property>
-                <Alignment>right</Alignment>
-                <Channel><Variable name="chanNum"/></Channel>
-              </TrackProperty>
+      <WidgetGroup><Size>10f,1min</Size></WidgetGroup>
 
-            </Children>
-          </WidgetGroup><!-- /ArtistDurationRow -->
+      <WidgetGroup><!-- Time/Duration - 3 modes to display elapsed remaining -->
+        <Layout>vertical</Layout>
+        <SizePolicy>min,me</SizePolicy>
+        <Children>
+        <!-- Elapsed (may include '-' if position is before actual track beginning)
+            or Remaning -->
+          <NumberPos>
+            <ObjectName>PlayPosition</ObjectName>
+            <TooltipId>track_time</TooltipId>
+            <Size>90min,22f</Size>
+            <Alignment>right</Alignment>
+            <Channel><Variable name="chanNum"/></Channel>
+            <!-- Not respected, see https://answers.launchpad.net/mixxx/+question/635872
+            <NumberOfDigits>1</NumberOfDigits>-->
+            <Connection>
+              <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
+            </Connection>
+            <Connection>
+              <ConfigKey>[Controls],ShowDurationRemaining</ConfigKey>
+              <Transform><IsEqual>2</IsEqual><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </NumberPos>
+          
+          <!-- Elapsed & Remaining -->
+          <NumberPos>
+            <ObjectName>PlayPosition</ObjectName>
+            <TooltipId>track_time</TooltipId>
+            <Size>175min,22f</Size>
+            <Alignment>right</Alignment>
+            <Channel><Variable name="chanNum"/></Channel>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
+            </Connection>
+            <Connection>
+              <ConfigKey>[Controls],ShowDurationRemaining</ConfigKey>
+              <Transform><IsEqual>2</IsEqual></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </NumberPos>
 
+          <TrackProperty>
+            <ObjectName>Duration</ObjectName>
+            <Size>60min,22f</Size>
+            <TooltipId>track_duration</TooltipId>
+            <Property>durationFormatted</Property>
+            <Alignment>right</Alignment>
+            <Channel><Variable name="chanNum"/></Channel>
+          </TrackProperty>
         </Children>
-      </WidgetGroup><!-- Artist & Title rows -->
+      </WidgetGroup><!-- /Time/Duration -->
 
-      <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
+      <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
       <Template src="skin:loop_indicator.xml"/>
 
     </Children>
-  </WidgetGroup><!-- DeckArtistTitle -->
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/Tango/deck_artist_title_right.xml b/res/skins/Tango/deck_artist_title_right.xml
index 8932b2a1b08b..6f7baaa6083a 100644
--- a/res/skins/Tango/deck_artist_title_right.xml
+++ b/res/skins/Tango/deck_artist_title_right.xml
@@ -2,7 +2,7 @@
 Description:
   Container for:
   * artist/title
-  * play position (elapsed/remaining)
+  * play position (elapsed/remaining/both)
   * track duration
   * indicator for enabled loop (if loop controls are hidden)
   Time/duration can be set to left-hand side so that left and rigt decks
@@ -13,211 +13,189 @@ Variables:
 -->
 <Template>
   <WidgetGroup>
-    <ObjectName>DeckArtistTitleRight</ObjectName>
+    <ObjectName>ArtistTitleTime</ObjectName>
     <Layout>horizontal</Layout>
     <SizePolicy>me,me</SizePolicy>
     <Children>
-
       <Template src="skin:loop_indicator.xml"/>
 
-      <WidgetGroup><!-- Symmetric time display -->
-        <ObjectName>SymmetricTimeDuration</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,me</SizePolicy>
-        <Children>
-          <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
-
-          <WidgetGroup><!-- TimeDurationColumn -->
-            <ObjectName>TimeDurationColumn</ObjectName>
-            <Layout>vertical</Layout>
-            <SizePolicy>min,me</SizePolicy>
-            <Children>
-              <NumberPos>
-                <ObjectName>TrackTime</ObjectName>
-                <TooltipId>track_time</TooltipId>
-                <Size>72min,22f</Size>
-                <Alignment>left</Alignment>
-                <Channel><Variable name="chanNum"/></Channel>
-                <NumberOfDigits>1</NumberOfDigits>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
-                </Connection>
-                <Connection>
-                  <ConfigKey>[Controls],ShowDurationRemaining</ConfigKey>
-                  <Transform><IsEqual>0</IsEqual></Transform>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </NumberPos>
-              
-              <NumberPos>
-                <ObjectName>TrackTime</ObjectName>
-                <TooltipId>track_time</TooltipId>
-                <Size>78min,22f</Size>
-                <Alignment>left</Alignment>
-                <Channel><Variable name="chanNum"/></Channel>
-                <NumberOfDigits>1</NumberOfDigits>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
-                </Connection>
-                <Connection>
-                  <ConfigKey>[Controls],ShowDurationRemaining</ConfigKey>
-                  <Transform><IsEqual>1</IsEqual></Transform>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </NumberPos>
-              
-              <NumberPos>
-                <ObjectName>TrackTime</ObjectName>
-                <TooltipId>track_time</TooltipId>
-                <Size>158min,22f</Size>
-                <Alignment>left</Alignment>
-                <Channel><Variable name="chanNum"/></Channel>
-                <NumberOfDigits>1</NumberOfDigits>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
-                </Connection>
-                <Connection>
-                  <ConfigKey>[Controls],ShowDurationRemaining</ConfigKey>
-                  <Transform><IsEqual>2</IsEqual></Transform>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </NumberPos>
-
-              <TrackProperty>
-                <ObjectName>TrackDuration</ObjectName>
-                <Size>60min,22f</Size>
-                <TooltipId>track_duration</TooltipId>
-                <Property>durationFormatted</Property>
-                <Alignment>left</Alignment>
-                <Channel><Variable name="chanNum"/></Channel>
-              </TrackProperty>
-            </Children>
-          </WidgetGroup><!-- /TimeDurationColumn -->
-
-          <WidgetGroup><Size>20f,1min</Size></WidgetGroup>
-
-          <WidgetGroup><!-- TitleArtistColumn -->
-            <ObjectName>TitleArtistColumn</ObjectName>
-            <Layout>vertical</Layout>
-            <SizePolicy>min,me</SizePolicy>
-            <Children>
-              <TrackProperty>
-                <ObjectName>TrackTitle</ObjectName>
-                <TooltipId>track_title</TooltipId>
-                <Property>title</Property>
-                <Alignment>Left</Alignment>
-                <Elide>right</Elide>
-                <Size>1me,22f</Size>
-                <Channel><Variable name="chanNum"/></Channel>
-              </TrackProperty>
+      <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
-              <WidgetGroup><!-- by Artist -->
-                <SizePolicy>min,me</SizePolicy>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <Label>
-                    <ObjectName>TrackBy</ObjectName>
-                    <Size>22f,22f</Size>
-                    <Text>by </Text>
-                    <Alignment>left</Alignment>
-                  </Label>
-
-                  <TrackProperty>
-                    <ObjectName>TrackArtist</ObjectName>
-                    <Elide>right</Elide>
-                    <Size>1me,22f</Size>
-                    <TooltipId>track_artist</TooltipId>
-                    <Property>artist</Property>
-                    <Channel><Variable name="chanNum"/></Channel>
-                  </TrackProperty>
-                </Children>
-              </WidgetGroup><!-- /by Artist -->
-            </Children>
-          </WidgetGroup><!-- /TitleArtistColumn -->
-        </Children>
+      <WidgetGroup><!-- Spacer for parallel time -->
+        <Size>1f,1min</Size>
         <Connection>
           <ConfigKey persist="true">[Tango],symmetric_time</ConfigKey>
+          <Transform><Not/></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- /Symmetric time display -->
+      </WidgetGroup>
 
-      <WidgetGroup><!-- Parallel time display -->
+      <WidgetGroup><!-- Time/Duration for symmetric time -->
         <Layout>vertical</Layout>
-        <SizePolicy>me,me</SizePolicy>
+        <SizePolicy>min,me</SizePolicy>
         <Children>
-          <WidgetGroup><!-- TitleTimeRow -->
-            <ObjectName>TitleTimeRow</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,me</SizePolicy>
-            <Children>
-              <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
-
-              <TrackProperty>
-                <ObjectName>TrackTitle</ObjectName>
-                <TooltipId>track_title</TooltipId>
-                <Property>title</Property>
-                <Alignment>Left</Alignment>
-                <Elide>right</Elide>
-                <Size>1me,22f</Size>
-                <Channel><Variable name="chanNum"/></Channel>
-              </TrackProperty>
+          <!-- Elapsed (may include '-' if position is before actual track beginning)
+              or Remaning -->
+          <NumberPos>
+            <ObjectName>PlayPosition</ObjectName>
+            <TooltipId>track_time</TooltipId>
+            <Size>90f,22f</Size>
+            <Alignment>left</Alignment>
+            <Channel><Variable name="chanNum"/></Channel>
+            <!-- Not respected, see https://answers.launchpad.net/mixxx/+question/635872
+            <NumberOfDigits>1</NumberOfDigits>-->
+            <Connection>
+              <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
+            </Connection>
+            <Connection>
+              <ConfigKey>[Controls],ShowDurationRemaining</ConfigKey>
+              <Transform><IsEqual>2</IsEqual><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </NumberPos>
+          
+          <!-- Elapsed & Remaining -->
+          <NumberPos>
+            <ObjectName>PlayPosition</ObjectName>
+            <TooltipId>track_time</TooltipId>
+            <Size>175min,22f</Size>
+            <Alignment>left</Alignment>
+            <Channel><Variable name="chanNum"/></Channel>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
+            </Connection>
+            <Connection>
+              <ConfigKey>[Controls],ShowDurationRemaining</ConfigKey>
+              <Transform><IsEqual>2</IsEqual></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </NumberPos>
+
+          <TrackProperty>
+            <ObjectName>Duration</ObjectName>
+            <Size>60min,22f</Size>
+            <TooltipId>track_duration</TooltipId>
+            <Property>durationFormatted</Property>
+            <Alignment>left</Alignment>
+            <Channel><Variable name="chanNum"/></Channel>
+          </TrackProperty>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Tango],symmetric_time</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /Time/Duration for symmetric time -->
 
-              <NumberPos>
-                <ObjectName>TrackTime</ObjectName>
-                <TooltipId>track_time</TooltipId>
-                <Size>80min,22f</Size>
-                <Alignment>right</Alignment>
-                <Channel><Variable name="chanNum"/></Channel>
-                <NumberOfDigits>1</NumberOfDigits>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
-                </Connection>
-              </NumberPos>
-            </Children>
-          </WidgetGroup><!-- /TitleTimeRow -->
+      <WidgetGroup><!-- Spacer for symmetric time -->
+        <Size>10f,1min</Size>
+        <Connection>
+          <ConfigKey persist="true">[Tango],symmetric_time</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
 
-          <WidgetGroup><!-- ArtistDurationRow -->
-            <ObjectName>ArtistDurationRow</ObjectName>
+      <WidgetGroup><!-- Title/Artist -->
+        <Layout>vertical</Layout>
+        <SizePolicy>min,me</SizePolicy>
+        <Children>
+          <TrackProperty>
+            <ObjectName>TrackTitle</ObjectName>
+            <TooltipId>track_title</TooltipId>
+            <Property>title</Property>
+            <Alignment>left</Alignment>
+            <Elide>right</Elide>
+            <Size>1me,22f</Size>
+            <Channel><Variable name="chanNum"/></Channel>
+          </TrackProperty>
+
+          <WidgetGroup><!-- by Artist -->
+            <SizePolicy>min,me</SizePolicy>
             <Layout>horizontal</Layout>
-            <SizePolicy>me,me</SizePolicy>
             <Children>
-              <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
-
               <Label>
                 <ObjectName>TrackBy</ObjectName>
-                <Size>20f,22f</Size>
+                <Size>22f,22f</Size>
                 <Text>by </Text>
                 <Alignment>left</Alignment>
               </Label>
 
               <TrackProperty>
                 <ObjectName>TrackArtist</ObjectName>
+                <Alignment>left</Alignment>
                 <Elide>right</Elide>
                 <Size>1me,22f</Size>
                 <TooltipId>track_artist</TooltipId>
                 <Property>artist</Property>
                 <Channel><Variable name="chanNum"/></Channel>
               </TrackProperty>
-
-              <TrackProperty>
-                <ObjectName>TrackDuration</ObjectName>
-                <Size>50f,22f</Size>
-                <TooltipId>track_duration</TooltipId>
-                <Property>durationFormatted</Property>
-                <Alignment>right</Alignment>
-                <Channel><Variable name="chanNum"/></Channel>
-              </TrackProperty>
-
             </Children>
-          </WidgetGroup><!-- /ArtistDurationRow -->
+          </WidgetGroup><!-- /by Artist -->
+        </Children>
+      </WidgetGroup><!-- /Title/Artist -->
 
+      <WidgetGroup><!-- Spacer for parallel time -->
+        <Size>10f,1min</Size>
+        <Connection>
+          <ConfigKey persist="true">[Tango],symmetric_time</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup><!-- Time/Duration for parallel time -->
+        <Layout>vertical</Layout>
+        <SizePolicy>min,me</SizePolicy>
+        <Children>
+          <!-- Elapsed (may include '-' if position is before actual track beginning)
+              or Remaning -->
+          <NumberPos>
+            <ObjectName>PlayPosition</ObjectName>
+            <TooltipId>track_time</TooltipId>
+            <Size>90f,22f</Size>
+            <Alignment>right</Alignment>
+            <Channel><Variable name="chanNum"/></Channel>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
+            </Connection>
+            <Connection>
+              <ConfigKey>[Controls],ShowDurationRemaining</ConfigKey>
+              <Transform><IsEqual>2</IsEqual><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </NumberPos>
+          
+          <!-- Elapsed & Remaining -->
+          <NumberPos>
+            <ObjectName>PlayPosition</ObjectName>
+            <TooltipId>track_time</TooltipId>
+            <Size>175f,22f</Size>
+            <Alignment>right</Alignment>
+            <Channel><Variable name="chanNum"/></Channel>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
+            </Connection>
+            <Connection>
+              <ConfigKey>[Controls],ShowDurationRemaining</ConfigKey>
+              <Transform><IsEqual>2</IsEqual></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </NumberPos>
+
+          <TrackProperty>
+            <ObjectName>Duration</ObjectName>
+            <Size>60min,22f</Size>
+            <TooltipId>track_duration</TooltipId>
+            <Property>durationFormatted</Property>
+            <Alignment>right</Alignment>
+            <Channel><Variable name="chanNum"/></Channel>
+          </TrackProperty>
         </Children>
         <Connection>
           <ConfigKey persist="true">[Tango],symmetric_time</ConfigKey>
           <Transform><Not/></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- /Parallel time display -->
+      </WidgetGroup><!-- /Time/Duration for parallel time -->
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Tango/deck_buttons_left.xml b/res/skins/Tango/deck_buttons_left.xml
index fa6a68e3adff..072ef29baba1 100644
--- a/res/skins/Tango/deck_buttons_left.xml
+++ b/res/skins/Tango/deck_buttons_left.xml
@@ -36,7 +36,7 @@ Variables:
                 <SetVariable name="state_0_unpressed">keylock_off.svg</SetVariable>
                 <SetVariable name="state_1_pressed">keylock_on.svg</SetVariable>
                 <SetVariable name="state_1_unpressed">keylock_on.svg</SetVariable>
-                <SetVariable name="ConfigKeyPerm"><Variable name="group"/>,keylock</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="group"/>,keylock</SetVariable>
               </Template>
             </Children>
             <Connection>
@@ -114,17 +114,17 @@ Variables:
                 <SetVariable name="ObjectName">DeckButton</SetVariable>
                 <SetVariable name="Size">20f,22f</SetVariable>
                 <SetVariable name="TooltipId">orientation</SetVariable>
-                <SetVariable name="state_0_pressed">cf_left.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">cf_left.svg</SetVariable>
-                <SetVariable name="state_1_pressed">cf_center_attention.svg</SetVariable>
-                <SetVariable name="state_1_unpressed">cf_center_attention.svg</SetVariable>
-                <SetVariable name="state_2_pressed">cf_right_attention.svg</SetVariable>
-                <SetVariable name="state_2_unpressed">cf_right_attention.svg</SetVariable>
+                <SetVariable name="state_0_pressed">xfader_left.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">xfader_left.svg</SetVariable>
+                <SetVariable name="state_1_pressed">xfader_center_attention.svg</SetVariable>
+                <SetVariable name="state_1_unpressed">xfader_center_attention.svg</SetVariable>
+                <SetVariable name="state_2_pressed">xfader_right_attention.svg</SetVariable>
+                <SetVariable name="state_2_unpressed">xfader_right_attention.svg</SetVariable>
                 <SetVariable name="ConfigKey"><Variable name="group"/>,orientation</SetVariable>
               </Template>
             </Children>
             <Connection>
-              <ConfigKey persist="true">[Tango],always_visible_cfOrientation</ConfigKey>
+              <ConfigKey persist="true">[Tango],always_visible_xfaderOrientation</ConfigKey>
               <BindProperty>visible</BindProperty>
             </Connection>
           </WidgetGroup>
@@ -141,7 +141,7 @@ Variables:
                 <SetVariable name="state_0_unpressed">quantize_off.svg</SetVariable>
                 <SetVariable name="state_1_pressed">quantize_on.svg</SetVariable>
                 <SetVariable name="state_1_unpressed">quantize_on.svg</SetVariable>
-                <SetVariable name="ConfigKeyPerm"><Variable name="group"/>,quantize</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="group"/>,quantize</SetVariable>
               </Template>
             </Children>
             <Connection>
@@ -153,11 +153,21 @@ Variables:
 
           <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
-          <Template src="skin:button_2state_persist.xml"><!-- Toggle extra deck buttons -->
-            <SetVariable name="ObjectName">DeckButtonTogglerLeft</SetVariable>
-            <SetVariable name="Size">11f,22f</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Tango],deck_controls</SetVariable>
-          </Template>
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <Template src="skin:button_2state_persist.xml"><!-- Toggle extra deck buttons -->
+                <SetVariable name="ObjectName">DeckButtonTogglerLeft</SetVariable>
+                <SetVariable name="Size">11f,22f</SetVariable>
+                <SetVariable name="ConfigKey">[Tango],deck_controls</SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey>[Tango],deck_controls_toggle</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
 
           <WidgetGroup><!-- Expandable Deck controls -->
             <ObjectName>DeckControlsExpanded</ObjectName>
@@ -176,7 +186,7 @@ Variables:
                     <SetVariable name="state_0_unpressed">keylock_off.svg</SetVariable>
                     <SetVariable name="state_1_pressed">keylock_on.svg</SetVariable>
                     <SetVariable name="state_1_unpressed">keylock_on.svg</SetVariable>
-                    <SetVariable name="ConfigKeyPerm"><Variable name="group"/>,keylock</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,keylock</SetVariable>
                   </Template>
                 </Children>
                 <Connection>
@@ -258,17 +268,17 @@ Variables:
                     <SetVariable name="ObjectName">DeckButtonExpanded</SetVariable>
                     <SetVariable name="Size">20f,22f</SetVariable>
                     <SetVariable name="TooltipId">orientation</SetVariable>
-                    <SetVariable name="state_0_pressed">cf_left.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">cf_left.svg</SetVariable>
-                    <SetVariable name="state_1_pressed">cf_center_attention.svg</SetVariable>
-                    <SetVariable name="state_1_unpressed">cf_center_attention.svg</SetVariable>
-                    <SetVariable name="state_2_pressed">cf_right_attention.svg</SetVariable>
-                    <SetVariable name="state_2_unpressed">cf_right_attention.svg</SetVariable>
+                    <SetVariable name="state_0_pressed">xfader_left.svg</SetVariable>
+                    <SetVariable name="state_0_unpressed">xfader_left.svg</SetVariable>
+                    <SetVariable name="state_1_pressed">xfader_center_attention.svg</SetVariable>
+                    <SetVariable name="state_1_unpressed">xfader_center_attention.svg</SetVariable>
+                    <SetVariable name="state_2_pressed">xfader_right_attention.svg</SetVariable>
+                    <SetVariable name="state_2_unpressed">xfader_right_attention.svg</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,orientation</SetVariable>
                   </Template>
                 </Children>
                 <Connection>
-                  <ConfigKey persist="true">[Tango],always_visible_cfOrientation</ConfigKey>
+                  <ConfigKey persist="true">[Tango],always_visible_xfaderOrientation</ConfigKey>
                   <Transform><Not/></Transform>
                   <BindProperty>visible</BindProperty>
                 </Connection>
@@ -286,7 +296,7 @@ Variables:
                     <SetVariable name="state_0_unpressed">quantize_off.svg</SetVariable>
                     <SetVariable name="state_1_pressed">quantize_on.svg</SetVariable>
                     <SetVariable name="state_1_unpressed">quantize_on.svg</SetVariable>
-                    <SetVariable name="ConfigKeyPerm"><Variable name="group"/>,quantize</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,quantize</SetVariable>
                   </Template>
                 </Children>
                 <Connection>
@@ -295,7 +305,7 @@ Variables:
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
-                <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
+                <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
             </Children>
             <Connection>
               <ConfigKey persist="true">[Tango],deck_controls</ConfigKey>
@@ -303,7 +313,9 @@ Variables:
             </Connection>
           </WidgetGroup><!-- /Expandable Deck controls -->
 
-          <WidgetGroup><!-- Stars -->
+          <!-- Stars -->
+          <!-- visibility controlled by SizeAwareStack in size_detector_stars.xml -->
+          <WidgetGroup>
             <Layout>horizontal</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
@@ -311,14 +323,12 @@ Variables:
                 <Size>84f,22f</Size>
                 <Layout>horizontal</Layout>
                 <Children>
-
                   <StarRating>
                     <ObjectName>DeckStars</ObjectName>
                     <Size>83min,22f</Size>
                     <TooltipId>starrating</TooltipId>
                     <Channel><Variable name="chanNum"/></Channel>
                   </StarRating>
-
                   <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
                 </Children>
                 <Connection>
@@ -327,13 +337,11 @@ Variables:
                 </Connection>
               </WidgetGroup>
             </Children>
-            <!-- visibilty controlled by SizeAwareStack in size_detector_stars.xml -->
             <Connection>
               <ConfigKey>[Tango],stars_fit</ConfigKey>
               <BindProperty>visible</BindProperty>
             </Connection>
           </WidgetGroup><!-- /Stars -->
-
         </Children>
       </WidgetGroup><!-- /Deck Controls + Star rating -->
 
@@ -346,7 +354,22 @@ Variables:
         <Layout>stacked</Layout>
         <Size>50f,24f</Size>
         <Children>
-          <Template src="skin:button_2state_right_display.xml"><!-- Play -->
+          <!-- index 0 due to bug -->
+          <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
+
+          <!-- Block Play button if passthrough is active,
+              show speaker icon instead -->
+          <WidgetGroup>
+            <ObjectName>PassthroughPlayCover</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>me,me</SizePolicy>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+          <!-- Play -->
+          <Template src="skin:button_2state_right_display.xml">
             <SetVariable name="ObjectName">PlayCue</SetVariable>
             <SetVariable name="TooltipId">play_cue_set</SetVariable>
             <SetVariable name="Size">50f,24f</SetVariable>
@@ -398,7 +421,21 @@ Variables:
             <Layout>stacked</Layout>
             <Size>50f,24f</Size>
             <Children>
-              <Template src="skin:button_2state_right_display.xml"><!-- Play -->
+              <!-- index 0 due to bug -->
+              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
+              <!-- Block Play button if passthrough is active,
+                  show speaker icon instead -->
+              <WidgetGroup>
+                <ObjectName>PassthroughPlayCover</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>me,me</SizePolicy>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+              <!-- Play -->
+              <Template src="skin:button_2state_right_display.xml">
                 <SetVariable name="ObjectName">PlayCue</SetVariable>
                 <SetVariable name="TooltipId">play_cue_set</SetVariable>
                 <SetVariable name="Size">50f,24f</SetVariable>
diff --git a/res/skins/Tango/deck_buttons_right.xml b/res/skins/Tango/deck_buttons_right.xml
index bed0aea54677..c2d4bbfafcb2 100644
--- a/res/skins/Tango/deck_buttons_right.xml
+++ b/res/skins/Tango/deck_buttons_right.xml
@@ -31,7 +31,21 @@ Variables:
             <Layout>stacked</Layout>
             <Size>50f,24f</Size>
             <Children>
-              <Template src="skin:button_2state_right_display.xml"><!-- Play -->
+              <!-- index 0 due to bug -->
+              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
+              <!-- Block Play button if passthrough is active,
+                  show speaker icon instead -->
+              <WidgetGroup>
+                <ObjectName>PassthroughPlayCover</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>me,me</SizePolicy>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+              <!-- Play -->
+              <Template src="skin:button_2state_right_display.xml">
                 <SetVariable name="ObjectName">PlayCue</SetVariable>
                 <SetVariable name="TooltipId">play_cue_set</SetVariable>
                 <SetVariable name="Size">50f,24f</SetVariable>
@@ -71,7 +85,21 @@ Variables:
                 <Layout>stacked</Layout>
                 <Size>50f,24f</Size>
                 <Children>
-                  <Template src="skin:button_2state_right_display.xml"><!-- Play -->
+                  <!-- index 0 due to bug -->
+                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
+                  <!-- Block Play button if passthrough is active,
+                      show speaker icon instead -->
+                  <WidgetGroup>
+                    <ObjectName>PassthroughPlayCover</ObjectName>
+                    <Layout>vertical</Layout>
+                    <SizePolicy>me,me</SizePolicy>
+                    <Connection>
+                      <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+                  <!-- Play -->
+                  <Template src="skin:button_2state_right_display.xml">
                     <SetVariable name="ObjectName">PlayCue</SetVariable>
                     <SetVariable name="TooltipId">play_cue_set</SetVariable>
                     <SetVariable name="Size">50f,24f</SetVariable>
@@ -120,8 +148,9 @@ Variables:
             <Layout>horizontal</Layout>
             <SizePolicy>min,me</SizePolicy>
             <Children>
-
-              <WidgetGroup><!-- Stars -->
+              <!-- Stars -->
+              <!-- visibility controlled by SizeAwareStack in size_detector_stars.xml -->
+              <WidgetGroup>
                 <Layout>horizontal</Layout>
                 <SizePolicy>min,min</SizePolicy>
                 <Children>
@@ -129,9 +158,7 @@ Variables:
                     <Size>84f,22f</Size>
                     <Layout>horizontal</Layout>
                     <Children>
-
                       <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-
                       <StarRating>
                         <ObjectName>DeckStars</ObjectName>
                         <Size>83min,22f</Size>
@@ -168,7 +195,7 @@ Variables:
                         <SetVariable name="state_0_unpressed">quantize_off.svg</SetVariable>
                         <SetVariable name="state_1_pressed">quantize_on.svg</SetVariable>
                         <SetVariable name="state_1_unpressed">quantize_on.svg</SetVariable>
-                        <SetVariable name="ConfigKeyPerm"><Variable name="group"/>,quantize</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,quantize</SetVariable>
                       </Template>
                     </Children>
                     <Connection>
@@ -186,17 +213,17 @@ Variables:
                         <SetVariable name="ObjectName">DeckButtonExpanded</SetVariable>
                         <SetVariable name="Size">20f,22f</SetVariable>
                         <SetVariable name="TooltipId">orientation</SetVariable>
-                        <SetVariable name="state_0_pressed">cf_left_attention.svg</SetVariable>
-                        <SetVariable name="state_0_unpressed">cf_left_attention.svg</SetVariable>
-                        <SetVariable name="state_1_pressed">cf_center_attention.svg</SetVariable>
-                        <SetVariable name="state_1_unpressed">cf_center_attention.svg</SetVariable>
-                        <SetVariable name="state_2_pressed">cf_right.svg</SetVariable>
-                        <SetVariable name="state_2_unpressed">cf_right.svg</SetVariable>
+                        <SetVariable name="state_0_pressed">xfader_left_attention.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">xfader_left_attention.svg</SetVariable>
+                        <SetVariable name="state_1_pressed">xfader_center_attention.svg</SetVariable>
+                        <SetVariable name="state_1_unpressed">xfader_center_attention.svg</SetVariable>
+                        <SetVariable name="state_2_pressed">xfader_right.svg</SetVariable>
+                        <SetVariable name="state_2_unpressed">xfader_right.svg</SetVariable>
                         <SetVariable name="ConfigKey"><Variable name="group"/>,orientation</SetVariable>
                       </Template>
                     </Children>
                     <Connection>
-                      <ConfigKey persist="true">[Tango],always_visible_cfOrientation</ConfigKey>
+                      <ConfigKey persist="true">[Tango],always_visible_xfaderOrientation</ConfigKey>
                       <Transform><Not/></Transform>
                       <BindProperty>visible</BindProperty>
                     </Connection>
@@ -278,7 +305,7 @@ Variables:
                         <SetVariable name="state_0_unpressed">keylock_off.svg</SetVariable>
                         <SetVariable name="state_1_pressed">keylock_on.svg</SetVariable>
                         <SetVariable name="state_1_unpressed">keylock_on.svg</SetVariable>
-                        <SetVariable name="ConfigKeyPerm"><Variable name="group"/>,keylock</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,keylock</SetVariable>
                       </Template>
                     </Children>
                     <Connection>
@@ -287,7 +314,7 @@ Variables:
                       <BindProperty>visible</BindProperty>
                     </Connection>
                   </WidgetGroup>
-                    <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
+                    <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
                 </Children>
                 <Connection>
                   <ConfigKey persist="true">[Tango],deck_controls</ConfigKey>
@@ -295,11 +322,21 @@ Variables:
                 </Connection>
               </WidgetGroup><!-- /Expandable Deck controls -->
 
-              <Template src="skin:button_2state_persist.xml"><!-- Toggle extra deck buttons -->
-                <SetVariable name="ObjectName">DeckButtonTogglerRight</SetVariable>
-                <SetVariable name="Size">11f,22f</SetVariable>
-                <SetVariable name="ConfigKeyPerm">[Tango],deck_controls</SetVariable>
-              </Template>
+              <WidgetGroup>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <Template src="skin:button_2state_persist.xml"><!-- Toggle extra deck buttons -->
+                    <SetVariable name="ObjectName">DeckButtonTogglerRight</SetVariable>
+                    <SetVariable name="Size">11f,22f</SetVariable>
+                    <SetVariable name="ConfigKey">[Tango],deck_controls</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey>[Tango],deck_controls_toggle</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
 
               <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
@@ -316,7 +353,7 @@ Variables:
                     <SetVariable name="state_0_unpressed">quantize_off.svg</SetVariable>
                     <SetVariable name="state_1_pressed">quantize_on.svg</SetVariable>
                     <SetVariable name="state_1_unpressed">quantize_on.svg</SetVariable>
-                    <SetVariable name="ConfigKeyPerm"><Variable name="group"/>,quantize</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,quantize</SetVariable>
                   </Template>
                 </Children>
                 <Connection>
@@ -333,17 +370,17 @@ Variables:
                     <SetVariable name="ObjectName">DeckButton</SetVariable>
                     <SetVariable name="Size">20f,22f</SetVariable>
                     <SetVariable name="TooltipId">orientation</SetVariable>
-                    <SetVariable name="state_0_pressed">cf_left_attention.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">cf_left_attention.svg</SetVariable>
-                    <SetVariable name="state_1_pressed">cf_center_attention.svg</SetVariable>
-                    <SetVariable name="state_1_unpressed">cf_center_attention.svg</SetVariable>
-                    <SetVariable name="state_2_pressed">cf_right.svg</SetVariable>
-                    <SetVariable name="state_2_unpressed">cf_right.svg</SetVariable>
+                    <SetVariable name="state_0_pressed">xfader_left_attention.svg</SetVariable>
+                    <SetVariable name="state_0_unpressed">xfader_left_attention.svg</SetVariable>
+                    <SetVariable name="state_1_pressed">xfader_center_attention.svg</SetVariable>
+                    <SetVariable name="state_1_unpressed">xfader_center_attention.svg</SetVariable>
+                    <SetVariable name="state_2_pressed">xfader_right.svg</SetVariable>
+                    <SetVariable name="state_2_unpressed">xfader_right.svg</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,orientation</SetVariable>
                   </Template>
                 </Children>
                 <Connection>
-                  <ConfigKey persist="true">[Tango],always_visible_cfOrientation</ConfigKey>
+                  <ConfigKey persist="true">[Tango],always_visible_xfaderOrientation</ConfigKey>
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
@@ -421,7 +458,7 @@ Variables:
                     <SetVariable name="state_0_unpressed">keylock_off.svg</SetVariable>
                     <SetVariable name="state_1_pressed">keylock_on.svg</SetVariable>
                     <SetVariable name="state_1_unpressed">keylock_on.svg</SetVariable>
-                    <SetVariable name="ConfigKeyPerm"><Variable name="group"/>,keylock</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,keylock</SetVariable>
                   </Template>
                 </Children>
                 <Connection>
@@ -439,6 +476,9 @@ Variables:
       <!-- hidden detector to show Star rating only if it fits -->
       <Template src="skin:size_detector_stars.xml"/>
 
+      <!-- hidden detector to show deck controls toggle if necessary -->
+      <Template src="skin:size_detector_deck_controls_toggle.xml"/>
+
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Tango/deck_comment_left.xml b/res/skins/Tango/deck_comment_left.xml
index 39a885ffd1d0..f3889f63c06b 100644
--- a/res/skins/Tango/deck_comment_left.xml
+++ b/res/skins/Tango/deck_comment_left.xml
@@ -1,3 +1,10 @@
+<!--
+Description:
+  An extra line below/above waveform overview that contains FX asssign buttons and
+  track commment (optional)
+Variables:
+  chanNum : the channel number
+-->
 <Template>
   <SetVariable name="sourceType">deck</SetVariable>
   <WidgetGroup>
@@ -7,7 +14,7 @@
     <Children>
       <WidgetGroup><!-- Track comment + FX indicators -->
         <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
+        <SizePolicy>i,min</SizePolicy>
         <Children>
           <!--	Additional line to display comments from file tag.
           Useful to explain hotcues, loop, Ins & Outs for live sets etc.
@@ -37,34 +44,28 @@
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
           <Template src="skin:fx_assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
-            <SetVariable name="labelText">FX1</SetVariable>
-            <SetVariable name="fxUnit">1</SetVariable>
+            <SetVariable name="FxUnitNum">1</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
           <Template src="skin:fx_assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
-            <SetVariable name="labelText">FX2</SetVariable>
-            <SetVariable name="fxUnit">2</SetVariable>
+            <SetVariable name="FxUnitNum">2</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
           <Template src="skin:fx_assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
-            <SetVariable name="labelText">FX3</SetVariable>
-            <SetVariable name="fxUnit">3</SetVariable>
+            <SetVariable name="FxUnitNum">3</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
           <Template src="skin:fx_assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
-            <SetVariable name="labelText">FX4</SetVariable>
-            <SetVariable name="fxUnit">4</SetVariable>
+            <SetVariable name="FxUnitNum">4</SetVariable>
           </Template>
 
         </Children>
       </WidgetGroup><!-- /Track comment + FX indicators -->
 
-      <WidgetGroup>
-        <Size>1me,1f</Size>
-      </WidgetGroup>
+      <WidgetGroup><Size>1me,1f</Size></WidgetGroup>
 
     </Children>
   </WidgetGroup>
diff --git a/res/skins/Tango/deck_comment_right.xml b/res/skins/Tango/deck_comment_right.xml
index b5d1dfebf994..03793ff02df3 100644
--- a/res/skins/Tango/deck_comment_right.xml
+++ b/res/skins/Tango/deck_comment_right.xml
@@ -1,3 +1,10 @@
+<!--
+Description:
+  An extra line below/above waveform overview that contains FX asssign buttons and
+  track commment (optional)
+Variables:
+  chanNum : the channel number
+-->
 <Template>
   <SetVariable name="sourceType">deck</SetVariable>
   <WidgetGroup>
@@ -16,31 +23,27 @@
 
       <WidgetGroup><!-- Track comment + FX indicators -->
         <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
+        <SizePolicy>i,min</SizePolicy>
         <Children>
 
           <Template src="skin:fx_assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
-            <SetVariable name="labelText">FX1</SetVariable>
-            <SetVariable name="fxUnit">1</SetVariable>
+            <SetVariable name="FxUnitNum">1</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
           <Template src="skin:fx_assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
-            <SetVariable name="labelText">FX2</SetVariable>
-            <SetVariable name="fxUnit">2</SetVariable>
+            <SetVariable name="FxUnitNum">2</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
           <Template src="skin:fx_assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
-            <SetVariable name="labelText">FX3</SetVariable>
-            <SetVariable name="fxUnit">3</SetVariable>
+            <SetVariable name="FxUnitNum">3</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
           <Template src="skin:fx_assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
-            <SetVariable name="labelText">FX4</SetVariable>
-            <SetVariable name="fxUnit">4</SetVariable>
+            <SetVariable name="FxUnitNum">4</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
@@ -72,7 +75,6 @@
         </Children>
       </WidgetGroup><!-- /Track comment + FX indicators -->
 
-
       <WidgetGroup>
         <Size>1me,1f</Size>
         <Connection>
diff --git a/res/skins/Tango/deck_left.xml b/res/skins/Tango/deck_left.xml
index 23b67bc2a656..70c4c49aa670 100644
--- a/res/skins/Tango/deck_left.xml
+++ b/res/skins/Tango/deck_left.xml
@@ -16,12 +16,12 @@ Variables:
   <WidgetGroup>
     <ObjectName>DeckContainer</ObjectName>
     <Layout>horizontal</Layout>
-    <Size>504me,136min</Size>
+    <SizePolicy>me,min</SizePolicy>
     <Children>
 
       <WidgetGroup><!-- [Overview, Comment, ArtistTitle] + [Loop/Beatjump, DeckButtons] -->
         <ObjectName>Deck<Variable name="chanNum"/></ObjectName>
-        <Size>250me,136min</Size>
+        <SizePolicy>me,min</SizePolicy>
         <Layout>vertical</Layout>
         <Children>
 
@@ -40,138 +40,107 @@ Variables:
             </Children>
           </WidgetGroup><!-- /Overview, Comment, ArtistTitle -->
 
-          <Template src="skin:deck_buttons_left.xml" />
+          <Template src="skin:deck_buttons_left.xml"/>
+
+          <Template src="skin:loop_jump_controls_left.xml"/>
+
+        </Children>
+      </WidgetGroup><!-- / [Overview, Comment, ArtistTitle] + [Loop/Beatjump, DeckButtons] -->
+
+      <WidgetGroup><!-- Mixer -->
+        <Layout>vertical</Layout>
+        <SizePolicy>f,min</SizePolicy>
+        <Children>
+          <Template src="skin:mixer_channel_left.xml"/>
 
           <WidgetGroup>
             <Layout>vertical</Layout>
-            <Size>1me,25f</Size>
+            <Size>1me,25me</Size>
             <Children>
               <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>1me,3f</Size></WidgetGroup>
-              <Template src="skin:loop_controls_left.xml"/>
+              <WidgetGroup><ObjectName>RoundFiller25</ObjectName><Size>1me,22me</Size></WidgetGroup>
             </Children>
             <Connection>
               <ConfigKey>[Tango],loop_beatjump_controls</ConfigKey>
               <BindProperty>visible</BindProperty>
             </Connection>
           </WidgetGroup>
-
         </Children>
-      </WidgetGroup><!-- / [Overview, Comment, ArtistTitle] + [Loop/Beatjump, DeckButtons] -->
-
-      <WidgetGroup><!-- Mixer / [ [Spinny / Cover] + VUMeter ] + Pitch + spacer -->
-        <Layout>vertical</Layout>
+        <Connection>
+          <ConfigKey>[Tango],channel_mixer</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /Mixer -->
+
+      <WidgetGroup><!-- Spinny/Cover + VUMeter -->
+        <Layout>horizontal</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <WidgetGroup><!-- Mixer / [ [Spinny / Cover] + VUMeter ] + Pitch -->
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
+
+          <WidgetGroup><!-- Spinny/Cover -->
+            <Layout>vertical</Layout>
+            <SizePolicy>min,me</SizePolicy>
             <Children>
-              <!-- Mixer / [ [Spinny / Cover] + VUMeter ] -->
-              <WidgetStack currentpage="[Tango],mixer_spinnyCover" persist="true">
-                <ObjectName>MixerCoverStack</ObjectName>
-                <SizePolicy>f,min</SizePolicy>
+              <WidgetGroup><!-- if BIG spinny is enabled -->
+                <Layout>vertical</Layout>
+                <SizePolicy>min,me</SizePolicy>
                 <Children>
-
-                  <!-- Mixer -->
-                  <WidgetGroup trigger="[Tango],channel_mixer" persist="true" on-hide-select="1">
-                    <Layout>vertical</Layout>
-                    <SizePolicy>f,min</SizePolicy>
-                    <Children>
-                      <Template src="skin:mixer_channel_left.xml"/>
-
-                      <WidgetGroup>
-                        <Layout>vertical</Layout>
-                        <Size>1me,25f</Size>
-                        <Children>
-                          <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>1me,3f</Size></WidgetGroup>
-                          <WidgetGroup><ObjectName>Spacer25</ObjectName><Size>1me,22f</Size></WidgetGroup>
-                        </Children>
-                        <Connection>
-                          <ConfigKey>[Tango],loop_beatjump_controls</ConfigKey>
-                          <BindProperty>visible</BindProperty>
-                        </Connection>
-                      </WidgetGroup>
-                    </Children>
-                  </WidgetGroup><!-- /Mixer -->
-
-                  <WidgetGroup><!-- Spinny/Cover/none + VUMeter -->
+                  <WidgetGroup>
                     <Layout>horizontal</Layout>
-                    <SizePolicy>min,me</SizePolicy>
+                    <SizePolicy>min,min</SizePolicy>
                     <Children>
-
-                      <WidgetGroup><!-- Spinny/Cover/none -->
-                        <Layout>horizontal</Layout>
-                        <SizePolicy>min,min</SizePolicy>
-                        <Children>
-                          <WidgetGroup>
-                            <Layout>horizontal</Layout>
-                            <SizePolicy>min,min</SizePolicy>
-                            <Children>
-
-                              <WidgetGroup>
-                                <Size>3f,1min</Size>
-                                <Children/>
-                              </WidgetGroup>
-
-                              <Template src="skin:spinnyCover.xml"/>
-
-                            </Children>
-                            <Connection>
-                              <ConfigKey persist="true">[Tango],spinnyCoverBIG</ConfigKey>
-                              <BindProperty>visible</BindProperty>
-                            </Connection>
-                          </WidgetGroup>
-                        </Children>
-                        <Connection>
-                          <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
-                          <Transform><IsEqual>2</IsEqual><Not/></Transform>
-                          <BindProperty>visible</BindProperty>
-                        </Connection>
-                      </WidgetGroup><!-- /Spinny/Cover/none -->
-
-                      <WidgetGroup>
-                        <Size>3f,1me</Size>
-                        <Children/>
-                        <Connection>
-                          <ConfigKey>[Tango],vumeter</ConfigKey>
-                          <BindProperty>visible</BindProperty>
-                        </Connection>
-                      </WidgetGroup>
-
-                      <Template src="skin:vumeter_floating.xml"/>
-
+                      <!-- margin to deck -->
+                      <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
+                      <Template src="skin:spinnyCover.xml"/>
                     </Children>
-                  </WidgetGroup><!-- / Spinny/Cover/none + VUMeter -->
-
+                  </WidgetGroup>
+                  <!-- push spinny to the top -->
+                  <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
                 </Children>
-              </WidgetStack><!-- /Mixer / [ Spinny/Cover/none + VUMeter ] -->
-
-              <WidgetGroup><!-- Pitch slider & Key controls -->
-                <Size>3f,1me</Size>
-                <Children/>
                 <Connection>
-                  <ConfigKey>[Tango],pitch_fader</ConfigKey>
+                  <ConfigKey persist="true">[Tango],spinnyCoverBIG</ConfigKey>
                   <BindProperty>visible</BindProperty>
                 </Connection>
-              </WidgetGroup>
-
-              <Template src="skin:rate_pitch_key.xml"/>
-              <!-- /Pitch slider & Key controls -->
-
+              </WidgetGroup><!-- if BIG spinny is enabled -->
             </Children>
-          </WidgetGroup><!-- /Mixer / [ Spinny/Cover/none + VUMeter ] + Pitch -->
+            <Connection>
+              <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
+              <Transform><IsEqual>2</IsEqual><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- /Spinny/Cover -->
 
-          <!-- This was working and somehow necessary, but now (v38++) causes left decks
-          to grow by 3px (right decks shrink by 3px) when enabling extra deck buttons.
+          <WidgetGroup>
+            <Size>5f,1me</Size>
+            <Connection>
+              <ConfigKey>[Tango],vumeter</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
 
-          Expanding spacer, necessary because obviously WidgetStack breaks
-          qproperty-layoutAlignment of parent Widget -->
-          <WidgetGroup><SizePolicy>min,me</SizePolicy><Children/></WidgetGroup>
+          <Template src="skin:vumeter_floating.xml"/>
 
         </Children>
-      </WidgetGroup><!-- Mixer / [ [Spinny / Cover] + VUMeter ] + Pitch + spacer -->
-
-      <WidgetGroup><Size>3f,1min</Size><Children/></WidgetGroup>
+        <Connection>
+          <ConfigKey>[Tango],channel_mixer</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /Spinny + VUMeter -->
+
+      <!-- Pitch slider & Key controls -->
+      <WidgetGroup>
+        <Size>3f,1me</Size>
+        <Connection>
+          <ConfigKey>[Tango],pitch_fader</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <Template src="skin:rate_pitch_key.xml"/>
+      <!-- /Pitch slider & Key controls -->
+
+      <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
 
     </Children>
   </WidgetGroup>
diff --git a/res/skins/Tango/deck_loop_beatjump_left.xml b/res/skins/Tango/deck_loop_beatjump_left.xml
deleted file mode 100644
index 594f2e649d88..000000000000
--- a/res/skins/Tango/deck_loop_beatjump_left.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<Template>
-  <WidgetGroup><!-- Loop/Jump 2.0 -->
-    <ObjectName>DeckLoopBeatjump</ObjectName>
-    <SizePolicy>min,min</SizePolicy>
-    <Layout>horizontal</Layout>
-    <Children>
-      <!-- Number of spacers besides the loop containers determines the
-          ratio of 'white space' between them -->
-        <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>0me,1min</Size></WidgetGroup>
-        <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>0me,1min</Size></WidgetGroup>
-        <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>0me,1min</Size></WidgetGroup>
-      <Template src="skin:loop_move_sizes.xml"/>
-        <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>1me,1min</Size></WidgetGroup>
-      <Template src="skin:loop_sizes.xml"/>
-        <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-      <Template src="skin:loop_scale.xml"/>
-        <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>1me,1min</Size></WidgetGroup>
-      <Template src="skin:loop_basics.xml"/>
-        <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>1me,1min</Size></WidgetGroup>
-        <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>0me,1min</Size></WidgetGroup>
-        <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>0me,1min</Size></WidgetGroup>
-      <Template src="skin:beatjump_sizes.xml"/>
-    </Children>
-    <Connection>
-      <ConfigKey persist="true">[Tango],loop_beatjump_controls</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup><!-- /Loop/Jump 2.0 -->
-
-  <!-- Loop/Jump 2.1 compact
-  <WidgetGroup>
-    <ObjectName>DeckLoopBeatjump</ObjectName>
-    <SizePolicy>min,min</SizePolicy>
-    <Layout>horizontal</Layout>
-    <Children>
-        <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>1me,1min</Size></WidgetGroup>
-        <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>0me,1min</Size></WidgetGroup>
-      <Template src="skin:loop_controls_2.1_compact_left.xml"/>
-        <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>1me,1min</Size></WidgetGroup>
-      <Template src="skin:beatjump_2.1_compact_left.xml"/>
-    </Children>
-    <Connection>
-      <ConfigKey persist="true">[Tango],loop_beatjump_controls</ConfigKey>
-      <Transform><IsEqual>2</IsEqual></Transform>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup> -->
-
-  <!-- Loop/Jump 2.1+ advanced
-  <WidgetGroup>
-    <ObjectName>DeckLoopBeatjump</ObjectName>
-    <SizePolicy>min,min</SizePolicy>
-    <Layout>horizontal</Layout>
-    <Children>
-        <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>0me,1min</Size></WidgetGroup>
-        <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>0me,1min</Size></WidgetGroup>
-        <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>0me,1min</Size></WidgetGroup>
-      <Template src="skin:loop_sizes.xml"/>
-        <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>1me,1min</Size></WidgetGroup>
-      <Template src="skin:loop_controls_2.1.xml"/>
-        <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>1me,1min</Size></WidgetGroup>
-        <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>0me,1min</Size></WidgetGroup>
-        <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>0me,1min</Size></WidgetGroup>
-      <Template src="skin:beatjump_2.1.xml"/>
-    </Children>
-    <Connection>
-      <ConfigKey persist="true">[Tango],loop_beatjump_controls</ConfigKey>
-      <Transform><IsEqual>3</IsEqual></Transform>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup> -->
-</Template>
diff --git a/res/skins/Tango/deck_overview_left.xml b/res/skins/Tango/deck_overview_left.xml
index 8ca976d223f1..ae28002797be 100644
--- a/res/skins/Tango/deck_overview_left.xml
+++ b/res/skins/Tango/deck_overview_left.xml
@@ -17,7 +17,7 @@ Variables:
 -->
 <Template>
   <WidgetGroup>
-    <ObjectName>DeckOverview</ObjectName>
+    <ObjectName>Spacer0f</ObjectName>
     <Layout>stacked</Layout>
     <SizePolicy>me,f</SizePolicy>
     <Children>
@@ -64,16 +64,42 @@ Variables:
             </Connection>
           </Overview><!-- /Overview -->
 
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size><Children/></WidgetGroup>
+          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
           <Template src="skin:vinyl_controls_left.xml"/>
 
-          <Template src="skin:button_2state_persist.xml">
-            <SetVariable name="ObjectName">VinylTogglerLeft</SetVariable>
-            <SetVariable name="Size">11f,50f</SetVariable>
-            <SetVariable name="TooltipId"></SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
-          </Template>
+          <WidgetGroup><!-- Vinyl Controls toggle with passthrough -->
+            <Size>11f,50f</Size>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:button_2state.xml">
+                <SetVariable name="ObjectName">VinylTogglerLeftPassthrough</SetVariable>
+                <SetVariable name="Size">11f,50f</SetVariable>
+                <SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <WidgetGroup><!-- Vinyl Controls toggle without passthrough -->
+            <Size>11f,50f</Size>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:button_2state.xml">
+                <SetVariable name="ObjectName">VinylTogglerLeft</SetVariable>
+                <SetVariable name="Size">11f,50f</SetVariable>
+                <SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
 
           <WidgetGroup><!-- [Spinny / Cover / none] -->
             <Layout>vertical</Layout>
@@ -128,15 +154,10 @@ Variables:
 
 <!-- 	Invisible Waveform, active when stacked Waveform are disabled.
       Appearently, they needs to be present in skin somewhere (visible or not)
-      to prevent visual glitches (or crashes). -->
+      to prevent visual glitches (or crashes).
       <WidgetGroup>
         <Size>50f,50f</Size>
         <Children>
-          <!-- Colors contain actually deck-specific Variable "chanNum" is already
-          but here this is already passed as variable and we can't set a variable name
-          containing another variable.
-          Here it doesn't matter since waveform is invisble.                           
-          -->
           <Template src="skin:waveform.xml">
             <SetVariable name="Size">0me,50me</SetVariable>
             <SetVariable name="chanNum"><Variable name="chanNum"/></SetVariable>
@@ -149,7 +170,7 @@ Variables:
           <BindProperty>visible</BindProperty>
           <Transform><Not/></Transform>
         </Connection>
-      </WidgetGroup><!-- Invisible waveform -->
+      </WidgetGroup> --><!-- Invisible waveform -->
 
     </Children>
   </WidgetGroup><!-- /Overview Row -->
diff --git a/res/skins/Tango/deck_overview_right.xml b/res/skins/Tango/deck_overview_right.xml
index 25b25be232d5..83d3b5891c7f 100644
--- a/res/skins/Tango/deck_overview_right.xml
+++ b/res/skins/Tango/deck_overview_right.xml
@@ -17,7 +17,7 @@ Variables:
 -->
 <Template>
   <WidgetGroup>
-    <ObjectName>DeckOverview</ObjectName>
+    <ObjectName>Spacer0f</ObjectName>
     <Layout>stacked</Layout>
     <SizePolicy>me,f</SizePolicy>
     <Children>
@@ -77,13 +77,40 @@ Variables:
             </Connection>
           </WidgetGroup><!-- /[Spinny / Cover / none] -->
 
-          <Template src="skin:button_2state_persist.xml"><!-- Toggle extra deck buttons -->
-            <SetVariable name="ObjectName">VinylTogglerRight</SetVariable>
-            <SetVariable name="Size">11f,50f</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
-          </Template>
+          <WidgetGroup><!-- Vinyl Controls toggle with passthrough -->
+            <Size>11f,50f</Size>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:button_2state.xml">
+                <SetVariable name="ObjectName">VinylTogglerRightPassthrough</SetVariable>
+                <SetVariable name="Size">11f,50f</SetVariable>
+                <SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <WidgetGroup><!-- Vinyl Controls toggle without passthrough -->
+            <Size>11f,50f</Size>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:button_2state.xml">
+                <SetVariable name="ObjectName">VinylTogglerRight</SetVariable>
+                <SetVariable name="Size">11f,50f</SetVariable>
+                <SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
 
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size><Children/></WidgetGroup>
+          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
           <Template src="skin:vinyl_controls_right.xml"/>
 
@@ -101,27 +128,27 @@ Variables:
             <PlayedOverlayColor><Variable name="PlayedOverlayColor"/></PlayedOverlayColor>
             <EndOfTrackColor>#EA0085</EndOfTrackColor>
             <DefaultMark>
-                <Align>bottom|right</Align>
-                <Color>#00FF00</Color>
-                <TextColor>#FFFFFF</TextColor>
-                <Text> %1 </Text>
+              <Align>bottom|right</Align>
+              <Color>#00FF00</Color>
+              <TextColor>#FFFFFF</TextColor>
+              <Text> %1 </Text>
             </DefaultMark>
             <MarkRange>
-                <StartControl>loop_start_position</StartControl>
-                <EndControl>loop_end_position</EndControl>
-                <EnabledControl>loop_enabled</EnabledControl>
-                <Color>#00FF00</Color>
-                <DisabledColor>#FFFFFF</DisabledColor>
+              <StartControl>loop_start_position</StartControl>
+              <EndControl>loop_end_position</EndControl>
+              <EnabledControl>loop_enabled</EnabledControl>
+              <Color>#00FF00</Color>
+              <DisabledColor>#FFFFFF</DisabledColor>
             </MarkRange>
             <Mark>
-                <Control>cue_point</Control>
-                <Text>C</Text>
-                <Align>top|right</Align>
-                <Color>#FF0080</Color>
-                <TextColor>#FFFFFF</TextColor>
+              <Control>cue_point</Control>
+              <Text>C</Text>
+              <Align>top|right</Align>
+              <Color>#FF0080</Color>
+              <TextColor>#FFFFFF</TextColor>
             </Mark>
             <Connection>
-                <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
+              <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
             </Connection>
           </Overview>
 
@@ -130,15 +157,10 @@ Variables:
 
 <!-- 	Invisible Waveform, active when stacked Waveform are disabled.
       Appearently, they needs to be present in skin somewhere (visible or not)
-      to prevent visual glitches (or crashes). -->
+      to prevent visual glitches (or crashes).
       <WidgetGroup>
         <Size>50f,50f</Size>
         <Children>
-          <!-- Colors contain actually deck-specific Variable "chanNum" is already
-          but here this is already passed as variable and we can't set a variable name
-          containing another variable.
-          Here it doesn't matter since waveform is invisble.                           
-          -->
           <Template src="skin:waveform.xml">
             <SetVariable name="Size">0me,50me</SetVariable>
             <SetVariable name="chanNum"><Variable name="chanNum"/></SetVariable>
@@ -151,7 +173,7 @@ Variables:
           <BindProperty>visible</BindProperty>
           <Transform><Not/></Transform>
         </Connection>
-      </WidgetGroup><!-- /Invisible waveform -->
+      </WidgetGroup> --><!-- /Invisible waveform -->
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Tango/deck_right.xml b/res/skins/Tango/deck_right.xml
index f75ea1275536..7a98d902fa92 100644
--- a/res/skins/Tango/deck_right.xml
+++ b/res/skins/Tango/deck_right.xml
@@ -16,123 +16,110 @@ Variables:
   <WidgetGroup>
     <ObjectName>DeckContainer</ObjectName>
     <Layout>horizontal</Layout>
-    <Size>504me,136min</Size>
+    <SizePolicy>me,min</SizePolicy>
     <Children>
 
-      <WidgetGroup><Size>3f,1min</Size><Children/></WidgetGroup>
+      <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
 
-      <WidgetGroup><!-- Mixer / [ Spinny/Cover/none + VUMeter ] + Pitch + spacer -->
+      <!-- Pitch slider & Key controls -->
+      <Template src="skin:rate_pitch_key.xml"/>
+
+      <WidgetGroup>
+        <Size>3f,1me</Size>
+        <Connection>
+          <ConfigKey>[Tango],pitch_fader</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+      <!-- /Pitch slider & Key controls -->
+
+      <WidgetGroup><!-- Mixer -->
         <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
+        <SizePolicy>f,min</SizePolicy>
         <Children>
-          <WidgetGroup><!-- Mixer / [ Spinny/Cover/none + VUMeter ] + Pitch -->
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
+          <Template src="skin:mixer_channel_right.xml"/>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Size>1me,25me</Size>
             <Children>
+              <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>1me,3f</Size></WidgetGroup>
+              <WidgetGroup><ObjectName>RoundFiller25</ObjectName><Size>1me,22me</Size></WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey>[Tango],loop_beatjump_controls</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey>[Tango],channel_mixer</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /Mixer -->
 
-              <!-- Pitch slider & Key controls -->
-              <Template src="skin:rate_pitch_key.xml"/>
-			
-              <WidgetGroup>
-                <Size>3f,1me</Size>
-                <Children/>
-                <Connection>
-                  <ConfigKey>[Tango],pitch_fader</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-              <!-- /Pitch slider & Key controls -->
-              
-              <!-- Mixer / Spinny/Cover/none + VUMeter ] -->
-              <WidgetStack currentpage="[Tango],mixer_spinnyCover" persist="true">
-                <ObjectName>MixerCoverStack</ObjectName>
-                <SizePolicy>f,min</SizePolicy>
+      <WidgetGroup><!-- Spinny/Cover + VUMeter -->
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,me</SizePolicy>
+        <Children>
+
+          <Template src="skin:vumeter_floating.xml"/>
+
+          <WidgetGroup>
+            <Size>5f,1me</Size>
+            <Connection>
+              <ConfigKey>[Tango],vumeter</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <WidgetGroup><!-- Spinny/Cover -->
+            <Layout>vertical</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <Children>
+              <WidgetGroup><!-- if BIG spinny is enabled -->
+                <Layout>vertical</Layout>
+                <SizePolicy>min,me</SizePolicy>
                 <Children>
-                
-                  <!-- Mixer -->
-                  <WidgetGroup trigger="[Tango],channel_mixer" persist="true" on-hide-select="1">
-                    <Layout>vertical</Layout>
-                    <SizePolicy>f,min</SizePolicy>
-                    <Children>
-                      <Template src="skin:mixer_channel_right.xml"/>
-
-                      <WidgetGroup>
-                        <Layout>vertical</Layout>
-                        <Size>1me,25f</Size>
-                        <Children>
-                          <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>1me,3f</Size></WidgetGroup>
-                          <WidgetGroup><ObjectName>Spacer25</ObjectName><Size>1me,22f</Size></WidgetGroup>
-                        </Children>
-                        <Connection>
-                          <ConfigKey>[Tango],loop_beatjump_controls</ConfigKey>
-                          <BindProperty>visible</BindProperty>
-                        </Connection>
-                      </WidgetGroup>
-                    </Children>
-                  </WidgetGroup><!-- /Mixer -->
-                  
-                  <WidgetGroup><!-- Spinny/Cover/none + VUMeter -->
+                  <WidgetGroup>
                     <Layout>horizontal</Layout>
-                    <SizePolicy>min,me</SizePolicy>
+                    <SizePolicy>min,min</SizePolicy>
                     <Children>
-                      
-                      <Template src="skin:vumeter_floating.xml"/>
-			
-                      <WidgetGroup>
-                        <Size>3f,1me</Size>
-                        <Children/>
-                        <Connection>
-                          <ConfigKey>[Tango],vumeter</ConfigKey>
-                          <BindProperty>visible</BindProperty>
-                        </Connection>
-                      </WidgetGroup>
-                    
-                      <WidgetGroup><!-- Spinny/Cover/none -->
-                        <Layout>horizontal</Layout>
-                        <SizePolicy>min,min</SizePolicy>
-                        <Children>
-                          <WidgetGroup>
-                            <Layout>horizontal</Layout>
-                            <SizePolicy>min,min</SizePolicy>
-                            <Children>
-                              <Template src="skin:spinnyCover.xml"/>
-                              <WidgetGroup><Size>3f,1min</Size><Children/></WidgetGroup>
-                            </Children>
-                            <Connection>
-                              <ConfigKey persist="true">[Tango],spinnyCoverBIG</ConfigKey>
-                              <BindProperty>visible</BindProperty>
-                            </Connection>
-                          </WidgetGroup>
-                        </Children>
-                        <Connection>
-                          <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
-                          <Transform><IsEqual>2</IsEqual><Not/></Transform>
-                          <BindProperty>visible</BindProperty>
-                        </Connection>
-                      </WidgetGroup><!-- /Spinny/Cover/none -->
-                        
+                      <Template src="skin:spinnyCover.xml"/>
+                      <!-- margin to deck -->
+                      <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
                     </Children>
-                  </WidgetGroup><!-- /Spinny/Cover/none + VUMeter -->
-                    
+                  </WidgetGroup>
+                  <!-- push spinny to the top -->
+                  <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
                 </Children>
-              </WidgetStack><!-- /Mixer / [ Spinny/Cover/none + VUMeter ] -->
-            
+                <Connection>
+                  <ConfigKey persist="true">[Tango],spinnyCoverBIG</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup><!-- if BIG spinny is enabled -->
             </Children>
-          </WidgetGroup><!-- /Mixer / [ Spinny/Cover/none + VUMeter ] + Pitch -->
-          
-          <!-- Expanding spacer, necessary because obviously WidgetStack breaks
-          qproperty-layoutAlignment of parent Widget -->
-          <WidgetGroup><SizePolicy>min,me</SizePolicy><Children/></WidgetGroup>
-          
+            <Connection>
+              <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
+              <Transform><IsEqual>2</IsEqual><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- /Spinny/Cover -->
+
         </Children>
-      </WidgetGroup><!-- /Mixer / Spinny/Cover/none + VUMeter ] + Pitch + spacer -->
+        <Connection>
+          <ConfigKey>[Tango],channel_mixer</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /Spinny/Cover + VUMeter -->
 
       <WidgetGroup><!-- [Overview, Comment, ArtistTitle] + [Loop/Beatjump, DeckButtons] -->
         <ObjectName>Deck<Variable name="chanNum"/></ObjectName>
-        <Size>250me,136min</Size>
+        <SizePolicy>me,min</SizePolicy>
         <Layout>vertical</Layout>
         <Children>
-        
+
           <!-- Packed Waveform & ArtistTitle into a fixed-size container,
           so Deck stays steady while Comment and LoopBeatjump controls can be toggled.
           Symmetrical decks [Waveforn/Artist/Deckbuttons] can be enabled in skin settings.
@@ -175,19 +162,8 @@ Variables:
 
           <Template src="skin:deck_buttons_right.xml" />
 
-          <WidgetGroup>
-            <Layout>vertical</Layout>
-            <Size>1me,25f</Size>
-            <Children>
-              <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>1me,3f</Size></WidgetGroup>
-              <Template src="skin:loop_controls_right.xml"/>
-            </Children>
-            <Connection>
-              <ConfigKey>[Tango],loop_beatjump_controls</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-          
+          <Template src="skin:loop_jump_controls_right.xml"/>
+
         </Children>
       </WidgetGroup><!-- / [Overview, Comment, ArtistTitle] + [Loop/Beatjump, DeckButtons] -->
     </Children>
diff --git a/res/skins/Tango/decks_12.xml b/res/skins/Tango/decks_12.xml
new file mode 100644
index 000000000000..864d05372ebc
--- /dev/null
+++ b/res/skins/Tango/decks_12.xml
@@ -0,0 +1,32 @@
+<!--
+Description:
+  Container for left deck, master VU, [GUI controls, xfader, etc.] and right deck
+Variables:
+  SignalBgColor_1   defined in skin.xml
+  SignalColor_1
+  SignalBgColor_2
+  SignalColor_2
+-->
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,f</SizePolicy>
+    <Children>
+      <Template src="skin:deck_left.xml">
+        <SetVariable name="chanNum">1</SetVariable>
+        <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_1"/></SetVariable>
+        <SetVariable name="SignalColor"><Variable name="SignalColor_1"/></SetVariable>
+      </Template>
+
+      <Template src="skin:vumeter_master_container.xml"/>
+
+      <Template src="skin:centerbox_deck12.xml"/>
+
+      <Template src="skin:deck_right.xml">
+        <SetVariable name="chanNum">2</SetVariable>
+        <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_2"/></SetVariable>
+        <SetVariable name="SignalColor"><Variable name="SignalColor_2"/></SetVariable>
+      </Template>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Tango/decks_34.xml b/res/skins/Tango/decks_34.xml
new file mode 100644
index 000000000000..c788f3034612
--- /dev/null
+++ b/res/skins/Tango/decks_34.xml
@@ -0,0 +1,36 @@
+<!--
+Description:
+  Container for left deck, centerbox (Logo) and right deck
+Variables:
+  SignalBgColor_3   defined in skin.xml
+  SignalColor_3
+  SignalBgColor_4
+  SignalColor_4
+-->
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,f</SizePolicy>
+    <Children>
+
+      <Template src="skin:deck_left.xml">
+        <SetVariable name="chanNum">3</SetVariable>
+        <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_3"/></SetVariable>
+        <SetVariable name="SignalColor"><Variable name="SignalColor_3"/></SetVariable>
+      </Template>
+
+      <Template src="skin:centerbox_deck34.xml"/>
+
+      <Template src="skin:deck_right.xml">
+        <SetVariable name="chanNum">4</SetVariable>
+        <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_4"/></SetVariable>
+        <SetVariable name="SignalColor"><Variable name="SignalColor_4"/></SetVariable>
+      </Template>
+
+    </Children>
+    <Connection>
+      <ConfigKey persist="true">[Master],show_4decks</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Tango/eq_knob_button_left.xml b/res/skins/Tango/eq_knob_button_left.xml
new file mode 100644
index 000000000000..a5497e7c38e3
--- /dev/null
+++ b/res/skins/Tango/eq_knob_button_left.xml
@@ -0,0 +1,70 @@
+<!--
+Description:
+  An EQ knob with a Kill button next to it.
+  A 'button' underneath the knob turns grey when EQ range is killed.
+Variables:
+  PotiMinAngle: -135°, see skin.xml
+  PotiMaxAngle: 135°, see skin.xml
+  group       : affected group
+  parameter   : 1, 2, 3 (low, mid, high)
+-->
+<Template>
+  <SetVariable name="FxRack">EqualizerRack1</SetVariable>
+  <SetVariable name="FxNum">1</SetVariable>
+  <SetVariable name="EQEffect">[EqualizerRack1_<Variable name="group"/>_Effect1]</SetVariable>
+  <WidgetGroup>
+    <ObjectName>EQKnobContainerLeft</ObjectName>
+    <SizePolicy>min,min</SizePolicy>
+    <Layout>vertical</Layout>
+    <Children>
+      <WidgetGroup><!-- EQ knob + Kill button -->
+        <SizePolicy>min,min</SizePolicy>
+        <Layout>horizontal</Layout>
+        <Children>
+          <!-- EQ knob + Kill indicator underneath -->
+          <WidgetGroup>
+            <SizePolicy>min,min</SizePolicy>
+            <Layout>stacked</Layout>
+            <Children>
+              <EffectParameterKnobComposed>
+                <Size>30f,30f</Size>
+                <Knob>skin:/knobs_sliders/knob_white.svg</Knob>
+                <BackPath>skin:/knobs_sliders/knob_bg.svg</BackPath>
+                <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+                <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+                <Connection>
+                  <ConfigKey><Variable name="EQEffect"/>,parameter<Variable name="parameter"/></ConfigKey>
+                </Connection>
+              </EffectParameterKnobComposed>
+
+              <Template src="skin:fx_button.xml">
+                <SetVariable name="ObjectName">EQKillUnderlayLeft</SetVariable>
+                <SetVariable name="Size">30f,30f</SetVariable>
+                <SetVariable name="parameter">button_parameter<Variable name="parameter"/></SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup><!-- /EQ knob + Kill indicator underneath -->
+
+          <!-- Kill button -->
+          <Template src="skin:fx_button.xml">
+            <SetVariable name="ObjectName">EQKillButton</SetVariable>
+            <SetVariable name="Size">12f,30f</SetVariable>
+            <SetVariable name="parameter">button_parameter<Variable name="parameter"/></SetVariable>
+          </Template>
+        </Children>
+        <Connection>
+          <ConfigKey><Variable name="EQEffect"/>,loaded</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /EQ knob + Kill button -->
+      <WidgetGroup><!-- Spacer when no EQ plugin is loaded -->
+        <Size>42me,30f</Size>
+        <Connection>
+          <ConfigKey><Variable name="EQEffect"/>,loaded</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /Spacer -->
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Tango/eq_knob_button_right.xml b/res/skins/Tango/eq_knob_button_right.xml
new file mode 100644
index 000000000000..01ef8b1fadf1
--- /dev/null
+++ b/res/skins/Tango/eq_knob_button_right.xml
@@ -0,0 +1,70 @@
+<!--
+Description:
+  An EQ knob with a Kill button next to it.
+  A 'button' underneath the knob turns grey when EQ range is killed.
+Variables:
+  PotiMinAngle: -135°, see skin.xml
+  PotiMaxAngle: 135°, see skin.xml
+  group       : affected group
+  parameter   : 1, 2, 3 (low, mid, high)
+-->
+<Template>
+  <SetVariable name="FxRack">EqualizerRack1</SetVariable>
+  <SetVariable name="FxNum">1</SetVariable>
+  <SetVariable name="EQEffect">[EqualizerRack1_<Variable name="group"/>_Effect1]</SetVariable>
+  <WidgetGroup>
+    <ObjectName>EQKnobContainerRight</ObjectName>
+    <SizePolicy>min,min</SizePolicy>
+    <Layout>vertical</Layout>
+    <Children>
+      <WidgetGroup><!-- EQ knob + Kill button -->
+        <SizePolicy>min,min</SizePolicy>
+        <Layout>horizontal</Layout>
+        <Children>
+          <!-- Kill button -->
+          <Template src="skin:fx_button.xml">
+            <SetVariable name="ObjectName">EQKillButton</SetVariable>
+            <SetVariable name="Size">12f,30f</SetVariable>
+            <SetVariable name="parameter">button_parameter<Variable name="parameter"/></SetVariable>
+          </Template>
+
+          <!-- EQ knob + Kill indicator underneath -->
+          <WidgetGroup>
+            <SizePolicy>min,min</SizePolicy>
+            <Layout>stacked</Layout>
+            <Children>
+              <EffectParameterKnobComposed>
+                <Size>30f,30f</Size>
+                <Knob>skin:/knobs_sliders/knob_white.svg</Knob>
+                <BackPath>skin:/knobs_sliders/knob_bg.svg</BackPath>
+                <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+                <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+                <Connection>
+                  <ConfigKey><Variable name="EQEffect"/>,parameter<Variable name="parameter"/></ConfigKey>
+                </Connection>
+              </EffectParameterKnobComposed>
+
+              <Template src="skin:fx_button.xml">
+                <SetVariable name="ObjectName">EQKillUnderlayRight</SetVariable>
+                <SetVariable name="Size">30f,30f</SetVariable>
+                <SetVariable name="parameter">button_parameter<Variable name="parameter"/></SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup><!-- /EQ knob + Kill indicator underneath -->
+        </Children>
+        <Connection>
+          <ConfigKey><Variable name="EQEffect"/>,loaded</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /EQ knob + Kill button -->
+      <WidgetGroup><!-- Spacer when no EQ plugin is loaded -->
+        <Size>42me,30f</Size>
+        <Connection>
+          <ConfigKey><Variable name="EQEffect"/>,loaded</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /Spacer -->
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Tango/eq_knob_left.xml b/res/skins/Tango/eq_knob_left.xml
deleted file mode 100644
index d074ea29286e..000000000000
--- a/res/skins/Tango/eq_knob_left.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
-Description:
-  An EQ knob with a Kill button next to it.
-  A 'button' underneath the knob turns grey when EQ range is killed.
-Variables:
-  group     : [ChannelN]
-  parameter : EQ parameter number
--->
-<Template>
-  <SetVariable name="EqualizerNumber">1</SetVariable>
-  <SetVariable name="EffectNumber">1</SetVariable>
-  <SetVariable name="EqualizerRackGroup">[EqualizerRack<Variable name="EqualizerNumber"/>]</SetVariable>
-  <SetVariable name="EqualizerEffectUnitGroup">[EqualizerRack<Variable name="EqualizerNumber"/>_<Variable name="group"/>]</SetVariable>
-  <SetVariable name="EqualizerEffectGroup">[EqualizerRack<Variable name="EqualizerNumber"/>_<Variable name="group"/>_Effect<Variable name="EffectNumber"/>]</SetVariable>
-  <WidgetGroup>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
-    <Children>
-
-      <WidgetGroup><!-- EQ knob + Kill button -->
-        <ObjectName>EQKnobLeft</ObjectName>
-        <Layout>horizontal</Layout>
-        <Size>54f,34f</Size><!-- 42f,30f + [4 12 0 0] margin -->
-        <Children>
-          <WidgetGroup><!-- EQ knob + Kill indicator underneath -->
-            <SizePolicy>min,min</SizePolicy>
-            <Layout>stacked</Layout>
-            <Children>
-              <EffectParameterKnobComposed>
-                  <Size>30f,30f</Size>
-                  <Knob>skin:/knobs_sliders/knob_white.svg</Knob>
-                  <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
-                  <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
-                  <Connection>
-                      <ConfigKey><Variable name="EqualizerEffectGroup"/>,parameter<Variable name="parameter"/></ConfigKey>
-                  </Connection>
-              </EffectParameterKnobComposed>
-              <Template src="skin:button_2state.xml">
-                <SetVariable name="ObjectName">EQKillButtonUnderlayLeft</SetVariable>
-                <SetVariable name="Size">30f,30f</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="EqualizerEffectGroup"/>,button_parameter<Variable name="parameter"/></SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup><!-- /EQ knob + Kill indicator underneath -->
-
-          <Template src="skin:button_2state.xml">
-            <SetVariable name="ObjectName">EQKillButton</SetVariable>
-            <SetVariable name="TooltipId"><Variable name="TooltipId"/>Kill</SetVariable>
-            <SetVariable name="Size">12f,30f</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="EqualizerEffectGroup"/>,button_parameter<Variable name="parameter"/></SetVariable>
-          </Template><!-- Kill button -->
-        </Children>
-      </WidgetGroup><!-- /EQ knob + Kill button -->
-
-      <WidgetGroup><!-- create margin when Filter knob is visible -->
-        <Size>6f,1min</Size>
-        <Connection>
-          <ConfigKey persist="true">[Tango],filter_knob</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Tango/eq_knob_right.xml b/res/skins/Tango/eq_knob_right.xml
deleted file mode 100644
index 0ad50d5679ab..000000000000
--- a/res/skins/Tango/eq_knob_right.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<!--
-Description:
-  An EQ knob with a Kill button next to it.
-  A 'button' underneath the knob turns grey when EQ range is killed.
-Variables:
-  group     : [ChannelN]
-  parameter : EQ parameter number
--->
-<Template>
-  <SetVariable name="EqualizerNumber">1</SetVariable>
-  <SetVariable name="EffectNumber">1</SetVariable>
-  <SetVariable name="EqualizerRackGroup">[EqualizerRack<Variable name="EqualizerNumber"/>]</SetVariable>
-  <SetVariable name="EqualizerEffectUnitGroup">[EqualizerRack<Variable name="EqualizerNumber"/>_<Variable name="group"/>]</SetVariable>
-  <SetVariable name="EqualizerEffectGroup">[EqualizerRack<Variable name="EqualizerNumber"/>_<Variable name="group"/>_Effect<Variable name="EffectNumber"/>]</SetVariable>
-  <WidgetGroup>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
-    <Children>
-
-      <WidgetGroup><!-- create margin when Filter knob is visible -->
-        <Size>6f,1min</Size>
-        <Connection>
-          <ConfigKey persist="true">[Tango],filter_knob</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
-      <WidgetGroup><!-- EQ knob + Kill button -->
-        <ObjectName>EQKnobRight</ObjectName>
-        <Layout>horizontal</Layout>
-        <Size>54f,34f</Size><!-- 42f,30f + [4 0 0 12] margin -->
-        <Children>
-          <Template src="skin:button_2state.xml">
-            <SetVariable name="ObjectName">EQKillButton</SetVariable>
-            <SetVariable name="TooltipId"><Variable name="TooltipId"/>Kill</SetVariable>
-            <SetVariable name="Size">12f,30f</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="EqualizerEffectGroup"/>,button_parameter<Variable name="parameter"/></SetVariable>
-          </Template><!-- Kill button -->
-
-          <WidgetGroup><!-- EQ knob + Kill indicator underneath -->
-            <SizePolicy>min,min</SizePolicy>
-            <Layout>stacked</Layout>
-            <Children>
-              <EffectParameterKnobComposed>
-                  <Size>30f,30f</Size>
-                  <Knob>skin:/knobs_sliders/knob_white.svg</Knob>
-                  <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
-                  <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
-                  <Connection>
-                      <ConfigKey><Variable name="EqualizerEffectGroup"/>,parameter<Variable name="parameter"/></ConfigKey>
-                  </Connection>
-              </EffectParameterKnobComposed>
-              <Template src="skin:button_2state.xml">
-                <SetVariable name="ObjectName">EQKillButtonUnderlayRight</SetVariable>
-                <SetVariable name="Size">30f,30f</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="EqualizerEffectGroup"/>,button_parameter<Variable name="parameter"/></SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup><!-- /EQ knob + Kill indicator underneath -->
-
-        </Children>
-      </WidgetGroup><!-- /EQ knob + Kill button -->
-
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Tango/fx_assign_button.xml b/res/skins/Tango/fx_assign_button.xml
index 2d8b82b2d584..311a3ee75d6b 100644
--- a/res/skins/Tango/fx_assign_button.xml
+++ b/res/skins/Tango/fx_assign_button.xml
@@ -1,11 +1,10 @@
 <!--
 Description:
-  A simple indicator for usage in decks' artist/duration row,
-  showing if an effect unit is assigned to parent deck.
-  Visible only if assigned.
+  A button to assign an effect unit to parent deck,
+  used in decks' artist/duration row.
 Variables:
-  fxUnit : [EffectRack1_EffectUnitN]
-  group : [ChannelN]
+  FxUnitNum: [EffectRack1_EffectUnitN]
+  group:  [ChannelN]
 -->
 <Template>
   <PushButton>
@@ -16,20 +15,20 @@ Variables:
     <RightClickIsPushButton>false</RightClickIsPushButton>
     <State>
       <Number>0</Number>
-      <Text><Variable name="labelText"/></Text>
+      <Text>FX<Variable name="FxUnitNum"/></Text>
       <Alignment>center</Alignment>
       <Pressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="labelOff"/>.svg</Pressed>
       <Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="labelOff"/>.svg</Unpressed>
     </State>
     <State>
       <Number>1</Number>
-      <Text><Variable name="labelText"/></Text>
+      <Text>FX<Variable name="FxUnitNum"/></Text>
       <Alignment>center</Alignment>
       <Pressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="labelOn"/>.svg</Pressed>
       <Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="labelOn"/>.svg</Unpressed>
     </State>
     <Connection>
-      <ConfigKey>[EffectRack1_EffectUnit<Variable name="fxUnit"/>],group_<Variable name="group"/>_enable</ConfigKey>
+      <ConfigKey>[EffectRack1_EffectUnit<Variable name="FxUnitNum"/>],group_<Variable name="group"/>_enable</ConfigKey>
       <ButtonState>LeftButton</ButtonState>
     </Connection>
   </PushButton>
diff --git a/res/skins/Tango/fx_button.xml b/res/skins/Tango/fx_button.xml
new file mode 100644
index 000000000000..c31610cad721
--- /dev/null
+++ b/res/skins/Tango/fx_button.xml
@@ -0,0 +1,37 @@
+<!--
+Description:
+  An EffectPushButton template used for EQ kill buttons and
+  effect parameter buttons.
+Variables:
+  ObjectName:
+  Size      :
+  FxRack    : [EffectRack1]
+  FxNum     : [EffectY]
+  group     : [ChannelN], [EffectUnitX]
+  parameter : 1, 2, 3, ...
+  labelOn  : button graphic for ON state
+  labelOff  : button graphic for OFF state
+-->
+<Template>
+  <SetVariable name="FxGroup"><Variable name="FxRack"/>_<Variable name="group"/></SetVariable>
+  <EffectPushButton>
+    <ObjectName><Variable name="ObjectName"/></ObjectName>
+    <Size><Variable name="Size"/></Size>
+    <NumberStates>2</NumberStates>
+    <RightClickIsPushButton>false</RightClickIsPushButton>
+    <State>
+      <Number>0</Number>
+      <Pressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="labelOff"/>.svg</Pressed>
+      <Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="labelOff"/>.svg</Unpressed>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Pressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="labelOn"/>.svg</Pressed>
+      <Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="labelOn"/>.svg</Unpressed>
+    </State>
+    <Connection>
+      <ConfigKey>[<Variable name="FxGroup"/>_Effect<Variable name="FxNum"/>],<Variable name="parameter"/></ConfigKey>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+  </EffectPushButton>
+</Template>
diff --git a/res/skins/Tango/fx_focus_button.xml b/res/skins/Tango/fx_focus_button.xml
index d01f19c53b6a..a310fe5a16f8 100644
--- a/res/skins/Tango/fx_focus_button.xml
+++ b/res/skins/Tango/fx_focus_button.xml
@@ -1,39 +1,74 @@
 <!--
 Description:
   A button that displays focus state of an effect slot.
-  Left-click sets focus, right-click removes focus from all effects
+  Left-click sets focus, right-click removes focus from all effects.
+  If focused, left-click also removes focus.
 Variables:
-  fxGroup : [EffectRack1_EffectUnitN]
-  fxNum   : effect number
+  FxGroup : [EffectRack1_EffectUnitN]
+  FxNum   : effect number
 -->
 <Template>
-  <PushButton>
-    <TooltipId>EffectSlot_focus</TooltipId>
-    <ObjectName>EffectFocusButton</ObjectName>
-    <Size>12f,30me</Size>
-    <NumberStates>2</NumberStates>
-    <RightClickIsPushButton>true</RightClickIsPushButton>
-    <State>
-      <Number>0</Number>
-    </State>
-    <State>
-      <Number>1</Number>
-    </State>
-    <Connection>
-      <ConfigKey>[<Variable name="fxGroup"/>],focused_effect</ConfigKey>
-      <ButtonState>LeftButton</ButtonState>
-      <EmitOnDownPress>true</EmitOnDownPress>
-      <Transform><IsEqual><Variable name="fxNum"/></IsEqual></Transform>
-    </Connection>
-    <Connection>
-      <ConfigKey>[<Variable name="fxGroup"/>],focused_effect</ConfigKey>
-      <ButtonState>RightButton</ButtonState>
-      <EmitOnDownPress>true</EmitOnDownPress>
-      <Transform><IsEqual><Variable name="fxNum"/></IsEqual><Not/></Transform>
-    </Connection>
-    <Connection>
-      <ConfigKey>[<Variable name="fxGroup"/>],show_focus</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </PushButton>
+  <WidgetGroup>
+    <ObjectName>AlignVCenter</ObjectName>
+    <Layout>horizontal</Layout>
+    <Size>14f,30me</Size>
+    <Children>
+      <!-- visible if unfocused: left-click > focus, right click > unfocus -->
+      <PushButton>
+        <TooltipId>EffectSlot_focus</TooltipId>
+        <ObjectName>FxFocusButton</ObjectName>
+        <Size>14f,18f</Size>
+        <NumberStates>2</NumberStates>
+        <RightClickIsPushButton>true</RightClickIsPushButton>
+        <Connection>
+          <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+          <EmitOnDownPress>true</EmitOnDownPress>
+          <Transform><IsEqual><Variable name="FxNum"/></IsEqual></Transform>
+        </Connection>
+        <Connection>
+          <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+          <ButtonState>RightButton</ButtonState>
+          <EmitOnDownPress>true</EmitOnDownPress>
+          <Transform><IsEqual><Variable name="FxNum"/></IsEqual><Not/></Transform>
+        </Connection>
+        <Connection>
+          <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+          <Transform><IsEqual><Variable name="FxNum"/></IsEqual><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </PushButton>
+
+      <!-- visible if focused: left-click > unfocus, right click > unfocus -->
+      <PushButton>
+        <TooltipId>EffectSlot_focus</TooltipId>
+        <ObjectName>FxFocusButton</ObjectName>
+        <Size>14f,18f</Size>
+        <NumberStates>2</NumberStates>
+        <RightClickIsPushButton>true</RightClickIsPushButton>
+        <Connection>
+          <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+          <EmitOnDownPress>true</EmitOnDownPress>
+          <Transform><IsEqual><Variable name="FxNum"/></IsEqual><Not/></Transform>
+        </Connection>
+        <Connection>
+          <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+          <ButtonState>RightButton</ButtonState>
+          <EmitOnDownPress>true</EmitOnDownPress>
+          <Transform><IsEqual><Variable name="FxNum"/></IsEqual><Not/></Transform>
+        </Connection>
+        <Connection>
+          <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+          <Transform><IsEqual><Variable name="FxNum"/></IsEqual></Transform>
+          <ConnectValueFromWidget>false</ConnectValueFromWidget>
+        </Connection>
+        <Connection>
+          <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+          <Transform><IsEqual><Variable name="FxNum"/></IsEqual></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </PushButton>
+    </Children>
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/Tango/fx_head_master_button.xml b/res/skins/Tango/fx_head_master_button.xml
new file mode 100644
index 000000000000..3c8cf6fdb8c7
--- /dev/null
+++ b/res/skins/Tango/fx_head_master_button.xml
@@ -0,0 +1,33 @@
+<!--
+Description:
+  A button to assign parent effect unit to master output or headphones. 
+Variables:
+  Size        :
+  sourceType  : headphone or master
+  FxUnitNum      : [EffectRack1_EffectUnitN]
+  labelOn     : button graphic for ON state
+  labelOff    : button graphic for OFF state
+-->
+<Template>
+  <PushButton>
+    <TooltipId>EffectUnit_<Variable name="sourceType"/>_enabled</TooltipId>
+    <ObjectName>FxHeadMasterButton</ObjectName>
+    <Size><Variable name="Size"/></Size>
+    <NumberStates>2</NumberStates>
+    <RightClickIsPushButton>false</RightClickIsPushButton>
+    <State>
+      <Number>0</Number>
+      <Pressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="labelOff"/>.svg</Pressed>
+      <Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="labelOff"/>.svg</Unpressed>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Pressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="labelOn"/>.svg</Pressed>
+      <Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="labelOn"/>.svg</Unpressed>
+    </State>
+    <Connection>
+      <ConfigKey>[EffectRack1_EffectUnit<Variable name="FxUnitNum"/>],group_<Variable name="group"/>_enable</ConfigKey>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+  </PushButton>
+</Template>
diff --git a/res/skins/Tango/fx_metaknob.xml b/res/skins/Tango/fx_metaknob.xml
new file mode 100644
index 000000000000..8f438805fac1
--- /dev/null
+++ b/res/skins/Tango/fx_metaknob.xml
@@ -0,0 +1,24 @@
+<!--
+Description:
+  An effect meta knob that controls all knobs linked to it.
+Variables:
+  PotiMinAngle:	see skin.xml
+  PotiMaxAngle: see skin.xml
+  FxGroup     : EffectRack1_EffectUnitX
+  FxNum       : EffectX
+-->
+<Template>
+  <SetVariable name="FxGroup_FxNum">[<Variable name="FxGroup"/>_Effect<Variable name="FxNum"/>]</SetVariable>
+  <KnobComposed>
+    <TooltipId>EffectSlot_metaknob</TooltipId>
+    <ObjectName>FxSlot_metaknob</ObjectName>
+    <Size>30f,30f</Size>
+    <Knob>skin:/knobs_sliders/knob_blue.svg</Knob>
+    <BackPath>skin:/knobs_sliders/knob_bg.svg</BackPath>
+    <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+    <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+    <Connection>
+      <ConfigKey><Variable name="FxGroup_FxNum"/>,meta</ConfigKey>
+    </Connection>
+  </KnobComposed>
+</Template>
diff --git a/res/skins/Tango/fx_parameter_button.xml b/res/skins/Tango/fx_parameter_button.xml
index bd150284a178..b3d1fa64f8e9 100644
--- a/res/skins/Tango/fx_parameter_button.xml
+++ b/res/skins/Tango/fx_parameter_button.xml
@@ -4,55 +4,87 @@ Description:
   Stacked layout of invisible button, parameter name
   and button display underneath.
 Variables:
-  fxRack            : rack number
-  fxUnit            : unit number
-  fxGroup_fxNum     : EffectRack1_EffectUnitX_EffectY
-  fxNum             : effect number
-  fxButtonParameter : the parameter
+  FxRackNum     : rack number
+  FxUnitNum     : unit number
+  FxGroup_FxNum : EffectRack1_EffectUnitX_EffectY
+  FxNum         : effect number
+  parameter     : the parameter
 -->
 <Template>
+  <SetVariable name="group">EffectUnit<Variable name="FxUnitNum"/></SetVariable>
+  <SetVariable name="FxGroup">EffectRack1_EffectUnit<Variable name="FxUnitNum"/></SetVariable>
+  <SetVariable name="FxGroup_FxNum">[<Variable name="FxGroup"/>_Effect<Variable name="FxNum"/>]</SetVariable>
   <WidgetGroup>
     <Layout>stacked</Layout>
-    <ObjectName>EffectButtonParameter</ObjectName>
-    <!-- working around default AlignVCenter when Connection is applied.
-      Available height is 38px, button is 18px & we want it
-      in the same height as the knobs -->
+    <ObjectName>FxParameterButton</ObjectName>
+  <!-- working around disrespected AlignVCenter when Connection is applied. -->
     <Size>52f,26f</Size>
-    <Children><!-- Actual button, invisible except hover border -->
-      <Template src="skin:button_2state.xml">
-        <SetVariable name="ObjectName">EffectButtonParameterOverlay</SetVariable>
-        <SetVariable name="TooltipId">EffectSlot_button_parameter</SetVariable>
+    <Children>
+      <!-- Actual button, invisible except hover border -->
+      <Template src="skin:fx_button.xml">
+        <SetVariable name="ObjectName">FxParameterButtonOverlay</SetVariable>
         <SetVariable name="Size">51f,18f</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="fxGroup_fxNum"/>,button_parameter<Variable name="fxButtonParameter"/></SetVariable>
+        <SetVariable name="parameter">button_parameter<Variable name="parameter"/></SetVariable>
       </Template>
 
-      <WidgetGroup><!-- Name of effect parameter -->
+      <!-- Name of effect parameter when inactive-->
+      <WidgetGroup>
         <Size>51f,18f</Size>
         <Layout>horizontal</Layout>
         <Children>
           <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
           <EffectButtonParameterName>
             <SizePolicy>min,me</SizePolicy>
-            <ObjectName>EffectButtonParameterName</ObjectName>
-            <EffectRack><Variable name="fxRack"/></EffectRack>
-            <EffectUnit><Variable name="fxUnit"/></EffectUnit>
-            <Effect><Variable name="fxNum"/></Effect>
-            <EffectButtonParameter><Variable name="fxButtonParameter"/></EffectButtonParameter>
+            <ObjectName>FxParameterButtonName_0</ObjectName>
+            <EffectRack><Variable name="FxRackNum"/></EffectRack>
+            <EffectUnit><Variable name="FxUnitNum"/></EffectUnit>
+            <Effect><Variable name="FxNum"/></Effect>
+            <EffectButtonParameter><Variable name="parameter"/></EffectButtonParameter>
             <Alignment>center</Alignment>
           </EffectButtonParameterName>
           <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
         </Children>
+        <Connection>
+          <ConfigKey><Variable name="FxGroup_FxNum"/>,button_parameter<Variable name="parameter"/></ConfigKey>
+          <Transform><IsEqual>0</IsEqual></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
       </WidgetGroup>
 
-      <Template src="skin:button_2state.xml"><!-- Button to display parameter state -->
-        <SetVariable name="ObjectName">EffectButtonParameterUnderlay</SetVariable>
+      <!-- Name of effect parameter when active-->
+      <WidgetGroup>
+        <Size>51f,18f</Size>
+        <Layout>horizontal</Layout>
+        <Children>
+          <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
+          <EffectButtonParameterName>
+            <SizePolicy>min,me</SizePolicy>
+            <ObjectName>FxParameterButtonName_1</ObjectName>
+            <EffectRack><Variable name="FxRackNum"/></EffectRack>
+            <EffectUnit><Variable name="FxUnitNum"/></EffectUnit>
+            <Effect><Variable name="FxNum"/></Effect>
+            <EffectButtonParameter><Variable name="parameter"/></EffectButtonParameter>
+            <Alignment>center</Alignment>
+          </EffectButtonParameterName>
+          <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey><Variable name="FxGroup_FxNum"/>,button_parameter<Variable name="parameter"/></ConfigKey>
+          <Transform><IsEqual>1</IsEqual></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <!-- Button to indicate parameter state -->
+      <Template src="skin:fx_button.xml">
+        <SetVariable name="ObjectName">FxParameterButtonUnderlay</SetVariable>
         <SetVariable name="Size">51f,18f</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="fxGroup_fxNum"/>,button_parameter<Variable name="fxButtonParameter"/></SetVariable>
+        <SetVariable name="parameter">button_parameter<Variable name="parameter"/></SetVariable>
       </Template>
     </Children>
     <!-- show only if button parameter is loaded -->
     <Connection>
-      <ConfigKey><Variable name="fxGroup_fxNum"/>,button_parameter<Variable name="fxButtonParameter"/>_loaded</ConfigKey>
+      <ConfigKey><Variable name="FxGroup_FxNum"/>,button_parameter<Variable name="parameter"/>_loaded</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
   </WidgetGroup>
diff --git a/res/skins/Tango/fx_parameter_knob.xml b/res/skins/Tango/fx_parameter_knob.xml
index 2f51db9e3d27..4fcfbb21a72f 100644
--- a/res/skins/Tango/fx_parameter_knob.xml
+++ b/res/skins/Tango/fx_parameter_knob.xml
@@ -3,11 +3,11 @@ Description:
   An effect parameter knob with a 5 state button below
   that controls SuperKnob linking type.
 Variables:
-  fxRack          : rack number
-  fxUnit          : unit number
-  fxGroup_fxNum   : EffectRack1_EffectUnitX_EffectY
-  fxNum           : effect number
-  fxKnobParameter : the parameter
+  FxRack        : rack number
+  FxUnitNum     : unit number
+  FxGroup_FxNum : EffectRack1_EffectUnitX_EffectY
+  FxNum         : effect number
+  parameter     : the parameter
 -->
 <Template>
   <WidgetGroup>
@@ -20,18 +20,19 @@ Variables:
         <Children>
 
           <WidgetGroup><!-- Effect parameter knob -->
-            <ObjectName>EffectKnobParameter</ObjectName>
+            <ObjectName>FxParameterknob</ObjectName>
             <Layout>vertical</Layout>
             <Size>51f,26f</Size>
             <Children>
               <EffectParameterKnobComposed>
-                  <Size>26f,26f</Size>
-                  <Knob>skin:/knobs_sliders/knob_fx_yellow.svg</Knob>
-                  <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
-                  <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
-                  <Connection>
-                      <ConfigKey><Variable name="fxGroup_fxNum"/>,parameter<Variable name="fxKnobParameter"/></ConfigKey>
-                  </Connection>
+                <Size>26f,26f</Size>
+                <Knob>skin:/knobs_sliders/knob_fx_yellow.svg</Knob>
+                <BackPath>skin:/knobs_sliders/knob_bg_fx_parameter.svg</BackPath>
+                <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+                <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+                <Connection>
+                  <ConfigKey><Variable name="FxGroup_FxNum"/>,parameter<Variable name="parameter"/></ConfigKey>
+                </Connection>
               </EffectParameterKnobComposed>
             </Children>
           </WidgetGroup>
@@ -40,14 +41,15 @@ Variables:
             <Size>51f,34f</Size>
             <Layout>horizontal</Layout>
             <Children>
+              <!-- To keep text centered it's in an container with spacer on the left/right -->
               <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
               <EffectParameterName>
-                <ObjectName>EffectKnobParameterName</ObjectName>
+                <ObjectName>FxParameterKnobName</ObjectName>
                 <Size>-1min,34f</Size>
-                <EffectRack><Variable name="fxRack"/></EffectRack>
-                <EffectUnit><Variable name="fxUnit"/></EffectUnit>
-                <Effect><Variable name="fxNum"/></Effect>
-                <EffectParameter><Variable name="fxKnobParameter"/></EffectParameter>
+                <EffectRack><Variable name="FxRackNum"/></EffectRack>
+                <EffectUnit><Variable name="FxUnitNum"/></EffectUnit>
+                <Effect><Variable name="FxNum"/></Effect>
+                <EffectParameter><Variable name="parameter"/></EffectParameter>
                 <Alignment>left</Alignment>
               </EffectParameterName>
               <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
@@ -60,26 +62,26 @@ Variables:
 
       <!-- Meta knob link button -->
       <Template src="skin:button_5state.xml">
-        <SetVariable name="ObjectName">EffectLinkTypeButton</SetVariable>
         <SetVariable name="TooltipId">EffectSlot_parameter_link_type</SetVariable>
+        <SetVariable name="ObjectName">FxSuperLinkButton</SetVariable>
         <SetVariable name="Size">51f,5f</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="fxGroup_fxNum"/>,parameter<Variable name="fxKnobParameter"/>_link_type</SetVariable>
+        <SetVariable name="ConfigKey"><Variable name="FxGroup_FxNum"/>,parameter<Variable name="parameter"/>_link_type</SetVariable>
       </Template>
 
       <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
 
       <!-- Meta knob link invert button -->
       <Template src="skin:button_2state.xml">
-        <SetVariable name="ObjectName">EffectLinkInvertButton</SetVariable>
         <SetVariable name="TooltipId">EffectSlot_parameter_inversion</SetVariable>
+        <SetVariable name="ObjectName">FxSuperLinkInvertButton</SetVariable>
         <SetVariable name="Size">51f,5f</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="fxGroup_fxNum"/>,parameter<Variable name="fxKnobParameter"/>_link_inverse</SetVariable>
+        <SetVariable name="ConfigKey"><Variable name="FxGroup_FxNum"/>,parameter<Variable name="parameter"/>_link_inverse</SetVariable>
       </Template>
 
     </Children>
     <!-- show only if parameter is loaded -->
     <Connection>
-      <ConfigKey><Variable name="fxGroup_fxNum"/>,parameter<Variable name="fxKnobParameter"/>_loaded</ConfigKey>
+      <ConfigKey><Variable name="FxGroup_FxNum"/>,parameter<Variable name="parameter"/>_loaded</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
   </WidgetGroup>
diff --git a/res/skins/Tango/fx_parameter_row.xml b/res/skins/Tango/fx_parameter_row.xml
index 3b322de295e4..3269cb5643d8 100644
--- a/res/skins/Tango/fx_parameter_row.xml
+++ b/res/skins/Tango/fx_parameter_row.xml
@@ -2,73 +2,73 @@
 Description:
   A row of up to 8 effect parameter knobs and up to 8 parameter buttons.
 Variables:
-  fxGroup   : EffectRack1_EffectUnitX
-  fxNum : effect number
+  FxGroup : EffectRack1_EffectUnitX
+  FxNum   : effect number
 -->
 <Template>
-  <SetVariable name="fxGroup_fxNum">[<Variable name="fxGroup"/>_Effect<Variable name="fxNum"/>]</SetVariable>
+  <SetVariable name="FxGroup_FxNum">[<Variable name="FxGroup"/>_Effect<Variable name="FxNum"/>]</SetVariable>
   <WidgetGroup>
-    <ObjectName>EffectSlotParameters</ObjectName>
+    <ObjectName>FxParameters</ObjectName>
     <Layout>horizontal</Layout>
     <Size>max,45f</Size>
     <Children>
-    
+
       <Template src="skin:fx_parameter_knob.xml">
-        <SetVariable name="fxKnobParameter">1</SetVariable>
+        <SetVariable name="parameter">1</SetVariable>
       </Template>
       <Template src="skin:fx_parameter_button.xml">
-        <SetVariable name="fxButtonParameter">1</SetVariable>
+        <SetVariable name="parameter">1</SetVariable>
       </Template>
-        
+
       <Template src="skin:fx_parameter_knob.xml">
-        <SetVariable name="fxKnobParameter">2</SetVariable>
+        <SetVariable name="parameter">2</SetVariable>
       </Template>
       <Template src="skin:fx_parameter_button.xml">
-        <SetVariable name="fxButtonParameter">2</SetVariable>
+        <SetVariable name="parameter">2</SetVariable>
       </Template>
-        
+
       <Template src="skin:fx_parameter_knob.xml">
-        <SetVariable name="fxKnobParameter">3</SetVariable>
+        <SetVariable name="parameter">3</SetVariable>
       </Template>
       <Template src="skin:fx_parameter_button.xml">
-        <SetVariable name="fxButtonParameter">3</SetVariable>
+        <SetVariable name="parameter">3</SetVariable>
       </Template>
-        
+
       <Template src="skin:fx_parameter_knob.xml">
-        <SetVariable name="fxKnobParameter">4</SetVariable>
+        <SetVariable name="parameter">4</SetVariable>
       </Template>
       <Template src="skin:fx_parameter_button.xml">
-        <SetVariable name="fxButtonParameter">4</SetVariable>
+        <SetVariable name="parameter">4</SetVariable>
       </Template>
-        
+
       <Template src="skin:fx_parameter_knob.xml">
-        <SetVariable name="fxKnobParameter">5</SetVariable>
+        <SetVariable name="parameter">5</SetVariable>
       </Template>
       <Template src="skin:fx_parameter_button.xml">
-        <SetVariable name="fxButtonParameter">5</SetVariable>
+        <SetVariable name="parameter">5</SetVariable>
       </Template>
-        
+
       <Template src="skin:fx_parameter_knob.xml">
-        <SetVariable name="fxKnobParameter">6</SetVariable>
+        <SetVariable name="parameter">6</SetVariable>
       </Template>
       <Template src="skin:fx_parameter_button.xml">
-        <SetVariable name="fxButtonParameter">6</SetVariable>
+        <SetVariable name="parameter">6</SetVariable>
       </Template>
-        
+
       <Template src="skin:fx_parameter_knob.xml">
-        <SetVariable name="fxKnobParameter">7</SetVariable>
+        <SetVariable name="parameter">7</SetVariable>
       </Template>
       <Template src="skin:fx_parameter_button.xml">
-        <SetVariable name="fxButtonParameter">7</SetVariable>
+        <SetVariable name="parameter">7</SetVariable>
       </Template>
-        
+
       <Template src="skin:fx_parameter_knob.xml">
-        <SetVariable name="fxKnobParameter">8</SetVariable>
+        <SetVariable name="parameter">8</SetVariable>
       </Template>
       <Template src="skin:fx_parameter_button.xml">
-        <SetVariable name="fxButtonParameter">8</SetVariable>
+        <SetVariable name="parameter">8</SetVariable>
       </Template>
-      
+
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Tango/fx_selector_meta_left.xml b/res/skins/Tango/fx_selector_meta_left.xml
deleted file mode 100644
index eb20c97443d2..000000000000
--- a/res/skins/Tango/fx_selector_meta_left.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<!--
-Description:
-  Container in left effect units with
-  * effect enable button
-  * effect focus button
-  * effect selector drop-down list
-  * Meta knob
-Variables:
-  fxGroup : EffectRack1_EffectUnitX
-  fxRack  : effect rack number
-  fxUnit  : effect unit number
-  fxNum   : effect number
--->
-<Template>
-  <SetVariable name="fxGroup_fxNum">[<Variable name="fxGroup"/>_Effect<Variable name="fxNum"/>]</SetVariable>
-  <WidgetGroup>
-    <ObjectName>EffectTogglerMetaKnob</ObjectName>
-    <Layout>horizontal</Layout>
-    <MinimunSize>123,30</MinimunSize>
-    <MaximumSize>134,39</MaximumSize>
-    <SizePolicy>max,me</SizePolicy>
-    <Children>
-
-      <WidgetGroup><!-- Effect toggler + Effect selector -->
-        <ObjectName>EffectTogglerLeft</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-
-          <EffectSelector>
-            <Size>90f,20f</Size>
-            <EffectRack><Variable name="fxRack"/></EffectRack>
-            <EffectUnit><Variable name="fxUnit"/></EffectUnit>
-            <Effect><Variable name="fxNum"/></Effect>
-          </EffectSelector>
-
-          <WidgetGroup><!-- Effect toggler + Effect name + underlay -->
-            <ObjectName>EffectToggler</ObjectName>
-            <Layout>stacked</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <Children>
-
-              <!-- invisible, clickable Overlay to toggle Effect -->
-              <Template src="skin:button_2state.xml"><!-- EffectToggleButton -->
-                <SetVariable name="ObjectName">EffectToggleButton</SetVariable>
-                <SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
-                <SetVariable name="Size">72f,20f</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="fxGroup_fxNum"/>,enabled</SetVariable>
-              </Template>
-
-              <WidgetGroup>
-                <ObjectName>fxNameContainer</ObjectName>
-                <Size>72f,20f</Size>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <WidgetGroup><Size>0me,1min</Size></WidgetGroup>
-                  <EffectName>
-                    <ObjectName>fxName</ObjectName>
-                    <EffectRack><Variable name="fxRack"/></EffectRack>
-                    <EffectUnit><Variable name="fxUnit"/></EffectUnit>
-                    <Effect><Variable name="fxNum"/></Effect>
-                  </EffectName>
-                  <WidgetGroup><Size>0me,1min</Size></WidgetGroup>
-                </Children>
-              </WidgetGroup>
-              <!-- Colored background to communicate the Effect's ON/OFF status -->
-              <Template src="skin:button_2state.xml"><!-- EffectToggleButton -->
-                <SetVariable name="ObjectName">EffectToggleButtonUnderlay</SetVariable>
-                <SetVariable name="Size">72f,20f</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="fxGroup_fxNum"/>,enabled</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup><!-- /Effect toggler + Effect name + underlay -->
-
-        </Children>
-      </WidgetGroup><!-- /Effect toggler + Effect selector -->
-      
-      <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-
-      <Template src="skin:knob_textless.xml">
-        <SetVariable name="TooltipId">EffectSlot_metaknob</SetVariable>
-        <SetVariable name="group"><Variable name="fxGroup_fxNum"/></SetVariable>
-        <SetVariable name="ConfigKey">meta</SetVariable>
-        <SetVariable name="Size">30f,30f</SetVariable>
-        <SetVariable name="Color">blue</SetVariable>
-      </Template>
-
-      <!-- 12x30 -->
-      <Template src="skin:fx_focus_button.xml"/>
-
-      <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Tango/fx_selector_meta_right.xml b/res/skins/Tango/fx_selector_meta_right.xml
deleted file mode 100644
index dccb0962fa7d..000000000000
--- a/res/skins/Tango/fx_selector_meta_right.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<!--
-Description:
-  Container in left effect units with
-  * effect enable button
-  * effect focus button
-  * effect selector drop-down list
-  * Meta knob
-Variables:
-  fxGroup : EffectRack1_EffectUnitX
-  fxRack  : effect rack number
-  fxUnit  : effect unit number
-  fxNum   : effect number
--->
-<Template>
-  <SetVariable name="fxGroup_fxNum">[<Variable name="fxGroup"/>_Effect<Variable name="fxNum"/>]</SetVariable>
-  <WidgetGroup>
-    <ObjectName>EffectTogglerMetaKnob</ObjectName>
-    <Layout>horizontal</Layout>
-    <MinimunSize>122,30</MinimunSize>
-    <MaximumSize>133,39</MaximumSize>
-    <SizePolicy>max,me</SizePolicy>
-    <Children>
-      
-      <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-
-      <Template src="skin:fx_focus_button.xml"/>
-
-      <Template src="skin:knob_textless.xml">
-        <SetVariable name="TooltipId">EffectSlot_metaknob</SetVariable>
-        <SetVariable name="group"><Variable name="fxGroup_fxNum"/></SetVariable>
-        <SetVariable name="ConfigKey">meta</SetVariable>
-        <SetVariable name="Size">30f,30f</SetVariable>
-        <SetVariable name="Color">blue</SetVariable>
-      </Template>
-      
-      <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-
-      <WidgetGroup><!-- Effect toggler + Effect selector -->
-        <ObjectName>EffectToggler</ObjectName>
-        <Layout>stacked</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-
-          <!-- invisible, clickable Overlay to toggle Effect -->
-          <Template src="skin:button_2state.xml"><!-- EffectToggleButton -->
-            <SetVariable name="ObjectName">EffectToggleButton</SetVariable>
-            <SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
-            <SetVariable name="Size">72f,20f</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="fxGroup_fxNum"/>,enabled</SetVariable>
-          </Template>
-
-          <WidgetGroup>
-            <ObjectName>fxNameContainer</ObjectName>
-            <Size>72f,20f</Size>
-            <Layout>horizontal</Layout>
-            <Children>
-              <WidgetGroup><Size>0me,1min</Size></WidgetGroup>
-              <EffectName>
-                <ObjectName>fxName</ObjectName>
-                <EffectRack><Variable name="fxRack"/></EffectRack>
-                <EffectUnit><Variable name="fxUnit"/></EffectUnit>
-                <Effect><Variable name="fxNum"/></Effect>
-              </EffectName>
-              <WidgetGroup><Size>0me,1min</Size></WidgetGroup>
-            </Children>
-          </WidgetGroup>
-          <!-- Colored background to communicate the Effect's ON/OFF status -->
-          <Template src="skin:button_2state.xml"><!-- EffectToggleButton -->
-            <SetVariable name="ObjectName">EffectToggleButtonUnderlay</SetVariable>
-            <SetVariable name="Size">72f,20f</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="fxGroup_fxNum"/>,enabled</SetVariable>
-          </Template>
-
-          <EffectSelector>
-            <Size>90f,20f</Size>
-            <EffectRack><Variable name="fxRack"/></EffectRack>
-            <EffectUnit><Variable name="fxUnit"/></EffectUnit>
-            <Effect><Variable name="fxNum"/></Effect>
-          </EffectSelector>
-
-        </Children>
-      </WidgetGroup><!-- /Effect toggler + Effect selector -->
-
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Tango/fx_toggle_selector.xml b/res/skins/Tango/fx_toggle_selector.xml
new file mode 100644
index 000000000000..0f91313c22fe
--- /dev/null
+++ b/res/skins/Tango/fx_toggle_selector.xml
@@ -0,0 +1,61 @@
+<!--
+Description:
+  A button stack:
+  * effect enable button
+  * effect name
+  * enable feedback
+  * effect selector drop-down list
+Variables:
+  FxRack    : effect rack number
+  FxUnitNum : effect unit number
+  FxGroup   : EffectRack1_EffectUnitX
+  FxNum     : effect number
+-->
+<Template>
+  <SetVariable name="FxGroup_FxNum">[<Variable name="FxGroup"/>_Effect<Variable name="FxNum"/>]</SetVariable>
+  <WidgetGroup>
+    <ObjectName>FxToggleSelector</ObjectName>
+    <Layout>stacked</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+      <!-- invisible, clickable Overlay to toggle Effect -->
+      <Template src="skin:button_2state.xml">
+        <SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
+        <SetVariable name="ObjectName">FxToggleButton</SetVariable>
+        <SetVariable name="Size">72f,20f</SetVariable>
+        <SetVariable name="ConfigKey"><Variable name="FxGroup_FxNum"/>,enabled</SetVariable>
+      </Template>
+
+      <WidgetGroup>
+        <ObjectName>FxNameContainer</ObjectName>
+        <Size>72f,20f</Size>
+        <Layout>horizontal</Layout>
+        <Children>
+          <WidgetGroup><Size>0me,1min</Size></WidgetGroup>
+          <EffectName>
+            <ObjectName>FxName</ObjectName>
+            <EffectRack><Variable name="FxRackNum"/></EffectRack>
+            <EffectUnit><Variable name="FxUnitNum"/></EffectUnit>
+            <Effect><Variable name="FxNum"/></Effect>
+          </EffectName>
+          <WidgetGroup><Size>0me,1min</Size></WidgetGroup>
+        </Children>
+      </WidgetGroup>
+
+       <!-- Colored background to communicate the Effect's ON/OFF status -->
+      <Template src="skin:button_2state.xml">
+        <SetVariable name="ObjectName">FxToggleButtonUnderlay</SetVariable>
+        <SetVariable name="Size">72f,20f</SetVariable>
+        <SetVariable name="ConfigKey"><Variable name="FxGroup_FxNum"/>,enabled</SetVariable>
+      </Template>
+
+      <EffectSelector>
+        <Size>82f,20f</Size>
+        <EffectRack><Variable name="FxRackNum"/></EffectRack>
+        <EffectUnit><Variable name="FxUnitNum"/></EffectUnit>
+        <Effect><Variable name="FxNum"/></Effect>
+      </EffectSelector>
+
+    </Children>
+  </WidgetGroup><!-- /Effect toggler + Effect selector -->
+</Template>
diff --git a/res/skins/Tango/fx_unit_group_button.xml b/res/skins/Tango/fx_unit_group_button.xml
deleted file mode 100644
index 3714a4838003..000000000000
--- a/res/skins/Tango/fx_unit_group_button.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-Description:
-  An effect group control button.
-Variables:
-  ToolTipID : tooltip to display.
-  fxGroup   : [EffectRack1_EffectUnitN]
-  GroupName : affected group
-  Color     : knob notch colour
-  Align     : horizontal label alignment
-  LabelText : text to show on the button
-  LabelOff  : backpath in state 0
-  LabelOn   : backpath in state 1
--->
-<Template>
-  <PushButton>
-    <TooltipId>EffectUnit_group_enabled</TooltipId>
-    <ObjectName>EffectUnitGroupButton</ObjectName>
-    <Size><Variable name="Size"/></Size>
-    <NumberStates>2</NumberStates>
-    <RightClickIsPushButton>false</RightClickIsPushButton>
-    <State>
-      <Number>0</Number>
-      <Text><Variable name="LabelText"/></Text>
-      <Alignment>center</Alignment>
-      <Pressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="LabelOff"/>.svg</Pressed>
-      <Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="LabelOff"/>.svg</Unpressed>
-    </State>
-    <State>
-      <Number>1</Number>
-      <Text><Variable name="LabelText"/></Text>
-      <Alignment>center</Alignment>
-      <Pressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="LabelOn"/>.svg</Pressed>
-      <Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="LabelOn"/>.svg</Unpressed>
-    </State>
-    <Connection>
-      <ConfigKey>[<Variable name="fxGroup"/>],group_<Variable name="GroupName"/>_enable</ConfigKey>
-      <ButtonState>LeftButton</ButtonState>
-    </Connection>
-  </PushButton>
-</Template>
-
diff --git a/res/skins/Tango/fx_unit_left.xml b/res/skins/Tango/fx_unit_left.xml
index 2e30ca8f679e..804ca707f661 100644
--- a/res/skins/Tango/fx_unit_left.xml
+++ b/res/skins/Tango/fx_unit_left.xml
@@ -2,236 +2,317 @@
 Description:
   An effect chain widget.
   * EffectSlots, with or without highlight/focus option
-  * mixer with Wet/Dry knob and Super knob
-  * Enable and Eject button
-  * assignment buttons for decks, master, headphone, mics & aux
+  * mixer with Wet/Dry knob and Super knob (optional)
+  * assignment buttons for master & headphone
 Variables:
-  fxRack: Number of effect rack.
-  fxUnit: Number of effect unit.
+  FxUnitNum:   number of effect unit for FX label
 -->
 <Template>
+  <SetVariable name="FxGroup">EffectRack1_EffectUnit<Variable name="FxUnitNum"/></SetVariable>
+  <SetVariable name="group">EffectUnit<Variable name="FxUnitNum"/></SetVariable>
   <WidgetGroup><!-- EffectUnit -->
-    <ObjectName>EffectUnitLeft</ObjectName>
     <Layout>horizontal</Layout>
     <SizePolicy>me,min</SizePolicy>
     <Children>
 
-      <WidgetGroup><!-- EffectSlots 1-3 * highlightable -->
-        <ObjectName>EffectSlots</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>me,min</SizePolicy>
+      <WidgetGroup><!-- EffectSlots + Underlays, with focus button -->
+        <ObjectName>Spacer0f</ObjectName>
+        <Layout>stacked</Layout>
+        <SizePolicy>min,min</SizePolicy>
         <Children>
-          <WidgetGroup><!-- EffectSlot 1 -->
-            <ObjectName>EffectSlotLeftHighlight</ObjectName>
-            <SizePolicy>min,min</SizePolicy>
-            <Layout>horizontal</Layout>
-            <Children>
-              <Template src="skin:fx_parameter_row.xml">
-                <SetVariable name="fxNum">1</SetVariable>
-              </Template>
-              <WidgetGroup><Size>5f,1min</Size><Children/></WidgetGroup>
-              <Template src="skin:fx_selector_meta_left.xml">
-                <SetVariable name="fxNum">1</SetVariable>
-              </Template>
-            </Children>
-            <Connection>
-              <ConfigKey>[<Variable name="fxGroup"/>],focused_effect</ConfigKey>
-              <BindProperty>highlight</BindProperty>
-              <Transform>
-                <IsEqual>1</IsEqual>
-              </Transform>
-            </Connection>
-          </WidgetGroup><!-- /EffectSlot 1 -->
-
-          <WidgetGroup><Size>1me,1f</Size><Children/></WidgetGroup>
-
-          <WidgetGroup><!-- EffectSlot 2 -->
-            <ObjectName>EffectSlotLeftHighlight</ObjectName>
+          <WidgetGroup><!-- EffectSlots with focus -->
+            <Layout>vertical</Layout>
             <SizePolicy>min,min</SizePolicy>
-            <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:fx_parameter_row.xml">
-                <SetVariable name="fxNum">2</SetVariable>
-              </Template>
-              <WidgetGroup><Size>5f,1min</Size><Children/></WidgetGroup>
-              <Template src="skin:fx_selector_meta_left.xml">
-                <SetVariable name="fxNum">2</SetVariable>
-              </Template>
+              <WidgetGroup><!-- EffectSlot 1 -->
+                <ObjectName>AlignRight</ObjectName>
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:fx_parameter_row.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup><!-- /EffectSlot 1 -->
+
+                <WidgetGroup><Size>1me,1f</Size></WidgetGroup>
+
+              <WidgetGroup><!-- EffectSlot 2 -->
+                <ObjectName>AlignRight</ObjectName>
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:fx_parameter_row.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup><!-- /EffectSlot 2 -->
+
+                <WidgetGroup><Size>1me,1f</Size></WidgetGroup>
+
+              <WidgetGroup><!-- EffectSlot 3 -->
+                <ObjectName>AlignRight</ObjectName>
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:fx_parameter_row.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup><!-- /EffectSlot 3 -->
             </Children>
-            <Connection>
-              <ConfigKey>[<Variable name="fxGroup"/>],focused_effect</ConfigKey>
-              <BindProperty>highlight</BindProperty>
-              <Transform>
-                <IsEqual>2</IsEqual>
-              </Transform>
-            </Connection>
-          </WidgetGroup><!-- /EffectSlot 2 -->
-
-          <WidgetGroup><Size>1me,1f</Size><Children/></WidgetGroup>
-
-          <WidgetGroup><!-- EffectSlot 3 -->
-            <ObjectName>EffectSlotLeftHighlight</ObjectName>
+          </WidgetGroup><!-- /EffectSlots with focus -->
+
+          <WidgetGroup><!-- Underlays with focus -->
+            <Layout>stacked</Layout>
             <SizePolicy>min,min</SizePolicy>
-            <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:fx_parameter_row.xml">
-                <SetVariable name="fxNum">3</SetVariable>
-              </Template>
-              <WidgetGroup><Size>5f,1min</Size><Children/></WidgetGroup>
-              <Template src="skin:fx_selector_meta_left.xml">
-                <SetVariable name="fxNum">3</SetVariable>
-              </Template>
-            </Children>
-            <Connection>
-              <ConfigKey>[<Variable name="fxGroup"/>],focused_effect</ConfigKey>
-              <BindProperty>highlight</BindProperty>
-              <Transform>
-                <IsEqual>3</IsEqual>
-              </Transform>
-            </Connection>
-          </WidgetGroup><!-- /EffectSlot 3 -->
+              <WidgetGroup><!-- EffectSlot 1 -->
+                <ObjectName>FxFlowUnderlay_left_focus1</ObjectName>
+                <Size>1me,53f</Size>
+                <Connection>
+                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <BindProperty>highlight</BindProperty>
+                  <Transform><IsEqual>1</IsEqual></Transform>
+                </Connection>
+              </WidgetGroup>
+
+              <WidgetGroup><!-- EffectSlot 2 -->
+                <ObjectName>FxFlowUnderlay_left_focus2</ObjectName>
+                <Size>1me,99f</Size>
+                <Connection>
+                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <BindProperty>highlight</BindProperty>
+                  <Transform><IsEqual>2</IsEqual></Transform>
+                </Connection>
+              </WidgetGroup>
 
+              <WidgetGroup><!-- EffectSlot 3 -->
+                <ObjectName>FxFlowUnderlay_left_focus3</ObjectName>
+                <Size>1me,137f</Size>
+                <Connection>
+                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <BindProperty>highlight</BindProperty>
+                  <Transform><IsEqual>3</IsEqual></Transform>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- /Underlays with focus -->
         </Children>
         <Connection>
-          <ConfigKey>[<Variable name="fxGroup"/>],show_focus</ConfigKey>
+          <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- /EffectSlots 1-3 * highlightable -->
+      </WidgetGroup><!-- /EffectSlots + Underlays, with focus button -->
 
-      <WidgetGroup><!-- EffectSlots 1-3 * no highlight -->
-        <ObjectName>EffectSlots</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>me,min</SizePolicy>
+      <WidgetGroup><!-- EffectSlots + Underlays, no focus -->
+        <ObjectName>Spacer0f</ObjectName>
+        <Layout>stacked</Layout>
+        <SizePolicy>min,min</SizePolicy>
         <Children>
-          <WidgetGroup><!-- EffectSlot 1 -->
-            <ObjectName>EffectSlotLeft</ObjectName>
+          <WidgetGroup><!-- EffectSlots, no focus -->
+            <Layout>vertical</Layout>
             <SizePolicy>min,min</SizePolicy>
-            <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:fx_parameter_row.xml">
-                <SetVariable name="fxNum">1</SetVariable>
-              </Template>
-              <WidgetGroup><Size>5f,1min</Size><Children/></WidgetGroup>
-              <Template src="skin:fx_selector_meta_left.xml">
-                <SetVariable name="fxNum">1</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup><!-- /EffectSlot 1 -->
+              <WidgetGroup><!-- EffectSlot 1 -->
+                <ObjectName>AlignRight</ObjectName>
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:fx_parameter_row.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup><!-- /EffectSlot 1 -->
 
-          <WidgetGroup><Size>1me,1f</Size><Children/></WidgetGroup>
+                <WidgetGroup><Size>1me,1f</Size></WidgetGroup>
 
-          <WidgetGroup><!-- EffectSlot 2 -->
-            <ObjectName>EffectSlotLeft</ObjectName>
-            <SizePolicy>min,min</SizePolicy>
-            <Layout>horizontal</Layout>
-            <Children>
-              <Template src="skin:fx_parameter_row.xml">
-                <SetVariable name="fxNum">2</SetVariable>
-              </Template>
-              <WidgetGroup><Size>5f,1min</Size><Children/></WidgetGroup>
-              <Template src="skin:fx_selector_meta_left.xml">
-                <SetVariable name="fxNum">2</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup><!-- /EffectSlot 2 -->
+              <WidgetGroup><!-- EffectSlot 2 -->
+                <ObjectName>AlignRight</ObjectName>
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:fx_parameter_row.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup><!-- /EffectSlot 2 -->
 
-          <WidgetGroup><Size>1me,1f</Size><Children/></WidgetGroup>
+                <WidgetGroup><Size>1me,1f</Size></WidgetGroup>
 
-          <WidgetGroup><!-- EffectSlot 3 -->
-            <ObjectName>EffectSlotLeft</ObjectName>
+              <WidgetGroup><!-- EffectSlot 3 -->
+                <ObjectName>AlignRight</ObjectName>
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:fx_parameter_row.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup><!-- /EffectSlot 3 -->
+            </Children>
+          </WidgetGroup><!-- /EffectSlots, no focus -->
+
+          <WidgetGroup><!-- Underlays, no focus -->
+            <Layout>stacked</Layout>
             <SizePolicy>min,min</SizePolicy>
-            <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:fx_parameter_row.xml">
-                <SetVariable name="fxNum">3</SetVariable>
-              </Template>
-              <WidgetGroup><Size>5f,1min</Size><Children/></WidgetGroup>
-              <Template src="skin:fx_selector_meta_left.xml">
-                <SetVariable name="fxNum">3</SetVariable>
-              </Template>
+              <WidgetGroup><!-- EffectSlot 1 -->
+                <ObjectName>FxFlowUnderlay_left_noFocus1</ObjectName>
+                <Size>1me,53f</Size>
+              </WidgetGroup>
+
+              <WidgetGroup><!-- EffectSlot 2 -->
+                <ObjectName>FxFlowUnderlay_left_noFocus2</ObjectName>
+                <Size>1me,99f</Size>
+              </WidgetGroup>
+
+              <WidgetGroup><!-- EffectSlot 3 -->
+                <ObjectName>FxFlowUnderlay_left_noFocus3</ObjectName>
+                <Size>1me,137f</Size>
+              </WidgetGroup>
             </Children>
-          </WidgetGroup><!-- /EffectSlot 3 -->
+          </WidgetGroup><!-- /Underlays, no focus -->
         </Children>
         <Connection>
-          <ConfigKey>[<Variable name="fxGroup"/>],show_focus</ConfigKey>
-          <BindProperty>visible</BindProperty>
+          <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
           <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- /EffectSlots 1-3 * no highlight -->
+      </WidgetGroup><!-- /EffectSlots + Underlays, no focus -->
 
       <WidgetGroup><!-- EffectUnitMixer + Master, Headphone -->
-        <ObjectName>EffectUnitControlsLeft</ObjectName>
+        <ObjectName>FxUnitControlsLeft</ObjectName>
         <Layout>vertical</Layout>
         <Size>44f,1me</Size>
         <Children>
           <Template src="skin:button_2state_persist.xml">
-            <SetVariable name="ObjectName">FXSamplersMiniMaxiButton</SetVariable>
+            <SetVariable name="ObjectName">FxSamplersMiniMaxi</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
             <SetVariable name="Size">22me,14f</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[<Variable name="fxGroup"/>],show_parameters</SetVariable>
+            <SetVariable name="ConfigKey">[<Variable name="FxGroup"/>],show_parameters</SetVariable>
           </Template>
 
           <Label>
-            <ObjectName>EffectUnitLabel</ObjectName>
+            <ObjectName>FxUnitLabel</ObjectName>
             <Size>44f,18f</Size>
-            <Text>FX<Variable name="fxUnit"/></Text>
+            <Text>FX<Variable name="FxUnitNum"/></Text>
             <Alignment>center</Alignment>
           </Label>
 
           <WidgetGroup><!-- EffectUnitMixer -->
-            <ObjectName>EffectUnitMixerLeft</ObjectName>
+            <ObjectName>FxUnitMixerLeft</ObjectName>
             <Layout>vertical</Layout>
             <Size>44f,1me</Size>
             <Children>
 
-              <WidgetGroup>
+              <WidgetGroup><!-- SuperWetDryContainer -->
                 <ObjectName>SuperWetDryContainer</ObjectName>
                 <Layout>vertical</Layout>
                 <SizePolicy>me,me</SizePolicy>
                 <Children>
-                    <WidgetGroup><Size>1min,0me</Size><Children/></WidgetGroup>
+                  <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+
                   <Template src="skin:knob_textless.xml">
                     <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
                     <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
                     <SetVariable name="Size">32f,32f</SetVariable>
-                    <SetVariable name="group">[<Variable name="fxGroup"/>]</SetVariable>
+                    <SetVariable name="group">[<Variable name="FxGroup"/>]</SetVariable>
                     <SetVariable name="ConfigKey">mix</SetVariable>
                     <SetVariable name="Color">red</SetVariable>
                   </Template>
-                    <WidgetGroup><Size>1min,0me</Size><Children/></WidgetGroup>
-                  <Template src="skin:knob_textless.xml">
-                    <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
-                    <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
-                    <SetVariable name="Size">32f,32f</SetVariable>
-                    <SetVariable name="group">[<Variable name="fxGroup"/>]</SetVariable>
-                    <SetVariable name="ConfigKey">super1</SetVariable>
-                    <SetVariable name="Color">blue</SetVariable>
-                  </Template>
-                    <WidgetGroup><Size>1min,0me</Size><Children/></WidgetGroup>
+
+                  <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+
+                  <WidgetGroup><!-- Super Knob, if enabled -->
+                    <Size>32f,32f</Size>
+                    <Layout>vertical</Layout>
+                    <Children>
+                      <Template src="skin:knob_textless.xml">
+                        <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
+                        <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
+                        <SetVariable name="Size">32f,32f</SetVariable>
+                        <SetVariable name="group">[<Variable name="FxGroup"/>]</SetVariable>
+                        <SetVariable name="ConfigKey">super1</SetVariable>
+                        <SetVariable name="Color">blue</SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey persist="true">[Tango],fx_super_knob</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- /Super Knob, if enabled -->
+
+                  <WidgetGroup><!-- additional spacer for Super Knob, if enabled -->
+                    <Size>1min,0me</Size>
+                    <Connection>
+                      <ConfigKey persist="true">[Tango],fx_super_knob</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- /additional spacer for Super Knob, if enabled -->
                 </Children>
-              </WidgetGroup><!-- SuperWetDryContainer -->
+              </WidgetGroup><!-- /SuperWetDryContainer -->
 
-              <WidgetGroup><Size>1min,1f</Size><Children/></WidgetGroup>
+              <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
 
               <WidgetGroup><!-- Master, Headphone -->
                 <Layout>horizontal</Layout>
                 <SizePolicy>min,min</SizePolicy>
                 <Children>
-                  <Template src="skin:fx_assign_button.xml">
+                  <Template src="skin:fx_head_master_button.xml">
                     <SetVariable name="Size">21f,21f</SetVariable>
                     <SetVariable name="sourceType">master</SetVariable>
                     <SetVariable name="labelOff">fx_master_off</SetVariable>
                     <SetVariable name="labelOn">fx_master_on</SetVariable>
                     <SetVariable name="group">[Master]</SetVariable>
                   </Template>
-                    <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
-                  <Template src="skin:fx_assign_button.xml">
-                    <SetVariable name="Size">21f,21f</SetVariable>
-                    <SetVariable name="sourceType">headphones</SetVariable>
-                    <SetVariable name="labelOff">fx_head_off</SetVariable>
-                    <SetVariable name="labelOn">fx_head_on</SetVariable>
-                    <SetVariable name="group">[Headphone]</SetVariable>
-                  </Template>
+                    <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+                  <WidgetGroup><!-- Headphone FX button -->
+                    <Size>21f,21f</Size>
+                    <Layout>stacked</Layout>
+                    <Children>
+                      <!-- index 0 due to bug -->
+                      <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
+
+                      <!-- Greyed out if no headphone device is configured -->
+                      <WidgetGroup>
+                        <ObjectName>MixerbarCover</ObjectName>
+                        <Layout>vertical</Layout>
+                        <SizePolicy>me,me</SizePolicy>
+                        <Connection>
+                          <ConfigKey>[Master],headEnabled</ConfigKey>
+                          <BindProperty>visible</BindProperty>
+                          <Transform><Not/></Transform>
+                        </Connection>
+                      </WidgetGroup>
+
+                      <Template src="skin:fx_head_master_button.xml">
+                        <SetVariable name="Size">21f,21f</SetVariable>
+                        <SetVariable name="sourceType">headphones</SetVariable>
+                        <SetVariable name="labelOff">fx_head_off</SetVariable>
+                        <SetVariable name="labelOn">fx_head_on</SetVariable>
+                        <SetVariable name="group">[Headphone]</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup><!-- /Headphone FX button -->
                 </Children>
               </WidgetGroup><!-- /Master, Headphone -->
 
diff --git a/res/skins/Tango/fx_unit_left_mini.xml b/res/skins/Tango/fx_unit_left_mini.xml
index 8b4bc139a000..25a89b0ab6f3 100644
--- a/res/skins/Tango/fx_unit_left_mini.xml
+++ b/res/skins/Tango/fx_unit_left_mini.xml
@@ -2,148 +2,222 @@
 Description:
   An effect chain widget.
   * EffectSlots, with or without highlight/focus option
-  * mixer with Wet/Dry knob and Super knob
-  * Enable button
+  * mixer with Wet/Dry knob and Super knob (optional)
+  * assignment buttons for master & headphone
 Variables:
-  fxRack: Number of effect rack.
-  fxUnit: Number of effect unit.
+  FxUnitNum:   number of effect unit for FX label
 -->
 <Template>
-  <WidgetGroup><!-- EffectUnit -->
-    <ObjectName>EffectUnitLeftMini</ObjectName>
+  <SetVariable name="FxGroup">EffectRack1_EffectUnit<Variable name="FxUnitNum"/></SetVariable>
+  <SetVariable name="group">EffectUnit<Variable name="FxUnitNum"/></SetVariable>
+  <WidgetGroup>
     <Layout>horizontal</Layout>
     <SizePolicy>me,max</SizePolicy>
     <Children>
 
-      <WidgetGroup><!-- Effect _selector_meta_s * highlightable -->
-        <ObjectName>AlignRightCenter</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,min</SizePolicy>
-        <Children>
-
-          <WidgetGroup><ObjectName>Spacer33</ObjectName><Size>0me,1min</Size></WidgetGroup>
+      <WidgetGroup><ObjectName>Spacer33</ObjectName><Size>0me,1min</Size></WidgetGroup>
 
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1max,1min</Size></WidgetGroup>
+      <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
-          <WidgetGroup>
-            <ObjectName>EffectSlotLeftHighlight</ObjectName>
+      <WidgetGroup><!-- EffectSlots + Underlays, no focus -->
+        <Layout>stacked</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <WidgetGroup><!-- EffectSlots, no focus -->
             <Layout>horizontal</Layout>
-            <SizePolicy>min,me</SizePolicy>
+            <SizePolicy>max,min</SizePolicy>
             <Children>
-              <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-              <Template src="skin:fx_selector_meta_left.xml">
-                <SetVariable name="fxNum">1</SetVariable>
-              </Template>
-            </Children>
-            <Connection>
-              <ConfigKey>[<Variable name="fxGroup"/>],focused_effect</ConfigKey>
-              <BindProperty>highlight</BindProperty>
-              <Transform><IsEqual>1</IsEqual></Transform>
-            </Connection>
-          </WidgetGroup>
+              <WidgetGroup><!-- Effect 1 -->
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup>
 
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
+              <WidgetGroup><!-- Effect 2 -->
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup>
 
-          <WidgetGroup>
-            <ObjectName>EffectSlotLeftHighlight</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,me</SizePolicy>
-            <Children>
-              <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-              <Template src="skin:fx_selector_meta_left.xml">
-                <SetVariable name="fxNum">2</SetVariable>
-              </Template>
+              <WidgetGroup><!-- Effect 3 -->
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup>
             </Children>
-            <Connection>
-              <ConfigKey>[<Variable name="fxGroup"/>],focused_effect</ConfigKey>
-              <BindProperty>highlight</BindProperty>
-              <Transform><IsEqual>2</IsEqual></Transform>
-            </Connection>
-          </WidgetGroup>
-
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
+          </WidgetGroup><!-- /EffectSlots, no focus -->
 
-          <WidgetGroup>
-            <ObjectName>EffectSlotLeftHighlight</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,me</SizePolicy>
+          <WidgetGroup><!-- Underlays, no focus -->
+            <ObjectName>Spacer0f</ObjectName>
+            <Layout>stacked</Layout>
+            <SizePolicy>min,min</SizePolicy>
             <Children>
-              <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-              <Template src="skin:fx_selector_meta_left.xml">
-                <SetVariable name="fxNum">3</SetVariable>
-              </Template>
-            </Children>
-            <Connection>
-              <ConfigKey>[<Variable name="fxGroup"/>],focused_effect</ConfigKey>
-              <BindProperty>highlight</BindProperty>
-              <Transform><IsEqual>3</IsEqual></Transform>
-            </Connection>
-          </WidgetGroup>
+              <WidgetGroup><!-- EffectSlot 1 -->
+                <ObjectName>FxFlowUnderlay_mini_noFocus1</ObjectName>
+                <Size>120f,30f</Size>
+              </WidgetGroup>
+
+              <WidgetGroup><!-- EffectSlot 2 -->
+                <ObjectName>FxFlowUnderlay_mini_noFocus2</ObjectName>
+                <Size>240f,30f</Size>
+              </WidgetGroup>
 
+              <WidgetGroup><!-- EffectSlot 3 -->
+                <ObjectName>FxFlowUnderlay_mini_noFocus3</ObjectName>
+                <Size>360f,30f</Size>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- /Underlays, no focus -->
         </Children>
         <Connection>
-          <ConfigKey>[<Variable name="fxGroup"/>],show_focus</ConfigKey>
+          <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
+          <Transform><Not/></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- /Effect _selector_meta_s * highlightable -->
+      </WidgetGroup><!-- /EffectSlots + Underlays, no focus -->
 
-      <WidgetGroup><!-- Effect _selector_meta_s * no highlight -->
-        <ObjectName>AlignRightCenter</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,min</SizePolicy>
+      <WidgetGroup><!-- EffectSlots + Underlays, with focus -->
+        <Layout>stacked</Layout>
+        <SizePolicy>min,min</SizePolicy>
         <Children>
+          <WidgetGroup><!-- EffectSlots with focus button -->
+            <Layout>horizontal</Layout>
+            <SizePolicy>max,min</SizePolicy>
+            <Children>
+              <WidgetGroup><!-- Effect 1 -->
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup>
 
-          <WidgetGroup><ObjectName>Spacer33</ObjectName><Size>0me,1min</Size></WidgetGroup>
+              <WidgetGroup><!-- Effect 2 -->
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup>
 
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
+              <WidgetGroup><!-- Effect 3 -->
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- /EffectSlots with focus button -->
 
-          <WidgetGroup>
-            <ObjectName>EffectSlotLeft</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,me</SizePolicy>
+          <WidgetGroup><!-- Underlays with focus -->
+            <ObjectName>Spacer0f</ObjectName>
+            <Layout>stacked</Layout>
+            <SizePolicy>min,min</SizePolicy>
             <Children>
-              <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-              <Template src="skin:fx_selector_meta_left.xml">
-                <SetVariable name="fxNum">1</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
+              <WidgetGroup><!-- EffectSlot 1 -->
+                <ObjectName>FxFlowUnderlay_mini_focus1</ObjectName>
+                <Size>134f,30f</Size>
+                <Connection>
+                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <Transform><IsEqual>1</IsEqual></Transform>
+                  <BindProperty>highlight</BindProperty>
+                </Connection>
+              </WidgetGroup>
 
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
+              <WidgetGroup><!-- EffectSlot 2 -->
+                <ObjectName>FxFlowUnderlay_mini_focus2</ObjectName>
+                <Size>268f,30f</Size>
+                <Connection>
+                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <Transform><IsEqual>2</IsEqual></Transform>
+                  <BindProperty>highlight</BindProperty>
+                </Connection>
+              </WidgetGroup>
 
-          <WidgetGroup>
-            <ObjectName>EffectSlotLeft</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,me</SizePolicy>
-            <Children>
-              <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-              <Template src="skin:fx_selector_meta_left.xml">
-                <SetVariable name="fxNum">2</SetVariable>
-              </Template>
+              <WidgetGroup><!-- EffectSlot 3 -->
+                <ObjectName>FxFlowUnderlay_mini_focus3</ObjectName>
+                <Size>402f,30f</Size>
+                <Connection>
+                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <Transform><IsEqual>3</IsEqual></Transform>
+                  <BindProperty>highlight</BindProperty>
+                </Connection>
+              </WidgetGroup>
             </Children>
-          </WidgetGroup>
+          </WidgetGroup><!-- /Underlays with focus -->
+        </Children>
+        <Connection>
+          <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /EffectSlots + Underlays, with focus -->
 
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
+      <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
-          <WidgetGroup>
-            <ObjectName>EffectSlotLeft</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,me</SizePolicy>
+      <WidgetGroup><!-- Master, Headphone -->
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:fx_head_master_button.xml">
+            <SetVariable name="Size">15f,15f</SetVariable>
+            <SetVariable name="sourceType">master</SetVariable>
+            <SetVariable name="labelOff">fx_master_off</SetVariable>
+            <SetVariable name="labelOn">fx_master_on</SetVariable>
+            <SetVariable name="group">[Master]</SetVariable>
+          </Template>
+            <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
+          <WidgetGroup><!-- Headphone FX button -->
+            <Size>15f,14f</Size>
+            <Layout>stacked</Layout>
             <Children>
-              <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-              <Template src="skin:fx_selector_meta_left.xml">
-                <SetVariable name="fxNum">3</SetVariable>
+              <!-- index 0 due to bug -->
+              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
+
+              <!-- Greyed out if no headphone device is configured -->
+              <WidgetGroup>
+                <ObjectName>MixerbarCover</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>me,me</SizePolicy>
+                <Connection>
+                  <ConfigKey>[Master],headEnabled</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                  <Transform><Not/></Transform>
+                </Connection>
+              </WidgetGroup>
+
+              <Template src="skin:fx_head_master_button.xml">
+                <SetVariable name="Size">15f,14f</SetVariable>
+                <SetVariable name="sourceType">headphones</SetVariable>
+                <SetVariable name="labelOff">fx_head_off</SetVariable>
+                <SetVariable name="labelOn">fx_head_on</SetVariable>
+                <SetVariable name="group">[Headphone]</SetVariable>
               </Template>
             </Children>
-          </WidgetGroup>
-
+          </WidgetGroup><!-- /Headphone FX button -->
         </Children>
-        <Connection>
-          <ConfigKey>[<Variable name="fxGroup"/>],show_focus</ConfigKey>
-          <BindProperty>visible</BindProperty>
-          <Transform><Not/></Transform>
-        </Connection>
-      </WidgetGroup><!-- /Effect _selector_meta_s * no highlight -->
+      </WidgetGroup><!-- /Master, Headphone -->
 
       <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
@@ -152,20 +226,30 @@ Variables:
         <Layout>horizontal</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <Template src="skin:knob_textless.xml">
-            <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
-            <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
-            <SetVariable name="Size">30f,30f</SetVariable>
-            <SetVariable name="group">[<Variable name="fxGroup"/>]</SetVariable>
-            <SetVariable name="ConfigKey">super1</SetVariable>
-            <SetVariable name="Color">blue</SetVariable>
-          </Template>
+          <WidgetGroup>
+            <Size>30f,30f</Size>
+            <Layout>vertical</Layout>
+            <Children>
+              <Template src="skin:knob_textless.xml">
+                <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
+                <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
+                <SetVariable name="Size">30f,30f</SetVariable>
+                <SetVariable name="group">[<Variable name="FxGroup"/>]</SetVariable>
+                <SetVariable name="ConfigKey">super1</SetVariable>
+                <SetVariable name="Color">blue</SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[Tango],fx_super_knob</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
 
           <Template src="skin:knob_textless.xml">
             <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
             <SetVariable name="Size">30f,30f</SetVariable>
-            <SetVariable name="group">[<Variable name="fxGroup"/>]</SetVariable>
+            <SetVariable name="group">[<Variable name="FxGroup"/>]</SetVariable>
             <SetVariable name="ConfigKey">mix</SetVariable>
             <SetVariable name="Color">red</SetVariable>
           </Template>
@@ -174,27 +258,84 @@ Variables:
 
       <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
-      <WidgetGroup>
+      <WidgetGroup><!-- FX expand button + FX label -->
         <Layout>vertical</Layout>
         <Size>28f,30f</Size>
         <Children>
-          <Template src="skin:button_2state_persist.xml">
-            <SetVariable name="ObjectName">FXSamplersMiniMaxiButton</SetVariable>
-            <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
-            <SetVariable name="Size">28f,13f</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[<Variable name="fxGroup"/>],show_parameters</SetVariable>
-          </Template>
+          <WidgetGroup><!-- normal FX expand button -->
+            <Layout>vertical</Layout>
+            <Size>28f,14f</Size>
+            <Children>
+              <Template src="skin:button_2state_persist.xml">
+                <SetVariable name="ObjectName">FxSamplersMiniMaxi</SetVariable>
+                <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
+                <SetVariable name="Size">28f,14f</SetVariable>
+                <SetVariable name="ConfigKey">[<Variable name="FxGroup"/>],show_parameters</SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- /normal FX expand button -->
+
+          <WidgetGroup><!-- FX expand button when focus is shown -->
+            <Layout>vertical</Layout>
+            <Size>28f,14f</Size>
+            <Children>
+              <WidgetGroup><!-- when no effect is focused -->
+                <Layout>vertical</Layout>
+                <Size>28f,14f</Size>
+                <Children>
+                  <Template src="skin:button_2state_persist.xml">
+                    <SetVariable name="ObjectName">FxSamplersMiniMaxi</SetVariable>
+                    <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
+                    <SetVariable name="Size">28f,14f</SetVariable>
+                    <SetVariable name="ConfigKey">[<Variable name="FxGroup"/>],show_parameters</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <Transform><IsEqual>0</IsEqual></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+              <WidgetGroup><!-- when any effect is focused -->
+                <Layout>vertical</Layout>
+                <Size>28f,14f</Size>
+                <Children>
+                  <Template src="skin:button_2state_persist.xml">
+                    <SetVariable name="ObjectName">FxSamplersMiniMaxi_Focus</SetVariable>
+                    <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
+                    <SetVariable name="Size">28f,14f</SetVariable>
+                    <SetVariable name="ConfigKey">[<Variable name="FxGroup"/>],show_parameters</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <Transform><IsEqual>0</IsEqual><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- /FX expand button when focus is shown -->
 
           <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
 
           <Label>
-            <ObjectName>EffectUnitLabel</ObjectName>
+            <ObjectName>FxUnitLabel</ObjectName>
             <Size>28f,12f</Size>
-            <Text>FX<Variable name="fxUnit"/></Text>
+            <Text>FX<Variable name="FxUnitNum"/></Text>
             <Alignment>center</Alignment>
           </Label>
         </Children>
-      </WidgetGroup>
+      </WidgetGroup><!-- /FX expand button + FX label -->
 
     </Children>
   </WidgetGroup><!-- /EffectUnit -->
diff --git a/res/skins/Tango/fx_unit_right.xml b/res/skins/Tango/fx_unit_right.xml
index 0ae0b10c6b55..34eed628e99b 100644
--- a/res/skins/Tango/fx_unit_right.xml
+++ b/res/skins/Tango/fx_unit_right.xml
@@ -2,92 +2,133 @@
 Description:
   An effect chain widget.
   * EffectSlots, with or without highlight/focus option
-  * mixer with Wet/Dry knob and Super knob
-  * Enable button
+  * mixer with Wet/Dry knob and Super knob (optional)
+  * assignment buttons for master & headphone
 Variables:
-  fxRack: Number of effect rack.
-  fxUnit: Number of effect unit.
+  FxUnitNum: number of effect unit for FX label
 -->
 <Template>
-  <WidgetGroup><!-- EffectUnit -->
-    <ObjectName>EffectUnitRight</ObjectName>
+  <SetVariable name="FxGroup">EffectRack1_EffectUnit<Variable name="FxUnitNum"/></SetVariable>
+  <SetVariable name="group">EffectUnit<Variable name="FxUnitNum"/></SetVariable>
+  <WidgetGroup>
     <Layout>horizontal</Layout>
     <SizePolicy>me,min</SizePolicy>
     <Children>
 
       <WidgetGroup><!-- EffectUnitMixer + Master, Headphone -->
-        <ObjectName>EffectUnitControlsRight</ObjectName>
+        <ObjectName>FxUnitControlsRight</ObjectName>
         <Layout>vertical</Layout>
         <Size>44f,1me</Size>
         <Children>
           <Template src="skin:button_2state_persist.xml">
-            <SetVariable name="ObjectName">FXSamplersMiniMaxiButton</SetVariable>
+            <SetVariable name="ObjectName">FxSamplersMiniMaxi</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
             <SetVariable name="Size">22me,14f</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[<Variable name="fxGroup"/>],show_parameters</SetVariable>
+            <SetVariable name="ConfigKey">[<Variable name="FxGroup"/>],show_parameters</SetVariable>
           </Template>
 
           <Label>
-            <ObjectName>EffectUnitLabel</ObjectName>
+            <ObjectName>FxUnitLabel</ObjectName>
             <Size>44f,18f</Size>
-            <Text>FX<Variable name="fxUnit"/></Text>
+            <Text>FX<Variable name="FxUnitNum"/></Text>
             <Alignment>center</Alignment>
           </Label>
 
           <WidgetGroup><!-- EffectUnitMixer -->
-            <ObjectName>EffectUnitMixerRight</ObjectName>
+            <ObjectName>FxUnitMixerRight</ObjectName>
             <Layout>vertical</Layout>
             <Size>44f,1me</Size>
             <Children>
 
-              <WidgetGroup>
+              <WidgetGroup><!-- SuperWetDryContainer -->
                 <ObjectName>SuperWetDryContainer</ObjectName>
                 <Layout>vertical</Layout>
                 <SizePolicy>me,me</SizePolicy>
                 <Children>
-                    <WidgetGroup><Size>1min,0me</Size><Children/></WidgetGroup>
+                  <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+
                   <Template src="skin:knob_textless.xml">
-                    <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
                     <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
+                    <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
                     <SetVariable name="Size">32f,32f</SetVariable>
-                    <SetVariable name="group">[<Variable name="fxGroup"/>]</SetVariable>
+                    <SetVariable name="group">[<Variable name="FxGroup"/>]</SetVariable>
                     <SetVariable name="ConfigKey">mix</SetVariable>
                     <SetVariable name="Color">red</SetVariable>
                   </Template>
-                    <WidgetGroup><Size>1min,0me</Size><Children/></WidgetGroup>
-                  <Template src="skin:knob_textless.xml">
-                    <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
-                    <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
-                    <SetVariable name="Size">32f,32f</SetVariable>
-                    <SetVariable name="group">[<Variable name="fxGroup"/>]</SetVariable>
-                    <SetVariable name="ConfigKey">super1</SetVariable>
-                    <SetVariable name="Color">blue</SetVariable>
-                  </Template>
-                    <WidgetGroup><Size>1min,0me</Size><Children/></WidgetGroup>
+
+                  <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+
+                  <WidgetGroup><!-- Super Knob, if enabled -->
+                    <Size>32f,32f</Size>
+                    <Layout>vertical</Layout>
+                    <Children>
+                      <Template src="skin:knob_textless.xml">
+                        <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
+                        <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
+                        <SetVariable name="Size">32f,32f</SetVariable>
+                        <SetVariable name="group">[<Variable name="FxGroup"/>]</SetVariable>
+                        <SetVariable name="ConfigKey">super1</SetVariable>
+                        <SetVariable name="Color">blue</SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey persist="true">[Tango],fx_super_knob</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- /Super Knob, if enabled -->
+
+                  <WidgetGroup><!-- additional spacer for Super Knob, if enabled -->
+                    <Size>1min,0me</Size>
+                    <Connection>
+                      <ConfigKey persist="true">[Tango],fx_super_knob</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- /additional spacer for Super Knob, if enabled -->
                 </Children>
-              </WidgetGroup><!-- SuperWetDryContainer -->
+              </WidgetGroup><!-- /SuperWetDryContainer -->
 
-              <WidgetGroup><Size>1min,1f</Size><Children/></WidgetGroup>
+              <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
 
               <WidgetGroup><!-- Master, Headphone -->
                 <Layout>horizontal</Layout>
                 <SizePolicy>min,min</SizePolicy>
                 <Children>
-                  <Template src="skin:fx_assign_button.xml">
+                  <Template src="skin:fx_head_master_button.xml">
                     <SetVariable name="Size">21f,21f</SetVariable>
                     <SetVariable name="sourceType">master</SetVariable>
                     <SetVariable name="labelOff">fx_master_off</SetVariable>
                     <SetVariable name="labelOn">fx_master_on</SetVariable>
                     <SetVariable name="group">[Master]</SetVariable>
                   </Template>
-                    <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
-                  <Template src="skin:fx_assign_button.xml">
-                    <SetVariable name="Size">21f,21f</SetVariable>
-                    <SetVariable name="sourceType">headphones</SetVariable>
-                    <SetVariable name="labelOff">fx_head_off</SetVariable>
-                    <SetVariable name="labelOn">fx_head_on</SetVariable>
-                    <SetVariable name="group">[Headphone]</SetVariable>
-                  </Template>
+                    <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+                  <WidgetGroup><!-- Headphone FX button -->
+                    <Size>21f,21f</Size>
+                    <Layout>stacked</Layout>
+                    <Children>
+                      <!-- index 0 due to bug -->
+                      <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
+
+                      <!-- Greyed out if no headphone device is configured -->
+                      <WidgetGroup>
+                        <ObjectName>MixerbarCover</ObjectName>
+                        <Layout>vertical</Layout>
+                        <SizePolicy>me,me</SizePolicy>
+                        <Connection>
+                          <ConfigKey>[Master],headEnabled</ConfigKey>
+                          <BindProperty>visible</BindProperty>
+                          <Transform><Not/></Transform>
+                        </Connection>
+                      </WidgetGroup>
+
+                      <Template src="skin:fx_head_master_button.xml">
+                        <SetVariable name="Size">21f,21f</SetVariable>
+                        <SetVariable name="sourceType">headphones</SetVariable>
+                        <SetVariable name="labelOff">fx_head_off</SetVariable>
+                        <SetVariable name="labelOn">fx_head_on</SetVariable>
+                        <SetVariable name="group">[Headphone]</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup><!-- /Headphone FX button -->
                 </Children>
               </WidgetGroup><!-- /Master, Headphone -->
 
@@ -96,147 +137,188 @@ Variables:
         </Children>
       </WidgetGroup><!-- /EffectUnitMixer + Master, Headphone -->
 
-      <WidgetGroup><!-- EffectSlots 1-3 * highlightable -->
-        <ObjectName>EffectSlots</ObjectName>
-        <Layout>vertical</Layout>
+      <WidgetGroup><!-- EffectSlots + Underlays, with focus button -->
+        <ObjectName>Spacer0f</ObjectName>
+        <Layout>stacked</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <WidgetGroup><!-- EffectSlot 1 * highlightable -->
-            <ObjectName>EffectSlotRightHighlight</ObjectName>
-            <SizePolicy>min,min</SizePolicy>
-            <Layout>horizontal</Layout>
-            <Children>
-              <Template src="skin:fx_selector_meta_right.xml">
-                <SetVariable name="fxNum">1</SetVariable>
-              </Template>
-              <WidgetGroup><Size>5f,1min</Size><Children/></WidgetGroup>
-              <Template src="skin:fx_parameter_row.xml">
-                <SetVariable name="fxNum">1</SetVariable>
-              </Template>
-            </Children>
-            <Connection>
-              <ConfigKey>[<Variable name="fxGroup"/>],focused_effect</ConfigKey>
-              <BindProperty>highlight</BindProperty>
-              <Transform>
-                <IsEqual>1</IsEqual>
-              </Transform>
-            </Connection>
-          </WidgetGroup><!-- /EffectSlot 1 * highlightable -->
-
-          <WidgetGroup><Size>1me,1f</Size><Children/></WidgetGroup>
-
-          <WidgetGroup><!-- EffectSlot 2 * highlightable -->
-            <ObjectName>EffectSlotRightHighlight</ObjectName>
+          <WidgetGroup><!-- EffectSlots with focus -->
+            <Layout>vertical</Layout>
             <SizePolicy>min,min</SizePolicy>
-            <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:fx_selector_meta_right.xml">
-                <SetVariable name="fxNum">2</SetVariable>
-              </Template>
-              <WidgetGroup><Size>5f,1min</Size><Children/></WidgetGroup>
-              <Template src="skin:fx_parameter_row.xml">
-                <SetVariable name="fxNum">2</SetVariable>
-              </Template>
+              <WidgetGroup><!-- EffectSlot 1 -->
+                <ObjectName>AlignLeft</ObjectName>
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_parameter_row.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                </Children>
+              </WidgetGroup><!-- /EffectSlot 1 -->
+
+                <WidgetGroup><Size>1me,1f</Size></WidgetGroup>
+
+              <WidgetGroup><!-- EffectSlot 2 -->
+                <ObjectName>AlignLeft</ObjectName>
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_parameter_row.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                </Children>
+              </WidgetGroup><!-- /EffectSlot 2 -->
+
+                <WidgetGroup><Size>1me,1f</Size></WidgetGroup>
+
+              <WidgetGroup><!-- EffectSlot 3 -->
+                <ObjectName>AlignLeft</ObjectName>
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_parameter_row.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                </Children>
+              </WidgetGroup><!-- /EffectSlot 3 -->
             </Children>
-            <Connection>
-              <ConfigKey>[<Variable name="fxGroup"/>],focused_effect</ConfigKey>
-              <BindProperty>highlight</BindProperty>
-              <Transform>
-                <IsEqual>2</IsEqual>
-              </Transform>
-            </Connection>
-          </WidgetGroup><!-- /EffectSlot 2 * highlightable -->
-
-          <WidgetGroup><Size>1me,1f</Size><Children/></WidgetGroup>
-
-          <WidgetGroup><!-- EffectSlot 3 * highlightable -->
-            <ObjectName>EffectSlotRightHighlight</ObjectName>
+          </WidgetGroup><!-- /EffectSlots with focus -->
+
+          <WidgetGroup><!-- Underlays with focus -->
+            <Layout>stacked</Layout>
             <SizePolicy>min,min</SizePolicy>
-            <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:fx_selector_meta_right.xml">
-                <SetVariable name="fxNum">3</SetVariable>
-              </Template>
-              <WidgetGroup><Size>5f,1min</Size><Children/></WidgetGroup>
-              <Template src="skin:fx_parameter_row.xml">
-                <SetVariable name="fxNum">3</SetVariable>
-              </Template>
+              <WidgetGroup><!-- EffectSlot 1 -->
+                <ObjectName>FxFlowUnderlay_right_focus1</ObjectName>
+                <Size>1me,53f</Size>
+                <Connection>
+                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <BindProperty>highlight</BindProperty>
+                  <Transform><IsEqual>1</IsEqual></Transform>
+                </Connection>
+              </WidgetGroup>
+
+              <WidgetGroup><!-- EffectSlot 2 -->
+                <ObjectName>FxFlowUnderlay_right_focus2</ObjectName>
+                <Size>1me,99f</Size>
+                <Connection>
+                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <BindProperty>highlight</BindProperty>
+                  <Transform><IsEqual>2</IsEqual></Transform>
+                </Connection>
+              </WidgetGroup>
+
+              <WidgetGroup><!-- EffectSlot 3 -->
+                <ObjectName>FxFlowUnderlay_right_focus3</ObjectName>
+                <Size>1me,137f</Size>
+                <Connection>
+                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <BindProperty>highlight</BindProperty>
+                  <Transform><IsEqual>3</IsEqual></Transform>
+                </Connection>
+              </WidgetGroup>
             </Children>
-            <Connection>
-              <ConfigKey>[<Variable name="fxGroup"/>],focused_effect</ConfigKey>
-              <BindProperty>highlight</BindProperty>
-              <Transform>
-                <IsEqual>3</IsEqual>
-              </Transform>
-            </Connection>
-          </WidgetGroup><!-- /EffectSlot 3 * highlightable -->
+          </WidgetGroup><!-- /Underlays with focus -->
         </Children>
         <Connection>
-          <ConfigKey>[<Variable name="fxGroup"/>],show_focus</ConfigKey>
+          <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- /EffectSlots 1-3 * highlightable -->
+      </WidgetGroup><!-- /EffectSlots + Underlays, with focus button -->
 
-      <WidgetGroup><!-- EffectSlots 1-3 * no highlight -->
-        <ObjectName>EffectSlots</ObjectName>
-        <Layout>vertical</Layout>
+      <WidgetGroup><!-- EffectSlots + Underlays, no focus -->
+        <ObjectName>Spacer0f</ObjectName>
+        <Layout>stacked</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <WidgetGroup><!-- EffectSlot 1 -->
-            <ObjectName>EffectSlotRight</ObjectName>
+          <WidgetGroup><!-- EffectSlots, no focus -->
+            <Layout>vertical</Layout>
             <SizePolicy>min,min</SizePolicy>
-            <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:fx_selector_meta_right.xml">
-                <SetVariable name="fxNum">1</SetVariable>
-              </Template>
-              <WidgetGroup><Size>5f,1min</Size><Children/></WidgetGroup>
-              <Template src="skin:fx_parameter_row.xml">
-                <SetVariable name="fxNum">1</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup><!-- /EffectSlot 1 -->
+              <WidgetGroup><!-- EffectSlot 1 -->
+                <ObjectName>AlignLeft</ObjectName>
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_parameter_row.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                </Children>
+              </WidgetGroup><!-- /EffectSlot 1 -->
 
-          <WidgetGroup><Size>1me,1f</Size><Children/></WidgetGroup>
+                <WidgetGroup><Size>1me,1f</Size></WidgetGroup>
 
-          <WidgetGroup><!-- EffectSlot 2 -->
-            <ObjectName>EffectSlotRight</ObjectName>
-            <SizePolicy>min,min</SizePolicy>
-            <Layout>horizontal</Layout>
-            <Children>
-              <Template src="skin:fx_selector_meta_right.xml">
-                <SetVariable name="fxNum">2</SetVariable>
-              </Template>
-              <WidgetGroup><Size>5f,1min</Size><Children/></WidgetGroup>
-              <Template src="skin:fx_parameter_row.xml">
-                <SetVariable name="fxNum">2</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup><!-- /EffectSlot 2 -->
+              <WidgetGroup><!-- EffectSlot 2 -->
+                <ObjectName>AlignLeft</ObjectName>
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_parameter_row.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                </Children>
+              </WidgetGroup><!-- /EffectSlot 2 -->
 
-          <WidgetGroup><Size>1me,1f</Size><Children/></WidgetGroup>
+                <WidgetGroup><Size>1me,1f</Size></WidgetGroup>
 
-          <WidgetGroup><!-- EffectSlot 3 -->
-            <ObjectName>EffectSlotRight</ObjectName>
+              <WidgetGroup><!-- EffectSlot 3 -->
+                <ObjectName>AlignLeft</ObjectName>
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_parameter_row.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                </Children>
+              </WidgetGroup><!-- /EffectSlot 3 -->
+            </Children>
+          </WidgetGroup><!-- /EffectSlots, no focus -->
+
+          <WidgetGroup><!-- Underlays, no focus -->
+            <Layout>stacked</Layout>
             <SizePolicy>min,min</SizePolicy>
-            <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:fx_selector_meta_right.xml">
-                <SetVariable name="fxNum">3</SetVariable>
-              </Template>
-              <WidgetGroup><Size>5f,1min</Size><Children/></WidgetGroup>
-              <Template src="skin:fx_parameter_row.xml">
-                <SetVariable name="fxNum">3</SetVariable>
-              </Template>
+              <WidgetGroup><!-- EffectSlot 1 -->
+                <ObjectName>FxFlowUnderlay_right_noFocus1</ObjectName>
+                <Size>1me,53f</Size>
+              </WidgetGroup>
+
+              <WidgetGroup><!-- EffectSlot 2 -->
+                <ObjectName>FxFlowUnderlay_right_noFocus2</ObjectName>
+                <Size>1me,99f</Size>
+              </WidgetGroup>
+
+              <WidgetGroup><!-- EffectSlot 3 -->
+                <ObjectName>FxFlowUnderlay_right_noFocus3</ObjectName>
+                <Size>1me,137f</Size>
+              </WidgetGroup>
             </Children>
-          </WidgetGroup><!-- /EffectSlot 3 -->
+          </WidgetGroup><!-- /Underlays, no focus -->
         </Children>
         <Connection>
-          <ConfigKey>[<Variable name="fxGroup"/>],show_focus</ConfigKey>
-          <BindProperty>visible</BindProperty>
+          <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
           <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- /EffectSlots 1-3 * no highlight -->
+      </WidgetGroup><!-- /EffectSlots + Underlays, no focus -->
     </Children>
   </WidgetGroup><!-- /EffectUnit -->
 </Template>
diff --git a/res/skins/Tango/fx_unit_right_mini.xml b/res/skins/Tango/fx_unit_right_mini.xml
index 805833606fb8..f7dda78adcfb 100644
--- a/res/skins/Tango/fx_unit_right_mini.xml
+++ b/res/skins/Tango/fx_unit_right_mini.xml
@@ -1,38 +1,98 @@
 <!--
-  Description:
-    An effect chain widget.
-  Variables:
-    EffectRack: Number of effect rack.
-    EffectUnit: Number of effect unit.
+Description:
+  An effect chain widget.
+  * EffectSlots, with or without highlight/focus option
+  * mixer with Wet/Dry knob and Super knob (optional)
+  * assignment buttons for master & headphone
+Variables:
+  FxUnitNum:   number of effect unit for FX label
 -->
 <Template>
-  <WidgetGroup><!-- EffectUnit -->
-    <ObjectName>EffectUnitRightMini</ObjectName>
+  <SetVariable name="FxGroup">EffectRack1_EffectUnit<Variable name="FxUnitNum"/></SetVariable>
+  <SetVariable name="group">EffectUnit<Variable name="FxUnitNum"/></SetVariable>
+  <WidgetGroup>
     <Layout>horizontal</Layout>
     <SizePolicy>me,max</SizePolicy>
     <Children>
 
-      <WidgetGroup>
+      <WidgetGroup><!-- FX expand button + FX label -->
         <Layout>vertical</Layout>
         <Size>28f,30f</Size>
         <Children>
-          <Template src="skin:button_2state_persist.xml">
-            <SetVariable name="ObjectName">FXSamplersMiniMaxiButton</SetVariable>
-            <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
-            <SetVariable name="Size">28f,13f</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[<Variable name="fxGroup"/>],show_parameters</SetVariable>
-          </Template>
+          <WidgetGroup><!-- normal FX expand button -->
+            <Layout>vertical</Layout>
+            <Size>28f,14f</Size>
+            <Children>
+              <Template src="skin:button_2state_persist.xml">
+                <SetVariable name="ObjectName">FxSamplersMiniMaxi</SetVariable>
+                <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
+                <SetVariable name="Size">28f,14f</SetVariable>
+                <SetVariable name="ConfigKey">[<Variable name="FxGroup"/>],show_parameters</SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- /normal FX expand button -->
+
+          <WidgetGroup><!-- FX expand button when focus is shown -->
+            <Layout>vertical</Layout>
+            <Size>28f,14f</Size>
+            <Children>
+              <WidgetGroup><!-- when no effect is focused -->
+                <Layout>vertical</Layout>
+                <Size>28f,14f</Size>
+                <Children>
+                  <Template src="skin:button_2state_persist.xml">
+                    <SetVariable name="ObjectName">FxSamplersMiniMaxi</SetVariable>
+                    <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
+                    <SetVariable name="Size">28f,14f</SetVariable>
+                    <SetVariable name="ConfigKey">[<Variable name="FxGroup"/>],show_parameters</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <Transform><IsEqual>0</IsEqual></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+              <WidgetGroup><!-- when any effect is focused -->
+                <Layout>vertical</Layout>
+                <Size>28f,14f</Size>
+                <Children>
+                  <Template src="skin:button_2state_persist.xml">
+                    <SetVariable name="ObjectName">FxSamplersMiniMaxi_Focus</SetVariable>
+                    <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
+                    <SetVariable name="Size">28f,14f</SetVariable>
+                    <SetVariable name="ConfigKey">[<Variable name="FxGroup"/>],show_parameters</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <Transform><IsEqual>0</IsEqual><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- /FX expand button when focus is shown -->
 
           <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
 
           <Label>
-            <ObjectName>EffectUnitLabel</ObjectName>
+            <ObjectName>FxUnitLabel</ObjectName>
             <Size>28f,12f</Size>
-            <Text>FX<Variable name="fxUnit"/></Text>
+            <Text>FX<Variable name="FxUnitNum"/></Text>
             <Alignment>center</Alignment>
           </Label>
         </Children>
-      </WidgetGroup>
+      </WidgetGroup><!-- /FX expand button + FX label -->
 
       <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
@@ -42,155 +102,240 @@
         <SizePolicy>min,min</SizePolicy>
         <Children>
           <Template src="skin:knob_textless.xml">
-            <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
+            <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
             <SetVariable name="Size">30f,30f</SetVariable>
-            <SetVariable name="group">[<Variable name="fxGroup"/>]</SetVariable>
+            <SetVariable name="group">[<Variable name="FxGroup"/>]</SetVariable>
             <SetVariable name="ConfigKey">mix</SetVariable>
             <SetVariable name="Color">red</SetVariable>
           </Template>
 
-          <Template src="skin:knob_textless.xml">
-            <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
-            <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
-            <SetVariable name="Size">30f,30f</SetVariable>
-            <SetVariable name="group">[<Variable name="fxGroup"/>]</SetVariable>
-            <SetVariable name="ConfigKey">super1</SetVariable>
-            <SetVariable name="Color">blue</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup><!-- /SuperWetDryContainer -->
-
-      <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
-
-      <WidgetGroup><!-- Effect togglers * highlightable -->
-        <ObjectName>AlignRightCenter</ObjectName>
-        <SizePolicy>me,min</SizePolicy>
-        <Layout>horizontal</Layout>
-        <Children>
-
           <WidgetGroup>
-            <ObjectName>EffectSlotRightHighlight</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,me</SizePolicy>
+            <Size>30f,30f</Size>
+            <Layout>vertical</Layout>
             <Children>
-              <Template src="skin:fx_selector_meta_right.xml">
-                <SetVariable name="fxNum">1</SetVariable>
+              <Template src="skin:knob_textless.xml">
+                <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
+                <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
+                <SetVariable name="Size">30f,30f</SetVariable>
+                <SetVariable name="group">[<Variable name="FxGroup"/>]</SetVariable>
+                <SetVariable name="ConfigKey">super1</SetVariable>
+                <SetVariable name="Color">blue</SetVariable>
               </Template>
-              <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
             </Children>
             <Connection>
-              <ConfigKey>[<Variable name="fxGroup"/>],focused_effect</ConfigKey>
-              <BindProperty>highlight</BindProperty>
-              <Transform><IsEqual>1</IsEqual></Transform>
+              <ConfigKey persist="true">[Tango],fx_super_knob</ConfigKey>
+              <BindProperty>visible</BindProperty>
             </Connection>
           </WidgetGroup>
+        </Children>
+      </WidgetGroup><!-- /SuperWetDryContainer -->
 
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
+      <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
-          <WidgetGroup>
-            <ObjectName>EffectSlotRightHighlight</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,me</SizePolicy>
+      <WidgetGroup><!-- Master, Headphone -->
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:fx_head_master_button.xml">
+            <SetVariable name="Size">15f,15f</SetVariable>
+            <SetVariable name="sourceType">master</SetVariable>
+            <SetVariable name="labelOff">fx_master_off</SetVariable>
+            <SetVariable name="labelOn">fx_master_on</SetVariable>
+            <SetVariable name="group">[Master]</SetVariable>
+          </Template>
+            <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
+          <WidgetGroup><!-- Headphone FX button -->
+            <Size>15f,14f</Size>
+            <Layout>stacked</Layout>
             <Children>
-              <Template src="skin:fx_selector_meta_right.xml">
-                <SetVariable name="fxNum">2</SetVariable>
+              <!-- index 0 due to bug -->
+              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
+
+              <!-- Greyed out if no headphone device is configured -->
+              <WidgetGroup>
+                <ObjectName>MixerbarCover</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>me,me</SizePolicy>
+                <Connection>
+                  <ConfigKey>[Master],headEnabled</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                  <Transform><Not/></Transform>
+                </Connection>
+              </WidgetGroup>
+
+              <Template src="skin:fx_head_master_button.xml">
+                <SetVariable name="Size">15f,14f</SetVariable>
+                <SetVariable name="sourceType">headphones</SetVariable>
+                <SetVariable name="labelOff">fx_head_off</SetVariable>
+                <SetVariable name="labelOn">fx_head_on</SetVariable>
+                <SetVariable name="group">[Headphone]</SetVariable>
               </Template>
-              <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
             </Children>
-            <Connection>
-              <ConfigKey>[<Variable name="fxGroup"/>],focused_effect</ConfigKey>
-              <BindProperty>highlight</BindProperty>
-              <Transform><IsEqual>2</IsEqual></Transform>
-            </Connection>
-          </WidgetGroup>
+          </WidgetGroup><!-- /Headphone FX button -->
+        </Children>
+      </WidgetGroup><!-- /Master, Headphone -->
 
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
+      <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
-          <WidgetGroup>
-            <ObjectName>EffectSlotRightHighlight</ObjectName>
+      <WidgetGroup><!-- EffectSlots + Underlays, no focus -->
+        <Layout>stacked</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <WidgetGroup><!-- EffectSlots, no focus -->
             <Layout>horizontal</Layout>
-            <SizePolicy>min,me</SizePolicy>
+            <SizePolicy>max,min</SizePolicy>
             <Children>
-              <Template src="skin:fx_selector_meta_right.xml">
-                <SetVariable name="fxNum">3</SetVariable>
-              </Template>
-              <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+              <WidgetGroup><!-- Effect 1 -->
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup><!-- Effect 2 -->
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup><!-- Effect 3 -->
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup>
             </Children>
-            <Connection>
-              <ConfigKey>[<Variable name="fxGroup"/>],focused_effect</ConfigKey>
-              <BindProperty>highlight</BindProperty>
-              <Transform><IsEqual>3</IsEqual></Transform>
-            </Connection>
-          </WidgetGroup>
+          </WidgetGroup><!-- /EffectSlots, no focus -->
 
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
+          <WidgetGroup><!-- Underlays, no focus -->
+            <ObjectName>Spacer0f</ObjectName>
+            <Layout>stacked</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <WidgetGroup><!-- EffectSlot 1 -->
+                <ObjectName>FxFlowUnderlay_mini_noFocus1</ObjectName>
+                <Size>120f,30f</Size>
+              </WidgetGroup>
 
-          <WidgetGroup><ObjectName>Spacer33</ObjectName><Size>0me,1min</Size></WidgetGroup>
+              <WidgetGroup><!-- EffectSlot 2 -->
+                <ObjectName>FxFlowUnderlay_mini_noFocus2</ObjectName>
+                <Size>240f,30f</Size>
+              </WidgetGroup>
 
+              <WidgetGroup><!-- EffectSlot 3 -->
+                <ObjectName>FxFlowUnderlay_mini_noFocus3</ObjectName>
+                <Size>360f,30f</Size>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- /Underlays, no focus -->
         </Children>
         <Connection>
-          <ConfigKey>[<Variable name="fxGroup"/>],show_focus</ConfigKey>
+          <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
+          <Transform><Not/></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- /Effect togglers * highlightable -->
+      </WidgetGroup><!-- /EffectSlots + Underlays, no focus -->
 
-      <WidgetGroup><!-- Effect togglers * no highlight -->
-        <ObjectName>AlignRightCenter</ObjectName>
-        <SizePolicy>me,min</SizePolicy>
-        <Layout>horizontal</Layout>
+      <WidgetGroup><!-- EffectSlots + Underlays, with focus -->
+        <Layout>stacked</Layout>
+        <SizePolicy>min,min</SizePolicy>
         <Children>
-
-          <WidgetGroup>
-            <ObjectName>EffectSlotRight</ObjectName>
+          <WidgetGroup><!-- EffectSlots with focus button -->
             <Layout>horizontal</Layout>
-            <SizePolicy>min,me</SizePolicy>
+            <SizePolicy>max,min</SizePolicy>
             <Children>
-              <Template src="skin:fx_selector_meta_right.xml">
-                <SetVariable name="fxNum">1</SetVariable>
-              </Template>
-              <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-            </Children>
-          </WidgetGroup>
+              <WidgetGroup><!-- Effect 1 -->
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup>
 
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
+              <WidgetGroup><!-- Effect 2 -->
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup>
 
-          <WidgetGroup>
-            <ObjectName>EffectSlotRight</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,me</SizePolicy>
-            <Children>
-              <Template src="skin:fx_selector_meta_right.xml">
-                <SetVariable name="fxNum">2</SetVariable>
-              </Template>
-              <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+              <WidgetGroup><!-- Effect 3 -->
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup>
             </Children>
-          </WidgetGroup>
+          </WidgetGroup><!-- /EffectSlots with focus button -->
 
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
-
-          <WidgetGroup>
-            <ObjectName>EffectSlotRight</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,me</SizePolicy>
+          <WidgetGroup><!-- Underlays with focus -->
+            <ObjectName>Spacer0f</ObjectName>
+            <Layout>stacked</Layout>
+            <SizePolicy>min,min</SizePolicy>
             <Children>
-              <Template src="skin:fx_selector_meta_right.xml">
-                <SetVariable name="fxNum">3</SetVariable>
-              </Template>
-              <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-            </Children>
-          </WidgetGroup>
+              <WidgetGroup><!-- EffectSlot 1 -->
+                <ObjectName>FxFlowUnderlay_mini_focus1</ObjectName>
+                <Size>134f,30f</Size>
+                <Connection>
+                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <Transform><IsEqual>1</IsEqual></Transform>
+                  <BindProperty>highlight</BindProperty>
+                </Connection>
+              </WidgetGroup>
 
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1max,1min</Size></WidgetGroup>
-          <WidgetGroup><ObjectName>Spacer33</ObjectName><Size>0me,1min</Size></WidgetGroup>
+              <WidgetGroup><!-- EffectSlot 2 -->
+                <ObjectName>FxFlowUnderlay_mini_focus2</ObjectName>
+                <Size>268f,30f</Size>
+                <Connection>
+                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <Transform><IsEqual>2</IsEqual></Transform>
+                  <BindProperty>highlight</BindProperty>
+                </Connection>
+              </WidgetGroup>
 
+              <WidgetGroup><!-- EffectSlot 3 -->
+                <ObjectName>FxFlowUnderlay_mini_focus3</ObjectName>
+                <Size>402f,30f</Size>
+                <Connection>
+                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <Transform><IsEqual>3</IsEqual></Transform>
+                  <BindProperty>highlight</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- /Underlays with focus -->
         </Children>
         <Connection>
-          <ConfigKey>[<Variable name="fxGroup"/>],show_focus</ConfigKey>
+          <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
           <BindProperty>visible</BindProperty>
-          <Transform><Not/></Transform>
         </Connection>
-      </WidgetGroup><!-- /Effect togglers * no highlight -->
+      </WidgetGroup><!-- /EffectSlots + Underlays, with focus -->
+
+      <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
+
+      <WidgetGroup><ObjectName>Spacer33</ObjectName><Size>0me,1min</Size></WidgetGroup>
 
     </Children>
   </WidgetGroup><!-- /EffectUnit -->
diff --git a/res/skins/Tango/fx_units_12.xml b/res/skins/Tango/fx_units_12.xml
index ff450a4aae57..3a9b112543bb 100644
--- a/res/skins/Tango/fx_units_12.xml
+++ b/res/skins/Tango/fx_units_12.xml
@@ -1,27 +1,25 @@
 <!--
 Description:
   Container for EffectUnits 1 & 2.
-  In netbook mode they are pushed apart by several spacers which also
-  aligns them to decks (resp. channel mixer or cover art).
-  For each EffectUnit there's a minimized and a full mode.
+  Units are pushed apart by spacers, see fx_units_spacer.xml.
 -->
 <Template>
-  <WidgetGroup><!-- EffectUnits 1 & 2 -->
-    <ObjectName>EffectUnits12</ObjectName>
+  <SetVariable name="FxRack">EffectRack1</SetVariable>
+  <SetVariable name="FxRackNum">1</SetVariable>
+  <WidgetGroup>
+    <ObjectName>FxUnits12</ObjectName>
     <SizePolicy>me,max</SizePolicy>
     <Layout>horizontal</Layout>
     <Children>
 
-      <WidgetGroup><!-- EffectUnit 1 -->
-        <ObjectName>EffectUnit1_maxi</ObjectName>
+      <WidgetGroup><!-- EffectUnit 1 maxi -->
         <Layout>vertical</Layout>
-        <SizePolicy>me,max</SizePolicy>
+        <SizePolicy>min,max</SizePolicy>
         <Children>
           <Template src="skin:fx_unit_left.xml">
-            <SetVariable name="fxRack">1</SetVariable>
-            <SetVariable name="fxUnit">1</SetVariable>
-            <SetVariable name="fxGroup">EffectRack1_EffectUnit1</SetVariable>
+            <SetVariable name="FxUnitNum">1</SetVariable>
           </Template>
+          <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
         </Children>
         <Connection>
           <ConfigKey persist="true">[EffectRack1_EffectUnit1],show_parameters</ConfigKey>
@@ -29,91 +27,32 @@ Description:
         </Connection>
       </WidgetGroup>
 
-      <WidgetGroup>
-        <ObjectName>EffectUnit1_mini</ObjectName>
+      <WidgetGroup><!-- EffectUnit 1 mini -->
         <Layout>vertical</Layout>
-        <SizePolicy>me,me</SizePolicy>
+        <SizePolicy>min,me</SizePolicy>
         <Children>
           <Template src="skin:fx_unit_left_mini.xml">
-            <SetVariable name="fxRack">1</SetVariable>
-            <SetVariable name="fxUnit">1</SetVariable>
-            <SetVariable name="fxGroup">EffectRack1_EffectUnit1</SetVariable>
+            <SetVariable name="FxUnitNum">1</SetVariable>
           </Template>
-          <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+          <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
         </Children>
         <Connection>
           <ConfigKey persist="true">[EffectRack1_EffectUnit1],show_parameters</ConfigKey>
           <Transform><Not/></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- /EffectUnit 1 -->
-
-      <WidgetGroup><!-- Spacers for normal width -->
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-
-          <WidgetGroup><!-- Skin Controls spacer -->
-            <Size>110f,1min</Size>
-          </WidgetGroup>
-
-          <WidgetGroup> <!-- Pitch fader spacer -->
-            <Size>106f,1min</Size>
-            <Children/>
-            <Connection>
-              <ConfigKey>[Tango],pitch_fader</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-
-          <WidgetGroup><!-- VU Meter spacer when Channel Mixer is hidden -->
-            <Layout>vertical</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <Children>
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                <Size>22f,1min</Size>
-                <Children>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Tango],vumeter</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-            </Children>
-            <Connection>
-              <ConfigKey>[Tango],channel_mixer</ConfigKey>
-              <BindProperty>visible</BindProperty>
-              <Transform><Not/></Transform>
-            </Connection>
-          </WidgetGroup>
-
-        </Children>
-        <Connection>
-          <ConfigKey>[Tango],normal_mode</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup><!-- /Spacers for normal width -->
+      </WidgetGroup>
 
-      <WidgetGroup><!-- Spacer for netbook mode -->
-        <Size>10f,1min</Size>
-        <Children/>
-        <Connection>
-          <ConfigKey>[Tango],netbook_mode</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup><!-- /Spacer for netbook mode -->
+      <Template src="skin:spacer_fx_units.xml"/>
 
-      <WidgetGroup><!-- EffectUnit 2 -->
-        <ObjectName>EffectUnit2_maxi</ObjectName>
+      <WidgetGroup><!-- EffectUnit 2 maxi -->
         <Layout>vertical</Layout>
-        <SizePolicy>me,max</SizePolicy>
+        <SizePolicy>min,max</SizePolicy>
         <Children>
           <Template src="skin:fx_unit_right.xml">
-            <SetVariable name="fxRack">1</SetVariable>
-            <SetVariable name="fxUnit">2</SetVariable>
-            <SetVariable name="fxGroup">EffectRack1_EffectUnit2</SetVariable>
+            <SetVariable name="FxUnitNum">2</SetVariable>
           </Template>
+          <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
         </Children>
         <Connection>
           <ConfigKey persist="true">[EffectRack1_EffectUnit2],show_parameters</ConfigKey>
@@ -121,24 +60,21 @@ Description:
         </Connection>
       </WidgetGroup>
 
-      <WidgetGroup>
-        <ObjectName>EffectUnit2_mini</ObjectName>
+      <WidgetGroup><!-- EffectUnit 2 mini -->
         <Layout>vertical</Layout>
-        <SizePolicy>me,me</SizePolicy>
+        <SizePolicy>min,me</SizePolicy>
         <Children>
           <Template src="skin:fx_unit_right_mini.xml">
-            <SetVariable name="fxRack">1</SetVariable>
-            <SetVariable name="fxUnit">2</SetVariable>
-            <SetVariable name="fxGroup">EffectRack1_EffectUnit2</SetVariable>
+            <SetVariable name="FxUnitNum">2</SetVariable>
           </Template>
-          <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+          <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
         </Children>
         <Connection>
           <ConfigKey persist="true">[EffectRack1_EffectUnit2],show_parameters</ConfigKey>
           <Transform><Not/></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- /EffectUnit 2 -->
+      </WidgetGroup>
 
     </Children>
     <Connection>
diff --git a/res/skins/Tango/fx_units_34.xml b/res/skins/Tango/fx_units_34.xml
index bc9b5f495159..15c458aeb82e 100644
--- a/res/skins/Tango/fx_units_34.xml
+++ b/res/skins/Tango/fx_units_34.xml
@@ -1,27 +1,25 @@
 <!--
 Description:
-  Container for EffectUnits 1 & 2.
-  In netbook mode they are pushed apart by several spacers which also
-  aligns them to decks (resp. channel mixer or cover art).
-  For each EffectUnit there's a minimized and a full mode.
+  Container for EffectUnits 3 & 4.
+  Units are pushed apart by spacers, see fx_units_spacer.xml.
 -->
 <Template>
-  <WidgetGroup><!-- EffectUnits 3 & 4 -->
-    <ObjectName>EffectUnits34</ObjectName>
+  <SetVariable name="FxRack">EffectRack1</SetVariable>
+  <SetVariable name="FxRackNum">1</SetVariable>
+  <WidgetGroup>
+    <ObjectName>FxUnits34</ObjectName>
     <SizePolicy>me,max</SizePolicy>
     <Layout>horizontal</Layout>
     <Children>
 
-      <WidgetGroup><!-- EffectUnit 3 -->
-        <ObjectName>EffectUnit3_maxi</ObjectName>
+      <WidgetGroup><!-- EffectUnit 3 maxi -->
         <Layout>vertical</Layout>
         <SizePolicy>min,max</SizePolicy>
         <Children>
           <Template src="skin:fx_unit_left.xml">
-              <SetVariable name="fxRack">1</SetVariable>
-              <SetVariable name="fxUnit">3</SetVariable>
-              <SetVariable name="fxGroup">EffectRack1_EffectUnit3</SetVariable>
+            <SetVariable name="FxUnitNum">3</SetVariable>
           </Template>
+          <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
         </Children>
         <Connection>
           <ConfigKey persist="true">[EffectRack1_EffectUnit3],show_parameters</ConfigKey>
@@ -29,90 +27,32 @@ Description:
         </Connection>
       </WidgetGroup>
 
-      <WidgetGroup>
-        <ObjectName>EffectUnit3_mini</ObjectName>
+      <WidgetGroup><!-- EffectUnit 3 mini -->
         <Layout>vertical</Layout>
         <SizePolicy>min,me</SizePolicy>
         <Children>
           <Template src="skin:fx_unit_left_mini.xml">
-              <SetVariable name="fxRack">1</SetVariable>
-              <SetVariable name="fxUnit">3</SetVariable>
-              <SetVariable name="fxGroup">EffectRack1_EffectUnit3</SetVariable>
+            <SetVariable name="FxUnitNum">3</SetVariable>
           </Template>
-          <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+          <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
         </Children>
         <Connection>
           <ConfigKey persist="true">[EffectRack1_EffectUnit3],show_parameters</ConfigKey>
           <Transform><Not/></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- /EffectUnit 1 -->
-
-      <WidgetGroup><!-- Spacers for normal width -->
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-
-          <WidgetGroup><!-- Skin Controls spacer -->
-            <Size>110f,1min</Size>
-          </WidgetGroup>
-
-          <WidgetGroup> <!-- Spacer to keep Deck & FX unit aligned without Pitch fader-->
-            <Size>106f,1min</Size>
-            <Children/>
-            <Connection>
-              <ConfigKey>[Tango],pitch_fader</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-
-          <WidgetGroup><!-- VU Meter spacer when Channel Mixer is hidden -->
-            <Layout>vertical</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <Children>
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                <Size>22f,1min</Size>
-                <Children>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Tango],vumeter</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-            </Children>
-            <Connection>
-              <ConfigKey>[Tango],channel_mixer</ConfigKey>
-              <BindProperty>visible</BindProperty>
-              <Transform><Not/></Transform>
-            </Connection>
-          </WidgetGroup><!-- /VU Meter spacer when Channel Mixer is hidden -->
-        </Children>
-        <Connection>
-          <ConfigKey>[Tango],normal_mode</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup><!-- /Spacers for normal width -->
+      </WidgetGroup>
 
-      <WidgetGroup><!-- Spacer for netbook mode -->
-        <Size>10f,1min</Size>
-        <Children/>
-        <Connection>
-          <ConfigKey>[Tango],netbook_mode</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup><!-- /Spacer for netbook mode -->
+      <Template src="skin:spacer_fx_units.xml"/>
 
-      <WidgetGroup><!-- EffectUnit 4 -->
-        <ObjectName>EffectUnit4_maxi</ObjectName>
+      <WidgetGroup><!-- EffectUnit 4 maxi -->
         <Layout>vertical</Layout>
         <SizePolicy>min,max</SizePolicy>
         <Children>
           <Template src="skin:fx_unit_right.xml">
-              <SetVariable name="fxRack">1</SetVariable>
-              <SetVariable name="fxUnit">4</SetVariable>
-              <SetVariable name="fxGroup">EffectRack1_EffectUnit4</SetVariable>
+            <SetVariable name="FxUnitNum">4</SetVariable>
           </Template>
+          <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
         </Children>
         <Connection>
           <ConfigKey persist="true">[EffectRack1_EffectUnit4],show_parameters</ConfigKey>
@@ -120,29 +60,26 @@ Description:
         </Connection>
       </WidgetGroup>
 
-      <WidgetGroup>
-        <ObjectName>EffectUnit4_mini</ObjectName>
+      <WidgetGroup><!-- EffectUnit 4 mini -->
         <Layout>vertical</Layout>
         <SizePolicy>min,me</SizePolicy>
         <Children>
           <Template src="skin:fx_unit_right_mini.xml">
-              <SetVariable name="fxRack">1</SetVariable>
-              <SetVariable name="fxUnit">4</SetVariable>
-              <SetVariable name="fxGroup">EffectRack1_EffectUnit4</SetVariable>
+            <SetVariable name="FxUnitNum">4</SetVariable>
           </Template>
-          <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+          <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
         </Children>
         <Connection>
           <ConfigKey persist="true">[EffectRack1_EffectUnit4],show_parameters</ConfigKey>
           <Transform><Not/></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- /EffectUnit 4 -->
+      </WidgetGroup>
 
     </Children>
     <Connection>
       <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
-  </WidgetGroup><!-- /EffectUnits 3 & 4 -->
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/Tango/graphics/battery_0_charging.svg b/res/skins/Tango/graphics/battery_0_charging.svg
index d4e2b4153e0d..113e9e07029f 100644
--- a/res/skins/Tango/graphics/battery_0_charging.svg
+++ b/res/skins/Tango/graphics/battery_0_charging.svg
@@ -1,76 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_1_discharging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="7.0790983"
-     inkscape:cy="11.111046"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#ff1ff6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,5 0,8 16,0 0,-2 2,0 0,-4 -2,0 0,-2 z"
-       transform="translate(0,1034.3622)"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 15.884707,1036.3687 -6.992858,6.4109 2.622563,1.4568 -3.399119,6.1193 6.992858,-6.4109 -2.622563,-1.4568 3.39912,-6.1193 z"
-       id="path5316"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M4 5v8h16v-2h2V7h-2V5z" fill="#ff1ff6"/><path d="M15.884707 2.0065L8.891849 8.4174l2.622563 1.4568-3.399119 6.1193 6.992858-6.4109-2.622563-1.4568 3.39912-6.1193z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_0_discharging.svg b/res/skins/Tango/graphics/battery_0_discharging.svg
index 6207b27e6081..ea9393df28e4 100644
--- a/res/skins/Tango/graphics/battery_0_discharging.svg
+++ b/res/skins/Tango/graphics/battery_0_discharging.svg
@@ -1,85 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_0_charging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="7.0790983"
-     inkscape:cy="6.4550525"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#ff1ff6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,5 0,8 16,0 0,-2 2,0 0,-4 -2,0 0,-2 z"
-       transform="translate(0,1034.3622)"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot7475"
-       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       transform="translate(7.2036504,1030.8267)"><flowRegion
-         id="flowRegion7477"><rect
-           id="rect7479"
-           width="8.7504463"
-           height="23.246136"
-           x="2.8726213"
-           y="1.6039615"
-           style="font-size:16px"
-           ry="0" /></flowRegion><flowPara
-         id="flowPara7481"
-         style="font-size:16px;fill:#ffffff;fill-opacity:1">!</flowPara></flowRoot>  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M4 5v8h16v-2h2V7h-2V5z" fill="#ff1ff6"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_1_charging.svg b/res/skins/Tango/graphics/battery_1_charging.svg
index 7780d57e5307..b7cdd059c8af 100644
--- a/res/skins/Tango/graphics/battery_1_charging.svg
+++ b/res/skins/Tango/graphics/battery_1_charging.svg
@@ -1,82 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_2_discharging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="7.0790983"
-     inkscape:cy="11.111046"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 6,5 0,8 14,0 0,-2 2,0 0,-4 -2,0 0,-2 z"
-       transform="translate(0,1034.3622)"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#ff1ff6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,1039.3622 2,0 0,8 -2,0 z"
-       id="rect3759-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 15.884707,1036.3687 -6.992858,6.4109 2.622563,1.4568 -3.399119,6.1193 6.992858,-6.4109 -2.622563,-1.4568 3.39912,-6.1193 z"
-       id="path5316"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M6 5v8h14v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h2v8H4z" fill="#ff1ff6"/><path d="M15.884707 2.0065L8.891849 8.4174l2.622563 1.4568-3.399119 6.1193 6.992858-6.4109-2.622563-1.4568 3.39912-6.1193z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_1_discharging.svg b/res/skins/Tango/graphics/battery_1_discharging.svg
index aad5dce1f7bd..e00acba144b4 100644
--- a/res/skins/Tango/graphics/battery_1_discharging.svg
+++ b/res/skins/Tango/graphics/battery_1_discharging.svg
@@ -1,77 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_1_charging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="7.0790983"
-     inkscape:cy="11.111046"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 6,5 0,8 14,0 0,-2 2,0 0,-4 -2,0 0,-2 z"
-       transform="translate(0,1034.3622)"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#ff1ff6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,1039.3622 2,0 0,8 -2,0 z"
-       id="rect3759-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M6 5v8h14v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h2v8H4z" fill="#ff1ff6"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_2_charging.svg b/res/skins/Tango/graphics/battery_2_charging.svg
index ab063f4595f1..cd6f9b4bd643 100644
--- a/res/skins/Tango/graphics/battery_2_charging.svg
+++ b/res/skins/Tango/graphics/battery_2_charging.svg
@@ -1,82 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_2_discharging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="7.0790983"
-     inkscape:cy="11.111046"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 8,5 0,8 12,0 0,-2 2,0 0,-4 -2,0 0,-2 z"
-       transform="translate(0,1034.3622)"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#fc0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,1039.3622 4,0 0,8 -4,0 z"
-       id="rect3759-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 15.884707,1036.3687 -6.992858,6.4109 2.622563,1.4568 -3.399119,6.1193 6.992858,-6.4109 -2.622563,-1.4568 3.39912,-6.1193 z"
-       id="path5316"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M8 5v8h12v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h4v8H4z" fill="#fc0000"/><path d="M15.884707 2.0065L8.891849 8.4174l2.622563 1.4568-3.399119 6.1193 6.992858-6.4109-2.622563-1.4568 3.39912-6.1193z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_2_discharging.svg b/res/skins/Tango/graphics/battery_2_discharging.svg
index 0d1ff874c757..d02a3480e6c9 100644
--- a/res/skins/Tango/graphics/battery_2_discharging.svg
+++ b/res/skins/Tango/graphics/battery_2_discharging.svg
@@ -1,77 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_2_charging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="7.0790983"
-     inkscape:cy="11.111046"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 8,5 0,8 12,0 0,-2 2,0 0,-4 -2,0 0,-2 z"
-       transform="translate(0,1034.3622)"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#fc0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,1039.3622 4,0 0,8 -4,0 z"
-       id="rect3759-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M8 5v8h12v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h4v8H4z" fill="#fc0000"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_3_charging.svg b/res/skins/Tango/graphics/battery_3_charging.svg
index 0b3639380e70..9b90a2b0a812 100644
--- a/res/skins/Tango/graphics/battery_3_charging.svg
+++ b/res/skins/Tango/graphics/battery_3_charging.svg
@@ -1,82 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_3_charging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="14.547914"
-     inkscape:cy="11.111046"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#fe9500;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,1039.3622 6,0 0,8 -6,0 z"
-       id="rect3759-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 10,5 0,8 10,0 0,-2 2,0 0,-4 -2,0 0,-2 z"
-       transform="translate(0,1034.3622)"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 15.884707,1036.3687 -6.992858,6.4109 2.622563,1.4568 -3.399119,6.1193 6.992858,-6.4109 -2.622563,-1.4568 3.39912,-6.1193 z"
-       id="path5316"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M4 5h6v8H4z" fill="#fe9500"/><path d="M10 5v8h10v-2h2V7h-2V5z" fill="#888"/><path d="M15.884707 2.0065L8.891849 8.4174l2.622563 1.4568-3.399119 6.1193 6.992858-6.4109-2.622563-1.4568 3.39912-6.1193z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_3_discharging.svg b/res/skins/Tango/graphics/battery_3_discharging.svg
index 59f005838f94..4de20dbf869c 100644
--- a/res/skins/Tango/graphics/battery_3_discharging.svg
+++ b/res/skins/Tango/graphics/battery_3_discharging.svg
@@ -1,77 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_3_discharging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="7.0790986"
-     inkscape:cy="11.111046"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 10,5 0,8 10,0 0,-2 2,0 0,-4 -2,0 0,-2 z"
-       transform="translate(0,1034.3622)"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#fe9500;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,1039.3622 6,0 0,8 -6,0 z"
-       id="rect3759-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M10 5v8h10v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h6v8H4z" fill="#fe9500"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_4_charging.svg b/res/skins/Tango/graphics/battery_4_charging.svg
index 1e1cd74b10e5..e285a81af40e 100644
--- a/res/skins/Tango/graphics/battery_4_charging.svg
+++ b/res/skins/Tango/graphics/battery_4_charging.svg
@@ -1,82 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_5_discharging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="14.547914"
-     inkscape:cy="11.111046"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 12,5 0,8 8,0 0,-2 2,0 0,-4 -2,0 0,-2 z"
-       transform="translate(0,1034.3622)"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,1039.3622 8,0 0,8 -8,0 z"
-       id="rect3759-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 15.884707,1036.3687 -6.992858,6.4109 2.622563,1.4568 -3.399119,6.1193 6.992858,-6.4109 -2.622563,-1.4568 3.39912,-6.1193 z"
-       id="path5316"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M12 5v8h8v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h8v8H4z" fill="#d2d2d2"/><path d="M15.884707 2.0065L8.891849 8.4174l2.622563 1.4568-3.399119 6.1193 6.992858-6.4109-2.622563-1.4568 3.39912-6.1193z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_4_discharging.svg b/res/skins/Tango/graphics/battery_4_discharging.svg
index 6ecb923573d1..2ed22196661d 100644
--- a/res/skins/Tango/graphics/battery_4_discharging.svg
+++ b/res/skins/Tango/graphics/battery_4_discharging.svg
@@ -1,77 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_4_charging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="14.547914"
-     inkscape:cy="11.111046"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 12,5 0,8 8,0 0,-2 2,0 0,-4 -2,0 0,-2 z"
-       transform="translate(0,1034.3622)"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,1039.3622 8,0 0,8 -8,0 z"
-       id="rect3759-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M12 5v8h8v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h8v8H4z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_5_charging.svg b/res/skins/Tango/graphics/battery_5_charging.svg
index f003a993faf3..838533316259 100644
--- a/res/skins/Tango/graphics/battery_5_charging.svg
+++ b/res/skins/Tango/graphics/battery_5_charging.svg
@@ -1,82 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_6_charging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="14.547914"
-     inkscape:cy="11.111046"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 14,5 0,8 6,0 0,-2 2,0 0,-4 -2,0 0,-2 z"
-       transform="translate(0,1034.3622)"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,1039.3622 10,0 0,8 -10,0 z"
-       id="rect3759-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 15.884707,1036.3687 -6.992858,6.4109 2.622563,1.4568 -3.399119,6.1193 6.992858,-6.4109 -2.622563,-1.4568 3.39912,-6.1193 z"
-       id="path5316"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M14 5v8h6v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h10v8H4z" fill="#d2d2d2"/><path d="M15.884707 2.0065L8.891849 8.4174l2.622563 1.4568-3.399119 6.1193 6.992858-6.4109-2.622563-1.4568 3.39912-6.1193z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_5_discharging.svg b/res/skins/Tango/graphics/battery_5_discharging.svg
index 42508bf8a836..f702424f3bd5 100644
--- a/res/skins/Tango/graphics/battery_5_discharging.svg
+++ b/res/skins/Tango/graphics/battery_5_discharging.svg
@@ -1,77 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_5_charging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="14.547914"
-     inkscape:cy="11.111046"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 14,5 0,8 6,0 0,-2 2,0 0,-4 -2,0 0,-2 z"
-       transform="translate(0,1034.3622)"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,1039.3622 10,0 0,8 -10,0 z"
-       id="rect3759-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M14 5v8h6v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h10v8H4z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_6_charging.svg b/res/skins/Tango/graphics/battery_6_charging.svg
index 4fc6c2a9d252..d90e5f7aa9bf 100644
--- a/res/skins/Tango/graphics/battery_6_charging.svg
+++ b/res/skins/Tango/graphics/battery_6_charging.svg
@@ -1,82 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_6_discharging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="18.427204"
-     inkscape:cy="6.0758193"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 16,5 0,8 4,0 0,-2 2,0 0,-4 -2,0 0,-2 z"
-       transform="translate(0,1034.3622)"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,1039.3622 12,0 0,8 -12,0 z"
-       id="rect3759-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 15.884707,1036.3687 -6.992858,6.4109 2.622563,1.4568 -3.399119,6.1193 6.992858,-6.4109 -2.622563,-1.4568 3.39912,-6.1193 z"
-       id="path5316"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M16 5v8h4v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h12v8H4z" fill="#d2d2d2"/><path d="M15.884707 2.0065L8.891849 8.4174l2.622563 1.4568-3.399119 6.1193 6.992858-6.4109-2.622563-1.4568 3.39912-6.1193z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_6_discharging.svg b/res/skins/Tango/graphics/battery_6_discharging.svg
index bd98382d9e0c..4c8f55a6d735 100644
--- a/res/skins/Tango/graphics/battery_6_discharging.svg
+++ b/res/skins/Tango/graphics/battery_6_discharging.svg
@@ -1,77 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_6_charging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="18.427204"
-     inkscape:cy="6.0758193"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 16,5 0,8 4,0 0,-2 2,0 0,-4 -2,0 0,-2 z"
-       transform="translate(0,1034.3622)"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,1039.3622 12,0 0,8 -12,0 z"
-       id="rect3759-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M16 5v8h4v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h12v8H4z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_7_charging.svg b/res/skins/Tango/graphics/battery_7_charging.svg
index 3f47670bad9f..5f7dc8dd6954 100644
--- a/res/skins/Tango/graphics/battery_7_charging.svg
+++ b/res/skins/Tango/graphics/battery_7_charging.svg
@@ -1,82 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_8_charging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="18.427204"
-     inkscape:cy="6.0758193"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 18,5 0,8 2,0 0,-2 2,0 0,-4 -2,0 0,-2 z"
-       transform="translate(0,1034.3622)"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,1039.3622 14,0 0,8 -14,0 z"
-       id="rect3759-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 15.884707,1036.3687 -6.992858,6.4109 2.622563,1.4568 -3.399119,6.1193 6.992858,-6.4109 -2.622563,-1.4568 3.39912,-6.1193 z"
-       id="path5316"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M18 5v8h2v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h14v8H4z" fill="#d2d2d2"/><path d="M15.884707 2.0065L8.891849 8.4174l2.622563 1.4568-3.399119 6.1193 6.992858-6.4109-2.622563-1.4568 3.39912-6.1193z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_7_discharging.svg b/res/skins/Tango/graphics/battery_7_discharging.svg
index 1897a93a32b3..8e01422be002 100644
--- a/res/skins/Tango/graphics/battery_7_discharging.svg
+++ b/res/skins/Tango/graphics/battery_7_discharging.svg
@@ -1,77 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_7_charging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="18.427204"
-     inkscape:cy="6.0758193"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 18,5 0,8 2,0 0,-2 2,0 0,-4 -2,0 0,-2 z"
-       transform="translate(0,1034.3622)"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,1039.3622 14,0 0,8 -14,0 z"
-       id="rect3759-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M18 5v8h2v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h14v8H4z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_8_charging.svg b/res/skins/Tango/graphics/battery_8_charging.svg
index 5b7eddc3748e..0cefd2ae25e6 100644
--- a/res/skins/Tango/graphics/battery_8_charging.svg
+++ b/res/skins/Tango/graphics/battery_8_charging.svg
@@ -1,82 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_8_charging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="18.427204"
-     inkscape:cy="6.0758193"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 20,5 0,8 0,0 0,-2 2,0 0,-4 -2,0 0,-2 z"
-       transform="translate(0,1034.3622)"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,1039.3622 16,0 0,8 -16,0 z"
-       id="rect3759-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 15.884707,1036.3687 -6.992858,6.4109 2.622563,1.4568 -3.399119,6.1193 6.992858,-6.4109 -2.622563,-1.4568 3.39912,-6.1193 z"
-       id="path5316"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M20 5v8-2h2V7h-2V5z" fill="#888"/><path d="M4 5h16v8H4z" fill="#d2d2d2"/><path d="M15.884707 2.0065L8.891849 8.4174l2.622563 1.4568-3.399119 6.1193 6.992858-6.4109-2.622563-1.4568 3.39912-6.1193z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_8_discharging.svg b/res/skins/Tango/graphics/battery_8_discharging.svg
index 80170cd3cf05..8e01422be002 100644
--- a/res/skins/Tango/graphics/battery_8_discharging.svg
+++ b/res/skins/Tango/graphics/battery_8_discharging.svg
@@ -1,77 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_8_discharging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="14.274797"
-     inkscape:cy="6.9269033"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 18,5 0,8 2,0 0,-2 2,0 0,-4 -2,0 0,-2 z"
-       transform="translate(0,1034.3622)"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,1039.3622 14,0 0,8 -14,0 z"
-       id="rect3759-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M18 5v8h2v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h14v8H4z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_9_charging.svg b/res/skins/Tango/graphics/battery_9_charging.svg
index d03bf146e4b5..7260261e990b 100644
--- a/res/skins/Tango/graphics/battery_9_charging.svg
+++ b/res/skins/Tango/graphics/battery_9_charging.svg
@@ -1,81 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_9_charging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="10.301938"
-     inkscape:cy="14.037084"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 20,1045.3622 2,0 0,-4 -2,0 z"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,1039.3622 16,0 0,8 -16,0 z"
-       id="rect3759-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 15.884707,1036.3687 -6.992858,6.4109 2.622563,1.4568 -3.399119,6.1193 6.992858,-6.4109 -2.622563,-1.4568 3.39912,-6.1193 z"
-       id="path5316"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M20 11h2V7h-2z" fill="#888"/><path d="M4 5h16v8H4z" fill="#d2d2d2"/><path d="M15.884707 2.0065L8.891849 8.4174l2.622563 1.4568-3.399119 6.1193 6.992858-6.4109-2.622563-1.4568 3.39912-6.1193z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_9_discharging.svg b/res/skins/Tango/graphics/battery_9_discharging.svg
index f85fa75e03e0..523a3cc5bbe2 100644
--- a/res/skins/Tango/graphics/battery_9_discharging.svg
+++ b/res/skins/Tango/graphics/battery_9_discharging.svg
@@ -1,76 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_9_discharging.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="10.241361"
-     inkscape:cy="11.635796"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 20,1045.3622 2,0 0,-4 -2,0 z"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,1039.3622 16,0 0,8 -16,0 z"
-       id="rect3759-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M20 11h2V7h-2z" fill="#888"/><path d="M4 5h16v8H4z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/battery_charged.svg b/res/skins/Tango/graphics/battery_charged.svg
index 48711547b49e..55fee28ec91f 100644
--- a/res/skins/Tango/graphics/battery_charged.svg
+++ b/res/skins/Tango/graphics/battery_charged.svg
@@ -1,71 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="battery_charged.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-0.321139"
-     inkscape:cy="11.635796"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1034.3622)">
-    <path
-       style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4,5 0,8 16,0 0,-2 2,0 0,-4 -2,0 0,-2 z"
-       transform="translate(0,1034.3622)"
-       id="rect3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="18"><path d="M4 5v8h16v-2h2V7h-2V5z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/blank_1x1.svg b/res/skins/Tango/graphics/blank_1x1.svg
new file mode 100644
index 000000000000..c886185764a4
--- /dev/null
+++ b/res/skins/Tango/graphics/blank_1x1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1" height="1" viewBox="0 0 1 1"/>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/cover_default.svg b/res/skins/Tango/graphics/cover_default.svg
index fd08d44028e5..3ed7660e459f 100644
--- a/res/skins/Tango/graphics/cover_default.svg
+++ b/res/skins/Tango/graphics/cover_default.svg
@@ -1,103 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="96"
-   height="96"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="cover_default_big.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2"
-     inkscape:cx="1.4825945"
-     inkscape:cy="82.793608"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-956.36218)">
-    <rect
-       style="fill:#333333;fill-opacity:1;stroke:none"
-       id="rect4605"
-       width="96"
-       height="96"
-       x="0"
-       y="0"
-       transform="translate(0,956.36218)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;fill-opacity:1;stroke:none;display:inline"
-       id="path4919-6-3"
-       sodipodi:cx="47.414036"
-       sodipodi:cy="48.144024"
-       sodipodi:rx="42.110733"
-       sodipodi:ry="45.330597"
-       d="m 89.524769,48.144024 c 0,25.035397 -18.853618,45.330597 -42.110733,45.330597 -23.257116,0 -42.1107332,-20.2952 -42.1107332,-45.330597 0,-25.035397 18.8536172,-45.330597 42.1107332,-45.330597 23.257115,0 42.110733,20.2952 42.110733,45.330597 z"
-       transform="matrix(1.098337,0,0,1.0203213,-4.0765977,955.2398)" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#585858;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.22671224;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 48.000001,957.99168 c -25.616581,0 -46.3704139,20.7877 -46.3704139,46.38642 0,25.5988 20.7538329,46.3546 46.3704139,46.3546 25.61658,0 46.370412,-20.7558 46.370412,-46.3546 0,-25.59872 -20.753832,-46.38642 -46.370412,-46.38642 z m 0,0.25505 c 25.471716,0 46.130153,20.64876 46.130153,46.13137 0,25.4826 -20.658437,46.1314 -46.130153,46.1314 -25.471718,0 -46.1301527,-20.6488 -46.1301527,-46.1314 0,-25.48261 20.6584347,-46.13137 46.1301527,-46.13137 z"
-       id="path4919-6"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#9e9e9e;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       d="m 47.999985,983.23446 c -11.668502,0 -21.127701,9.4592 -21.127701,21.12774 0,11.6685 9.459199,21.1277 21.127701,21.1277 11.668513,0 21.1277,-9.4592 21.1277,-21.1277 0,-11.66854 -9.459187,-21.12774 -21.1277,-21.12774 z"
-       id="path4010"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="path3830-7"
-       sodipodi:cx="48.739861"
-       sodipodi:cy="48.017754"
-       sodipodi:rx="4.2931485"
-       sodipodi:ry="4.2931485"
-       d="m 53.033009,48.017754 c 0,2.37104 -1.922108,4.293148 -4.293148,4.293148 -2.371041,0 -4.293149,-1.922108 -4.293149,-4.293148 0,-2.371041 1.922108,-4.293149 4.293149,-4.293149 2.37104,0 4.293148,1.922108 4.293148,4.293149 z"
-       transform="matrix(0.27995619,0,0,0.27995619,34.354962,990.9193)" />
-    <rect
-       style="fill:#333333;fill-opacity:1;stroke:none;opacity:0.5"
-       id="rect4605-3"
-       width="96"
-       height="96"
-       x="0"
-       y="956.36218" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="96" height="96"><path fill="#333" d="M0 0h96v96H0z"/><path d="M94.2517685092 47.999993155c0 25.544148813-20.7076262333 46.2517736607-46.251776151 46.2517736607-25.5441510162 0-46.2517763708-20.7076248477-46.2517763708-46.2517736608 0-25.544148813 20.7076253546-46.2517736608 46.2517763707-46.2517736608 25.5441499178 0 46.251776151 20.7076248478 46.251776151 46.2517736608z"/><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M48.000001 1.6295c-25.616581 0-46.3704139 20.7877-46.3704139 46.38642 0 25.5988 20.7538329 46.3546 46.3704139 46.3546 25.61658 0 46.370412-20.7558 46.370412-46.3546 0-25.59872-20.753832-46.38642-46.370412-46.38642zm0 .25505c25.471716 0 46.130153 20.64876 46.130153 46.13137 0 25.4826-20.658437 46.1314-46.130153 46.1314-25.471718 0-46.1301527-20.6488-46.1301527-46.1314 0-25.48261 20.6584347-46.13137 46.1301527-46.13137z" font-weight="400" color="#000" fill="#585858" overflow="visible" font-family="Sans"/><path d="M47.999985 26.87228c-11.668502 0-21.127701 9.4592-21.127701 21.12774 0 11.6685 9.459199 21.1277 21.127701 21.1277 11.668513 0 21.1277-9.4592 21.1277-21.1277 0-11.66854-9.459187-21.12774-21.1277-21.12774z" fill="#9e9e9e"/><path d="M49.2018811439 47.9999874622c0 .6637873247-.5381060325 1.2018933572-1.2018933572 1.2018933572-.6637876047 0-1.2018936372-.5381060325-1.2018936372-1.2018933572 0-.6637876047.5381060325-1.2018936371 1.2018936372-1.2018936371.6637873247 0 1.2018933572.5381060324 1.2018933572 1.2018936371z"/><path fill="#333" opacity=".5" d="M0 0h96v96H0z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/cover_default_mini.svg b/res/skins/Tango/graphics/cover_default_mini.svg
index 9d83c2b19a4f..a4f867b70209 100644
--- a/res/skins/Tango/graphics/cover_default_mini.svg
+++ b/res/skins/Tango/graphics/cover_default_mini.svg
@@ -1,81 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="200"
-   height="200"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="cover_default_mini.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="-35.817862"
-     inkscape:cy="46.873296"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <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>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-852.36218)">
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;stroke:#585858;stroke-width:0.22671224;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;fill-opacity:1"
-       id="path4919-6"
-       sodipodi:cx="47.414036"
-       sodipodi:cy="48.144024"
-       sodipodi:rx="42.110733"
-       sodipodi:ry="45.330597"
-       d="m 89.524769,48.144024 c 0,25.035397 -18.853618,45.330597 -42.110733,45.330597 -23.257116,0 -42.1107332,-20.2952 -42.1107332,-45.330597 0,-25.035397 18.8536172,-45.330597 42.1107332,-45.330597 23.257115,0 42.110733,20.2952 42.110733,45.330597 z"
-       transform="matrix(2.288202,0,0,2.1256694,-8.4929119,850.02388)" />
-    <path
-       style="fill:#9e9e9e;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       d="m 99.999969,908.3461 c -24.309379,0 -44.016044,19.70667 -44.016044,44.01605 0,24.3094 19.706665,44.01604 44.016044,44.01604 24.309401,0 44.016041,-19.70664 44.016041,-44.01604 0,-24.30938 -19.70664,-44.01605 -44.016041,-44.01605 z"
-       id="path4010" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="path3830-7"
-       sodipodi:cx="48.739861"
-       sodipodi:cy="48.017754"
-       sodipodi:rx="4.2931485"
-       sodipodi:ry="4.2931485"
-       d="m 53.033009,48.017754 c 0,2.37104 -1.922108,4.293148 -4.293148,4.293148 -2.371041,0 -4.293149,-1.922108 -4.293149,-4.293148 0,-2.371041 1.922108,-4.293149 4.293149,-4.293149 2.37104,0 4.293148,1.922108 4.293148,4.293149 z"
-       transform="matrix(0.58324207,0,0,0.58324207,71.572838,924.35618)" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200"><path d="M89.524769 48.144024c0 25.035397-18.853618 45.330597-42.110733 45.330597-23.257116 0-42.1107332-20.2952-42.1107332-45.330597 0-25.035397 18.8536172-45.330597 42.1107332-45.330597 23.257115 0 42.110733 20.2952 42.110733 45.330597z" transform="matrix(2.2882 0 0 2.12567 -8.4929119 -2.3383)" stroke="#585858" stroke-width=".22671224"/><path d="M99.999969 55.98392c-24.309379 0-44.016044 19.70667-44.016044 44.01605 0 24.3094 19.706665 44.01604 44.016044 44.01604 24.309401 0 44.016041-19.70664 44.016041-44.01604 0-24.30938-19.70664-44.01605-44.016041-44.01605z" fill="#9e9e9e"/><path d="M102.5039199475 99.9999742397c0 1.3828902777-1.1210542487 2.5039445263-2.5039445263 2.5039445263-1.382890861 0-2.5039451096-1.1210542486-2.5039451096-2.5039445263 0-1.3828908609 1.1210542487-2.5039451096 2.5039451096-2.5039451096 1.3828902776 0 2.5039445263 1.1210542487 2.5039445263 2.5039451096z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/cover_default_mini_1.svg b/res/skins/Tango/graphics/cover_default_mini_1.svg
index 79dd48646258..688582359d1e 100644
--- a/res/skins/Tango/graphics/cover_default_mini_1.svg
+++ b/res/skins/Tango/graphics/cover_default_mini_1.svg
@@ -1,87 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="200"
-   height="200"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="cover_default_mini_1.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="28.52431"
-     inkscape:cy="22.834161"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-852.36218)">
-    <path
-       style="fill:#001d33;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;enable-background:new"
-       d="m 0,852.36218 0,200.00002 200,0 0,-200.00002 -200,0 z"
-       id="path3377"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;stroke:#585858;stroke-width:0.22671224;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;fill-opacity:1"
-       id="path4919-6"
-       sodipodi:cx="47.414036"
-       sodipodi:cy="48.144024"
-       sodipodi:rx="42.110733"
-       sodipodi:ry="45.330597"
-       d="m 89.524769,48.144024 c 0,25.035397 -18.853618,45.330597 -42.110733,45.330597 -23.257116,0 -42.1107332,-20.2952 -42.1107332,-45.330597 0,-25.035397 18.8536172,-45.330597 42.1107332,-45.330597 23.257115,0 42.110733,20.2952 42.110733,45.330597 z"
-       transform="matrix(2.288202,0,0,2.1256694,-8.4929119,850.02388)" />
-    <path
-       style="fill:#9e9e9e;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       d="m 99.999969,908.3461 c -24.309379,0 -44.016044,19.70667 -44.016044,44.01605 0,24.3094 19.706665,44.01604 44.016044,44.01604 24.309401,0 44.016041,-19.70664 44.016041,-44.01604 0,-24.30938 -19.70664,-44.01605 -44.016041,-44.01605 z"
-       id="path4010" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="path3830-7"
-       sodipodi:cx="48.739861"
-       sodipodi:cy="48.017754"
-       sodipodi:rx="4.2931485"
-       sodipodi:ry="4.2931485"
-       d="m 53.033009,48.017754 c 0,2.37104 -1.922108,4.293148 -4.293148,4.293148 -2.371041,0 -4.293149,-1.922108 -4.293149,-4.293148 0,-2.371041 1.922108,-4.293149 4.293149,-4.293149 2.37104,0 4.293148,1.922108 4.293148,4.293149 z"
-       transform="matrix(0.58324207,0,0,0.58324207,71.572838,924.35618)" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200"><path d="M0 0v200.00002h200V0H0z" fill="#001d33"/><path d="M89.524769 48.144024c0 25.035397-18.853618 45.330597-42.110733 45.330597-23.257116 0-42.1107332-20.2952-42.1107332-45.330597 0-25.035397 18.8536172-45.330597 42.1107332-45.330597 23.257115 0 42.110733 20.2952 42.110733 45.330597z" transform="matrix(2.2882 0 0 2.12567 -8.4929119 -2.3383)" stroke="#585858" stroke-width=".22671224"/><path d="M99.999969 55.98392c-24.309379 0-44.016044 19.70667-44.016044 44.01605 0 24.3094 19.706665 44.01604 44.016044 44.01604 24.309401 0 44.016041-19.70664 44.016041-44.01604 0-24.30938-19.70664-44.01605-44.016041-44.01605z" fill="#9e9e9e"/><path d="M102.5039199475 99.9999742397c0 1.3828902777-1.1210542487 2.5039445263-2.5039445263 2.5039445263-1.382890861 0-2.5039451096-1.1210542486-2.5039451096-2.5039445263 0-1.3828908609 1.1210542487-2.5039451096 2.5039451096-2.5039451096 1.3828902776 0 2.5039445263 1.1210542487 2.5039445263 2.5039451096z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/cover_default_mini_2.svg b/res/skins/Tango/graphics/cover_default_mini_2.svg
index ec37e75db416..688582359d1e 100644
--- a/res/skins/Tango/graphics/cover_default_mini_2.svg
+++ b/res/skins/Tango/graphics/cover_default_mini_2.svg
@@ -1,87 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="200"
-   height="200"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="cover_default_mini_2.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="28.52431"
-     inkscape:cy="22.834161"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-852.36218)">
-    <path
-       style="fill:#001d33;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;enable-background:new"
-       d="m 0,852.36218 0,200.00002 200,0 0,-200.00002 -200,0 z"
-       id="path3377"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;stroke:#585858;stroke-width:0.22671224;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;fill-opacity:1"
-       id="path4919-6"
-       sodipodi:cx="47.414036"
-       sodipodi:cy="48.144024"
-       sodipodi:rx="42.110733"
-       sodipodi:ry="45.330597"
-       d="m 89.524769,48.144024 c 0,25.035397 -18.853618,45.330597 -42.110733,45.330597 -23.257116,0 -42.1107332,-20.2952 -42.1107332,-45.330597 0,-25.035397 18.8536172,-45.330597 42.1107332,-45.330597 23.257115,0 42.110733,20.2952 42.110733,45.330597 z"
-       transform="matrix(2.288202,0,0,2.1256694,-8.4929119,850.02388)" />
-    <path
-       style="fill:#9e9e9e;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       d="m 99.999969,908.3461 c -24.309379,0 -44.016044,19.70667 -44.016044,44.01605 0,24.3094 19.706665,44.01604 44.016044,44.01604 24.309401,0 44.016041,-19.70664 44.016041,-44.01604 0,-24.30938 -19.70664,-44.01605 -44.016041,-44.01605 z"
-       id="path4010" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="path3830-7"
-       sodipodi:cx="48.739861"
-       sodipodi:cy="48.017754"
-       sodipodi:rx="4.2931485"
-       sodipodi:ry="4.2931485"
-       d="m 53.033009,48.017754 c 0,2.37104 -1.922108,4.293148 -4.293148,4.293148 -2.371041,0 -4.293149,-1.922108 -4.293149,-4.293148 0,-2.371041 1.922108,-4.293149 4.293149,-4.293149 2.37104,0 4.293148,1.922108 4.293148,4.293149 z"
-       transform="matrix(0.58324207,0,0,0.58324207,71.572838,924.35618)" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200"><path d="M0 0v200.00002h200V0H0z" fill="#001d33"/><path d="M89.524769 48.144024c0 25.035397-18.853618 45.330597-42.110733 45.330597-23.257116 0-42.1107332-20.2952-42.1107332-45.330597 0-25.035397 18.8536172-45.330597 42.1107332-45.330597 23.257115 0 42.110733 20.2952 42.110733 45.330597z" transform="matrix(2.2882 0 0 2.12567 -8.4929119 -2.3383)" stroke="#585858" stroke-width=".22671224"/><path d="M99.999969 55.98392c-24.309379 0-44.016044 19.70667-44.016044 44.01605 0 24.3094 19.706665 44.01604 44.016044 44.01604 24.309401 0 44.016041-19.70664 44.016041-44.01604 0-24.30938-19.70664-44.01605-44.016041-44.01605z" fill="#9e9e9e"/><path d="M102.5039199475 99.9999742397c0 1.3828902777-1.1210542487 2.5039445263-2.5039445263 2.5039445263-1.382890861 0-2.5039451096-1.1210542486-2.5039451096-2.5039445263 0-1.3828908609 1.1210542487-2.5039451096 2.5039451096-2.5039451096 1.3828902776 0 2.5039445263 1.1210542487 2.5039445263 2.5039451096z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/cover_default_mini_3.svg b/res/skins/Tango/graphics/cover_default_mini_3.svg
index 54b8e2754a35..47c1a8fc3996 100644
--- a/res/skins/Tango/graphics/cover_default_mini_3.svg
+++ b/res/skins/Tango/graphics/cover_default_mini_3.svg
@@ -1,87 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="200"
-   height="200"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="cover_default_mini_3.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="13.288992"
-     inkscape:cy="9.4476514"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-852.36218)">
-    <path
-       style="fill:#3a0440;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;enable-background:new"
-       d="m 0,852.36218 0,200.00002 200,0 0,-200.00002 -200,0 z"
-       id="path3189"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;stroke:#585858;stroke-width:0.22671224;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;fill-opacity:1"
-       id="path4919-6"
-       sodipodi:cx="47.414036"
-       sodipodi:cy="48.144024"
-       sodipodi:rx="42.110733"
-       sodipodi:ry="45.330597"
-       d="m 89.524769,48.144024 c 0,25.035397 -18.853618,45.330597 -42.110733,45.330597 -23.257116,0 -42.1107332,-20.2952 -42.1107332,-45.330597 0,-25.035397 18.8536172,-45.330597 42.1107332,-45.330597 23.257115,0 42.110733,20.2952 42.110733,45.330597 z"
-       transform="matrix(2.288202,0,0,2.1256694,-8.4929119,850.02388)" />
-    <path
-       style="fill:#9e9e9e;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       d="m 99.999969,908.3461 c -24.309379,0 -44.016044,19.70667 -44.016044,44.01605 0,24.3094 19.706665,44.01604 44.016044,44.01604 24.309401,0 44.016041,-19.70664 44.016041,-44.01604 0,-24.30938 -19.70664,-44.01605 -44.016041,-44.01605 z"
-       id="path4010" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="path3830-7"
-       sodipodi:cx="48.739861"
-       sodipodi:cy="48.017754"
-       sodipodi:rx="4.2931485"
-       sodipodi:ry="4.2931485"
-       d="m 53.033009,48.017754 c 0,2.37104 -1.922108,4.293148 -4.293148,4.293148 -2.371041,0 -4.293149,-1.922108 -4.293149,-4.293148 0,-2.371041 1.922108,-4.293149 4.293149,-4.293149 2.37104,0 4.293148,1.922108 4.293148,4.293149 z"
-       transform="matrix(0.58324207,0,0,0.58324207,71.572838,924.35618)" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200"><path d="M0 0v200.00002h200V0H0z" fill="#3a0440"/><path d="M89.524769 48.144024c0 25.035397-18.853618 45.330597-42.110733 45.330597-23.257116 0-42.1107332-20.2952-42.1107332-45.330597 0-25.035397 18.8536172-45.330597 42.1107332-45.330597 23.257115 0 42.110733 20.2952 42.110733 45.330597z" transform="matrix(2.2882 0 0 2.12567 -8.4929119 -2.3383)" stroke="#585858" stroke-width=".22671224"/><path d="M99.999969 55.98392c-24.309379 0-44.016044 19.70667-44.016044 44.01605 0 24.3094 19.706665 44.01604 44.016044 44.01604 24.309401 0 44.016041-19.70664 44.016041-44.01604 0-24.30938-19.70664-44.01605-44.016041-44.01605z" fill="#9e9e9e"/><path d="M102.5039199475 99.9999742397c0 1.3828902777-1.1210542487 2.5039445263-2.5039445263 2.5039445263-1.382890861 0-2.5039451096-1.1210542486-2.5039451096-2.5039445263 0-1.3828908609 1.1210542487-2.5039451096 2.5039451096-2.5039451096 1.3828902776 0 2.5039445263 1.1210542487 2.5039445263 2.5039451096z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/cover_default_mini_4.svg b/res/skins/Tango/graphics/cover_default_mini_4.svg
index 736ac511399a..47c1a8fc3996 100644
--- a/res/skins/Tango/graphics/cover_default_mini_4.svg
+++ b/res/skins/Tango/graphics/cover_default_mini_4.svg
@@ -1,87 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="200"
-   height="200"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="cover_default_mini_4.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="13.288992"
-     inkscape:cy="9.4476514"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-852.36218)">
-    <path
-       style="fill:#3a0440;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;enable-background:new"
-       d="m 0,852.36218 0,200.00002 200,0 0,-200.00002 -200,0 z"
-       id="path3189"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;stroke:#585858;stroke-width:0.22671224;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;fill-opacity:1"
-       id="path4919-6"
-       sodipodi:cx="47.414036"
-       sodipodi:cy="48.144024"
-       sodipodi:rx="42.110733"
-       sodipodi:ry="45.330597"
-       d="m 89.524769,48.144024 c 0,25.035397 -18.853618,45.330597 -42.110733,45.330597 -23.257116,0 -42.1107332,-20.2952 -42.1107332,-45.330597 0,-25.035397 18.8536172,-45.330597 42.1107332,-45.330597 23.257115,0 42.110733,20.2952 42.110733,45.330597 z"
-       transform="matrix(2.288202,0,0,2.1256694,-8.4929119,850.02388)" />
-    <path
-       style="fill:#9e9e9e;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       d="m 99.999969,908.3461 c -24.309379,0 -44.016044,19.70667 -44.016044,44.01605 0,24.3094 19.706665,44.01604 44.016044,44.01604 24.309401,0 44.016041,-19.70664 44.016041,-44.01604 0,-24.30938 -19.70664,-44.01605 -44.016041,-44.01605 z"
-       id="path4010" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="path3830-7"
-       sodipodi:cx="48.739861"
-       sodipodi:cy="48.017754"
-       sodipodi:rx="4.2931485"
-       sodipodi:ry="4.2931485"
-       d="m 53.033009,48.017754 c 0,2.37104 -1.922108,4.293148 -4.293148,4.293148 -2.371041,0 -4.293149,-1.922108 -4.293149,-4.293148 0,-2.371041 1.922108,-4.293149 4.293149,-4.293149 2.37104,0 4.293148,1.922108 4.293148,4.293149 z"
-       transform="matrix(0.58324207,0,0,0.58324207,71.572838,924.35618)" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200"><path d="M0 0v200.00002h200V0H0z" fill="#3a0440"/><path d="M89.524769 48.144024c0 25.035397-18.853618 45.330597-42.110733 45.330597-23.257116 0-42.1107332-20.2952-42.1107332-45.330597 0-25.035397 18.8536172-45.330597 42.1107332-45.330597 23.257115 0 42.110733 20.2952 42.110733 45.330597z" transform="matrix(2.2882 0 0 2.12567 -8.4929119 -2.3383)" stroke="#585858" stroke-width=".22671224"/><path d="M99.999969 55.98392c-24.309379 0-44.016044 19.70667-44.016044 44.01605 0 24.3094 19.706665 44.01604 44.016044 44.01604 24.309401 0 44.016041-19.70664 44.016041-44.01604 0-24.30938-19.70664-44.01605-44.016041-44.01605z" fill="#9e9e9e"/><path d="M102.5039199475 99.9999742397c0 1.3828902777-1.1210542487 2.5039445263-2.5039445263 2.5039445263-1.382890861 0-2.5039451096-1.1210542486-2.5039451096-2.5039445263 0-1.3828908609 1.1210542487-2.5039451096 2.5039451096-2.5039451096 1.3828902776 0 2.5039445263 1.1210542487 2.5039445263 2.5039451096z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/fxChainFlow_h_unfocused1.svg b/res/skins/Tango/graphics/fxChainFlow_h_unfocused1.svg
new file mode 100644
index 000000000000..9e54cfb27bfd
--- /dev/null
+++ b/res/skins/Tango/graphics/fxChainFlow_h_unfocused1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30"><path d="M0 0v30h20.10506L29.5 15 20.10506 0z" fill="#333"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/fxChainFlow_h_unfocused2.svg b/res/skins/Tango/graphics/fxChainFlow_h_unfocused2.svg
new file mode 100644
index 000000000000..103b36a088b6
--- /dev/null
+++ b/res/skins/Tango/graphics/fxChainFlow_h_unfocused2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30"><path d="M.5 0L10 14.9999.5 30h19.60506L29.5 15 20.10506 0z" fill="#333"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/fxChainFlow_h_unfocused3.svg b/res/skins/Tango/graphics/fxChainFlow_h_unfocused3.svg
new file mode 100644
index 000000000000..1e1d77950a1a
--- /dev/null
+++ b/res/skins/Tango/graphics/fxChainFlow_h_unfocused3.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30"><path d="M.5 0H30v30H.5L10 14.9999z" fill="#333"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/fxChainFlow_v_noFocus1.svg b/res/skins/Tango/graphics/fxChainFlow_v_noFocus1.svg
new file mode 100644
index 000000000000..0fd37f30f6b5
--- /dev/null
+++ b/res/skins/Tango/graphics/fxChainFlow_v_noFocus1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="150" height="53"><path d="M150 0L0 .0001v45.0001L55 45l15 8 15-8 65 .0001z" fill="#333"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/fxChainFlow_v_noFocus2.svg b/res/skins/Tango/graphics/fxChainFlow_v_noFocus2.svg
new file mode 100644
index 000000000000..b619605b0551
--- /dev/null
+++ b/res/skins/Tango/graphics/fxChainFlow_v_noFocus2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="150" height="53"><path d="M150 0L85 .00003 70 8.0001 55 .00003 0 .0001v45.0001L55 45l15 8 15-8 65 .0001z" fill="#333"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/fxChainFlow_v_noFocus3.svg b/res/skins/Tango/graphics/fxChainFlow_v_noFocus3.svg
new file mode 100644
index 000000000000..fe04f853123a
--- /dev/null
+++ b/res/skins/Tango/graphics/fxChainFlow_v_noFocus3.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="150" height="45"><path d="M150 0H85L70 8 55 0H0v45.0001h150z" fill="#333"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/fxChainFlow_v_unfocused1.svg b/res/skins/Tango/graphics/fxChainFlow_v_unfocused1.svg
new file mode 100644
index 000000000000..e4a4ba5b0956
--- /dev/null
+++ b/res/skins/Tango/graphics/fxChainFlow_v_unfocused1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="182" height="53"><path d="M182 0H0v45.0001L71 45l15 8 15-8 81 .0001z" fill="#333"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/fxChainFlow_v_unfocused2.svg b/res/skins/Tango/graphics/fxChainFlow_v_unfocused2.svg
new file mode 100644
index 000000000000..7e99d1106e31
--- /dev/null
+++ b/res/skins/Tango/graphics/fxChainFlow_v_unfocused2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="182" height="53"><path d="M182 0h-81L86 8 71 0H0v45.1051l71-.0001L86 53l15-7.8946 81-.0002z" fill="#333"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/fxChainFlow_v_unfocused3.svg b/res/skins/Tango/graphics/fxChainFlow_v_unfocused3.svg
new file mode 100644
index 000000000000..505bf23c727c
--- /dev/null
+++ b/res/skins/Tango/graphics/fxChainFlow_v_unfocused3.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="182" height="45"><path d="M182 0h-81L86 8 71 0H0v45.1051l182 .0001z" fill="#333"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/latency_usage.png b/res/skins/Tango/graphics/latency_usage.png
new file mode 100644
index 000000000000..e7c414d90903
Binary files /dev/null and b/res/skins/Tango/graphics/latency_usage.png differ
diff --git a/res/skins/Tango/graphics/latency_usage_over.png b/res/skins/Tango/graphics/latency_usage_over.png
new file mode 100644
index 000000000000..ffb302e559cc
Binary files /dev/null and b/res/skins/Tango/graphics/latency_usage_over.png differ
diff --git a/res/skins/Tango/graphics/mixerbar_vumeter.png b/res/skins/Tango/graphics/mixerbar_vumeter.png
new file mode 100644
index 000000000000..961c1117ec35
Binary files /dev/null and b/res/skins/Tango/graphics/mixerbar_vumeter.png differ
diff --git a/res/skins/Tango/graphics/mixerbar_vumeter_clipping.png b/res/skins/Tango/graphics/mixerbar_vumeter_clipping.png
new file mode 100644
index 000000000000..b60c3eaba55f
Binary files /dev/null and b/res/skins/Tango/graphics/mixerbar_vumeter_clipping.png differ
diff --git a/res/skins/Tango/graphics/mixerbar_vumeter_clipping_over.png b/res/skins/Tango/graphics/mixerbar_vumeter_clipping_over.png
new file mode 100644
index 000000000000..12d266662161
Binary files /dev/null and b/res/skins/Tango/graphics/mixerbar_vumeter_clipping_over.png differ
diff --git a/res/skins/Tango/graphics/mixerbar_vumeter_over.png b/res/skins/Tango/graphics/mixerbar_vumeter_over.png
new file mode 100644
index 000000000000..f3024345513d
Binary files /dev/null and b/res/skins/Tango/graphics/mixerbar_vumeter_over.png differ
diff --git a/res/skins/Tango/graphics/passthrough_play_cover.svg b/res/skins/Tango/graphics/passthrough_play_cover.svg
new file mode 100644
index 000000000000..40efba6d8e90
--- /dev/null
+++ b/res/skins/Tango/graphics/passthrough_play_cover.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M19.948972 11.2006c1.237577 1.2261 2.003653 2.9237 2.003653 4.7995 0 1.8757-.766076 3.5733-2.003653 4.7994M22.842602 8.3017c1.98543 1.9664 3.214491 4.6894 3.214491 7.6983 0 3.009-1.229061 5.732-3.214491 7.6984" fill="none" stroke="#000" stroke-width="2" stroke-linecap="round"/><g transform="matrix(.7253 0 0 .7223 .3695103 -731.06306)"><path d="M21.177616 1022.034l-8.173954 8.1739v8.174l8.173954 8.174h1.021744v-24.5219h-1.021744z"/><rect ry="1.3844813" rx="1.3787388" y="1030.2079" x="7.624095" height="8.1739349" width="4.3036532"/></g></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/spinnyMini_1_mask.svg b/res/skins/Tango/graphics/spinnyMini_1_mask.svg
index 5c816f0898c1..2f5a5ce5b390 100644
--- a/res/skins/Tango/graphics/spinnyMini_1_mask.svg
+++ b/res/skins/Tango/graphics/spinnyMini_1_mask.svg
@@ -1,169 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="50"
-   height="50"
-   id="svg2"
-   style="enable-background:new"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="spinnyMini_1_mask.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview24"
-     showgrid="false"
-     inkscape:zoom="4.9166667"
-     inkscape:cx="42.025436"
-     inkscape:cy="22.498101"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer7"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-page="true" />
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3861">
-      <stop
-         id="stop3863"
-         style="stop-color:#eece33;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3865"
-         style="stop-color:#eece33;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3851">
-      <stop
-         id="stop3853"
-         style="stop-color:#eece33;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3855"
-         style="stop-color:#eece33;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3851-7">
-      <stop
-         id="stop3853-0"
-         offset="0"
-         style="stop-color:#eece33;stop-opacity:1;" />
-      <stop
-         id="stop3855-9"
-         offset="1"
-         style="stop-color:#eece33;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3861-9">
-      <stop
-         id="stop3863-1"
-         offset="0"
-         style="stop-color:#eece33;stop-opacity:1;" />
-      <stop
-         id="stop3865-2"
-         offset="1"
-         style="stop-color:#eece33;stop-opacity:0;" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer6"
-     style="display:none"
-     transform="translate(0,-46)">
-    <rect
-       width="96"
-       height="96"
-       x="-4.2632564e-14"
-       y="-2.7171737e-15"
-       id="rect3003"
-       style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-  </g>
-  <g
-     id="g4080"
-     style="display:none"
-     transform="translate(0,-46)">
-    <path
-       d="m 71.071428,46.267857 a 17.946428,11.875 0 1 1 -35.892856,0 17.946428,11.875 0 1 1 35.892856,0 z"
-       transform="matrix(1.1144279,0,0,1.6842105,-11.203982,-29.92481)"
-       id="path4082"
-       style="fill:#bf880f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 53.033009,48.017754 a 4.2931485,4.2931485 0 1 1 -8.586297,0 4.2931485,4.2931485 0 1 1 8.586297,0 z"
-       transform="matrix(0.93171713,0,0,0.93171713,2.588237,3.2610364)"
-       id="path4084"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="layer3"
-     style="opacity:0.95999995;display:none"
-     transform="translate(0,-46)">
-    <path
-       d="M 46,3.7264493 C 45.96903,2.8335721 46.545072,1.949526 47.936937,1.9914377 49.328802,2.0333497 49.963562,2.675413 49.984216,3.742233 L 50,28.157989 c 0,0.681626 -1.287693,1.112807 -2.049321,1.104854 C 47.18905,29.254891 46.015784,28.805118 46,28.157989 z"
-       id="rect3776"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Mask1"
-     style="display:inline"
-     transform="translate(0,-46)">
-    <g
-       style="enable-background:new"
-       id="layer7">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 0,46 0,50 50,0 0,-50 -50,0 z m 24.999999,1.041667 c 13.231823,0 23.958334,10.726511 23.958334,23.958334 0,13.231821 -10.726511,23.958332 -23.958334,23.958332 -13.231821,0 -23.9583323,-10.726511 -23.9583323,-23.958332 0,-13.231823 10.7265113,-23.958334 23.9583323,-23.958334 z"
-         id="rect3842-3"
-         style="fill:#001d33;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 48.958333,70.999999 a 23.958334,23.958333 0 0 1 -47.9166663,0 23.958334,23.958333 0 1 1 47.9166663,0 z"
-         id="path4919-6"
-         style="fill:none;stroke:#585858;stroke-width:0.52083331;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50"><path d="M0 0v50h50V0H0zm24.999999 1.041667c13.231823 0 23.958334 10.726511 23.958334 23.958334 0 13.231821-10.726511 23.958332-23.958334 23.958332-13.231821 0-23.9583323-10.726511-23.9583323-23.958332 0-13.231823 10.7265113-23.958334 23.9583323-23.958334z" fill="#001d33"/><path d="M48.958333 24.999999a23.958334 23.958333 0 0 1-47.9166663 0 23.958334 23.958333 0 1 1 47.9166663 0z" fill="none" stroke="#585858" stroke-width=".52083331"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/spinnyMini_2_mask.svg b/res/skins/Tango/graphics/spinnyMini_2_mask.svg
index 339ad1f38d4f..2f5a5ce5b390 100644
--- a/res/skins/Tango/graphics/spinnyMini_2_mask.svg
+++ b/res/skins/Tango/graphics/spinnyMini_2_mask.svg
@@ -1,169 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="50"
-   height="50"
-   id="svg2"
-   style="enable-background:new"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="spinnyMini_2_mask.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview24"
-     showgrid="false"
-     inkscape:zoom="4.9166667"
-     inkscape:cx="42.025436"
-     inkscape:cy="22.498101"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer7"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-page="true" />
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3861">
-      <stop
-         id="stop3863"
-         style="stop-color:#eece33;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3865"
-         style="stop-color:#eece33;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3851">
-      <stop
-         id="stop3853"
-         style="stop-color:#eece33;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3855"
-         style="stop-color:#eece33;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3851-7">
-      <stop
-         id="stop3853-0"
-         offset="0"
-         style="stop-color:#eece33;stop-opacity:1;" />
-      <stop
-         id="stop3855-9"
-         offset="1"
-         style="stop-color:#eece33;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3861-9">
-      <stop
-         id="stop3863-1"
-         offset="0"
-         style="stop-color:#eece33;stop-opacity:1;" />
-      <stop
-         id="stop3865-2"
-         offset="1"
-         style="stop-color:#eece33;stop-opacity:0;" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer6"
-     style="display:none"
-     transform="translate(0,-46)">
-    <rect
-       width="96"
-       height="96"
-       x="-4.2632564e-14"
-       y="-2.7171737e-15"
-       id="rect3003"
-       style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-  </g>
-  <g
-     id="g4080"
-     style="display:none"
-     transform="translate(0,-46)">
-    <path
-       d="m 71.071428,46.267857 a 17.946428,11.875 0 1 1 -35.892856,0 17.946428,11.875 0 1 1 35.892856,0 z"
-       transform="matrix(1.1144279,0,0,1.6842105,-11.203982,-29.92481)"
-       id="path4082"
-       style="fill:#bf880f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 53.033009,48.017754 a 4.2931485,4.2931485 0 1 1 -8.586297,0 4.2931485,4.2931485 0 1 1 8.586297,0 z"
-       transform="matrix(0.93171713,0,0,0.93171713,2.588237,3.2610364)"
-       id="path4084"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="layer3"
-     style="opacity:0.95999995;display:none"
-     transform="translate(0,-46)">
-    <path
-       d="M 46,3.7264493 C 45.96903,2.8335721 46.545072,1.949526 47.936937,1.9914377 49.328802,2.0333497 49.963562,2.675413 49.984216,3.742233 L 50,28.157989 c 0,0.681626 -1.287693,1.112807 -2.049321,1.104854 C 47.18905,29.254891 46.015784,28.805118 46,28.157989 z"
-       id="rect3776"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Mask1"
-     style="display:inline"
-     transform="translate(0,-46)">
-    <g
-       style="enable-background:new"
-       id="layer7">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 0,46 0,50 50,0 0,-50 -50,0 z m 24.999999,1.041667 c 13.231823,0 23.958334,10.726511 23.958334,23.958334 0,13.231821 -10.726511,23.958332 -23.958334,23.958332 -13.231821,0 -23.9583323,-10.726511 -23.9583323,-23.958332 0,-13.231823 10.7265113,-23.958334 23.9583323,-23.958334 z"
-         id="rect3842-3"
-         style="fill:#001d33;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 48.958333,70.999999 a 23.958334,23.958333 0 0 1 -47.9166663,0 23.958334,23.958333 0 1 1 47.9166663,0 z"
-         id="path4919-6"
-         style="fill:none;stroke:#585858;stroke-width:0.52083331;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50"><path d="M0 0v50h50V0H0zm24.999999 1.041667c13.231823 0 23.958334 10.726511 23.958334 23.958334 0 13.231821-10.726511 23.958332-23.958334 23.958332-13.231821 0-23.9583323-10.726511-23.9583323-23.958332 0-13.231823 10.7265113-23.958334 23.9583323-23.958334z" fill="#001d33"/><path d="M48.958333 24.999999a23.958334 23.958333 0 0 1-47.9166663 0 23.958334 23.958333 0 1 1 47.9166663 0z" fill="none" stroke="#585858" stroke-width=".52083331"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/spinnyMini_3_mask.svg b/res/skins/Tango/graphics/spinnyMini_3_mask.svg
index c0c90a55b21c..bb3e6a4d7cd3 100644
--- a/res/skins/Tango/graphics/spinnyMini_3_mask.svg
+++ b/res/skins/Tango/graphics/spinnyMini_3_mask.svg
@@ -1,68 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="50"
-   height="50"
-   id="svg2"
-   style="enable-background:new"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="spinnyMini_3_mask.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview3094"
-     showgrid="false"
-     inkscape:zoom="4.9166666"
-     inkscape:cx="5.1256417"
-     inkscape:cy="33.313556"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3919"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="g3919"
-     style="display:inline"
-     transform="translate(0,-46)">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#3a0440;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;enable-background:new"
-       id="path3923"
-       d="m 0,46 0,50 50,0 0,-50 -50,0 z m 25,1.041666 C 38.231823,47.041666 48.958334,57.768178 48.958334,71 48.958334,84.231823 38.231823,94.958334 25,94.958334 11.768178,94.958334 1.0416667,84.231823 1.0416667,71 1.0416667,57.768178 11.768178,47.041666 25,47.041666 z" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#585858;stroke-width:0.52083331;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
-       id="path3925"
-       d="m 48.958334,70.999999 a 23.958334,23.958332 0 0 1 -47.9166673,0 23.958334,23.958332 0 1 1 47.9166673,0 z" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50"><path d="M0 0v50h50V0H0zm25 1.041666c13.231823 0 23.958334 10.726512 23.958334 23.958334 0 13.231823-10.726511 23.958334-23.958334 23.958334C11.768178 48.958334 1.0416667 38.231823 1.0416667 25 1.0416667 11.768178 11.768178 1.041666 25 1.041666z" fill="#3a0440"/><path d="M48.958334 24.999999a23.958334 23.958332 0 0 1-47.9166673 0 23.958334 23.958332 0 1 1 47.9166673 0z" fill="none" stroke="#585858" stroke-width=".52083331"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/spinnyMini_4_mask.svg b/res/skins/Tango/graphics/spinnyMini_4_mask.svg
index 168cc6ba5a2d..bb3e6a4d7cd3 100644
--- a/res/skins/Tango/graphics/spinnyMini_4_mask.svg
+++ b/res/skins/Tango/graphics/spinnyMini_4_mask.svg
@@ -1,68 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="50"
-   height="50"
-   id="svg2"
-   style="enable-background:new"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="spinnyMini_4_mask.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview3094"
-     showgrid="false"
-     inkscape:zoom="4.9166666"
-     inkscape:cx="5.1256417"
-     inkscape:cy="33.313556"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3919"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="g3919"
-     style="display:inline"
-     transform="translate(0,-46)">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#3a0440;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;enable-background:new"
-       id="path3923"
-       d="m 0,46 0,50 50,0 0,-50 -50,0 z m 25,1.041666 C 38.231823,47.041666 48.958334,57.768178 48.958334,71 48.958334,84.231823 38.231823,94.958334 25,94.958334 11.768178,94.958334 1.0416667,84.231823 1.0416667,71 1.0416667,57.768178 11.768178,47.041666 25,47.041666 z" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#585858;stroke-width:0.52083331;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
-       id="path3925"
-       d="m 48.958334,70.999999 a 23.958334,23.958332 0 0 1 -47.9166673,0 23.958334,23.958332 0 1 1 47.9166673,0 z" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50"><path d="M0 0v50h50V0H0zm25 1.041666c13.231823 0 23.958334 10.726512 23.958334 23.958334 0 13.231823-10.726511 23.958334-23.958334 23.958334C11.768178 48.958334 1.0416667 38.231823 1.0416667 25 1.0416667 11.768178 11.768178 1.041666 25 1.041666z" fill="#3a0440"/><path d="M48.958334 24.999999a23.958334 23.958332 0 0 1-47.9166673 0 23.958334 23.958332 0 1 1 47.9166673 0z" fill="none" stroke="#585858" stroke-width=".52083331"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/spinnyMini_bg.svg b/res/skins/Tango/graphics/spinnyMini_bg.svg
index f52d74d0c4c7..055c4d58e881 100644
--- a/res/skins/Tango/graphics/spinnyMini_bg.svg
+++ b/res/skins/Tango/graphics/spinnyMini_bg.svg
@@ -1,177 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="96"
-   height="96"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="spinny_bg.svg"
-   enable-background="new">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3861">
-      <stop
-         style="stop-color:#eece33;stop-opacity:1;"
-         offset="0"
-         id="stop3863" />
-      <stop
-         style="stop-color:#eece33;stop-opacity:0;"
-         offset="1"
-         id="stop3865" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3851">
-      <stop
-         style="stop-color:#eece33;stop-opacity:1;"
-         offset="0"
-         id="stop3853" />
-      <stop
-         style="stop-color:#eece33;stop-opacity:0;"
-         offset="1"
-         id="stop3855" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3851"
-       id="linearGradient3857"
-       x1="48.010761"
-       y1="0.07037171"
-       x2="47.827461"
-       y2="24.407314"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="radialGradient3867"
-       cx="50.002552"
-       cy="45.492374"
-       fx="50.002552"
-       fy="45.492374"
-       r="20.076782"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="-60.78678"
-     inkscape:cy="48.310421"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer4"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="orig"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-956.36218)"
-     style="display:none"
-     sodipodi:insensitive="true">
-    <image
-       y="956.36218"
-       x="0"
-       id="image3047"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAABHNCSVQICAgIfAhkiAAAEgNJREFU eJztXWtsJNlVPufcW492+1kzHvc87PHMet32vlhWSCFEQoIfKFJW2gRBNmJBsBIICEgILUH5FfiD EMkGFEWJIIEIxEMRrIL4xz8IBIlNFIlAdtc9GdiJN+Px2Ov2zNjdXY97z+FHVfW07W6/xu7yzviT Wl2PW7duna/Oueeee6oKR0ZGBE5RGKjoBjzq0EU3YC8MTV+5MTlQmhYRKwgAAILY/b4RYQAAxFSn UUSg9v3vN6TVGupTcw8MPEkmyDkT3Jw5N1ER3C5kgfUnnvrHZHjw7vZj4iBYd+v1sR113dscGXvz jY+0axAGFEARwYWFBQQAPJ6rOBgKJ8CfnKpND5VnEKndjvXq7NeSoaEtwo7GxtYPWre3vr6FGGdj Y2Ssdu2nAQBEGIGLJ6MQArDk35ubvlIGwva567OzryUD6R0eBaMHFvZ+4dXvjAEAOM3NkeDatZ8B AAAWFBHKyOgr+kqAHgtuzpyfqGBmpeszM/8QDwykQh8ZqbcbpRQAAIi17eVO5Ns7/zvReUxnHdvL +ffuBSICbrM5Ely//rMigsD9JaIvBNBgebU6ORXkd3z96tW/jwcG7oTDw12Fnq/3EnAn9kNAr/Kd 5/DW1wOn0Rg98/bbH+2nRhwrAejoaG7mcZ0Lfm1q+qtJuXwnHBmq73VsUfDvbqRELN74WD+IODYC 5ufnLSIyAMC7U5Nfze74teM413HAv3fvjNtsjp5dfOdjIkLMrGq12pGf5+gJQErm56qIiPLupYt/ F/kDd8Kh8ntG8NvhbzTOeGFz9Mw7P3hJRNRRa8OREqCHhxdnL106DwCwWjn/t3fPnPnfo6q7aIys rT02vnzrJWZWCwsLRxZBODICOk3O6rmJv7lzZuz6UdR7kjC6tj4zvnL754/SJB0JAbnwV8fH/zpy 9HpzYODd9gn28GI6y3RzFx/EG+q1fbub26ve7edGpaC02TzrRq2x8dV3f/EoSHhgAnLhrwTBX90Z HfneA7XmPYTRO3cfH19be/lBSXggAubn5w0iysro6F+uDw1eO3Qr3qMY29icHV9ff5mZ9WFJODQB 7Tt/eOgr9YGBR074OYJmc3b87r1fPqwmHIqAXPi3ywN/Uff9o3eO32MIwrB6brPxK4ch4cAEtIXv eV9e89xHXvg5zkRx9VwY/upBSTjQhIwqld5GxEvLWn95TasFSJL7O4kAmLce0Llt+37KXOnO/fl6 XrbbMb3272d5r/Vu19CrvduOf1erBfHcPzsXRr8GB5hp3DcBAhhXr1y5BAAQgqxKkmxtSTdXrnPb 9v27refLvcp027+f5f2etxt67etoS8i8SkR2bm4O9zti3rcJmp+fNwAgtxH+dJXhrf0c8yhinGB+ QuDX9+sZ7YuAubk5i4i8bPmLK9acCn8PnFN6foLwN0Vkz/5gbxOE1EJEvRzHX7idxG8eVSMfZtxO 4jfAcT9/Tuvfgj2mO/ckYK466wAAN6N4VZK4Rw91iu1oMqyi49hqtbqrKdqVAFS0hIhnb21sfP5u GC6LtYJKYef/1vIKAQC278+3dyIvky93P3/3OnqV73Z8r/b02rafOndrb36+u9YuLxN8bqI08Nuw i1e0KwHVx2fPAQA342iVw5ABACRJpPO/E53bei33Kr/X/r3KHuT4btew3/p3K7e9vibhKg6UuVqt Ui8t6EkAaXUdEaeW6vXPra/fubWfxp1iK9aj6NYtpD+pjI6+Aj20oCcBszOPTwMANxqNFW6Fp7b/ kGg0Gis4NtZTC3oRsIaIQzdv3frj+srK0vE28eFGfWVlaUnrV89PTPwudNGCrgTMzc2NAAA3NjZW DmN7T7EVjY2NFaxUumpBV7uEiHzz5s3P1uv15b608CFHvV5fXlpa+kyekNaJHRqgtX4dAH640Wis 9qV1BwEhoucTOg4iIqYBsuyaWEBERJJEJAoZWE6U5jYajVVJ07e3pPrtIGBmZuY5aF/VyQB6HpHv K/Q8QkWIjktAtHV8YVmELUgSs9ghkShijmOWVmv3Cek+AhG5Wq1uCU/sIAAR5cSYH61RlcsaSyUi 11XouYSOQ6gUIhKC0ggIAMypX2+tSJywsBGJYsY4tuw4yM2mBWMKvakyM/TqhQsXPgkd4YktBBDR NQCYPgnmhwbLigbKmnxfke8Teq5CnRHgagLYNjpmEBALEhsWk7D4CVMUEbuuYtcxHIaWNxuFakM3 M7SFgNnZ2asAULjPT4NlpYaGHBooK/J9hSVfo+MQuS6h4ygkjaAQgei+CUqsiIiAb0WSxEpimB2H 0HEsOg6CbiCQQr53zxR4aYCIUq1WITdD201Q4eaHhoe1Kg9oGhzUqjSg0S8pKnmKXFeB1oTaVagJ gYgAFSAiAmb3lU0YrIgkiRITW3Q0sXYIlSKgtCSwlaI0oV6vLy8uLn5pcnLy4/m2LQQgohRpfmiw rHLhU6msabCsyfcUep5G7SoqeQqVItCaMi8of7pFgFnEuCJsGI1miR0CVAREyADY6XqIZSiqc46i 6HrmjiLASXpIT2sk31e52SHf1+R7GkslTa6ryPc1aJ1qAhGiUgSCqSkCADHMKJaBmTmOGR1DoBAx IkREZK1AWARYRFkWkyRcVMcsIjsJyP3/IhoEAKDKZd3udEtlrQYHFHkljb6vyfc1Oo7OzJBCx6Hs 7ifE+/2wWMuSJKyUshzHRETIRPnjfiLGCgiLJInQwIAqsD9oE98mYGZm5kcAoBC1xFJJke9T9tNU ysyO76b/nqfJdTV6nkalFJImcBShCAIRpjcUMBhmIGJQKjdRQADAzIKGhUpWwBqRJGFVKimJIpYo 6rvTgYiQd8RbngUtqgMm1yX0PIWeq9D1Up9fp2aHXPe+8B1Ho+c56Lsuua6LpZKLnueQ6zqkHJc8 x1We56DntbUGHUeTV9LopR05el7q0nqeIt/f+QDaMaNery/fuHHjtXy9sw8opgMmRHQ0poOszM93 HIWuVug4udDuC1M52pt7fMa9cOFJ8v1hEQGJonvx0tJb0ds3/k9Sk4MiguC6IAzCxjC6msG4jDqx qF1CzyX0PAJC7HfYotVqLebLhXfCWWyHkDSidgg1EWqXyPEIHSe1+UrlZDjl9//oTzjj43MAACgC IgLoeUN6ePiiMz5+ffOb3/oXYABBZBRRwMxgXUvWEieWMmItKo2oCNHzqd8eERE18uU2Ad0idf0A Og6i42J7hKscAoUITupCIqXbUCldevKJZ9yzZ+fs5ibc/sIXYfM/XwcAgMEfez9M/MbHQZ89O1Oa n1tpvbXwXYxYRGsGawmVIlEOgQoRSSO6mtDRhI6LqKjvgS9EjPLl4jUg8+dRq3SkpFMXM9tOqAlR EyEQuRcuPCki8INP/R5sfP3f2nXUFxfBrKzA1Kf/CJzz5+fDa997E5RKB2CI7fpQqdQ1RQRAhQCA qDRBn50PRGzndBb/thRCQEAApHRglf4g8/VTEkSQyiUXPW+EwxA2/v0bO6q5969fBw5DINcdRUe7 QITIQEBEAJCPnLFNOCGg4yBQIW8paCvdFgIKC0GoHVLIR7ipiymZNiCiJEn3BFrmjgew02Cd6Ozy iBBSC3v/PFSM5LdjCwFBEFT63wQEsCwgLJC/j0bueyWICIII3GhFHMcNPTwM/tzcjloGnnsOVLkM bEyD4ygGSDtpAMjD1QJiCw80ZmiTX7wJYgbJNFKABZgFRQCYGZgZcsGhSLK2dh0AYPIP/wBKTz/d rmLg2R+CS7//KQAAMMvLbwELZ9FRBisC6dtq0jmDDMAsYq0A99/3EBEnX9YdG4sxhm1hGAFmACtp SEFExDCLtYxKsVjL4Xff+LYeHb3kTU6eufqVPwduNgEAQJXLIIhgNzdvt2rX3gBjWIA5/xdrGWwi 6b9Iaq5M/t93rRARL18uXAMkSUSSWCQxnE6mxHlIOZ3ZShJmY1istbbVCje/8R//FC8tfUesDVW5 DDQ4CGxMI7l16783v/mtfxZrYjbGgDE2jw2lkVJmMSzCRiQ2LInhdPqy/1aJmcv5cqcbWowGRCFL MsBijYhJWAwzG8OUJCyxseJYQmMI4pgAEbnRCpv/9Z3XQetvk+97wGwlSYwIs1hmMMZCHBs2xkiS WEis5Ti2woaFDaeTNUl6PsvpBH6/r1lkJF/eQkC5XB7vuyfEIhwnTFHM4sdpcMxzLGhN4sQkoSJB RCYCRBR0RDBmwdhYmyTx/Xo4NV3WGjHGSpJkJERWwthKGFuIY5trmUTZuQrInvB9fzJf7uwD4OLF i680Go1P9puELCppJYpJ3ERxHFvQmihCFERkhUCQPtlOzAJKWdGawBgChYDW5n1ravdjY9kmRlot w3FsxMRGTGw5ji2HoZUothJFluP+p9sHQVC5cuXKT+XrbQJqtdqd+fn5Qt4uKFHEHIaMnsfoOAaU RlQKBbJ4PhGwFUDXMjNrJE3o2nSABdmoJrfznPYXEkVWksRAnApboshwK7ISR5bDkG2rZQtMWcFu c8JnACDuWrwPsI2GQc+jbHSaz3QhoQAzC/kswloRswglCAmloQaAtp+fmSCR2FgxcSr0OLYShoZb keVmM82OCEPLzWZhGRLYMYu0JRZUlCsKAADGCDcbBhEBCDGL1QAACKYuqZDnMCfWgpPGdiSfExYE EMtiWEAscxwzGMPcioyY2HCzaTmMDEcty82G5WbDFDUdaa0NOuW8PRhXTEecoZ2tQOkdgiBgrQhZ K+gyg00YVEKoCdsT8ykynz7188XELEmS2vxWZLnVyPKCNo1tNE2R+UGe5z3Tub5DA4rqiHN0CkcS w8paLWyEYsPiaouOowAVZqkpmIcbRETawjfMYhLmVpjbfMvNhrUbG0mRwg+CoDI9Pf2hzm1bCFhY WMAnnniiv63qglxIlCQKmIWShMWL8sw4i1ohKtqamMUsIpJmxiVJ7mpaDkPmZuNEZMYBACAiLSws tNe35wWRiBRqhnLwZsNyGLFKjHAcM7kuo+dSe0JF6VT4RAgCAJKGMyQ27dxQjmMrrRbbRnE2vxOu 6z67vZ/dMSEjIlS0GWrDGLF37yYYhiS+z+jodObMcRFJYTuMbbPk3HZ2NEvq7xeT9dANQRBUpqam Xtq+fQcBJ8UMdUKiiG0Ucfv5AEVpzL8zpM8CYg2LZTiJzwcA7DQ/AN3T00lE6CSYoR1gEWm18od0 C7fnB4HW+gPd3Pyu0dDcDBUzQfPwIfN+PtJtX1cCarVauzM+3qY9GnBd9ykA6PqYas/5ABFRp1rw 4Mg631/qtb8nAadacDTwPO9J6HH3A+wxI3aqBQ+GIAgqk5OTL+9WZlcCMi2gUy04HBzHeR/scvcD 7GNO+FQLDocgCCqXL1/+6F7l9iSgVquhiKhTLTgYEPHD0DHx0gv7yooQEXXhwoXfmZycfHrv0qeo VCoffOyxx358P2X3RUCtVgMR0RcvXnzllITdMTk5+czU1NQvAADs562J+84LqtVqyMyn/cEuCIKg cv78+U/APkxPjgMlZtVqNXXaH/QGET0PAAd6dfGBM+Oy/uATp6ZoK8bHx1+8evXqTx70uAMTkPcH pyTcx8TExAtXrlx5AWB/dr8Th8oN7SDhkfeMJiYmnr98+fKLAAcXPsADJOdmJDiPsiZMTEy8cPny 5Z8DOJzwAR4wO/pRNkfj4+MvPsidn+NIvqJUrVYBEe3S0tKnG43G6ombSTtCBEFQIaLn8w638K8o 5ahWqwAAlojszZs3P/vOO+/8z1HUe5IwOTn5TObnK4AHFz7AMXzKsFqtCiKapaWlVx8mEiqVygez Ee6+B1n7wbF8zPNhMklBEFQQ8cN5bOeoP+h5bF9TzUySZER85r1GRBAEFcdx3peFlBHg6IUP0IcP OmdEcEbEqyediCAIKp7nPZnNZBHA8Qg+R98+aX7SiQiCoOK67lPZBPqxCz5HX78pD7CFCM5NE0Ax T+nnUV2t9QeyvJ2+CT5H3wnIkXXUIiI5Ga/2g4xc6K7rPjs1NfVSnpAM0F/B5yiMgE5sI0MWFxe/ FEXRlu8RH4aUznkLa23ged4z09PTHypa6J04EQR0IjNROSECqScFN27ceK3Vai0SUQMRo+yVL+23 D4qIIyIeM5dFZMT3/cnsaUTEtLJ2XmbRQu/EiSOgG3JSDoOTJOxueE8Q8DDj/wGeBpGeX2BWoQAA AABJRU5ErkJggg== "
-       height="96"
-       width="96" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="Layer#1">
-    <rect
-       style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3000"
-       width="95.999992"
-       height="96"
-       x="-3.5527137e-15"
-       y="-3.5620842e-14" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer"
-     style="display:none">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.4;fill:url(#linearGradient3857);fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3849"
-       sodipodi:cx="47.919113"
-       sodipodi:cy="47.82835"
-       sodipodi:rx="47.792843"
-       sodipodi:ry="47.666573"
-       d="m 95.711956,47.82835 a 47.792843,47.666573 0 1 1 -95.58568571,0 47.792843,47.666573 0 1 1 95.58568571,0 z"
-       transform="matrix(0.96248721,0,0,0.96503687,1.8784665,1.8438788)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.4;fill:url(#radialGradient3867);fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3859"
-       sodipodi:cx="50.002552"
-       sodipodi:cy="45.492374"
-       sodipodi:rx="20.076782"
-       sodipodi:ry="20.076782"
-       d="m 70.079334,45.492374 a 20.076782,20.076782 0 1 1 -40.153564,0 20.076782,20.076782 0 1 1 40.153564,0 z"
-       transform="translate(-2.002552,2.5076256)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3830"
-       sodipodi:cx="48.739861"
-       sodipodi:cy="48.017754"
-       sodipodi:rx="4.2931485"
-       sodipodi:ry="4.2931485"
-       d="m 53.033009,48.017754 a 4.2931485,4.2931485 0 1 1 -8.586297,0 4.2931485,4.2931485 0 1 1 8.586297,0 z"
-       transform="matrix(0.93171713,0,0,0.93171713,2.588237,3.2610364)" />
-    <path
-       style="fill:#0e0e0e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 0,0 0,96 96,96 96,0 0,0 z M 48,2 C 73.405099,2 94,22.594902 94,48 94,73.405099 73.405099,94 48,94 22.594902,94 2,73.405099 2,48 2,22.594902 22.594902,2 48,2 z"
-       id="rect3842"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="indicator"
-     style="opacity:0.95999995;display:none">
-    <path
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 46,3.7264493 C 45.96903,2.8335721 46.545072,1.949526 47.936937,1.9914377 49.328802,2.0333497 49.963562,2.675413 49.984216,3.742233 L 50,42.800846 C 50,43.482472 48.712307,43.913653 47.950679,43.9057 47.18905,43.897748 46.015784,43.447975 46,42.800846 z"
-       id="rect3776"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="czcczcc" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="96" height="96"><defs><linearGradient id="b"><stop offset="0" stop-color="#eece33"/><stop offset="1" stop-color="#eece33" stop-opacity="0"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#eece33"/><stop offset="1" stop-color="#eece33" stop-opacity="0"/></linearGradient></defs><path fill="#0f0f0f" d="M0 0h95.999992v96H0z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/spinnyMini_indicator.svg b/res/skins/Tango/graphics/spinnyMini_indicator.svg
index 196a18c0b7e9..9e3530f67eb4 100644
--- a/res/skins/Tango/graphics/spinnyMini_indicator.svg
+++ b/res/skins/Tango/graphics/spinnyMini_indicator.svg
@@ -1,149 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   width="50"
-   height="50"
-   id="svg2"
-   style="enable-background:new"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="spinnyMini_indicator.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview26"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:zoom="2.4583333"
-     inkscape:cx="48"
-     inkscape:cy="48"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3861">
-      <stop
-         id="stop3863"
-         style="stop-color:#eece33;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3865"
-         style="stop-color:#eece33;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3851">
-      <stop
-         id="stop3853"
-         style="stop-color:#eece33;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3855"
-         style="stop-color:#eece33;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3851-7">
-      <stop
-         id="stop3853-0"
-         style="stop-color:#eece33;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3855-9"
-         style="stop-color:#eece33;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3861-9">
-      <stop
-         id="stop3863-1"
-         style="stop-color:#eece33;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3865-2"
-         style="stop-color:#eece33;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer6"
-     style="display:none"
-     transform="translate(0,-46)">
-    <rect
-       width="96"
-       height="96"
-       x="-4.2632564e-14"
-       y="-2.7171737e-15"
-       id="rect3003"
-       style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-  </g>
-  <g
-     id="g4080"
-     style="display:none"
-     transform="translate(0,-46)">
-    <path
-       d="m 71.071428,46.267857 a 17.946428,11.875 0 1 1 -35.892856,0 17.946428,11.875 0 1 1 35.892856,0 z"
-       transform="matrix(1.1144279,0,0,1.6842105,-11.203982,-29.92481)"
-       id="path4082"
-       style="fill:#bf880f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 53.033009,48.017754 a 4.2931485,4.2931485 0 1 1 -8.586297,0 4.2931485,4.2931485 0 1 1 8.586297,0 z"
-       transform="matrix(0.93171713,0,0,0.93171713,2.588237,3.2610364)"
-       id="path4084"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="layer3"
-     style="opacity:0.95999995;display:none"
-     transform="translate(0,-46)">
-    <path
-       d="M 46,3.7264493 C 45.96903,2.8335721 46.545072,1.949526 47.936937,1.9914377 49.328802,2.0333497 49.963562,2.675413 49.984216,3.742233 L 50,28.157989 c 0,0.681626 -1.287693,1.112807 -2.049321,1.104854 C 47.18905,29.254891 46.015784,28.805118 46,28.157989 z"
-       id="rect3776"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="layer2"
-     style="display:inline"
-     transform="scale(0.52083335,0.52083335)">
-    <path
-       d="m 47.71875,2.53125 c -1.998912,0.1408911 -3.723709,1.9961347 -3.71875,4 l 0,33.3125 c 0,2.094395 1.905605,3.999998 4,3.999998 2.094395,0 4,-1.905603 4,-3.999998 l 0,-33.3125 c 10e-4,-2.0533728 -1.82263,-3.9358323 -3.875,-4 -0.1353,-0.00688 -0.27095,-0.00688 -0.40625,0 z"
-       id="path3830-7-5"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;enable-background:new"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50"><path d="M24.8535164203 1.3183594172c-1.0411000333.0733807836-1.9394318329 1.0396535228-1.9368490203 2.0833334V20.751953789c0 1.090830764.992502636 2.0833323583 2.0833334 2.0833323583s2.0833334-.9925015943 2.0833334-2.0833323583V3.401692817c.0005208333-1.0694650341-.9492864887-2.0499127218-2.0182292312-2.0833334-.0704687523-.0035833334-.1411197962-.0035833334-.2115885485 0z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/spinnyMini_indicator_ghost.svg b/res/skins/Tango/graphics/spinnyMini_indicator_ghost.svg
index 37a65e51d1df..7c08e609b722 100644
--- a/res/skins/Tango/graphics/spinnyMini_indicator_ghost.svg
+++ b/res/skins/Tango/graphics/spinnyMini_indicator_ghost.svg
@@ -1,168 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="50"
-   height="50"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="spinnyMini_indicator_ghost.svg"
-   style="enable-background:new">
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3861">
-      <stop
-         style="stop-color:#09b2ae;stop-opacity:1;"
-         offset="0"
-         id="stop3863" />
-      <stop
-         style="stop-color:#09b2ae;stop-opacity:0;"
-         offset="1"
-         id="stop3865" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3851">
-      <stop
-         style="stop-color:#09b2ae;stop-opacity:1;"
-         offset="0"
-         id="stop3853" />
-      <stop
-         style="stop-color:#09b2ae;stop-opacity:0;"
-         offset="1"
-         id="stop3855" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3851"
-       id="linearGradient3857"
-       x1="48.010761"
-       y1="0.07037171"
-       x2="47.827461"
-       y2="24.407314"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="radialGradient3867"
-       cx="50.002552"
-       cy="45.492374"
-       fx="50.002552"
-       fy="45.492374"
-       r="20.076782"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="17.209008"
-     inkscape:cy="68.318224"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer3"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="orig"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1002.3622)"
-     style="display:none"
-     sodipodi:insensitive="true">
-    <image
-       y="956.36218"
-       x="0"
-       id="image3047"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAABHNCSVQICAgIfAhkiAAAEgNJREFU eJztXWtsJNlVPufcW492+1kzHvc87PHMet32vlhWSCFEQoIfKFJW2gRBNmJBsBIICEgILUH5FfiD EMkGFEWJIIEIxEMRrIL4xz8IBIlNFIlAdtc9GdiJN+Px2Ov2zNjdXY97z+FHVfW07W6/xu7yzviT Wl2PW7duna/Oueeee6oKR0ZGBE5RGKjoBjzq0EU3YC8MTV+5MTlQmhYRKwgAAILY/b4RYQAAxFSn UUSg9v3vN6TVGupTcw8MPEkmyDkT3Jw5N1ER3C5kgfUnnvrHZHjw7vZj4iBYd+v1sR113dscGXvz jY+0axAGFEARwYWFBQQAPJ6rOBgKJ8CfnKpND5VnEKndjvXq7NeSoaEtwo7GxtYPWre3vr6FGGdj Y2Ssdu2nAQBEGIGLJ6MQArDk35ubvlIGwva567OzryUD6R0eBaMHFvZ+4dXvjAEAOM3NkeDatZ8B AAAWFBHKyOgr+kqAHgtuzpyfqGBmpeszM/8QDwykQh8ZqbcbpRQAAIi17eVO5Ns7/zvReUxnHdvL +ffuBSICbrM5Ely//rMigsD9JaIvBNBgebU6ORXkd3z96tW/jwcG7oTDw12Fnq/3EnAn9kNAr/Kd 5/DW1wOn0Rg98/bbH+2nRhwrAejoaG7mcZ0Lfm1q+qtJuXwnHBmq73VsUfDvbqRELN74WD+IODYC 5ufnLSIyAMC7U5Nfze74teM413HAv3fvjNtsjp5dfOdjIkLMrGq12pGf5+gJQErm56qIiPLupYt/ F/kDd8Kh8ntG8NvhbzTOeGFz9Mw7P3hJRNRRa8OREqCHhxdnL106DwCwWjn/t3fPnPnfo6q7aIys rT02vnzrJWZWCwsLRxZBODICOk3O6rmJv7lzZuz6UdR7kjC6tj4zvnL754/SJB0JAbnwV8fH/zpy 9HpzYODd9gn28GI6y3RzFx/EG+q1fbub26ve7edGpaC02TzrRq2x8dV3f/EoSHhgAnLhrwTBX90Z HfneA7XmPYTRO3cfH19be/lBSXggAubn5w0iysro6F+uDw1eO3Qr3qMY29icHV9ff5mZ9WFJODQB 7Tt/eOgr9YGBR074OYJmc3b87r1fPqwmHIqAXPi3ywN/Uff9o3eO32MIwrB6brPxK4ch4cAEtIXv eV9e89xHXvg5zkRx9VwY/upBSTjQhIwqld5GxEvLWn95TasFSJL7O4kAmLce0Llt+37KXOnO/fl6 XrbbMb3272d5r/Vu19CrvduOf1erBfHcPzsXRr8GB5hp3DcBAhhXr1y5BAAQgqxKkmxtSTdXrnPb 9v27refLvcp027+f5f2etxt67etoS8i8SkR2bm4O9zti3rcJmp+fNwAgtxH+dJXhrf0c8yhinGB+ QuDX9+sZ7YuAubk5i4i8bPmLK9acCn8PnFN6foLwN0Vkz/5gbxOE1EJEvRzHX7idxG8eVSMfZtxO 4jfAcT9/Tuvfgj2mO/ckYK466wAAN6N4VZK4Rw91iu1oMqyi49hqtbqrKdqVAFS0hIhnb21sfP5u GC6LtYJKYef/1vIKAQC278+3dyIvky93P3/3OnqV73Z8r/b02rafOndrb36+u9YuLxN8bqI08Nuw i1e0KwHVx2fPAQA342iVw5ABACRJpPO/E53bei33Kr/X/r3KHuT4btew3/p3K7e9vibhKg6UuVqt Ui8t6EkAaXUdEaeW6vXPra/fubWfxp1iK9aj6NYtpD+pjI6+Aj20oCcBszOPTwMANxqNFW6Fp7b/ kGg0Gis4NtZTC3oRsIaIQzdv3frj+srK0vE28eFGfWVlaUnrV89PTPwudNGCrgTMzc2NAAA3NjZW DmN7T7EVjY2NFaxUumpBV7uEiHzz5s3P1uv15b608CFHvV5fXlpa+kyekNaJHRqgtX4dAH640Wis 9qV1BwEhoucTOg4iIqYBsuyaWEBERJJEJAoZWE6U5jYajVVJ07e3pPrtIGBmZuY5aF/VyQB6HpHv K/Q8QkWIjktAtHV8YVmELUgSs9ghkShijmOWVmv3Cek+AhG5Wq1uCU/sIAAR5cSYH61RlcsaSyUi 11XouYSOQ6gUIhKC0ggIAMypX2+tSJywsBGJYsY4tuw4yM2mBWMKvakyM/TqhQsXPgkd4YktBBDR NQCYPgnmhwbLigbKmnxfke8Teq5CnRHgagLYNjpmEBALEhsWk7D4CVMUEbuuYtcxHIaWNxuFakM3 M7SFgNnZ2asAULjPT4NlpYaGHBooK/J9hSVfo+MQuS6h4ygkjaAQgei+CUqsiIiAb0WSxEpimB2H 0HEsOg6CbiCQQr53zxR4aYCIUq1WITdD201Q4eaHhoe1Kg9oGhzUqjSg0S8pKnmKXFeB1oTaVagJ gYgAFSAiAmb3lU0YrIgkiRITW3Q0sXYIlSKgtCSwlaI0oV6vLy8uLn5pcnLy4/m2LQQgohRpfmiw rHLhU6msabCsyfcUep5G7SoqeQqVItCaMi8of7pFgFnEuCJsGI1miR0CVAREyADY6XqIZSiqc46i 6HrmjiLASXpIT2sk31e52SHf1+R7GkslTa6ryPc1aJ1qAhGiUgSCqSkCADHMKJaBmTmOGR1DoBAx IkREZK1AWARYRFkWkyRcVMcsIjsJyP3/IhoEAKDKZd3udEtlrQYHFHkljb6vyfc1Oo7OzJBCx6Hs 7ifE+/2wWMuSJKyUshzHRETIRPnjfiLGCgiLJInQwIAqsD9oE98mYGZm5kcAoBC1xFJJke9T9tNU ysyO76b/nqfJdTV6nkalFJImcBShCAIRpjcUMBhmIGJQKjdRQADAzIKGhUpWwBqRJGFVKimJIpYo 6rvTgYiQd8RbngUtqgMm1yX0PIWeq9D1Up9fp2aHXPe+8B1Ho+c56Lsuua6LpZKLnueQ6zqkHJc8 x1We56DntbUGHUeTV9LopR05el7q0nqeIt/f+QDaMaNery/fuHHjtXy9sw8opgMmRHQ0poOszM93 HIWuVug4udDuC1M52pt7fMa9cOFJ8v1hEQGJonvx0tJb0ds3/k9Sk4MiguC6IAzCxjC6msG4jDqx qF1CzyX0PAJC7HfYotVqLebLhXfCWWyHkDSidgg1EWqXyPEIHSe1+UrlZDjl9//oTzjj43MAACgC IgLoeUN6ePiiMz5+ffOb3/oXYABBZBRRwMxgXUvWEieWMmItKo2oCNHzqd8eERE18uU2Ad0idf0A Og6i42J7hKscAoUITupCIqXbUCldevKJZ9yzZ+fs5ibc/sIXYfM/XwcAgMEfez9M/MbHQZ89O1Oa n1tpvbXwXYxYRGsGawmVIlEOgQoRSSO6mtDRhI6LqKjvgS9EjPLl4jUg8+dRq3SkpFMXM9tOqAlR EyEQuRcuPCki8INP/R5sfP3f2nXUFxfBrKzA1Kf/CJzz5+fDa997E5RKB2CI7fpQqdQ1RQRAhQCA qDRBn50PRGzndBb/thRCQEAApHRglf4g8/VTEkSQyiUXPW+EwxA2/v0bO6q5969fBw5DINcdRUe7 QITIQEBEAJCPnLFNOCGg4yBQIW8paCvdFgIKC0GoHVLIR7ipiymZNiCiJEn3BFrmjgew02Cd6Ozy iBBSC3v/PFSM5LdjCwFBEFT63wQEsCwgLJC/j0bueyWICIII3GhFHMcNPTwM/tzcjloGnnsOVLkM bEyD4ygGSDtpAMjD1QJiCw80ZmiTX7wJYgbJNFKABZgFRQCYGZgZcsGhSLK2dh0AYPIP/wBKTz/d rmLg2R+CS7//KQAAMMvLbwELZ9FRBisC6dtq0jmDDMAsYq0A99/3EBEnX9YdG4sxhm1hGAFmACtp SEFExDCLtYxKsVjL4Xff+LYeHb3kTU6eufqVPwduNgEAQJXLIIhgNzdvt2rX3gBjWIA5/xdrGWwi 6b9Iaq5M/t93rRARL18uXAMkSUSSWCQxnE6mxHlIOZ3ZShJmY1istbbVCje/8R//FC8tfUesDVW5 DDQ4CGxMI7l16783v/mtfxZrYjbGgDE2jw2lkVJmMSzCRiQ2LInhdPqy/1aJmcv5cqcbWowGRCFL MsBijYhJWAwzG8OUJCyxseJYQmMI4pgAEbnRCpv/9Z3XQetvk+97wGwlSYwIs1hmMMZCHBs2xkiS WEis5Ti2woaFDaeTNUl6PsvpBH6/r1lkJF/eQkC5XB7vuyfEIhwnTFHM4sdpcMxzLGhN4sQkoSJB RCYCRBR0RDBmwdhYmyTx/Xo4NV3WGjHGSpJkJERWwthKGFuIY5trmUTZuQrInvB9fzJf7uwD4OLF i680Go1P9puELCppJYpJ3ERxHFvQmihCFERkhUCQPtlOzAJKWdGawBgChYDW5n1ravdjY9kmRlot w3FsxMRGTGw5ji2HoZUothJFluP+p9sHQVC5cuXKT+XrbQJqtdqd+fn5Qt4uKFHEHIaMnsfoOAaU RlQKBbJ4PhGwFUDXMjNrJE3o2nSABdmoJrfznPYXEkVWksRAnApboshwK7ISR5bDkG2rZQtMWcFu c8JnACDuWrwPsI2GQc+jbHSaz3QhoQAzC/kswloRswglCAmloQaAtp+fmSCR2FgxcSr0OLYShoZb keVmM82OCEPLzWZhGRLYMYu0JRZUlCsKAADGCDcbBhEBCDGL1QAACKYuqZDnMCfWgpPGdiSfExYE EMtiWEAscxwzGMPcioyY2HCzaTmMDEcty82G5WbDFDUdaa0NOuW8PRhXTEecoZ2tQOkdgiBgrQhZ K+gyg00YVEKoCdsT8ykynz7188XELEmS2vxWZLnVyPKCNo1tNE2R+UGe5z3Tub5DA4rqiHN0CkcS w8paLWyEYsPiaouOowAVZqkpmIcbRETawjfMYhLmVpjbfMvNhrUbG0mRwg+CoDI9Pf2hzm1bCFhY WMAnnniiv63qglxIlCQKmIWShMWL8sw4i1ohKtqamMUsIpJmxiVJ7mpaDkPmZuNEZMYBACAiLSws tNe35wWRiBRqhnLwZsNyGLFKjHAcM7kuo+dSe0JF6VT4RAgCAJKGMyQ27dxQjmMrrRbbRnE2vxOu 6z67vZ/dMSEjIlS0GWrDGLF37yYYhiS+z+jodObMcRFJYTuMbbPk3HZ2NEvq7xeT9dANQRBUpqam Xtq+fQcBJ8UMdUKiiG0Ucfv5AEVpzL8zpM8CYg2LZTiJzwcA7DQ/AN3T00lE6CSYoR1gEWm18od0 C7fnB4HW+gPd3Pyu0dDcDBUzQfPwIfN+PtJtX1cCarVauzM+3qY9GnBd9ykA6PqYas/5ABFRp1rw 4Mg631/qtb8nAadacDTwPO9J6HH3A+wxI3aqBQ+GIAgqk5OTL+9WZlcCMi2gUy04HBzHeR/scvcD 7GNO+FQLDocgCCqXL1/+6F7l9iSgVquhiKhTLTgYEPHD0DHx0gv7yooQEXXhwoXfmZycfHrv0qeo VCoffOyxx358P2X3RUCtVgMR0RcvXnzllITdMTk5+czU1NQvAADs562J+84LqtVqyMyn/cEuCIKg cv78+U/APkxPjgMlZtVqNXXaH/QGET0PAAd6dfGBM+Oy/uATp6ZoK8bHx1+8evXqTx70uAMTkPcH pyTcx8TExAtXrlx5AWB/dr8Th8oN7SDhkfeMJiYmnr98+fKLAAcXPsADJOdmJDiPsiZMTEy8cPny 5Z8DOJzwAR4wO/pRNkfj4+MvPsidn+NIvqJUrVYBEe3S0tKnG43G6ombSTtCBEFQIaLn8w638K8o 5ahWqwAAlojszZs3P/vOO+/8z1HUe5IwOTn5TObnK4AHFz7AMXzKsFqtCiKapaWlVx8mEiqVygez Ee6+B1n7wbF8zPNhMklBEFQQ8cN5bOeoP+h5bF9TzUySZER85r1GRBAEFcdx3peFlBHg6IUP0IcP OmdEcEbEqyediCAIKp7nPZnNZBHA8Qg+R98+aX7SiQiCoOK67lPZBPqxCz5HX78pD7CFCM5NE0Ax T+nnUV2t9QeyvJ2+CT5H3wnIkXXUIiI5Ga/2g4xc6K7rPjs1NfVSnpAM0F/B5yiMgE5sI0MWFxe/ FEXRlu8RH4aUznkLa23ged4z09PTHypa6J04EQR0IjNROSECqScFN27ceK3Vai0SUQMRo+yVL+23 D4qIIyIeM5dFZMT3/cnsaUTEtLJ2XmbRQu/EiSOgG3JSDoOTJOxueE8Q8DDj/wGeBpGeX2BWoQAA AABJRU5ErkJggg== "
-       height="96"
-       width="96" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer"
-     style="display:none"
-     transform="translate(0,-46)">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.94000005;fill:url(#radialGradient3867);fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3859"
-       sodipodi:cx="50.002552"
-       sodipodi:cy="45.492374"
-       sodipodi:rx="20.076782"
-       sodipodi:ry="20.076782"
-       d="m 70.079334,45.492374 c 0,11.088101 -8.988681,20.076783 -20.076782,20.076783 -11.088101,0 -20.076782,-8.988682 -20.076782,-20.076783 0,-11.0881 8.988681,-20.076782 20.076782,-20.076782 11.088101,0 20.076782,8.988682 20.076782,20.076782 z"
-       transform="translate(-2.002552,2.5076256)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.94000005;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3830"
-       sodipodi:cx="48.739861"
-       sodipodi:cy="48.017754"
-       sodipodi:rx="4.2931485"
-       sodipodi:ry="4.2931485"
-       d="m 53.033009,48.017754 c 0,2.37104 -1.922108,4.293148 -4.293148,4.293148 -2.371041,0 -4.293149,-1.922108 -4.293149,-4.293148 0,-2.371041 1.922108,-4.293149 4.293149,-4.293149 2.37104,0 4.293148,1.922108 4.293148,4.293149 z"
-       transform="matrix(0.93171713,0,0,0.93171713,2.588237,3.2610364)" />
-    <path
-       style="opacity:0.94000005;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 0,0 0,96 96,96 96,0 0,0 z M 48,2 C 73.405099,2 94,22.594902 94,48 94,73.405099 73.405099,94 48,94 22.594902,94 2,73.405099 2,48 2,22.594902 22.594902,2 48,2 z"
-       id="rect3842"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.94000005;fill:url(#linearGradient3857);fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3849"
-       sodipodi:cx="47.919113"
-       sodipodi:cy="47.82835"
-       sodipodi:rx="47.792843"
-       sodipodi:ry="47.666573"
-       d="m 95.711956,47.82835 c 0,26.325521 -21.397585,47.666573 -47.792843,47.666573 -26.395258,0 -47.79284271,-21.341052 -47.79284271,-47.666573 0,-26.325521 21.39758471,-47.6665725 47.79284271,-47.6665725 26.395258,0 47.792843,21.3410515 47.792843,47.6665725 z"
-       transform="matrix(0.96248721,0,0,0.96503687,1.8784665,1.8438788)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="indicator"
-     style="opacity:0.95999995;display:inline"
-     transform="translate(0,-46)">
-    <path
-       style="fill:#9c9c9c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 23.958333,47.940859 c -0.01613,-0.46504 0.283892,-0.925481 1.008822,-0.903652 0.724929,0.02183 1.055534,0.356237 1.066291,0.911873 l 0.0082,20.343027 c 0,0.355014 -0.670674,0.579587 -1.067355,0.575445 -0.396682,-0.0041 -1.007758,-0.238398 -1.015979,-0.575445 z"
-       id="rect3776"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="czcczcc" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50"><defs><linearGradient id="b"><stop offset="0" stop-color="#09b2ae"/><stop offset="1" stop-color="#09b2ae" stop-opacity="0"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#09b2ae"/><stop offset="1" stop-color="#09b2ae" stop-opacity="0"/></linearGradient></defs><path d="M23.958333 1.9408587c-.01613-.46504.283892-.925481 1.008822-.903652.724929.02183 1.055534.356237 1.066291.911873l.0082 20.3430273c0 .355014-.670674.579587-1.067355.575445-.396682-.0041-1.007758-.238398-1.015979-.575445z" opacity=".95999995" fill="#9c9c9c"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/spinny_bg.svg b/res/skins/Tango/graphics/spinny_bg.svg
index fdc292ae6a51..9a276bea58d0 100644
--- a/res/skins/Tango/graphics/spinny_bg.svg
+++ b/res/skins/Tango/graphics/spinny_bg.svg
@@ -1,80 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="96"
-   height="96"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="spinny_bg.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284272"
-     inkscape:cx="-5.0057786"
-     inkscape:cy="64.066047"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <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>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-956.36218)">
-    <rect
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect5376"
-       width="96"
-       height="96"
-       x="0"
-       y="0"
-       transform="translate(0,956.36218)" />
-    <path
-       style="fill:#9e9e9e;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       d="m 48,983.23446 c -11.668501,0 -21.127701,9.4592 -21.127701,21.12774 0,11.6685 9.4592,21.1277 21.127701,21.1277 11.668513,0 21.127701,-9.4592 21.127701,-21.1277 0,-11.66854 -9.459188,-21.12774 -21.127701,-21.12774 z"
-       id="path4010"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="path3830-7"
-       sodipodi:cx="48.739861"
-       sodipodi:cy="48.017754"
-       sodipodi:rx="4.2931485"
-       sodipodi:ry="4.2931485"
-       d="m 53.033009,48.017754 a 4.2931485,4.2931485 0 1 1 -8.586297,0 4.2931485,4.2931485 0 1 1 8.586297,0 z"
-       transform="matrix(0.27995619,0,0,0.27995619,34.354974,990.91931)" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="96" height="96"><path d="M0 0h96v96H0z"/><path d="M48 26.875c-11.668501 0-21.125 9.45646-21.125 21.125 0 11.6685 9.456499 21.125 21.125 21.125 11.668513 0 21.125-9.4565 21.125-21.125 0-11.66854-9.456487-21.125-21.125-21.125zm0 19.9375c.663787 0 1.1875.523713 1.1875 1.1875S48.663787 49.1875 48 49.1875 46.8125 48.663787 46.8125 48s.523713-1.1875 1.1875-1.1875z" fill="#9e9e9e"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/spinny_indicator.svg b/res/skins/Tango/graphics/spinny_indicator.svg
index 86440528cfb9..68b635db6175 100644
--- a/res/skins/Tango/graphics/spinny_indicator.svg
+++ b/res/skins/Tango/graphics/spinny_indicator.svg
@@ -1,180 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="96"
-   height="96"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="spinny_indicator.svg"
-   enable-background="new">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3861">
-      <stop
-         style="stop-color:#eece33;stop-opacity:1;"
-         offset="0"
-         id="stop3863" />
-      <stop
-         style="stop-color:#eece33;stop-opacity:0;"
-         offset="1"
-         id="stop3865" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3851">
-      <stop
-         style="stop-color:#eece33;stop-opacity:1;"
-         offset="0"
-         id="stop3853" />
-      <stop
-         style="stop-color:#eece33;stop-opacity:0;"
-         offset="1"
-         id="stop3855" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="-194.12642"
-     inkscape:cy="-75.213518"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer3"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer6"
-     inkscape:label="Back"
-     style="display:none">
-    <rect
-       style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3003"
-       width="96"
-       height="96"
-       x="-4.2632564e-14"
-       y="-2.7171737e-15" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer7"
-     inkscape:label="Mask"
-     style="display:none">
-    <path
-       style="fill:#0f0f0f;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       d="M 0,0 0,96 96,96 96,0 0,0 z M 48,2 C 73.405099,2 94,22.594902 94,48 94,73.405099 73.405099,94 48,94 22.594902,94 2,73.405099 2,48 2,22.594902 22.594902,2 48,2 z"
-       id="rect3842-3"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#585858;stroke-width:1.89960933;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="path4919-6"
-       sodipodi:cx="47.414036"
-       sodipodi:cy="48.144024"
-       sodipodi:rx="42.110733"
-       sodipodi:ry="45.330597"
-       d="m 89.524769,48.144024 a 42.110733,45.330597 0 1 1 -84.2214662,0 42.110733,45.330597 0 1 1 84.2214662,0 z"
-       transform="matrix(1.0923581,0,0,1.0147671,-3.7931057,-0.85497323)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Color1, Color3"
-     style="display:none">
-    <path
-       sodipodi:type="arc"
-       style="fill:#52b5ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3823"
-       sodipodi:cx="53.125"
-       sodipodi:cy="46.267857"
-       sodipodi:rx="17.946428"
-       sodipodi:ry="11.875"
-       d="m 71.071428,46.267857 a 17.946428,11.875 0 1 1 -35.892856,0 17.946428,11.875 0 1 1 35.892856,0 z"
-       transform="matrix(1.1144279,0,0,1.6842105,-11.203982,-29.92481)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="path3830-7"
-       sodipodi:cx="48.739861"
-       sodipodi:cy="48.017754"
-       sodipodi:rx="4.2931485"
-       sodipodi:ry="4.2931485"
-       d="m 53.033009,48.017754 a 4.2931485,4.2931485 0 1 1 -8.586297,0 4.2931485,4.2931485 0 1 1 8.586297,0 z"
-       transform="matrix(0.93171713,0,0,0.93171713,2.588237,3.2610364)" />
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Color2, Color4"
-     id="g4080"
-     inkscape:groupmode="layer">
-    <path
-       transform="matrix(1.1144279,0,0,1.6842105,-11.203982,-29.92481)"
-       d="m 71.071428,46.267857 a 17.946428,11.875 0 1 1 -35.892856,0 17.946428,11.875 0 1 1 35.892856,0 z"
-       sodipodi:ry="11.875"
-       sodipodi:rx="17.946428"
-       sodipodi:cy="46.267857"
-       sodipodi:cx="53.125"
-       id="path4082"
-       style="fill:#bf880f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.93171713,0,0,0.93171713,2.588237,3.2610364)"
-       d="m 53.033009,48.017754 a 4.2931485,4.2931485 0 1 1 -8.586297,0 4.2931485,4.2931485 0 1 1 8.586297,0 z"
-       sodipodi:ry="4.2931485"
-       sodipodi:rx="4.2931485"
-       sodipodi:cy="48.017754"
-       sodipodi:cx="48.739861"
-       id="path4084"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       sodipodi:type="arc" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="indicator"
-     style="opacity:0.95999995;display:inline">
-    <path
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-opacity:1;stroke-width:1.50000002;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 48,1.9078363 c -1.100151,0 -2,0.8685988 -2,1.96875 l 0,21.9279027 c 0,1.100151 0.899849,2 2,2 1.100151,0 2,-0.899849 2,-2 L 49.96875,3.8765863 c 0,-1.1001512 -0.868599,-1.96875 -1.96875,-1.96875 z"
-       id="rect3776"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sccsccs" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="96" height="96"><path d="M48 1.907836c-1.100151 0-2 .8685988-2 1.96875v21.927903c0 1.100151.899849 2 2 2 1.100151 0 2-.899849 2-2l-.03125-21.927903c0-1.1001512-.868599-1.96875-1.96875-1.96875z" opacity=".95999995" fill="#fff" stroke="#000" stroke-width="1.5"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/spinny_indicator_ghost.svg b/res/skins/Tango/graphics/spinny_indicator_ghost.svg
index 102629b9516d..5f4148403eef 100644
--- a/res/skins/Tango/graphics/spinny_indicator_ghost.svg
+++ b/res/skins/Tango/graphics/spinny_indicator_ghost.svg
@@ -1,169 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="96"
-   height="96"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="spinnyBig_indicator_ghost.svg"
-   enable-background="new">
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3861">
-      <stop
-         style="stop-color:#09b2ae;stop-opacity:1;"
-         offset="0"
-         id="stop3863" />
-      <stop
-         style="stop-color:#09b2ae;stop-opacity:0;"
-         offset="1"
-         id="stop3865" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3851">
-      <stop
-         style="stop-color:#09b2ae;stop-opacity:1;"
-         offset="0"
-         id="stop3853" />
-      <stop
-         style="stop-color:#09b2ae;stop-opacity:0;"
-         offset="1"
-         id="stop3855" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3851"
-       id="linearGradient3857"
-       x1="48.010761"
-       y1="0.07037171"
-       x2="47.827461"
-       y2="24.407314"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="radialGradient3867"
-       cx="50.002552"
-       cy="45.492374"
-       fx="50.002552"
-       fy="45.492374"
-       r="20.076782"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="41.94955"
-     inkscape:cy="78.259395"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer3"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="orig"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-956.36218)"
-     style="display:none"
-     sodipodi:insensitive="true">
-    <image
-       y="956.36218"
-       x="0"
-       id="image3047"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAABHNCSVQICAgIfAhkiAAAEgNJREFU eJztXWtsJNlVPufcW492+1kzHvc87PHMet32vlhWSCFEQoIfKFJW2gRBNmJBsBIICEgILUH5FfiD EMkGFEWJIIEIxEMRrIL4xz8IBIlNFIlAdtc9GdiJN+Px2Ov2zNjdXY97z+FHVfW07W6/xu7yzviT Wl2PW7duna/Oueeee6oKR0ZGBE5RGKjoBjzq0EU3YC8MTV+5MTlQmhYRKwgAAILY/b4RYQAAxFSn UUSg9v3vN6TVGupTcw8MPEkmyDkT3Jw5N1ER3C5kgfUnnvrHZHjw7vZj4iBYd+v1sR113dscGXvz jY+0axAGFEARwYWFBQQAPJ6rOBgKJ8CfnKpND5VnEKndjvXq7NeSoaEtwo7GxtYPWre3vr6FGGdj Y2Ssdu2nAQBEGIGLJ6MQArDk35ubvlIGwva567OzryUD6R0eBaMHFvZ+4dXvjAEAOM3NkeDatZ8B AAAWFBHKyOgr+kqAHgtuzpyfqGBmpeszM/8QDwykQh8ZqbcbpRQAAIi17eVO5Ns7/zvReUxnHdvL +ffuBSICbrM5Ely//rMigsD9JaIvBNBgebU6ORXkd3z96tW/jwcG7oTDw12Fnq/3EnAn9kNAr/Kd 5/DW1wOn0Rg98/bbH+2nRhwrAejoaG7mcZ0Lfm1q+qtJuXwnHBmq73VsUfDvbqRELN74WD+IODYC 5ufnLSIyAMC7U5Nfze74teM413HAv3fvjNtsjp5dfOdjIkLMrGq12pGf5+gJQErm56qIiPLupYt/ F/kDd8Kh8ntG8NvhbzTOeGFz9Mw7P3hJRNRRa8OREqCHhxdnL106DwCwWjn/t3fPnPnfo6q7aIys rT02vnzrJWZWCwsLRxZBODICOk3O6rmJv7lzZuz6UdR7kjC6tj4zvnL754/SJB0JAbnwV8fH/zpy 9HpzYODd9gn28GI6y3RzFx/EG+q1fbub26ve7edGpaC02TzrRq2x8dV3f/EoSHhgAnLhrwTBX90Z HfneA7XmPYTRO3cfH19be/lBSXggAubn5w0iysro6F+uDw1eO3Qr3qMY29icHV9ff5mZ9WFJODQB 7Tt/eOgr9YGBR074OYJmc3b87r1fPqwmHIqAXPi3ywN/Uff9o3eO32MIwrB6brPxK4ch4cAEtIXv eV9e89xHXvg5zkRx9VwY/upBSTjQhIwqld5GxEvLWn95TasFSJL7O4kAmLce0Llt+37KXOnO/fl6 XrbbMb3272d5r/Vu19CrvduOf1erBfHcPzsXRr8GB5hp3DcBAhhXr1y5BAAQgqxKkmxtSTdXrnPb 9v27refLvcp027+f5f2etxt67etoS8i8SkR2bm4O9zti3rcJmp+fNwAgtxH+dJXhrf0c8yhinGB+ QuDX9+sZ7YuAubk5i4i8bPmLK9acCn8PnFN6foLwN0Vkz/5gbxOE1EJEvRzHX7idxG8eVSMfZtxO 4jfAcT9/Tuvfgj2mO/ckYK466wAAN6N4VZK4Rw91iu1oMqyi49hqtbqrKdqVAFS0hIhnb21sfP5u GC6LtYJKYef/1vIKAQC278+3dyIvky93P3/3OnqV73Z8r/b02rafOndrb36+u9YuLxN8bqI08Nuw i1e0KwHVx2fPAQA342iVw5ABACRJpPO/E53bei33Kr/X/r3KHuT4btew3/p3K7e9vibhKg6UuVqt Ui8t6EkAaXUdEaeW6vXPra/fubWfxp1iK9aj6NYtpD+pjI6+Aj20oCcBszOPTwMANxqNFW6Fp7b/ kGg0Gis4NtZTC3oRsIaIQzdv3frj+srK0vE28eFGfWVlaUnrV89PTPwudNGCrgTMzc2NAAA3NjZW DmN7T7EVjY2NFaxUumpBV7uEiHzz5s3P1uv15b608CFHvV5fXlpa+kyekNaJHRqgtX4dAH640Wis 9qV1BwEhoucTOg4iIqYBsuyaWEBERJJEJAoZWE6U5jYajVVJ07e3pPrtIGBmZuY5aF/VyQB6HpHv K/Q8QkWIjktAtHV8YVmELUgSs9ghkShijmOWVmv3Cek+AhG5Wq1uCU/sIAAR5cSYH61RlcsaSyUi 11XouYSOQ6gUIhKC0ggIAMypX2+tSJywsBGJYsY4tuw4yM2mBWMKvakyM/TqhQsXPgkd4YktBBDR NQCYPgnmhwbLigbKmnxfke8Teq5CnRHgagLYNjpmEBALEhsWk7D4CVMUEbuuYtcxHIaWNxuFakM3 M7SFgNnZ2asAULjPT4NlpYaGHBooK/J9hSVfo+MQuS6h4ygkjaAQgei+CUqsiIiAb0WSxEpimB2H 0HEsOg6CbiCQQr53zxR4aYCIUq1WITdD201Q4eaHhoe1Kg9oGhzUqjSg0S8pKnmKXFeB1oTaVagJ gYgAFSAiAmb3lU0YrIgkiRITW3Q0sXYIlSKgtCSwlaI0oV6vLy8uLn5pcnLy4/m2LQQgohRpfmiw rHLhU6msabCsyfcUep5G7SoqeQqVItCaMi8of7pFgFnEuCJsGI1miR0CVAREyADY6XqIZSiqc46i 6HrmjiLASXpIT2sk31e52SHf1+R7GkslTa6ryPc1aJ1qAhGiUgSCqSkCADHMKJaBmTmOGR1DoBAx IkREZK1AWARYRFkWkyRcVMcsIjsJyP3/IhoEAKDKZd3udEtlrQYHFHkljb6vyfc1Oo7OzJBCx6Hs 7ifE+/2wWMuSJKyUshzHRETIRPnjfiLGCgiLJInQwIAqsD9oE98mYGZm5kcAoBC1xFJJke9T9tNU ysyO76b/nqfJdTV6nkalFJImcBShCAIRpjcUMBhmIGJQKjdRQADAzIKGhUpWwBqRJGFVKimJIpYo 6rvTgYiQd8RbngUtqgMm1yX0PIWeq9D1Up9fp2aHXPe+8B1Ho+c56Lsuua6LpZKLnueQ6zqkHJc8 x1We56DntbUGHUeTV9LopR05el7q0nqeIt/f+QDaMaNery/fuHHjtXy9sw8opgMmRHQ0poOszM93 HIWuVug4udDuC1M52pt7fMa9cOFJ8v1hEQGJonvx0tJb0ds3/k9Sk4MiguC6IAzCxjC6msG4jDqx qF1CzyX0PAJC7HfYotVqLebLhXfCWWyHkDSidgg1EWqXyPEIHSe1+UrlZDjl9//oTzjj43MAACgC IgLoeUN6ePiiMz5+ffOb3/oXYABBZBRRwMxgXUvWEieWMmItKo2oCNHzqd8eERE18uU2Ad0idf0A Og6i42J7hKscAoUITupCIqXbUCldevKJZ9yzZ+fs5ibc/sIXYfM/XwcAgMEfez9M/MbHQZ89O1Oa n1tpvbXwXYxYRGsGawmVIlEOgQoRSSO6mtDRhI6LqKjvgS9EjPLl4jUg8+dRq3SkpFMXM9tOqAlR EyEQuRcuPCki8INP/R5sfP3f2nXUFxfBrKzA1Kf/CJzz5+fDa997E5RKB2CI7fpQqdQ1RQRAhQCA qDRBn50PRGzndBb/thRCQEAApHRglf4g8/VTEkSQyiUXPW+EwxA2/v0bO6q5969fBw5DINcdRUe7 QITIQEBEAJCPnLFNOCGg4yBQIW8paCvdFgIKC0GoHVLIR7ipiymZNiCiJEn3BFrmjgew02Cd6Ozy iBBSC3v/PFSM5LdjCwFBEFT63wQEsCwgLJC/j0bueyWICIII3GhFHMcNPTwM/tzcjloGnnsOVLkM bEyD4ygGSDtpAMjD1QJiCw80ZmiTX7wJYgbJNFKABZgFRQCYGZgZcsGhSLK2dh0AYPIP/wBKTz/d rmLg2R+CS7//KQAAMMvLbwELZ9FRBisC6dtq0jmDDMAsYq0A99/3EBEnX9YdG4sxhm1hGAFmACtp SEFExDCLtYxKsVjL4Xff+LYeHb3kTU6eufqVPwduNgEAQJXLIIhgNzdvt2rX3gBjWIA5/xdrGWwi 6b9Iaq5M/t93rRARL18uXAMkSUSSWCQxnE6mxHlIOZ3ZShJmY1istbbVCje/8R//FC8tfUesDVW5 DDQ4CGxMI7l16783v/mtfxZrYjbGgDE2jw2lkVJmMSzCRiQ2LInhdPqy/1aJmcv5cqcbWowGRCFL MsBijYhJWAwzG8OUJCyxseJYQmMI4pgAEbnRCpv/9Z3XQetvk+97wGwlSYwIs1hmMMZCHBs2xkiS WEis5Ti2woaFDaeTNUl6PsvpBH6/r1lkJF/eQkC5XB7vuyfEIhwnTFHM4sdpcMxzLGhN4sQkoSJB RCYCRBR0RDBmwdhYmyTx/Xo4NV3WGjHGSpJkJERWwthKGFuIY5trmUTZuQrInvB9fzJf7uwD4OLF i680Go1P9puELCppJYpJ3ERxHFvQmihCFERkhUCQPtlOzAJKWdGawBgChYDW5n1ravdjY9kmRlot w3FsxMRGTGw5ji2HoZUothJFluP+p9sHQVC5cuXKT+XrbQJqtdqd+fn5Qt4uKFHEHIaMnsfoOAaU RlQKBbJ4PhGwFUDXMjNrJE3o2nSABdmoJrfznPYXEkVWksRAnApboshwK7ISR5bDkG2rZQtMWcFu c8JnACDuWrwPsI2GQc+jbHSaz3QhoQAzC/kswloRswglCAmloQaAtp+fmSCR2FgxcSr0OLYShoZb keVmM82OCEPLzWZhGRLYMYu0JRZUlCsKAADGCDcbBhEBCDGL1QAACKYuqZDnMCfWgpPGdiSfExYE EMtiWEAscxwzGMPcioyY2HCzaTmMDEcty82G5WbDFDUdaa0NOuW8PRhXTEecoZ2tQOkdgiBgrQhZ K+gyg00YVEKoCdsT8ykynz7188XELEmS2vxWZLnVyPKCNo1tNE2R+UGe5z3Tub5DA4rqiHN0CkcS w8paLWyEYsPiaouOowAVZqkpmIcbRETawjfMYhLmVpjbfMvNhrUbG0mRwg+CoDI9Pf2hzm1bCFhY WMAnnniiv63qglxIlCQKmIWShMWL8sw4i1ohKtqamMUsIpJmxiVJ7mpaDkPmZuNEZMYBACAiLSws tNe35wWRiBRqhnLwZsNyGLFKjHAcM7kuo+dSe0JF6VT4RAgCAJKGMyQ27dxQjmMrrRbbRnE2vxOu 6z67vZ/dMSEjIlS0GWrDGLF37yYYhiS+z+jodObMcRFJYTuMbbPk3HZ2NEvq7xeT9dANQRBUpqam Xtq+fQcBJ8UMdUKiiG0Ucfv5AEVpzL8zpM8CYg2LZTiJzwcA7DQ/AN3T00lE6CSYoR1gEWm18od0 C7fnB4HW+gPd3Pyu0dDcDBUzQfPwIfN+PtJtX1cCarVauzM+3qY9GnBd9ykA6PqYas/5ABFRp1rw 4Mg631/qtb8nAadacDTwPO9J6HH3A+wxI3aqBQ+GIAgqk5OTL+9WZlcCMi2gUy04HBzHeR/scvcD 7GNO+FQLDocgCCqXL1/+6F7l9iSgVquhiKhTLTgYEPHD0DHx0gv7yooQEXXhwoXfmZycfHrv0qeo VCoffOyxx358P2X3RUCtVgMR0RcvXnzllITdMTk5+czU1NQvAADs562J+84LqtVqyMyn/cEuCIKg cv78+U/APkxPjgMlZtVqNXXaH/QGET0PAAd6dfGBM+Oy/uATp6ZoK8bHx1+8evXqTx70uAMTkPcH pyTcx8TExAtXrlx5AWB/dr8Th8oN7SDhkfeMJiYmnr98+fKLAAcXPsADJOdmJDiPsiZMTEy8cPny 5Z8DOJzwAR4wO/pRNkfj4+MvPsidn+NIvqJUrVYBEe3S0tKnG43G6ombSTtCBEFQIaLn8w638K8o 5ahWqwAAlojszZs3P/vOO+/8z1HUe5IwOTn5TObnK4AHFz7AMXzKsFqtCiKapaWlVx8mEiqVygez Ee6+B1n7wbF8zPNhMklBEFQQ8cN5bOeoP+h5bF9TzUySZER85r1GRBAEFcdx3peFlBHg6IUP0IcP OmdEcEbEqyediCAIKp7nPZnNZBHA8Qg+R98+aX7SiQiCoOK67lPZBPqxCz5HX78pD7CFCM5NE0Ax T+nnUV2t9QeyvJ2+CT5H3wnIkXXUIiI5Ga/2g4xc6K7rPjs1NfVSnpAM0F/B5yiMgE5sI0MWFxe/ FEXRlu8RH4aUznkLa23ged4z09PTHypa6J04EQR0IjNROSECqScFN27ceK3Vai0SUQMRo+yVL+23 D4qIIyIeM5dFZMT3/cnsaUTEtLJ2XmbRQu/EiSOgG3JSDoOTJOxueE8Q8DDj/wGeBpGeX2BWoQAA AABJRU5ErkJggg== "
-       height="96"
-       width="96" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer"
-     style="display:none">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.94000005;fill:url(#radialGradient3867);fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3859"
-       sodipodi:cx="50.002552"
-       sodipodi:cy="45.492374"
-       sodipodi:rx="20.076782"
-       sodipodi:ry="20.076782"
-       d="m 70.079334,45.492374 a 20.076782,20.076782 0 1 1 -40.153564,0 20.076782,20.076782 0 1 1 40.153564,0 z"
-       transform="translate(-2.002552,2.5076256)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.94000005;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3830"
-       sodipodi:cx="48.739861"
-       sodipodi:cy="48.017754"
-       sodipodi:rx="4.2931485"
-       sodipodi:ry="4.2931485"
-       d="m 53.033009,48.017754 a 4.2931485,4.2931485 0 1 1 -8.586297,0 4.2931485,4.2931485 0 1 1 8.586297,0 z"
-       transform="matrix(0.93171713,0,0,0.93171713,2.588237,3.2610364)" />
-    <path
-       style="opacity:0.94000005;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 0,0 0,96 96,96 96,0 0,0 z M 48,2 C 73.405099,2 94,22.594902 94,48 94,73.405099 73.405099,94 48,94 22.594902,94 2,73.405099 2,48 2,22.594902 22.594902,2 48,2 z"
-       id="rect3842"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.94000005;fill:url(#linearGradient3857);fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3849"
-       sodipodi:cx="47.919113"
-       sodipodi:cy="47.82835"
-       sodipodi:rx="47.792843"
-       sodipodi:ry="47.666573"
-       d="m 95.711956,47.82835 a 47.792843,47.666573 0 1 1 -95.58568571,0 47.792843,47.666573 0 1 1 95.58568571,0 z"
-       transform="matrix(0.96248721,0,0,0.96503687,1.8784665,1.8438788)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="indicator"
-     style="opacity:0.95999995;display:inline">
-    <rect
-       style="fill:#181818;fill-opacity:1;stroke:#ffffff;stroke-width:1.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3957"
-       width="3.0011821"
-       height="40.915802"
-       x="46.498817"
-       y="2.4900041"
-       rx="1.5"
-       ry="1.5" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="96" height="96"><defs><linearGradient id="b"><stop offset="0" stop-color="#09b2ae"/><stop offset="1" stop-color="#09b2ae" stop-opacity="0"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#09b2ae"/><stop offset="1" stop-color="#09b2ae" stop-opacity="0"/></linearGradient></defs><rect width="3.0011821" height="40.915802" x="46.498817" y="2.4900041" rx="1.5" ry="1.5" opacity=".95999995" fill="#181818" stroke="#fff" stroke-width="1.20000005" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/spinny_mask.svg b/res/skins/Tango/graphics/spinny_mask.svg
index bc9863e8dcf1..f5ef7412f682 100644
--- a/res/skins/Tango/graphics/spinny_mask.svg
+++ b/res/skins/Tango/graphics/spinny_mask.svg
@@ -1,85 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="96"
-   height="96"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="spinnyBig_mask.svg"
-   enable-background="new">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3861">
-      <stop
-         style="stop-color:#eece33;stop-opacity:1;"
-         offset="0"
-         id="stop3863" />
-      <stop
-         style="stop-color:#eece33;stop-opacity:0;"
-         offset="1"
-         id="stop3865" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3851">
-      <stop
-         style="stop-color:#eece33;stop-opacity:1;"
-         offset="0"
-         id="stop3853" />
-      <stop
-         style="stop-color:#eece33;stop-opacity:0;"
-         offset="1"
-         id="stop3855" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="61.45348"
-     inkscape:cy="3.1761761"
-     inkscape:document-units="px"
-     inkscape:current-layer="svg2"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-     d="M 0 0 L 0 96 L 96 96 L 96 0 L 0 0 z M 48 1.875 C 73.474392 1.875 94.125 22.515393 94.125 48 C 94.125 73.484597 73.474392 94.125 48 94.125 C 22.525606 94.125 1.875 73.484597 1.875 48 C 1.875 22.515393 22.525606 1.875 48 1.875 z "
-     id="path5294" />
-  <path
-     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#585858;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.227;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-     d="M 48 1.625 C 22.383419 1.625 1.625 22.43253 1.625 48.03125 C 1.625 73.63005 22.383419 94.375 48 94.375 C 73.61658 94.375 94.375 73.63005 94.375 48.03125 C 94.375 22.43253 73.61658 1.625 48 1.625 z M 48 1.875 C 73.468871 1.875 94.125 22.520917 94.125 48 C 94.125 73.479073 73.468871 94.125 48 94.125 C 22.531127 94.125 1.875 73.479073 1.875 48 C 1.875 22.520917 22.531127 1.875 48 1.875 z "
-     id="path5348" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="96" height="96"><path d="M48 26.87228c-11.668501 0-21.127701 9.4592-21.127701 21.12774 0 11.6685 9.4592 21.1277 21.127701 21.1277 11.668513 0 21.127701-9.4592 21.127701-21.1277 0-11.66854-9.459188-21.12774-21.127701-21.12774z" fill="none" stroke="#000" stroke-width=".5"/><path d="M0 0v96h96V0H0zm48 1.875c25.474392 0 46.125 20.640393 46.125 46.125 0 25.484597-20.650608 46.125-46.125 46.125C22.525606 94.125 1.875 73.484597 1.875 48 1.875 22.515393 22.525606 1.875 48 1.875z" fill="#333"/><path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" d="M48 1.625c-25.616581 0-46.375 20.80753-46.375 46.40625C1.625 73.63005 22.383419 94.375 48 94.375c25.61658 0 46.375-20.74495 46.375-46.34375C94.375 22.43253 73.61658 1.625 48 1.625zm0 .25c25.468871 0 46.125 20.645917 46.125 46.125 0 25.479073-20.656129 46.125-46.125 46.125C22.531127 94.125 1.875 73.479073 1.875 48 1.875 22.520917 22.531127 1.875 48 1.875z" font-weight="400" color="#000" overflow="visible" font-family="Sans"/><path d="M49.2018931439 47.9999974622a1.2018934972 1.2018934972 0 1 1-2.4037869944 0 1.2018934972 1.2018934972 0 1 1 2.4037869944 0z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/graphics/vumeter_floating.png b/res/skins/Tango/graphics/vumeter_floating.png
index eea27e72e7e3..30a85a9e0fa5 100644
Binary files a/res/skins/Tango/graphics/vumeter_floating.png and b/res/skins/Tango/graphics/vumeter_floating.png differ
diff --git a/res/skins/Tango/graphics/vumeter_floating_clipping.png b/res/skins/Tango/graphics/vumeter_floating_clipping.png
index 0db0b614e728..ee8c90c3646d 100644
Binary files a/res/skins/Tango/graphics/vumeter_floating_clipping.png and b/res/skins/Tango/graphics/vumeter_floating_clipping.png differ
diff --git a/res/skins/Tango/graphics/vumeter_floating_clipping_over.png b/res/skins/Tango/graphics/vumeter_floating_clipping_over.png
index 2e6656baf0f5..1eaf57b307a3 100644
Binary files a/res/skins/Tango/graphics/vumeter_floating_clipping_over.png and b/res/skins/Tango/graphics/vumeter_floating_clipping_over.png differ
diff --git a/res/skins/Tango/graphics/vumeter_floating_over.png b/res/skins/Tango/graphics/vumeter_floating_over.png
index fdd9016bd723..9b4b98720419 100644
Binary files a/res/skins/Tango/graphics/vumeter_floating_over.png and b/res/skins/Tango/graphics/vumeter_floating_over.png differ
diff --git a/res/skins/Tango/graphics/vumeter_h_floating.png b/res/skins/Tango/graphics/vumeter_h_floating.png
deleted file mode 100644
index 39ed941ef896..000000000000
Binary files a/res/skins/Tango/graphics/vumeter_h_floating.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/vumeter_h_floating_clipping.png b/res/skins/Tango/graphics/vumeter_h_floating_clipping.png
deleted file mode 100644
index d73e6bb3cf1c..000000000000
Binary files a/res/skins/Tango/graphics/vumeter_h_floating_clipping.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/vumeter_h_floating_clipping_over.png b/res/skins/Tango/graphics/vumeter_h_floating_clipping_over.png
deleted file mode 100644
index db1a3baba203..000000000000
Binary files a/res/skins/Tango/graphics/vumeter_h_floating_clipping_over.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/vumeter_h_floating_over.png b/res/skins/Tango/graphics/vumeter_h_floating_over.png
deleted file mode 100644
index 51bf36e65dfd..000000000000
Binary files a/res/skins/Tango/graphics/vumeter_h_floating_over.png and /dev/null differ
diff --git a/res/skins/Tango/graphics/vumeter_master.png b/res/skins/Tango/graphics/vumeter_master.png
new file mode 100644
index 000000000000..f3cc6e944462
Binary files /dev/null and b/res/skins/Tango/graphics/vumeter_master.png differ
diff --git a/res/skins/Tango/graphics/vumeter_master_clipping.png b/res/skins/Tango/graphics/vumeter_master_clipping.png
new file mode 100644
index 000000000000..ee8c90c3646d
Binary files /dev/null and b/res/skins/Tango/graphics/vumeter_master_clipping.png differ
diff --git a/res/skins/Tango/graphics/vumeter_master_clipping_over.png b/res/skins/Tango/graphics/vumeter_master_clipping_over.png
new file mode 100644
index 000000000000..1eaf57b307a3
Binary files /dev/null and b/res/skins/Tango/graphics/vumeter_master_clipping_over.png differ
diff --git a/res/skins/Tango/graphics/vumeter_master_over.png b/res/skins/Tango/graphics/vumeter_master_over.png
new file mode 100644
index 000000000000..9b4b98720419
Binary files /dev/null and b/res/skins/Tango/graphics/vumeter_master_over.png differ
diff --git a/res/skins/Tango/hotcues_deck_left.xml b/res/skins/Tango/hotcues_deck_left.xml
index 9985914542a2..ea23913b17bb 100644
--- a/res/skins/Tango/hotcues_deck_left.xml
+++ b/res/skins/Tango/hotcues_deck_left.xml
@@ -1,48 +1,46 @@
 <!--
 Description:
   A widget containing hotcue buttons whose number can be set to 4 or 8.
-Variables:
-  HotCue: The hotcue nummber (1-8).
+  They're layed out in a way that they either expand or get squeezed,
+  depending on how many deck buttons/star rating are visible.
 -->
 <Template>
   <WidgetGroup>
-    <ObjectName>Hotcues</ObjectName>
+    <ObjectName>Spacer33</ObjectName>
     <Layout>horizontal</Layout>
-    <SizePolicy>me,f</SizePolicy>
+    <SizePolicy>me,me</SizePolicy>
     <Children>
-
       <WidgetGroup>
         <Layout>horizontal</Layout>
-        <SizePolicy>min,f</SizePolicy>
+        <SizePolicy>min,me</SizePolicy>
         <Children>
-
       <!-- Qt is fun to design with...not.
           This spacer is necessary to fill (expanding) container
           when 4 hotcues are enabled. -->
           <WidgetGroup>
-            <ObjectName>Spacer33</ObjectName>
             <SizePolicy>min,me</SizePolicy>
           </WidgetGroup>
 
           <WidgetGroup><!-- 4 -->
+            <ObjectName>Spacer0f</ObjectName>
             <Layout>horizontal</Layout>
             <MinimumSize>64,24</MinimumSize>
             <MaximumSize>96,24</MaximumSize>
             <SizePolicy>me,f</SizePolicy>
             <Children>
-                <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+                <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
               <Template src="skin:button_hotcue_deck.xml">
                 <SetVariable name="HotCue">1</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+                <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
               <Template src="skin:button_hotcue_deck.xml">
                 <SetVariable name="HotCue">2</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+                <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
               <Template src="skin:button_hotcue_deck.xml">
                 <SetVariable name="HotCue">3</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+                <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
               <Template src="skin:button_hotcue_deck.xml">
                 <SetVariable name="HotCue">4</SetVariable>
               </Template>
@@ -52,43 +50,44 @@ Variables:
               <Transform><Not/></Transform>
               <BindProperty>visible</BindProperty>
             </Connection>
-          </WidgetGroup><!-- 4 -->
+          </WidgetGroup><!-- /4 -->
 
           <WidgetGroup><!-- 8 -->
+            <ObjectName>Spacer0f</ObjectName>
             <Layout>horizontal</Layout>
             <MinimumSize>128,24</MinimumSize>
             <MaximumSize>192,24</MaximumSize>
             <SizePolicy>me,f</SizePolicy>
             <Children>
-                <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+                <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
               <Template src="skin:button_hotcue_deck.xml">
                 <SetVariable name="HotCue">1</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+                <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
               <Template src="skin:button_hotcue_deck.xml">
                 <SetVariable name="HotCue">2</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+                <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
               <Template src="skin:button_hotcue_deck.xml">
                 <SetVariable name="HotCue">3</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+                <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
               <Template src="skin:button_hotcue_deck.xml">
                 <SetVariable name="HotCue">4</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+                <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
               <Template src="skin:button_hotcue_deck.xml">
                 <SetVariable name="HotCue">5</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+                <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
               <Template src="skin:button_hotcue_deck.xml">
                 <SetVariable name="HotCue">6</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+                <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
               <Template src="skin:button_hotcue_deck.xml">
                 <SetVariable name="HotCue">7</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+                <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
               <Template src="skin:button_hotcue_deck.xml">
                 <SetVariable name="HotCue">8</SetVariable>
               </Template>
@@ -97,7 +96,7 @@ Variables:
               <ConfigKey persist="true">[Tango],8_hotcues</ConfigKey>
               <BindProperty>visible</BindProperty>
             </Connection>
-          </WidgetGroup><!-- 8 -->
+          </WidgetGroup><!-- /8 -->
         </Children>
         <Connection>
           <ConfigKey persist="true">[Tango],hotcues</ConfigKey>
diff --git a/res/skins/Tango/hotcues_deck_right.xml b/res/skins/Tango/hotcues_deck_right.xml
index b971f306b896..22acb82f9e4b 100644
--- a/res/skins/Tango/hotcues_deck_right.xml
+++ b/res/skins/Tango/hotcues_deck_right.xml
@@ -1,23 +1,21 @@
 <!--
 Description:
   A widget containing hotcue buttons whose number can be set to 4 or 8.
-Variables:
-  HotCue: The hotcue nummber (1-8).
+  They're layed out in a way that they either expand or get squeezed,
+  depending on how many deck buttons/star rating are visible.
 -->
 <Template>
   <WidgetGroup>
-    <ObjectName>Hotcues</ObjectName>
+    <ObjectName>Spacer33</ObjectName>
     <Layout>horizontal</Layout>
-    <SizePolicy>me,f</SizePolicy>
+    <SizePolicy>me,me</SizePolicy>
     <Children>
-
       <WidgetGroup>
-        <ObjectName>HotcueBox</ObjectName>
         <Layout>horizontal</Layout>
         <SizePolicy>min,f</SizePolicy>
         <Children>
           <WidgetGroup><!-- 4 -->
-            <ObjectName>Hotcues4</ObjectName>
+            <ObjectName>Spacer0f</ObjectName>
             <Layout>horizontal</Layout>
             <MinimumSize>64,24</MinimumSize>
             <MaximumSize>96,24</MaximumSize>
@@ -48,7 +46,7 @@ Variables:
           </WidgetGroup><!-- 4 -->
 
           <WidgetGroup><!-- 8 -->
-            <ObjectName>Hotcues8</ObjectName>
+            <ObjectName>Spacer0f</ObjectName>
             <Layout>horizontal</Layout>
             <MinimumSize>128,24</MinimumSize>
             <MaximumSize>192,24</MaximumSize>
@@ -97,7 +95,6 @@ Variables:
           This spacer is necessary to fill (expanding) container
           when 4 hotcues are enabled. -->
           <WidgetGroup>
-            <ObjectName>Spacer33</ObjectName>
             <SizePolicy>min,me</SizePolicy>
           </WidgetGroup>
         </Children>
@@ -106,7 +103,6 @@ Variables:
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup>
-
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Tango/hotcues_sampler_preview.xml b/res/skins/Tango/hotcues_sampler_preview.xml
index 5c7367dee87d..5d902b8f452f 100644
--- a/res/skins/Tango/hotcues_sampler_preview.xml
+++ b/res/skins/Tango/hotcues_sampler_preview.xml
@@ -1,8 +1,8 @@
 <!--
 Description:
   A widget containing hotcue buttons whose number can be set to 4 or 8.
-Variables:
-  HotCue: The hotcue nummber (1-8).
+  They're layed out in a way that they either expand or get squeezed,
+  depending on available space.
 -->
 <Template>
   <WidgetGroup>
@@ -20,15 +20,15 @@ Variables:
           <Template src="skin:button_hotcue_sam_pre.xml">
             <SetVariable name="HotCue">1</SetVariable>
           </Template>
-            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+            <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
           <Template src="skin:button_hotcue_sam_pre.xml">
             <SetVariable name="HotCue">2</SetVariable>
           </Template>
-            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+            <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
           <Template src="skin:button_hotcue_sam_pre.xml">
             <SetVariable name="HotCue">3</SetVariable>
           </Template>
-            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+            <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
           <Template src="skin:button_hotcue_sam_pre.xml">
             <SetVariable name="HotCue">4</SetVariable>
           </Template>
@@ -50,31 +50,31 @@ Variables:
           <Template src="skin:button_hotcue_sam_pre.xml">
             <SetVariable name="HotCue">1</SetVariable>
           </Template>
-            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+            <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
           <Template src="skin:button_hotcue_sam_pre.xml">
             <SetVariable name="HotCue">2</SetVariable>
           </Template>
-            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+            <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
           <Template src="skin:button_hotcue_sam_pre.xml">
             <SetVariable name="HotCue">3</SetVariable>
           </Template>
-            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+            <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
           <Template src="skin:button_hotcue_sam_pre.xml">
             <SetVariable name="HotCue">4</SetVariable>
           </Template>
-            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+            <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
           <Template src="skin:button_hotcue_sam_pre.xml">
             <SetVariable name="HotCue">5</SetVariable>
           </Template>
-            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+            <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
           <Template src="skin:button_hotcue_sam_pre.xml">
             <SetVariable name="HotCue">6</SetVariable>
           </Template>
-            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+            <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
           <Template src="skin:button_hotcue_sam_pre.xml">
             <SetVariable name="HotCue">7</SetVariable>
           </Template>
-            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+            <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
           <Template src="skin:button_hotcue_sam_pre.xml">
             <SetVariable name="HotCue">8</SetVariable>
           </Template>
diff --git a/res/skins/Tango/knob_textless.xml b/res/skins/Tango/knob_textless.xml
index 59a7b0077f3d..9d1999d9f673 100644
--- a/res/skins/Tango/knob_textless.xml
+++ b/res/skins/Tango/knob_textless.xml
@@ -1,34 +1,34 @@
 <!--
 Description:
-	An effect parameter knob with a 5 state button below
-	that controls SuperKnob linking type.
+  A simple knob, packed into a box to allow margin without to
+  distort knob graphics.
 Variables:
-	ToolTip/TooltipId
-	ObjectName
-	Size
-	PotiMinAngle:	see skin.xml
-	PotiMaxAngle: see skin.xml
-	Color: The knob's notch colour.
-	group: The affected group.
-	ConfigKey: The control to connect to.
+  ObjectName  : name of parent container, css for individual margin
+  ToolTip     :
+  Size        : actual knob size
+  PotiMinAngle: -130°, see skin.xml
+  PotiMaxAngle: 130°, see skin.xml
+  Color       : knob's notch colour
+  group       : affected group
+  ConfigKey   : control to connect to
 -->
 <Template>
-	<WidgetGroup>
-		<ObjectName>KnobTextless</ObjectName>
-		<Layout>horizontal</Layout>
-		<SizePolicy>f,f</SizePolicy>
-		<Children>
-			<KnobComposed>
-				<TooltipId><Variable name="TooltipId"/></TooltipId>
-				<ObjectName><Variable name="ObjectName"/></ObjectName>
-				<Size><Variable name="Size"/></Size>
-				<Knob>skin:/knobs_sliders/knob_<Variable name="Color"/>.svg</Knob>
-				<MinAngle><Variable name="PotiMinAngle"/></MinAngle>
-				<MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
-				<Connection>
-					<ConfigKey><Variable name="group"/>,<Variable name="ConfigKey"/></ConfigKey>
-				</Connection>
-			</KnobComposed>
-		</Children>
-	</WidgetGroup>
+  <WidgetGroup>
+    <ObjectName><Variable name="ObjectName"/></ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+      <KnobComposed>
+        <TooltipId><Variable name="TooltipId"/></TooltipId>
+        <Size><Variable name="Size"/></Size>
+        <Knob>skin:/knobs_sliders/knob_<Variable name="Color"/>.svg</Knob>
+        <BackPath>skin:/knobs_sliders/knob_bg.svg</BackPath>
+        <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+        <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,<Variable name="ConfigKey"/></ConfigKey>
+        </Connection>
+      </KnobComposed>
+    </Children>
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/Tango/knobs_sliders/knob_bg.svg b/res/skins/Tango/knobs_sliders/knob_bg.svg
new file mode 100644
index 000000000000..d68d629d5da5
--- /dev/null
+++ b/res/skins/Tango/knobs_sliders/knob_bg.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="30" width="30"><path stroke-linejoin="round" d="M8.2628851 21.306659a9.2119779 9.2263715 0 1 1 13.4744289 0" stroke="#b4b4b4" stroke-linecap="round" stroke-width="1.70000005" fill="none" color="#000"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/knobs_sliders/knob_bg_fx_parameter.svg b/res/skins/Tango/knobs_sliders/knob_bg_fx_parameter.svg
new file mode 100644
index 000000000000..86d21808e17c
--- /dev/null
+++ b/res/skins/Tango/knobs_sliders/knob_bg_fx_parameter.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="26" width="26"><path stroke-linejoin="round" d="M7.0135542 18.612145a8.185561 8.2032124 0 1 1 11.9730808 0" stroke="#b4b4b4" stroke-linecap="round" stroke-width="1.70000005" fill="none" color="#000"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/knobs_sliders/knob_blue.svg b/res/skins/Tango/knobs_sliders/knob_blue.svg
index 3d008fc3350a..d856c058e10c 100644
--- a/res/skins/Tango/knobs_sliders/knob_blue.svg
+++ b/res/skins/Tango/knobs_sliders/knob_blue.svg
@@ -1,851 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="knob_yellow.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4574">
-      <stop
-         style="stop-color:#ffb401;stop-opacity:1;"
-         offset="0"
-         id="stop4576" />
-      <stop
-         style="stop-color:#c68c00;stop-opacity:1;"
-         offset="1"
-         id="stop4578" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3846">
-      <stop
-         style="stop-color:#b0b0b0;stop-opacity:1;"
-         offset="0"
-         id="stop3848" />
-      <stop
-         style="stop-color:#585858;stop-opacity:0;"
-         offset="1"
-         id="stop3850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4937">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3939">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941" />
-      <stop
-         id="stop5813"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5461">
-      <stop
-         id="stop5463"
-         offset="0"
-         style="stop-color:#b9dcff;stop-opacity:1;" />
-      <stop
-         id="stop5465"
-         offset="1"
-         style="stop-color:#0d0d0d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443" />
-      <stop
-         style="stop-color:#343434;stop-opacity:1;"
-         offset="1"
-         id="stop5445" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5483-8"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5441-4">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441-7">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-4" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4-6"
-       id="linearGradient5573-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692" />
-    <linearGradient
-       id="linearGradient5441-4-6">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2-5" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3945"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5024"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(54.522364,18.173742)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5032"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-57.471498)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5265"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5267"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5791"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5847"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3837"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3839"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3841"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937"
-       id="linearGradient4945"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48778"
-       y2="634.36542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient4947"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3"
-       id="radialGradient4947-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2" />
-      <stop
-         id="stop5813-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6"
-       id="linearGradient3142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-234.5901,-615.11102)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.257316,0,0,1,-252.5901,-618.29518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3935"
-       xlink:href="#linearGradient4937-6"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9"
-       xlink:href="#Grad0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5"
-         style="stop-color:#060606;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop12-7"
-         style="stop-color:#343434;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846"
-       id="linearGradient3852"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9-5"
-       xlink:href="#Grad0-8-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929" />
-      <stop
-         id="stop12-7-9"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846-6"
-       id="linearGradient3852-5"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3846-6">
-      <stop
-         id="stop3927"
-         offset="0"
-         style="stop-color:#7c7c7c;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3850-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898"
-       xlink:href="#Grad0-8-9"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-2"
-       id="radialGradient4006-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-1" />
-      <stop
-         id="stop5813-8-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9"
-       id="linearGradient4004-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898-0"
-       xlink:href="#Grad0-8-9-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9-5"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4-7"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929-9" />
-      <stop
-         id="stop12-7-9-6"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9-7"
-       id="linearGradient4004-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9-7">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0-9" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7-5" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4006-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5" />
-      <stop
-         id="stop5813-8-1"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-6"
-       id="linearGradient4004-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-13.919877,95.08267)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302"
-       xlink:href="#linearGradient4937-6-6"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7-5"
-       id="radialGradient4337-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7-5">
-      <stop
-         style="stop-color:#33aaee;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-0" />
-      <stop
-         id="stop5813-8-1-6"
-         offset="0.61061949"
-         style="stop-color:#4ebeff;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#2db2ff;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-4"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2">
-      <stop
-         style="stop-color:#6ac6fa;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3939-3-7-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-05" />
-      <stop
-         id="stop5813-8-1-2"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-1" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-6"
-       xlink:href="#linearGradient4937-6-6-24"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-24">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-4" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130-8"
-       xlink:href="#linearGradient4937-6-6-2-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2-7">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2-4" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="621.81409"
-       x1="202.48863"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4865"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="-6.5469836"
-     inkscape:cy="3.3246674"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer8"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     fit-margin-top="2.7755576e-17"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer8"
-     inkscape:label="Pointer FX yellow"
-     style="display:inline"
-     transform="translate(-1,-1)">
-    <path
-       style="fill:url(#linearGradient4865);fill-opacity:1.0;stroke:none;display:inline"
-       d="m 15.30149,4.9185362 c 0,-0.9175 0.56725,-1.7192 1.7,-1.7192 1.07944,0 1.7,0.79317 1.7,1.7192 L 18.701,10.628628 c -0.004,1.051882 -0.68283,1.721502 -1.6999,1.721502 -1.01707,0 -1.7,-0.65763 -1.7,-1.721502 0,0 0.0015,1.834058 3.9e-4,-5.7100918 z"
-       id="rect5578-8-2-8-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscczcc" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b4b4b4;fill-opacity:1;stroke:none;stroke-width:1.10780871;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 12.8125,8.375 C 8.5101381,10.449216 6.2941972,15.444786 7.84375,20.09375 9.5259413,25.1404 14.984684,27.869685 20.03125,26.1875 25.077838,24.505307 27.838414,19.046642 26.15625,14 25.299917,11.430925 23.449925,9.4650358 21.1875,8.375 l 0,1.78125 c 1.592102,0.957272 2.864943,2.438531 3.5,4.34375 1.417976,4.254055 -0.870996,8.832002 -5.125,10.25 -4.253976,1.41799 -8.832,-0.870936 -10.25,-5.125 -1.2227691,-3.668549 0.3253826,-7.553596 3.5,-9.46875 l 0,-1.78125 z"
-       id=" path4669-5-5-8-2-4-3"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="30" width="30" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <defs></defs>
+ <path d="M13.407647,3.6736275c0-0.8601562,0.531797-1.61175,1.59375-1.61175,1.011975,0,1.59375,0.7435969,1.59375,1.61175l-0.00046,5.3532111c-0.0038,0.9861394-0.640153,1.6139084-1.593656,1.6139084s-1.59375-0.616528-1.59375-1.6139084,0.0014,1.7194294,0.000366-5.3532111z" stroke="#0f0f0f" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1.8" fill="#41b5ff"/>
+ <path fill="#41b5ff" d="m13.407647,3.673628c0-0.8601562,0.531797-1.61175,1.59375-1.61175,1.011975,0,1.59375,0.7435969,1.59375,1.61175l-0.00046,5.3532111c-0.0038,0.9861389-0.640153,1.6139089-1.593656,1.6139089s-1.59375-0.616528-1.59375-1.6139089c0,0,0.0014,1.7194289,0.000366-5.3532111z"/>
 </svg>
diff --git a/res/skins/Tango/knobs_sliders/knob_fx_yellow.svg b/res/skins/Tango/knobs_sliders/knob_fx_yellow.svg
index ac84296f1958..af57a5d88b15 100644
--- a/res/skins/Tango/knobs_sliders/knob_fx_yellow.svg
+++ b/res/skins/Tango/knobs_sliders/knob_fx_yellow.svg
@@ -1,852 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="knob_fx_yellow.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4574">
-      <stop
-         style="stop-color:#ffb401;stop-opacity:1;"
-         offset="0"
-         id="stop4576" />
-      <stop
-         style="stop-color:#c68c00;stop-opacity:1;"
-         offset="1"
-         id="stop4578" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3846">
-      <stop
-         style="stop-color:#b0b0b0;stop-opacity:1;"
-         offset="0"
-         id="stop3848" />
-      <stop
-         style="stop-color:#585858;stop-opacity:0;"
-         offset="1"
-         id="stop3850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4937">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3939">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941" />
-      <stop
-         id="stop5813"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5461">
-      <stop
-         id="stop5463"
-         offset="0"
-         style="stop-color:#b9dcff;stop-opacity:1;" />
-      <stop
-         id="stop5465"
-         offset="1"
-         style="stop-color:#0d0d0d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443" />
-      <stop
-         style="stop-color:#343434;stop-opacity:1;"
-         offset="1"
-         id="stop5445" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5483-8"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5441-4">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441-7">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-4" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4-6"
-       id="linearGradient5573-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692" />
-    <linearGradient
-       id="linearGradient5441-4-6">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2-5" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3945"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5024"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(54.522364,18.173742)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5032"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-57.471498)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5265"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5267"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5791"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5847"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3837"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3839"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3841"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937"
-       id="linearGradient4945"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48778"
-       y2="634.36542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient4947"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3"
-       id="radialGradient4947-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2" />
-      <stop
-         id="stop5813-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6"
-       id="linearGradient3142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-234.5901,-615.11102)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.257316,0,0,1,-252.5901,-618.29518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3935"
-       xlink:href="#linearGradient4937-6"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9"
-       xlink:href="#Grad0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5"
-         style="stop-color:#060606;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop12-7"
-         style="stop-color:#343434;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846"
-       id="linearGradient3852"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9-5"
-       xlink:href="#Grad0-8-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929" />
-      <stop
-         id="stop12-7-9"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846-6"
-       id="linearGradient3852-5"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3846-6">
-      <stop
-         id="stop3927"
-         offset="0"
-         style="stop-color:#7c7c7c;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3850-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898"
-       xlink:href="#Grad0-8-9"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-2"
-       id="radialGradient4006-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-1" />
-      <stop
-         id="stop5813-8-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9"
-       id="linearGradient4004-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898-0"
-       xlink:href="#Grad0-8-9-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9-5"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4-7"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929-9" />
-      <stop
-         id="stop12-7-9-6"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9-7"
-       id="linearGradient4004-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9-7">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0-9" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7-5" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4006-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5" />
-      <stop
-         id="stop5813-8-1"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-6"
-       id="linearGradient4004-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-13.919877,95.08267)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302"
-       xlink:href="#linearGradient4937-6-6"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7-5"
-       id="radialGradient4337-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7-5">
-      <stop
-         style="stop-color:#33aaee;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-0" />
-      <stop
-         id="stop5813-8-1-6"
-         offset="0.61061949"
-         style="stop-color:#4ebeff;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#2db2ff;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-4"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3939-3-7-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-05" />
-      <stop
-         id="stop5813-8-1-2"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-1" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-6"
-       xlink:href="#linearGradient4937-6-6-24"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-24">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-4" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130-8"
-       xlink:href="#linearGradient4937-6-6-2-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2-7">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2-4" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="621.81409"
-       x1="202.48863"
-       gradientTransform="matrix(1.2023084,0,0,0.95625064,-226.45378,-586.90458)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4865"
-       xlink:href="#linearGradient4574"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.0000001"
-     inkscape:cx="25.582079"
-     inkscape:cy="13.999064"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer8"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     fit-margin-top="2.7755576e-17"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-global="false" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer8"
-     inkscape:label="Pointer FX yellow"
-     style="display:inline"
-     transform="translate(-1,-1)">
-    <path
-       style="fill:url(#linearGradient4865);fill-opacity:1;stroke:none;display:inline"
-       d="m 15.089176,5.6583532 c 0,-1.0321875 0.638156,-1.9341 1.9125,-1.9341 1.21437,0 1.9125,0.8923163 1.9125,1.9341 l -5.51e-4,6.4238528 c -0.0045,1.183368 -0.768184,1.93669 -1.912387,1.93669 -1.144204,0 -1.912501,-0.739833 -1.912501,-1.93669 0,0 0.0017,2.063316 4.39e-4,-6.4238528 z"
-       id="rect5578-8-2-8-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscczcc" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b4b4b4;fill-opacity:1;stroke:none;stroke-width:1.10780871;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 12.289063,7.296875 C 7.4489054,9.630368 4.9559718,15.250384 6.6992188,20.480469 8.591684,26.15795 14.732769,29.228396 20.410156,27.335937 26.087568,25.44347 29.193216,19.302472 27.300781,13.625 26.337407,10.734791 24.256166,8.5231653 21.710937,7.296875 l 0,2.0039062 c 1.791115,1.0769308 3.223061,2.7433478 3.9375,4.8867188 1.595223,4.785812 -0.97987,9.936002 -5.765625,11.53125 C 15.097089,27.313989 9.946813,24.738947 8.351563,19.953125 6.9759473,15.826007 8.717618,11.45533 12.289063,9.3007812 l 0,-2.0039062 z"
-       id=" path4669-5-5-8-2-4-3"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="26" width="26" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path d="M11.447456,3.7849118c0-0.8386523,0.518501-1.5714562,1.553906-1.5714562,0.986675,0,1.553906,0.725007,1.553906,1.5714562l-0.000448,5.2193806c-0.0037,0.9614865-0.624149,1.5735606-1.553814,1.5735606-0.929666,0-1.553907-0.6011143-1.553907-1.5735606,0,0,0.0014,1.6764446,0.000357-5.2193806z" stroke="#0f0f0f" stroke-dasharray="none" stroke-miterlimit="4" stroke-width="1.5" fill="#ffb401"/>
+ <path fill="#ffb401" d="m11.447456,3.7849122c0-0.8386523,0.518501-1.5714562,1.553906-1.5714562,0.986675,0,1.553906,0.725007,1.553906,1.5714562l-0.000448,5.2193806c-0.0037,0.9614865-0.624149,1.5735602-1.553814,1.5735602-0.929666,0-1.553907-0.6011139-1.553907-1.5735602,0,0,0.0014,1.6764442,0.000357-5.2193806z"/>
 </svg>
diff --git a/res/skins/Tango/knobs_sliders/knob_red.svg b/res/skins/Tango/knobs_sliders/knob_red.svg
index ecb4c943c8a9..6c629781ab29 100644
--- a/res/skins/Tango/knobs_sliders/knob_red.svg
+++ b/res/skins/Tango/knobs_sliders/knob_red.svg
@@ -1,907 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="knob_red.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4574">
-      <stop
-         style="stop-color:#ffb401;stop-opacity:1;"
-         offset="0"
-         id="stop4576" />
-      <stop
-         style="stop-color:#c68c00;stop-opacity:1;"
-         offset="1"
-         id="stop4578" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3846">
-      <stop
-         style="stop-color:#b0b0b0;stop-opacity:1;"
-         offset="0"
-         id="stop3848" />
-      <stop
-         style="stop-color:#585858;stop-opacity:0;"
-         offset="1"
-         id="stop3850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4937">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3939">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941" />
-      <stop
-         id="stop5813"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5461">
-      <stop
-         id="stop5463"
-         offset="0"
-         style="stop-color:#b9dcff;stop-opacity:1;" />
-      <stop
-         id="stop5465"
-         offset="1"
-         style="stop-color:#0d0d0d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443" />
-      <stop
-         style="stop-color:#343434;stop-opacity:1;"
-         offset="1"
-         id="stop5445" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5483-8"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5441-4">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441-7">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-4" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4-6"
-       id="linearGradient5573-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692" />
-    <linearGradient
-       id="linearGradient5441-4-6">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2-5" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3945"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5024"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(54.522364,18.173742)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5032"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-57.471498)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5265"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5267"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5791"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5847"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3837"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3839"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3841"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937"
-       id="linearGradient4945"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48778"
-       y2="634.36542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient4947"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3"
-       id="radialGradient4947-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2" />
-      <stop
-         id="stop5813-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6"
-       id="linearGradient3142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-234.5901,-615.11102)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.257316,0,0,1,-252.5901,-618.29518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3935"
-       xlink:href="#linearGradient4937-6"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9"
-       xlink:href="#Grad0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5"
-         style="stop-color:#060606;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop12-7"
-         style="stop-color:#343434;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846"
-       id="linearGradient3852"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9-5"
-       xlink:href="#Grad0-8-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929" />
-      <stop
-         id="stop12-7-9"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846-6"
-       id="linearGradient3852-5"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3846-6">
-      <stop
-         id="stop3927"
-         offset="0"
-         style="stop-color:#7c7c7c;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3850-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898"
-       xlink:href="#Grad0-8-9"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-2"
-       id="radialGradient4006-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-1" />
-      <stop
-         id="stop5813-8-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9"
-       id="linearGradient4004-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898-0"
-       xlink:href="#Grad0-8-9-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9-5"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4-7"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929-9" />
-      <stop
-         id="stop12-7-9-6"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9-7"
-       id="linearGradient4004-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9-7">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0-9" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7-5" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4006-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5" />
-      <stop
-         id="stop5813-8-1"
-         offset="0.51428574"
-         style="stop-color:#e85708;stop-opacity:0.95686275;" />
-      <stop
-         style="stop-color:#e80808;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-6"
-       id="linearGradient4004-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-13.919877,95.08267)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302"
-       xlink:href="#linearGradient4937-6-6"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7-5"
-       id="radialGradient4337-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7-5">
-      <stop
-         style="stop-color:#33aaee;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-0" />
-      <stop
-         id="stop5813-8-1-6"
-         offset="0.61061949"
-         style="stop-color:#4ebeff;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#2db2ff;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-4" />
-    </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter5815-7-9-8"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.42678198"
-         id="feGaussianBlur5817-6-1-3" />
-    </filter>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-4"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3939-3-7-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-05" />
-      <stop
-         id="stop5813-8-1-2"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-1" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-6"
-       xlink:href="#linearGradient4937-6-6-24"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-24">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-4" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130-8"
-       xlink:href="#linearGradient4937-6-6-2-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2-7">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2-4" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="621.81409"
-       x1="202.48863"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4865"
-       xlink:href="#linearGradient4574"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-16.434173"
-     inkscape:cy="30.787331"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer4"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     fit-margin-top="2.7755576e-17"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true">
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="Pointer EQ red"
-     style="display:inline"
-     transform="translate(-1,-1)">
-    <path
-       style="fill:url(#linearGradient4302);fill-opacity:1;stroke:none;display:inline"
-       d="m 15.3,3.0844792 c 0,-0.9175 0.56725,-1.7192 1.7,-1.7192 1.07944,0 1.7,0.79317 1.7,1.7192 0,2.61633 0.001,7.5441498 0.001,7.5441498 -0.004,1.051881 -0.68283,1.721501 -1.6999,1.721501 -1.01707,0 -1.7,-0.65763 -1.7,-1.721501 -0.007,-3.9168098 -10e-4,-3.8763698 -10e-4,-7.5441498 z"
-       id="rect5578-8-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscczccc" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b4b4b4;fill-opacity:1;stroke:none;stroke-width:1.10780871000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 12.8125,8.375 C 8.5101381,10.449216 6.2941972,15.444786 7.84375,20.09375 9.5259413,25.1404 14.984684,27.869685 20.03125,26.1875 25.077838,24.505307 27.838414,19.046642 26.15625,14 25.299917,11.430925 23.449925,9.4650358 21.1875,8.375 l 0,1.78125 c 1.592102,0.957272 2.864943,2.438531 3.5,4.34375 1.417976,4.254055 -0.870996,8.832002 -5.125,10.25 -4.253976,1.41799 -8.832,-0.870936 -10.25,-5.125 -1.2227691,-3.668549 0.3253826,-7.553596 3.5,-9.46875 l 0,-1.78125 z"
-       id=" path4669-5-5-8-2-4-3"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer6"
-     inkscape:label="Pointer GAIN blue"
-     style="display:none"
-     transform="translate(-1,-1)">
-    <path
-       style="fill:url(#linearGradient3130);fill-opacity:1;stroke:none;display:inline"
-       d="m 15.3,3.0844784 c 0,-0.9175 0.56725,-1.7192 1.7,-1.7192 1.07944,0 1.7,0.79317 1.7,1.7192 0,2.61633 0.001,7.5441496 0.001,7.5441496 -0.004,1.051882 -0.68283,1.721502 -1.6999,1.721502 -1.01707,0 -1.7,-0.65763 -1.7,-1.721502 -0.007,-3.9168096 -10e-4,-3.8763696 -10e-4,-7.5441496 z"
-       id="rect5578-8-2-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscczccc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient4337-8);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter5815-7-9-8)"
-       id="path3936-7-1-8"
-       sodipodi:cx="366.93793"
-       sodipodi:cy="355.35693"
-       sodipodi:rx="21.465742"
-       sodipodi:ry="21.213203"
-       d="m 388.40367,355.35693 c 0,11.71573 -9.61054,21.21321 -21.46574,21.21321 -11.8552,0 -21.46574,-9.49748 -21.46574,-21.21321 0,-11.71573 9.61054,-21.2132 21.46574,-21.2132 11.8552,0 21.46574,9.49747 21.46574,21.2132 z"
-       transform="matrix(0.07558908,0,0,0.07644756,-10.7365,-24.17919)" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#9c9c9c;fill-opacity:1;stroke:none;stroke-width:1.10780871;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 12.8125,8.375 C 8.5101381,10.449216 6.2941972,15.444786 7.84375,20.09375 9.5259413,25.1404 14.984684,27.869685 20.03125,26.1875 25.077838,24.505307 27.838414,19.046642 26.15625,14 25.299917,11.430925 23.449925,9.4650358 21.1875,8.375 l 0,1.78125 c 1.592102,0.957272 2.864943,2.438531 3.5,4.34375 1.417976,4.254055 -0.870996,8.832002 -5.125,10.25 -4.253976,1.41799 -8.832,-0.870936 -10.25,-5.125 -1.2227691,-3.668549 0.3253826,-7.553596 3.5,-9.46875 l 0,-1.78125 z"
-       id=" path4669-5-5-8-2-4-6"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer8"
-     inkscape:label="Pointer FX yellow"
-     style="display:none"
-     transform="translate(-1,-1)">
-    <path
-       style="fill:url(#linearGradient4865);fill-opacity:1;stroke:none;display:inline"
-       d="m 15.30149,4.9185362 c 0,-0.9175 0.56725,-1.7192 1.7,-1.7192 1.07944,0 1.7,0.79317 1.7,1.7192 L 18.701,10.628628 c -0.004,1.051882 -0.68283,1.721502 -1.6999,1.721502 -1.01707,0 -1.7,-0.65763 -1.7,-1.721502 0,0 0.0015,1.834058 3.9e-4,-5.7100918 z"
-       id="rect5578-8-2-8-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscczcc" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#c8c8c8;fill-opacity:1;stroke:none;stroke-width:1.10780871;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 12.8125,8.375 C 8.5101381,10.449216 6.2941972,15.444786 7.84375,20.09375 9.5259413,25.1404 14.984684,27.869685 20.03125,26.1875 25.077838,24.505307 27.838414,19.046642 26.15625,14 25.299917,11.430925 23.449925,9.4650358 21.1875,8.375 l 0,1.78125 c 1.592102,0.957272 2.864943,2.438531 3.5,4.34375 1.417976,4.254055 -0.870996,8.832002 -5.125,10.25 -4.253976,1.41799 -8.832,-0.870936 -10.25,-5.125 -1.2227691,-3.668549 0.3253826,-7.553596 3.5,-9.46875 l 0,-1.78125 z"
-       id=" path4669-5-5-8-2-4-7"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="30" width="30" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path d="m13.407647,3.673628c0-0.8601562,0.531797-1.61175,1.59375-1.61175,1.011975,0,1.59375,0.7435969,1.59375,1.61175l-0.00046,5.3532111c-0.0038,0.9861389-0.640153,1.6139079-1.593656,1.6139079s-1.59375-0.616528-1.59375-1.6139079c0,0,0.0014,1.7194289,0.000366-5.3532111z" stroke="#0f0f0f" stroke-dasharray="none" stroke-miterlimit="4" stroke-width="1.5" fill="#41b5ff"/>
+ <path fill="#e90808" d="m13.407647,3.6736285c0-0.8601562,0.531797-1.61175,1.59375-1.61175,1.011975,0,1.59375,0.7435969,1.59375,1.61175l-0.00046,5.3532111c-0.0038,0.9861384-0.640153,1.6139084-1.593656,1.6139084s-1.59375-0.616528-1.59375-1.6139084c0,0,0.0014,1.7194284,0.000366-5.3532111z"/>
 </svg>
diff --git a/res/skins/Tango/knobs_sliders/knob_red_top.svg b/res/skins/Tango/knobs_sliders/knob_red_top.svg
deleted file mode 100644
index 70addc93f85b..000000000000
--- a/res/skins/Tango/knobs_sliders/knob_red_top.svg
+++ /dev/null
@@ -1,907 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="knob_indicator_red.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4574">
-      <stop
-         style="stop-color:#ffb401;stop-opacity:1;"
-         offset="0"
-         id="stop4576" />
-      <stop
-         style="stop-color:#c68c00;stop-opacity:1;"
-         offset="1"
-         id="stop4578" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3846">
-      <stop
-         style="stop-color:#b0b0b0;stop-opacity:1;"
-         offset="0"
-         id="stop3848" />
-      <stop
-         style="stop-color:#585858;stop-opacity:0;"
-         offset="1"
-         id="stop3850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4937">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3939">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941" />
-      <stop
-         id="stop5813"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5461">
-      <stop
-         id="stop5463"
-         offset="0"
-         style="stop-color:#b9dcff;stop-opacity:1;" />
-      <stop
-         id="stop5465"
-         offset="1"
-         style="stop-color:#0d0d0d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443" />
-      <stop
-         style="stop-color:#343434;stop-opacity:1;"
-         offset="1"
-         id="stop5445" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5483-8"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5441-4">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441-7">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-4" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4-6"
-       id="linearGradient5573-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692" />
-    <linearGradient
-       id="linearGradient5441-4-6">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2-5" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3945"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5024"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(54.522364,18.173742)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5032"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-57.471498)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5265"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5267"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5791"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5847"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3837"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3839"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3841"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937"
-       id="linearGradient4945"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48778"
-       y2="634.36542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient4947"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3"
-       id="radialGradient4947-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2" />
-      <stop
-         id="stop5813-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6"
-       id="linearGradient3142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-234.5901,-615.11102)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.257316,0,0,1,-252.5901,-618.29518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3935"
-       xlink:href="#linearGradient4937-6"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9"
-       xlink:href="#Grad0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5"
-         style="stop-color:#060606;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop12-7"
-         style="stop-color:#343434;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846"
-       id="linearGradient3852"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9-5"
-       xlink:href="#Grad0-8-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929" />
-      <stop
-         id="stop12-7-9"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846-6"
-       id="linearGradient3852-5"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3846-6">
-      <stop
-         id="stop3927"
-         offset="0"
-         style="stop-color:#7c7c7c;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3850-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898"
-       xlink:href="#Grad0-8-9"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-2"
-       id="radialGradient4006-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-1" />
-      <stop
-         id="stop5813-8-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9"
-       id="linearGradient4004-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898-0"
-       xlink:href="#Grad0-8-9-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9-5"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4-7"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929-9" />
-      <stop
-         id="stop12-7-9-6"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9-7"
-       id="linearGradient4004-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9-7">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0-9" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7-5" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4006-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5" />
-      <stop
-         id="stop5813-8-1"
-         offset="0.51428574"
-         style="stop-color:#e85708;stop-opacity:0.95686275;" />
-      <stop
-         style="stop-color:#e80808;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-6"
-       id="linearGradient4004-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-13.919877,95.08267)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302"
-       xlink:href="#linearGradient4937-6-6"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7-5"
-       id="radialGradient4337-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7-5">
-      <stop
-         style="stop-color:#33aaee;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-0" />
-      <stop
-         id="stop5813-8-1-6"
-         offset="0.61061949"
-         style="stop-color:#4ebeff;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#2db2ff;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-4" />
-    </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter5815-7-9-8"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.42678198"
-         id="feGaussianBlur5817-6-1-3" />
-    </filter>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-4"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3939-3-7-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-05" />
-      <stop
-         id="stop5813-8-1-2"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-1" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-6"
-       xlink:href="#linearGradient4937-6-6-24"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-24">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-4" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130-8"
-       xlink:href="#linearGradient4937-6-6-2-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2-7">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2-4" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="621.81409"
-       x1="202.48863"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4865"
-       xlink:href="#linearGradient4574"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="9.4637676"
-     inkscape:cy="25.524826"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer4"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     fit-margin-top="2.7755576e-17"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true">
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="Pointer EQ red"
-     style="display:inline"
-     transform="translate(-1,-1)">
-    <path
-       style="fill:url(#linearGradient4302);fill-opacity:1;stroke:none;display:inline"
-       d="m 15.3,3.0844792 c 0,-0.9175 0.56725,-1.7192 1.7,-1.7192 1.07944,0 1.7,0.79317 1.7,1.7192 0,2.61633 0.001,7.5441498 0.001,7.5441498 -0.004,1.051881 -0.68283,1.721501 -1.6999,1.721501 -1.01707,0 -1.7,-0.65763 -1.7,-1.721501 -0.007,-3.9168098 -10e-4,-3.8763698 -10e-4,-7.5441498 z"
-       id="rect5578-8-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscczccc" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#0f0f0f;fill-opacity:1;stroke:none;stroke-width:1.10780871000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 12.8125,8.375 C 8.5101381,10.449216 6.2941972,15.444786 7.84375,20.09375 9.5259413,25.1404 14.984684,27.869685 20.03125,26.1875 25.077838,24.505307 27.838414,19.046642 26.15625,14 25.299917,11.430925 23.449925,9.4650358 21.1875,8.375 l 0,1.78125 c 1.592102,0.957272 2.864943,2.438531 3.5,4.34375 1.417976,4.254055 -0.870996,8.832002 -5.125,10.25 -4.253976,1.41799 -8.832,-0.870936 -10.25,-5.125 -1.2227691,-3.668549 0.3253826,-7.553596 3.5,-9.46875 l 0,-1.78125 z"
-       id=" path4669-5-5-8-2-4-3"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer6"
-     inkscape:label="Pointer GAIN blue"
-     style="display:none"
-     transform="translate(-1,-1)">
-    <path
-       style="fill:url(#linearGradient3130);fill-opacity:1;stroke:none;display:inline"
-       d="m 15.3,3.0844784 c 0,-0.9175 0.56725,-1.7192 1.7,-1.7192 1.07944,0 1.7,0.79317 1.7,1.7192 0,2.61633 0.001,7.5441496 0.001,7.5441496 -0.004,1.051882 -0.68283,1.721502 -1.6999,1.721502 -1.01707,0 -1.7,-0.65763 -1.7,-1.721502 -0.007,-3.9168096 -10e-4,-3.8763696 -10e-4,-7.5441496 z"
-       id="rect5578-8-2-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscczccc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient4337-8);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter5815-7-9-8)"
-       id="path3936-7-1-8"
-       sodipodi:cx="366.93793"
-       sodipodi:cy="355.35693"
-       sodipodi:rx="21.465742"
-       sodipodi:ry="21.213203"
-       d="m 388.40367,355.35693 c 0,11.71573 -9.61054,21.21321 -21.46574,21.21321 -11.8552,0 -21.46574,-9.49748 -21.46574,-21.21321 0,-11.71573 9.61054,-21.2132 21.46574,-21.2132 11.8552,0 21.46574,9.49747 21.46574,21.2132 z"
-       transform="matrix(0.07558908,0,0,0.07644756,-10.7365,-24.17919)" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#9c9c9c;fill-opacity:1;stroke:none;stroke-width:1.10780871;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 12.8125,8.375 C 8.5101381,10.449216 6.2941972,15.444786 7.84375,20.09375 9.5259413,25.1404 14.984684,27.869685 20.03125,26.1875 25.077838,24.505307 27.838414,19.046642 26.15625,14 25.299917,11.430925 23.449925,9.4650358 21.1875,8.375 l 0,1.78125 c 1.592102,0.957272 2.864943,2.438531 3.5,4.34375 1.417976,4.254055 -0.870996,8.832002 -5.125,10.25 -4.253976,1.41799 -8.832,-0.870936 -10.25,-5.125 -1.2227691,-3.668549 0.3253826,-7.553596 3.5,-9.46875 l 0,-1.78125 z"
-       id=" path4669-5-5-8-2-4-6"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer8"
-     inkscape:label="Pointer FX yellow"
-     style="display:none"
-     transform="translate(-1,-1)">
-    <path
-       style="fill:url(#linearGradient4865);fill-opacity:1;stroke:none;display:inline"
-       d="m 15.30149,4.9185362 c 0,-0.9175 0.56725,-1.7192 1.7,-1.7192 1.07944,0 1.7,0.79317 1.7,1.7192 L 18.701,10.628628 c -0.004,1.051882 -0.68283,1.721502 -1.6999,1.721502 -1.01707,0 -1.7,-0.65763 -1.7,-1.721502 0,0 0.0015,1.834058 3.9e-4,-5.7100918 z"
-       id="rect5578-8-2-8-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscczcc" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#c8c8c8;fill-opacity:1;stroke:none;stroke-width:1.10780871;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 12.8125,8.375 C 8.5101381,10.449216 6.2941972,15.444786 7.84375,20.09375 9.5259413,25.1404 14.984684,27.869685 20.03125,26.1875 25.077838,24.505307 27.838414,19.046642 26.15625,14 25.299917,11.430925 23.449925,9.4650358 21.1875,8.375 l 0,1.78125 c 1.592102,0.957272 2.864943,2.438531 3.5,4.34375 1.417976,4.254055 -0.870996,8.832002 -5.125,10.25 -4.253976,1.41799 -8.832,-0.870936 -10.25,-5.125 -1.2227691,-3.668549 0.3253826,-7.553596 3.5,-9.46875 l 0,-1.78125 z"
-       id=" path4669-5-5-8-2-4-7"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/res/skins/Tango/knobs_sliders/knob_tiny_red.svg b/res/skins/Tango/knobs_sliders/knob_tiny_red.svg
index 061f16615eeb..c01ee39a14ca 100644
--- a/res/skins/Tango/knobs_sliders/knob_tiny_red.svg
+++ b/res/skins/Tango/knobs_sliders/knob_tiny_red.svg
@@ -1,974 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="knob_tiny_red.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4574">
-      <stop
-         style="stop-color:#ffb401;stop-opacity:1;"
-         offset="0"
-         id="stop4576" />
-      <stop
-         style="stop-color:#c68c00;stop-opacity:1;"
-         offset="1"
-         id="stop4578" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3846">
-      <stop
-         style="stop-color:#b0b0b0;stop-opacity:1;"
-         offset="0"
-         id="stop3848" />
-      <stop
-         style="stop-color:#585858;stop-opacity:0;"
-         offset="1"
-         id="stop3850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4937">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3939">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941" />
-      <stop
-         id="stop5813"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5461">
-      <stop
-         id="stop5463"
-         offset="0"
-         style="stop-color:#b9dcff;stop-opacity:1;" />
-      <stop
-         id="stop5465"
-         offset="1"
-         style="stop-color:#0d0d0d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443" />
-      <stop
-         style="stop-color:#343434;stop-opacity:1;"
-         offset="1"
-         id="stop5445" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5483-8"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5441-4">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441-7">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-4" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4-6"
-       id="linearGradient5573-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692" />
-    <linearGradient
-       id="linearGradient5441-4-6">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2-5" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3945"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5024"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(54.522364,18.173742)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5032"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-57.471498)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5265"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5267"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5791"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5847"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3837"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3839"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3841"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937"
-       id="linearGradient4945"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48778"
-       y2="634.36542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient4947"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3"
-       id="radialGradient4947-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2" />
-      <stop
-         id="stop5813-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6"
-       id="linearGradient3142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-234.5901,-615.11102)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.257316,0,0,1,-252.5901,-618.29518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3935"
-       xlink:href="#linearGradient4937-6"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9"
-       xlink:href="#Grad0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5"
-         style="stop-color:#060606;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop12-7"
-         style="stop-color:#343434;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846"
-       id="linearGradient3852"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9-5"
-       xlink:href="#Grad0-8-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929" />
-      <stop
-         id="stop12-7-9"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846-6"
-       id="linearGradient3852-5"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3846-6">
-      <stop
-         id="stop3927"
-         offset="0"
-         style="stop-color:#7c7c7c;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3850-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898"
-       xlink:href="#Grad0-8-9"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-2"
-       id="radialGradient4006-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-1" />
-      <stop
-         id="stop5813-8-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9"
-       id="linearGradient4004-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898-0"
-       xlink:href="#Grad0-8-9-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9-5"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4-7"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929-9" />
-      <stop
-         id="stop12-7-9-6"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9-7"
-       id="linearGradient4004-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9-7">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0-9" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7-5" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4006-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5" />
-      <stop
-         id="stop5813-8-1"
-         offset="0.51428574"
-         style="stop-color:#e85708;stop-opacity:0.95686275;" />
-      <stop
-         style="stop-color:#e80808;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-6"
-       id="linearGradient4004-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-13.919877,95.08267)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7-5"
-       id="radialGradient4337-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7-5">
-      <stop
-         style="stop-color:#33aaee;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-0" />
-      <stop
-         id="stop5813-8-1-6"
-         offset="0.61061949"
-         style="stop-color:#4ebeff;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#2db2ff;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-4" />
-    </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter5815-7-9-8"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.42678198"
-         id="feGaussianBlur5817-6-1-3" />
-    </filter>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-4"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3939-3-7-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-05" />
-      <stop
-         id="stop5813-8-1-2"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-1" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-6"
-       xlink:href="#linearGradient4937-6-6-24"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-24">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-4" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130-8"
-       xlink:href="#linearGradient4937-6-6-2-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2-7">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2-4" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="621.81409"
-       x1="202.48863"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4865"
-       xlink:href="#linearGradient4574"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="621.81409"
-       x1="202.48863"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4865-3"
-       xlink:href="#linearGradient4574-6"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4574-6">
-      <stop
-         style="stop-color:#ffb401;stop-opacity:1;"
-         offset="0"
-         id="stop4576-7" />
-      <stop
-         style="stop-color:#c68c00;stop-opacity:1;"
-         offset="1"
-         id="stop4578-5" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="621.81409"
-       x1="202.48863"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-231.09059,-516.93334)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3156"
-       xlink:href="#linearGradient4574-6"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4574-6"
-       id="linearGradient3332"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-229.27809,-518.17908)"
-       x1="202.48863"
-       y1="621.81409"
-       x2="202.48849"
-       y2="628.41626" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="45.254836"
-     inkscape:cx="9.5057101"
-     inkscape:cy="16.435943"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer4"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     fit-margin-top="2.7755576e-17"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-center="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-global="true">
-    <sodipodi:guide
-       orientation="0,1"
-       position="11,12.71875"
-       id="guide3057" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="12.654297,14.339844"
-       id="guide3884" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="14.46875,16.46875"
-       id="guide3888" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="9.345703,14.339844"
-       id="guide3182" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="19,25.812"
-       id="guide3184" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="3,10.96875"
-       id="guide3942" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="7.53125,16.5"
-       id="guide3944" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="11,2.96875"
-       id="guide3946" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3136"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="14.30161,21"
-       id="guide3132" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="Pointer EQ red"
-     style="display:inline"
-     transform="translate(-1,-11)">
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 11,1.03125 c -0.452171,0 -0.883661,0.142295 -1.1875,0.4375 -0.303838,0.295206 -0.466962,0.730882 -0.46875,1.1875 l 0,5 c 0,0.460453 0.163315,0.892749 0.46875,1.1875 0.305435,0.29475 0.737137,0.4375 1.1875,0.4375 0.452171,0 0.883661,-0.142295 1.1875,-0.4375 0.303838,-0.295206 0.466962,-0.730882 0.46875,-1.1875 l 0,-5 c 0,-0.460453 -0.163315,-0.892749 -0.46875,-1.1875 C 11.882065,1.174 11.450363,1.03125 11,1.03125 z"
-       transform="translate(1,11)"
-       id="rect5578-8-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssccsssccss" />
-    <path
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 7.53125 3.84375 C 4.8578454 5.1376142 3 7.8611281 3 11.03125 C 3 15.449529 6.581722 19.03125 11 19.03125 C 15.418278 19.03125 19 15.449529 19 11.03125 C 19 7.8587143 17.145605 5.1364572 14.46875 3.84375 L 14.46875 5.53125 C 16.310379 6.6893621 17.53125 8.6935972 17.53125 11.03125 C 17.53125 14.646206 14.614955 17.59375 11 17.59375 C 7.3850452 17.59375 4.46875 14.646206 4.46875 11.03125 C 4.46875 8.6883368 5.6834092 6.6577669 7.53125 5.5 L 7.53125 3.84375 z "
-       id="path3908"
-       transform="translate(1,11)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer6"
-     inkscape:label="Pointer GAIN blue"
-     style="display:none"
-     transform="translate(-1,-11)">
-    <path
-       style="fill:url(#linearGradient3130);fill-opacity:1;stroke:none;display:inline"
-       d="m 15.3,3.0844784 c 0,-0.9175 0.56725,-1.7192 1.7,-1.7192 1.07944,0 1.7,0.79317 1.7,1.7192 0,2.61633 0.001,7.5441496 0.001,7.5441496 -0.004,1.051882 -0.68283,1.721502 -1.6999,1.721502 -1.01707,0 -1.7,-0.65763 -1.7,-1.721502 -0.007,-3.9168096 -10e-4,-3.8763696 -10e-4,-7.5441496 z"
-       id="rect5578-8-2-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscczccc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient4337-8);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter5815-7-9-8)"
-       id="path3936-7-1-8"
-       sodipodi:cx="366.93793"
-       sodipodi:cy="355.35693"
-       sodipodi:rx="21.465742"
-       sodipodi:ry="21.213203"
-       d="m 388.40367,355.35693 c 0,11.71573 -9.61054,21.21321 -21.46574,21.21321 -11.8552,0 -21.46574,-9.49748 -21.46574,-21.21321 0,-11.71573 9.61054,-21.2132 21.46574,-21.2132 11.8552,0 21.46574,9.49747 21.46574,21.2132 z"
-       transform="matrix(0.07558908,0,0,0.07644756,-10.7365,-24.17919)" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#9c9c9c;fill-opacity:1;stroke:none;stroke-width:1.10780871;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 12.8125,8.375 C 8.5101381,10.449216 6.2941972,15.444786 7.84375,20.09375 9.5259413,25.1404 14.984684,27.869685 20.03125,26.1875 25.077838,24.505307 27.838414,19.046642 26.15625,14 25.299917,11.430925 23.449925,9.4650358 21.1875,8.375 l 0,1.78125 c 1.592102,0.957272 2.864943,2.438531 3.5,4.34375 1.417976,4.254055 -0.870996,8.832002 -5.125,10.25 -4.253976,1.41799 -8.832,-0.870936 -10.25,-5.125 -1.2227691,-3.668549 0.3253826,-7.553596 3.5,-9.46875 l 0,-1.78125 z"
-       id=" path4669-5-5-8-2-4-6"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer8"
-     inkscape:label="Pointer FX yellow"
-     style="display:none"
-     transform="translate(-1,-11)">
-    <path
-       style="fill:url(#linearGradient4865);fill-opacity:1;stroke:none;display:inline"
-       d="m 15.30149,4.9185362 c 0,-0.9175 0.56725,-1.7192 1.7,-1.7192 1.07944,0 1.7,0.79317 1.7,1.7192 L 18.701,10.628628 c -0.004,1.051882 -0.68283,1.721502 -1.6999,1.721502 -1.01707,0 -1.7,-0.65763 -1.7,-1.721502 0,0 0.0015,1.834058 3.9e-4,-5.7100918 z"
-       id="rect5578-8-2-8-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscczcc" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#c8c8c8;fill-opacity:1;stroke:none;stroke-width:1.10780871;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 12.8125,8.375 C 8.5101381,10.449216 6.2941972,15.444786 7.84375,20.09375 9.5259413,25.1404 14.984684,27.869685 20.03125,26.1875 25.077838,24.505307 27.838414,19.046642 26.15625,14 25.299917,11.430925 23.449925,9.4650358 21.1875,8.375 l 0,1.78125 c 1.592102,0.957272 2.864943,2.438531 3.5,4.34375 1.417976,4.254055 -0.870996,8.832002 -5.125,10.25 -4.253976,1.41799 -8.832,-0.870936 -10.25,-5.125 -1.2227691,-3.668549 0.3253826,-7.553596 3.5,-9.46875 l 0,-1.78125 z"
-       id=" path4669-5-5-8-2-4-7"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="20" width="20" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path style="block-progression:tb;text-align:start;text-transform:none;text-indent:0;" d="M10,0.95857558c-0.4101086,0-0.80146,0.12905822-1.0770349,0.39680232-0.275574,0.267745-0.4235237,0.662893-0.4251454,1.0770349v4.5348837c0,0.4176201,0.1481229,0.8097026,0.4251454,1.0770349,0.2770224,0.2673314,0.6685661,0.3968023,1.0770349,0.3968023,0.410109,0,0.80146-0.1290583,1.077035-0.3968023,0.275574-0.267745,0.423524-0.662893,0.425145-1.0770349v-4.5348837c0-0.4176202-0.148123-0.8097026-0.425145-1.0770349-0.277023-0.2673314-0.668566-0.39680232-1.077035-0.39680232z" color="#000" stroke="#000" stroke-width=".49999997" fill="#F00"/>
 </svg>
diff --git a/res/skins/Tango/knobs_sliders/knob_white.svg b/res/skins/Tango/knobs_sliders/knob_white.svg
index 60cf2bdab241..897d6269d1c1 100644
--- a/res/skins/Tango/knobs_sliders/knob_white.svg
+++ b/res/skins/Tango/knobs_sliders/knob_white.svg
@@ -1,952 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="knob_white.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4574">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4576" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop4578" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3846">
-      <stop
-         style="stop-color:#b0b0b0;stop-opacity:1;"
-         offset="0"
-         id="stop3848" />
-      <stop
-         style="stop-color:#585858;stop-opacity:0;"
-         offset="1"
-         id="stop3850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4937">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3939">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941" />
-      <stop
-         id="stop5813"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5461">
-      <stop
-         id="stop5463"
-         offset="0"
-         style="stop-color:#b9dcff;stop-opacity:1;" />
-      <stop
-         id="stop5465"
-         offset="1"
-         style="stop-color:#0d0d0d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443" />
-      <stop
-         style="stop-color:#343434;stop-opacity:1;"
-         offset="1"
-         id="stop5445" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5483-8"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5441-4">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441-7">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-4" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4-6"
-       id="linearGradient5573-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692" />
-    <linearGradient
-       id="linearGradient5441-4-6">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2-5" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3945"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5024"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(54.522364,18.173742)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5032"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-57.471498)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5265"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5267"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5791"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5847"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3837"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3839"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3841"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937"
-       id="linearGradient4945"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48778"
-       y2="634.36542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient4947"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3"
-       id="radialGradient4947-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2" />
-      <stop
-         id="stop5813-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6"
-       id="linearGradient3142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-234.5901,-615.11102)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.257316,0,0,1,-252.5901,-618.29518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3935"
-       xlink:href="#linearGradient4937-6"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9"
-       xlink:href="#Grad0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5"
-         style="stop-color:#060606;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop12-7"
-         style="stop-color:#343434;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846"
-       id="linearGradient3852"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9-5"
-       xlink:href="#Grad0-8-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929" />
-      <stop
-         id="stop12-7-9"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846-6"
-       id="linearGradient3852-5"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3846-6">
-      <stop
-         id="stop3927"
-         offset="0"
-         style="stop-color:#7c7c7c;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3850-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898"
-       xlink:href="#Grad0-8-9"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-2"
-       id="radialGradient4006-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-1" />
-      <stop
-         id="stop5813-8-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9"
-       id="linearGradient4004-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898-0"
-       xlink:href="#Grad0-8-9-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9-5"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4-7"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929-9" />
-      <stop
-         id="stop12-7-9-6"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9-7"
-       id="linearGradient4004-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9-7">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0-9" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7-5" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4006-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5" />
-      <stop
-         id="stop5813-8-1"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9" />
-    </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter5815-7-9"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.42678198"
-         id="feGaussianBlur5817-6-1" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-6"
-       id="linearGradient4004-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-13.919877,95.08267)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302"
-       xlink:href="#linearGradient4937-6-6"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7-5"
-       id="radialGradient4337-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7-5">
-      <stop
-         style="stop-color:#33aaee;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-0" />
-      <stop
-         id="stop5813-8-1-6"
-         offset="0.61061949"
-         style="stop-color:#4ebeff;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#2db2ff;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-4" />
-    </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter5815-7-9-8"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.42678198"
-         id="feGaussianBlur5817-6-1-3" />
-    </filter>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-4"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3939-3-7-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-05" />
-      <stop
-         id="stop5813-8-1-2"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-1" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-6"
-       xlink:href="#linearGradient4937-6-6-24"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-24">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-4" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4574"
-       id="linearGradient4580"
-       x1="17.001101"
-       y1="4.4665027"
-       x2="17.001101"
-       y2="12.35013"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.94117647,0,0,0.94117647,0,2)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-6.2985685"
-     inkscape:cy="14.022728"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer8"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="BAK"
-     style="display:none"
-     transform="translate(-3,-5)"
-     sodipodi:insensitive="true">
-    <rect
-       style="fill:#0f0f0f;fill-opacity:0.36224491;stroke:none"
-       id="rect3053"
-       width="34"
-       height="34"
-       x="3"
-       y="3" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Knob"
-     style="display:none"
-     transform="translate(0,-2)">
-    <path
-       d="m 13.791149,8.7524258 c 5.316727,-1.772181 11.063393,1.101187 12.835609,6.4178532 1.772216,5.31664 -1.10116,11.063306 -6.417896,12.835522 C 14.892125,29.777929 9.145433,26.904551 7.373234,21.587903 5.601027,16.271255 8.47443,10.524616 13.791149,8.7524258 z"
-       id=" path4669-2"
-       style="opacity:0.93999999;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.10800004;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 13.791149,7.3772328 c 5.316727,-1.7721809 11.063393,1.101187 12.835609,6.4178532 1.772216,5.31664 -1.10116,11.063305 -6.417896,12.835521 C 14.892125,28.402735 9.145433,25.529358 7.373235,20.21271 5.601027,14.896062 8.47443,9.1494228 13.791149,7.3772328 z"
-       id=" path4669"
-       style="fill:url(#linearGradient3006-9);fill-rule:nonzero;stroke:url(#linearGradient3852);stroke-width:1.10780871;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Ring Moon"
-     style="display:none"
-     transform="translate(-185.48349,-618.88674)">
-    <path
-       d="m 212.11016,630.6818 c 1.77219,5.31673 -1.10118,11.06339 -6.41785,12.83561 -5.31664,1.77221 -11.0633,-1.10116 -12.83552,-6.4179 -1.77213,-5.31674 1.10125,-11.06343 6.4179,-12.83563 5.31665,-1.7722 11.06328,1.1012 12.83547,6.41792 z"
-       id=" path4669-5"
-       style="fill:none;stroke:url(#linearGradient3898);stroke-width:1.10780871;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;display:inline"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Ring solid 1"
-     style="display:none"
-     transform="translate(0,-2)">
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b0b0b0;fill-opacity:1;stroke:none;stroke-width:1.10780871;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 12.8125,7.15625 C 7.7305322,9.3125835 5.0685966,15.049189 6.84375,20.375 8.7106308,25.975727 14.774367,29.023124 20.375,27.15625 25.975659,25.289367 29.0231,19.225718 27.15625,13.625 26.148302,10.601068 23.907778,8.346353 21.1875,7.1875 l 0,0.75 0,1.15625 c 1.974738,1.041217 3.579965,2.802333 4.34375,5.09375 1.573657,4.721112 -0.966444,9.801318 -5.6875,11.375 C 15.122726,27.136172 10.042434,24.596123 8.46875,19.875 7.0538618,15.630056 8.9808912,11.109576 12.8125,9.09375 l 0,-1.1875 c -4.5e-5,-0.2687144 -1.5e-4,-0.5519076 0,-0.75 z"
-       id=" path4669-5-5-8"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer7"
-     inkscape:label="Ring solid smaller"
-     transform="translate(0,-2)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="Pointer red"
-     style="display:none"
-     transform="translate(0,-2)">
-    <path
-       style="fill:url(#linearGradient4302);fill-opacity:1;stroke:none;display:inline"
-       d="m 15.3,3.0844792 c 0,-0.9175 0.56725,-1.7192 1.7,-1.7192 1.07944,0 1.7,0.79317 1.7,1.7192 0,2.61633 0.001,7.5441498 0.001,7.5441498 -0.004,1.051881 -0.68283,1.721501 -1.6999,1.721501 -1.01707,0 -1.7,-0.65763 -1.7,-1.721501 -0.007,-3.9168098 -10e-4,-3.8763698 -10e-4,-7.5441498 z"
-       id="rect5578-8-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscczccc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient4337);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter5815-7-9)"
-       id="path3936-7-1"
-       sodipodi:cx="366.93793"
-       sodipodi:cy="355.35693"
-       sodipodi:rx="21.465742"
-       sodipodi:ry="21.213203"
-       d="m 388.40367,355.35693 c 0,11.71573 -9.61054,21.21321 -21.46574,21.21321 -11.8552,0 -21.46574,-9.49748 -21.46574,-21.21321 0,-11.71573 9.61054,-21.2132 21.46574,-21.2132 11.8552,0 21.46574,9.49747 21.46574,21.2132 z"
-       transform="matrix(0.07558908,0,0,0.07644756,-10.7365,-24.17919)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer6"
-     inkscape:label="Pointer blue"
-     style="display:none"
-     transform="translate(0,-2)">
-    <path
-       style="fill:url(#linearGradient3130);fill-opacity:1;stroke:none;display:inline"
-       d="m 15.3,3.0844784 c 0,-0.9175 0.56725,-1.7192 1.7,-1.7192 1.07944,0 1.7,0.79317 1.7,1.7192 0,2.61633 0.001,7.5441496 0.001,7.5441496 -0.004,1.051882 -0.68283,1.721502 -1.6999,1.721502 -1.01707,0 -1.7,-0.65763 -1.7,-1.721502 -0.007,-3.9168096 -10e-4,-3.8763696 -10e-4,-7.5441496 z"
-       id="rect5578-8-2-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscczccc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient4337-8);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter5815-7-9-8)"
-       id="path3936-7-1-8"
-       sodipodi:cx="366.93793"
-       sodipodi:cy="355.35693"
-       sodipodi:rx="21.465742"
-       sodipodi:ry="21.213203"
-       d="m 388.40367,355.35693 c 0,11.71573 -9.61054,21.21321 -21.46574,21.21321 -11.8552,0 -21.46574,-9.49748 -21.46574,-21.21321 0,-11.71573 9.61054,-21.2132 21.46574,-21.2132 11.8552,0 21.46574,9.49747 21.46574,21.2132 z"
-       transform="matrix(0.07558908,0,0,0.07644756,-10.7365,-24.17919)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer8"
-     inkscape:label="Pointer white"
-     transform="translate(0,-2)">
-    <path
-       style="fill:url(#linearGradient4580);fill-opacity:1;stroke:none;display:inline"
-       d="m 14.4,4.9030385 c 0,-0.8635294 0.533882,-1.6180706 1.6,-1.6180706 1.015944,0 1.6,0.7465129 1.6,1.6180706 0,2.4624282 9.41e-4,7.1003765 9.41e-4,7.1003765 -0.0038,0.990006 -0.642663,1.620237 -1.599906,1.620237 -0.957242,0 -1.6,-0.618946 -1.6,-1.620237 -0.0066,-3.6864094 -9.41e-4,-3.6483483 -9.41e-4,-7.1003765 z"
-       id="rect5578-8-2-82"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscczccc" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b4b4b4;fill-opacity:1;stroke:none;stroke-width:1.10780871;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 11.8125,9.375 C 7.5101381,11.449216 5.2941972,16.444786 6.84375,21.09375 8.5259413,26.1404 13.984684,28.869685 19.03125,27.1875 24.077838,25.505307 26.838414,20.046642 25.15625,15 24.299917,12.430925 22.449925,10.465036 20.1875,9.375 l 0,1.78125 c 1.592102,0.957272 2.864943,2.438531 3.5,4.34375 1.417976,4.254055 -0.870996,8.832002 -5.125,10.25 -4.253976,1.41799 -8.832,-0.870936 -10.25,-5.125 -1.2227691,-3.668549 0.3253826,-7.553596 3.5,-9.46875 l 0,-1.78125 z"
-       id=" path4669-5-5-8-2-4-3"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="30" width="30" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <defs></defs>
+ <path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" fill="#0f0f0f" d="m15,0.41949153c-0.88485,0-1.759683,0.35845401-2.3125,0.98069947-0.552817,0.6222455-0.78125,1.4345229-0.78125,2.1828473v5.4096649c0.04128,0.7668692,0.331673,1.7286018,0.875,2.2777538,0.588495,0.594804,1.418702,0.885793,2.21875,0.885793,0.805942,0,1.634701-0.323082,2.21875-0.917429,0.584049-0.594346,0.871861-1.4215865,0.875-2.2461178v-5.4096649c0-0.7786286-0.258595-1.5757612-0.8125-2.1828473-0.553905-0.60708606-1.407864-0.98069947-2.28125-0.98069947z"/>
+ <path d="M13.510345,2.8062773c0-0.8039756,0.497062-1.5064795,1.489655-1.5064795,0.945879,0,1.489655,0.6950292,1.489655,1.5064795,0,2.2926056,0.000876,6.6106953,0.000876,6.6106953-0.0035,0.9217294-0.598341,1.5084964-1.489567,1.5084964s-1.489656-0.57626-1.489656-1.5084964c-0.0061-3.4321742-0.000876-3.396738-0.000876-6.6106953z" fill="#FFF"/>
 </svg>
diff --git a/res/skins/Tango/knobs_sliders/knob_yellow.svg b/res/skins/Tango/knobs_sliders/knob_yellow.svg
index a08e6e1a54a8..14e3743f284e 100644
--- a/res/skins/Tango/knobs_sliders/knob_yellow.svg
+++ b/res/skins/Tango/knobs_sliders/knob_yellow.svg
@@ -1,851 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="knob_yellow.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4574">
-      <stop
-         style="stop-color:#ffb401;stop-opacity:1;"
-         offset="0"
-         id="stop4576" />
-      <stop
-         style="stop-color:#c68c00;stop-opacity:1;"
-         offset="1"
-         id="stop4578" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3846">
-      <stop
-         style="stop-color:#b0b0b0;stop-opacity:1;"
-         offset="0"
-         id="stop3848" />
-      <stop
-         style="stop-color:#585858;stop-opacity:0;"
-         offset="1"
-         id="stop3850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4937">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3939">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941" />
-      <stop
-         id="stop5813"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5461">
-      <stop
-         id="stop5463"
-         offset="0"
-         style="stop-color:#b9dcff;stop-opacity:1;" />
-      <stop
-         id="stop5465"
-         offset="1"
-         style="stop-color:#0d0d0d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443" />
-      <stop
-         style="stop-color:#343434;stop-opacity:1;"
-         offset="1"
-         id="stop5445" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5483-8"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5441-4">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441-7">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-4" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4-6"
-       id="linearGradient5573-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692" />
-    <linearGradient
-       id="linearGradient5441-4-6">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2-5" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3945"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5024"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(54.522364,18.173742)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5032"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-57.471498)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5265"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5267"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5791"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5847"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3837"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3839"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3841"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937"
-       id="linearGradient4945"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48778"
-       y2="634.36542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient4947"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3"
-       id="radialGradient4947-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2" />
-      <stop
-         id="stop5813-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6"
-       id="linearGradient3142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-234.5901,-615.11102)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.257316,0,0,1,-252.5901,-618.29518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3935"
-       xlink:href="#linearGradient4937-6"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9"
-       xlink:href="#Grad0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5"
-         style="stop-color:#060606;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop12-7"
-         style="stop-color:#343434;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846"
-       id="linearGradient3852"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="linearGradient3006-9-5"
-       xlink:href="#Grad0-8-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929" />
-      <stop
-         id="stop12-7-9"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3846-6"
-       id="linearGradient3852-5"
-       x1="6.2958603"
-       y1="17.003906"
-       x2="27.70414"
-       y2="17.003906"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3846-6">
-      <stop
-         id="stop3927"
-         offset="0"
-         style="stop-color:#7c7c7c;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3850-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898"
-       xlink:href="#Grad0-8-9"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-2"
-       id="radialGradient4006-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-1" />
-      <stop
-         id="stop5813-8-8"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9"
-       id="linearGradient4004-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)"
-       y2="17.003906"
-       x2="27.70414"
-       y1="17.003906"
-       x1="6.2958603"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3898-0"
-       xlink:href="#Grad0-8-9-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="16.8985"
-       y1="20.7381"
-       x2="9.2021799"
-       y2="-2.3512399"
-       id="Grad0-8-9-5"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop10-5-4-7"
-         style="stop-color:#060606;stop-opacity:0;"
-         offset="0" />
-      <stop
-         offset="0.34285715"
-         style="stop-color:#ffffff;stop-opacity:0;"
-         id="stop3929-9" />
-      <stop
-         id="stop12-7-9-6"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-9-7"
-       id="linearGradient4004-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-9-7">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-0-9" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-7-5" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4006-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5" />
-      <stop
-         id="stop5813-8-1"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937-6-6"
-       id="linearGradient4004-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-13.919877,95.08267)"
-       x1="202.49004"
-       y1="623.47784"
-       x2="202.48849"
-       y2="628.41626" />
-    <linearGradient
-       id="linearGradient4937-6-6">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302"
-       xlink:href="#linearGradient4937-6-6"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7"
-       id="radialGradient4337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939-3-7-5"
-       id="radialGradient4337-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       id="linearGradient3939-3-7-5">
-      <stop
-         style="stop-color:#33aaee;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-0" />
-      <stop
-         id="stop5813-8-1-6"
-         offset="0.61061949"
-         style="stop-color:#4ebeff;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#2db2ff;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-4"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130"
-       xlink:href="#linearGradient4937-6-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3939-3-7-2">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941-2-5-05" />
-      <stop
-         id="stop5813-8-1-2"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943-54-9-1" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4302-6"
-       xlink:href="#linearGradient4937-6-6-24"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-24">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-4" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="623.47784"
-       x1="202.49004"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3130-8"
-       xlink:href="#linearGradient4937-6-6-2-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4937-6-6-2-7">
-      <stop
-         style="stop-color:#0897e9;stop-opacity:1;"
-         offset="0"
-         id="stop4939-3-8-2-4" />
-      <stop
-         style="stop-color:#0074b6;stop-opacity:1;"
-         offset="1"
-         id="stop4941-8-6-9-4" />
-    </linearGradient>
-    <linearGradient
-       y2="628.41626"
-       x2="202.48849"
-       y1="621.81409"
-       x1="202.48863"
-       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4865"
-       xlink:href="#linearGradient4574"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="21.118569"
-     inkscape:cy="3.3246674"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer8"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     fit-margin-top="2.7755576e-17"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:snap-page="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer8"
-     inkscape:label="Pointer FX yellow"
-     style="display:inline"
-     transform="translate(-1,-1)">
-    <path
-       style="fill:url(#linearGradient4865);fill-opacity:1;stroke:none;display:inline"
-       d="m 15.30149,4.9185362 c 0,-0.9175 0.56725,-1.7192 1.7,-1.7192 1.07944,0 1.7,0.79317 1.7,1.7192 L 18.701,10.628628 c -0.004,1.051882 -0.68283,1.721502 -1.6999,1.721502 -1.01707,0 -1.7,-0.65763 -1.7,-1.721502 0,0 0.0015,1.834058 3.9e-4,-5.7100918 z"
-       id="rect5578-8-2-8-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscczcc" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b4b4b4;fill-opacity:1;stroke:none;stroke-width:1.10780871;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 12.8125,8.375 C 8.5101381,10.449216 6.2941972,15.444786 7.84375,20.09375 9.5259413,25.1404 14.984684,27.869685 20.03125,26.1875 25.077838,24.505307 27.838414,19.046642 26.15625,14 25.299917,11.430925 23.449925,9.4650358 21.1875,8.375 l 0,1.78125 c 1.592102,0.957272 2.864943,2.438531 3.5,4.34375 1.417976,4.254055 -0.870996,8.832002 -5.125,10.25 -4.253976,1.41799 -8.832,-0.870936 -10.25,-5.125 -1.2227691,-3.668549 0.3253826,-7.553596 3.5,-9.46875 l 0,-1.78125 z"
-       id=" path4669-5-5-8-2-4-3"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="30" width="30" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path d="m13.407647,3.673628c0-0.8601562,0.531797-1.61175,1.59375-1.61175,1.011975,0,1.59375,0.7435969,1.59375,1.61175l-0.00046,5.3532111c-0.0038,0.9861389-0.640153,1.6139079-1.593656,1.6139079s-1.59375-0.616528-1.59375-1.6139079c0,0,0.0014,1.7194289,0.000366-5.3532111z" stroke="#0f0f0f" stroke-dasharray="none" stroke-miterlimit="4" stroke-width="1.79999995" fill="#41b5ff"/>
+ <path fill="#ffb401" d="m13.407647,3.6736285c0-0.8601562,0.531797-1.61175,1.59375-1.61175,1.011975,0,1.59375,0.7435969,1.59375,1.61175l-0.00046,5.3532111c-0.0038,0.9861384-0.640153,1.6139084-1.593656,1.6139084s-1.59375-0.616528-1.59375-1.6139084c0,0,0.0014,1.7194284,0.000366-5.3532111z"/>
 </svg>
diff --git a/res/skins/Tango/knobs_sliders/slider_balance_handle.svg b/res/skins/Tango/knobs_sliders/slider_balance_handle.svg
index 29c5e4ac8b27..c93e227912ee 100644
--- a/res/skins/Tango/knobs_sliders/slider_balance_handle.svg
+++ b/res/skins/Tango/knobs_sliders/slider_balance_handle.svg
@@ -1,251 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4451"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="8"
-   height="28"
-   sodipodi:docname="slider_balance_handle.svg"
-   inkscape:export-filename="/home/ronso/.mixxx/skins/FlatNite/volume_slider.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata4457">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4455">
-    <linearGradient
-       id="linearGradient5267"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5269" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3805">
-      <stop
-         id="stop3807"
-         offset="0"
-         style="stop-color:#002464;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.18000001"
-         id="stop3809" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.81819808"
-         id="stop3811" />
-      <stop
-         id="stop3813"
-         offset="1"
-         style="stop-color:#002f64;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3861">
-      <stop
-         style="stop-color:#b4b4b4;stop-opacity:1;"
-         offset="0"
-         id="stop3863" />
-      <stop
-         style="stop-color:#6a6a6a;stop-opacity:1;"
-         offset="1"
-         id="stop3865" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#dc0000;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         id="stop3803"
-         offset="0.09"
-         style="stop-color:#b50000;stop-opacity:1;" />
-      <stop
-         id="stop3801"
-         offset="0.92000002"
-         style="stop-color:#b50000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#920000;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3756">
-      <stop
-         style="stop-color:#acacac;stop-opacity:1;"
-         offset="0"
-         id="stop3758" />
-      <stop
-         style="stop-color:#acacac;stop-opacity:0;"
-         offset="1"
-         id="stop3760" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3791"
-       x1="20.097458"
-       y1="1.9632759"
-       x2="20.097458"
-       y2="100.81083"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3867"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861-9"
-       id="linearGradient3867-7"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3861-9">
-      <stop
-         style="stop-color:#b4b4b4;stop-opacity:1;"
-         offset="0"
-         id="stop3863-4" />
-      <stop
-         style="stop-color:#7a7a7a;stop-opacity:1;"
-         offset="1"
-         id="stop3865-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3968"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3971"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3978"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481"
-       gradientTransform="translate(-0.5,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient4002"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.5,0)"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview4453"
-     showgrid="false"
-     inkscape:zoom="16.000001"
-     inkscape:cx="-17.521392"
-     inkscape:cy="16.548078"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     fit-margin-left="1"
-     fit-margin-right="1"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3014"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Layer"
-     style="display:inline"
-     transform="translate(0,-75)">
-    <rect
-       style="fill:#0872e8;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect3785-3"
-       width="5"
-       height="23.5"
-       x="1.5"
-       y="77.25"
-       rx="2"
-       ry="1.9999999" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="28"><defs><linearGradient id="b"><stop offset="0" stop-color="#b4b4b4"/><stop offset="1" stop-color="#6a6a6a"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#dc0000"/><stop offset=".09" stop-color="#b50000"/><stop offset=".92000002" stop-color="#b50000"/><stop offset="1" stop-color="#920000"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#b4b4b4"/><stop offset="1" stop-color="#7a7a7a"/></linearGradient></defs><rect width="5" height="23.5" rx="2" ry="1.9999999" x="1.5" y="77.25" fill="#0872e8" stroke="#000" stroke-width=".5" transform="translate(0 -75)"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/knobs_sliders/slider_balance_scale.svg b/res/skins/Tango/knobs_sliders/slider_balance_scale.svg
index d9c93ae89c6f..71948cd54448 100644
--- a/res/skins/Tango/knobs_sliders/slider_balance_scale.svg
+++ b/res/skins/Tango/knobs_sliders/slider_balance_scale.svg
@@ -1,204 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3242"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="48"
-   height="28"
-   sodipodi:docname="slider_balance_scale.svg"
-   inkscape:export-filename="/home/ronso/.mixxx/skins/FlatNite/crossfader_slider.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata3248">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3246">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3805"
-       id="linearGradient5279"
-       x1="98"
-       y1="-18"
-       x2="103"
-       y2="-18"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.72222222,-98,103)" />
-    <linearGradient
-       id="linearGradient3805">
-      <stop
-         id="stop3807"
-         offset="0"
-         style="stop-color:#002464;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.18000001"
-         id="stop3809" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.81819808"
-         id="stop3811" />
-      <stop
-         id="stop3813"
-         offset="1"
-         style="stop-color:#002f64;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       y2="-18"
-       x2="103"
-       y1="-18"
-       x1="98"
-       gradientTransform="matrix(1,0,0,0.72222222,-96.5,23.721171)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3031"
-       xlink:href="#linearGradient3805"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview3244"
-     showgrid="false"
-     inkscape:zoom="3.9999998"
-     inkscape:cx="-18.074285"
-     inkscape:cy="20.257419"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer4"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="vector"
-     style="display:inline"
-     transform="translate(0,2)">
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect2989"
-       width="2"
-       height="23"
-       x="3"
-       y="8e-08" />
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-3"
-       width="2"
-       height="14"
-       x="7"
-       y="9" />
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-3-7"
-       width="2"
-       height="8.2948685"
-       x="11"
-       y="14.705132" />
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-3-3"
-       width="2"
-       height="5.5809193"
-       x="15"
-       y="17.419079" />
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-3-7-6"
-       width="2"
-       height="3.9999974"
-       x="19"
-       y="19.000002" />
-    <rect
-       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-2"
-       width="2"
-       height="23"
-       x="23"
-       y="0" />
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-0"
-       width="2"
-       height="23"
-       x="-45"
-       y="0"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-3-2"
-       width="2"
-       height="14"
-       x="-41"
-       y="9"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-3-7-3"
-       width="2"
-       height="8.2948685"
-       x="-37"
-       y="14.70513"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-3-3-8"
-       width="2"
-       height="5.5809193"
-       x="-33"
-       y="17.419077"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-3-7-6-0"
-       width="2"
-       height="3.9999974"
-       x="-29"
-       y="19"
-       transform="scale(-1,1)" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="28"><defs><linearGradient id="a"><stop offset="0" stop-color="#002464"/><stop offset=".18000001" stop-color="#0872e9"/><stop offset=".81819808" stop-color="#0872e9"/><stop offset="1" stop-color="#002f64"/></linearGradient></defs><path fill="#828282" d="M3 3h2v22H3zM7 11h2v14H7zM11 16.705132h2v8.2948685h-2zM15 19.419079h2v5.5809193h-2zM19 21.000002h2v3.9999974h-2z"/><path fill="#888" d="M23 3h2v22h-2z"/><path fill="#828282" d="M45 3h-2v22h2zM41 11h-2v14h2zM37 16.70513h-2v8.2948685h2zM33 19.419077h-2v5.5809193h2zM29 21h-2v3.9999974h2z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/knobs_sliders/slider_crossfader_handle.svg b/res/skins/Tango/knobs_sliders/slider_crossfader_handle.svg
index 6cbf21d84134..28c1b61e8084 100644
--- a/res/skins/Tango/knobs_sliders/slider_crossfader_handle.svg
+++ b/res/skins/Tango/knobs_sliders/slider_crossfader_handle.svg
@@ -1,261 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4451"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="7"
-   height="28"
-   sodipodi:docname="slider_crossfader_handle.svg"
-   inkscape:export-filename="/home/ronso/.mixxx/skins/FlatNite/volume_slider.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata4457">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4455">
-    <linearGradient
-       id="linearGradient5267"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5269" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3805">
-      <stop
-         id="stop3807"
-         offset="0"
-         style="stop-color:#640000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#b50000;stop-opacity:1;"
-         offset="0.18000001"
-         id="stop3809" />
-      <stop
-         style="stop-color:#b50000;stop-opacity:1;"
-         offset="0.81819808"
-         id="stop3811" />
-      <stop
-         id="stop3813"
-         offset="1"
-         style="stop-color:#640000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3861">
-      <stop
-         style="stop-color:#b4b4b4;stop-opacity:1;"
-         offset="0"
-         id="stop3863" />
-      <stop
-         style="stop-color:#6a6a6a;stop-opacity:1;"
-         offset="1"
-         id="stop3865" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#dc0000;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         id="stop3803"
-         offset="0.09"
-         style="stop-color:#b50000;stop-opacity:1;" />
-      <stop
-         id="stop3801"
-         offset="0.92000002"
-         style="stop-color:#b50000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#920000;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3756">
-      <stop
-         style="stop-color:#acacac;stop-opacity:1;"
-         offset="0"
-         id="stop3758" />
-      <stop
-         style="stop-color:#acacac;stop-opacity:0;"
-         offset="1"
-         id="stop3760" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3791"
-       x1="20.097458"
-       y1="1.9632759"
-       x2="20.097458"
-       y2="100.81083"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3867"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861-9"
-       id="linearGradient3867-7"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3861-9">
-      <stop
-         style="stop-color:#b4b4b4;stop-opacity:1;"
-         offset="0"
-         id="stop3863-4" />
-      <stop
-         style="stop-color:#7a7a7a;stop-opacity:1;"
-         offset="1"
-         id="stop3865-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3968"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3971"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3978"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481"
-       gradientTransform="translate(-0.5,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient4002"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.5,0)"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3805"
-       id="linearGradient5279"
-       x1="98"
-       y1="-18"
-       x2="103"
-       y2="-18"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.72222222,-116.29639,99.199301)" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview4453"
-     showgrid="false"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-13.996059"
-     inkscape:cy="8.3618558"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     fit-margin-left="1"
-     fit-margin-right="1"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3014"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Layer"
-     style="display:inline"
-     transform="translate(0,-75)">
-    <rect
-       style="fill:#b50000;fill-opacity:1;fill-rule:nonzero;stroke:#ff4a4a;stroke-width:0.49670237;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect3785-3"
-       width="4.5032978"
-       height="25.503296"
-       x="1.2483511"
-       y="76.248352"
-       rx="1.9999999"
-       ry="1.9999999" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="7" height="28"><defs><linearGradient id="d"><stop offset="0" stop-color="#640000"/><stop offset=".18000001" stop-color="#b50000"/><stop offset=".81819808" stop-color="#b50000"/><stop offset="1" stop-color="#640000"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#b4b4b4"/><stop offset="1" stop-color="#6a6a6a"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#dc0000"/><stop offset=".09" stop-color="#b50000"/><stop offset=".92000002" stop-color="#b50000"/><stop offset="1" stop-color="#920000"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#b4b4b4"/><stop offset="1" stop-color="#7a7a7a"/></linearGradient></defs><rect width="4.5032978" height="25.503296" rx="1.9999999" ry="1.9999999" x="1.2483511" y="76.248352" fill="#b50000" stroke="#ff4a4a" stroke-width=".49670237" transform="translate(0 -75)"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/knobs_sliders/slider_crossfader_scale.svg b/res/skins/Tango/knobs_sliders/slider_crossfader_scale.svg
index e399bb4eaf0e..6f7bcd41ad61 100644
--- a/res/skins/Tango/knobs_sliders/slider_crossfader_scale.svg
+++ b/res/skins/Tango/knobs_sliders/slider_crossfader_scale.svg
@@ -1,85 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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="svg3242"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="104"
-   height="28"
-   sodipodi:docname="slider_crossfader_scale.svg"
-   inkscape:export-filename="/home/ronso/.mixxx/skins/FlatNite/crossfader_slider.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata3248">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3246" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview3244"
-     showgrid="false"
-     inkscape:zoom="8"
-     inkscape:cx="73.847312"
-     inkscape:cy="6.721803"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer4"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="vector"
-     style="display:inline"
-     transform="translate(0,2)">
-    <path
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 2,0 0,24 1,0 0,-8.5 C 3,14.16177 4.1187295,13 5.5,13 l 43,0 c 1.380713,0 2.5,1.119288 2.5,2.5 l 0,8.5 2,0 0,-8.5 C 53,14.119287 54.619288,13 56,13 l 42.5,0 c 1.38071,0 2.5,1.119287 2.5,2.5 l 0,8.5 1,0 0,-24 -1,0 0,8.5 C 101,9.880712 99.88071,11 98.5,11 L 56,11 C 54.619287,11 53,9.880712 53,8.5 L 53,0 51,0 51,8.5 C 51,9.880713 49.880712,11 48.5,11 l -43,0 C 4.119288,11 3,9.880712 3,8.5 L 3,0 z m 50,11 c 0.552285,0 1,0.447715 1,1 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 z"
-       id="path3943"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccsccsccsccsccccsccsccsccsccsssss" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="104" height="28"><path d="M3 3v22h2v-7.5C5 16.16177 6.1187295 15 7.5 15h41c1.380713 0 2.5 1.119288 2.5 2.5V26h2v-8.5c0-1.380713 1.119288-2.5 2.5-2.5h41c1.38071 0 2.338676 1.128744 2.5 2.5V25h2V3h-2v7.5c0 1.380712-1.11929 2.5-2.5 2.5h-41c-1.380713 0-2.5-1.119288-2.5-2.5V2h-2v8.5c0 1.380713-1.119288 2.5-2.5 2.5h-41c-1.380712 0-2.3386759-1.128745-2.5-2.5V3z" fill="#828282"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/knobs_sliders/slider_headMix_handle.svg b/res/skins/Tango/knobs_sliders/slider_headMix_handle.svg
index 30190d2705f0..509d1e628033 100644
--- a/res/skins/Tango/knobs_sliders/slider_headMix_handle.svg
+++ b/res/skins/Tango/knobs_sliders/slider_headMix_handle.svg
@@ -1,251 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4451"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="26"
-   height="28"
-   sodipodi:docname="slider_headMix_handle.svg"
-   inkscape:export-filename="/home/ronso/.mixxx/skins/FlatNite/volume_slider.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata4457">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4455">
-    <linearGradient
-       id="linearGradient5267"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5269" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3805">
-      <stop
-         id="stop3807"
-         offset="0"
-         style="stop-color:#002464;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.18000001"
-         id="stop3809" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.81819808"
-         id="stop3811" />
-      <stop
-         id="stop3813"
-         offset="1"
-         style="stop-color:#002f64;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3861">
-      <stop
-         style="stop-color:#b4b4b4;stop-opacity:1;"
-         offset="0"
-         id="stop3863" />
-      <stop
-         style="stop-color:#6a6a6a;stop-opacity:1;"
-         offset="1"
-         id="stop3865" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#dc0000;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         id="stop3803"
-         offset="0.09"
-         style="stop-color:#b50000;stop-opacity:1;" />
-      <stop
-         id="stop3801"
-         offset="0.92000002"
-         style="stop-color:#b50000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#920000;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3756">
-      <stop
-         style="stop-color:#acacac;stop-opacity:1;"
-         offset="0"
-         id="stop3758" />
-      <stop
-         style="stop-color:#acacac;stop-opacity:0;"
-         offset="1"
-         id="stop3760" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3791"
-       x1="20.097458"
-       y1="1.9632759"
-       x2="20.097458"
-       y2="100.81083"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3867"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861-9"
-       id="linearGradient3867-7"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3861-9">
-      <stop
-         style="stop-color:#b4b4b4;stop-opacity:1;"
-         offset="0"
-         id="stop3863-4" />
-      <stop
-         style="stop-color:#7a7a7a;stop-opacity:1;"
-         offset="1"
-         id="stop3865-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3968"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3971"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3978"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481"
-       gradientTransform="translate(-0.5,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient4002"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.5,0)"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview4453"
-     showgrid="false"
-     inkscape:zoom="8.0000004"
-     inkscape:cx="-7.2296546"
-     inkscape:cy="18.1657"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     fit-margin-left="1"
-     fit-margin-right="1"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3014"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Layer"
-     style="display:inline"
-     transform="translate(0,-75)">
-    <rect
-       style="fill:#0872e8;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3785"
-       width="5"
-       height="23.5"
-       x="9.5"
-       y="77.25"
-       rx="2"
-       ry="2" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="26" height="28"><defs><linearGradient id="b"><stop offset="0" stop-color="#b4b4b4"/><stop offset="1" stop-color="#6a6a6a"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#dc0000"/><stop offset=".09" stop-color="#b50000"/><stop offset=".92000002" stop-color="#b50000"/><stop offset="1" stop-color="#920000"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#b4b4b4"/><stop offset="1" stop-color="#7a7a7a"/></linearGradient></defs><rect width="5" height="23.5" rx="2" ry="2" x="9.5" y="77.25" fill="#0872e8" stroke="#000" stroke-width=".5" transform="translate(0 -75)"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/knobs_sliders/slider_headMix_scale.svg b/res/skins/Tango/knobs_sliders/slider_headMix_scale.svg
index 873c9ad1ee3c..ee350333f477 100644
--- a/res/skins/Tango/knobs_sliders/slider_headMix_scale.svg
+++ b/res/skins/Tango/knobs_sliders/slider_headMix_scale.svg
@@ -1,266 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3242"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="74"
-   height="28"
-   sodipodi:docname="slider_headMix_scale.svg"
-   inkscape:export-filename="/home/ronso/.mixxx/skins/FlatNite/crossfader_slider.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata3248">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3246">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3805"
-       id="linearGradient5279"
-       x1="98"
-       y1="-18"
-       x2="103"
-       y2="-18"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.72222222,-98,103)" />
-    <linearGradient
-       id="linearGradient3805">
-      <stop
-         id="stop3807"
-         offset="0"
-         style="stop-color:#002464;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.18000001"
-         id="stop3809" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.81819808"
-         id="stop3811" />
-      <stop
-         id="stop3813"
-         offset="1"
-         style="stop-color:#002f64;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       y2="-18"
-       x2="103"
-       y1="-18"
-       x1="98"
-       gradientTransform="matrix(1,0,0,0.72222222,-98,26)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3799"
-       xlink:href="#linearGradient3805"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="-18"
-       x2="103"
-       y1="-18"
-       x1="98"
-       gradientTransform="matrix(1,0,0,0.72222222,-98,26)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3799-0"
-       xlink:href="#linearGradient3805-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3805-2">
-      <stop
-         id="stop3807-3"
-         offset="0"
-         style="stop-color:#002464;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.18000001"
-         id="stop3809-7" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.81819808"
-         id="stop3811-5" />
-      <stop
-         id="stop3813-9"
-         offset="1"
-         style="stop-color:#002f64;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       y2="-18"
-       x2="103"
-       y1="-18"
-       x1="98"
-       gradientTransform="matrix(1,0,0,0.72222222,-98,26)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4027"
-       xlink:href="#linearGradient3805-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3805"
-       id="linearGradient4130"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.72222222,-98,26)"
-       x1="98"
-       y1="-18"
-       x2="103"
-       y2="-18" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3805-2"
-       id="linearGradient4143"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.72222222,-98.000002,20)"
-       x1="98"
-       y1="-18"
-       x2="103"
-       y2="-18" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3805-28"
-       id="linearGradient3847"
-       x1="7.5"
-       y1="90"
-       x2="12.5"
-       y2="90"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.3339844e-7,-83.000001)" />
-    <linearGradient
-       id="linearGradient3805-28">
-      <stop
-         id="stop3807-9"
-         offset="0"
-         style="stop-color:#002464;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.18000001"
-         id="stop3809-73" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.81819808"
-         id="stop3811-6" />
-      <stop
-         id="stop3813-1"
-         offset="1"
-         style="stop-color:#002f64;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3805-28"
-       id="linearGradient4211"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.3339844e-7,-83.000001)"
-       x1="7.5"
-       y1="90"
-       x2="12.5"
-       y2="90" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview3244"
-     showgrid="false"
-     inkscape:zoom="8"
-     inkscape:cx="10.575386"
-     inkscape:cy="6.2206139"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer4"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-49,89"
-       id="guide3161" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="126,-137"
-       id="guide3167" />
-  </sodipodi:namedview>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="vector"
-     style="display:inline"
-     transform="translate(0,2)">
-    <g
-       id="g4480"
-       transform="matrix(0.86250001,0,0,0.86250001,8.4333325,2.2830002)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path2991"
-         d="m 62.166668,-0.66666691 -6.666667,6.66666661 0,6.6666663 6.666667,6.666667 0.833333,0 0,-19.99999991 -0.833333,0 z"
-         style="fill:#828282;fill-opacity:1;stroke:none;display:inline" />
-      <rect
-         y="6"
-         x="51.333332"
-         height="6.6666684"
-         width="3.3333333"
-         id="rect3783-5"
-         style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-      <path
-         id="path4069"
-         d="m 65.838543,1.4947914 -0.442709,1.1848958 c 2.732211,0.9812025 4.6875,3.5824617 4.6875,6.6536458 0,3.056829 -1.936286,5.648862 -4.648437,6.640625 l 0.429687,1.184896 c 3.188507,-1.170853 5.46875,-4.232538 5.46875,-7.825521 0,-3.6032683 -2.291941,-6.6752158 -5.494791,-7.8385416 z"
-         style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path4069-6"
-         d="m 64.979168,3.8515622 -0.429688,1.171875 c 1.765081,0.6368717 3.033854,2.3251542 3.033854,4.3098958 0,1.970123 -1.250111,3.649362 -2.994791,4.296875 l 0.416666,1.171875 c 2.233252,-0.817101 3.828125,-2.952459 3.828125,-5.46875 0,-2.5266158 -1.60651,-4.6722341 -3.854166,-5.4817708 z"
-         style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-    <path
-       inkscape:connector-curvature="0"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#828282;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 12.022549,2.2500002 c -4.1241265,0 -7.4840337,3.35984 -7.4840337,7.4840337 0,0.4715611 0.043025,0.9252071 0.1268481,1.3722661 l 0.1153162,0.622708 C 4.5280824,11.88417 4.3761928,12.180624 4.4347305,12.490097 l 0.8879362,4.658782 c 0.075798,0.400719 0.4526219,0.663911 0.8533415,0.588113 l 1.6605557,-0.311355 c 0.4007196,-0.07579 0.6639109,-0.464153 0.5881139,-0.864872 L 7.5367416,11.901983 C 7.460944,11.501264 7.0841191,11.238072 6.6834001,11.313869 l -0.2882909,0.05766 -0.1037848,-0.56505 -0.023062,-0.103785 0.023062,0 c -0.054418,-0.31724 -0.092253,-0.633115 -0.092253,-0.9686575 0,-3.2265715 2.5969301,-5.8234781 5.823478,-5.8234781 3.226549,-3.68e-5 5.823478,2.5969066 5.823478,5.8234781 0,0.3713735 -0.03854,0.7225445 -0.103785,1.0724425 l -0.103785,0.56505 -0.311354,-0.05766 c -0.400726,-0.0758 -0.789074,0.187395 -0.864873,0.588114 l -0.876405,4.658782 c -0.07579,0.400719 0.175856,0.789075 0.576583,0.864872 l 1.660555,0.311355 c 0.400726,0.07579 0.777543,-0.187394 0.853342,-0.588113 l 0.887936,-4.658782 c 0.0562,-0.297073 -0.06593,-0.589732 -0.299822,-0.749557 l 0.09225,-0.518925 -0.01152,0 0.02306,-0.115315 c 0.08411,-0.448536 0.13838,-0.902218 0.13838,-1.3722661 -6e-6,-4.1241937 -3.359913,-7.4840337 -7.484039,-7.4840337 z"
-       id="path3925" />
-    <path
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       d="m 11,19 0,10 2,0 48,0 0,-8 -2,0 0,6 -46,0 0,-8 z"
-       transform="translate(0,-6)"
-       id="rect2989-2-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="74" height="28"><defs><linearGradient id="a"><stop offset="0" stop-color="#002464"/><stop offset=".18000001" stop-color="#0872e9"/><stop offset=".81819808" stop-color="#0872e9"/><stop offset="1" stop-color="#002f64"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#002464"/><stop offset=".18000001" stop-color="#0872e9"/><stop offset=".81819808" stop-color="#0872e9"/><stop offset="1" stop-color="#002f64"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#002464"/><stop offset=".18000001" stop-color="#0872e9"/><stop offset=".81819808" stop-color="#0872e9"/><stop offset="1" stop-color="#002f64"/></linearGradient></defs><g fill="#828282"><path d="M62.0520842717 3.7079999835l-5.7500003542 5.7500000177v5.7499997505l5.7500003542 5.7500003541h.7187497208V3.7079999835h-.7187497208zM52.7083318633 9.45800026h2.8750000046v5.7500015617h-2.8750000046zM65.2190764959 5.5722577974l-.381836517 1.0219726394c2.3565320149.846287166 4.042968797 3.089873252 4.042968797 5.738769569 0 2.6365150431-1.6700466944 4.8721435315-4.009276959 5.727539129l.3706050417 1.0219728118c2.7500873194-1.0098607242 4.7167969297-3.6505640673 4.7167969297-6.7495119408 0-3.1078189447-1.9767991354-5.7573736942-4.7392572924-6.7607422084z"/><path d="M64.4778655498 7.604972636l-.3706059043 1.0107421992c1.5223823801.5493018477 2.6166991053 2.0054455208 2.6166991053 3.7172851706 0 1.6992311072-1.07822075 3.1475747615-2.5830072674 3.7060547305l.3593744292 1.0107421992c1.9261798723-.7047496207 3.3017578507-2.546495917 3.3017578507-4.7167969297 0-2.1792061527-1.385614891-4.029801958-3.3242182135-4.7280273698z"/></g><path d="M4.8960504 13.603981l2.5662813-.478506c.4062058-.0757.7941962.190306.8699349.596501l.8886227 4.766008c.07574.406195-.1903053.794117-.5965119.869908l-2.5662805.47842c-.4062057.075705-.7941962-.190306-.8699349-.596502l-.8886235-4.76592c-.07574-.406195.1903061-.794204.5965119-.869909z" fill="#888"/><path d="M11.943096 4.1569826c-4.167906 0-7.5634792 3.3954897-7.5634792 7.5634292 0 .4765052.043482.9349972.1281942 1.3867892.3607046 1.964148.7340901 3.925772 1.1187887 5.885307l1.6432218-.314653c-.3547839-2.00522-.8342963-4.136962-1.1187896-5.978502-.0549947-.320658-.0932317-.639836-.0932317-.9789412 0-3.2607874 2.6244966-5.8853067 5.8852958-5.8853067 3.2608 0 5.885297 2.6245193 5.885297 5.8853067 0 .3391052-.03823.6582832-.09323.9789412-.284492 1.84154-.764005 3.973282-1.118788 5.978502l1.643221.314653c.384699-1.959535.758084-3.921159 1.118789-5.885307.08471-.451792.128195-.910284.128195-1.3867892 0-4.1679395-3.395574-7.5634292-7.563481-7.5634292z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none;-inkscape-font-specification:Sans" font-weight="400" color="#000" fill="#888" overflow="visible" font-family="Sans"/><path d="M18.990143 13.603981l-2.566282-.478506c-.406205-.0757-.794196.190306-.869935.596501l-.888622 4.766008c-.07574.406195.190305.794204.596512.869908l2.56628.478507c.406206.0757.794196-.190306.869934-.596589l.888625-4.766007c.07574-.406108-.190307-.794117-.596512-.869822z" fill="#888"/><path d="M11 15v10h50v-8h-2v6H13v-8z" fill="#828282"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/knobs_sliders/slider_pitch_handle.svg b/res/skins/Tango/knobs_sliders/slider_pitch_handle.svg
index 3382522f0ca6..8ef47dbdc716 100644
--- a/res/skins/Tango/knobs_sliders/slider_pitch_handle.svg
+++ b/res/skins/Tango/knobs_sliders/slider_pitch_handle.svg
@@ -1,97 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="50"
-   height="7"
-   id="svg5327"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="slider_pitch_handle.svg">
-  <defs
-     id="defs5329">
-    <linearGradient
-       id="linearGradient5858">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5860" />
-      <stop
-         id="stop5868"
-         offset="0.18000001"
-         style="stop-color:#dbdbdb;stop-opacity:1;" />
-      <stop
-         id="stop5866"
-         offset="0.81999999"
-         style="stop-color:#dbdbdb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#9e9e9e;stop-opacity:1;"
-         offset="1"
-         id="stop5862" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5858"
-       id="linearGradient5864"
-       x1="12.500638"
-       y1="0"
-       x2="12.500638"
-       y2="5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(9,1046.3622)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="-44.615021"
-     inkscape:cy="15.494035"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-page="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5332">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1045.3622)">
-    <rect
-       style="fill:url(#linearGradient5864);fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect5348"
-       width="32"
-       height="5"
-       x="9"
-       y="1046.3622"
-       rx="2"
-       ry="1.9999999" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="50" height="7"><defs><linearGradient id="a"><stop offset="0" stop-color="#fff"/><stop offset=".18000001" stop-color="#dbdbdb"/><stop offset=".81999999" stop-color="#dbdbdb"/><stop offset="1" stop-color="#9e9e9e"/></linearGradient><linearGradient x1="12.500638" x2="12.500638" y2="5" id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="translate(9 1046.3622)"/></defs><rect width="32" height="5" rx="2" ry="1.9999999" x="9" y="1046.3622" fill="url(#b)" transform="translate(0 -1045.3622)"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/knobs_sliders/slider_pitch_rate_label.svg b/res/skins/Tango/knobs_sliders/slider_pitch_rate_label.svg
new file mode 100644
index 000000000000..229f58700c44
--- /dev/null
+++ b/res/skins/Tango/knobs_sliders/slider_pitch_rate_label.svg
@@ -0,0 +1,25 @@
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="106" width="50" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g fill="#6e6e6e" transform="translate(-0.35355339,0)">
+  <g style="letter-spacing:0px;word-spacing:0px;" font-weight="normal" transform="translate(102.08854,35.001786)" font-size="40px" font-stretch="normal" line-height="125%" font-variant="normal" font-family="Ubuntu" font-style="normal">
+   <path d="m-65.383-26.158973c-0.000007,0.364002-0.06501,0.702002-0.195,1.014-0.12134,0.303334-0.307673,0.572001-0.559,0.806-0.242672,0.225334-0.550339,0.398667-0.923,0.52-0.372671,0.13-0.801671,0.195-1.287,0.195-0.563336,0-1.035669-0.078-1.417-0.234-0.372669-0.164666-0.671668-0.368333-0.897-0.611-0.225334-0.242666-0.385668-0.506999-0.481-0.793-0.09533-0.294665-0.143001-0.571998-0.143-0.832-0.000001-0.251331,0.039-0.489664,0.117-0.715,0.08667-0.233997,0.194999-0.450663,0.325-0.65,0.138665-0.19933,0.294665-0.376996,0.468-0.533,0.181998-0.164662,0.372665-0.307662,0.572-0.429-0.849335-0.485328-1.274001-1.200328-1.274-2.145-0.000001-0.329326,0.065-0.641326,0.195-0.936,0.129999-0.303325,0.311999-0.567658,0.546-0.793,0.242665-0.225325,0.532998-0.402991,0.871-0.533,0.337997-0.138658,0.714997-0.207991,1.131-0.208,0.485329,0.000009,0.901329,0.07368,1.248,0.221,0.346661,0.147342,0.628328,0.338009,0.845,0.572,0.225327,0.225342,0.385661,0.476675,0.481,0.754,0.103994,0.277341,0.155994,0.546007,0.156,0.806-0.000006,0.25134-0.03901,0.489673-0.117,0.715-0.06934,0.216673-0.169006,0.420339-0.299,0.611-0.121339,0.190672-0.264339,0.359672-0.429,0.507-0.156005,0.147338-0.320672,0.277338-0.494,0.39,1.022661,0.485337,1.54266,1.252337,1.56,2.301m-4.68,0.078c-0.000002,0.156002,0.026,0.320669,0.078,0.494,0.06067,0.164668,0.160331,0.320668,0.299,0.468,0.138664,0.138668,0.316331,0.255668,0.533,0.351,0.216664,0.09533,0.489663,0.143001,0.819,0.143,0.294663,0.000001,0.550329-0.04333,0.767-0.13,0.225329-0.08667,0.407328-0.194999,0.546-0.325,0.138662-0.138665,0.242661-0.294665,0.312-0.468,0.06933-0.173331,0.103995-0.350998,0.104-0.533-0.000005-0.277331-0.052-0.519997-0.156-0.728-0.104005-0.207997-0.255672-0.389997-0.455-0.546-0.190671-0.155996-0.424671-0.285996-0.702-0.39-0.26867-0.112663-0.576337-0.207996-0.923-0.286-0.390003,0.216671-0.693336,0.485337-0.91,0.806-0.208002,0.32067-0.312002,0.702003-0.312,1.144m3.25-4.615c-0.000005-0.129993-0.03034-0.272993-0.091-0.429-0.05201-0.155993-0.138672-0.298992-0.26-0.429-0.121338-0.138659-0.277338-0.251325-0.468-0.338-0.190671-0.09532-0.424671-0.142992-0.702-0.143-0.277337,0.000008-0.51567,0.04334-0.715,0.13-0.190669,0.08667-0.346669,0.199341-0.468,0.338-0.121336,0.130008-0.212336,0.277341-0.273,0.442-0.052,0.156007-0.078,0.312007-0.078,0.468-0.000002,0.190673,0.03466,0.38134,0.104,0.572,0.06933,0.190673,0.177664,0.368339,0.325,0.533,0.147331,0.164672,0.337997,0.312005,0.572,0.442,0.242663,0.130005,0.528663,0.234005,0.858,0.312,0.363996-0.216661,0.654329-0.467995,0.871-0.754,0.216662-0.294661,0.324995-0.675994,0.325-1.144"/>
+   <path d="m-64.012109-30.630973c-0.000001-0.389993,0.052-0.732326,0.156-1.027,0.103999-0.294659,0.246999-0.541658,0.429-0.741,0.190665-0.207991,0.411665-0.363991,0.663-0.468,0.251331-0.103991,0.524331-0.155991,0.819-0.156,0.294663,0.000009,0.567663,0.05201,0.819,0.156,0.251329,0.104009,0.467996,0.260009,0.65,0.468,0.190662,0.199342,0.337995,0.446341,0.442,0.741,0.103995,0.294674,0.155995,0.637007,0.156,1.027-0.000005,0.390006-0.05201,0.732339-0.156,1.027-0.104005,0.294672-0.251338,0.546005-0.442,0.754-0.182004,0.199338-0.398671,0.351005-0.65,0.455-0.251337,0.104004-0.524337,0.156004-0.819,0.156-0.294669,0.000004-0.567669-0.052-0.819-0.156-0.251335-0.103995-0.472335-0.255662-0.663-0.455-0.182001-0.207995-0.325001-0.459328-0.429-0.754-0.104001-0.294661-0.156001-0.636994-0.156-1.027m3.12,0c-0.000004-0.467993-0.091-0.831992-0.273-1.092-0.182004-0.268659-0.442003-0.402992-0.78-0.403-0.338003,0.000008-0.598002,0.134341-0.78,0.403-0.182002,0.260008-0.273002,0.624007-0.273,1.092-0.000002,0.468006,0.091,0.836339,0.273,1.105,0.181998,0.260005,0.441997,0.390005,0.78,0.39,0.337997,0.000005,0.597996-0.129995,0.78-0.39,0.181996-0.268661,0.272996-0.636994,0.273-1.105m2.6,4.615c-0.000007-0.389997,0.05199-0.73233,0.156-1.027,0.103993-0.294663,0.246993-0.541663,0.429-0.741,0.190659-0.207996,0.411659-0.363996,0.663-0.468,0.251325-0.103995,0.524325-0.155995,0.819-0.156,0.294658,0.000005,0.567657,0.052,0.819,0.156,0.251323,0.104004,0.46799,0.260004,0.65,0.468,0.190656,0.199337,0.337989,0.446337,0.442,0.741,0.103989,0.29467,0.155989,0.637003,0.156,1.027-0.000011,0.390002-0.05201,0.732335-0.156,1.027-0.104011,0.294668-0.251344,0.546001-0.442,0.754-0.18201,0.199334-0.398677,0.351-0.65,0.455-0.251343,0.104-0.524342,0.156-0.819,0.156-0.294675,0-0.567675-0.052-0.819-0.156-0.251341-0.104-0.472341-0.255666-0.663-0.455-0.182007-0.207999-0.325007-0.459332-0.429-0.754-0.104007-0.294665-0.156007-0.636998-0.156-1.027m3.12,0c-0.00001-0.467997-0.09101-0.831997-0.273-1.092-0.182009-0.268663-0.442009-0.402996-0.78-0.403-0.338008,0.000004-0.598008,0.134337-0.78,0.403-0.182008,0.260003-0.273008,0.624003-0.273,1.092-0.000008,0.468002,0.09099,0.836335,0.273,1.105,0.181992,0.260001,0.441992,0.390001,0.78,0.39,0.337991,0.000001,0.597991-0.129999,0.78-0.39,0.18199-0.268665,0.27299-0.636998,0.273-1.105m-0.78-6.812-5.083,9.009-1.183,0,5.083-9.009,1.183,0"/>
+  </g>
+  <path d="m9.901172,6.106313,5.376515,0,0,1.131-5.376515,0,0-1.131"/>
+ </g>
+ <g fill="#6e6e6e" transform="translate(-0.35355339,109.9551)">
+  <path d="m9.901172-11.77,2.457,0,0-2.678,1.04,0,0,2.678,2.457,0,0,1.027-2.457,0,0,2.691-1.04,0,0-2.691-2.457,0,0-1.027"/>
+  <g style="letter-spacing:0px;word-spacing:0px;" font-weight="normal" transform="translate(102.08854,17.079973)" font-size="40px" font-stretch="normal" line-height="125%" font-variant="normal" font-family="Ubuntu" font-style="normal">
+   <path d="m-65.383-26.158973c-0.000007,0.364002-0.06501,0.702002-0.195,1.014-0.12134,0.303334-0.307673,0.572001-0.559,0.806-0.242672,0.225334-0.550339,0.398667-0.923,0.52-0.372671,0.13-0.801671,0.195-1.287,0.195-0.563336,0-1.035669-0.078-1.417-0.234-0.372669-0.164666-0.671668-0.368333-0.897-0.611-0.225334-0.242666-0.385668-0.506999-0.481-0.793-0.09533-0.294665-0.143001-0.571998-0.143-0.832-0.000001-0.251331,0.039-0.489664,0.117-0.715,0.08667-0.233997,0.194999-0.450663,0.325-0.65,0.138665-0.19933,0.294665-0.376996,0.468-0.533,0.181998-0.164662,0.372665-0.307662,0.572-0.429-0.849335-0.485328-1.274001-1.200328-1.274-2.145-0.000001-0.329326,0.065-0.641326,0.195-0.936,0.129999-0.303325,0.311999-0.567658,0.546-0.793,0.242665-0.225325,0.532998-0.402991,0.871-0.533,0.337997-0.138658,0.714997-0.207991,1.131-0.208,0.485329,0.000009,0.901329,0.07368,1.248,0.221,0.346661,0.147342,0.628328,0.338009,0.845,0.572,0.225327,0.225342,0.385661,0.476675,0.481,0.754,0.103994,0.277341,0.155994,0.546007,0.156,0.806-0.000006,0.25134-0.03901,0.489673-0.117,0.715-0.06934,0.216673-0.169006,0.420339-0.299,0.611-0.121339,0.190672-0.264339,0.359672-0.429,0.507-0.156005,0.147338-0.320672,0.277338-0.494,0.39,1.022661,0.485337,1.54266,1.252337,1.56,2.301m-4.68,0.078c-0.000002,0.156002,0.026,0.320669,0.078,0.494,0.06067,0.164668,0.160331,0.320668,0.299,0.468,0.138664,0.138668,0.316331,0.255668,0.533,0.351,0.216664,0.09533,0.489663,0.143001,0.819,0.143,0.294663,0.000001,0.550329-0.04333,0.767-0.13,0.225329-0.08667,0.407328-0.194999,0.546-0.325,0.138662-0.138665,0.242661-0.294665,0.312-0.468,0.06933-0.173331,0.103995-0.350998,0.104-0.533-0.000005-0.277331-0.052-0.519997-0.156-0.728-0.104005-0.207997-0.255672-0.389997-0.455-0.546-0.190671-0.155996-0.424671-0.285996-0.702-0.39-0.26867-0.112663-0.576337-0.207996-0.923-0.286-0.390003,0.216671-0.693336,0.485337-0.91,0.806-0.208002,0.32067-0.312002,0.702003-0.312,1.144m3.25-4.615c-0.000005-0.129993-0.03034-0.272993-0.091-0.429-0.05201-0.155993-0.138672-0.298992-0.26-0.429-0.121338-0.138659-0.277338-0.251325-0.468-0.338-0.190671-0.09532-0.424671-0.142992-0.702-0.143-0.277337,0.000008-0.51567,0.04334-0.715,0.13-0.190669,0.08667-0.346669,0.199341-0.468,0.338-0.121336,0.130008-0.212336,0.277341-0.273,0.442-0.052,0.156007-0.078,0.312007-0.078,0.468-0.000002,0.190673,0.03466,0.38134,0.104,0.572,0.06933,0.190673,0.177664,0.368339,0.325,0.533,0.147331,0.164672,0.337997,0.312005,0.572,0.442,0.242663,0.130005,0.528663,0.234005,0.858,0.312,0.363996-0.216661,0.654329-0.467995,0.871-0.754,0.216662-0.294661,0.324995-0.675994,0.325-1.144"/>
+   <path d="m-64.012109-30.630973c-0.000001-0.389993,0.052-0.732326,0.156-1.027,0.103999-0.294659,0.246999-0.541658,0.429-0.741,0.190665-0.207991,0.411665-0.363991,0.663-0.468,0.251331-0.103991,0.524331-0.155991,0.819-0.156,0.294663,0.000009,0.567663,0.05201,0.819,0.156,0.251329,0.104009,0.467996,0.260009,0.65,0.468,0.190662,0.199342,0.337995,0.446341,0.442,0.741,0.103995,0.294674,0.155995,0.637007,0.156,1.027-0.000005,0.390006-0.05201,0.732339-0.156,1.027-0.104005,0.294672-0.251338,0.546005-0.442,0.754-0.182004,0.199338-0.398671,0.351005-0.65,0.455-0.251337,0.104004-0.524337,0.156004-0.819,0.156-0.294669,0.000004-0.567669-0.052-0.819-0.156-0.251335-0.103995-0.472335-0.255662-0.663-0.455-0.182001-0.207995-0.325001-0.459328-0.429-0.754-0.104001-0.294661-0.156001-0.636994-0.156-1.027m3.12,0c-0.000004-0.467993-0.091-0.831992-0.273-1.092-0.182004-0.268659-0.442003-0.402992-0.78-0.403-0.338003,0.000008-0.598002,0.134341-0.78,0.403-0.182002,0.260008-0.273002,0.624007-0.273,1.092-0.000002,0.468006,0.091,0.836339,0.273,1.105,0.181998,0.260005,0.441997,0.390005,0.78,0.39,0.337997,0.000005,0.597996-0.129995,0.78-0.39,0.181996-0.268661,0.272996-0.636994,0.273-1.105m2.6,4.615c-0.000007-0.389997,0.05199-0.73233,0.156-1.027,0.103993-0.294663,0.246993-0.541663,0.429-0.741,0.190659-0.207996,0.411659-0.363996,0.663-0.468,0.251325-0.103995,0.524325-0.155995,0.819-0.156,0.294658,0.000005,0.567657,0.052,0.819,0.156,0.251323,0.104004,0.46799,0.260004,0.65,0.468,0.190656,0.199337,0.337989,0.446337,0.442,0.741,0.103989,0.29467,0.155989,0.637003,0.156,1.027-0.000011,0.390002-0.05201,0.732335-0.156,1.027-0.104011,0.294668-0.251344,0.546001-0.442,0.754-0.18201,0.199334-0.398677,0.351-0.65,0.455-0.251343,0.104-0.524342,0.156-0.819,0.156-0.294675,0-0.567675-0.052-0.819-0.156-0.251341-0.104-0.472341-0.255666-0.663-0.455-0.182007-0.207999-0.325007-0.459332-0.429-0.754-0.104007-0.294665-0.156007-0.636998-0.156-1.027m3.12,0c-0.00001-0.467997-0.09101-0.831997-0.273-1.092-0.182009-0.268663-0.442009-0.402996-0.78-0.403-0.338008,0.000004-0.598008,0.134337-0.78,0.403-0.182008,0.260003-0.273008,0.624003-0.273,1.092-0.000008,0.468002,0.09099,0.836335,0.273,1.105,0.181992,0.260001,0.441992,0.390001,0.78,0.39,0.337991,0.000001,0.597991-0.129999,0.78-0.39,0.18199-0.268665,0.27299-0.636998,0.273-1.105m-0.78-6.812-5.083,9.009-1.183,0,5.083-9.009,1.183,0"/>
+  </g>
+ </g>
+</svg>
diff --git a/res/skins/Tango/knobs_sliders/slider_pitch_rate_label_0.08.svg b/res/skins/Tango/knobs_sliders/slider_pitch_rate_label_0.08.svg
new file mode 100644
index 000000000000..d4cd1796bc4c
--- /dev/null
+++ b/res/skins/Tango/knobs_sliders/slider_pitch_rate_label_0.08.svg
@@ -0,0 +1,22 @@
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="106" width="50" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path d="M25,2.5c-0.552285,0-1,0.447715-1,1v46c0,1.380712-1.119288,2.5-2.5,2.5h-5.5c-0.552285,0-1,0.447715-1,1s0.447715,1,1,1h5.5c1.380712,0,2.5,1.119288,2.5,2.5v46c0,0.55228,0.447715,1,1,1s1-0.44772,1-1v-46c0-1.380712,1.119288-2.5,2.5-2.5h5.5c0.552285,0,1-0.447715,1-1s-0.447715-1-1-1h-5.5c-1.380712,0-2.5-1.119288-2.5-2.5v-46c0-0.552285-0.447715-1-1-1z" fill="#6e6e6e"/>
+ <g style="letter-spacing:0px;word-spacing:0px;" font-weight="normal" transform="translate(101.73499,35.001786)" font-stretch="normal" line-height="125%" font-size="40px" font-variant="normal" font-family="Ubuntu" font-style="normal" fill="#6e6e6e">
+  <path d="m-65.383-26.158973c-0.000007,0.364002-0.06501,0.702002-0.195,1.014-0.12134,0.303334-0.307673,0.572001-0.559,0.806-0.242672,0.225334-0.550339,0.398667-0.923,0.52-0.372671,0.13-0.801671,0.195-1.287,0.195-0.563336,0-1.035669-0.078-1.417-0.234-0.372669-0.164666-0.671668-0.368333-0.897-0.611-0.225334-0.242666-0.385668-0.506999-0.481-0.793-0.09533-0.294665-0.143001-0.571998-0.143-0.832-0.000001-0.251331,0.039-0.489664,0.117-0.715,0.08667-0.233997,0.194999-0.450663,0.325-0.65,0.138665-0.19933,0.294665-0.376996,0.468-0.533,0.181998-0.164662,0.372665-0.307662,0.572-0.429-0.849335-0.485328-1.274001-1.200328-1.274-2.145-0.000001-0.329326,0.065-0.641326,0.195-0.936,0.129999-0.303325,0.311999-0.567658,0.546-0.793,0.242665-0.225325,0.532998-0.402991,0.871-0.533,0.337997-0.138658,0.714997-0.207991,1.131-0.208,0.485329,0.000009,0.901329,0.07368,1.248,0.221,0.346661,0.147342,0.628328,0.338009,0.845,0.572,0.225327,0.225342,0.385661,0.476675,0.481,0.754,0.103994,0.277341,0.155994,0.546007,0.156,0.806-0.000006,0.25134-0.03901,0.489673-0.117,0.715-0.06934,0.216673-0.169006,0.420339-0.299,0.611-0.121339,0.190672-0.264339,0.359672-0.429,0.507-0.156005,0.147338-0.320672,0.277338-0.494,0.39,1.022661,0.485337,1.54266,1.252337,1.56,2.301m-4.68,0.078c-0.000002,0.156002,0.026,0.320669,0.078,0.494,0.06067,0.164668,0.160331,0.320668,0.299,0.468,0.138664,0.138668,0.316331,0.255668,0.533,0.351,0.216664,0.09533,0.489663,0.143001,0.819,0.143,0.294663,0.000001,0.550329-0.04333,0.767-0.13,0.225329-0.08667,0.407328-0.194999,0.546-0.325,0.138662-0.138665,0.242661-0.294665,0.312-0.468,0.06933-0.173331,0.103995-0.350998,0.104-0.533-0.000005-0.277331-0.052-0.519997-0.156-0.728-0.104005-0.207997-0.255672-0.389997-0.455-0.546-0.190671-0.155996-0.424671-0.285996-0.702-0.39-0.26867-0.112663-0.576337-0.207996-0.923-0.286-0.390003,0.216671-0.693336,0.485337-0.91,0.806-0.208002,0.32067-0.312002,0.702003-0.312,1.144m3.25-4.615c-0.000005-0.129993-0.03034-0.272993-0.091-0.429-0.05201-0.155993-0.138672-0.298992-0.26-0.429-0.121338-0.138659-0.277338-0.251325-0.468-0.338-0.190671-0.09532-0.424671-0.142992-0.702-0.143-0.277337,0.000008-0.51567,0.04334-0.715,0.13-0.190669,0.08667-0.346669,0.199341-0.468,0.338-0.121336,0.130008-0.212336,0.277341-0.273,0.442-0.052,0.156007-0.078,0.312007-0.078,0.468-0.000002,0.190673,0.03466,0.38134,0.104,0.572,0.06933,0.190673,0.177664,0.368339,0.325,0.533,0.147331,0.164672,0.337997,0.312005,0.572,0.442,0.242663,0.130005,0.528663,0.234005,0.858,0.312,0.363996-0.216661,0.654329-0.467995,0.871-0.754,0.216662-0.294661,0.324995-0.675994,0.325-1.144"/>
+  <path d="m-64.012109-30.630973c-0.000001-0.389993,0.052-0.732326,0.156-1.027,0.103999-0.294659,0.246999-0.541658,0.429-0.741,0.190665-0.207991,0.411665-0.363991,0.663-0.468,0.251331-0.103991,0.524331-0.155991,0.819-0.156,0.294663,0.000009,0.567663,0.05201,0.819,0.156,0.251329,0.104009,0.467996,0.260009,0.65,0.468,0.190662,0.199342,0.337995,0.446341,0.442,0.741,0.103995,0.294674,0.155995,0.637007,0.156,1.027-0.000005,0.390006-0.05201,0.732339-0.156,1.027-0.104005,0.294672-0.251338,0.546005-0.442,0.754-0.182004,0.199338-0.398671,0.351005-0.65,0.455-0.251337,0.104004-0.524337,0.156004-0.819,0.156-0.294669,0.000004-0.567669-0.052-0.819-0.156-0.251335-0.103995-0.472335-0.255662-0.663-0.455-0.182001-0.207995-0.325001-0.459328-0.429-0.754-0.104001-0.294661-0.156001-0.636994-0.156-1.027m3.12,0c-0.000004-0.467993-0.091-0.831992-0.273-1.092-0.182004-0.268659-0.442003-0.402992-0.78-0.403-0.338003,0.000008-0.598002,0.134341-0.78,0.403-0.182002,0.260008-0.273002,0.624007-0.273,1.092-0.000002,0.468006,0.091,0.836339,0.273,1.105,0.181998,0.260005,0.441997,0.390005,0.78,0.39,0.337997,0.000005,0.597996-0.129995,0.78-0.39,0.181996-0.268661,0.272996-0.636994,0.273-1.105m2.6,4.615c-0.000007-0.389997,0.05199-0.73233,0.156-1.027,0.103993-0.294663,0.246993-0.541663,0.429-0.741,0.190659-0.207996,0.411659-0.363996,0.663-0.468,0.251325-0.103995,0.524325-0.155995,0.819-0.156,0.294658,0.000005,0.567657,0.052,0.819,0.156,0.251323,0.104004,0.46799,0.260004,0.65,0.468,0.190656,0.199337,0.337989,0.446337,0.442,0.741,0.103989,0.29467,0.155989,0.637003,0.156,1.027-0.000011,0.390002-0.05201,0.732335-0.156,1.027-0.104011,0.294668-0.251344,0.546001-0.442,0.754-0.18201,0.199334-0.398677,0.351-0.65,0.455-0.251343,0.104-0.524342,0.156-0.819,0.156-0.294675,0-0.567675-0.052-0.819-0.156-0.251341-0.104-0.472341-0.255666-0.663-0.455-0.182007-0.207999-0.325007-0.459332-0.429-0.754-0.104007-0.294665-0.156007-0.636998-0.156-1.027m3.12,0c-0.00001-0.467997-0.09101-0.831997-0.273-1.092-0.182009-0.268663-0.442009-0.402996-0.78-0.403-0.338008,0.000004-0.598008,0.134337-0.78,0.403-0.182008,0.260003-0.273008,0.624003-0.273,1.092-0.000008,0.468002,0.09099,0.836335,0.273,1.105,0.181992,0.260001,0.441992,0.390001,0.78,0.39,0.337991,0.000001,0.597991-0.129999,0.78-0.39,0.18199-0.268665,0.27299-0.636998,0.273-1.105m-0.78-6.812-5.083,9.009-1.183,0,5.083-9.009,1.183,0"/>
+ </g>
+ <path d="m13.547619,6.106313,5.376515,0,0,1.131-5.376515,0,0-1.131" fill="#6e6e6e"/>
+ <path d="m13.547619,98.1851,2.457,0,0-2.678,1.04,0,0,2.678,2.457,0,0,1.027-2.457,0,0,2.691-1.04,0,0-2.691-2.457,0,0-1.027" fill="#6e6e6e"/>
+ <g style="letter-spacing:0px;word-spacing:0px;" font-weight="normal" transform="translate(101.73499,127.03507)" font-stretch="normal" line-height="125%" font-size="40px" font-variant="normal" font-family="Ubuntu" font-style="normal" fill="#6e6e6e">
+  <path d="m-65.383-26.158973c-0.000007,0.364002-0.06501,0.702002-0.195,1.014-0.12134,0.303334-0.307673,0.572001-0.559,0.806-0.242672,0.225334-0.550339,0.398667-0.923,0.52-0.372671,0.13-0.801671,0.195-1.287,0.195-0.563336,0-1.035669-0.078-1.417-0.234-0.372669-0.164666-0.671668-0.368333-0.897-0.611-0.225334-0.242666-0.385668-0.506999-0.481-0.793-0.09533-0.294665-0.143001-0.571998-0.143-0.832-0.000001-0.251331,0.039-0.489664,0.117-0.715,0.08667-0.233997,0.194999-0.450663,0.325-0.65,0.138665-0.19933,0.294665-0.376996,0.468-0.533,0.181998-0.164662,0.372665-0.307662,0.572-0.429-0.849335-0.485328-1.274001-1.200328-1.274-2.145-0.000001-0.329326,0.065-0.641326,0.195-0.936,0.129999-0.303325,0.311999-0.567658,0.546-0.793,0.242665-0.225325,0.532998-0.402991,0.871-0.533,0.337997-0.138658,0.714997-0.207991,1.131-0.208,0.485329,0.000009,0.901329,0.07368,1.248,0.221,0.346661,0.147342,0.628328,0.338009,0.845,0.572,0.225327,0.225342,0.385661,0.476675,0.481,0.754,0.103994,0.277341,0.155994,0.546007,0.156,0.806-0.000006,0.25134-0.03901,0.489673-0.117,0.715-0.06934,0.216673-0.169006,0.420339-0.299,0.611-0.121339,0.190672-0.264339,0.359672-0.429,0.507-0.156005,0.147338-0.320672,0.277338-0.494,0.39,1.022661,0.485337,1.54266,1.252337,1.56,2.301m-4.68,0.078c-0.000002,0.156002,0.026,0.320669,0.078,0.494,0.06067,0.164668,0.160331,0.320668,0.299,0.468,0.138664,0.138668,0.316331,0.255668,0.533,0.351,0.216664,0.09533,0.489663,0.143001,0.819,0.143,0.294663,0.000001,0.550329-0.04333,0.767-0.13,0.225329-0.08667,0.407328-0.194999,0.546-0.325,0.138662-0.138665,0.242661-0.294665,0.312-0.468,0.06933-0.173331,0.103995-0.350998,0.104-0.533-0.000005-0.277331-0.052-0.519997-0.156-0.728-0.104005-0.207997-0.255672-0.389997-0.455-0.546-0.190671-0.155996-0.424671-0.285996-0.702-0.39-0.26867-0.112663-0.576337-0.207996-0.923-0.286-0.390003,0.216671-0.693336,0.485337-0.91,0.806-0.208002,0.32067-0.312002,0.702003-0.312,1.144m3.25-4.615c-0.000005-0.129993-0.03034-0.272993-0.091-0.429-0.05201-0.155993-0.138672-0.298992-0.26-0.429-0.121338-0.138659-0.277338-0.251325-0.468-0.338-0.190671-0.09532-0.424671-0.142992-0.702-0.143-0.277337,0.000008-0.51567,0.04334-0.715,0.13-0.190669,0.08667-0.346669,0.199341-0.468,0.338-0.121336,0.130008-0.212336,0.277341-0.273,0.442-0.052,0.156007-0.078,0.312007-0.078,0.468-0.000002,0.190673,0.03466,0.38134,0.104,0.572,0.06933,0.190673,0.177664,0.368339,0.325,0.533,0.147331,0.164672,0.337997,0.312005,0.572,0.442,0.242663,0.130005,0.528663,0.234005,0.858,0.312,0.363996-0.216661,0.654329-0.467995,0.871-0.754,0.216662-0.294661,0.324995-0.675994,0.325-1.144"/>
+  <path d="m-64.012109-30.630973c-0.000001-0.389993,0.052-0.732326,0.156-1.027,0.103999-0.294659,0.246999-0.541658,0.429-0.741,0.190665-0.207991,0.411665-0.363991,0.663-0.468,0.251331-0.103991,0.524331-0.155991,0.819-0.156,0.294663,0.000009,0.567663,0.05201,0.819,0.156,0.251329,0.104009,0.467996,0.260009,0.65,0.468,0.190662,0.199342,0.337995,0.446341,0.442,0.741,0.103995,0.294674,0.155995,0.637007,0.156,1.027-0.000005,0.390006-0.05201,0.732339-0.156,1.027-0.104005,0.294672-0.251338,0.546005-0.442,0.754-0.182004,0.199338-0.398671,0.351005-0.65,0.455-0.251337,0.104004-0.524337,0.156004-0.819,0.156-0.294669,0.000004-0.567669-0.052-0.819-0.156-0.251335-0.103995-0.472335-0.255662-0.663-0.455-0.182001-0.207995-0.325001-0.459328-0.429-0.754-0.104001-0.294661-0.156001-0.636994-0.156-1.027m3.12,0c-0.000004-0.467993-0.091-0.831992-0.273-1.092-0.182004-0.268659-0.442003-0.402992-0.78-0.403-0.338003,0.000008-0.598002,0.134341-0.78,0.403-0.182002,0.260008-0.273002,0.624007-0.273,1.092-0.000002,0.468006,0.091,0.836339,0.273,1.105,0.181998,0.260005,0.441997,0.390005,0.78,0.39,0.337997,0.000005,0.597996-0.129995,0.78-0.39,0.181996-0.268661,0.272996-0.636994,0.273-1.105m2.6,4.615c-0.000007-0.389997,0.05199-0.73233,0.156-1.027,0.103993-0.294663,0.246993-0.541663,0.429-0.741,0.190659-0.207996,0.411659-0.363996,0.663-0.468,0.251325-0.103995,0.524325-0.155995,0.819-0.156,0.294658,0.000005,0.567657,0.052,0.819,0.156,0.251323,0.104004,0.46799,0.260004,0.65,0.468,0.190656,0.199337,0.337989,0.446337,0.442,0.741,0.103989,0.29467,0.155989,0.637003,0.156,1.027-0.000011,0.390002-0.05201,0.732335-0.156,1.027-0.104011,0.294668-0.251344,0.546001-0.442,0.754-0.18201,0.199334-0.398677,0.351-0.65,0.455-0.251343,0.104-0.524342,0.156-0.819,0.156-0.294675,0-0.567675-0.052-0.819-0.156-0.251341-0.104-0.472341-0.255666-0.663-0.455-0.182007-0.207999-0.325007-0.459332-0.429-0.754-0.104007-0.294665-0.156007-0.636998-0.156-1.027m3.12,0c-0.00001-0.467997-0.09101-0.831997-0.273-1.092-0.182009-0.268663-0.442009-0.402996-0.78-0.403-0.338008,0.000004-0.598008,0.134337-0.78,0.403-0.182008,0.260003-0.273008,0.624003-0.273,1.092-0.000008,0.468002,0.09099,0.836335,0.273,1.105,0.181992,0.260001,0.441992,0.390001,0.78,0.39,0.337991,0.000001,0.597991-0.129999,0.78-0.39,0.18199-0.268665,0.27299-0.636998,0.273-1.105m-0.78-6.812-5.083,9.009-1.183,0,5.083-9.009,1.183,0"/>
+ </g>
+</svg>
diff --git a/res/skins/Tango/knobs_sliders/slider_pitch_sampler_handle.svg b/res/skins/Tango/knobs_sliders/slider_pitch_sampler_handle.svg
index 020aa3814c51..e6fb49acfdd1 100644
--- a/res/skins/Tango/knobs_sliders/slider_pitch_sampler_handle.svg
+++ b/res/skins/Tango/knobs_sliders/slider_pitch_sampler_handle.svg
@@ -1,65 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="6"
-   id="svg3758"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="New document 2">
-  <defs
-     id="defs3760" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.4"
-     inkscape:cx="15.345605"
-     inkscape:cy="8.4578502"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata3763">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1046.3622)">
-    <rect
-       style="color:#000000;fill:#dbdbdb;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3766"
-       width="18"
-       height="4"
-       x="1"
-       y="1047.3622"
-       rx="2"
-       ry="2" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="6"><rect style="marker:none" width="18" height="4" x="1" y=".9999826" rx="2" ry="2" color="#000" fill="#dbdbdb" overflow="visible"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/knobs_sliders/slider_pitch_sampler_scale.svg b/res/skins/Tango/knobs_sliders/slider_pitch_sampler_scale.svg
index 36dd56e7bad0..bf131c1f687f 100644
--- a/res/skins/Tango/knobs_sliders/slider_pitch_sampler_scale.svg
+++ b/res/skins/Tango/knobs_sliders/slider_pitch_sampler_scale.svg
@@ -1,85 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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="svg3068"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="20"
-   height="54"
-   sodipodi:docname="slider_pitch_sampler_scale.svg.2017_04_18_07_09_39.0.svg"
-   inkscape:export-filename="/home/ronso/.mixxx/skins/FlatNite/sampler_pitch_slider.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata3074">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3072" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="747"
-     id="namedview3070"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:zoom="11.313708"
-     inkscape:cx="24.306237"
-     inkscape:cy="27.190333"
-     inkscape:window-x="0"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer4"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-object-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2992"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="Layer#1"
-     transform="translate(0,-53)"
-     style="display:inline">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#6e6e6e;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       d="m 10,54.5 c -0.552285,0 -1,0.447715 -1,1 l 0,20.999999 c 0,1.380712 -1.119288,2.5 -2.5,2.5 L 3,79 c -0.552285,0 -1,0.447715 -1,1 0,0.552285 0.447715,1 1,1 l 3.5,-10e-7 c 1.380712,0 2.5,1.119288 2.5,2.5 L 9,104.5 c 0,0.55228 0.447715,1 1,1 0.552285,0 1,-0.44772 1,-1 l 0,-21.000001 c 0,-1.380712 1.119288,-2.5 2.5,-2.5 L 17,81 c 0.552285,0 1,-0.447715 1,-1 0,-0.552285 -0.447715,-1 -1,-1 l -3.5,-10e-7 c -1.380712,0 -2.5,-1.119288 -2.5,-2.5 L 11,55.5 c 0,-0.552285 -0.447715,-1 -1,-1 z m 0,24.499999 c 0.552285,0 1,0.447715 1,1 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 z"
-       id="rect4849-3"
-       sodipodi:nodetypes="ssssssssssssssssssssssssss" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="54"><path d="M10 1.5c-.552285 0-1 .447715-1 1v20.999999c0 1.380712-1.119288 2.5-2.5 2.5L3 26c-.552285 0-1 .447715-1 1s.447715 1 1 1l3.5-.000001c1.380712 0 2.5 1.119288 2.5 2.5V51.5c0 .55228.447715 1 1 1s1-.44772 1-1V30.499999c0-1.380712 1.119288-2.5 2.5-2.5L17 28c.552285 0 1-.447715 1-1s-.447715-1-1-1l-3.5-.000001c-1.380712 0-2.5-1.119288-2.5-2.5V2.5c0-.552285-.447715-1-1-1z" fill="#6e6e6e"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/knobs_sliders/slider_pitch_scale.svg b/res/skins/Tango/knobs_sliders/slider_pitch_scale.svg
index 89e52aa0394e..6c917ab4d74e 100644
--- a/res/skins/Tango/knobs_sliders/slider_pitch_scale.svg
+++ b/res/skins/Tango/knobs_sliders/slider_pitch_scale.svg
@@ -1,78 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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="svg3068"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="50"
-   height="107"
-   sodipodi:docname="slider_pitch_scale.svg"
-   inkscape:export-filename="/home/ronso/.mixxx/skins/FlatNite/pitch_slider.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata3074">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3072" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview3070"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:zoom="4"
-     inkscape:cx="42.060366"
-     inkscape:cy="38.324744"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer4"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="Layer#1"
-     style="display:inline">
-    <path
-       style="fill:#6e6e6e;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       d="m 25,3 c -0.552285,0 -1,0.447715 -1,1 l 0,46 c 0,1.380712 -1.119288,2.5 -2.5,2.5 l -5.5,0 c -0.552285,0 -1,0.447715 -1,1 0,0.552285 0.447715,1 1,1 l 5.5,0 c 1.380712,0 2.5,1.119288 2.5,2.5 l 0,46 c 0,0.55228 0.447715,1 1,1 0.552285,0 1,-0.44772 1,-1 l 0,-46 c 0,-1.380712 1.119288,-2.5 2.5,-2.5 l 5.5,0 c 0.552285,0 1,-0.447715 1,-1 0,-0.552285 -0.447715,-1 -1,-1 l -5.5,0 C 27.119288,52.5 26,51.380712 26,50 L 26,4 C 26,3.447715 25.552285,3 25,3 z m 0,49.5 c 0.552285,0 1,0.447715 1,1 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 z"
-       id="rect4849-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssssssssssssssssssssssssss" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="106"><path d="M25 2.5c-.552285 0-1 .447715-1 1v46c0 1.380712-1.119288 2.5-2.5 2.5H16c-.552285 0-1 .447715-1 1s.447715 1 1 1h5.5c1.380712 0 2.5 1.119288 2.5 2.5v46c0 .55228.447715 1 1 1s1-.44772 1-1v-46c0-1.380712 1.119288-2.5 2.5-2.5H34c.552285 0 1-.447715 1-1s-.447715-1-1-1h-5.5c-1.380712 0-2.5-1.119288-2.5-2.5v-46c0-.552285-.447715-1-1-1z" fill="#6e6e6e"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/knobs_sliders/slider_volume_h_handle.svg b/res/skins/Tango/knobs_sliders/slider_volume_h_handle.svg
index 3d930fe40b1e..33c666cc85e0 100644
--- a/res/skins/Tango/knobs_sliders/slider_volume_h_handle.svg
+++ b/res/skins/Tango/knobs_sliders/slider_volume_h_handle.svg
@@ -1,251 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4451"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="8"
-   height="28"
-   sodipodi:docname="slider_volume_h_handle.svg"
-   inkscape:export-filename="/home/ronso/.mixxx/skins/FlatNite/volume_slider.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata4457">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4455">
-    <linearGradient
-       id="linearGradient5267"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5269" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3805">
-      <stop
-         id="stop3807"
-         offset="0"
-         style="stop-color:#002464;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.18000001"
-         id="stop3809" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.81819808"
-         id="stop3811" />
-      <stop
-         id="stop3813"
-         offset="1"
-         style="stop-color:#002f64;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3861">
-      <stop
-         style="stop-color:#b4b4b4;stop-opacity:1;"
-         offset="0"
-         id="stop3863" />
-      <stop
-         style="stop-color:#6a6a6a;stop-opacity:1;"
-         offset="1"
-         id="stop3865" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#dc0000;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         id="stop3803"
-         offset="0.09"
-         style="stop-color:#b50000;stop-opacity:1;" />
-      <stop
-         id="stop3801"
-         offset="0.92000002"
-         style="stop-color:#b50000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#920000;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3756">
-      <stop
-         style="stop-color:#acacac;stop-opacity:1;"
-         offset="0"
-         id="stop3758" />
-      <stop
-         style="stop-color:#acacac;stop-opacity:0;"
-         offset="1"
-         id="stop3760" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3791"
-       x1="20.097458"
-       y1="1.9632759"
-       x2="20.097458"
-       y2="100.81083"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3867"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861-9"
-       id="linearGradient3867-7"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3861-9">
-      <stop
-         style="stop-color:#b4b4b4;stop-opacity:1;"
-         offset="0"
-         id="stop3863-4" />
-      <stop
-         style="stop-color:#7a7a7a;stop-opacity:1;"
-         offset="1"
-         id="stop3865-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3968"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3971"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3978"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481"
-       gradientTransform="translate(-0.5,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient4002"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.5,0)"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview4453"
-     showgrid="false"
-     inkscape:zoom="8.0000005"
-     inkscape:cx="-29.904405"
-     inkscape:cy="21.086604"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     fit-margin-left="1"
-     fit-margin-right="1"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3014"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Layer"
-     style="display:inline"
-     transform="translate(0,-75)">
-    <rect
-       style="fill:#b50000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect3785-3"
-       width="5"
-       height="23.5"
-       x="1.5"
-       y="77.25"
-       rx="2"
-       ry="2" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="28"><defs><linearGradient id="b"><stop offset="0" stop-color="#b4b4b4"/><stop offset="1" stop-color="#6a6a6a"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#dc0000"/><stop offset=".09" stop-color="#b50000"/><stop offset=".92000002" stop-color="#b50000"/><stop offset="1" stop-color="#920000"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#b4b4b4"/><stop offset="1" stop-color="#7a7a7a"/></linearGradient></defs><rect width="5" height="23.5" rx="2" ry="2" x="1.5" y="2.25" fill="#b50000" stroke="#000" stroke-width=".5"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/knobs_sliders/slider_volume_h_scale.svg b/res/skins/Tango/knobs_sliders/slider_volume_h_scale.svg
index efcd87b768df..4117ea214580 100644
--- a/res/skins/Tango/knobs_sliders/slider_volume_h_scale.svg
+++ b/res/skins/Tango/knobs_sliders/slider_volume_h_scale.svg
@@ -1,210 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3242"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="48"
-   height="28"
-   sodipodi:docname="slider_volume_h_scale.svg"
-   inkscape:export-filename="/home/ronso/.mixxx/skins/FlatNite/crossfader_slider.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata3248">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3246">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3805"
-       id="linearGradient5279"
-       x1="98"
-       y1="-18"
-       x2="103"
-       y2="-18"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.72222222,-98,103)" />
-    <linearGradient
-       id="linearGradient3805">
-      <stop
-         id="stop3807"
-         offset="0"
-         style="stop-color:#002464;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.18000001"
-         id="stop3809" />
-      <stop
-         style="stop-color:#0872e9;stop-opacity:1;"
-         offset="0.81819808"
-         id="stop3811" />
-      <stop
-         id="stop3813"
-         offset="1"
-         style="stop-color:#002f64;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       y2="-18"
-       x2="103"
-       y1="-18"
-       x1="98"
-       gradientTransform="matrix(1,0,0,0.72222222,-96.5,23.721171)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3031"
-       xlink:href="#linearGradient3805"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview3244"
-     showgrid="false"
-     inkscape:zoom="8"
-     inkscape:cx="42.97362"
-     inkscape:cy="22.269187"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer4"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-page="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="vector"
-     style="display:inline"
-     transform="translate(0,2)">
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-0"
-       width="2"
-       height="23"
-       x="-45"
-       y="-1.2212453e-15"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-0-3-7-6"
-       width="2"
-       height="20.891666"
-       x="-41"
-       y="2.1083333"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-0-2"
-       width="2"
-       height="18.783333"
-       x="-37"
-       y="4.2166667"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-0-3-9"
-       width="2"
-       height="16.674999"
-       x="-33"
-       y="6.3250003"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-0-6-1"
-       width="2"
-       height="14.566667"
-       x="-29"
-       y="8.4333334"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-0-3-7-2"
-       width="2"
-       height="12.458333"
-       x="-25"
-       y="10.541667"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-0-5-7"
-       width="2"
-       height="10.349999"
-       x="-21"
-       y="12.650001"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-0-3-3-0"
-       width="2"
-       height="8.2416668"
-       x="-17"
-       y="14.758334"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-0-6-5-9"
-       width="2"
-       height="6.1333323"
-       x="-13"
-       y="16.866667"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-0-3-7-6-3"
-       width="2"
-       height="4.0249996"
-       x="-9"
-       y="18.975"
-       transform="scale(-1,1)" />
-    <rect
-       style="fill:#828282;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="rect2989-0-3-7-6-3-6"
-       width="2"
-       height="1.9166666"
-       x="-5"
-       y="21.083334"
-       transform="scale(-1,1)" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="28"><defs><linearGradient id="a"><stop offset="0" stop-color="#002464"/><stop offset=".18000001" stop-color="#0872e9"/><stop offset=".81819808" stop-color="#0872e9"/><stop offset="1" stop-color="#002f64"/></linearGradient></defs><path fill="#828282" d="M45 3h-2v22h2zM41 5h-2v20h2zM37 7h-2v18h2zM33 9h-2v16h2zM29 11h-2v14h2zM25 13h-2v12h2zM21 15h-2v10h2zM17 17h-2v8.000001h2zM13 19h-2v5.999999h2zM9 21H7v4h2zM5 23H3v2.0000005h2z"/></svg>
\ No newline at end of file
diff --git a/res/skins/Tango/knobs_sliders/slider_volume_v_handle.svg b/res/skins/Tango/knobs_sliders/slider_volume_v_handle.svg
index 3397e7d596c9..ed1d206349c9 100644
--- a/res/skins/Tango/knobs_sliders/slider_volume_v_handle.svg
+++ b/res/skins/Tango/knobs_sliders/slider_volume_v_handle.svg
@@ -1,252 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4451"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="36"
-   height="9"
-   sodipodi:docname="volume_handle.svg"
-   inkscape:export-filename="/home/ronso/.mixxx/skins/FlatNite/volume_slider.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata4457">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4455">
-    <linearGradient
-       id="linearGradient5267"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5269" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3805">
-      <stop
-         id="stop3807"
-         offset="0"
-         style="stop-color:#ff3535;stop-opacity:1;" />
-      <stop
-         style="stop-color:#b50000;stop-opacity:1;"
-         offset="0.18000001"
-         id="stop3809" />
-      <stop
-         style="stop-color:#b50000;stop-opacity:1;"
-         offset="0.81819808"
-         id="stop3811" />
-      <stop
-         id="stop3813"
-         offset="1"
-         style="stop-color:#640000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3861">
-      <stop
-         style="stop-color:#b4b4b4;stop-opacity:1;"
-         offset="0"
-         id="stop3863" />
-      <stop
-         style="stop-color:#6a6a6a;stop-opacity:1;"
-         offset="1"
-         id="stop3865" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#dc0000;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         id="stop3803"
-         offset="0.09"
-         style="stop-color:#b50000;stop-opacity:1;" />
-      <stop
-         id="stop3801"
-         offset="0.92000002"
-         style="stop-color:#b50000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#920000;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3756">
-      <stop
-         style="stop-color:#acacac;stop-opacity:1;"
-         offset="0"
-         id="stop3758" />
-      <stop
-         style="stop-color:#acacac;stop-opacity:0;"
-         offset="1"
-         id="stop3760" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3791"
-       x1="20.097458"
-       y1="1.9632759"
-       x2="20.097458"
-       y2="100.81083"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3867"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861-9"
-       id="linearGradient3867-7"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3861-9">
-      <stop
-         style="stop-color:#b4b4b4;stop-opacity:1;"
-         offset="0"
-         id="stop3863-4" />
-      <stop
-         style="stop-color:#7a7a7a;stop-opacity:1;"
-         offset="1"
-         id="stop3865-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3968"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3971"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3978"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481"
-       gradientTransform="translate(-0.5,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient4002"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.5,0)"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview4453"
-     showgrid="false"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="-4.7824744"
-     inkscape:cy="-6.1750001"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     fit-margin-left="1"
-     fit-margin-right="1"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3014"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Layer"
-     style="display:inline"
-     transform="translate(0,-94)">
-    <rect
-       style="fill:#b50000;fill-opacity:1;fill-rule:nonzero;stroke:#ff0e0e;stroke-width:0.49670239999999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3785"
-       width="5.0032978"
-       height="35.503296"
-       x="95.998352"
-       y="-35.751648"
-       transform="matrix(0,1,-1,0,0,0)"
-       rx="2"
-       ry="1.9999999" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="9" width="34" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <defs></defs>
+ <rect transform="matrix(0,1,-1,0,0,0)" rx="2" ry="1.7746688" height="31.503298" width="5.0032978" stroke="#ff0e0e" y="-32.751648" x="1.9983521" stroke-width="0.49670237" fill="#b50000"/>
 </svg>
diff --git a/res/skins/Tango/knobs_sliders/slider_volume_v_scale.svg b/res/skins/Tango/knobs_sliders/slider_volume_v_scale.svg
index 440a0cc9e946..62798620c98e 100644
--- a/res/skins/Tango/knobs_sliders/slider_volume_v_scale.svg
+++ b/res/skins/Tango/knobs_sliders/slider_volume_v_scale.svg
@@ -1,268 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4451"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="36"
-   height="103"
-   sodipodi:docname="volume_slider.svg"
-   inkscape:export-filename="/home/ronso/.mixxx/skins/FlatNite/volume_slider.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata4457">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4455">
-    <linearGradient
-       id="linearGradient3775">
-      <stop
-         style="stop-color:#0e0000;stop-opacity:1;"
-         offset="0"
-         id="stop3777" />
-      <stop
-         style="stop-color:#7c0000;stop-opacity:0;"
-         offset="1"
-         id="stop3779" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3861">
-      <stop
-         style="stop-color:#b4b4b4;stop-opacity:1;"
-         offset="0"
-         id="stop3863" />
-      <stop
-         style="stop-color:#6a6a6a;stop-opacity:1;"
-         offset="1"
-         id="stop3865" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#d1d1d1;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         style="stop-color:#878787;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3756">
-      <stop
-         style="stop-color:#acacac;stop-opacity:1;"
-         offset="0"
-         id="stop3758" />
-      <stop
-         style="stop-color:#acacac;stop-opacity:0;"
-         offset="1"
-         id="stop3760" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3791"
-       x1="20.097458"
-       y1="1.9632759"
-       x2="20.097458"
-       y2="100.81083"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3867"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861-9"
-       id="linearGradient3867-7"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3861-9">
-      <stop
-         style="stop-color:#b4b4b4;stop-opacity:1;"
-         offset="0"
-         id="stop3863-4" />
-      <stop
-         style="stop-color:#7a7a7a;stop-opacity:1;"
-         offset="1"
-         id="stop3865-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3968"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3971"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient3978"
-       gradientUnits="userSpaceOnUse"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481"
-       gradientTransform="translate(-0.5,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="linearGradient4002"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.5,0)"
-       x1="26.282167"
-       y1="2.7318561"
-       x2="26.282167"
-       y2="101.18481" />
-    <filter
-       inkscape:collect="always"
-       id="filter4058"
-       x="-1.7062012"
-       width="4.4124024"
-       y="-0.034792819"
-       height="1.0695856">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.4218343"
-         id="feGaussianBlur4060" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview4453"
-     showgrid="false"
-     inkscape:zoom="4"
-     inkscape:cx="-23.253848"
-     inkscape:cy="39.822484"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     fit-margin-left="1"
-     fit-margin-right="1"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3014"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="back"
-     style="display:none"
-     sodipodi:insensitive="true">
-    <rect
-       style="fill:#333333;fill-opacity:1"
-       id="rect3787"
-       width="1390.5"
-       height="1131.3716"
-       x="-677.25"
-       y="-567.8924"
-       inkscape:transform-center-x="632.15346"
-       inkscape:transform-center-y="541.64379" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer#1"
-     style="display:none">
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter4058)"
-       d="m 17,100.07778 2,0 0,-98.0777799 -2,0 z"
-       id="path3028"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       transform="matrix(1.504046,0,0,1,-9.0728286,0)" />
-    <path
-       style="fill:#333333;fill-opacity:1"
-       d="m -43.125,-44.78125 0,194.4375 120.1875,0 0,-194.4375 z M 6,2 c 8,0 16,0 24,0 l 0,1 -3,24 0,1 -1,23 0,1 -1,25 0,1 -2,22 0,1 -10,0 0,-1 L 11,78 11,77 10,52 10,51 9,28 9,27 6,3 z"
-       id="rect4365"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccccccc" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Layer"
-     style="display:inline">
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       d="m 6,2 0,1 8.5,0 C 15.880712,3 17,4.11929 17,5.5 l 0,2.125 0,16.875 c 0,1.380712 -1.119288,2.5 -2.5,2.5 l -5.5,0 0,1 5.5,0 c 1.380712,0 2.5,1.119288 2.5,2.5 l 0,18 c 0,1.380712 -1.119288,2.5 -2.5,2.5 l -4.5,0 0,1 4.5,0 c 1.380712,0 2.5,1.119288 2.5,2.5 l 0,20 c 0,1.380712 -1.119288,2.5 -2.5,2.5 l -3.5,0 0,1 3.5,0 c 1.380712,0 2.5,1.119288 2.5,2.5 l 0,17.125 C 16.934027,98.946849 15.838229,100 14.5,100 l -1.5,0 0,1 10,0 0,-1 -1.5,0 c -1.338229,0 -2.434027,-1.053151 -2.5,-2.375 l 0,-0.125 0,-17 C 19,79.119288 20.119288,78 21.5,78 l 3.5,0 0,-1 -3.5,0 C 20.119288,77 19,75.880712 19,74.5 l 0,-20 C 19,53.119288 20.119288,52 21.5,52 l 4.5,0 0,-1 -4.5,0 C 20.119288,51 19,49.880712 19,48.5 l 0,-18 C 19,29.119288 20.119288,28 21.5,28 l 5.5,0 0,-1 -5.5,0 C 20.119288,27 19,25.880712 19,24.5 L 19,7.625 19,5.5 C 19,4.11929 20.119288,3 21.5,3 L 30,3 30,2 19,2 17,2 6,2 z"
-       id="path3028-6"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="103" width="34" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <defs></defs>
+ <path d="m5,2v2h8.5c1.380712,0,2.5,1.11929,2.5,2.5v17c0,1.380712-1.141559,2.253011-2.5,2.5h-5.5v2h5.5c1.380712,0,2.5,1.119288,2.5,2.5v17c0,1.380712-1.152167,2.200482-2.5,2.5h-4.5v2h4.5c1.380712,0,2.5,1.119288,2.5,2.5v19c0,1.380712-1.172412,2.120689-2.5,2.5h-3.5v2h3.5c1.380712,0,2.5,1.119288,2.5,2.5v16.125c-0.06597,1.321849-1.386526,1.632684-2.5,2.375h-1.5v2h10v-2h-1.5c-1.338229,0-2.434027-1.053151-2.5-2.375v-16.125c0-1.380712,1.119288-2.5,2.5-2.5h3.5v-2h-3.5c-1.380712,0-2.5-1.119288-2.5-2.5v-19c0-1.380712,1.119288-2.5,2.5-2.5h4.5v-2h-4.5c-1.380712,0-2.5-1.119288-2.5-2.5v-17c0-1.380712,1.119288-2.5,2.5-2.5h5.5v-2h-5.5c-1.380712,0-2.5-1.119288-2.5-2.5v-17c0-1.38071,1.128745-2.3386759,2.5-2.5h8.5v-2h-13z"/>
 </svg>
diff --git a/res/skins/Tango/library.xml b/res/skins/Tango/library.xml
index 60edd808c85e..62a891f3d9f4 100644
--- a/res/skins/Tango/library.xml
+++ b/res/skins/Tango/library.xml
@@ -17,10 +17,6 @@ Description:
     <Layout>vertical</Layout>
     <Children>
 
-      <!-- margin-top has no effect
-      <WidgetGroup><Size>1me,3f</Size></WidgetGroup> -->
-      <WidgetGroup><Size>1me,5f</Size></WidgetGroup>
-
       <Splitter>
         <ObjectName>LibrarySplitter</ObjectName>
         <SizePolicy>me,me</SizePolicy>
@@ -36,6 +32,15 @@ Description:
             <Size>159min,74me</Size>
             <Children>
               <Template src="skin:preview_deck.xml"/>
+
+              <WidgetGroup>
+                <Size>1me,4f</Size>
+                <Connection>
+                  <ConfigKey persist="true">[PreviewDeck],show_previewdeck</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
               <Splitter><!-- Splitter to make CoverArt resizeable -->
                 <ObjectName>LibrarySplitter</ObjectName>
                 <SizePolicy>me,me</SizePolicy>
@@ -44,14 +49,6 @@ Description:
                 <Orientation>vertical</Orientation>
                 <Collapsible>0,0</Collapsible>
                 <Children>
-                  <CoverArt>
-                    <Size>30min,30min</Size>
-                    <Connection>
-                      <ConfigKey persist="true">[Library],show_coverart</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </CoverArt>
-
                   <WidgetGroup><!-- Preview Deck, Search, Tree View -->
                     <Layout>vertical</Layout>
                     <SizePolicy>me,min</SizePolicy>
@@ -62,35 +59,32 @@ Description:
                         <Children>
                           <SearchBox></SearchBox>
                           <Template src="skin:button_2state_persist.xml">
-                            <SetVariable name="ObjectName">LibCoverbutton</SetVariable>
+                            <SetVariable name="ObjectName">LibCoverArtButton</SetVariable>
                             <!-- Icon size is 48x48px (24x24px), margin: left 2px, bottom 4px -->
                             <SetVariable name="Size">26f,28f</SetVariable>
-                            <SetVariable name="ConfigKeyPerm">[Library],show_coverart</SetVariable>
+                            <SetVariable name="ConfigKey">[Library],show_coverart</SetVariable>
                           </Template>
                           <Template src="skin:button_2state_persist.xml">
                             <SetVariable name="ObjectName">LibMiniMaxiButton</SetVariable>
                             <SetVariable name="Size">19f,28f</SetVariable>
-                            <SetVariable name="ConfigKeyPerm">[Master],maximize_library</SetVariable>
+                            <SetVariable name="ConfigKey">[Master],maximize_library</SetVariable>
                           </Template>
                         </Children>
                       </WidgetGroup><!-- /Search, Cover button, Maxi button -->
 
                       <!-- Tree View -->
                       <LibrarySidebar></LibrarySidebar>
-                      <!-- Draw a 1px line with Library border color if Mixerbar
-                          is displayed below Library -->
-
-                      <WidgetGroup>
-                        <ObjectName>Spacer58</ObjectName>
-                        <Size>1me,1f</Size>
-                        <Connection>
-                          <ConfigKey>[Tango],mixerbar_below_library</ConfigKey>
-                          <BindProperty>visible</BindProperty>
-                        </Connection>
-                      </WidgetGroup>
-
                     </Children>
                   </WidgetGroup><!-- /Preview Deck, Search, Tree View -->
+
+                  <CoverArt>
+                    <Size>30min,30min</Size>
+                    <Connection>
+                      <ConfigKey persist="true">[Library],show_coverart</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </CoverArt>
+
                 </Children>
               </Splitter><!-- /Splitter to make CoverArt resizeable -->
             </Children>
diff --git a/res/skins/Tango/library_samplers.xml b/res/skins/Tango/library_samplers.xml
deleted file mode 100644
index 91296ad44ca9..000000000000
--- a/res/skins/Tango/library_samplers.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<!--
-Description:
-  Size-aware container for sampler decks and Library.
-Modes:
-  0-36px    Library only
-  37-81px   Library or 4 miniSamplers
-  82-166    Library & [4/8 minisamplers / 4 maxiSamplers]
-  167++     Library & all Sampler options
--->
-<Template>
-  <SizeAwareStack>
-    <Children>
-
-      <WidgetGroup><!-- 0   Library only -->
-        <ObjectName>Library_Samplers_0</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>me,max</SizePolicy>
-        <MinimumSize>770,0</MinimumSize>
-        <MaximumSize>-1,36</MaximumSize>
-        <Children>
-          <SingletonContainer trigger="[Library],show_library" persist="true">
-            <ObjectName>Library_Singleton</ObjectName>
-            <Connection>
-              <ConfigKey persist="true">[Library],show_library</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </SingletonContainer>
-        </Children>
-      </WidgetGroup><!-- /0   Library only -->
-
-      <WidgetStack><!-- 1   4 miniSamplers &/ Lib -->
-        <ObjectName>Library_Samplers_1</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>me,min</SizePolicy>
-        <MinimumSize>770,37</MinimumSize>
-        <MaximumSize>-1,81</MaximumSize>
-        <Children>
-
-          <!-- workaround -->
-          <WidgetGroup><Size>0f,0f</Size><Children/></WidgetGroup>
-
-          <WidgetGroup trigger="[Samplers],show_samplers" persist="true" on_hide_select="0">
-            <ObjectName>Library_Samplers_1__Samplers</ObjectName>
-            <SizePolicy>me,min</SizePolicy>
-            <Layout>vertical</Layout>
-            <Children>
-              <WidgetGroup><!-- 4 miniSamplers -->
-                <ObjectName>Library_Samplers_1__Samplers_4mini</ObjectName>
-                <SizePolicy>me,min</SizePolicy>
-                <Layout>vertical</Layout>
-                <Children>
-                  <Template src="skin:sampler_rows_mini.xml">
-                    <SetVariable name="MaxiButtonSize">0f,0f</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-                  <Transform><Add>-1</Add><Not/></Transform>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup><!-- /4 miniSamplers -->
-            </Children>
-            <Connection>
-              <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-
-          <SingletonContainer trigger="[Library],show_library" persist="true" on_hide_select="0">
-            <ObjectName>Library_Singleton</ObjectName>
-            <Connection>
-              <ConfigKey persist="true">[Library],show_library</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </SingletonContainer>
-
-        </Children>
-      </WidgetStack><!-- /1   4 miniSamplers &/ Lib -->
-
-      <WidgetGroup><!-- 2   4/8 miniSamplers & Lib //  4 maxiSamplers & Lib -->
-        <ObjectName>Library_Samplers_2</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>me,me</SizePolicy>
-        <MinimumSize>770,82</MinimumSize>
-        <MaximumSize>-1,166</MaximumSize>
-        <Children>
-
-          <WidgetGroup trigger="[Samplers],show_samplers" persist="true" on_hide_select="0">
-            <ObjectName>Library_Samplers_2__Samplers</ObjectName>
-            <SizePolicy>me,max</SizePolicy>
-            <Layout>vertical</Layout>
-            <Children>
-
-              <WidgetGroup><!-- 4 miniSamplers / 4 maxiSamplers -->
-                <ObjectName>Library_Samplers_2__4mini_4Maxi</ObjectName>
-                <SizePolicy>me,min</SizePolicy>
-                <Layout>vertical</Layout>
-                <Children>
-                  <Template src="skin:sampler_rows.xml"/>
-                </Children>
-                <Connection>
-                  <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-                  <Transform><Add>-1</Add><Not/></Transform>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup><!-- /4 miniSamplers / 4 maxiSamplers -->
-
-              <WidgetGroup><!-- 8 miniSamplers, no MAXI button -->
-                <ObjectName>Library_Samplers_2__8mini</ObjectName>
-                <SizePolicy>me,min</SizePolicy>
-                <Layout>vertical</Layout>
-                <Children>
-                  <Template src="skin:sampler_rows_mini.xml">
-                    <SetVariable name="MaxiButtonSize">0f,0f</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-                  <Transform><Add>-1</Add></Transform>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup><!-- /8 miniSamplers, no MAXI button -->
-
-            </Children>
-            <Connection>
-              <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-
-          <SingletonContainer>
-            <ObjectName>Library_Singleton</ObjectName>
-            <Connection>
-              <ConfigKey persist="true">[Library],show_library</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </SingletonContainer>
-
-        </Children>
-      </WidgetGroup><!-- /2  4/8 miniSamplers & Lib //  4 maxiSamplers & Lib -->
-
-      <WidgetGroup><!-- 3   Samplers &/ Lib -->
-        <ObjectName>Library_Samplers_3</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>me,me</SizePolicy>
-        <MinimumSize>770,167</MinimumSize>
-        <Children>
-
-          <WidgetGroup>
-            <ObjectName>Library_Samplers_3__Samplers</ObjectName>
-            <SizePolicy>me,max</SizePolicy>
-            <Layout>horizontal</Layout>
-            <Children>
-              <Template src="skin:sampler_rows.xml"/>
-            </Children>
-            <Connection>
-              <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-
-          <SingletonContainer>
-            <ObjectName>Library_Singleton</ObjectName>
-            <Connection>
-              <ConfigKey persist="true">[Library],show_library</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </SingletonContainer>
-
-        </Children>
-      </WidgetGroup><!-- /3   Samplers &/ Lib -->
-
-    </Children>
-  </SizeAwareStack>
-</Template>
diff --git a/res/skins/Tango/loop_controls_left.xml b/res/skins/Tango/loop_controls_left.xml
deleted file mode 100644
index 605b1174edd7..000000000000
--- a/res/skins/Tango/loop_controls_left.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<!--
-Description:
-    Full looping controls: in/goto, out/goto, spinbox for beatloop size,
-                           loop move, reloop, reloop cue, beatloop
-Variables:
-    group : The group for the controls.
--->
-<Template>
-  <WidgetGroup>
-    <ObjectName>LoopBeatJumpContainer_Left</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
-    <Children>
-      <WidgetGroup><Size>0me,1min</Size></WidgetGroup>
-
-      <!-- Beatloop controls -->
-      <WidgetGroup>
-        <ObjectName>Spacer0f</ObjectName>
-        <Layout>horizontal</Layout>
-        <Children>
-          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-
-          <Template src="skin:button_1state_right.xml">
-            <SetVariable name="TooltipId">loop_in</SetVariable>
-            <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
-            <SetVariable name="Size">22f,22f</SetVariable>
-            <SetVariable name="state_0_pressed">loop_in_active.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">loop_in.svg</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,loop_in</SetVariable>
-            <SetVariable name="ConfigKeyRight"><Variable name="group"/>,loop_in_goto</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-
-          <Template src="skin:button_1state_right.xml">
-            <SetVariable name="TooltipId">loop_out</SetVariable>
-            <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
-            <SetVariable name="Size">22f,22f</SetVariable>
-            <SetVariable name="state_0_pressed">loop_out_active.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">loop_out.svg</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,loop_out</SetVariable>
-            <SetVariable name="ConfigKeyRight"><Variable name="group"/>,loop_out_goto</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-
-          <Template src="skin:button_2state_right_display.xml">
-            <SetVariable name="TooltipId">reloop_toggle</SetVariable>
-            <SetVariable name="ObjectName">ReloopButton</SetVariable>
-            <SetVariable name="Size">30f,22f</SetVariable>
-            <SetVariable name="state_0_pressed">reloop_off.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">reloop_off.svg</SetVariable>
-            <SetVariable name="state_1_pressed">reloop_on.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">reloop_on.svg</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,reloop_toggle</SetVariable>
-            <SetVariable name="ConfigKeyRight"><Variable name="group"/>,reloop_andstop</SetVariable>
-            <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,loop_enabled</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
-
-      <BeatSpinBox>
-        <TooltipId>beatloop_size</TooltipId>
-        <Value><Variable name="group"/>,beatloop_size</Value>
-      </BeatSpinBox>
-
-      <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>3f,1min</Size></WidgetGroup>
-
-      <WidgetGroup>
-        <ObjectName>Spacer0f</ObjectName>
-        <Layout>horizontal</Layout>
-        <Children>
-
-          <Template src="skin:button_2state_right.xml">
-            <SetVariable name="TooltipId">beatloop_activate</SetVariable>
-            <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
-            <SetVariable name="Size">30f,22f</SetVariable>
-            <SetVariable name="state_0_pressed">loop_on.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">loop.svg</SetVariable>
-            <SetVariable name="state_1_pressed">loop_on.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">loop_on.svg</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,beatloop_activate</SetVariable>
-            <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatlooproll_activate</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-      <!-- /Beatloop controls -->
-
-      <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>3f,1min</Size></WidgetGroup>
-
-      <!-- Loopmove / beatjump controls -->
-      <WidgetGroup><Size>0me,1min</Size></WidgetGroup>
-      <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
-
-      <BeatSpinBox>
-        <TooltipId>beatjump_size</TooltipId>
-        <Value><Variable name="group"/>,beatjump_size</Value>
-      </BeatSpinBox>
-
-      <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>3f,1min</Size></WidgetGroup>
-
-      <WidgetGroup>
-        <ObjectName>Spacer0f</ObjectName>
-        <Layout>horizontal</Layout>
-        <Children>
-
-          <Template src="skin:button_1state_right.xml">
-            <SetVariable name="TooltipId">beatjump_backward</SetVariable>
-            <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
-            <SetVariable name="Size">22f,22f</SetVariable>
-            <SetVariable name="state_0_pressed">backward_pressed.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">backward.svg</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,beatjump_backward</SetVariable>
-            <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatjump_1_backward</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-
-          <Template src="skin:button_1state_right.xml">
-            <SetVariable name="TooltipId">beatjump_forward</SetVariable>
-            <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
-            <SetVariable name="Size">22f,22f</SetVariable>
-            <SetVariable name="state_0_pressed">forward_pressed.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">forward.svg</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,beatjump_forward</SetVariable>
-            <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatjump_1_forward</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>3f,1min</Size></WidgetGroup>
-      <!-- /Loopmove / beatjump controls -->
-
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Tango/loop_controls_right.xml b/res/skins/Tango/loop_controls_right.xml
deleted file mode 100644
index 4f23c4a55f00..000000000000
--- a/res/skins/Tango/loop_controls_right.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<!--
-Description:
-    Full looping controls: in/goto, out/goto, spinbox for beatloop size,
-                           loop move, reloop, reloop cue, beatloop
-Variables:
-    group : The group for the controls.
--->
-<Template>
-  <WidgetGroup>
-    <ObjectName>LoopBeatJumpContainer_Right</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
-    <Children>
-      <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>3f,1min</Size></WidgetGroup>
-
-      <!-- Loopmove / beatjump controls -->
-      <WidgetGroup>
-        <ObjectName>Spacer0f</ObjectName>
-        <Layout>horizontal</Layout>
-        <Children>
-          <Template src="skin:button_1state_right.xml">
-            <SetVariable name="TooltipId">beatjump_backward</SetVariable>
-            <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
-            <SetVariable name="Size">22f,22f</SetVariable>
-            <SetVariable name="state_0_pressed">backward_pressed.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">backward.svg</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,beatjump_backward</SetVariable>
-            <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatjump_1_backward</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-
-          <Template src="skin:button_1state_right.xml">
-            <SetVariable name="TooltipId">beatjump_forward</SetVariable>
-            <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
-            <SetVariable name="Size">22f,22f</SetVariable>
-            <SetVariable name="state_0_pressed">forward_pressed.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">forward.svg</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,beatjump_forward</SetVariable>
-            <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatjump_1_forward</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>3f,1min</Size></WidgetGroup>
-
-      <BeatSpinBox>
-        <TooltipId>beatjump_size</TooltipId>
-        <Value><Variable name="group"/>,beatjump_size</Value>
-      </BeatSpinBox>
-
-      <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
-      <WidgetGroup><Size>0me,1min</Size></WidgetGroup>
-      <!-- /Loopmove / beatjump controls -->
-
-      <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>3f,1min</Size></WidgetGroup>
-
-      <!-- Beatloop controls -->
-      <Template src="skin:button_2state_right.xml">
-        <SetVariable name="TooltipId">beatloop_activate</SetVariable>
-        <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
-        <SetVariable name="Size">30f,22f</SetVariable>
-        <SetVariable name="state_0_pressed">loop_on.svg</SetVariable>
-        <SetVariable name="state_0_unpressed">loop.svg</SetVariable>
-        <SetVariable name="state_1_pressed">loop_on.svg</SetVariable>
-        <SetVariable name="state_1_unpressed">loop_on.svg</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="group"/>,beatloop_activate</SetVariable>
-        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatlooproll_activate</SetVariable>
-      </Template>
-
-      <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>3f,1min</Size></WidgetGroup>
-
-      <BeatSpinBox>
-        <TooltipId>beatloop_size</TooltipId>
-        <Value><Variable name="group"/>,beatloop_size</Value>
-      </BeatSpinBox>
-
-      <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
-
-      <WidgetGroup>
-        <ObjectName>Spacer0f</ObjectName>
-        <Layout>horizontal</Layout>
-        <Children>
-          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-
-          <Template src="skin:button_2state_right_display.xml">
-            <SetVariable name="TooltipId">reloop_toggle</SetVariable>
-            <SetVariable name="ObjectName">ReloopButton</SetVariable>
-            <SetVariable name="Size">30f,22f</SetVariable>
-            <SetVariable name="state_0_pressed">reloop_off.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">reloop_off.svg</SetVariable>
-            <SetVariable name="state_1_pressed">reloop_on.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">reloop_on.svg</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,reloop_toggle</SetVariable>
-            <SetVariable name="ConfigKeyRight"><Variable name="group"/>,reloop_andstop</SetVariable>
-            <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,loop_enabled</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-
-          <Template src="skin:button_1state_right.xml">
-            <SetVariable name="TooltipId">loop_in</SetVariable>
-            <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
-            <SetVariable name="Size">22f,22f</SetVariable>
-            <SetVariable name="state_0_pressed">loop_in_active.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">loop_in.svg</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,loop_in</SetVariable>
-            <SetVariable name="ConfigKeyRight"><Variable name="group"/>,loop_in_goto</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-
-          <Template src="skin:button_1state_right.xml">
-            <SetVariable name="TooltipId">loop_out</SetVariable>
-            <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
-            <SetVariable name="Size">22f,22f</SetVariable>
-            <SetVariable name="state_0_pressed">loop_out_active.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">loop_out.svg</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,loop_out</SetVariable>
-            <SetVariable name="ConfigKeyRight"><Variable name="group"/>,loop_out_goto</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-        </Children>
-      </WidgetGroup>
-      <!-- /Beatloop controls -->
-
-      <WidgetGroup><Size>0me,1min</Size></WidgetGroup>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Tango/loop_indicator.xml b/res/skins/Tango/loop_indicator.xml
index 450e85be6802..ca2def565588 100644
--- a/res/skins/Tango/loop_indicator.xml
+++ b/res/skins/Tango/loop_indicator.xml
@@ -1,9 +1,9 @@
 <!--
 Description:
-  An indicator displayed in decks' artist/title container when loop is enabled.
+  A loop indicator in decks' artist/title container, visible when loop is enabled
+  but loop controls are hidden.
 Variables:
   group   : [ChannelN]
-  chanNum : channel number
 -->
 <Template>
   <WidgetGroup>
@@ -23,7 +23,7 @@ Variables:
           </Template>
         </Children>
         <Connection>
-          <ConfigKey>[Channel<Variable name="chanNum"/>],loop_enabled</ConfigKey>
+          <ConfigKey><Variable name="group"/>,loop_enabled</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup>
diff --git a/res/skins/Tango/loop_jump_controls_left.xml b/res/skins/Tango/loop_jump_controls_left.xml
new file mode 100644
index 000000000000..f4a539758a28
--- /dev/null
+++ b/res/skins/Tango/loop_jump_controls_left.xml
@@ -0,0 +1,213 @@
+<!--
+Description:
+    Full looping controls: in/goto, out/goto, spinbox for beatloop size,
+                           loop move, reloop, reloop cue, beatloop
+Variables:
+    group : The group for the controls.
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>Spacer1e</ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+      <WidgetGroup><Size>1me,3f</Size></WidgetGroup>
+
+      <WidgetGroup><!-- Loop & beatjump controls -->
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:spacer_responsive_filler.xml">
+            <SetVariable name="Color">25</SetVariable>
+            <SetVariable name="Size">0me,0me</SetVariable>
+          </Template>
+
+          <WidgetGroup>
+            <MinimumSize>0,0</MinimumSize>
+            <MaximumSize>3,-1</MaximumSize>
+            <SizePolicy>me,min</SizePolicy>
+          </WidgetGroup>
+
+          <WidgetGroup><!-- Beatloop controls -->
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <WidgetGroup><!-- Beatloop controls 2.1 -->
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <Template src="skin:button_2state_right.xml">
+                    <SetVariable name="TooltipId">beatloop_activate</SetVariable>
+                    <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
+                    <SetVariable name="Size">30f,22f</SetVariable>
+                    <SetVariable name="state_0_pressed">loop_on.svg</SetVariable>
+                    <SetVariable name="state_0_unpressed">loop.svg</SetVariable>
+                    <SetVariable name="state_1_pressed">loop_on.svg</SetVariable>
+                    <SetVariable name="state_1_unpressed">loop_on.svg</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,beatloop_activate</SetVariable>
+                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatlooproll_activate</SetVariable>
+                  </Template>
+
+                  <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
+
+                  <BeatSpinBox>
+                    <TooltipId>beatloop_size</TooltipId>
+                    <Value><Variable name="group"/>,beatloop_size</Value>
+                  </BeatSpinBox>
+
+                  <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+                  <WidgetGroup>
+                    <ObjectName>Spacer0f</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                      <Template src="skin:button_2state_right_display.xml">
+                        <SetVariable name="TooltipId">reloop_toggle</SetVariable>
+                        <SetVariable name="ObjectName">ReloopButton</SetVariable>
+                        <SetVariable name="Size">30f,22f</SetVariable>
+                        <SetVariable name="state_0_pressed">reloop_off.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">reloop_off.svg</SetVariable>
+                        <SetVariable name="state_1_pressed">reloop_on.svg</SetVariable>
+                        <SetVariable name="state_1_unpressed">reloop_on.svg</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,reloop_toggle</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,reloop_andstop</SetVariable>
+                        <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,loop_enabled</SetVariable>
+                      </Template>
+
+                      <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+
+                      <Template src="skin:button_1state_right.xml">
+                        <SetVariable name="TooltipId">loop_in</SetVariable>
+                        <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
+                        <SetVariable name="Size">22f,22f</SetVariable>
+                        <SetVariable name="state_0_pressed">loop_in_active.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">loop_in.svg</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,loop_in</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,loop_in_goto</SetVariable>
+                      </Template>
+
+                      <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+
+                      <Template src="skin:button_1state_right.xml">
+                        <SetVariable name="TooltipId">loop_out</SetVariable>
+                        <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
+                        <SetVariable name="Size">22f,22f</SetVariable>
+                        <SetVariable name="state_0_pressed">loop_out_active.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">loop_out.svg</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,loop_out</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,loop_out_goto</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup>
+
+                  <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
+
+                  <Template src="skin:button_2state_persist.xml">
+                    <SetVariable name="ObjectName">FxSamplersMiniMaxi</SetVariable>
+                    <SetVariable name="Size">16f,16f</SetVariable>
+                    <SetVariable name="ConfigKey">[Tango],loop_sizes</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup><!-- /Beatloop controls 2.1 -->
+
+              <!-- Fixed-size beatloop buttons -->
+              <Template src="skin:loop_sizes_left.xml"/>
+
+            </Children>
+          </WidgetGroup><!-- /Beatloop controls -->
+
+          <WidgetGroup>
+            <MinimumSize>0,0</MinimumSize>
+            <MaximumSize>2,-1</MaximumSize>
+            <SizePolicy>me,min</SizePolicy>
+          </WidgetGroup>
+
+          <!-- Loopmove / beatjump controls -->
+          <Template src="skin:spacer_responsive_filler.xml">
+            <SetVariable name="Color">25</SetVariable>
+            <SetVariable name="Size">0me,0me</SetVariable>
+          </Template>
+
+          <WidgetGroup>
+            <MinimumSize>0,0</MinimumSize>
+            <MaximumSize>5,-1</MaximumSize>
+            <SizePolicy>me,min</SizePolicy>
+          </WidgetGroup>
+
+          <WidgetGroup><!-- Beatjump controls + spacer below -->
+            <SizePolicy>min,min</SizePolicy>
+            <Layout>vertical</Layout>
+            <Children>
+              <WidgetGroup><!-- Beatjump controls -->
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <BeatSpinBox>
+                    <TooltipId>beatjump_size</TooltipId>
+                    <Value><Variable name="group"/>,beatjump_size</Value>
+                  </BeatSpinBox>
+
+                  <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
+
+                  <WidgetGroup><!-- Beatjump backw/forw -->
+                    <ObjectName>Spacer0f</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                      <Template src="skin:button_1state_right.xml">
+                        <SetVariable name="TooltipId">beatjump_backward</SetVariable>
+                        <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
+                        <SetVariable name="Size">22f,22f</SetVariable>
+                        <SetVariable name="state_0_pressed">backward_pressed.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">backward.svg</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,beatjump_backward</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatjump_1_backward</SetVariable>
+                      </Template>
+
+                      <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+
+                      <Template src="skin:button_1state_right.xml">
+                        <SetVariable name="TooltipId">beatjump_forward</SetVariable>
+                        <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
+                        <SetVariable name="Size">22f,22f</SetVariable>
+                        <SetVariable name="state_0_pressed">forward_pressed.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">forward.svg</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,beatjump_forward</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatjump_1_forward</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup><!-- /Beatjump backw/forw -->
+                </Children>
+              </WidgetGroup><!-- Beatjump controls -->
+
+              <WidgetGroup><!-- Sapcer when fixed-size loop buttons are ON -->
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>vertical</Layout>
+                <Children>
+                  <WidgetGroup><Size>1min,3f</Size></WidgetGroup>
+                  <Template src="skin:spacer_responsive_filler.xml">
+                    <SetVariable name="Color">25</SetVariable>
+                    <SetVariable name="Size">0me,0min</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey persist="true">[Tango],loop_sizes</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- /Beatjump controls + spacer below -->
+
+          <WidgetGroup>
+            <MinimumSize>0,0</MinimumSize>
+            <MaximumSize>3,-1</MaximumSize>
+            <SizePolicy>me,min</SizePolicy>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup><!-- /Loop & beatjump controls -->
+    </Children>
+    <Connection>
+      <ConfigKey>[Tango],loop_beatjump_controls</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Tango/loop_jump_controls_right.xml b/res/skins/Tango/loop_jump_controls_right.xml
new file mode 100644
index 000000000000..51b842241cb9
--- /dev/null
+++ b/res/skins/Tango/loop_jump_controls_right.xml
@@ -0,0 +1,213 @@
+<!--
+Description:
+    Full looping controls: in/goto, out/goto, spinbox for beatloop size,
+                           loop move, reloop, reloop cue, beatloop
+Variables:
+    group : The group for the controls.
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>Spacer1e</ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+      <WidgetGroup><Size>1me,3f</Size></WidgetGroup>
+
+      <WidgetGroup><!-- Loop & beatjump controls -->
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <MinimumSize>0,0</MinimumSize>
+            <MaximumSize>3,-1</MaximumSize>
+            <SizePolicy>me,min</SizePolicy>
+          </WidgetGroup>
+
+          <WidgetGroup><!-- Beatjump controls + spacer below -->
+            <SizePolicy>min,min</SizePolicy>
+            <Layout>vertical</Layout>
+            <Children>
+              <WidgetGroup><!-- Beatjump controls -->
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><!-- Beatjump backw/forw -->
+                    <ObjectName>Spacer0f</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                      <Template src="skin:button_1state_right.xml">
+                        <SetVariable name="TooltipId">beatjump_backward</SetVariable>
+                        <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
+                        <SetVariable name="Size">22f,22f</SetVariable>
+                        <SetVariable name="state_0_pressed">backward_pressed.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">backward.svg</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,beatjump_backward</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatjump_1_backward</SetVariable>
+                      </Template>
+
+                      <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+
+                      <Template src="skin:button_1state_right.xml">
+                        <SetVariable name="TooltipId">beatjump_forward</SetVariable>
+                        <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
+                        <SetVariable name="Size">22f,22f</SetVariable>
+                        <SetVariable name="state_0_pressed">forward_pressed.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">forward.svg</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,beatjump_forward</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatjump_1_forward</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup><!-- /Beatjump backw/forw -->
+
+                  <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
+
+                  <BeatSpinBox>
+                    <TooltipId>beatjump_size</TooltipId>
+                    <Value><Variable name="group"/>,beatjump_size</Value>
+                  </BeatSpinBox>
+                </Children>
+              </WidgetGroup><!-- Beatjump controls -->
+
+              <WidgetGroup><!-- Spacer when fixed-size loop buttons are ON -->
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>vertical</Layout>
+                <Children>
+                  <WidgetGroup><Size>1min,3f</Size></WidgetGroup>
+                  <Template src="skin:spacer_responsive_filler.xml">
+                    <SetVariable name="Color">25</SetVariable>
+                    <SetVariable name="Size">0me,0min</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey persist="true">[Tango],loop_sizes</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- /Beatjump controls + spacer below -->
+
+          <WidgetGroup>
+            <MinimumSize>0,0</MinimumSize>
+            <MaximumSize>5,-1</MaximumSize>
+            <SizePolicy>me,min</SizePolicy>
+          </WidgetGroup>
+
+          <!-- Loopmove / beatjump controls -->
+          <Template src="skin:spacer_responsive_filler.xml">
+            <SetVariable name="Color">25</SetVariable>
+            <SetVariable name="Size">0me,0me</SetVariable>
+          </Template>
+
+          <WidgetGroup>
+            <MinimumSize>0,0</MinimumSize>
+            <MaximumSize>3,-1</MaximumSize>
+            <SizePolicy>me,min</SizePolicy>
+          </WidgetGroup>
+
+          <WidgetGroup><!-- Beatloop controls -->
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <WidgetGroup><!-- Beatloop controls 2.1 -->
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <Template src="skin:button_2state_persist.xml">
+                    <SetVariable name="ObjectName">FxSamplersMiniMaxi</SetVariable>
+                    <SetVariable name="Size">16f,16f</SetVariable>
+                    <SetVariable name="ConfigKey">[Tango],loop_sizes</SetVariable>
+                  </Template>
+
+                  <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
+
+                  <Template src="skin:button_2state_right.xml">
+                    <SetVariable name="TooltipId">beatloop_activate</SetVariable>
+                    <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
+                    <SetVariable name="Size">30f,22f</SetVariable>
+                    <SetVariable name="state_0_pressed">loop_on.svg</SetVariable>
+                    <SetVariable name="state_0_unpressed">loop.svg</SetVariable>
+                    <SetVariable name="state_1_pressed">loop_on.svg</SetVariable>
+                    <SetVariable name="state_1_unpressed">loop_on.svg</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,beatloop_activate</SetVariable>
+                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatlooproll_activate</SetVariable>
+                  </Template>
+
+                  <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
+
+                  <BeatSpinBox>
+                    <TooltipId>beatloop_size</TooltipId>
+                    <Value><Variable name="group"/>,beatloop_size</Value>
+                  </BeatSpinBox>
+
+                  <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+                  <WidgetGroup>
+                    <ObjectName>Spacer0f</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                      <Template src="skin:button_2state_right_display.xml">
+                        <SetVariable name="TooltipId">reloop_toggle</SetVariable>
+                        <SetVariable name="ObjectName">ReloopButton</SetVariable>
+                        <SetVariable name="Size">30f,22f</SetVariable>
+                        <SetVariable name="state_0_pressed">reloop_off.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">reloop_off.svg</SetVariable>
+                        <SetVariable name="state_1_pressed">reloop_on.svg</SetVariable>
+                        <SetVariable name="state_1_unpressed">reloop_on.svg</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,reloop_toggle</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,reloop_andstop</SetVariable>
+                        <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,loop_enabled</SetVariable>
+                      </Template>
+
+                      <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+
+                      <Template src="skin:button_1state_right.xml">
+                        <SetVariable name="TooltipId">loop_in</SetVariable>
+                        <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
+                        <SetVariable name="Size">22f,22f</SetVariable>
+                        <SetVariable name="state_0_pressed">loop_in_active.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">loop_in.svg</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,loop_in</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,loop_in_goto</SetVariable>
+                      </Template>
+
+                      <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+
+                      <Template src="skin:button_1state_right.xml">
+                        <SetVariable name="TooltipId">loop_out</SetVariable>
+                        <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
+                        <SetVariable name="Size">22f,22f</SetVariable>
+                        <SetVariable name="state_0_pressed">loop_out_active.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">loop_out.svg</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,loop_out</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,loop_out_goto</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup>
+                </Children>
+              </WidgetGroup><!-- /Beatloop controls 2.1 -->
+
+              <!-- Fixed-size beatloop buttons -->
+              <Template src="skin:loop_sizes_right.xml"/>
+
+            </Children>
+          </WidgetGroup><!-- /Beatloop controls -->
+
+          <WidgetGroup>
+            <MinimumSize>0,0</MinimumSize>
+            <MaximumSize>3,-1</MaximumSize>
+            <SizePolicy>me,min</SizePolicy>
+          </WidgetGroup>
+
+          <Template src="skin:spacer_responsive_filler.xml">
+            <SetVariable name="Color">25</SetVariable>
+            <SetVariable name="Size">0me,0me</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup><!-- /Loop & beatjump controls -->
+    </Children>
+    <Connection>
+      <ConfigKey>[Tango],loop_beatjump_controls</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Tango/loop_sizes.xml b/res/skins/Tango/loop_sizes_left.xml
similarity index 69%
rename from res/skins/Tango/loop_sizes.xml
rename to res/skins/Tango/loop_sizes_left.xml
index 0e7adaa3f63c..7d46af8ecb80 100644
--- a/res/skins/Tango/loop_sizes.xml
+++ b/res/skins/Tango/loop_sizes_left.xml
@@ -6,65 +6,62 @@ Variables:
 -->
 <Template>
   <WidgetGroup>
-    <ObjectName>LoopBeatJumpContainer</ObjectName>
     <Layout>vertical</Layout>
     <SizePolicy>min,min</SizePolicy>
     <Children>
-    
-      <WidgetGroup><!-- Loop row 1 -->
+      <WidgetGroup><Size>1min,3f</Size></WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>Spacer0f</ObjectName>
         <Layout>horizontal</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <Template src="skin:button_loop.xml">
+          <Template src="skin:button_loopsize.xml">
             <SetVariable name="LoopLength_Control">0.125</SetVariable>
             <SetVariable name="LoopLength_Text">/8</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup><!--   -->
-          <Template src="skin:button_loop.xml">
+          <Template src="skin:button_loopsize.xml">
             <SetVariable name="LoopLength_Control">0.25</SetVariable>
             <SetVariable name="LoopLength_Text">/4</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-          <Template src="skin:button_loop.xml">
+          <Template src="skin:button_loopsize.xml">
             <SetVariable name="LoopLength_Control">0.5</SetVariable>
             <SetVariable name="LoopLength_Text">/2</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-          <Template src="skin:button_loop.xml">
+          <Template src="skin:button_loopsize.xml">
             <SetVariable name="LoopLength_Control">1</SetVariable>
             <SetVariable name="LoopLength_Text">1</SetVariable>
           </Template>
-        </Children>
-      </WidgetGroup><!-- /Loop row 1 -->
-      
-        <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
-        
-      <WidgetGroup><!-- Loop row 2 -->
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:button_loop.xml">
+            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+          <Template src="skin:button_loopsize.xml">
             <SetVariable name="LoopLength_Control">2</SetVariable>
             <SetVariable name="LoopLength_Text">2</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-          <Template src="skin:button_loop.xml">
+          <Template src="skin:button_loopsize.xml">
             <SetVariable name="LoopLength_Control">4</SetVariable>
             <SetVariable name="LoopLength_Text">4</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-          <Template src="skin:button_loop.xml">
+          <Template src="skin:button_loopsize.xml">
             <SetVariable name="LoopLength_Control">8</SetVariable>
             <SetVariable name="LoopLength_Text">8</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-          <Template src="skin:button_loop.xml">
+          <Template src="skin:button_loopsize.xml">
             <SetVariable name="LoopLength_Control">16</SetVariable>
             <SetVariable name="LoopLength_Text">16</SetVariable>
-          </Template><!--    -->
+          </Template>
+            <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>0me,1min</Size></WidgetGroup>
         </Children>
-      </WidgetGroup><!-- /Loop row 2 -->
-      
+      </WidgetGroup>
     </Children>
+    <Connection>
+      <ConfigKey persist="true">[Tango],loop_sizes</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Tango/loop_sizes_right.xml b/res/skins/Tango/loop_sizes_right.xml
new file mode 100644
index 000000000000..fcb0d5639d13
--- /dev/null
+++ b/res/skins/Tango/loop_sizes_right.xml
@@ -0,0 +1,67 @@
+<!--
+Description:
+    Looping controls (in, out, reloop, loop move).
+Variables:
+    group: The group for the controls.
+-->
+<Template>
+  <WidgetGroup>
+    <Layout>vertical</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+      <WidgetGroup><Size>1min,3f</Size></WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>Spacer0f</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+            <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>0me,1min</Size></WidgetGroup>
+          <Template src="skin:button_loopsize.xml">
+            <SetVariable name="LoopLength_Control">0.125</SetVariable>
+            <SetVariable name="LoopLength_Text">/8</SetVariable>
+          </Template>
+            <WidgetGroup><Size>1f,1min</Size></WidgetGroup><!--   -->
+          <Template src="skin:button_loopsize.xml">
+            <SetVariable name="LoopLength_Control">0.25</SetVariable>
+            <SetVariable name="LoopLength_Text">/4</SetVariable>
+          </Template>
+            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+          <Template src="skin:button_loopsize.xml">
+            <SetVariable name="LoopLength_Control">0.5</SetVariable>
+            <SetVariable name="LoopLength_Text">/2</SetVariable>
+          </Template>
+            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+          <Template src="skin:button_loopsize.xml">
+            <SetVariable name="LoopLength_Control">1</SetVariable>
+            <SetVariable name="LoopLength_Text">1</SetVariable>
+          </Template>
+            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+          <Template src="skin:button_loopsize.xml">
+            <SetVariable name="LoopLength_Control">2</SetVariable>
+            <SetVariable name="LoopLength_Text">2</SetVariable>
+          </Template>
+            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+          <Template src="skin:button_loopsize.xml">
+            <SetVariable name="LoopLength_Control">4</SetVariable>
+            <SetVariable name="LoopLength_Text">4</SetVariable>
+          </Template>
+            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+          <Template src="skin:button_loopsize.xml">
+            <SetVariable name="LoopLength_Control">8</SetVariable>
+            <SetVariable name="LoopLength_Text">8</SetVariable>
+          </Template>
+            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+          <Template src="skin:button_loopsize.xml">
+            <SetVariable name="LoopLength_Control">16</SetVariable>
+            <SetVariable name="LoopLength_Text">16</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+    <Connection>
+      <ConfigKey persist="true">[Tango],loop_sizes</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Tango/mixer_channel_left.xml b/res/skins/Tango/mixer_channel_left.xml
index 32e5bc79a6f5..c19b4ff89b2f 100644
--- a/res/skins/Tango/mixer_channel_left.xml
+++ b/res/skins/Tango/mixer_channel_left.xml
@@ -1,12 +1,12 @@
 <!--
 Description:
   The channel mixer containing
-  * EQ knobs incl. Kill buttons (if enabled)
-  * Filter knob (if enabled)
+  * EQ knobs incl. Kill buttons ] if enabled
+  * QuickEffect knob            ]
   * Headphone cue button
   * Volume slider
   * Gain knob
-  * VUMeter (if enabled)
+  * VUMeter
 Variables:
   group : [ChannelXY]
 -->
@@ -18,118 +18,39 @@ Variables:
     <Children>
       <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1me</Size></WidgetGroup>
 
-      <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+      <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
 
-      <WidgetGroup><!-- EQs + Filter + Pfl -->
-        <ObjectName>EQKnobs</ObjectName>
+      <WidgetGroup><!-- EQs + QuickEffect knobs -->
         <Layout>vertical</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <!-- see spacer in eq_knob_left/right.xml when
-               Filter knob is visible -->
-          <Template src="skin:eq_knob_left.xml"><!-- High EQ -->
+            <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
+          <Template src="skin:eq_knob_button_left.xml"><!-- High EQ -->
             <SetVariable name="parameter">3</SetVariable>
-            <SetVariable name="TooltipId">filterHigh</SetVariable>
           </Template>
-          <Template src="skin:eq_knob_left.xml"><!-- Mid EQ -->
+            <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
+          <Template src="skin:eq_knob_button_left.xml"><!-- Mid EQ -->
             <SetVariable name="parameter">2</SetVariable>
-            <SetVariable name="TooltipId">filterMid</SetVariable>
           </Template>
-          <Template src="skin:eq_knob_left.xml"><!-- Low EQ -->
+            <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
+          <Template src="skin:eq_knob_button_left.xml"><!-- Low EQ -->
             <SetVariable name="parameter">1</SetVariable>
-            <SetVariable name="TooltipId">filterLow</SetVariable>
           </Template>
-
-          <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
-
-          <WidgetGroup>
-            <Size>1min,3f</Size>
-            <Connection>
-              <ConfigKey persist="true">[Tango],filter_knob</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-
-          <!-- Filter knob + PflButton / Pfl button only -->
-          <WidgetStack currentpage="[Tango],filter_pfl_stack" persist="true">
-            <Children>
-
-              <WidgetGroup><!-- PflButton only -->
-                <ObjectName>FilterPflContainer</ObjectName>
-                <SizePolicy>min,min</SizePolicy>
-                <Layout>horizontal</Layout>
-                <Children>
-
-                  <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-
-                  <Template src="skin:button_2state.xml">
-                    <SetVariable name="TooltipId">pfl</SetVariable>
-                    <SetVariable name="ObjectName">PflButton</SetVariable>
-                    <SetVariable name="Size">28f,28f</SetVariable>
-                    <SetVariable name="state_0_pressed">pfl_off.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">pfl_off.svg</SetVariable>
-                    <SetVariable name="state_1_pressed">pfl_on.svg</SetVariable>
-                    <SetVariable name="state_1_unpressed">pfl_on.svg</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
-                  </Template>
-
-                  <WidgetGroup><Size>25f,1min</Size></WidgetGroup>
-
-                </Children>
-              </WidgetGroup><!-- /PflButton only -->
-
-              <!-- Filter knob + PflButton -->
-              <WidgetGroup trigger="[Tango],filter_knob" on-hide-select="0">
-                <ObjectName>FilterPflContainer</ObjectName>
-                <SizePolicy>min,min</SizePolicy>
-                <Layout>horizontal</Layout>
-                <Children>
-
-                  <Template src="skin:knob_textless.xml">
-                    <SetVariable name="ObjectName">FilterKnob</SetVariable>
-                    <SetVariable name="TooltipId"></SetVariable>
-                    <SetVariable name="Size">30f,30f</SetVariable>
-                    <SetVariable name="Color">blue</SetVariable>
-                    <SetVariable name="group">[QuickEffectRack1_<Variable name="group"/>]</SetVariable>
-                    <SetVariable name="ConfigKey">super1</SetVariable>
-                  </Template>
-
-                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-
-                  <Template src="skin:button_2state.xml">
-                    <SetVariable name="TooltipId">pfl</SetVariable>
-                    <SetVariable name="ObjectName">PflButton</SetVariable>
-                    <SetVariable name="Size">24f,24f</SetVariable>
-                    <SetVariable name="state_0_pressed">pfl_off.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">pfl_off.svg</SetVariable>
-                    <SetVariable name="state_1_pressed">pfl_on.svg</SetVariable>
-                    <SetVariable name="state_1_unpressed">pfl_on.svg</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
-                  </Template>
-
-                  <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
-
-                </Children>
-                <Connection>
-                  <ConfigKey persist="true">[Tango],filter_knob</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup><!-- /Filter knob + PflButton -->
-
-            </Children>
-          </WidgetStack><!-- /Filter knob + PflButton / Pfl button only -->
-
+            <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
+          <Template src="skin:quick_fx_knob_button_left.xml"/><!-- Quick Effect knob -->
         </Children>
         <Connection>
           <ConfigKey persist="true">[Tango],eq_knobs</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- /EQs + Filter + Pfl -->
+      </WidgetGroup><!-- /EQs + QuickEffect knobs -->
+
+      <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
 
       <WidgetGroup><!--  Volume Slider + Gain knob -->
         <ObjectName>VolumeSliderGain</ObjectName>
         <Layout>vertical</Layout>
-        <Size>36f,1me</Size>
+        <SizePolicy>f,me</SizePolicy>
         <Children>
           <SliderComposed><!-- Volume slider -->
             <ObjectName>VolumeSlider</ObjectName>
@@ -144,31 +65,60 @@ Variables:
 
           <WidgetGroup><Size>1min,1me</Size></WidgetGroup>
 
-          <WidgetGroup><!--  Gain knob -->
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <Children>
-              <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
-              <Template src="skin:knob_textless.xml">
-                <SetVariable name="ObjectName">GainKnob</SetVariable>
-                <SetVariable name="TooltipId">pregain</SetVariable>
-                <SetVariable name="Size">30f,30f</SetVariable>
-                <SetVariable name="Color">yellow</SetVariable>
-                <SetVariable name="group"><Variable name="group"/></SetVariable>
-                <SetVariable name="ConfigKey">pregain</SetVariable>
-              </Template>
-              <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
-            </Children>
-          </WidgetGroup><!-- /Gain knob -->
+          <!-- Gain knob, centered below Volume slider -->
+          <Template src="skin:knob_textless.xml">
+            <SetVariable name="TooltipId">pregain</SetVariable>
+            <SetVariable name="ObjectName">GainKnob</SetVariable>
+            <SetVariable name="Size">30f,30f</SetVariable>
+            <SetVariable name="Color">yellow</SetVariable>
+            <SetVariable name="group"><Variable name="group"/></SetVariable>
+            <SetVariable name="ConfigKey">pregain</SetVariable>
+          </Template>
 
         </Children>
       </WidgetGroup><!-- /Volume Slider + Gain knob -->
 
-    <!-- No matter if VUMeter is visible, make sure there's 4px padding on the right -->
-      <WidgetGroup><Size>2f,1me</Size></WidgetGroup>
-      <Template src="skin:vumeter_mixer.xml"/>
-      <WidgetGroup><Size>2f,1me</Size></WidgetGroup>
+      <WidgetGroup><!-- VU Meter + Pfl button -->
+        <ObjectName>AlignCenter</ObjectName>
+        <Layout>vertical</Layout>
+        <Children>
+          <Template src="skin:vumeter_mixer.xml"/>
+            <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
 
+          <WidgetGroup><!-- Pfl button, isolated with a 'gap' -->
+            <ObjectName>PflBoxLeft</ObjectName>
+            <Size>25f,25f</Size>
+            <Layout>stacked</Layout>
+            <Children>
+              <!-- index 0 due to bug -->
+              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
+
+              <!-- Greyed out if no headphone device is configured -->
+              <WidgetGroup>
+                <ObjectName>MixerbarCover</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>me,me</SizePolicy>
+                <Connection>
+                  <ConfigKey>[Master],headEnabled</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                  <Transform><Not/></Transform>
+                </Connection>
+              </WidgetGroup>
+
+              <Template src="skin:button_2state.xml">
+                <SetVariable name="TooltipId">pfl</SetVariable>
+                <SetVariable name="ObjectName">PflButtonLeft</SetVariable>
+                <SetVariable name="Size">24f,24f</SetVariable>
+                <SetVariable name="state_0_pressed">pfl_off.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">pfl_off.svg</SetVariable>
+                <SetVariable name="state_1_pressed">pfl_on.svg</SetVariable>
+                <SetVariable name="state_1_unpressed">pfl_on.svg</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup><!-- /Pfl button, isolated with a 'gap' -->
+        </Children>
+      </WidgetGroup><!-- /VU Meter + Pfl button -->
     </Children>
     <Connection>
       <ConfigKey persist="true">[Tango],channel_mixer</ConfigKey>
diff --git a/res/skins/Tango/mixer_channel_right.xml b/res/skins/Tango/mixer_channel_right.xml
index 0d4c715c9462..c8b2a88267c1 100644
--- a/res/skins/Tango/mixer_channel_right.xml
+++ b/res/skins/Tango/mixer_channel_right.xml
@@ -1,12 +1,12 @@
 <!--
 Description:
   The channel mixer containing
-  * EQ knobs incl. Kill buttons (if enabled)
-  * Filter knob (if enabled)
+  * EQ knobs incl. Kill buttons ] if enabled
+  * QuickEffect knob            ]
   * Headphone cue button
   * Volume slider
   * Gain knob
-  * VUMeter (if enabled)
+  * VUMeter
 Variables:
   group : [ChannelXY]
 -->
@@ -17,15 +17,52 @@ Variables:
     <SizePolicy>min,me</SizePolicy>
     <Children>
 
-    <!-- No matter if VUMeter is visible, make sure there's 4px padding on the left -->
-      <WidgetGroup><Size>2f,1me</Size></WidgetGroup>
-      <Template src="skin:vumeter_mixer.xml"/>
-      <WidgetGroup><Size>2f,1me</Size></WidgetGroup>
+      <WidgetGroup><!-- VU Meter + Pfl button -->
+        <ObjectName>AlignCenter</ObjectName>
+        <Layout>vertical</Layout>
+        <Children>
+          <Template src="skin:vumeter_mixer.xml"/>
+            <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
+
+          <WidgetGroup><!-- Pfl button, isolated with a 'gap' -->
+            <ObjectName>PflBoxRight</ObjectName>
+            <Size>25f,25f</Size>
+            <Layout>stacked</Layout>
+            <Children>
+              <!-- index 0 due to bug -->
+              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
+
+              <!-- Greyed out if no headphone device is configured -->
+              <WidgetGroup>
+                <ObjectName>MixerbarCover</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>me,me</SizePolicy>
+                <Connection>
+                  <ConfigKey>[Master],headEnabled</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                  <Transform><Not/></Transform>
+                </Connection>
+              </WidgetGroup>
+
+              <Template src="skin:button_2state.xml">
+                <SetVariable name="TooltipId">pfl</SetVariable>
+                <SetVariable name="ObjectName">PflButtonRight</SetVariable>
+                <SetVariable name="Size">24f,24f</SetVariable>
+                <SetVariable name="state_0_pressed">pfl_off.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">pfl_off.svg</SetVariable>
+                <SetVariable name="state_1_pressed">pfl_on.svg</SetVariable>
+                <SetVariable name="state_1_unpressed">pfl_on.svg</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup><!-- /Pfl button, isolated with a 'gap' -->
+        </Children>
+      </WidgetGroup><!-- /VU Meter + Pfl button -->
 
       <WidgetGroup><!--  Volume Slider + Gain knob -->
         <ObjectName>VolumeSliderGain</ObjectName>
         <Layout>vertical</Layout>
-        <Size>36f,1me</Size>
+        <SizePolicy>f,me</SizePolicy>
         <Children>
           <SliderComposed><!-- Volume slider -->
             <ObjectName>VolumeSlider</ObjectName>
@@ -40,133 +77,47 @@ Variables:
 
           <WidgetGroup><Size>1min,1me</Size></WidgetGroup>
 
-          <WidgetGroup><!--  Gain knob -->
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <Children>
-              <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
-              <Template src="skin:knob_textless.xml">
-                <SetVariable name="ObjectName">GainKnob</SetVariable>
-                <SetVariable name="TooltipId">pregain</SetVariable>
-                <SetVariable name="Size">30f,30f</SetVariable>
-                <SetVariable name="Color">yellow</SetVariable>
-                <SetVariable name="group"><Variable name="group"/></SetVariable>
-                <SetVariable name="ConfigKey">pregain</SetVariable>
-              </Template>
-              <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
-            </Children>
-          </WidgetGroup><!--  /Gain knob -->
+          <!-- Gain knob, centered below Volume slider -->
+          <Template src="skin:knob_textless.xml">
+            <SetVariable name="ObjectName">GainKnob</SetVariable>
+            <SetVariable name="TooltipId">pregain</SetVariable>
+            <SetVariable name="Size">30f,30f</SetVariable>
+            <SetVariable name="Color">yellow</SetVariable>
+            <SetVariable name="group"><Variable name="group"/></SetVariable>
+            <SetVariable name="ConfigKey">pregain</SetVariable>
+          </Template>
 
         </Children>
-      </WidgetGroup><!--  /Volume Slider + Gain knob -->
+      </WidgetGroup><!-- /Volume Slider + Gain knob -->
+
+      <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
 
-      <WidgetGroup><!-- EQs + Filter + Pfl -->
-        <ObjectName>EQKnobs</ObjectName>
+      <WidgetGroup><!-- EQs + QuickEffect knobs -->
         <Layout>vertical</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <!-- see spacer in eq_knob_left/right.xml when
-               Filter knob is visible -->
-          <Template src="skin:eq_knob_right.xml"><!-- High EQ -->
+            <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
+          <Template src="skin:eq_knob_button_right.xml"><!-- High EQ -->
             <SetVariable name="parameter">3</SetVariable>
-            <SetVariable name="TooltipId">filterHigh</SetVariable>
           </Template>
-          <Template src="skin:eq_knob_right.xml"><!-- Mid EQ -->
+            <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
+          <Template src="skin:eq_knob_button_right.xml"><!-- Mid EQ -->
             <SetVariable name="parameter">2</SetVariable>
-            <SetVariable name="TooltipId">filterMid</SetVariable>
           </Template>
-          <Template src="skin:eq_knob_right.xml"><!-- Low EQ -->
+            <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
+          <Template src="skin:eq_knob_button_right.xml"><!-- Low EQ -->
             <SetVariable name="parameter">1</SetVariable>
-            <SetVariable name="TooltipId">filterLow</SetVariable>
           </Template>
-
-          <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
-
-          <WidgetGroup>
-            <Size>1min,3f</Size>
-            <Connection>
-              <ConfigKey persist="true">[Tango],filter_knob</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-
-          <!-- Filter knob + PflButton / Pfl button only -->
-          <WidgetStack currentpage="[Tango],filter_pfl_stack" persist="true">
-            <Children>
-
-              <WidgetGroup><!-- PflButton only -->
-                <ObjectName>FilterPflContainer</ObjectName>
-                <SizePolicy>min,min</SizePolicy>
-                <Layout>horizontal</Layout>
-                <Children>
-
-                  <WidgetGroup><Size>25f,1min</Size></WidgetGroup>
-
-                  <Template src="skin:button_2state.xml">
-                    <SetVariable name="TooltipId">pfl</SetVariable>
-                    <SetVariable name="ObjectName">PflButton</SetVariable>
-                    <SetVariable name="Size">28f,28f</SetVariable>
-                    <SetVariable name="state_0_pressed">pfl_off.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">pfl_off.svg</SetVariable>
-                    <SetVariable name="state_1_pressed">pfl_on.svg</SetVariable>
-                    <SetVariable name="state_1_unpressed">pfl_on.svg</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
-                  </Template>
-
-                  <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-
-                </Children>
-              </WidgetGroup><!-- /PflButton only -->
-
-              <!-- Filter knob + PflButton -->
-              <WidgetGroup trigger="[Tango],filter_knob" on-hide-select="0">
-                <ObjectName>FilterPflContainer</ObjectName>
-                <SizePolicy>min,min</SizePolicy>
-                <Layout>horizontal</Layout>
-                <Children>
-
-                  <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
-
-                  <Template src="skin:button_2state.xml">
-                    <SetVariable name="TooltipId">pfl</SetVariable>
-                    <SetVariable name="ObjectName">PflButton</SetVariable>
-                    <SetVariable name="Size">24f,24f</SetVariable>
-                    <SetVariable name="state_0_pressed">pfl_off.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">pfl_off.svg</SetVariable>
-                    <SetVariable name="state_1_pressed">pfl_on.svg</SetVariable>
-                    <SetVariable name="state_1_unpressed">pfl_on.svg</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
-                  </Template>
-
-                  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-
-                  <Template src="skin:knob_textless.xml">
-                    <SetVariable name="ObjectName">FilterKnob</SetVariable>
-                    <SetVariable name="TooltipId"></SetVariable>
-                    <SetVariable name="Size">30f,30f</SetVariable>
-                    <SetVariable name="Color">blue</SetVariable>
-                    <SetVariable name="group">[QuickEffectRack1_<Variable name="group"/>]</SetVariable>
-                    <SetVariable name="ConfigKey">super1</SetVariable>
-                  </Template>
-
-                </Children>
-                <Connection>
-                  <ConfigKey persist="true">[Tango],filter_knob</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup><!-- /Filter knob + PflButton -->
-
-            </Children>
-          </WidgetStack><!-- /Filter knob + PflButton / Pfl button only -->
-
+            <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
+          <Template src="skin:quick_fx_knob_button_right.xml"/><!-- Quick Effect knob -->
         </Children>
         <Connection>
           <ConfigKey persist="true">[Tango],eq_knobs</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- /EQs + Filter + Pfl -->
+      </WidgetGroup><!-- /EQs + QuickEffect knobs -->
 
-      <WidgetGroup><Size>4f,1me</Size></WidgetGroup>
+      <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
 
       <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1me</Size></WidgetGroup>
 
diff --git a/res/skins/Tango/mixerbar.xml b/res/skins/Tango/mixerbar.xml
index 93a5e9bb19a4..de3bdd8f12b7 100644
--- a/res/skins/Tango/mixerbar.xml
+++ b/res/skins/Tango/mixerbar.xml
@@ -13,12 +13,12 @@ Description:
 -->
 <Template>
   <WidgetGroup><!-- Mixer Bar -->
-    <ObjectName>MixerBar</ObjectName>
+    <ObjectName>Mixerbar</ObjectName>
     <Layout>horizontal</Layout>
-    <Size>1me,36f</Size>
+    <Size>-1min,36f</Size>
     <Children>
     <!-- Together with expanding spacer at the far right, this
-      centers MixerBar when Library is hidden -->
+      centers Mixerbar when Library is hidden -->
       <WidgetGroup>
         <Layout>horizontal</Layout>
         <Children>
@@ -36,9 +36,9 @@ Description:
         <Layout>horizontal</Layout>
         <Children>
           <Template src="skin:button_2state_persist.xml"><!-- Toggle extra deck buttons -->
-            <SetVariable name="ObjectName">MixerBar_BelowLibrary</SetVariable>
+            <SetVariable name="ObjectName">Mixerbar_BelowLibrary</SetVariable>
             <SetVariable name="Size">12f,32f</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Tango],mixerbar_below_library</SetVariable>
+            <SetVariable name="ConfigKey">[Tango],mixerbar_below_library</SetVariable>
           </Template>
         </Children>
         <Connection>
@@ -48,140 +48,164 @@ Description:
       </WidgetGroup><!-- /Toggler to shift Mixerbar below Library -->
 
       <WidgetGroup><!-- Master Mixer -->
-        <ObjectName>MixerBarSection</ObjectName>
+        <ObjectName>MixerbarSection</ObjectName>
         <Layout>horizontal</Layout>
         <Size>-1min,36f</Size>
         <Children>
 
           <WidgetGroup>
-            <ObjectName>MixerBar_MasterSectionLabel</ObjectName>
-            <Size>32f,32f</Size>
+            <ObjectName>Mixerbar_MasterSectionLabel</ObjectName>
+            <Size>24f,32f</Size>
           </WidgetGroup>
 
-          <WidgetGroup><!-- Volume fader + VU Meter -->
+          <WidgetGroup>
+            <ObjectName>VUMeterMixerbar</ObjectName>
             <SizePolicy>max,max</SizePolicy>
-            <Layout>vertical</Layout>
+            <Layout>stacked</Layout>
             <Children>
-              <SliderComposed><!-- Volume fader -->
-                <TooltipId></TooltipId>
-                <ObjectName>MixerBarSlider</ObjectName>
-                <SizePolicy>max,max</SizePolicy>
-                <Handle>skin:/knobs_sliders/slider_volume_h_handle.svg</Handle>
-                <Slider>skin:/knobs_sliders/slider_volume_h_scale.svg</Slider>
-                <Horizontal>true</Horizontal>
+              <StatusLight>
+                <PathStatusLight>skin:/graphics/mixerbar_vumeter_clipping_over.png</PathStatusLight>
+                <PathBack>skin:/graphics/mixerbar_vumeter_clipping.png</PathBack>
                 <Connection>
-                  <ConfigKey>[Master],volume</ConfigKey>
+                  <ConfigKey>[Master],PeakIndicator</ConfigKey>
                 </Connection>
-              </SliderComposed>
-              <WidgetGroup><!-- VU Meter -->
-                <ObjectName>VUMeterFloating_h</ObjectName>
-                <SizePolicy>max,max</SizePolicy>
-                <Layout>stacked</Layout>
-                <Children>
-                  <StatusLight>
-                    <PathStatusLight>skin:/graphics/vumeter_h_floating_clipping_over.png</PathStatusLight>
-                    <PathBack>skin:/graphics/vumeter_h_floating_clipping.png</PathBack>
-                    <Connection>
-                      <ConfigKey>[Master],PeakIndicator</ConfigKey>
-                    </Connection>
-                  </StatusLight>
-                  <VuMeter>
-                    <PathVu>skin:/graphics/vumeter_h_floating_over.png</PathVu>
-                    <PathBack>skin:/graphics/vumeter_h_floating.png</PathBack>
-                    <Horizontal>true</Horizontal>
-                    <PeakHoldSize>5</PeakHoldSize>
-                    <PeakHoldTime>500</PeakHoldTime>
-                    <PeakFallTime>50</PeakFallTime>
-                    <PeakFallStep>2</PeakFallStep>
-                    <Connection>
-                      <ConfigKey>[Master],VuMeter</ConfigKey>
-                    </Connection>
-                  </VuMeter>
-                </Children>
-              </WidgetGroup><!-- /VU Meter -->
+              </StatusLight>
+              <VuMeter>
+                <PathVu>skin:/graphics/mixerbar_vumeter_over.png</PathVu>
+                <PathBack>skin:/graphics/mixerbar_vumeter.png</PathBack>
+                <Horizontal>false</Horizontal>
+                <PeakHoldSize>5</PeakHoldSize>
+                <PeakHoldTime>500</PeakHoldTime>
+                <PeakFallTime>50</PeakFallTime>
+                <PeakFallStep>2</PeakFallStep>
+                <Connection>
+                  <ConfigKey>[Master],VuMeter</ConfigKey>
+                </Connection>
+              </VuMeter>
             </Children>
-          </WidgetGroup><!-- /Volume fader + VU Meter -->
+          </WidgetGroup>
+
+          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+
+          <Template src="skin:knob_textless.xml">
+            <SetVariable name="TooltipId">master_gain</SetVariable>
+            <SetVariable name="ObjectName">MixerbarKnob</SetVariable>
+            <SetVariable name="Size">28f,28f</SetVariable>
+            <SetVariable name="group">[Master]</SetVariable>
+            <SetVariable name="ConfigKey">gain</SetVariable>
+            <SetVariable name="Color">yellow</SetVariable>
+          </Template>
 
-          <!-- All spacers left of MixerBarSliders are necessary
-          because margin/padding won't give a proper offset to neighbours,
-          just a shift of border/background while maintaining hover area.
-          This looks odd. -->
           <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
 
-          <WidgetGroup><!-- Balance fader + V-Spacer -->
-            <SizePolicy>max,max</SizePolicy>
-            <Layout>vertical</Layout>
+          <SliderComposed>
+            <TooltipId>balance</TooltipId>
+            <ObjectName>MixerbarSlider</ObjectName>
+            <SizePolicy>min,min</SizePolicy>
+            <Handle>skin:/knobs_sliders/slider_balance_handle.svg</Handle>
+            <Slider>skin:/knobs_sliders/slider_balance_scale.svg</Slider>
+            <Horizontal>true</Horizontal>
+            <Connection>
+              <ConfigKey>[Master],balance</ConfigKey>
+            </Connection>
+          </SliderComposed>
+
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup><!-- Booth Gain -->
+        <Layout>horizontal</Layout>
+        <Size>-1min,36f</Size>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>MixerbarSection</ObjectName>
+            <Layout>horizontal</Layout>
+            <Size>-1min,36f</Size>
             <Children>
-              <SliderComposed>
-                <TooltipId>balance</TooltipId>
-                <ObjectName>MixerBarSlider</ObjectName>
-                <SizePolicy>min,min</SizePolicy>
-                <Handle>skin:/knobs_sliders/slider_balance_handle.svg</Handle>
-                <Slider>skin:/knobs_sliders/slider_balance_scale.svg</Slider>
-                <Horizontal>true</Horizontal>
-                <Connection>
-                  <ConfigKey>[Master],balance</ConfigKey>
-                </Connection>
-              </SliderComposed>
-              <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>Mixerbar_BoothSectionLabel</ObjectName>
+                <Size>36f,32f</Size>
+              </WidgetGroup>
+
+              <Template src="skin:knob_textless.xml">
+                <SetVariable name="TooltipId">booth_gain</SetVariable>
+                <SetVariable name="ObjectName">MixerbarKnob</SetVariable>
+                <SetVariable name="Size">28f,28f</SetVariable>
+                <SetVariable name="group">[Master]</SetVariable>
+                <SetVariable name="ConfigKey">booth_gain</SetVariable>
+                <SetVariable name="Color">yellow</SetVariable>
+              </Template>
+
+              <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+
             </Children>
           </WidgetGroup>
-
         </Children>
-      </WidgetGroup><!-- Master Mixer -->
+        <Connection>
+          <ConfigKey>[Master],booth_enabled</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /Booth Gain -->
 
       <WidgetGroup><!-- Headphone Mixer -->
-        <ObjectName>MixerBarSection</ObjectName>
+        <ObjectName>MixerbarSection</ObjectName>
         <Layout>horizontal</Layout>
         <Size>-1min,36f</Size>
         <Children>
 
           <WidgetGroup>
-            <ObjectName>MixerBar_HeadSectionLabel</ObjectName>
+            <ObjectName>Mixerbar_HeadSectionLabel</ObjectName>
             <Size>32f,32f</Size>
           </WidgetGroup>
 
           <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
           <Template src="skin:button_2state_persist.xml"><!-- Toggle extra deck buttons -->
-            <SetVariable name="ObjectName">MixerBarToggler</SetVariable>
+            <SetVariable name="ObjectName">MixerbarToggler</SetVariable>
             <SetVariable name="Size">11f,32f</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Tango],mixerbar_headphone</SetVariable>
+            <SetVariable name="ConfigKey">[Tango],mixerbar_headphone</SetVariable>
           </Template>
 
           <WidgetGroup><!-- Headphone expanded -->
-            <SizePolicy>max,max</SizePolicy>
-            <Layout>horizontal</Layout>
+            <SizePolicy>max,me</SizePolicy>
+            <Layout>stacked</Layout>
             <Children>
 
-              <WidgetGroup><!-- Volume fader + V-Spacer -->
-                <SizePolicy>max,max</SizePolicy>
-                <Layout>vertical</Layout>
-                <Children>
-                  <SliderComposed><!-- Volume fader -->
-                    <TooltipId></TooltipId>
-                    <ObjectName>MixerBarSlider</ObjectName>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Handle>skin:/knobs_sliders/slider_volume_h_handle.svg</Handle>
-                    <Slider>skin:/knobs_sliders/slider_volume_h_scale.svg</Slider>
-                    <Horizontal>true</Horizontal>
-                    <Connection>
-                      <ConfigKey>[Master],headVolume</ConfigKey>
-                    </Connection>
-                  </SliderComposed>
-                  <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
-                </Children>
-              </WidgetGroup><!-- /Volume fader + V-Spacer -->
-
-              <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
+              <!-- index 0 due to bug -->
+              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
 
+              <!-- Headphone controls greyed out if no headphone device configured -->
               <WidgetGroup>
-                <SizePolicy>max,max</SizePolicy>
+                <ObjectName>MixerbarCover</ObjectName>
                 <Layout>vertical</Layout>
+                <SizePolicy>min,me</SizePolicy>
+                <Connection>
+                  <ConfigKey>[Master],headEnabled</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                  <Transform><Not/></Transform>
+                </Connection>
+              </WidgetGroup>
+
+              <!-- actual headphone controls -->
+              <WidgetGroup>
+                <SizePolicy>min,me</SizePolicy>
+                <Layout>horizontal</Layout>
                 <Children>
+                  <Template src="skin:knob_textless.xml">
+                    <SetVariable name="TooltipId">headphone_gain</SetVariable>
+                    <SetVariable name="ObjectName">MixerbarKnob</SetVariable>
+                    <SetVariable name="Size">28f,28f</SetVariable>
+                    <SetVariable name="group">[Master]</SetVariable>
+                    <SetVariable name="ConfigKey">headGain</SetVariable>
+                    <SetVariable name="Color">yellow</SetVariable>
+                  </Template>
+
+                  <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
+
                   <SliderComposed>
                     <TooltipId>headMix</TooltipId>
-                    <ObjectName>MixerBarSlider</ObjectName>
+                    <ObjectName>MixerbarSlider</ObjectName>
                     <SizePolicy>min,min</SizePolicy>
                     <Handle>skin:/knobs_sliders/slider_headMix_handle.svg</Handle>
                     <Slider>skin:/knobs_sliders/slider_headMix_scale.svg</Slider>
@@ -190,76 +214,77 @@ Description:
                       <ConfigKey>[Master],headMix</ConfigKey>
                     </Connection>
                   </SliderComposed>
-                  <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
-                </Children>
-              </WidgetGroup>
 
-              <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+                  <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
-              <WidgetGroup>
-                <SizePolicy>max,max</SizePolicy>
-                <Layout>vertical</Layout>
-                <Children>
-                  <Template src="skin:button_2state.xml">
-                    <SetVariable name="TooltipId">headSplit</SetVariable>
-                    <SetVariable name="ObjectName">MixerBarButton</SetVariable>
-                    <SetVariable name="Size">38f,24f</SetVariable>
-                    <SetVariable name="state_0_unpressed">headSplit_off.svg</SetVariable>
-                    <SetVariable name="state_0_pressed">headSplit_off.svg</SetVariable>
-                    <SetVariable name="state_1_unpressed">headSplit_on.svg</SetVariable>
-                    <SetVariable name="state_1_pressed">headSplit_on.svg</SetVariable>
-                    <SetVariable name="ConfigKey">[Master],headSplit</SetVariable>
-                  </Template>
-                  <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
-                </Children>
-              </WidgetGroup>
+                  <WidgetGroup>
+                    <SizePolicy>min,min</SizePolicy>
+                    <Layout>vertical</Layout>
+                    <Children>
+                      <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
+                      <Template src="skin:button_2state.xml">
+                        <SetVariable name="TooltipId">headSplit</SetVariable>
+                        <SetVariable name="ObjectName">MixerbarButton</SetVariable>
+                        <SetVariable name="Size">38f,24f</SetVariable>
+                        <SetVariable name="state_0_unpressed">headSplit_off.svg</SetVariable>
+                        <SetVariable name="state_0_pressed">headSplit_off.svg</SetVariable>
+                        <SetVariable name="state_1_unpressed">headSplit_on.svg</SetVariable>
+                        <SetVariable name="state_1_pressed">headSplit_on.svg</SetVariable>
+                        <SetVariable name="ConfigKey">[Master],headSplit</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup>
 
+                  <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup><!-- /actual headphone controls -->
             </Children>
             <Connection>
               <ConfigKey persist="true">[Tango],mixerbar_headphone</ConfigKey>
               <BindProperty>visible</BindProperty>
             </Connection>
           </WidgetGroup><!-- /Headphone expanded -->
-
         </Children>
-      </WidgetGroup><!-- Headphone Mixer -->
+      </WidgetGroup><!-- /Headphone Mixer -->
 
       <WidgetGroup><!-- Microphone Mixer -->
-        <ObjectName>MixerBarSection</ObjectName>
+        <ObjectName>MixerbarSection</ObjectName>
         <Layout>horizontal</Layout>
         <Size>-1min,36f</Size>
         <Children>
 
           <WidgetGroup>
-            <ObjectName>MixerBar_MicSectionLabel</ObjectName>
+            <ObjectName>Mixerbar_MicSectionLabel</ObjectName>
             <Size>22f,32f</Size>
           </WidgetGroup>
 
           <Template src="skin:button_2state_persist.xml">
-            <SetVariable name="ObjectName">MixerBarToggler</SetVariable>
+            <SetVariable name="ObjectName">MixerbarToggler</SetVariable>
             <SetVariable name="Size">11f,32f</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Tango],mixerbar_mic</SetVariable>
+            <SetVariable name="ConfigKey">[Tango],mixerbar_mic</SetVariable>
           </Template>
 
           <WidgetGroup><!-- MICs expanded -->
-            <SizePolicy>max,max</SizePolicy>
+            <ObjectName>MicsExpanded</ObjectName>
+            <SizePolicy>min,me</SizePolicy>
             <Layout>horizontal</Layout>
             <Children>
-            <!-- MIC Duck controls -->
+              <!-- MIC Duck controls -->
               <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+
               <WidgetGroup>
-                <SizePolicy>max,max</SizePolicy>
+                <SizePolicy>min,min</SizePolicy>
                 <Layout>vertical</Layout>
                 <Children>
+                  <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
                   <Template src="skin:button_3state_persist.xml">
-                    <SetVariable name="ObjectName">MixerBarButton</SetVariable>
+                    <SetVariable name="ObjectName">MixerbarButton</SetVariable>
                     <SetVariable name="Size">42f,24f</SetVariable>
                     <SetVariable name="state_0_text">DUCK</SetVariable>
                     <SetVariable name="state_1_text">AUTO</SetVariable>
                     <SetVariable name="state_2_text">MAN</SetVariable>
-                    <SetVariable name="ConfigKeyPerm">[Master],talkoverDucking</SetVariable>
+                    <SetVariable name="ConfigKey">[Master],talkoverDucking</SetVariable>
                   </Template>
-                  <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
                 </Children>
               </WidgetGroup>
 
@@ -267,15 +292,15 @@ Description:
 
               <WidgetGroup><!-- Duck strength, hidden when Auto-Duck is OFF -->
                 <Layout>stacked</Layout>
-                <Size>28f,28f</Size>
+                <SizePolicy>max,min</SizePolicy>
                 <Children>
                   <!-- index 0 due to bug -->
                   <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-                  <WidgetGroup><!-- translucent cover when Spinny/Cover is hidden -->
-                    <ObjectName>MixerBarCover</ObjectName>
+
+                  <WidgetGroup><!-- translucent cover when ducking is off -->
+                    <ObjectName>MixerbarCover</ObjectName>
                     <Layout>vertical</Layout>
                     <SizePolicy>me,me</SizePolicy>
-                    <Children/>
                     <Connection>
                       <ConfigKey persist="true">[Master],talkoverDucking</ConfigKey>
                       <BindProperty>visible</BindProperty>
@@ -285,7 +310,7 @@ Description:
 
                   <Template src="skin:knob_textless.xml">
                     <SetVariable name="TooltipId"></SetVariable>
-                    <SetVariable name="ObjectName">MixerBarKnob</SetVariable>
+                    <SetVariable name="ObjectName">MixerbarKnob</SetVariable>
                     <SetVariable name="Size">28f,28f</SetVariable>
                     <SetVariable name="group">[Master]</SetVariable>
                     <SetVariable name="ConfigKey">duckStrength</SetVariable>
@@ -324,20 +349,20 @@ Description:
       </WidgetGroup><!-- /Microphone Mixer -->
 
       <WidgetGroup><!-- Auxiliary Mixer -->
-        <ObjectName>MixerBarSection</ObjectName>
+        <ObjectName>MixerbarSection</ObjectName>
         <Layout>horizontal</Layout>
         <Size>-1min,36f</Size>
         <Children>
 
           <WidgetGroup>
-            <ObjectName>MixerBar_AuxSectionLabel</ObjectName>
+            <ObjectName>Mixerbar_AuxSectionLabel</ObjectName>
             <Size>18f,32f</Size>
           </WidgetGroup>
 
           <Template src="skin:button_2state_persist.xml">
-            <SetVariable name="ObjectName">MixerBarToggler</SetVariable>
+            <SetVariable name="ObjectName">MixerbarToggler</SetVariable>
             <SetVariable name="Size">11f,32f</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Tango],mixerbar_aux</SetVariable>
+            <SetVariable name="ConfigKey">[Tango],mixerbar_aux</SetVariable>
           </Template>
 
           <WidgetGroup><!-- AUX expanded -->
diff --git a/res/skins/Tango/mixerbar_aux.xml b/res/skins/Tango/mixerbar_aux.xml
index 25c658c0eff2..de75dd600e7e 100644
--- a/res/skins/Tango/mixerbar_aux.xml
+++ b/res/skins/Tango/mixerbar_aux.xml
@@ -11,129 +11,159 @@ Variables:
   <SetVariable name="sourceType">auxiliary</SetVariable>
   <SetVariable name="group">[Auxiliary<Variable name="auxNum"/>]</SetVariable>
   <WidgetGroup>
+    <ObjectName>AlignTop</ObjectName>
     <Layout>horizontal</Layout>
-    <Size>-1min,32f</Size>
+    <Size>-1min,32min</Size>
     <Children>
 
-      <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+      <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,32me</Size></WidgetGroup>
 
       <Label>
-        <ObjectName>MixerBar_MicAuxLabel</ObjectName>
+        <ObjectName>Mixerbar_MicAuxLabel</ObjectName>
         <Size>20f,32f</Size>
         <Text><Variable name="auxNum"/></Text>
         <Alignment>center</Alignment>
       </Label>
 
       <Template src="skin:button_2state.xml">
-        <SetVariable name="TooltipId">microphone_talkover</SetVariable>
-        <SetVariable name="ObjectName">MixerBarButton</SetVariable>
+        <SetVariable name="TooltipId">mute</SetVariable>
+        <SetVariable name="ObjectName">MixerbarMute</SetVariable>
         <SetVariable name="Size">20f,28f</SetVariable>
-        <SetVariable name="state_0_unpressed">mic_off.svg</SetVariable>
-        <SetVariable name="state_0_pressed">mic_off.svg</SetVariable>
-        <SetVariable name="state_1_unpressed">mic_on.svg</SetVariable>
-        <SetVariable name="state_1_pressed">mic_on.svg</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="group"/>,talkover</SetVariable>
+        <SetVariable name="state_0_unpressed">mic_on.svg</SetVariable>
+        <SetVariable name="state_0_pressed">mic_on.svg</SetVariable>
+        <SetVariable name="state_1_unpressed">mic_off.svg</SetVariable>
+        <SetVariable name="state_1_pressed">mic_off.svg</SetVariable>
+        <SetVariable name="ConfigKey"><Variable name="group"/>,mute</SetVariable>
       </Template>
 
+      <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>VUMeterMixerbar</ObjectName>
+        <SizePolicy>max,max</SizePolicy>
+        <Layout>stacked</Layout>
+        <Children>
+          <StatusLight>
+            <PathStatusLight>skin:/graphics/mixerbar_vumeter_clipping_over.png</PathStatusLight>
+            <PathBack>skin:/graphics/mixerbar_vumeter_clipping.png</PathBack>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey>
+            </Connection>
+          </StatusLight>
+          <VuMeter>
+            <PathVu>skin:/graphics/mixerbar_vumeter_over.png</PathVu>
+            <PathBack>skin:/graphics/mixerbar_vumeter.png</PathBack>
+            <Horizontal>false</Horizontal>
+            <PeakHoldSize>5</PeakHoldSize>
+            <PeakHoldTime>500</PeakHoldTime>
+            <PeakFallTime>50</PeakFallTime>
+            <PeakFallStep>2</PeakFallStep>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,VuMeter</ConfigKey>
+            </Connection>
+          </VuMeter>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+
       <Template src="skin:knob_textless.xml">
         <SetVariable name="TooltipId"></SetVariable>
-        <SetVariable name="ObjectName">MixerBarKnob</SetVariable>
+        <SetVariable name="ObjectName">MixerbarKnob</SetVariable>
         <SetVariable name="Size">28f,28f</SetVariable>
         <SetVariable name="group"><Variable name="group"/></SetVariable>
         <SetVariable name="ConfigKey">pregain</SetVariable>
         <SetVariable name="Color">yellow</SetVariable>
       </Template>
 
-      <WidgetGroup><!-- Volume fader + VU Meter -->
+      <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
+
+      <WidgetGroup><!-- Pfl + xFader orientation -->
         <SizePolicy>max,max</SizePolicy>
         <Layout>vertical</Layout>
         <Children>
+          <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
+          <Template src="skin:button_2state.xml">
+            <SetVariable name="TooltipId">pfl</SetVariable>
+            <SetVariable name="ObjectName">MixerbarPflButton</SetVariable>
+            <SetVariable name="Size">18f,18f</SetVariable>
+            <SetVariable name="state_0_pressed">pfl_off.svg</SetVariable>
+            <SetVariable name="state_0_unpressed">pfl_off.svg</SetVariable>
+            <SetVariable name="state_1_pressed">pfl_on.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">pfl_on.svg</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
+          </Template>
+          <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
+          <Template src="skin:button_3state_persist.xml">
+            <SetVariable name="TooltipId">orientation</SetVariable>
+            <SetVariable name="ObjectName">MixerbarXfaderButton</SetVariable>
+            <SetVariable name="Size">18f,12f</SetVariable>
+            <SetVariable name="state_0_pressed">mixerbar_xfader_left.svg</SetVariable>
+            <SetVariable name="state_0_unpressed">mixerbar_xfader_left.svg</SetVariable>
+            <SetVariable name="state_1_pressed">mixerbar_xfader_center.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">mixerbar_xfader_center.svg</SetVariable>
+            <SetVariable name="state_2_pressed">mixerbar_xfader_right.svg</SetVariable>
+            <SetVariable name="state_2_unpressed">mixerbar_xfader_right.svg</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="group"/>,orientation</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup><!-- /Pfl + xFader orientation -->
 
-          <SliderComposed>
-            <TooltipId></TooltipId>
-            <ObjectName>MixerBarSlider</ObjectName>
-            <SizePolicy>min,min</SizePolicy>
-            <Handle>skin:/knobs_sliders/slider_volume_h_handle.svg</Handle>
-            <Slider>skin:/knobs_sliders/slider_volume_h_scale.svg</Slider>
-            <Horizontal>true</Horizontal>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,volume</ConfigKey>
-            </Connection>
-          </SliderComposed>
+      <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
 
-          <WidgetGroup><!-- VU Meter -->
-            <ObjectName>VUMeterFloating_h</ObjectName>
-            <SizePolicy>max,max</SizePolicy>
-            <Layout>stacked</Layout>
-            <Children>
-              <StatusLight>
-                <PathStatusLight>skin:/graphics/vumeter_h_floating_clipping_over.png</PathStatusLight>
-                <PathBack>skin:/graphics/vumeter_h_floating_clipping.png</PathBack>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey>
-                </Connection>
-              </StatusLight>
-              <VuMeter>
-                <PathVu>skin:/graphics/vumeter_h_floating_over.png</PathVu>
-                <PathBack>skin:/graphics/vumeter_h_floating.png</PathBack>
-                <Horizontal>true</Horizontal>
-                <PeakHoldSize>5</PeakHoldSize>
-                <PeakHoldTime>500</PeakHoldTime>
-                <PeakFallTime>50</PeakFallTime>
-                <PeakFallStep>2</PeakFallStep>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,VuMeter</ConfigKey>
-                </Connection>
-              </VuMeter>
-            </Children>
-          </WidgetGroup><!-- /VU Meter -->
-        </Children>
-      </WidgetGroup><!-- /Volume fader + VU Meter -->
+      <SliderComposed>
+        <TooltipId></TooltipId>
+        <ObjectName>MixerbarSlider</ObjectName>
+        <SizePolicy>min,min</SizePolicy>
+        <Handle>skin:/knobs_sliders/slider_volume_h_handle.svg</Handle>
+        <Slider>skin:/knobs_sliders/slider_volume_h_scale.svg</Slider>
+        <Horizontal>true</Horizontal>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,volume</ConfigKey>
+        </Connection>
+      </SliderComposed>
+
+      <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
       <WidgetGroup><!-- FX assignment buttons -->
-        <Layout>vertical</Layout>
+        <ObjectName>Spacer0f</ObjectName>
+        <Layout>horizontal</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
 
-          <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
+          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
           <WidgetGroup>
-            <Layout>horizontal</Layout>
+            <Layout>vertical</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
               <Template src="skin:fx_assign_button.xml">
-                <SetVariable name="Size">26f,15f</SetVariable>
-                <SetVariable name="labelText">FX1</SetVariable>
-                <SetVariable name="fxUnit">1</SetVariable>
+                <SetVariable name="Size">26f,16f</SetVariable>
+                <SetVariable name="FxUnitNum">1</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
+                <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
               <Template src="skin:fx_assign_button.xml">
-                <SetVariable name="Size">26f,15f</SetVariable>
-                <SetVariable name="labelText">FX2</SetVariable>
-                <SetVariable name="fxUnit">2</SetVariable>
+                <SetVariable name="Size">26f,16f</SetVariable>
+                <SetVariable name="FxUnitNum">3</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
             </Children>
           </WidgetGroup>
 
-          <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
+          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
           <WidgetGroup>
-            <Layout>horizontal</Layout>
+            <Layout>vertical</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
               <Template src="skin:fx_assign_button.xml">
-                <SetVariable name="Size">26f,15f</SetVariable>
-                <SetVariable name="labelText">FX3</SetVariable>
-                <SetVariable name="fxUnit">3</SetVariable>
+                <SetVariable name="Size">26f,16f</SetVariable>
+                <SetVariable name="FxUnitNum">2</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
+                <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
               <Template src="skin:fx_assign_button.xml">
-                <SetVariable name="Size">26f,15f</SetVariable>
-                <SetVariable name="labelText">FX</SetVariable>
-                <SetVariable name="fxUnit">4</SetVariable>
+                <SetVariable name="Size">26f,16f</SetVariable>
+                <SetVariable name="FxUnitNum">4</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
             </Children>
           </WidgetGroup>
 
diff --git a/res/skins/Tango/mixerbar_mic.xml b/res/skins/Tango/mixerbar_mic.xml
index 99694bee13f0..620b485c6bde 100644
--- a/res/skins/Tango/mixerbar_mic.xml
+++ b/res/skins/Tango/mixerbar_mic.xml
@@ -12,14 +12,15 @@ Variables:
   <SetVariable name="sourceType">microphone</SetVariable>
   <SetVariable name="group">[Microphone<Variable name="micNum"/>]</SetVariable>
   <WidgetGroup>
+    <ObjectName>AlignTop</ObjectName>
     <Layout>horizontal</Layout>
-    <Size>-1min,32f</Size>
+    <Size>-1min,32min</Size>
     <Children>
 
-      <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+      <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,32me</Size></WidgetGroup>
 
       <Label>
-        <ObjectName>MixerBar_MicAuxLabel</ObjectName>
+        <ObjectName>Mixerbar_MicAuxLabel</ObjectName>
         <Size>20f,32f</Size>
         <Text><Variable name="MicLabel"/></Text>
         <Alignment>center</Alignment>
@@ -27,7 +28,7 @@ Variables:
 
       <Template src="skin:button_2state.xml">
         <SetVariable name="TooltipId">microphone_talkover</SetVariable>
-        <SetVariable name="ObjectName">MixerBarButton</SetVariable>
+        <SetVariable name="ObjectName">MixerbarTalkover</SetVariable>
         <SetVariable name="Size">20f,28f</SetVariable>
         <SetVariable name="state_0_unpressed">mic_off.svg</SetVariable>
         <SetVariable name="state_0_pressed">mic_off.svg</SetVariable>
@@ -36,107 +37,122 @@ Variables:
         <SetVariable name="ConfigKey"><Variable name="group"/>,talkover</SetVariable>
       </Template>
 
+      <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>VUMeterMixerbar</ObjectName>
+        <SizePolicy>max,max</SizePolicy>
+        <Layout>stacked</Layout>
+        <Children>
+          <StatusLight>
+            <PathStatusLight>skin:/graphics/mixerbar_vumeter_clipping_over.png</PathStatusLight>
+            <PathBack>skin:/graphics/mixerbar_vumeter_clipping.png</PathBack>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey>
+            </Connection>
+          </StatusLight>
+          <VuMeter>
+            <PathVu>skin:/graphics/mixerbar_vumeter_over.png</PathVu>
+            <PathBack>skin:/graphics/mixerbar_vumeter.png</PathBack>
+            <Horizontal>false</Horizontal>
+            <PeakHoldSize>5</PeakHoldSize>
+            <PeakHoldTime>500</PeakHoldTime>
+            <PeakFallTime>50</PeakFallTime>
+            <PeakFallStep>2</PeakFallStep>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,VuMeter</ConfigKey>
+            </Connection>
+          </VuMeter>
+        </Children>
+      </WidgetGroup>
+
       <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
       <Template src="skin:knob_textless.xml">
         <SetVariable name="TooltipId"></SetVariable>
-        <SetVariable name="ObjectName">MixerBarKnob</SetVariable>
+        <SetVariable name="ObjectName">MixerbarKnob</SetVariable>
         <SetVariable name="Size">28f,28f</SetVariable>
         <SetVariable name="group"><Variable name="group"/></SetVariable>
         <SetVariable name="ConfigKey">pregain</SetVariable>
         <SetVariable name="Color">yellow</SetVariable>
       </Template>
 
-      <WidgetGroup><!-- Volume fader + VU Meter -->
+      <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
+
+      <WidgetGroup><!-- Pfl button -->
         <SizePolicy>max,max</SizePolicy>
         <Layout>vertical</Layout>
         <Children>
+          <WidgetGroup><Size>1min,7f</Size></WidgetGroup>
+          <Template src="skin:button_2state.xml">
+            <SetVariable name="TooltipId">pfl</SetVariable>
+            <SetVariable name="ObjectName">MixerbarPflButton</SetVariable>
+            <SetVariable name="Size">18f,18f</SetVariable>
+            <SetVariable name="state_0_pressed">pfl_off.svg</SetVariable>
+            <SetVariable name="state_0_unpressed">pfl_off.svg</SetVariable>
+            <SetVariable name="state_1_pressed">pfl_on.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">pfl_on.svg</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
+          </Template>
+          <WidgetGroup><Size>1min,7f</Size></WidgetGroup>
+        </Children>
+      </WidgetGroup><!-- /Pfl + xFader orientation -->
 
-          <SliderComposed>
-            <TooltipId></TooltipId>
-            <ObjectName>MixerBarSlider</ObjectName>
-            <SizePolicy>min,min</SizePolicy>
-            <Handle>skin:/knobs_sliders/slider_volume_h_handle.svg</Handle>
-            <Slider>skin:/knobs_sliders/slider_volume_h_scale.svg</Slider>
-            <Horizontal>true</Horizontal>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,volume</ConfigKey>
-            </Connection>
-          </SliderComposed>
+      <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
 
-          <WidgetGroup><!-- VU Meter -->
-            <ObjectName>VUMeterFloating_h</ObjectName>
-            <SizePolicy>max,max</SizePolicy>
-            <Layout>stacked</Layout>
-            <Children>
-              <StatusLight>
-                <PathStatusLight>skin:/graphics/vumeter_h_floating_clipping_over.png</PathStatusLight>
-                <PathBack>skin:/graphics/vumeter_h_floating_clipping.png</PathBack>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey>
-                </Connection>
-              </StatusLight>
-              <VuMeter>
-                <PathVu>skin:/graphics/vumeter_h_floating_over.png</PathVu>
-                <PathBack>skin:/graphics/vumeter_h_floating.png</PathBack>
-                <Horizontal>true</Horizontal>
-                <PeakHoldSize>5</PeakHoldSize>
-                <PeakHoldTime>500</PeakHoldTime>
-                <PeakFallTime>50</PeakFallTime>
-                <PeakFallStep>2</PeakFallStep>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,VuMeter</ConfigKey>
-                </Connection>
-              </VuMeter>
-            </Children>
-          </WidgetGroup><!-- /VU Meter -->
-        </Children>
-      </WidgetGroup><!-- /Volume fader + VU Meter -->
+      <SliderComposed>
+        <TooltipId></TooltipId>
+        <ObjectName>MixerbarSlider</ObjectName>
+        <SizePolicy>min,min</SizePolicy>
+        <Handle>skin:/knobs_sliders/slider_volume_h_handle.svg</Handle>
+        <Slider>skin:/knobs_sliders/slider_volume_h_scale.svg</Slider>
+        <Horizontal>true</Horizontal>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,volume</ConfigKey>
+        </Connection>
+      </SliderComposed>
+
+      <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
       <WidgetGroup><!-- FX assignment buttons -->
-        <Layout>vertical</Layout>
+        <ObjectName>Spacer0f</ObjectName>
+        <Layout>horizontal</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
 
-          <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
+          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
           <WidgetGroup>
-            <Layout>horizontal</Layout>
+            <Layout>vertical</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
               <Template src="skin:fx_assign_button.xml">
-                <SetVariable name="Size">26f,15f</SetVariable>
-                <SetVariable name="labelText">FX1</SetVariable>
-                <SetVariable name="fxUnit">1</SetVariable>
+                <SetVariable name="Size">26f,16f</SetVariable>
+                <SetVariable name="FxUnitNum">1</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
+                <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
               <Template src="skin:fx_assign_button.xml">
-                <SetVariable name="Size">26f,15f</SetVariable>
-                <SetVariable name="labelText">FX2</SetVariable>
-                <SetVariable name="fxUnit">2</SetVariable>
+                <SetVariable name="Size">26f,16f</SetVariable>
+                <SetVariable name="FxUnitNum">3</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
             </Children>
           </WidgetGroup>
 
-          <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
+          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
           <WidgetGroup>
-            <Layout>horizontal</Layout>
+            <Layout>vertical</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
               <Template src="skin:fx_assign_button.xml">
-                <SetVariable name="Size">26f,15f</SetVariable>
-                <SetVariable name="labelText">FX3</SetVariable>
-                <SetVariable name="fxUnit">3</SetVariable>
+                <SetVariable name="Size">26f,16f</SetVariable>
+                <SetVariable name="FxUnitNum">2</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
+                <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
               <Template src="skin:fx_assign_button.xml">
-                <SetVariable name="Size">26f,15f</SetVariable>
-                <SetVariable name="labelText">FX</SetVariable>
-                <SetVariable name="fxUnit">4</SetVariable>
+                <SetVariable name="Size">26f,16f</SetVariable>
+                <SetVariable name="FxUnitNum">4</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
             </Children>
           </WidgetGroup>
 
diff --git a/res/skins/Tango/netbook_trigger.xml b/res/skins/Tango/netbook_trigger.xml
deleted file mode 100644
index f52fbe6d7704..000000000000
--- a/res/skins/Tango/netbook_trigger.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<!--
-Description:
-  Size-aware container that switches between 'netbook_mode' and 'normal_mode'.
-  In 'netbook_mode' skin controls are moved from center block to top row,
-  so that all spacers between left and right decks and between FX units are removed.
-  Waveforms can be much smaller. Though, they will grow to min 50px when beatgrid
-  buttons are shown.
-  Modes are flipping as soon as FX units have enough space to host effects
-  with 6 parameters (knobs plus buttons)
-
-Controls:
-  [Tango],netbook_normal_stack0
-    This is set to '0' in skin.xml so that 'netbook_mode' is triggered
-    for widths up to 1259px.
-  [Tango],netbook_normal_stack1
-    This is set to '1' in skin.xml so that 'normal_mode' is triggered
-    for widths from 1260px up.
-
--->
-<Template>
-  <WidgetGroup>
-    <Layout>horizontal</Layout>
-    <Children>
-      <SizeAwareStack><!-- Netbook trigger -->
-        <Children>
-
-          <WidgetGroup><!-- 0  show skin controls at top edge of window -->
-            <Layout>vertical</Layout>
-            <SizePolicy>me,max</SizePolicy>
-            <MinimumSize>1,1</MinimumSize>
-            <MaximumSize>1259,1</MaximumSize>
-            <Children>
-              <WidgetStack currentpage="[Tango],netbook_normal_stack0" persist="true">
-                <Children>
-                  <WidgetGroup trigger="[Tango],netbook_mode">
-                    <Size>2f,2f</Size>
-                    <Children>
-                    </Children>
-                    <Connection>
-                      <ConfigKey>[Tango],netbook_mode</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
-                  <WidgetGroup trigger="[Tango],normal_mode">
-                    <Size>2f,2f</Size>
-                    <Children>
-                    </Children>
-                    <Connection>
-                      <ConfigKey>[Tango],normal_mode</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
-                </Children>
-              </WidgetStack>
-            </Children>
-          </WidgetGroup>
-
-          <WidgetGroup><!-- 1  show skin controls in the center between decks -->
-            <Layout>vertical</Layout>
-            <SizePolicy>me,me</SizePolicy>
-            <MinimumSize>1260,-1</MinimumSize>
-            <Children>
-              <WidgetStack currentpage="[Tango],netbook_normal_stack1" persist="true">
-                <Children>
-                  <WidgetGroup trigger="[Tango],netbook_mode">
-                    <Size>2f,2f</Size>
-                    <Children>
-                    </Children>
-                    <Connection>
-                      <ConfigKey>[Tango],netbook_mode</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
-                  <WidgetGroup trigger="[Tango],normal_mode">
-                    <Size>2f,2f</Size>
-                    <Children>
-                    </Children>
-                    <Connection>
-                      <ConfigKey>[Tango],normal_mode</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
-                </Children>
-              </WidgetStack>
-            </Children>
-          </WidgetGroup>
-        </Children>
-      </SizeAwareStack><!-- /Netbook trigger -->
-      <WidgetGroup>
-        <ObjectName>EnforceNetbookMode</ObjectName>
-        <Size>10000f,1f</Size>
-        <Children/>
-        <Connection>
-          <ConfigKey persist="true">[Tango],enforce_netbook_mode</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Tango/preview_deck.xml b/res/skins/Tango/preview_deck.xml
index 2aed26e5cf20..03b90f8bb6ce 100644
--- a/res/skins/Tango/preview_deck.xml
+++ b/res/skins/Tango/preview_deck.xml
@@ -8,121 +8,133 @@ Description:
   * Gain knob
   * Eject button
 Variables:
-  group: set to [PreviewDeck1]
   PlayedOverlayColor  : defined in skin.xml
 -->
 <Template>	
   <SetVariable name="group">[PreviewDeck1]</SetVariable>
   <WidgetGroup>
-    <ObjectName>PreviewDeck</ObjectName>
-    <Layout>vertical</Layout>
-    <SizePolicy>me,min</SizePolicy>
+    <Layout>stacked</Layout>
+    <SizePolicy>me,max</SizePolicy>
     <Children>
+      <!-- index 0 due to bug -->
+      <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
+
+      <!-- Greyed out if no headphone device is configured -->
       <WidgetGroup>
-        <ObjectName>PreviewTitleEject</ObjectName>
-        <Layout>horizontal</Layout>
-        <Size>1me,19f</Size>
-        <Children>
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Size>1me,18f</Size>
-            <ObjectName>PreviewTitle</ObjectName>
-            <Children>
-              <Text>
-                <TooltipId>text</TooltipId>
-                <Size>1me,17f</Size>
-                <Group><Variable name="group"/></Group>
-                <Elide>right</Elide>
-              </Text>
-            </Children>
-          </WidgetGroup>
-          <Template src="skin:button_1state.xml">
-            <SetVariable name="TooltipId">eject</SetVariable>
-            <SetVariable name="ObjectName">PreviewEject</SetVariable>
-            <SetVariable name="Size">18f,18f</SetVariable>
-            <SetVariable name="state_0_pressed">eject_pressed.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">eject.svg</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,eject</SetVariable>
-          </Template>
-        </Children>
+        <ObjectName>MixerbarCover</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <Connection>
+          <ConfigKey>[Master],headEnabled</ConfigKey>
+          <BindProperty>visible</BindProperty>
+          <Transform><Not/></Transform>
+        </Connection>
       </WidgetGroup>
 
-      <WidgetGroup><!-- Play-Overview-Gain -->
-        <ObjectName>PreviewPlayOverview</ObjectName>
-        <Layout>horizontal</Layout>
-        <Size>80me,34f</Size>
+      <WidgetGroup>
+        <ObjectName>PreviewDeck</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>me,min</SizePolicy>
         <Children>
           <WidgetGroup>
-            <ObjectName>PreviewPlay</ObjectName>
-            <Layout>stacked</Layout>
-            <Size>25f,34f</Size>
+            <ObjectName>PreviewTitleEject</ObjectName>
+            <Layout>horizontal</Layout>
+            <Size>1me,19f</Size>
             <Children>
-              <Template src="skin:button_2state_right_display.xml">
-                <SetVariable name="ObjectName">PlayCue</SetVariable>
-                <SetVariable name="Size">24f,34f</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable>
-                <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_default</SetVariable>
-                <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_indicator</SetVariable>
-              </Template>
-              <!--	Turns Orange when playing Cue/HotCue.
-                    Only visible when play_indicator=0 -->
-              <Template src="skin:button_2state.xml">
-                <SetVariable name="ObjectName">CueUnderlay</SetVariable>
-                <SetVariable name="Size">24f,34f</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable>
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Size>1me,18f</Size>
+                <ObjectName>PreviewTitle</ObjectName>
+                <Children>
+                  <Text>
+                    <TooltipId>text</TooltipId>
+                    <Size>1me,17f</Size>
+                    <Group><Variable name="group"/></Group>
+                    <Elide>right</Elide>
+                  </Text>
+                </Children>
+              </WidgetGroup>
+              <Template src="skin:button_1state.xml">
+                <SetVariable name="TooltipId">eject</SetVariable>
+                <SetVariable name="ObjectName">PreviewEject</SetVariable>
+                <SetVariable name="Size">18f,18f</SetVariable>
+                <SetVariable name="state_0_pressed">eject_pressed.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">eject.svg</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="group"/>,eject</SetVariable>
               </Template>
             </Children>
           </WidgetGroup>
 
-          <Overview>
-            <TooltipId>waveform_overview</TooltipId>
-            <Size>1me,34f</Size>
-            <Group><Variable name="group"/></Group>
-            <BgColor>#1a1a1a</BgColor>
-            <SignalColor>#bababa</SignalColor>
-            <PlayPosColor>#FF4300</PlayPosColor>
-            <PlayedOverlayColor><Variable name="PlayedOverlayColor"/></PlayedOverlayColor>
-            <MarkerColor>#00FF00</MarkerColor>
-            <DefaultMark>
-              <Align>bottom|right</Align>
-              <Color>#00FF00</Color>
-              <TextColor>#FFFFFF</TextColor>
-              <Text> %1 </Text>
-            </DefaultMark>
-            <Mark>
-              <Control>cue_point</Control>
-              <Text>C</Text>
-              <Align>top|right</Align>
-              <Color>#FF0080</Color>
-              <TextColor>#FFFFFF</TextColor>
-            </Mark>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
-            </Connection>
-          </Overview>
-
-          <WidgetGroup>
-            <ObjectName>PreviewGainKnob</ObjectName>
-            <Size>22f,34f</Size>
-            <Layout>vertical</Layout>
+          <WidgetGroup><!-- Play-Overview-Gain -->
+            <ObjectName>PreviewPlayOverview</ObjectName>
+            <Layout>horizontal</Layout>
+            <Size>80me,34f</Size>
             <Children>
+              <WidgetGroup>
+                <ObjectName>PreviewPlay</ObjectName>
+                <Layout>stacked</Layout>
+                <Size>25f,34f</Size>
+                <Children>
+                  <Template src="skin:button_2state_right_display.xml">
+                    <SetVariable name="ObjectName">PlayCue</SetVariable>
+                    <SetVariable name="Size">24f,34f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable>
+                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_default</SetVariable>
+                    <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_indicator</SetVariable>
+                  </Template>
+                  <!--	Turns Orange when playing Cue/HotCue.
+                        Only visible when play_indicator=0 -->
+                  <Template src="skin:button_2state.xml">
+                    <SetVariable name="ObjectName">CueUnderlay</SetVariable>
+                    <SetVariable name="Size">24f,34f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <Overview>
+                <TooltipId>waveform_overview</TooltipId>
+                <Size>1me,34f</Size>
+                <Group><Variable name="group"/></Group>
+                <BgColor>#1a1a1a</BgColor>
+                <SignalColor>#bababa</SignalColor>
+                <PlayPosColor>#FF4300</PlayPosColor>
+                <PlayedOverlayColor><Variable name="PlayedOverlayColor"/></PlayedOverlayColor>
+                <MarkerColor>#00FF00</MarkerColor>
+                <DefaultMark>
+                  <Align>bottom|right</Align>
+                  <Color>#00FF00</Color>
+                  <TextColor>#FFFFFF</TextColor>
+                  <Text> %1 </Text>
+                </DefaultMark>
+                <Mark>
+                  <Control>cue_point</Control>
+                  <Text>C</Text>
+                  <Align>top|right</Align>
+                  <Color>#FF0080</Color>
+                  <TextColor>#FFFFFF</TextColor>
+                </Mark>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
+                </Connection>
+              </Overview>
+
               <!-- Wrapping in WidgetGroup enables padding -->
               <Template src="skin:knob_textless.xml">
+                <SetVariable name="ObjectName">PreviewGainKnob</SetVariable>
                 <SetVariable name="Size">22f,22f</SetVariable>
                 <SetVariable name="ConfigKey">pregain</SetVariable>
                 <SetVariable name="Color">tiny_red</SetVariable>
               </Template>
             </Children>
-          </WidgetGroup>
-        </Children>
-      </WidgetGroup><!-- /Play-Overview-Gain -->
-
-      <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>0me,1f</Size><Children/></WidgetGroup>
+          </WidgetGroup><!-- /Play-Overview-Gain -->
 
-      <Template src="skin:hotcues_sampler_preview.xml"/>
+          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>0me,1f</Size></WidgetGroup>
 
-      <WidgetGroup><Size>1me,4f</Size><Children/></WidgetGroup>
+          <Template src="skin:hotcues_sampler_preview.xml"/>
 
+        </Children>
+      </WidgetGroup>
     </Children>
     <Connection>
       <ConfigKey persist="true">[PreviewDeck],show_previewdeck</ConfigKey>
diff --git a/res/skins/Tango/quick_fx_knob_button_left.xml b/res/skins/Tango/quick_fx_knob_button_left.xml
new file mode 100644
index 000000000000..d12aceef56a0
--- /dev/null
+++ b/res/skins/Tango/quick_fx_knob_button_left.xml
@@ -0,0 +1,70 @@
+<!--
+Description:
+  Knob for chosen QuickEffect with an enable button next to it.
+  A 'button' underneath the knob turns grey when QuickEffect is disabled.
+Variables:
+  PotiMinAngle: -135°, see skin.xml
+  PotiMaxAngle: 135°, see skin.xml
+  group       : affected group
+-->
+<Template>
+  <SetVariable name="QuickFxGroup">[QuickEffectRack1_<Variable name="group"/>]</SetVariable>
+  <SetVariable name="QuickFx">[QuickEffectRack1_<Variable name="group"/>_Effect1]</SetVariable>
+  <WidgetGroup>
+    <ObjectName>EQKnobContainerLeft</ObjectName>
+    <SizePolicy>min,min</SizePolicy>
+    <Layout>vertical</Layout>
+    <Children>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <!-- QuickEffect knob + Enable indicator underneath -->
+          <WidgetGroup>
+            <SizePolicy>min,min</SizePolicy>
+            <Layout>stacked</Layout>
+            <Children>
+              <KnobComposed>
+                <TooltipId>QuickEffectRack_super1</TooltipId>
+                <Size>30f,30f</Size>
+                <Knob>skin:/knobs_sliders/knob_blue.svg</Knob>
+                <BackPath>skin:/knobs_sliders/knob_bg.svg</BackPath>
+                <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+                <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+                <Connection>
+                  <ConfigKey><Variable name="QuickFxGroup"/>,super1</ConfigKey>
+                </Connection>
+              </KnobComposed>
+
+              <Template src="skin:button_2state.xml">
+                <SetVariable name="ObjectName">QuickFxEnableUnderlay</SetVariable>
+                <SetVariable name="Size">30f,30f</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="QuickFx"/>,enabled</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <!-- QuickEffect enable button -->
+          <Template src="skin:button_2state.xml">
+            <SetVariable name="TooltipId">QuickEffectRack_enabled</SetVariable>
+            <SetVariable name="ObjectName">QuickFxEnableButton</SetVariable>
+            <SetVariable name="Size">12f,30f</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="QuickFx"/>,enabled</SetVariable>
+          </Template>
+        </Children>
+        <Connection>
+          <ConfigKey><Variable name="QuickFx"/>,loaded</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /QuickEffect knob + enable button -->
+      <WidgetGroup><!-- Spacer when no QuickEffect is loaded -->
+        <Size>42me,30f</Size>
+        <Connection>
+          <ConfigKey><Variable name="QuickFx"/>,loaded</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Tango/quick_fx_knob_button_right.xml b/res/skins/Tango/quick_fx_knob_button_right.xml
new file mode 100644
index 000000000000..78c344cdbc87
--- /dev/null
+++ b/res/skins/Tango/quick_fx_knob_button_right.xml
@@ -0,0 +1,71 @@
+<!--
+Description:
+  Knob for chosen QuickEffect with an enable button next to it.
+  A 'button' underneath the knob turns grey when QuickEffect is disabled.
+Variables:
+  PotiMinAngle: -135°, see skin.xml
+  PotiMaxAngle: 135°, see skin.xml
+  group       : affected group
+-->
+<Template>
+  <SetVariable name="QuickFxGroup">[QuickEffectRack1_<Variable name="group"/>]</SetVariable>
+  <SetVariable name="QuickFx">[QuickEffectRack1_<Variable name="group"/>_Effect1]</SetVariable>
+  <WidgetGroup>
+    <ObjectName>EQKnobContainerRight</ObjectName>
+    <SizePolicy>min,min</SizePolicy>
+    <Layout>vertical</Layout>
+    <Children>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <!-- QuickEffect enable button -->
+          <Template src="skin:button_2state.xml">
+            <SetVariable name="TooltipId">QuickEffectRack_enabled</SetVariable>
+            <SetVariable name="ObjectName">QuickFxEnableButton</SetVariable>
+            <SetVariable name="Size">12f,30f</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="QuickFx"/>,enabled</SetVariable>
+          </Template>
+
+          <!-- QuickEffect knob + Enable indicator underneath -->
+          <WidgetGroup>
+            <SizePolicy>min,min</SizePolicy>
+            <Layout>stacked</Layout>
+            <Children>
+              <KnobComposed>
+                <TooltipId>QuickEffectRack_super1</TooltipId>
+                <Size>30f,30f</Size>
+                <Knob>skin:/knobs_sliders/knob_blue.svg</Knob>
+                <BackPath>skin:/knobs_sliders/knob_bg.svg</BackPath>
+                <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+                <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+                <Connection>
+                  <ConfigKey><Variable name="QuickFxGroup"/>,super1</ConfigKey>
+                </Connection>
+              </KnobComposed>
+
+              <Template src="skin:button_2state.xml">
+                <SetVariable name="ObjectName">QuickFxEnableUnderlay</SetVariable>
+                <SetVariable name="Size">30f,30f</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="QuickFx"/>,enabled</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+        <Connection>
+          <ConfigKey><Variable name="QuickFx"/>,loaded</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /QuickEffect knob + enable button -->
+      <WidgetGroup><!-- Spacer when no QuickEffect is loaded -->
+        <Size>42me,30f</Size>
+        <Connection>
+          <ConfigKey><Variable name="QuickFx"/>,loaded</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Tango/rate_pitch_key.xml b/res/skins/Tango/rate_pitch_key.xml
index 03ace5519af2..5286e62aca8d 100644
--- a/res/skins/Tango/rate_pitch_key.xml
+++ b/res/skins/Tango/rate_pitch_key.xml
@@ -54,27 +54,25 @@ Variables:
                 </Children>
               </WidgetGroup><!-- /Overlay buttons: down, reset, up -->
 
-                        <!-- Show/light up if key is not original, like with script.
-                             Not working, only once per skin load.
-                            Tried different controls: pitch (from script), pitch_adjust, ...
-                        <WidgetGroup>
-                          <ObjectName>KeyOffsetWarning</ObjectName>
-                          <Size>50f,13f</Size>
-                          <Layout>horizontal</Layout>
-                          <Children/>
-                          <Connection>
-                            <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
-                            <Transform><Not/><IsEqual>1</IsEqual></Transform>
-                            <BindProperty>visible</BindProperty>
-                          </Connection>
-                        </WidgetGroup> -->
+              <!-- Show/light up if key is not original, like with script.
+                    Not working, only once per skin load.
+                  Tried different controls: pitch (from script), pitch_adjust, ...
+              <WidgetGroup>
+                <ObjectName>KeyOffsetWarning</ObjectName>
+                <Size>50f,13f</Size>
+                <Layout>horizontal</Layout>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
+                  <Transform><Not/><IsEqual>1</IsEqual></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup> -->
 
               <Key><!-- Actual Key display -->
                 <TooltipId>visual_key</TooltipId>
                 <ObjectName>KeyDisplay</ObjectName>
                 <Channel><Variable name="chanNum"/></Channel>
                 <Size>50f,13f</Size>
-                <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment>-->
                 <Alignment>center</Alignment>
                 <Elide>right</Elide>
                 <Connection>
@@ -86,17 +84,12 @@ Variables:
                 <Layout>horizontal</Layout>
                 <Size>50f,13f</Size>
                 <Children>
-                  <WidgetGroup><!-- key_down -->
-                    <ObjectName>Spacer33</ObjectName>
-                    <Size>12f,13f</Size>
-                  </WidgetGroup>
-                  <WidgetGroup>
-                    <Size>26f,13f</Size>
-                  </WidgetGroup>
-                  <WidgetGroup><!-- key_up -->
-                    <ObjectName>Spacer33</ObjectName>
-                    <Size>12f,13f</Size>
-                  </WidgetGroup>
+                  <!-- key_down -->
+                  <WidgetGroup><ObjectName>Spacer33</ObjectName><Size>12f,13f</Size></WidgetGroup>
+                  <!-- key display -->
+                  <WidgetGroup><Size>26f,13f</Size></WidgetGroup>
+                  <!-- key_up -->
+                  <WidgetGroup><ObjectName>Spacer33</ObjectName><Size>12f,13f</Size></WidgetGroup>
                 </Children>
               </WidgetGroup><!-- /Underlays to mark key_up/down buttons -->
             </Children>
@@ -133,11 +126,11 @@ Variables:
         </Children>
       </WidgetGroup><!-- /BPM + Key controls -->
 
-      <!-- Define size here and for parent RateContainer so that pitch slider
-      stays steady when Key controls are disabled and BPM container expands -->
+      <!-- Define size of slider and parent RateContainer so that slider
+      stays static when Key controls are disabled and BPM container expands -->
       <SliderComposed>
         <ObjectName>PitchSlider</ObjectName>
-        <Size>50f,107f</Size>
+        <Size>50f,106f</Size>
         <TooltipId>rate</TooltipId>
         <Handle>skin:/knobs_sliders/slider_pitch_handle.svg</Handle>
         <Slider>skin:/knobs_sliders/slider_pitch_scale.svg</Slider>
@@ -147,16 +140,19 @@ Variables:
         </Connection>
       </SliderComposed><!-- /PitchSlider -->
 
+      <WidgetGroup><Size>1me,1f</Size></WidgetGroup>
+
       <WidgetGroup>
         <ObjectName>Spacer1e</ObjectName>
         <Size>1me,25f</Size>
-        <Children/>
         <Connection>
           <ConfigKey>[Tango],loop_beatjump_controls</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup>
 
+      <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+
     </Children>
     <Connection>
       <ConfigKey>[Tango],pitch_fader</ConfigKey>
diff --git a/res/skins/Tango/sampler.xml b/res/skins/Tango/sampler.xml
index 478dd8387890..7e516c0f4508 100644
--- a/res/skins/Tango/sampler.xml
+++ b/res/skins/Tango/sampler.xml
@@ -60,7 +60,6 @@ Variables:
                         <SetVariable name="Size">34f,34f</SetVariable>
                         <SetVariable name="state_0_pressed">sampler_paused.png</SetVariable>
                         <SetVariable name="state_0_unpressed">sampler_paused.png</SetVariable>
-                        <SetVariable name="state_0_pressed">sampler_paused.png</SetVariable>
                         <SetVariable name="state_1_pressed">sampler_playing.svg</SetVariable>
                         <SetVariable name="state_1_unpressed">sampler_playing.svg</SetVariable>
                         <SetVariable name="ConfigKey"><Variable name="group"/>,cue_gotoandplay</SetVariable>
@@ -72,7 +71,7 @@ Variables:
                         <ObjectName>SamplerCover</ObjectName>
                         <Size>34f,34f</Size>
                         <Group><Variable name="group"/></Group>
-                        <DefaultCover>skin:/buttons/btn_.svg</DefaultCover>
+                        <DefaultCover>skin:/graphics/blank_1x1.svg</DefaultCover>
                       </CoverArt>
                   <!-- Background turns Orange when playing preview from Cue/HotCue.
                       Only visible when play_indicator=0 -->
@@ -178,29 +177,50 @@ Variables:
             <SetVariable name="Color">tiny_red</SetVariable>
           </Template>
 
-          <WidgetGroup><Size>0me,1min</Size><Children/></WidgetGroup>
+          <WidgetGroup><Size>0me,1min</Size></WidgetGroup>
 
-          <Template src="skin:button_2state.xml">
-            <SetVariable name="TooltipId">pfl</SetVariable>
-            <SetVariable name="ObjectName">PflButton</SetVariable>
-            <SetVariable name="Size">16f,16f</SetVariable>
-            <SetVariable name="state_0_pressed">pfl_off.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">pfl_off.svg</SetVariable>
-            <SetVariable name="state_1_pressed">pfl_on.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">pfl_on.svg</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
-          </Template>
+          <WidgetGroup><!-- Pfl button -->
+            <Size>16f,16f</Size>
+            <Layout>stacked</Layout>
+            <Children>
+              <!-- index 0 due to bug -->
+              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
+
+              <!-- Greyed out if no headphone device is configured -->
+              <WidgetGroup>
+                <ObjectName>MixerbarCover</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>me,me</SizePolicy>
+                <Connection>
+                  <ConfigKey>[Master],headEnabled</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                  <Transform><Not/></Transform>
+                </Connection>
+              </WidgetGroup>
+
+              <Template src="skin:button_2state.xml">
+                <SetVariable name="TooltipId">pfl</SetVariable>
+                <SetVariable name="ObjectName">PflButton</SetVariable>
+                <SetVariable name="Size">16f,16f</SetVariable>
+                <SetVariable name="state_0_pressed">pfl_off.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">pfl_off.svg</SetVariable>
+                <SetVariable name="state_1_pressed">pfl_on.svg</SetVariable>
+                <SetVariable name="state_1_unpressed">pfl_on.svg</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup><!-- /Pfl button -->
 
           <Template src="skin:button_3state.xml">
             <SetVariable name="TooltipId">orientation</SetVariable>
             <SetVariable name="ObjectName">SamplerButton</SetVariable>
             <SetVariable name="Size">16f,16f</SetVariable>
-            <SetVariable name="state_0_pressed">sampler_cf_left_white.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">sampler_cf_left_white.svg</SetVariable>
-            <SetVariable name="state_1_pressed">sampler_cf_center.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">sampler_cf_center.svg</SetVariable>
-            <SetVariable name="state_2_pressed">sampler_cf_right_white.svg</SetVariable>
-            <SetVariable name="state_2_unpressed">sampler_cf_right_white.svg</SetVariable>
+            <SetVariable name="state_0_pressed">sampler_xfader_left_white.svg</SetVariable>
+            <SetVariable name="state_0_unpressed">sampler_xfader_left_white.svg</SetVariable>
+            <SetVariable name="state_1_pressed">sampler_xfader_center.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">sampler_xfader_center.svg</SetVariable>
+            <SetVariable name="state_2_pressed">sampler_xfader_right_white.svg</SetVariable>
+            <SetVariable name="state_2_unpressed">sampler_xfader_right_white.svg</SetVariable>
             <SetVariable name="ConfigKey"><Variable name="group"/>,orientation</SetVariable>
           </Template>
 
@@ -235,7 +255,7 @@ Variables:
             <SetVariable name="ConfigKey"><Variable name="group"/>,keylock</SetVariable>
           </Template>
 
-          <WidgetGroup><Size>1me,1min</Size><Children/></WidgetGroup>
+          <WidgetGroup><Size>1me,1min</Size></WidgetGroup>
 
           <Template src="skin:button_1state_right.xml">
             <SetVariable name="TooltipId">beatsync_beatsync_tempo</SetVariable>
@@ -247,14 +267,13 @@ Variables:
             <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatsync_tempo</SetVariable>
           </Template>
 
-          <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
+          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
         </Children>
       </WidgetGroup><!-- /Sampler Buttons -->
 
       <WidgetGroup>
         <ObjectName>Spacer0f</ObjectName>
         <Size>-1me,1f</Size>
-        <Children/>
         <Connection>
           <ConfigKey persist="true">[Tango],hotcues</ConfigKey>
           <BindProperty>visible</BindProperty>
@@ -263,13 +282,16 @@ Variables:
 
       <Template src="skin:hotcues_sampler_preview.xml"/>
 
-      <WidgetGroup><!-- Sampler FX assign buttons -->
+      <!-- Sampler FX assign buttons
+      Removed on request due to enormous memory usage when routing
+      many samplers through effect units.
+      <WidgetGroup>
         <ObjectName>Spacer0f</ObjectName>
         <Size>-1me,17f</Size>
         <Layout>vertical</Layout>
         <Children>
 
-          <WidgetGroup><Size>1min,1f</Size><Children/></WidgetGroup>
+          <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
 
           <WidgetGroup>
             <Size>117me,16f</Size>
@@ -277,26 +299,22 @@ Variables:
             <Children>
               <Template src="skin:fx_assign_button.xml">
                 <SetVariable name="Size">28me,16f</SetVariable>
-                <SetVariable name="labelText">FX1</SetVariable>
-                <SetVariable name="fxUnit">1</SetVariable>
+                <SetVariable name="FxUnitNum">1</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
+                <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
               <Template src="skin:fx_assign_button.xml">
                 <SetVariable name="Size">28me,16f</SetVariable>
-                <SetVariable name="labelText">FX2</SetVariable>
-                <SetVariable name="fxUnit">2</SetVariable>
+                <SetVariable name="FxUnitNum">2</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
+                <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
               <Template src="skin:fx_assign_button.xml">
                 <SetVariable name="Size">28me,16f</SetVariable>
-                <SetVariable name="labelText">FX3</SetVariable>
-                <SetVariable name="fxUnit">3</SetVariable>
+                <SetVariable name="FxUnitNum">3</SetVariable>
               </Template>
-                <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
+                <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
               <Template src="skin:fx_assign_button.xml">
                 <SetVariable name="Size">28me,16f</SetVariable>
-                <SetVariable name="labelText">FX4</SetVariable>
-                <SetVariable name="fxUnit">4</SetVariable>
+                <SetVariable name="FxUnitNum">4</SetVariable>
               </Template>
             </Children>
           </WidgetGroup>
@@ -305,7 +323,8 @@ Variables:
           <ConfigKey persist="true">[Tango],sampler_fx_buttons</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- /Sampler FX assign buttons -->
+      </WidgetGroup> -->
+      <!-- /Sampler FX assign buttons -->
 
     </Children>
   </WidgetGroup>
diff --git a/res/skins/Tango/sampler_mini.xml b/res/skins/Tango/sampler_mini.xml
index 75120e6ea782..a2e2d06e9f6f 100644
--- a/res/skins/Tango/sampler_mini.xml
+++ b/res/skins/Tango/sampler_mini.xml
@@ -31,7 +31,6 @@ Variables:
             <SetVariable name="TooltipId">play_cue_set</SetVariable>
             <SetVariable name="state_0_pressed">sampler_paused.png</SetVariable>
             <SetVariable name="state_0_unpressed">sampler_paused.png</SetVariable>
-            <SetVariable name="state_0_pressed">sampler_paused.png</SetVariable>
             <SetVariable name="state_1_pressed">sampler_playing.svg</SetVariable>
             <SetVariable name="state_1_unpressed">sampler_playing.svg</SetVariable>
             <SetVariable name="ConfigKey"><Variable name="group"/>,cue_gotoandplay</SetVariable>
@@ -43,7 +42,7 @@ Variables:
             <ObjectName>SamplerCover</ObjectName>
             <Size>34f,34f</Size>
             <Group><Variable name="group"/></Group>
-            <DefaultCover>skin:/buttons/btn_.svg</DefaultCover>
+            <DefaultCover>skin:/graphics/blank_1x1.svg</DefaultCover>
           </CoverArt>
       <!-- Background turns Orange when playing preview from HotCue.
           Only visible when play_indicator=0 and no CoverArt loaded -->
@@ -74,7 +73,7 @@ Variables:
             <Size>82me,20f</Size>
             <Children>
 
-              <WidgetGroup><Size>2f,1min</Size><Children/></WidgetGroup>
+              <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
 
               <Template src="skin:knob_textless.xml">
                 <SetVariable name="TooltipId">pregain</SetVariable>
@@ -99,16 +98,16 @@ Variables:
                 <SetVariable name="TooltipId">orientation</SetVariable>
                 <SetVariable name="ObjectName">SamplerButton</SetVariable>
                 <SetVariable name="Size">16f,16f</SetVariable>
-                <SetVariable name="state_0_pressed">sampler_cf_left_white.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">sampler_cf_left_white.svg</SetVariable>
-                <SetVariable name="state_1_pressed">sampler_cf_center.svg</SetVariable>
-                <SetVariable name="state_1_unpressed">sampler_cf_center.svg</SetVariable>
-                <SetVariable name="state_2_pressed">sampler_cf_right_white.svg</SetVariable>
-                <SetVariable name="state_2_unpressed">sampler_cf_right_white.svg</SetVariable>
+                <SetVariable name="state_0_pressed">sampler_xfader_left_white.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">sampler_xfader_left_white.svg</SetVariable>
+                <SetVariable name="state_1_pressed">sampler_xfader_center.svg</SetVariable>
+                <SetVariable name="state_1_unpressed">sampler_xfader_center.svg</SetVariable>
+                <SetVariable name="state_2_pressed">sampler_xfader_right_white.svg</SetVariable>
+                <SetVariable name="state_2_unpressed">sampler_xfader_right_white.svg</SetVariable>
                 <SetVariable name="ConfigKey"><Variable name="group"/>,orientation</SetVariable>
               </Template>
 
-              <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
+              <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
               <Template src="skin:button_1state_right.xml">
                 <SetVariable name="TooltipId">beatsync_beatsync_tempo</SetVariable>
@@ -120,7 +119,7 @@ Variables:
                 <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatsync_tempo</SetVariable>
               </Template>
 
-              <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
+              <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
             </Children>
           </WidgetGroup><!-- Sync, CF assign, Volume -->
 
diff --git a/res/skins/Tango/sampler_row.xml b/res/skins/Tango/sampler_row.xml
index bf4e1a117aef..359a324f93fd 100644
--- a/res/skins/Tango/sampler_row.xml
+++ b/res/skins/Tango/sampler_row.xml
@@ -44,9 +44,9 @@ Variables:
             <Children>
               <WidgetGroup><Size>1min,3f</Size></WidgetGroup>
               <Template src="skin:button_2state_persist.xml">
-                <SetVariable name="ObjectName">FXSamplersMiniMaxiButton</SetVariable>
+                <SetVariable name="ObjectName">FxSamplersMiniMaxi</SetVariable>
                 <SetVariable name="Size">22f,13f</SetVariable>
-                <SetVariable name="ConfigKeyPerm">[SamplerRow<Variable name="row"/>],expanded</SetVariable>
+                <SetVariable name="ConfigKey">[SamplerRow<Variable name="row"/>],expanded</SetVariable>
               </Template>
               <WidgetGroup><Size>1min,1me</Size></WidgetGroup>
             </Children>
@@ -114,9 +114,9 @@ Variables:
             <Children>
               <WidgetGroup><Size>1min,3f</Size></WidgetGroup>
               <Template src="skin:button_2state_persist.xml">
-                <SetVariable name="ObjectName">FXSamplersMiniMaxiButton</SetVariable>
+                <SetVariable name="ObjectName">FxSamplersMiniMaxi</SetVariable>
                 <SetVariable name="Size">22f,13f</SetVariable>
-                <SetVariable name="ConfigKeyPerm">[SamplerRow<Variable name="row"/>],expanded</SetVariable>
+                <SetVariable name="ConfigKey">[SamplerRow<Variable name="row"/>],expanded</SetVariable>
               </Template>
               <WidgetGroup><Size>1min,1me</Size></WidgetGroup>
             </Children>
diff --git a/res/skins/Tango/size_detector_deck_controls_toggle.xml b/res/skins/Tango/size_detector_deck_controls_toggle.xml
new file mode 100644
index 000000000000..e971063abfb5
--- /dev/null
+++ b/res/skins/Tango/size_detector_deck_controls_toggle.xml
@@ -0,0 +1,83 @@
+<!--
+Description:
+  Size-aware container that hides the toggle for deck controls if it is not
+  necessary (when all deck controls are permanently visible).
+  Overall width of all controls is 126px. So, if SizeAwareStack can grow
+  broader than 1px the toggle should be visible.
+
+-->
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <Size>126f,1f</Size>
+    <Children>
+      <!-- spacers for deck controls that are set to be always visible -->
+      <WidgetGroup><!-- keylock -->
+        <Size>20f,1f</Size>
+        <Connection>
+          <ConfigKey persist="true">[Tango],always_visible_keylock</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+      <WidgetGroup><!-- repeat -->
+        <Size>22f,1f</Size>
+        <Connection>
+          <ConfigKey persist="true">[Tango],always_visible_repeat</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+      <WidgetGroup><!-- eject -->
+        <Size>20f,1f</Size>
+        <Connection>
+          <ConfigKey persist="true">[Tango],always_visible_eject</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+      <WidgetGroup><!-- slip mode -->
+        <Size>22f,1f</Size>
+        <Connection>
+          <ConfigKey persist="true">[Tango],always_visible_slipMode</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+      <WidgetGroup><!-- xfader orientation -->
+        <Size>20f,1f</Size>
+        <Connection>
+          <ConfigKey persist="true">[Tango],always_visible_xfaderOrientation</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+      <WidgetGroup><!-- quantize -->
+        <Size>22f,1f</Size>
+        <Connection>
+          <ConfigKey persist="true">[Tango],always_visible_quantize</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <SizeAwareStack><!-- Size detector -->
+        <Children>
+          <WidgetStack><!-- hide toggle if unnecessary -->
+            <SizePolicy>me,me</SizePolicy>
+            <MinimumSize>0,1</MinimumSize>
+            <MaximumSize>0,1</MaximumSize>
+            <Children>
+              <WidgetGroup><Size>1f,1f</Size></WidgetGroup>
+              <WidgetGroup trigger="[Tango],deck_controls_toggle"><Size>1f,1f</Size></WidgetGroup>
+            </Children>
+          </WidgetStack>
+
+          <WidgetStack><!-- show toggle if necessary -->
+            <SizePolicy>me,me</SizePolicy>
+            <MinimumSize>1,1</MinimumSize>
+            <MaximumSize>-1,1</MaximumSize>
+            <Children>
+              <WidgetGroup trigger="[Tango],deck_controls_toggle"><Size>1f,1f</Size></WidgetGroup>
+              <WidgetGroup><Size>1f,1f</Size></WidgetGroup>
+            </Children>
+          </WidgetStack>
+        </Children>
+      </SizeAwareStack><!-- /Size detector -->
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Tango/size_detector_netbook.xml b/res/skins/Tango/size_detector_netbook.xml
index e4eeff85d36b..b15c064387fc 100644
--- a/res/skins/Tango/size_detector_netbook.xml
+++ b/res/skins/Tango/size_detector_netbook.xml
@@ -11,53 +11,75 @@ Description:
 -->
 <Template>
   <WidgetGroup>
-    <Layout>horizontal</Layout>
+    <Layout>vertical</Layout>
     <Size>1me,0f</Size>
     <Children>
-      <SizeAwareStack><!-- Netbook trigger -->
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Size>1me,0f</Size>
         <Children>
-
-          <WidgetStack><!-- 0  show skin controls at top edge of window -->
-            <SizePolicy>me,max</SizePolicy>
-            <MinimumSize>1,0</MinimumSize>
-            <MaximumSize>1259,0</MaximumSize>
+          <SizeAwareStack><!-- Netbook trigger -->
             <Children>
-              <WidgetGroup trigger="[Tango],netbook_mode">
-                <Size>2f,0f</Size>
-                <Children/>
-              </WidgetGroup>
-              <WidgetGroup trigger="[Tango],normal_mode">
-                <Size>2f,0f</Size>
-                <Children/>
-              </WidgetGroup>
-            </Children>
-          </WidgetStack>
 
-          <WidgetStack><!-- 1  show skin controls in the center between decks -->
-            <SizePolicy>me,me</SizePolicy>
-            <MinimumSize>1260,0</MinimumSize>
+              <WidgetStack><!-- 0  show skin controls at top edge of window -->
+                <SizePolicy>me,max</SizePolicy>
+                <MinimumSize>1,0</MinimumSize>
+                <MaximumSize>1259,0</MaximumSize>
+                <Children>
+                  <WidgetGroup trigger="[Tango],netbook_mode"><Size>2f,0f</Size></WidgetGroup>
+                  <WidgetGroup trigger="[Tango],normal_mode"><Size>2f,0f</Size></WidgetGroup>
+                </Children>
+              </WidgetStack>
+
+              <WidgetStack><!-- 1  show skin controls in the center between decks -->
+                <SizePolicy>me,me</SizePolicy>
+                <MinimumSize>1260,0</MinimumSize>
+                <Children>
+                  <WidgetGroup trigger="[Tango],normal_mode"><Size>2f,0f</Size></WidgetGroup>
+                  <WidgetGroup trigger="[Tango],netbook_mode"><Size>2f,0f</Size></WidgetGroup>
+                </Children>
+              </WidgetStack>
+            </Children>
+          </SizeAwareStack><!-- /Netbook trigger -->
+          
+          <WidgetGroup><!-- Spacer to enforce netbook mode -->
+            <ObjectName>EnforceNetbookMode</ObjectName>
+            <Size>10000f,0f</Size>
+            <Connection>
+              <ConfigKey persist="true">[Tango],enforce_netbook_mode</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Size>1me,0f</Size>
+        <Children>
+          <SizeAwareStack><!-- Netbook trigger -->
             <Children>
-              <WidgetGroup trigger="[Tango],normal_mode">
-                <Size>2f,0f</Size>
-                <Children/>
-              </WidgetGroup>
-              <WidgetGroup trigger="[Tango],netbook_mode">
-                <Size>2f,0f</Size>
-                <Children/>
-              </WidgetGroup>
+
+              <WidgetStack><!-- 0  show skin controls at top edge of window -->
+                <SizePolicy>me,max</SizePolicy>
+                <MinimumSize>1,0</MinimumSize>
+                <MaximumSize>1259,0</MaximumSize>
+                <Children>
+                  <WidgetGroup trigger="[Tango],netbook_mode_auto"><Size>2f,0f</Size></WidgetGroup>
+                  <WidgetGroup trigger="[Tango],normal_mode_0"><Size>2f,0f</Size></WidgetGroup>
+                </Children>
+              </WidgetStack>
+
+              <WidgetStack><!-- 1  show skin controls in the center between decks -->
+                <SizePolicy>me,me</SizePolicy>
+                <MinimumSize>1260,0</MinimumSize>
+                <Children>
+                  <WidgetGroup trigger="[Tango],normal_mode_0"><Size>2f,0f</Size></WidgetGroup>
+                  <WidgetGroup trigger="[Tango],netbook_mode_auto"><Size>2f,0f</Size></WidgetGroup>
+                </Children>
+              </WidgetStack>
             </Children>
-          </WidgetStack>
+          </SizeAwareStack><!-- /Netbook trigger -->
         </Children>
-      </SizeAwareStack><!-- /Netbook trigger -->
-      
-      <WidgetGroup><!-- Spacer to enforce netbook mode -->
-        <ObjectName>EnforceNetbookMode</ObjectName>
-        <Size>10000f,0f</Size>
-        <Children/>
-        <Connection>
-          <ConfigKey persist="true">[Tango],enforce_netbook_mode</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
       </WidgetGroup>
     </Children>
   </WidgetGroup>
diff --git a/res/skins/Tango/size_detector_stars.xml b/res/skins/Tango/size_detector_stars.xml
index 14933724dbb2..d25c6f9d5157 100644
--- a/res/skins/Tango/size_detector_stars.xml
+++ b/res/skins/Tango/size_detector_stars.xml
@@ -19,15 +19,11 @@ Controls:
     <Layout>horizontal</Layout>
     <SizePolicy>me,min</SizePolicy>
     <Children>
-      <WidgetGroup><!-- Play and deck controls toggler -->
-        <ObjectName>SizeTest</ObjectName>
-        <Size>63f,12f</Size>
-        <Children/>
-      </WidgetGroup>
-      <WidgetGroup><!-- Separate Cue button -->
-        <ObjectName>SizeTest</ObjectName>
-        <Size>25f,12f</Size>
-        <Children/>
+      <!-- Play button -->
+      <WidgetGroup><Size>63f,1f</Size></WidgetGroup>
+      <!-- Separate Cue button -->
+      <WidgetGroup>
+        <Size>25f,1f</Size>
         <Connection>
           <ConfigKey persist="true">[Tango],separate_cue_button</ConfigKey>
           <Transform><IsEqual>1</IsEqual></Transform>
@@ -35,9 +31,7 @@ Controls:
         </Connection>
       </WidgetGroup>
       <WidgetGroup><!-- HotCues 1-4 at minimum size -->
-        <ObjectName>SizeTest</ObjectName>
-        <Size>64f,12f</Size>
-        <Children/>
+        <Size>64f,1f</Size>
         <Connection>
           <ConfigKey persist="true">[Tango],hotcues</ConfigKey>
           <Transform><IsEqual>1</IsEqual></Transform>
@@ -45,65 +39,58 @@ Controls:
         </Connection>
       </WidgetGroup>
       <WidgetGroup><!-- HotCues 1-8 at minimum size -->
-        <ObjectName>SizeTest</ObjectName>
-        <Size>128f,12f</Size>
-        <Children/>
+        <Size>128f,1f</Size>
         <Connection>
           <ConfigKey persist="true">[Tango],hotcues</ConfigKey>
           <Transform><IsEqual>2</IsEqual></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup>
+      <WidgetGroup><!-- deck controls toggle -->
+        <Size>11f,1f</Size>
+        <Connection>
+          <ConfigKey>[Tango],deck_controls_toggle</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /deck controls toggle -->
       <!-- spacers for deck controls that are set to be always visible -->
       <WidgetGroup><!-- keylock -->
-        <ObjectName>SizeTest</ObjectName>
-        <Size>20f,12f</Size>
-        <Children/>
+        <Size>20f,1f</Size>
         <Connection>
           <ConfigKey persist="true">[Tango],always_visible_keylock</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup>
       <WidgetGroup><!-- repeat -->
-        <ObjectName>SizeTest</ObjectName>
-        <Size>22f,12f</Size>
-        <Children/>
+        <Size>22f,1f</Size>
         <Connection>
           <ConfigKey persist="true">[Tango],always_visible_repeat</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup>
       <WidgetGroup><!-- eject -->
-        <ObjectName>SizeTest</ObjectName>
-        <Size>20f,12f</Size>
-        <Children/>
+        <Size>20f,1f</Size>
         <Connection>
           <ConfigKey persist="true">[Tango],always_visible_eject</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup>
       <WidgetGroup><!-- slip mode -->
-        <ObjectName>SizeTest</ObjectName>
-        <Size>22f,12f</Size>
-        <Children/>
+        <Size>22f,1f</Size>
         <Connection>
           <ConfigKey persist="true">[Tango],always_visible_slipMode</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup>
-      <WidgetGroup><!-- cf orientation -->
-        <ObjectName>SizeTest</ObjectName>
-        <Size>20f,12f</Size>
-        <Children/>
+      <WidgetGroup><!-- xfader orientation -->
+        <Size>20f,1f</Size>
         <Connection>
-          <ConfigKey persist="true">[Tango],always_visible_cfOrientation</ConfigKey>
+          <ConfigKey persist="true">[Tango],always_visible_xfaderOrientation</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup>
       <WidgetGroup><!-- quantize -->
-        <ObjectName>SizeTest</ObjectName>
-        <Size>22f,12f</Size>
-        <Children/>
+        <Size>22f,1f</Size>
         <Connection>
           <ConfigKey persist="true">[Tango],always_visible_quantize</ConfigKey>
           <BindProperty>visible</BindProperty>
@@ -115,9 +102,7 @@ Controls:
         <Layout>horizontal</Layout>
         <Children>
           <WidgetGroup><!-- keylock expanded -->
-            <ObjectName>SizeTest</ObjectName>
-            <Size>20f,12f</Size>
-            <Children/>
+            <Size>20f,1f</Size>
             <Connection>
               <ConfigKey persist="true">[Tango],always_visible_keylock</ConfigKey>
               <Transform><Not/></Transform>
@@ -125,9 +110,7 @@ Controls:
             </Connection>
           </WidgetGroup>
           <WidgetGroup><!-- repeat expanded -->
-            <ObjectName>SizeTest</ObjectName>
-            <Size>22f,12f</Size>
-            <Children/>
+            <Size>22f,1f</Size>
             <Connection>
               <ConfigKey persist="true">[Tango],always_visible_repeat</ConfigKey>
               <Transform><Not/></Transform>
@@ -135,9 +118,7 @@ Controls:
             </Connection>
           </WidgetGroup>
           <WidgetGroup><!-- eject expanded -->
-            <ObjectName>SizeTest</ObjectName>
-            <Size>20f,12f</Size>
-            <Children/>
+            <Size>20f,1f</Size>
             <Connection>
               <ConfigKey persist="true">[Tango],always_visible_eject</ConfigKey>
               <Transform><Not/></Transform>
@@ -145,29 +126,23 @@ Controls:
             </Connection>
           </WidgetGroup>
           <WidgetGroup><!-- slip mode expanded -->
-            <ObjectName>SizeTest</ObjectName>
-            <Size>22f,12f</Size>
-            <Children/>
+            <Size>22f,1f</Size>
             <Connection>
               <ConfigKey persist="true">[Tango],always_visible_slipMode</ConfigKey>
               <Transform><Not/></Transform>
               <BindProperty>visible</BindProperty>
             </Connection>
           </WidgetGroup>
-          <WidgetGroup><!-- cf orientation expanded -->
-            <ObjectName>SizeTest</ObjectName>
-            <Size>20f,12f</Size>
-            <Children/>
+          <WidgetGroup><!-- xfader orientation expanded -->
+            <Size>20f,1f</Size>
             <Connection>
-              <ConfigKey persist="true">[Tango],always_visible_cfOrientation</ConfigKey>
+              <ConfigKey persist="true">[Tango],always_visible_xfaderOrientation</ConfigKey>
               <Transform><Not/></Transform>
               <BindProperty>visible</BindProperty>
             </Connection>
           </WidgetGroup>
           <WidgetGroup><!-- quantize expanded -->
-            <ObjectName>SizeTest</ObjectName>
-            <Size>22f,12f</Size>
-            <Children/>
+            <Size>22f,1f</Size>
             <Connection>
               <ConfigKey persist="true">[Tango],always_visible_quantize</ConfigKey>
               <Transform><Not/></Transform>
@@ -185,33 +160,21 @@ Controls:
         <Children>
           <WidgetStack><!-- Not enough space for stars -->
             <SizePolicy>me,me</SizePolicy>
-            <MinimumSize>0,12</MinimumSize>
-            <MaximumSize>82,12</MaximumSize>
+            <MinimumSize>0,1</MinimumSize>
+            <MaximumSize>82,1</MaximumSize>
             <Children>
-              <WidgetGroup>
-                <Size>1f,12f</Size>
-                <Children/>
-              </WidgetGroup>
-              <WidgetGroup trigger="[Tango],stars_fit">
-                <Size>1f,12f</Size>
-                <Children/>
-              </WidgetGroup>
+              <WidgetGroup><Size>1f,1f</Size></WidgetGroup>
+              <WidgetGroup trigger="[Tango],stars_fit"><Size>1f,1f</Size></WidgetGroup>
             </Children>
           </WidgetStack>
 
           <WidgetStack><!-- when there is enough space for stars (min 83px) show them. -->
             <SizePolicy>me,me</SizePolicy>
-            <MinimumSize>83,12</MinimumSize>
-            <MaximumSize>-1,12</MaximumSize>
+            <MinimumSize>83,1</MinimumSize>
+            <MaximumSize>-1,1</MaximumSize>
             <Children>
-              <WidgetGroup trigger="[Tango],stars_fit">
-                <Size>1f,12f</Size>
-                <Children/>
-              </WidgetGroup>
-              <WidgetGroup>
-                <Size>1f,12f</Size>
-                <Children/>
-              </WidgetGroup>
+              <WidgetGroup trigger="[Tango],stars_fit"><Size>1f,1f</Size></WidgetGroup>
+              <WidgetGroup><Size>1f,1f</Size></WidgetGroup>
             </Children>
           </WidgetStack>
 
diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml
index f5a39bc7455f..29fc7a62a764 100644
--- a/res/skins/Tango/skin.xml
+++ b/res/skins/Tango/skin.xml
@@ -1,35 +1,39 @@
 <!--
-    Tango - a flat, super-minimizable, nightime-compatible skin for mixxx
+    Tango * a flat, super-minimizable, nightime-compatible skin for mixxx
 
-    This skin acts as an extension for your controller, meaning (almost) all duplicate
-    controls can be removed. See skin settings menu (next to clock) for all controls.
+    This skin is supposed to be an extension for your controller, in a way that
+    almost all duplicate controls can be removed from screen.
+    Toggle skin settings menu with the hamburger button to the right of the clock
+    to find all options.
 
     Main focus was to make every control easily and quickly recognizable,
     especially when your eyes are mostly on your controller and your hands.
     I started with LateNight and got much inspiration from Deere and how templates and
     variables can be used.
 
-    I suppose everything is self-explaining, just try out.
-    - Play buttons: RED when track is playing normally,
-                    ORANGE when 'previewing' from Cue/HotCue.
-    - right-clicking Play button when playing will stop/reset track to Cue point,
-      right-clicking when stopped will set Cue point to current position.
-    - how to use comments row: insert a blank line in track's comment with
-      <shift><space> and add your notes in front of that.
+    Special feature:
+    comment row below track overview shows first line of track's comment (read from
+    metadata tag, editable in tracks table or Properties window).
+    How to use:
+    - add your notes on cue points, moods, whatever to the beginning of track comment
+    - for a line break press <shift> + <enter>
+    - to push iTunes info etc. down, insert a blank line: <space> then <shift> + <enter>
+    - disable completely in skin settings menu
 
     Enjoy!
-    Big   U	  U   P P P
-          U	  U   P     P
-          U	  U   P P P
-            U	U	  P        to mixxx devs for their work over the past years!!
+
+    Big   U	    U   P P P
+          U	    U   P     P
+          U	    U   P P P
+            U	U	    P        to mixxx devs for their work over the past years!!
 
 -->
 
 <skin>
   <manifest>
     <title>Tango</title>
-    <author>Ronny Sandig</author>
-    <version>0.9.X</version>
+    <author>ronso0</author>
+    <version>2.1.4</version>
     <description>A flat, super-minimizable, nightime-compatible skin</description>
     <language>en</language>
     <license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>
@@ -47,31 +51,32 @@
       <attribute persist="true" config_key="[Master],maximize_library">0</attribute>
       <attribute persist="true" config_key="[Library],show_coverart">1</attribute>
       <attribute persist="true" config_key="[Library],show_library">1</attribute>
-      <attribute persist="true" config_key="[EffectRack1],show">0</attribute>
+      <attribute persist="true" config_key="[EffectRack1],show">1</attribute>
       <attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>
       <attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
       <attribute persist="true" config_key="[Samplers],show_samplers">0</attribute>
-      <attribute persist="true" config_key="[VinylControl],show_vinylcontrol">1</attribute>
       <!-- [Tango] specific defaults -->
-      <attribute persist="true" config_key="[Tango],2or4_fxUnits">0</attribute>
+      <attribute persist="true" config_key="[Tango],2or4_FxUnits">0</attribute>
+      <attribute persist="true" config_key="[Tango],fx_super_knob">0</attribute>
       <attribute persist="true" config_key="[Tango],sampler_fx_buttons">1</attribute>
       <attribute persist="true" config_key="[Tango],micaux_fx_buttons">1</attribute>
       <attribute persist="true" config_key="[Tango],beatgrid_buttons">0</attribute>
+      <attribute persist="true" config_key="[Tango],colorLogo">0</attribute>
       <attribute persist="true" config_key="[Tango],channel_mixer">1</attribute>
       <attribute persist="true" config_key="[Tango],crossfader">1</attribute>
-      <attribute persist="true" config_key="[Tango],crossfader_logo_Stack">1</attribute>
       <attribute persist="true" config_key="[Tango],deck_controls">1</attribute>
       <attribute persist="true" config_key="[Tango],always_visible_keylock">1</attribute>
       <attribute persist="true" config_key="[Tango],always_visible_eject">0</attribute>
-      <attribute persist="true" config_key="[Tango],always_visible_slipMode">0</attribute>
+      <attribute persist="true" config_key="[Tango],always_visible_slipMode">1</attribute>
       <attribute persist="true" config_key="[Tango],always_visible_repeat">0</attribute>
-      <attribute persist="true" config_key="[Tango],always_visible_cfOrientation">0</attribute>
-      <attribute persist="true" config_key="[Tango],always_visible_quantize">0</attribute>
+      <attribute persist="true" config_key="[Tango],always_visible_xfaderOrientation">0</attribute>
+      <attribute persist="true" config_key="[Tango],always_visible_quantize">1</attribute>
       <attribute persist="true" config_key="[Tango],eq_knobs">1</attribute>
       <attribute persist="true" config_key="[Tango],hotcues">1</attribute>
       <attribute persist="true" config_key="[Tango],8_hotcues">0</attribute>
       <attribute persist="true" config_key="[Tango],key_controls">1</attribute>
       <attribute persist="true" config_key="[Tango],loop_beatjump_controls">1</attribute>
+      <attribute persist="true" config_key="[Tango],loop_sizes">0</attribute>
       <attribute persist="true" config_key="[Tango],mixerbar">1</attribute>
       <attribute persist="true" config_key="[Tango],mixerbar_headphone">1</attribute>
       <attribute persist="true" config_key="[Tango],mixerbar_mic">1</attribute>
@@ -148,11 +153,13 @@
 <!--  ################################################################
       Variables #####################################################
      ###############################################################
-      Put these variable definitions at the beginning so SingletonDefinitions
-      have all Variables available. -->
+      Put these variable definitions at the beginning in order to have
+      have all variables available for SingletonDefinitions -->
         
-<!--  Initially I was trying to match 'active angle' on Reloop TerminalMix 2.
-      Values beyond -150/150 might interfere with some knob labels. -->
+<!--  Knob range in degrees, 0-360
+      Initially I was trying to match the responsive area on Reloop TerminalMix 2,
+      but tweak to your liking.
+      Values beyond -150/150 might interfere with some knob labels -->
     <SetVariable name="PotiMinAngle">-130</SetVariable>
     <SetVariable name="PotiMaxAngle">130</SetVariable>
 
@@ -182,112 +189,6 @@
       </Children>
     </SingletonDefinition>
 
-<!-- Decks appear multiple times due to [2/4 FX Units] switch, so make them
-     Singletons to save memory. TEST! -->
-    <SingletonDefinition><!-- Decks 12 -->
-      <ObjectName>Decks12_Singleton</ObjectName>
-      <Children>
-        <WidgetGroup>
-          <Layout>vertical</Layout>
-          <SizePolicy>me,f</SizePolicy>
-          <Children>
-
-            <!-- spacer when stacked waveforms are hidden -->
-            <WidgetGroup>
-              <Layout>vertical</Layout>
-              <Children>
-                <WidgetGroup><Size>1me,3f</Size><Children/>
-                  <Connection>
-                    <ConfigKey persist="true">[Tango],stacked_waveforms</ConfigKey>
-                    <Transform><Not/></Transform>
-                    <BindProperty>visible</BindProperty>
-                  </Connection>
-                </WidgetGroup>
-              </Children>
-              <Connection>
-                <ConfigKey persist="true">[Tango],normal_mode</ConfigKey>
-                <BindProperty>visible</BindProperty>
-              </Connection>
-            </WidgetGroup>
-
-            <WidgetGroup><!-- LEFT decks + Skin Controls + RIGHT decks -->
-              <ObjectName>DecksMixer12</ObjectName>
-              <Layout>horizontal</Layout>
-              <Size>1008me,136min</Size>
-              <Children>
-                <Template src="skin:deck_left.xml">
-                  <SetVariable name="chanNum">1</SetVariable>
-                  <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_1"/></SetVariable>
-                  <SetVariable name="SignalColor"><Variable name="SignalColor_1"/></SetVariable>
-                  <SetVariable name="SignalRGBHighColor"><Variable name="SignalRGBHighColor"/></SetVariable>
-                  <SetVariable name="SignalRGBMidColor"><Variable name="SignalRGBMidColor"/></SetVariable>
-                  <SetVariable name="SignalRGBLowColor"><Variable name="SignalRGBLowColor"/></SetVariable>
-                </Template>
-
-                <Template src="skin:crossfader12_skincontrols.xml"/>
-
-                <Template src="skin:deck_right.xml">
-                  <SetVariable name="chanNum">2</SetVariable>
-                  <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_2"/></SetVariable>
-                  <SetVariable name="SignalColor"><Variable name="SignalColor_2"/></SetVariable>
-                  <SetVariable name="SignalRGBHighColor"><Variable name="SignalRGBHighColor"/></SetVariable>
-                  <SetVariable name="SignalRGBMidColor"><Variable name="SignalRGBMidColor"/></SetVariable>
-                  <SetVariable name="SignalRGBLowColor"><Variable name="SignalRGBLowColor"/></SetVariable>
-                </Template>
-              </Children>
-            </WidgetGroup><!-- LEFT decks + Skin Controls + RIGHT decks -->
-
-          </Children>
-        </WidgetGroup>
-      </Children>
-    </SingletonDefinition><!-- /Decks 12 -->
-
-    <SingletonDefinition><!-- Decks 34 -->
-      <ObjectName>Decks34_Singleton</ObjectName>
-      <Children>
-        <WidgetGroup>
-          <Layout>vertical</Layout>
-          <SizePolicy>me,f</SizePolicy>
-          <Children>
-
-            <WidgetGroup><!-- LEFT decks + ToolbarTop + RIGHT decks -->
-              <ObjectName>DecksMixer34</ObjectName>
-              <Layout>horizontal</Layout>
-              <Size>1008me,136min</Size>
-              <Children>
-
-                <Template src="skin:deck_left.xml">
-                  <SetVariable name="chanNum">3</SetVariable>
-                  <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_3"/></SetVariable>
-                  <SetVariable name="SignalColor"><Variable name="SignalColor_3"/></SetVariable>
-                  <SetVariable name="SignalRGBHighColor"><Variable name="SignalRGBHighColor"/></SetVariable>
-                  <SetVariable name="SignalRGBMidColor"><Variable name="SignalRGBMidColor"/></SetVariable>
-                  <SetVariable name="SignalRGBLowColor"><Variable name="SignalRGBLowColor"/></SetVariable>
-                </Template>
-
-                <Template src="skin:crossfader34.xml"/>
-
-                <Template src="skin:deck_right.xml">
-                  <SetVariable name="chanNum">4</SetVariable>
-                  <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_4"/></SetVariable>
-                  <SetVariable name="SignalColor"><Variable name="SignalColor_4"/></SetVariable>
-                  <SetVariable name="SignalRGBHighColor"><Variable name="SignalRGBHighColor"/></SetVariable>
-                  <SetVariable name="SignalRGBMidColor"><Variable name="SignalRGBMidColor"/></SetVariable>
-                  <SetVariable name="SignalRGBLowColor"><Variable name="SignalRGBLowColor"/></SetVariable>
-                </Template>
-
-              </Children>
-              <Connection>
-                <ConfigKey persist="true">[Master],show_4decks</ConfigKey>
-                <BindProperty>visible</BindProperty>
-              </Connection>
-            </WidgetGroup><!-- LEFT decks + ToolbarTop + RIGHT decks -->
-
-          </Children>
-        </WidgetGroup>
-      </Children>
-    </SingletonDefinition><!-- /Decks 34 -->
-
 <!--  ################################################################
        SkinContainer  ###############################################
      ############################################################### -->
@@ -297,7 +198,7 @@
       <SizePolicy>me,me</SizePolicy>
       <Children>
         <!-- Normal view, expandig library -->
-        <!-- Mximized library -->
+        <!-- Maximized library -->
         <!-- Netbook size detector -->
 
         <WidgetGroup><!-- Lib normal, stacked resizable waveforms, skin settings menu -->
@@ -326,113 +227,63 @@
                   </Connection>
                 </WidgetGroup>
 
-                <WidgetGroup><!-- [Decks + 2 FX / Decks + 4 FX] + Samplers_Library -->
+                <WidgetGroup><!-- Decks + FX + Samplers + Library -->
                   <Layout>vertical</Layout>
                   <SizePolicy>me,min</SizePolicy>
                   <Children>
 
-                    <Template src="skin:crossfader_skincontrols_netbook.xml"/>
+                    <Template src="skin:topbar_netbook.xml"/>
+
+					          <!-- Spacer to window border with no parallel waveforms -->
+					          <WidgetGroup>
+					            <Size>1me,3f</Size>
+						          <Connection>
+						            <ConfigKey persist="true">[Tango],stacked_waveforms</ConfigKey>
+						            <Transform><Not/></Transform>
+						            <BindProperty>visible</BindProperty>
+						          </Connection>
+					          </WidgetGroup>
 
-                    <WidgetGroup><!-- Decks + 2 FX Units -->
+                    <Template src="skin:decks_12.xml"/>
+
+                    <WidgetGroup>
                       <Layout>vertical</Layout>
                       <SizePolicy>me,min</SizePolicy>
                       <Children>
-
-                        <SingletonContainer>
-                          <ObjectName>Decks12_Singleton</ObjectName>
-                        </SingletonContainer>
-
-                        <WidgetGroup>
-                          <Size>1me,5f</Size>
-                          <Children/>
-                          <Connection>
-                            <ConfigKey persist="true">[Master],show_4decks</ConfigKey>
-                            <BindProperty>visible</BindProperty>
-                          </Connection>
-                        </WidgetGroup>
-
-                        <SingletonContainer>
-                          <ObjectName>Decks34_Singleton</ObjectName>
-                          <Connection>
-                            <ConfigKey persist="true">[Master],show_4decks</ConfigKey>
-                            <BindProperty>visible</BindProperty>
-                          </Connection>
-                        </SingletonContainer>
-
-                        <WidgetGroup>
-                          <Size>1me,5f</Size>
-                          <Children/>
-                          <Connection>
-                            <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-                            <BindProperty>visible</BindProperty>
-                          </Connection>
-                        </WidgetGroup>
-
-
                         <Template src="skin:fx_units_12.xml"/>
-
                       </Children>
                       <Connection>
-                        <ConfigKey persist="true">[Tango],2or4_fxUnits</ConfigKey>
-                        <Transform><Not/></Transform>
+                        <ConfigKey persist="true">[Tango],2or4_FxUnits</ConfigKey>
                         <BindProperty>visible</BindProperty>
                       </Connection>
-                    </WidgetGroup><!-- /Decks + 2 FX Units +  -->
+                    </WidgetGroup>
+
+                    <Template src="skin:decks_34.xml"/>
 
-                    <WidgetGroup><!-- Decks + 4  FX Units -->
+                    <WidgetGroup>
                       <Layout>vertical</Layout>
                       <SizePolicy>me,min</SizePolicy>
                       <Children>
-
-                        <SingletonContainer>
-                          <ObjectName>Decks12_Singleton</ObjectName>
-                        </SingletonContainer>
-
-                        <WidgetGroup>
-                          <Size>1me,5f</Size>
-                          <Children/>
-                          <Connection>
-                            <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-                            <BindProperty>visible</BindProperty>
-                          </Connection>
-                        </WidgetGroup>
-
-                        <Template src="skin:fx_units_12.xml"/>
-
-                        <WidgetGroup>
-                          <Size>1me,5f</Size>
-                          <Children/>
-                          <Connection>
-                            <ConfigKey persist="true">[Master],show_4decks</ConfigKey>
-                            <BindProperty>visible</BindProperty>
-                          </Connection>
-                        </WidgetGroup>
-
-                        <SingletonContainer>
-                          <ObjectName>Decks34_Singleton</ObjectName>
-                          <Connection>
-                            <ConfigKey persist="true">[Master],show_4decks</ConfigKey>
-                            <BindProperty>visible</BindProperty>
-                          </Connection>
-                        </SingletonContainer>
-
-                        <WidgetGroup>
-                          <Size>1me,5f</Size>
-                          <Children/>
-                          <Connection>
-                            <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-                            <BindProperty>visible</BindProperty>
-                          </Connection>
-                        </WidgetGroup>
-
                         <Template src="skin:fx_units_34.xml"/>
+                      </Children>
+                      <Connection>
+                        <ConfigKey persist="true">[Tango],2or4_FxUnits</ConfigKey>
+                        <BindProperty>visible</BindProperty>
+                      </Connection>
+                    </WidgetGroup>
 
+                    <WidgetGroup>
+                      <Layout>vertical</Layout>
+                      <SizePolicy>me,min</SizePolicy>
+                      <Children>
+                        <Template src="skin:fx_units_12.xml"/>
                       </Children>
                       <Connection>
-                        <ConfigKey persist="true">[Tango],2or4_fxUnits</ConfigKey>
+                        <ConfigKey persist="true">[Tango],2or4_FxUnits</ConfigKey>
+                        <Transform><Not/></Transform>
                         <BindProperty>visible</BindProperty>
                       </Connection>
-                    </WidgetGroup><!-- /Decks + 4 FX Units -->
+                    </WidgetGroup>
 
                     <Template src="skin:sample_decks.xml"/>
 
@@ -456,7 +307,7 @@
                     </WidgetGroup><!-- /MixerBar when Library is not shown -->
 
                   </Children>
-                </WidgetGroup><!-- /2 FX + Decks, 4 FX + Decks, Samplers_Library -->
+                </WidgetGroup><!-- Decks + FX + Samplers + Library -->
               </Children>
             </Splitter>
 
@@ -488,6 +339,5 @@
 
       </Children>
     </WidgetGroup><!-- /SkinContainer -->
-
   </Children>
 </skin>
diff --git a/res/skins/Tango/skin_settings.xml b/res/skins/Tango/skin_settings.xml
index a3a70ffa28ad..a1099d72bfd7 100644
--- a/res/skins/Tango/skin_settings.xml
+++ b/res/skins/Tango/skin_settings.xml
@@ -1,9 +1,10 @@
 <!--
 Description:
-  The skin settings menu, floating on top of main skin window.
+  The skin settings menu.
 
   Bug: qss 'qproperty-layoutAlignment' is not respected for stacked layout.
-  No way to push SkinSettings to the right edge while keeping the area underneath clickable.
+  No way to make SkinSettings float on top of main window at the right side
+  while keeping the screen area underneath clickable.
 
   https://bugs.launchpad.net/mixxx/+bug/1689196
   On OSX this widget is drawn behind main skin instead on top of it.
@@ -28,30 +29,88 @@ Description:
               <Label>
                 <ObjectName>CategoryLabel</ObjectName>
                 <Text>Decks / General</Text>
+                <Size>190f,19f</Size>
               </Label>
-                <!-- push Close button to far right -->
-                <WidgetGroup><Size>1me,1me</Size><Children/></WidgetGroup>
+
+              <!-- push Close button to far right -->
+              <WidgetGroup><Size>1me,1me</Size></WidgetGroup>
+
               <Template src="skin:button_2state.xml">
                 <SetVariable name="ObjectName">SkinSettingsClose</SetVariable>
-                <SetVariable name="Size">17f,24f</SetVariable>
-                <SetVariable name="state_1_pressed">skinsettings_close.svg</SetVariable>
-                <SetVariable name="state_1_unpressed">skinsettings_close.svg</SetVariable>
+                <SetVariable name="Size">20f,24f</SetVariable>
                 <SetVariable name="ConfigKey">[Tango],skin_settings</SetVariable>
               </Template>
             </Children>
           </WidgetGroup>
 
-          <WidgetGroup><!-- Main Decks Settings -->
+          <WidgetGroup><!-- Decks / General | 9 buttons, 1 fixed row -->
             <ObjectName>SkinSettingsCategory</ObjectName>
+            <MinimumSize>182,150</MinimumSize>
+            <MaximumSize>-1,176</MaximumSize>
+            <SizePolicy>me,me</SizePolicy>
             <Layout>vertical</Layout>
-            <SizePolicy>me,max</SizePolicy>
             <Children>
+              <WidgetGroup><!-- force compact mode -->
+                <Layout>stacked</Layout>
+                <MinimumSize>182,13</MinimumSize>
+                <MaximumSize>-1,17</MaximumSize>
+                <SizePolicy>me,me</SizePolicy>
+                <Children>
+                  <!-- index 0 due to bug -->
+                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
 
-              <Template src="skin:skin_settings_button_2state.xml">
-                <SetVariable name="state_0_text">      Compact mode</SetVariable>
-                <SetVariable name="state_1_text"> &#10004; Compact mode</SetVariable>
-                <SetVariable name="Setting">[Tango],enforce_netbook_mode</SetVariable>
-              </Template>
+                  <WidgetGroup><!-- translucent cover when skin switched to netbook mode automatically -->
+                    <ObjectName>SubmenuCover</ObjectName>
+                    <Layout>vertical</Layout>
+                    <MinimumSize>182,13</MinimumSize>
+                    <MaximumSize>-1,17</MaximumSize>
+                    <SizePolicy>me,me</SizePolicy>
+                    <Connection>
+                      <ConfigKey persist="true">[Tango],netbook_mode_auto</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+                  <WidgetGroup><!-- button when skin switched to netbook mode automatically -->
+                    <ObjectName>SubmenuCover</ObjectName>
+                    <Layout>vertical</Layout>
+                    <MinimumSize>182,13</MinimumSize>
+                    <MaximumSize>-1,17</MaximumSize>
+                    <SizePolicy>me,me</SizePolicy>
+                    <Children>
+                      <Template src="skin:skin_settings_button_2state.xml">
+                        <SetVariable name="state_0_text">      Netbook mode</SetVariable>
+                        <SetVariable name="state_1_text"> &#10004; Netbook mode</SetVariable>
+                        <SetVariable name="Setting">[Tango],enforce_netbook_mode</SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey persist="true">[Tango],netbook_mode_auto</ConfigKey>
+                      <Transform><Not/></Transform>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+                  <WidgetGroup><!-- button when skin switched to netbook mode automatically -->
+                    <ObjectName>SubmenuCover</ObjectName>
+                    <Layout>vertical</Layout>
+                    <MinimumSize>182,13</MinimumSize>
+                    <MaximumSize>-1,17</MaximumSize>
+                    <SizePolicy>me,me</SizePolicy>
+                    <Children>
+                      <Template src="skin:skin_settings_button_2state.xml">
+                        <SetVariable name="state_0_text"> &#10004; Netbook mode (automatic)</SetVariable>
+                        <SetVariable name="state_1_text"> &#10004; Netbook mode (automatic)</SetVariable>
+                        <SetVariable name="Setting">[Tango],enforce_netbook_mode</SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey persist="true">[Tango],netbook_mode_auto</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+                </Children>
+              </WidgetGroup><!-- /force compact mode -->
 
               <Template src="skin:skin_settings_button_2state.xml">
                 <SetVariable name="state_0_text">      Symmetric Overviews</SetVariable>
@@ -65,11 +124,20 @@ Description:
                 <SetVariable name="Setting">[Tango],symmetric_time</SetVariable>
               </Template>
 
-              <Template src="skin:skin_settings_button_2state.xml">
-                <SetVariable name="state_0_text">      [ 4 &#9664;  8 ]  Hotcues</SetVariable>
-                <SetVariable name="state_1_text">      [ 4  &#9654; 8 ]  Hotcues</SetVariable>
-                <SetVariable name="Setting">[Tango],8_hotcues</SetVariable>
-              </Template>
+              <WidgetGroup>
+                <MinimumSize>182,13</MinimumSize>
+                <MaximumSize>-1,17</MaximumSize>
+                <SizePolicy>me,me</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>14f,1min</Size></WidgetGroup>
+                  <Template src="skin:skin_settings_button_2state.xml">
+                    <SetVariable name="state_0_text">[ 4 &#9664;  8 ]  Hotcues</SetVariable>
+                    <SetVariable name="state_1_text">[ 4  &#9654; 8 ]  Hotcues</SetVariable>
+                    <SetVariable name="Setting">[Tango],8_hotcues</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
 
               <Template src="skin:skin_settings_button_2state.xml">
                 <SetVariable name="state_0_text">      Track Comment</SetVariable>
@@ -85,9 +153,9 @@ Description:
 
               <WidgetGroup><!-- Pitch/Key submenu -->
                 <Layout>stacked</Layout>
-                <MinimumSize>182,15</MinimumSize>
-                <MaximumSize>182,17</MaximumSize>
-                <SizePolicy>f,max</SizePolicy>
+                <MinimumSize>182,13</MinimumSize>
+                <MaximumSize>-1,17</MaximumSize>
+                <SizePolicy>me,me</SizePolicy>
                 <Children>
                   <!-- index 0 due to bug -->
                   <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
@@ -95,12 +163,13 @@ Description:
                   <WidgetGroup><!-- translucent cover when Pitch slider is hidden -->
                     <ObjectName>SubmenuCover</ObjectName>
                     <Layout>vertical</Layout>
-                    <SizePolicy>me,max</SizePolicy>
-                    <Children/>
+                    <MinimumSize>182,13</MinimumSize>
+                    <MaximumSize>-1,17</MaximumSize>
+                    <SizePolicy>me,me</SizePolicy>
                     <Connection>
                       <ConfigKey persist="true">[Tango],pitch_fader</ConfigKey>
-                      <BindProperty>visible</BindProperty>
                       <Transform><Not/></Transform>
+                      <BindProperty>visible</BindProperty>
                     </Connection>
                   </WidgetGroup>
 
@@ -118,92 +187,118 @@ Description:
                 <SetVariable name="Setting">[Tango],loop_beatjump_controls</SetVariable>
               </Template>
 
-              <WidgetGroup>
+              <WidgetGroup><!-- Permanent deck controls -->
                 <ObjectName>DeckIndicatorSettings</ObjectName>
                 <Layout>vertical</Layout>
-                <Size>182f,30f</Size>
+                <MinimumSize>182,28</MinimumSize>
+                <MaximumSize>-1,32</MaximumSize>
+                <SizePolicy>me,me</SizePolicy>
                 <Children>
                   <Label>
-                    <Size>182f,15f</Size>
+                    <MinimumSize>182,13</MinimumSize>
+                    <MaximumSize>-1,17</MaximumSize>
+                    <SizePolicy>me,me</SizePolicy>
                     <Text>Permanent Deck controls:</Text>
                     <Alignment>left</Alignment>
                   </Label>
-                  <WidgetGroup>
+                  <WidgetGroup><!-- Permanent deck control icons -->
                     <ObjectName>AlignTopLeft</ObjectName>
-                    <Size>182f,15f</Size>
+                    <Size>50me,15f</Size>
                     <Layout>horizontal</Layout>
                     <Children>
+                      <!-- button graphics are 15x15px + 1px margin-right -->
                       <Template src="skin:button_2state_persist.xml"><!-- Keylock -->
                         <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
-                        <SetVariable name="Size">15f,15f</SetVariable>
+                        <SetVariable name="Size">16f,15f</SetVariable>
                         <SetVariable name="state_0_pressed">keylock_off.svg</SetVariable>
                         <SetVariable name="state_0_unpressed">keylock_off.svg</SetVariable>
                         <SetVariable name="state_1_pressed">keylock_on.svg</SetVariable>
                         <SetVariable name="state_1_unpressed">keylock_on.svg</SetVariable>
-                        <SetVariable name="ConfigKeyPerm">[Tango],always_visible_keylock</SetVariable>
+                        <SetVariable name="ConfigKey">[Tango],always_visible_keylock</SetVariable>
                       </Template>
 
                       <Template src="skin:button_2state_persist.xml">
                         <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
-                        <SetVariable name="Size">15f,15f</SetVariable>
+                        <SetVariable name="Size">16f,15f</SetVariable>
                         <SetVariable name="state_0_pressed">eject.svg</SetVariable>
                         <SetVariable name="state_0_unpressed">eject.svg</SetVariable>
                         <SetVariable name="state_1_pressed">eject_pressed.svg</SetVariable>
                         <SetVariable name="state_1_unpressed">eject_pressed.svg</SetVariable>
-                        <SetVariable name="ConfigKeyPerm">[Tango],always_visible_eject</SetVariable>
+                        <SetVariable name="ConfigKey">[Tango],always_visible_eject</SetVariable>
                       </Template>
 
                       <Template src="skin:button_2state_persist.xml">
                         <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
                         <SetVariable name="Size">16f,15f</SetVariable>
-                        <SetVariable name="state_0_pressed">slipmode_off.svg</SetVariable>
-                        <SetVariable name="state_0_unpressed">slipmode_off.svg</SetVariable>
+                        <SetVariable name="state_0_pressed">slipmode_hidden.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">slipmode_hidden.svg</SetVariable>
                         <SetVariable name="state_1_pressed">slipmode_visible.svg</SetVariable>
                         <SetVariable name="state_1_unpressed">slipmode_visible.svg</SetVariable>
-                        <SetVariable name="ConfigKeyPerm">[Tango],always_visible_slipMode</SetVariable>
+                        <SetVariable name="ConfigKey">[Tango],always_visible_slipMode</SetVariable>
                       </Template>
 
                       <Template src="skin:button_2state_persist.xml">
                         <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
                         <SetVariable name="Size">16f,15f</SetVariable>
-                        <SetVariable name="state_0_pressed">repeat_off.svg</SetVariable>
-                        <SetVariable name="state_0_unpressed">repeat_off.svg</SetVariable>
+                        <SetVariable name="state_0_pressed">repeat_hidden.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">repeat_hidden.svg</SetVariable>
                         <SetVariable name="state_1_pressed">repeat_visible.svg</SetVariable>
                         <SetVariable name="state_1_unpressed">repeat_visible.svg</SetVariable>
-                        <SetVariable name="ConfigKeyPerm">[Tango],always_visible_repeat</SetVariable>
+                        <SetVariable name="ConfigKey">[Tango],always_visible_repeat</SetVariable>
                       </Template>
 
                       <Template src="skin:button_2state_persist.xml">
                         <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
-                        <SetVariable name="Size">15f,15f</SetVariable>
-                        <SetVariable name="state_0_pressed">cf_center.svg</SetVariable>
-                        <SetVariable name="state_0_unpressed">cf_center.svg</SetVariable>
-                        <SetVariable name="state_1_pressed">cf_visible.svg</SetVariable>
-                        <SetVariable name="state_1_unpressed">cf_visible.svg</SetVariable>
-                        <SetVariable name="ConfigKeyPerm">[Tango],always_visible_cfOrientation</SetVariable>
+                        <SetVariable name="Size">16f,15f</SetVariable>
+                        <SetVariable name="state_0_pressed">xfader_center.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">xfader_center.svg</SetVariable>
+                        <SetVariable name="state_1_pressed">xfader_visible.svg</SetVariable>
+                        <SetVariable name="state_1_unpressed">xfader_visible.svg</SetVariable>
+                        <SetVariable name="ConfigKey">[Tango],always_visible_xfaderOrientation</SetVariable>
                       </Template>
 
                       <Template src="skin:button_2state_persist.xml">
                         <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
-                        <SetVariable name="Size">15f,15f</SetVariable>
-                        <SetVariable name="state_0_pressed">quantize_off.svg</SetVariable>
-                        <SetVariable name="state_0_unpressed">quantize_off.svg</SetVariable>
+                        <SetVariable name="Size">16f,15f</SetVariable>
+                        <SetVariable name="state_0_pressed">quantize_hidden.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">quantize_hidden.svg</SetVariable>
                         <SetVariable name="state_1_pressed">quantize_visible.svg</SetVariable>
                         <SetVariable name="state_1_unpressed">quantize_visible.svg</SetVariable>
-                        <SetVariable name="ConfigKeyPerm">[Tango],always_visible_quantize</SetVariable>
+                        <SetVariable name="ConfigKey">[Tango],always_visible_quantize</SetVariable>
                       </Template>
 
                       <WidgetGroup><Size>4f,0f</Size></WidgetGroup>
 
-                      <Template src="skin:button_2state_persist.xml">
-                        <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
-                        <SetVariable name="Size">16f,15f</SetVariable>
-                        <SetVariable name="state_0_pressed">stars_off.svg</SetVariable>
-                        <SetVariable name="state_0_unpressed">stars_off.svg</SetVariable>
-                        <SetVariable name="state_1_pressed">stars_visible.svg</SetVariable>
-                        <SetVariable name="state_1_unpressed">stars_visible.svg</SetVariable>
-                        <SetVariable name="ConfigKeyPerm">[Tango],stars</SetVariable>
-                      </Template>
+                      <WidgetGroup><!-- Star rating -->
+                        <Layout>stacked</Layout>
+                        <Size>16f,15f</Size>
+                        <Children>
+                          <!-- index 0 due to bug -->
+                          <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
+
+                          <WidgetGroup><!-- translucent cover when Stars wouldn't fit -->
+                            <ObjectName>SubmenuCover</ObjectName>
+                            <Layout>vertical</Layout>
+                            <Size>16f,15f</Size>
+                            <Connection>
+                              <ConfigKey persist="true">[Tango],stars_fit</ConfigKey>
+                              <Transform><Not/></Transform>
+                              <BindProperty>visible</BindProperty>
+                            </Connection>
+                          </WidgetGroup>
+
+                          <Template src="skin:button_2state_persist.xml">
+                            <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
+                            <SetVariable name="Size">16f,15f</SetVariable>
+                            <SetVariable name="state_0_pressed">stars_hidden.svg</SetVariable>
+                            <SetVariable name="state_0_unpressed">stars_hidden.svg</SetVariable>
+                            <SetVariable name="state_1_pressed">stars_visible.svg</SetVariable>
+                            <SetVariable name="state_1_unpressed">stars_visible.svg</SetVariable>
+                            <SetVariable name="ConfigKey">[Tango],stars</SetVariable>
+                          </Template>
+                        </Children>
+                      </WidgetGroup><!-- /Star rating -->
+
 
                       <WidgetGroup><Size>4f,0f</Size></WidgetGroup>
 
@@ -212,29 +307,33 @@ Description:
                         <SetVariable name="Size">28f,15f</SetVariable>
                         <SetVariable name="state_0_text">CUE</SetVariable>
                         <SetVariable name="state_1_text">CUE</SetVariable>
-                        <SetVariable name="ConfigKeyPerm">[Tango],separate_cue_button</SetVariable>
+                        <SetVariable name="ConfigKey">[Tango],separate_cue_button</SetVariable>
                       </Template>
                     </Children>
-                  </WidgetGroup>
+                  </WidgetGroup><!-- Permanent deck control icons -->
                 </Children>
-              </WidgetGroup>
-
+              </WidgetGroup><!-- /Permanent deck controls -->
             </Children>
-          </WidgetGroup>
+          </WidgetGroup><!-- /Decks / General -->
 
-          <Label><!-- Mixer Settings -->
+          <Label><!-- Mixer -->
             <ObjectName>CategoryLabel</ObjectName>
+            <Size>190f,19f</Size>
             <Text>Mixer</Text>
           </Label>
-          <WidgetGroup>
+          <WidgetGroup><!-- 5 buttons -->
             <ObjectName>SkinSettingsCategory</ObjectName>
+            <MinimumSize>182,72</MinimumSize>
+            <MaximumSize>-1,92</MaximumSize>
+            <SizePolicy>me,me</SizePolicy>
             <Layout>vertical</Layout>
-            <SizePolicy>f,max</SizePolicy>
             <Children>
-
               <WidgetGroup><!-- Channel mixer toggle + hint for big cover -->
-                <Layout>stacked</Layout>
-                <Size>182f,15f</Size>
+                <ObjectName>AlignLeft</ObjectName>
+                <Layout>horizontal</Layout>
+                <MinimumSize>182,13</MinimumSize>
+                <MaximumSize>-1,17</MaximumSize>
+                <SizePolicy>me,me</SizePolicy>
                 <Children>
                   <Template src="skin:skin_settings_button_2state.xml">
                     <SetVariable name="state_0_text">      Channel Mixer</SetVariable>
@@ -242,31 +341,53 @@ Description:
                     <SetVariable name="Setting">[Tango],channel_mixer</SetVariable>
                   </Template>
 
-                  <WidgetGroup><!-- Show hint when Channel mixer is visible -->
-                    <Layout>vertical</Layout>
-                    <SizePolicy>me,min</SizePolicy>
+                  <WidgetGroup><!-- Show hint when Big Cover was enabled but Channel mixer is visible -->
+                    <ObjectName>AlignLeft</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <MinimumSize>80,13</MinimumSize>
+                    <MaximumSize>80,17</MaximumSize>
+                    <SizePolicy>f,me</SizePolicy>
                     <Children>
-                      <Label>
-                        <ObjectName>CoverSpinnyHint</ObjectName>
-                        <Size>182f,15f</Size>
-                        <Text>                                   &#9664; !</Text>
+                      <WidgetGroup>
+                        <ObjectName>AlignLeft</ObjectName>
+                        <Layout>horizontal</Layout>
+                        <MinimumSize>80,13</MinimumSize>
+                        <MaximumSize>80,17</MaximumSize>
+                        <SizePolicy>f,me</SizePolicy>
+                        <Children>
+                          <Label>
+                            <ObjectName>CoverSpinnyHint</ObjectName>
+                            <MinimumSize>10,13</MinimumSize>
+                            <MaximumSize>10,13</MaximumSize>
+                            <SizePolicy>me,f</SizePolicy>
+                            <Text>&#9664;</Text>
+                            <Connection>
+                              <ConfigKey persist="true">[Tango],channel_mixer</ConfigKey>
+                              <BindProperty>visible</BindProperty>
+                            </Connection>
+                          </Label>
+                          <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
+                        </Children>
                         <Connection>
-                          <ConfigKey persist="true">[Tango],channel_mixer</ConfigKey>
+                          <ConfigKey persist="true">[Tango],spinnyCoverBIG</ConfigKey>
                           <BindProperty>visible</BindProperty>
                         </Connection>
-                      </Label>
+                      </WidgetGroup>
                     </Children>
                     <Connection>
-                      <ConfigKey persist="true">[Tango],spinnyCoverBIG</ConfigKey>
+                      <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
+                      <Transform><IsEqual>2</IsEqual><Not/></Transform>
                       <BindProperty>visible</BindProperty>
                     </Connection>
-                  </WidgetGroup>
+                  </WidgetGroup><!-- /Show hint when Channel mixer is visible -->
                 </Children>
               </WidgetGroup>
 
-              <WidgetGroup><!-- EQ & QuickEffect knobs submenu -->
+              <WidgetGroup><!-- EQ knobs -->
                 <Layout>stacked</Layout>
-                <Size>182f,30f</Size>
+                <MinimumSize>182,13</MinimumSize>
+                <MaximumSize>-1,17</MaximumSize>
+                <SizePolicy>me,me</SizePolicy>
                 <Children>
                   <!-- index 0 due to bug -->
                   <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
@@ -274,62 +395,28 @@ Description:
                   <WidgetGroup><!-- translucent cover when Channel Mixer is hidden -->
                     <ObjectName>SubmenuCover</ObjectName>
                     <Layout>vertical</Layout>
-                    <Size>182f,30f</Size>
-                    <Children/>
+                    <MinimumSize>182,13</MinimumSize>
+                    <MaximumSize>-1,17</MaximumSize>
+                    <SizePolicy>me,me</SizePolicy>
                     <Connection>
                       <ConfigKey persist="true">[Tango],channel_mixer</ConfigKey>
-                      <BindProperty>visible</BindProperty>
                       <Transform><Not/></Transform>
+                      <BindProperty>visible</BindProperty>
                     </Connection>
                   </WidgetGroup>
 
-                  <WidgetGroup><!-- EQ Knobs button -->
-                    <Layout>vertical</Layout>
-                    <Size>182f,30f</Size>
-                    <Children>
-
-                      <Template src="skin:skin_settings_button_2state.xml">
-                        <SetVariable name="state_0_text">      EQ Knobs</SetVariable>
-                        <SetVariable name="state_1_text"> &#10004; EQ Knobs</SetVariable>
-                        <SetVariable name="Setting">[Tango],eq_knobs</SetVariable>
-                      </Template>
-
-                      <WidgetGroup><!-- Filter knob submenu -->
-                        <Layout>stacked</Layout>
-                        <Size>182f,15f</Size>
-                        <Children>
-                          <!-- index 0 due to bug -->
-                          <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
-                          <WidgetGroup><!-- translucent cover when EQ Knobs are hidden -->
-                            <ObjectName>SubmenuCover</ObjectName>
-                            <Layout>vertical</Layout>
-                            <SizePolicy>me,me</SizePolicy>
-                            <Children/>
-                            <Connection>
-                              <ConfigKey persist="true">[Tango],eq_knobs</ConfigKey>
-                              <BindProperty>visible</BindProperty>
-                              <Transform><Not/></Transform>
-                            </Connection>
-                          </WidgetGroup>
-
-                          <Template src="skin:skin_settings_button_2state.xml">
-                            <SetVariable name="state_0_text">      Quick Effect Knob</SetVariable>
-                            <SetVariable name="state_1_text"> &#10004; Quick Effect Knob</SetVariable>
-                            <SetVariable name="Setting">[Tango],filter_knob</SetVariable>
-                          </Template>
-                        </Children>
-                      </WidgetGroup>
-
-                    </Children>
-                  </WidgetGroup><!-- EQ Knobs button --><!-- /Filter knob submenu -->
+                  <Template src="skin:skin_settings_button_2state.xml">
+                    <SetVariable name="state_0_text">      EQ Knobs</SetVariable>
+                    <SetVariable name="state_1_text"> &#10004; EQ Knobs</SetVariable>
+                    <SetVariable name="Setting">[Tango],eq_knobs</SetVariable>
+                  </Template>
 
                 </Children>
-              </WidgetGroup><!-- /EQ & Filter knobs submenu -->
+              </WidgetGroup><!-- /EQ knobs -->
 
               <Template src="skin:skin_settings_button_2state.xml">
-                <SetVariable name="state_0_text">      VU Meter</SetVariable>
-                <SetVariable name="state_1_text"> &#10004; VU Meter</SetVariable>
+                <SetVariable name="state_0_text">      Permanent Level Meters</SetVariable>
+                <SetVariable name="state_1_text"> &#10004; Permanent Level Meters</SetVariable>
                 <SetVariable name="Setting">[Tango],vumeter</SetVariable>
               </Template>
 
@@ -345,28 +432,41 @@ Description:
                 <SetVariable name="Setting">[Tango],mixerbar</SetVariable>
               </Template>
             </Children>
-          </WidgetGroup><!-- /Mixer Settings -->
+          </WidgetGroup><!-- /Mixer -->
 
-          <Label>
+          <Label><!-- Spinny / Cover -->
             <ObjectName>CategoryLabel</ObjectName>
+            <Size>190f,19f</Size>
             <Text>Spinny / Cover</Text>
           </Label>
-          <WidgetGroup><!-- Spinny Settings -->
+          <WidgetGroup><!-- 3 buttons -->
             <ObjectName>SkinSettingsCategory</ObjectName>
+            <MinimumSize>182,46</MinimumSize>
+            <MaximumSize>-1,58</MaximumSize>
+            <SizePolicy>me,me</SizePolicy>
             <Layout>vertical</Layout>
-            <SizePolicy>f,max</SizePolicy>
             <Children>
+              <WidgetGroup><!-- Spinny / Cover / Off -->
+                <MinimumSize>182,13</MinimumSize>
+                <MaximumSize>-1,17</MaximumSize>
+                <SizePolicy>me,me</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>14f,1min</Size></WidgetGroup>
+                  <Template src="skin:skin_settings_button_3state.xml">
+                    <SetVariable name="state_0_text"> [ Spinny &#9664;  Cover    Off ]</SetVariable>
+                    <SetVariable name="state_1_text"> [ Spinny  &#9654; Cover    Off ]</SetVariable>
+                    <SetVariable name="state_2_text"> [ Spinny    Cover  &#9654; Off ]</SetVariable>
+                    <SetVariable name="Setting">[Tango],spinny_cover_none</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup><!-- /Spinny / Cover / Off -->
 
-              <Template src="skin:skin_settings_button_3state.xml">
-                <SetVariable name="state_0_text">      [ Spinny &#9664;  Cover    Off ]</SetVariable>
-                <SetVariable name="state_1_text">      [ Spinny  &#9654; Cover    Off ]</SetVariable>
-                <SetVariable name="state_2_text">      [ Spinny    Cover  &#9654; Off ]</SetVariable>
-                <SetVariable name="Setting">[Tango],spinny_cover_none</SetVariable>
-              </Template>
-
-              <WidgetGroup><!-- Spinny/Cover small/BIG-->
+              <WidgetGroup><!-- BIG/small Spinny / Cover -->
+                <MinimumSize>182,13</MinimumSize>
+                <MaximumSize>-1,17</MaximumSize>
+                <SizePolicy>me,me</SizePolicy>
                 <Layout>stacked</Layout>
-                <Size>182f,15f</Size>
                 <Children>
                   <!-- index 0 due to bug -->
                   <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
@@ -375,60 +475,130 @@ Description:
                     <ObjectName>SubmenuCover</ObjectName>
                     <Layout>vertical</Layout>
                     <SizePolicy>me,me</SizePolicy>
-                    <Children/>
                     <Connection>
                       <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
-                      <BindProperty>visible</BindProperty>
                       <Transform><IsEqual>2</IsEqual></Transform>
+                      <BindProperty>visible</BindProperty>
                     </Connection>
                   </WidgetGroup>
 
-                  <WidgetGroup><!-- small/BIG button without Channel mixer -->
-                    <Layout>vertical</Layout>
-                    <Size>182f,15f</Size>
+                  <WidgetGroup><!-- BIG/small Spinny / Cover without ChannelMixer -->
+                    <MinimumSize>182,13</MinimumSize>
+                    <MaximumSize>-1,17</MaximumSize>
+                    <SizePolicy>me,me</SizePolicy>
+                    <Layout>horizontal</Layout>
                     <Children>
+                      <WidgetGroup><Size>14f,1min</Size></WidgetGroup>
                       <Template src="skin:skin_settings_button_2state.xml">
-                        <SetVariable name="state_0_text">      [ ° &#9664;  O ]</SetVariable>
-                        <SetVariable name="state_1_text">      [ °  &#9654; O ]</SetVariable>
+                        <SetVariable name="state_0_text"> [ ° &#9664;  O ]</SetVariable>
+                        <SetVariable name="state_1_text"> [ °  &#9654; O ]</SetVariable>
                         <SetVariable name="Setting">[Tango],spinnyCoverBIG</SetVariable>
                       </Template>
                     </Children>
-                  </WidgetGroup><!-- /small/BIG button without Channel mixer -->
-                </Children>
-              </WidgetGroup><!-- /Spinny/Cover small/BIG-->
-
-              <WidgetGroup><!-- Show hint when Channel mixer is visible -->
-                <Layout>vertical</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <Children>
-                  <Label>
-                    <ObjectName>CoverSpinnyHint</ObjectName>
-                    <Size>182f,15f</Size>
-                    <Text>      hide Channel Mixer</Text>
                     <Connection>
                       <ConfigKey persist="true">[Tango],channel_mixer</ConfigKey>
+                      <Transform><Not/></Transform>
                       <BindProperty>visible</BindProperty>
                     </Connection>
-                  </Label>
-                  <Label>
-                    <ObjectName>CoverSpinnyHint</ObjectName>
-                    <Size>182f,15f</Size>
-                    <Text>      to see big Cover/Spinny</Text>
+                  </WidgetGroup><!-- /BIG/small Spinny / Cover without ChannelMixer -->
+
+                  <WidgetGroup><!-- BIG/small Spinny / Cover-->
+                    <MinimumSize>182,13</MinimumSize>
+                    <MaximumSize>-1,17</MaximumSize>
+                    <SizePolicy>me,me</SizePolicy>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                      <WidgetGroup><Size>14f,1min</Size></WidgetGroup>
+                      <PushButton>
+                        <ObjectName>SkinSettingsButton</ObjectName>
+                        <MinimumSize>16,13</MinimumSize>
+                        <MaximumSize>16,17</MaximumSize>
+                        <SizePolicy>f,me</SizePolicy>
+                        <NumberStates>2</NumberStates>
+                        <RightClickIsPushButton>false</RightClickIsPushButton>
+                        <State>
+                          <Number>0</Number>
+                          <Text> [ ° </Text>
+                          <Alignment>left</Alignment>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text> [ ° </Text>
+                          <Alignment>left</Alignment>
+                        </State>
+                        <Connection>
+                          <ConfigKey persist="true">[Tango],spinnyCoverBIG</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                      </PushButton>
+                      <WidgetGroup><!-- disabled BIG cover/spinny with hint -->
+                        <Layout>stacked</Layout>
+                        <MinimumSize>70,13</MinimumSize>
+                        <MaximumSize>-1,17</MaximumSize>
+                        <SizePolicy>me,me</SizePolicy>
+                        <Children>
+                          <WidgetGroup>
+                            <SizePolicy>me,me</SizePolicy>
+                            <Layout>horizontal</Layout>
+                            <Children>
+                              <Label>
+                                <ObjectName>CoverSpinnyHint</ObjectName>
+                                <MinimumSize>70,13</MinimumSize>
+                                <MaximumSize>-1,13</MaximumSize>
+                                <SizePolicy>me,f</SizePolicy>
+                                <Text>     !</Text>
+                                <Connection>
+                                  <ConfigKey persist="true">[Tango],spinnyCoverBIG</ConfigKey>
+                                  <BindProperty>visible</BindProperty>
+                                </Connection>
+                              </Label>
+                              <WidgetGroup><SizePolicy>me,me</SizePolicy></WidgetGroup>
+                            </Children>
+                          </WidgetGroup>
+                          <WidgetGroup>
+                            <ObjectName>SubmenuCover</ObjectName>
+                            <MinimumSize>70,13</MinimumSize>
+                            <MaximumSize>-1,17</MaximumSize>
+                            <SizePolicy>me,me</SizePolicy>
+                          </WidgetGroup>
+                          <PushButton>
+                            <ObjectName>SkinSettingsButton</ObjectName>
+                            <MinimumSize>70,13</MinimumSize>
+                            <MaximumSize>-1,17</MaximumSize>
+                            <SizePolicy>me,me</SizePolicy>
+                            <NumberStates>2</NumberStates>
+                            <RightClickIsPushButton>false</RightClickIsPushButton>
+                            <State>
+                              <Number>0</Number>
+                              <Text>&#9664;  O ] (automatic)</Text>
+                              <Alignment>left</Alignment>
+                            </State>
+                            <State>
+                              <Number>1</Number>
+                              <Text>&#9664;      ] (automatic)</Text>
+                              <Alignment>left</Alignment>
+                            </State>
+                            <Connection>
+                              <ConfigKey persist="true">[Tango],spinnyCoverBIG</ConfigKey>
+                              <ButtonState>LeftButton</ButtonState>
+                            </Connection>
+                          </PushButton>
+                        </Children>
+                      </WidgetGroup><!-- /disabled BIG cover/spinny with hint -->
+                    </Children>
                     <Connection>
                       <ConfigKey persist="true">[Tango],channel_mixer</ConfigKey>
                       <BindProperty>visible</BindProperty>
                     </Connection>
-                  </Label>
+                  </WidgetGroup><!-- /BIG/small Spinny / Cover without ChannelMixer -->
                 </Children>
-                <Connection>
-                  <ConfigKey persist="true">[Tango],spinnyCoverBIG</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
+              </WidgetGroup><!-- /Spinny / Cover / Off -->
 
               <WidgetGroup><!-- Spinny/Cover Cover on Spinny-->
                 <Layout>stacked</Layout>
-                <Size>182f,15f</Size>
+                <MinimumSize>50,13</MinimumSize>
+                <MaximumSize>-1,17</MaximumSize>
+                <SizePolicy>me,me</SizePolicy>
                 <Children>
                   <!-- index 0 due to bug -->
                   <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
@@ -437,53 +607,67 @@ Description:
                     <ObjectName>SubmenuCover</ObjectName>
                     <Layout>vertical</Layout>
                     <SizePolicy>me,me</SizePolicy>
-                    <Children/>
                     <Connection>
                       <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
-                      <BindProperty>visible</BindProperty>
                       <Transform><IsEqual>0</IsEqual><Not/></Transform>
+                      <BindProperty>visible</BindProperty>
                     </Connection>
                   </WidgetGroup>
 
-                  <WidgetGroup><!-- SpinnyCover submenu buttons -->
-                    <Layout>vertical</Layout>
-                    <Size>182f,15f</Size>
-                    <Children>
-                      <Template src="skin:skin_settings_button_2state.xml">
-                        <SetVariable name="state_0_text">      Cover on Spinny</SetVariable>
-                        <SetVariable name="state_1_text"> &#10004; Cover on Spinny</SetVariable>
-                        <SetVariable name="Setting">[Tango],spinnyWithCoverArt</SetVariable>
-                      </Template>
-                    </Children>
-                  </WidgetGroup><!-- Spinny/Cover submenu buttons -->
+                  <Template src="skin:skin_settings_button_2state.xml">
+                    <SetVariable name="state_0_text">      Cover on Spinny</SetVariable>
+                    <SetVariable name="state_1_text"> &#10004; Cover on Spinny</SetVariable>
+                    <SetVariable name="Setting">[Tango],spinnyWithCoverArt</SetVariable>
+                  </Template>
                 </Children>
               </WidgetGroup><!-- /Spinny/Cover Cover on Spinny-->
 
             </Children>
-          </WidgetGroup><!-- /Spinny Settings -->
+          </WidgetGroup><!-- /Spinny / Cover -->
 
           <Label><!-- Effects -->
             <ObjectName>CategoryLabel</ObjectName>
+            <Size>190f,19f</Size>
             <Text>Effects</Text>
           </Label>
-          <WidgetGroup>
+          <WidgetGroup><!-- 3 buttons, 1 commented out -->
             <ObjectName>SkinSettingsCategory</ObjectName>
+            <!-- <MinimumSize>182,59</MinimumSize>
+            <MaximumSize>-1,73</MaximumSize> -->
+            <MinimumSize>182,46</MinimumSize>
+            <MaximumSize>-1,58</MaximumSize>
+            <SizePolicy>me,me</SizePolicy>
             <Layout>vertical</Layout>
-            <SizePolicy>f,max</SizePolicy>
             <Children>
+              <WidgetGroup>
+                <MinimumSize>182,13</MinimumSize>
+                <MaximumSize>-1,17</MaximumSize>
+                <SizePolicy>me,me</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>14f,1min</Size></WidgetGroup>
+                  <Template src="skin:skin_settings_button_2state.xml">
+                    <SetVariable name="state_0_text"> [ 2 &#9664;  4 ]  Effect Units</SetVariable>
+                    <SetVariable name="state_1_text"> [ 2  &#9654; 4 ]  Effect Units</SetVariable>
+                    <SetVariable name="Setting">[Tango],2or4_FxUnits</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
 
               <Template src="skin:skin_settings_button_2state.xml">
-                <SetVariable name="state_0_text">      [ 2 &#9664;  4 ]  Effect Units</SetVariable>
-                <SetVariable name="state_1_text">      [ 2  &#9654; 4 ]  Effect Units</SetVariable>
-                <SetVariable name="Setting">[Tango],2or4_fxUnits</SetVariable>
+                <SetVariable name="state_0_text">      Super Knobs</SetVariable>
+                <SetVariable name="state_1_text"> &#10004; Super Knobs</SetVariable>
+                <SetVariable name="Setting">[Tango],fx_super_knob</SetVariable>
               </Template>
 
+              <!-- Buttons in samplers were removed for now
               <Template src="skin:skin_settings_button_2state.xml">
                 <SetVariable name="state_0_text">      Sampler FX buttons</SetVariable>
                 <SetVariable name="state_1_text"> &#10004; Sampler FX buttons</SetVariable>
                 <SetVariable name="Setting">[Tango],sampler_fx_buttons</SetVariable>
               </Template>
-
+              -->
               <Template src="skin:skin_settings_button_2state.xml">
                 <SetVariable name="state_0_text">      Mic/AUX FX buttons</SetVariable>
                 <SetVariable name="state_1_text"> &#10004; Mic/AUX FX buttons</SetVariable>
@@ -495,12 +679,15 @@ Description:
 
           <Label><!-- Extras -->
             <ObjectName>CategoryLabel</ObjectName>
+            <Size>190f,19f</Size>
             <Text>Extras</Text>
           </Label>
           <WidgetGroup>
             <ObjectName>SkinSettingsCategory</ObjectName>
+            <MinimumSize>182,46</MinimumSize>
+            <MaximumSize>-1,58</MaximumSize>
+            <SizePolicy>me,me</SizePolicy>
             <Layout>vertical</Layout>
-            <SizePolicy>f,max</SizePolicy>
             <Children>
 
               <Template src="skin:skin_settings_button_2state.xml">
@@ -509,34 +696,48 @@ Description:
                 <SetVariable name="Setting">[PreviewDeck],show_previewdeck</SetVariable>
               </Template>
 
-              <Template src="skin:skin_settings_sampler_rows.xml"/>
-          
               <WidgetGroup>
+                <MinimumSize>182,13</MinimumSize>
+                <MaximumSize>-1,17</MaximumSize>
+                <SizePolicy>me,me</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><Size>14f,1min</Size></WidgetGroup>
+                  <Template src="skin:skin_settings_sampler_rows.xml"/>
+                </Children>
+              </WidgetGroup>
+          
+              <WidgetGroup><!-- Load/Save Sampler Bank -->
                 <ObjectName>AlignLeft</ObjectName>
                 <Layout>horizontal</Layout>
-                <Size>182f,15f</Size>
+                <MinimumSize>50,13</MinimumSize>
+                <MaximumSize>-1,17</MaximumSize>
+                <SizePolicy>me,max</SizePolicy>
                 <Children>
+                  <WidgetGroup><Size>14f,13me</Size></WidgetGroup>
                   <Template src="skin:button_1state.xml">
                     <SetVariable name="ObjectName">SkinSettingsButton</SetVariable>
-                    <SetVariable name="Size">50f,15f</SetVariable>
-                    <SetVariable name="state_0_text">      Load /</SetVariable>
+                    <SetVariable name="Size">31f,17f</SetVariable>
+                    <SetVariable name="state_0_text"> Load /</SetVariable>
                     <SetVariable name="Align">left</SetVariable>
                     <SetVariable name="ConfigKey">[Sampler],LoadSamplerBank</SetVariable>
                   </Template>
+                  <Label>
+                    <Text> / </Text>
+                  </Label>
                   <Template src="skin:button_1state.xml">
                     <SetVariable name="ObjectName">SkinSettingsButton</SetVariable>
-                    <SetVariable name="Size">122f,15f</SetVariable>
-                    <SetVariable name="state_0_text"> Save Sampler Banks</SetVariable>
+                    <SetVariable name="Size">110me,17f</SetVariable>
+                    <SetVariable name="state_0_text"> Save Sampler Bank</SetVariable>
                     <SetVariable name="Align">left</SetVariable>
                     <SetVariable name="ConfigKey">[Sampler],SaveSamplerBank</SetVariable>
                   </Template>
                 </Children>
-              </WidgetGroup>
-
+              </WidgetGroup><!-- /Load/Save Sampler Bank -->
             </Children>
           </WidgetGroup><!-- /Extras -->
         </Children>
-      </WidgetGroup><!-- SkinSettings -->
+      </WidgetGroup><!-- /SkinSettings -->
     </Children>
     <Connection>
       <ConfigKey>[Tango],skin_settings</ConfigKey>
diff --git a/res/skins/Tango/skin_settings_button_2state.xml b/res/skins/Tango/skin_settings_button_2state.xml
index 08e0d3f8eb1e..06b4796dccc9 100644
--- a/res/skins/Tango/skin_settings_button_2state.xml
+++ b/res/skins/Tango/skin_settings_button_2state.xml
@@ -1,6 +1,7 @@
 <!--
 Description:
   2-state button for skin settings menu.
+  Can be squeezed so that all skin settings categories fit on small screens.
 Variables:
   state_X_text  : label text for state X
   Setting       : persistent left-click control
@@ -8,7 +9,9 @@ Variables:
 <Template>
   <PushButton>
     <ObjectName>SkinSettingsButton</ObjectName>
-    <Size>182f,15f</Size>
+    <MinimumSize>20,13</MinimumSize>
+    <MaximumSize>182,17</MaximumSize>
+    <SizePolicy>me,me</SizePolicy>
     <NumberStates>2</NumberStates>
     <RightClickIsPushButton>false</RightClickIsPushButton>
     <State>
diff --git a/res/skins/Tango/skin_settings_button_3state.xml b/res/skins/Tango/skin_settings_button_3state.xml
index 1af61a0f258a..5190f83169be 100644
--- a/res/skins/Tango/skin_settings_button_3state.xml
+++ b/res/skins/Tango/skin_settings_button_3state.xml
@@ -8,7 +8,9 @@ Variables:
 <Template>
   <PushButton>
     <ObjectName>SkinSettingsButton</ObjectName>
-    <Size>182f,15f</Size>
+    <MinimumSize>20,13</MinimumSize>
+    <MaximumSize>182,17</MaximumSize>
+    <SizePolicy>me,me</SizePolicy>
     <NumberStates>3</NumberStates>
     <RightClickIsPushButton>false</RightClickIsPushButton>
     <State>
diff --git a/res/skins/Tango/skin_settings_button_4state.xml b/res/skins/Tango/skin_settings_button_4state.xml
deleted file mode 100644
index ed99751e3bae..000000000000
--- a/res/skins/Tango/skin_settings_button_4state.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-Description:
-  4-state button for skin settings menu.
-Variables:
-  state_X_text  : label text for state X
-  Setting       : persistent left-click control
--->
-<Template>
-  <PushButton>
-    <ObjectName>SkinSettingsButton</ObjectName>
-    <Size>182f,15f</Size>
-    <NumberStates>4</NumberStates>
-    <RightClickIsPushButton>false</RightClickIsPushButton>
-    <State>
-      <Number>0</Number>
-      <Text><Variable name="state_0_text"/></Text>
-      <Alignment>left</Alignment>
-    </State>
-    <State>
-      <Number>1</Number>
-      <Text><Variable name="state_1_text"/></Text>
-      <Alignment>left</Alignment>
-    </State>
-    <State>
-      <Number>2</Number>
-      <Text><Variable name="state_2_text"/></Text>
-      <Alignment>left</Alignment>
-    </State>
-    <State>
-      <Number>3</Number>
-      <Text><Variable name="state_3_text"/></Text>
-      <Alignment>left</Alignment>
-    </State>
-    <Connection>
-      <ConfigKey persist="true"><Variable name="Setting"/></ConfigKey>
-      <ButtonState>LeftButton</ButtonState>
-    </Connection>
-  </PushButton>
-</Template>
diff --git a/res/skins/Tango/skin_settings_button_sampler_rows.xml b/res/skins/Tango/skin_settings_button_sampler_rows.xml
index 95aba7ecc53e..fbd87e9c37d5 100644
--- a/res/skins/Tango/skin_settings_button_sampler_rows.xml
+++ b/res/skins/Tango/skin_settings_button_sampler_rows.xml
@@ -8,11 +8,13 @@ Description:
 <Template>
   <PushButton>
     <ObjectName>SkinSettingsButton</ObjectName>
-    <Size>182f,15f</Size>
+    <MinimumSize>160,13</MinimumSize>
+    <MaximumSize>182,17</MaximumSize>
+    <SizePolicy>min,me</SizePolicy>
     <NumberStates>1</NumberStates>
     <State>
       <Number>0</Number>
-      <Text>      [ <Variable name="current"/> ] Sampler Rows</Text>
+      <Text> [ <Variable name="current"/> ] Sampler Rows</Text>
       <Alignment>left</Alignment>
     </State>
     <Connection>
diff --git a/res/skins/Tango/skin_settings_sampler_rows.xml b/res/skins/Tango/skin_settings_sampler_rows.xml
index 63a727d1a1b7..b9d3db78c408 100644
--- a/res/skins/Tango/skin_settings_sampler_rows.xml
+++ b/res/skins/Tango/skin_settings_sampler_rows.xml
@@ -7,11 +7,13 @@ Description:
 -->
 <Template>
   <WidgetStack currentpage="[Tango],sampler_rows" persist="true">
+    <Size>160me,13min</Size>
     <NextControl>[Tango],sampler_bank_next</NextControl>
     <PrevControl>[Tango],sampler_bank_prev</PrevControl>
     <Children>
 
       <WidgetGroup>
+        <ObjectName>AlignLeft</ObjectName>
         <Layout>horizontal</Layout>
         <Children>
           <Template src="skin:skin_settings_button_sampler_rows.xml">
@@ -23,6 +25,7 @@ Description:
       </WidgetGroup>
 
       <WidgetGroup>
+        <ObjectName>AlignLeft</ObjectName>
         <Layout>horizontal</Layout>
         <Children>
           <Template src="skin:skin_settings_button_sampler_rows.xml">
@@ -34,6 +37,7 @@ Description:
       </WidgetGroup>
 
       <WidgetGroup>
+        <ObjectName>AlignLeft</ObjectName>
         <Layout>horizontal</Layout>
         <Children>
           <Template src="skin:skin_settings_button_sampler_rows.xml">
@@ -45,6 +49,7 @@ Description:
       </WidgetGroup>
 
       <WidgetGroup>
+        <ObjectName>AlignLeft</ObjectName>
         <Layout>horizontal</Layout>
         <Children>
           <Template src="skin:skin_settings_button_sampler_rows.xml">
@@ -56,6 +61,7 @@ Description:
       </WidgetGroup>
 
       <WidgetGroup>
+        <ObjectName>AlignLeft</ObjectName>
         <Layout>horizontal</Layout>
         <Children>
           <Template src="skin:skin_settings_button_sampler_rows.xml">
@@ -67,6 +73,7 @@ Description:
       </WidgetGroup>
 
       <WidgetGroup>
+        <ObjectName>AlignLeft</ObjectName>
         <Layout>horizontal</Layout>
         <Children>
           <Template src="skin:skin_settings_button_sampler_rows.xml">
@@ -78,6 +85,7 @@ Description:
       </WidgetGroup>
 
       <WidgetGroup>
+        <ObjectName>AlignLeft</ObjectName>
         <Layout>horizontal</Layout>
         <Children>
           <Template src="skin:skin_settings_button_sampler_rows.xml">
@@ -89,6 +97,7 @@ Description:
       </WidgetGroup>
 
       <WidgetGroup>
+        <ObjectName>AlignLeft</ObjectName>
         <Layout>horizontal</Layout>
         <Children>
           <Template src="skin:skin_settings_button_sampler_rows.xml">
diff --git a/res/skins/Tango/spacer_fx_units.xml b/res/skins/Tango/spacer_fx_units.xml
new file mode 100644
index 000000000000..3901a23a7ed3
--- /dev/null
+++ b/res/skins/Tango/spacer_fx_units.xml
@@ -0,0 +1,80 @@
+<!--
+Description:
+  Horizontal spacers between EffectUnits.
+  In 'netbook mode' or manually chosen 'compact mode' it's fixed.
+  In normal mode there are several optional spacers, i.e. for VU meter to
+  align FX units to decks' channel mixer or cover art.
+-->
+<Template>
+  <WidgetGroup>
+    <SizePolicy>min,max</SizePolicy>
+    <Layout>horizontal</Layout>
+    <Children>
+      <WidgetGroup><!-- Spacers for normal width -->
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup><!-- FX label offset, master VU -->
+            <Size>56f,1min</Size>
+          </WidgetGroup>
+
+          <WidgetGroup> <!-- Pitch fader spacer -->
+            <Size>106f,1min</Size>
+            <Connection>
+              <ConfigKey>[Tango],pitch_fader</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <WidgetGroup><!-- VU Meter spacer when Channel Mixer is hidden -->
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <!-- floating channel + master level meters -->
+              <WidgetGroup>
+                <Layout>vertical</Layout>
+                <Size>48f,1min</Size>
+                <Children>
+                </Children>
+                <Connection>
+                  <ConfigKey>[Tango],vumeter</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey>[Tango],channel_mixer</ConfigKey>
+              <BindProperty>visible</BindProperty>
+              <Transform><Not/></Transform>
+            </Connection>
+          </WidgetGroup>
+
+          <WidgetGroup><!-- Master VU Meter spacer when Channel Mixer is visible -->
+            <Layout>vertical</Layout>
+            <Size>22f,1min</Size>
+            <Children>
+            </Children>
+            <Connection>
+              <ConfigKey>[Tango],channel_mixer</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+        </Children>
+        <Connection>
+          <ConfigKey>[Tango],normal_mode</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /Spacers for normal width -->
+
+      <WidgetGroup><!-- Spacer for netbook mode -->
+        <Size>10f,1min</Size>
+        <Connection>
+          <ConfigKey>[Tango],netbook_mode</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+    </Children>
+  </WidgetGroup><!-- /EffectUnits 3 & 4 -->
+</Template>
diff --git a/res/skins/Tango/spacer_responsive_filler.xml b/res/skins/Tango/spacer_responsive_filler.xml
new file mode 100644
index 000000000000..c4136129e1d5
--- /dev/null
+++ b/res/skins/Tango/spacer_responsive_filler.xml
@@ -0,0 +1,22 @@
+<!--
+Description:
+  An expanding filler that appears only if more than XY pixels are available
+Variables:
+  Size  : Size/SizePolicy for the whole container
+  Color : Abbreviated hex color code for the filler, see style.qss
+-->
+<Template>
+  <SizeAwareStack>
+    <Size><Variable name="Size"/></Size>
+    <Children>
+      <WidgetGroup>
+        <MinimumSize>0,0</MinimumSize>
+        <MaximumSize>15,-1</MaximumSize>
+      </WidgetGroup>
+      <WidgetGroup>
+        <ObjectName>RoundFiller<Variable name="Color"/></ObjectName>
+        <MinimumSize>16,-1</MinimumSize>
+      </WidgetGroup>
+    </Children>
+  </SizeAwareStack>
+</Template>
diff --git a/res/skins/Tango/spacer_topbar_netbook.xml b/res/skins/Tango/spacer_topbar_netbook.xml
new file mode 100644
index 000000000000..283c62afa5b8
--- /dev/null
+++ b/res/skins/Tango/spacer_topbar_netbook.xml
@@ -0,0 +1,86 @@
+<!--
+Description:
+  Horizontal spacers between left & right icon bar at the top edge.
+  Height is zero in order to use it in a vertical stack without consuming space.  
+-->
+<Template>
+  <WidgetGroup>
+    <SizePolicy>max,0f</SizePolicy>
+    <Layout>horizontal</Layout>
+    <Children>
+
+      <WidgetGroup><!-- Spacer between decks -->
+        <Size>12f,0f</Size>
+      </WidgetGroup>
+
+      <WidgetGroup><!-- Pitch fader spacer -->
+        <Size>106f,0f</Size>
+        <Connection>
+          <ConfigKey>[Tango],pitch_fader</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup><!-- VU Meter + Cover/Spinny when Channel Mixer is hidden -->
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <Size>48f,0f</Size>
+            <Connection>
+              <ConfigKey>[Tango],vumeter</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Size>228f,0f</Size>
+                <Connection>
+                  <ConfigKey>[Tango],spinny_cover_none</ConfigKey>
+                  <Transform><IsEqual>2</IsEqual><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey>[Tango],spinnyCoverBIG</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey>[Tango],channel_mixer</ConfigKey>
+          <BindProperty>visible</BindProperty>
+          <Transform><Not/></Transform>
+        </Connection>
+      </WidgetGroup><!-- /VU Meter + Cover/Spinny when Channel Mixer is hidden -->
+
+      <WidgetGroup><!-- Channel Mixer, optional VU meter, EQs and Filter knobs -->
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <WidgetGroup><!-- Basic mixer incl. VU Meter (channel & master) -->
+            <Layout>horizontal</Layout>
+            <Size>158f,0f</Size>
+          </WidgetGroup>
+          <WidgetGroup><!-- EQ knobs -->
+            <Layout>horizontal</Layout>
+            <Size>96f,0f</Size>
+            <Connection>
+              <ConfigKey>[Tango],eq_knobs</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey>[Tango],channel_mixer</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /Channel Mixer, EQs and Filter knobs -->
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Tango/spinnyCover.xml b/res/skins/Tango/spinnyCover.xml
index 565cc5bc94f6..954d3951b1b5 100644
--- a/res/skins/Tango/spinnyCover.xml
+++ b/res/skins/Tango/spinnyCover.xml
@@ -14,6 +14,7 @@ Variables:
 
       <!-- spinny -->
       <WidgetGroup>
+        <ObjectName>SpinnyCover_Container</ObjectName>
         <Size>111f,111f</Size>
         <Layout>vertical</Layout>
         <Children>
@@ -71,7 +72,6 @@ Variables:
       <!-- none -->
       <WidgetGroup>
         <Size>0f,0f</Size>
-        <Children/>
         <Connection>
           <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
           <Transform><IsEqual>2</IsEqual></Transform>
diff --git a/res/skins/Tango/spinnyCover_mini.xml b/res/skins/Tango/spinnyCover_mini.xml
index f176b71f3a95..60cd7c6b1b86 100644
--- a/res/skins/Tango/spinnyCover_mini.xml
+++ b/res/skins/Tango/spinnyCover_mini.xml
@@ -74,7 +74,6 @@ Variables:
       <!-- none -->
       <WidgetGroup>
         <Size>0f,0f</Size>
-        <Children/>
         <Connection>
           <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
           <Transform><IsEqual>2</IsEqual></Transform>
diff --git a/res/skins/Tango/statuslight_4state.xml b/res/skins/Tango/statuslight_4state.xml
new file mode 100644
index 000000000000..d1e138bb25e2
--- /dev/null
+++ b/res/skins/Tango/statuslight_4state.xml
@@ -0,0 +1,31 @@
+<!--
+Description:
+  An indicator for example for control vinyl status
+Variables:
+  ObjectName        : object name
+  Size              : button size
+  ConfigKeyDisp     : display control
+-->
+<Template>
+  <PushButton>
+    <ObjectName><Variable name="ObjectName"/></ObjectName>
+    <Size><Variable name="Size"/></Size>
+    <NumberStates>4</NumberStates>
+    <State>
+      <Number>0</Number>
+    </State>
+    <State>
+      <Number>1</Number>
+    </State>
+    <State>
+      <Number>2</Number>
+    </State>
+    <State>
+      <Number>3</Number>
+    </State>
+    <Connection>
+      <ConfigKey><Variable name="ConfigKeyDisp"/></ConfigKey>
+      <ConnectValueFromWidget>false</ConnectValueFromWidget>
+    </Connection>
+  </PushButton>
+</Template>
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 088cccd964b5..d4585c5ad9ca 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -16,7 +16,11 @@
   qproperty-layoutAlignment: 'AlignRight | AlignTop';
 }
 
-WWidget, WLabel, WNumber, WTrackProperty, WBeatSpinBox {
+WWidget,
+WLabel,
+WNumber,
+WTrackProperty,
+WBeatSpinBox {
   font-family: Ubuntu;
   font-weight: normal;
   font-size: 12px/12px;
@@ -33,19 +37,12 @@ WWidgetGroup {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
 }
 
-#Library_Samplers_0, #Library_Samplers_1, #Library_Samplers_2, #Library_Samplers_3 {
-  margin-top: 3px;
-}
-/* #Library_Samplers_1 is a WidgetStack, so exclude it here */
-#Library_Samplers_0, #Library_Samplers_2, #Library_Samplers_3 {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-}
-
 #WaveformSplitter::handle:vertical {
   height: 4px;
   image: url(skin:/graphics/splitterVert_handle.png);
   }
-  #WaveformSplitter::handle:vertical:hover, #WaveformSplitter::handle:vertical:pressed {
+  #WaveformSplitter::handle:vertical:hover,
+  #WaveformSplitter::handle:vertical:pressed {
     image: url(skin:/graphics/splitterVert_handle_pressed.png);
   }
 
@@ -53,30 +50,34 @@ WWidgetGroup {
 /* ################################################################
 ####### Colors ##################################################
 ###############################################################*/
-    
-#Deck1 WLabel, #RateContainer1 WLabel,
+
+#Deck1 WLabel,#RateContainer1 WLabel,
 #Deck2 WLabel, #RateContainer2 WLabel {
-  color: #33a8ff;	/* SignalColor: #159bff		> decks_left.xml */
+  color: #33a8ff;
 }
 #Deck3 WLabel, #RateContainer3 WLabel,
 #Deck4 WLabel, #RateContainer4 WLabel {
-  color: #d910f0;	/* SignalColor: #df4df0		> decks_right.xml */
+  color: #d910f0;
 }
 
-#WaveformContainer1, #WaveformContainer2 {
+#WaveformContainer1,
+#WaveformContainer2 {
   background-color: #001D33;
 }
-#WaveformContainer3, #WaveformContainer4 {
+#WaveformContainer3,
+#WaveformContainer4 {
   background-color: #3A0440;
 }
 
 /*	Define background-color here to make VinylToggler match
   the waveforms background-color.
   spinnyMini_Xmask.svg must match as well. */
-#DeckOverview1, #DeckOverview2 {
+#DeckOverview1,
+#DeckOverview2 {
   background-color: #001D33;
 }
-#DeckOverview3, #DeckOverview4 {
+#DeckOverview3,
+#DeckOverview4 {
   background-color: #3A0440;
 }
 
@@ -101,13 +102,16 @@ WWidgetGroup {
   padding-right: 2px;
   }
   #SkinSettingsClose {
-    font-size: 16px/16px;
-    margin-bottom: 7px;
-    color: #d2d2d2;
+    border-radius:2px;
+    margin-bottom: 4px;
+    background-color: transparent;
+    image: url(skin:/buttons/btn_skinsettings_close.svg) no-repeat center top;
     }
     #SkinSettingsClose:hover {
-      border: 1px solid #666666;
       border-radius:2px;
+      margin-bottom: 4px;
+      background-color: #0f0f0f;
+      image: url(skin:/buttons/btn_skinsettings_close_hover.svg) no-repeat center top;
     }
 
 #SkinSettingsCategory {
@@ -125,27 +129,20 @@ WWidgetGroup {
     background-color: none;
     border-top: none;
   }
-  #SubmenuCover {
-    background-color: rgba(51, 51, 51, 127);
-  }
-  #SkinSettingsButton {
-    padding-top: 1px;
-    font-size: 12px/14px;
-    color: #d2d2d2;
-  }
-  #CoverSpinnyHint {
-    padding-top: 1px;
-    font-size: 12px/14px;
-    color: #f56200;
+
+#SkinSettingsButton {
+  padding-top: 1px;
+  font-size: 12px/14px;
+  color: #d2d2d2;
   }
   #SkinSettingsButton:hover {
     background: #151515;
   }
-  #DeckIndicatorSettings {
-    margin-left: 17px;
-  }
-  #DeckButtonVisibility {
-    margin-right: 1px;
+#DeckIndicatorSettings {
+  margin-left: 17px;
+}
+#DeckButtonVisibility {
+  margin-right: 1px;
   }
   #DeckButtonVisibility[displayValue="0"] {
     color: #888888;
@@ -158,6 +155,15 @@ WWidgetGroup {
   #DeckButtonVisibility[displayValue="1"]:hover {
     border: 1px solid #d2d2d2;
   }
+#SubmenuCover {
+  background-color: rgba(51, 51, 51, 127);
+}
+#CoverSpinnyHint {
+  font-family: "Times New Roman", serif;
+  font-size: 14px/14px;
+  font-weight: bold;
+  color: #f56200;
+}
 
 
 
@@ -166,45 +172,61 @@ WWidgetGroup {
 ##############################################################*/
 
 /* Also, see color definition above. */
-#WaveformContainer1, #WaveformContainer2, #WaveformContainer3, #WaveformContainer4 {
+#WaveformContainer1,
+#WaveformContainer2,
+#WaveformContainer3,
+#WaveformContainer4 {
 /* this will shift waveforms' center position to the left.
   Useful to 'look ahead' further (who cares about history, ha?)
   margin-left: -350px;	*/
   qproperty-layoutAlignment: 'AlignVCenter';
 }
 
-#Waveform {
-}
-
 #BeatgridButtonToggler {
   background-color: #333333;
   }
-  #BeatgridButtonToggler:hover {
-    background-color: #1e1e1e;
-  }
   #BeatgridButtonToggler[displayValue="0"] {
-    image: url(skin:/buttons/btn_arrow_left_thin.svg) no-repeat center center;
+    image: url(skin:/buttons/btn_arrow_left.svg) no-repeat center center;
   }
   #BeatgridButtonToggler[displayValue="0"]:hover {
-    image: url(skin:/buttons/btn_arrow_left_thin_hover.svg) no-repeat center center;
+    image: url(skin:/buttons/btn_arrow_left_hover.svg) no-repeat center center;
   }
 #BeatgridButtonToggler[displayValue="1"] {
-  image: url(skin:/buttons/btn_arrow_right_thin.svg) no-repeat center center;
+  image: url(skin:/buttons/btn_arrow_right.svg) no-repeat center center;
 }
   #BeatgridButtonToggler[displayValue="1"]:hover {
-    image: url(skin:/buttons/btn_arrow_right_thin_hover.svg) no-repeat center center;
+    image: url(skin:/buttons/btn_arrow_right_hover.svg) no-repeat center center;
   }
 
-#BeatgridButtonBox {
-  background-color: #0f0f0f;
+#BeatgridCurpos,
+#BeatgridSlower,
+#BeatgridFaster,
+#BeatgridEarlier,
+#BeatgridLater {
+  background-color: #333333;
+  }
+  #BeatgridCurpos:hover,
+  #BeatgridSlower:hover,
+  #BeatgridFaster:hover,
+  #BeatgridEarlier:hover,
+  #BeatgridLater:hover {
+    background-color: #0f0f0f;
+  }
+  #BeatgridCurpos {
+    image: url(skin:/buttons/btn_beats_curpos.svg) no-repeat center center;
+  }
+  #BeatgridSlower {
+    image: url(skin:/buttons/btn_beats_slower.svg) no-repeat center center;
+  }
+  #BeatgridFaster {
+    image: url(skin:/buttons/btn_beats_faster.svg) no-repeat center center;
+  }
+  #BeatgridEarlier {
+    image: url(skin:/buttons/btn_beats_earlier.svg) no-repeat center center;
+  }
+  #BeatgridLater {
+    image: url(skin:/buttons/btn_beats_later.svg) no-repeat center center;
   }
-  #BeatgridButton {
-    background-color: #333333;
-    }
-    #BeatgridButton:hover {
-      background-color: #1e1e1e;
-      border: 1px solid #666666;
-    }
 
 
 
@@ -212,7 +234,7 @@ WWidgetGroup {
  ######## Mixer Bar #############################################
 ##############################################################*/
 
-#MixerBar {
+#Mixerbar {
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
   margin: 0px;
   padding: 0px;
@@ -220,156 +242,233 @@ WWidgetGroup {
   qproperty-layoutSpacing: 0px;
 }
 
-#MixerBarSection {
-  qproperty-layoutAlignment: 'AlignTop';
-  margin: 2px 8px 1px 0px;
-  border: 1px solid #585858;
-  border-width: 1px 0px 0px 1px;
+#MixerbarSection {
+  qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
+  margin: 3px 5px 0px 0px;
+  background-color: #333333;
 }
 
-
-#MixerBar_BelowLibrary[displayValue="0"] {
-  background: transparent url(skin:/buttons/btn_arrow_downleft_thin.svg) no-repeat center top;
+#Mixerbar_BelowLibrary[displayValue="0"] {
+  background: transparent url(skin:/buttons/btn_arrow_downleft.svg) no-repeat center top;
   }
-  #MixerBar_BelowLibrary[displayValue="0"]:hover {
-    background: transparent url(skin:/buttons/btn_arrow_downleft_thin_hover.svg) no-repeat center top;
+  #Mixerbar_BelowLibrary[displayValue="0"]:hover {
+    background: transparent url(skin:/buttons/btn_arrow_downleft_hover.svg) no-repeat center top;
   }
-  #MixerBar_BelowLibrary[displayValue="1"] {
-    background: transparent url(skin:/buttons/btn_arrow_upright_thin.svg) no-repeat center top;
+  #Mixerbar_BelowLibrary[displayValue="1"] {
+    background: transparent url(skin:/buttons/btn_arrow_upright.svg) no-repeat center top;
   }
-  #MixerBar_BelowLibrary[displayValue="1"]:hover {
-    background: transparent url(skin:/buttons/btn_arrow_upright_thin_hover.svg) no-repeat center top;
+  #Mixerbar_BelowLibrary[displayValue="1"]:hover {
+    background: transparent url(skin:/buttons/btn_arrow_upright_hover.svg) no-repeat center top;
   }
 
-#MixerBarToggler[displayValue="0"] {
-  background: transparent url(skin:/buttons/btn_arrow_right_thin.svg) no-repeat center top;
+#MixerbarToggler[displayValue="0"] {
+  background: transparent url(skin:/buttons/btn_arrow_right.svg) no-repeat center top;
   }
-  #MixerBarToggler[displayValue="0"]:hover {
-    background: transparent url(skin:/buttons/btn_arrow_right_thin_hover.svg) no-repeat center top;
+  #MixerbarToggler[displayValue="0"]:hover {
+    background: transparent url(skin:/buttons/btn_arrow_right_hover.svg) no-repeat center top;
   }
-  #MixerBarToggler[displayValue="1"] {
-    background: transparent url(skin:/buttons/btn_arrow_left_thin.svg) no-repeat center top;
+  #MixerbarToggler[displayValue="1"] {
+    background: transparent url(skin:/buttons/btn_arrow_left.svg) no-repeat center top;
   }
-  #MixerBarToggler[displayValue="1"]:hover {
-    background: transparent url(skin:/buttons/btn_arrow_left_thin_hover.svg) no-repeat center top;
+  #MixerbarToggler[displayValue="1"]:hover {
+    background: transparent url(skin:/buttons/btn_arrow_left_hover.svg) no-repeat center top;
   }
-  
 
-#MixerBar_MasterSectionLabel, #MixerBar_HeadSectionLabel,
-#MixerBar_MicSectionLabel, #MixerBar_AuxSectionLabel {
-  }
-  #MixerBar_MasterSectionLabel {
-    image: url(skin:/buttons/btn_master.svg) no-repeat center center;
-  }
-  #MixerBar_HeadSectionLabel {
-    image: url(skin:/buttons/btn_head.svg) no-repeat center center;
-  }
-  #MixerBar_MicSectionLabel {
-    image: url(skin:/buttons/btn_mic.svg) no-repeat center center;
-  }
-  #MixerBar_AuxSectionLabel {
-    image: url(skin:/buttons/btn_aux.svg) no-repeat center center;
-  }
-
-#MixerBar_MicAuxLabel { /*
-  border: 1px solid #585858;
-  border-width: 0px 0px 0px 1px; */
+#Mixerbar_MasterSectionLabel {
+  image: url(skin:/buttons/btn_master.svg) no-repeat center center;
+}
+#Mixerbar_BoothSectionLabel {
+  image: url(skin:/buttons/btn_booth.svg) no-repeat center center;
+}
+#Mixerbar_HeadSectionLabel {
+  image: url(skin:/buttons/btn_head.svg) no-repeat center center;
+}
+#Mixerbar_MicSectionLabel {
+  image: url(skin:/buttons/btn_mic.svg) no-repeat center center;
+}
+#Mixerbar_AuxSectionLabel {
+  image: url(skin:/buttons/btn_aux.svg) no-repeat center center;
+}
+#Mixerbar_MicAuxLabel {
+  /* not apllied
+  border-left: 1px solid #453117; */
   font-size: 22px/22px;
   font-weight: bold;
   text-align: center;
 }
 
-#MixerBarButton {
+#MixerbarButton,
+#MixerbarPflButton,
+#MixerbarXfaderButton {
   font-weight: bold;
+  border: 1px solid #0f0f0f;
   }
-  #MixerBarButton[displayValue="0"] {
+  #MixerbarButton[displayValue="0"],
+  #MixerbarPflButton[displayValue="0"],
+  #MixerbarXfaderButton[displayValue="0"] {
     background-color: #333333;
     color: #888888;
     }
-    #MixerBarButton:hover[displayValue="0"] {
+    #MixerbarButton[displayValue="0"]:hover,
+    #MixerbarPflButton:hover,
+    #MixerbarXfaderButton:hover {
       border: 1px solid #888888;
     }
-  #MixerBarButton[displayValue="1"],
-  #MixerBarButton[displayValue="2"] {
+  #MixerbarButton[displayValue="1"],
+  #MixerbarButton[displayValue="2"] {
     background-color: #666666;
     color: #eeeeee;
     }
-    #MixerBarButton:hover[displayValue="1"]:hover,
-    #MixerBarButton:hover[displayValue="2"]:hover {
+  #MixerbarPflButton[displayValue="0"]:hover,
+  #MixerbarPflButton[displayValue="1"] {
+    background-color: #0f0f0f;
+  }
+    #MixerbarButton:hover[displayValue="1"]:hover,
+    #MixerbarButton:hover[displayValue="2"]:hover {
       border: 1px solid #eeeeee;
     }
 
-#VUMeterFloating_h {
-  margin: 0px 3px 0px 1px;
+#MixerbarTalkover[displayValue="0"],
+#MixerbarMute[displayValue="1"] {
+  background-color: #333333;
+  border: 1px solid #0f0f0f;
+}
+#MixerbarTalkover[displayValue="1"],
+#MixerbarMute[displayValue="0"] {
+  background-color: #ff8f00;
+  border: 1px solid #0f0f0f;
+}
+#MixerbarTalkover:hover,
+#MixerbarMute:hover {
+  border: 1px solid #eeeeee;
 }
 
-#MixerBarCover {
-  background-color: rgba(30, 30, 30, 200);
+#VUMeterMixerbar {
+  margin: 2px 0px 0px 0px;
+}
+#MixerbarKnob {
+  margin: 2px 0px 0px 0px;
+}
+#MixerbarSlider {
+  margin: 0px 0px 0px 0px;
+}
+#MixerbarCover {
+  /* background is #333333, so this has to blend in */
+  background-color: rgba(51, 51, 51, 200);
 }
 
 /*################################################################
  ######  Decks  #################################################
 ##############################################################*/
 
-#Decks12 {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
+#DeckContainer {
+  qproperty-layoutAlignment: 'AlignTop';/*
+  background-color: #333333; */
 }
-#Decks34 {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
+
+#Deck1,
+#Deck3,
+#Deck2,
+#Deck4 {
+  background-color: #0f0f0f;
 }
 
 #DeckContainer {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-  }
-  #Deck1, #Deck3, #Deck2, #Deck4 {
-    background-color: #0f0f0f
-    }
-  #Deck1, #Deck3 {
-    qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-    }
-  #Deck2, #Deck4 {
-    qproperty-layoutAlignment: 'AlignRight | AlignTop';
-    }
+  padding-bottom: 5px;
+}
 
 #DeckOverview {
     background-color: #0f0f0f;
   }
-  #VinylTogglerLeft {
+  #VinylTogglerLeft[displayValue="0"],
+  #VinylTogglerRightPassthrough[displayValue="1"],
+  #VinylTogglerRight[displayValue="1"] {
+    background: transparent url(skin:/buttons/btn_arrow_left.svg) no-repeat top center;
     }
-  #VinylTogglerRight {
+    #VinylTogglerLeft[displayValue="0"]:hover,
+    #VinylTogglerRightPassthrough[displayValue="1"]:hover,
+    #VinylTogglerRight[displayValue="1"]:hover {
+      background: transparent url(skin:/buttons/btn_arrow_left_hover.svg) no-repeat top center;
     }
-  #VinylTogglerLeft[displayValue="0"], #VinylTogglerRight[displayValue="1"] {
-    background: transparent url(skin:/buttons/btn_arrow_left_thin.svg) no-repeat top center;
+  #VinylTogglerLeft[displayValue="1"],
+  #VinylTogglerLeftPassthrough[displayValue="1"],
+  #VinylTogglerRight[displayValue="0"] {
+    background: transparent url(skin:/buttons/btn_arrow_right.svg) no-repeat top center;
     }
-  #VinylTogglerLeft[displayValue="0"]:hover, #VinylTogglerRight[displayValue="1"]:hover {
-    background: transparent url(skin:/buttons/btn_arrow_left_thin_hover.svg) no-repeat top center;
+    #VinylTogglerLeft[displayValue="1"]:hover,
+    #VinylTogglerLeftPassthrough[displayValue="1"]:hover,
+    #VinylTogglerRight[displayValue="0"]:hover {
+      background: transparent url(skin:/buttons/btn_arrow_right_hover.svg) no-repeat top center;
     }
-  #VinylTogglerLeft[displayValue="1"], #VinylTogglerRight[displayValue="0"] {
-    background: transparent url(skin:/buttons/btn_arrow_right_thin.svg) no-repeat top center;
+  /* When passthrough is active but Vinyl Controls are hidden,
+    yellow background and black arrow indicate passthrough */
+  #VinylTogglerLeftPassthrough[displayValue="0"] {
+    background: #ff8f00 url(skin:/buttons/btn_arrow_left_black.svg) no-repeat top center;
     }
-  #VinylTogglerLeft[displayValue="1"]:hover, #VinylTogglerRight[displayValue="0"]:hover {
-    background: transparent url(skin:/buttons/btn_arrow_right_thin_hover.svg) no-repeat top center;
+    #VinylTogglerLeftPassthrough[displayValue="0"]:hover {
+      background: #ff8f00 url(skin:/buttons/btn_arrow_left_black_hover.svg) no-repeat top center;
     }
-  #VinylControls {
-    qproperty-layoutAlignment: 'AlignRight | AlignTop';
-    background-color: #0f0f0f;
+  #VinylTogglerRightPassthrough[displayValue="0"] {
+    background: #ff8f00 url(skin:/buttons/btn_arrow_right_black.svg) no-repeat top center;
     }
-  #VinylButton, #VinylModeButton {
+    #VinylTogglerRightPassthrough[displayValue="0"]:hover {
+      background: #ff8f00 url(skin:/buttons/btn_arrow_right_black_hover.svg) no-repeat top center;
+    }
+
+  #VinylControlButton,
+  #VinylControlStatus,
+  #VinylModeButton,
+  #VinylCueModeButton,
+  #PassthroughButton {
+    margin-right: 1px;
+    }
+  #VinylControlButton[displayValue="0"],
+  #VinylModeButton,
+  #VinylCueModeButton,
+  #PassthroughButton {
     font-size: 11px/11px;
+    color: #888888;
     background-color: #333333;
-    margin-right: 1px;
     }
-  #VinylButton:hover, #VinylModeButton:hover {
-    border: 1px solid #999999;
+    #VinylControlButton:hover,
+    #VinylModeButton:hover {
+      border: 1px solid #999999;
     }
-  #VinylButton[displayValue="0"], #VinylModeButton {
-    color: #888888;
+    #PassthroughButton[displayValue="0"]:hover {
+      border: 1px solid #ff8f00;
     }
-  #VinylButton[displayValue="1"], #VinylButton[displayValue="2"] {
-    background-color: #666666;
+  #VinylModeButton[displayValue="1"],
+  #VinylModeButton[displayValue="2"],
+  #VinylControlButton[displayValue="1"] {
     color: #eeeeee;
     font-weight: bold;
     }
+  #VinylModeButton[displayValue="1"],
+  #VinylModeButton[displayValue="2"],
+  #VinylControlStatus[displayValue="0"] {
+    background-color: #666666;
+    }
+  #VinylControlButton[displayValue="1"] {
+    background-color: transparent;
+    }
+  #VinylControlStatus[displayValue="1"] {
+    background-color: #468c00;
+  }
+  #VinylControlStatus[displayValue="2"] {
+    background-color: #ff6600;
+  }
+  #VinylControlStatus[displayValue="3"] {
+    background-color: #ff0000;
+  }
+  #PassthroughButton[displayValue="1"] {
+    color: #0f0f0f;
+    font-weight: bold;
+    background-color: #ff8f00;
+    }
+    #PassthroughButton[displayValue="1"]:hover {
+      border: 1px solid #ffffff;
+    }
 
   #TrackCommentContainer {
     qproperty-layoutAlignment: 'AlignVCenter';
@@ -387,56 +486,45 @@ WWidgetGroup {
     }
   WLabel#DeckFxIndicator {
     font-weight: bold;
-    color: #FF8F00;
+    color: #ff8f00;
     padding-top: 1px;
     background-color: #333333;
   }
 
-#DeckArtistTitleLeft, #DeckArtistTitleRight {
-  qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
+#ArtistTitleTime {
+  qproperty-layoutAlignment: 'AlignVCenter';
   background-color: #333333;
   }
-  #DeckArtistTitleRight > #TitleTimeRow {
-    qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
-  }
-  #DeckArtistTitleLeft > #TitleTimeRow {
-    qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
-    }
-      WLabel#TrackTime, WLabel#TrackTitle {
-        font-size: 18px/18px;
-        font-weight: bold;
-      }
-  #DeckArtistTitleRight > #ArtistDurationRow {
-    qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
-    padding: 0px 2px 0px 1px;
-  }
-  #DeckArtistTitleLeft > #ArtistDurationRow {
-    qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
-    padding: 0px 1px 0px 2px;
-    }
-    WLabel#TrackDuration, WLabel#TrackBy, WLabel#TrackArtist {
-      font-size: 16px/16px;
-      font-weight: bold;
-    }
-    WLabel#TrackBy {
-      color: #888888;
-    }
-    
-  #LoopIndicator {
+  WLabel#PlayPosition, WLabel#TrackTitle {
+    font-size: 18px/18px;
+    font-weight: bold;
     }
-    #LoopIndicator:hover {
-      border: 1px solid #ffffff;
+    WLabel#PlayPosition:hover {
+      /* Emphasize that play position display can be changed
+      to show both elapsed and remaining time */
+      border: 1px solid #cccccc;
     }
-    #LoopIndicator[displayValue="0"] {
-      background: #333333 url(skin:/buttons/btn_reloop_off.svg) no-repeat center center;
+  WLabel#Duration, WLabel#TrackBy, WLabel#TrackArtist {
+    font-size: 16px/16px;
+    font-weight: bold;
+  }
+  WLabel#PlayPosition, WLabel#Duration {
+    /* Instead of 1px, this adds 6px padding both left and right...wtf? */
+    padding: 0px 1px 0px 1px;
+  }
+  WLabel#TrackBy {
+    color: #888888;
+  }
+  #LoopIndicator:hover {
+    border: 1px solid #ffffff;
     }
     #LoopIndicator[displayValue="1"] {
-      background: #FF8F00 url(skin:/buttons/btn_reloop_on.svg) no-repeat center center;
+      background: #ff8f00 url(skin:/buttons/btn_reloop_on.svg) no-repeat center center;
     }
-    
+
 #DeckButtonsPlay {
   margin-top: 1px;
-  background-color: #333333;
+  background-color: #0f0f0f;
   }
   #DeckControlsLeft {
     qproperty-layoutAlignment: 'Alignleft | AlignVCenter';
@@ -450,9 +538,9 @@ WWidgetGroup {
   }
 
 #DeckControlsExpanded,
-#Keylock[displayValue="0"]:hover, #Keylock[displayValue="1"],
-#PflButton[displayValue="0"]:hover, #PflButton[displayValue="1"],
-#DeckButton:hover {
+#DeckButton:hover,
+#Keylock[displayValue="0"]:hover,
+#Keylock[displayValue="1"] {
   background-color: #151515;
   }
   /* there's been trouble defining bg-color to several IDs at once,
@@ -461,54 +549,35 @@ WWidgetGroup {
     background-color: #000000;
   }
   #DeckButtonTogglerLeft[displayValue="0"] {
-    background: transparent url(skin:/buttons/btn_arrow_right_thin.svg) no-repeat center center;
+    background: transparent url(skin:/buttons/btn_arrow_right.svg) no-repeat center center;
     }
     #DeckButtonTogglerLeft[displayValue="0"]:hover {
-      background: #151515 url(skin:/buttons/btn_arrow_right_thin_hover.svg) no-repeat center center;
+      background: #151515 url(skin:/buttons/btn_arrow_right_hover.svg) no-repeat center center;
     }
     #DeckButtonTogglerLeft[displayValue="1"] {
-      background: #151515 url(skin:/buttons/btn_arrow_left_thin.svg) no-repeat center center;
+      background: #151515 url(skin:/buttons/btn_arrow_left.svg) no-repeat center center;
     }
     #DeckButtonTogglerLeft[displayValue="1"]:hover {
-      background: #000000 url(skin:/buttons/btn_arrow_left_thin_hover.svg) no-repeat center center;
+      background: #000000 url(skin:/buttons/btn_arrow_left_hover.svg) no-repeat center center;
     }
 
   #DeckButtonTogglerRight[displayValue="0"] {
-    background: transparent url(skin:/buttons/btn_arrow_left_thin.svg) no-repeat center center;
+    background: transparent url(skin:/buttons/btn_arrow_left.svg) no-repeat center center;
     }
     #DeckButtonTogglerRight[displayValue="0"]:hover {
-      background: #151515 url(skin:/buttons/btn_arrow_left_thin_hover.svg) no-repeat center center;
+      background: #151515 url(skin:/buttons/btn_arrow_left_hover.svg) no-repeat center center;
     }
     #DeckButtonTogglerRight[displayValue="1"] {
-      background: #151515 url(skin:/buttons/btn_arrow_right_thin.svg) no-repeat center center;
+      background: #151515 url(skin:/buttons/btn_arrow_right.svg) no-repeat center center;
     }
     #DeckButtonTogglerRight[displayValue="1"]:hover {
-      background: #000000 url(skin:/buttons/btn_arrow_right_thin_hover.svg) no-repeat center center;
+      background: #000000 url(skin:/buttons/btn_arrow_right_hover.svg) no-repeat center center;
     }
 
-  #Keylock[displayValue="1"]:hover, #PflButton[displayValue="1"]:hover {
+  #Keylock[displayValue="1"]:hover {
     border: 1px solid #d2d2d2;
   }
-  #SyncModeButton {
-    font-weight: bold;
-    color: #888888;
-    }
-    #SyncModeButton:hover {
-      color: #888888;
-      background-color: #151515;
-    }
-    #SyncModeButton[displayValue="1"], #SyncModeButton[displayValue="2"] {
-      background-color: #151515;
-    }
-    #SyncModeButton[displayValue="1"] {
-      color: #c66d00;
-    }
-    #SyncModeButton[displayValue="2"] {
-      color: #00D613;
-    }
-    #SyncModeButton[displayValue="1"]:hover, #SyncModeButton[displayValue="2"]:hover {
-      border: 1px solid #888888;
-    }
+
   #DeckStars:hover {
     background-color: #151515;
     border-radius: 2px;
@@ -521,33 +590,33 @@ WWidgetGroup {
     background-color: none;
     }
 
-#Hotcues {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-  background-color: #0f0f0f;
+#HotcueButton {
+  font-size: 13px/15px;
+  font-weight: bold;
   }
-  #HotcueButton {
-    font-size: 13px/15px;
-    font-weight: bold;
-    }
-  #HotcueButton[displayValue="0"], #CueUnderlay {
+  #HotcueButton[displayValue="0"],
+  #CueUnderlay {
     color: #888888;
     background-color: #333333;
     }
   #HotcueButton[displayValue="0"]:hover {
     border: 1px solid #888888;
     }
-  #HotcueButton[displayValue="1"], #CueButton[displayValue="1"],
+  #HotcueButton[displayValue="1"],
+  #CueButton[displayValue="1"],
   #CueUnderlay[displayValue="1"] {
     color: #eeeeee;
     background-color: #666666;
     }
-  #HotcueButton[displayValue="1"]:hover, #CueButton[displayValue="1"]:hover {
+  #HotcueButton[displayValue="1"]:hover,
+  #CueButton[displayValue="1"]:hover {
     border: 1px solid #eeeeee;
     }
 
 /* Actual Play button. Receives click events, turns red
   when playing regularly, not from Cue or HotCue */
-#PlayCue[displayValue="0"], #SamplerPlayCue[displayValue="0"] {
+#PlayCue[displayValue="0"],
+#SamplerPlayCue[displayValue="0"] {
     background: none url(skin:/buttons/btn_paused.svg) no-repeat center center;
     }
   #PlayCue[displayValue="0"]:hover {
@@ -559,6 +628,7 @@ WWidgetGroup {
     border: 1px solid #ca0000;
     }
   #PlayCue[displayValue="1"]:hover {
+    background: #a90000 url(skin:/buttons/btn_playing_hover.svg) no-repeat center center;
     border: 1px solid #ff0000;
     }
   /* The button which signals alternate play status when
@@ -579,53 +649,34 @@ WWidgetGroup {
     color: #d2d2d2;
   }
 
+#PassthroughPlayCover {
+  background: #333333 url(skin:/graphics/passthrough_play_cover.svg) no-repeat center center;
+}
+
 /*################################################################
  #######  Loop Controls  ########################################
 ##############################################################*/
 
-#LoopBeatJumpContainer_Left, #LoopBeatJumpContainer_Right {
-  qproperty-layoutAlignment: 'AlignCenter';
-  background-color: #252525;
-}
-  #LoopBeatJumpButton, #LoopSizeButton, #LoopRollButton {
-    font-weight: bold;
-    color: #888888;
-    background-color: #333333;
+#LoopBeatJumpButton,
+#LoopSizeButton {
+  font-weight: bold;
+  color: #888888;
+  background-color: #333333;
   }
-  #LoopBeatJumpButton:hover, #LoopSizeButton:hover, #LoopRollButton:hover {
-    border: 1px solid #888888;
+  #LoopSizeButton {
+    font-size: 14px/12px;
   }
-  #LoopSizeButton, #LoopRollButton {
+  #LoopBeatJumpButton:hover,
+  #LoopSizeButton:hover {
+    border: 1px solid #888888;
   }
-  #LoopSizeButton[displayValue="1"],
-  #LoopRollButton[displayValue="1"] {
-    border: 1px solid #FF8F00;
+  #LoopSizeButton[displayValue="1"] {
+    border: 1px solid #ff8f00;
     color: #d2d2d2;
   }
-  #LoopSizeButton[displayValue="1"]:hover,
-  #LoopRollButton[displayValue="1"]:hover {
+  #LoopSizeButton[displayValue="1"]:hover {
     border: 1px solid #eeeeee;
   }
-  #LoopRollButton::WPushButton:pressed {
-    border: 1px solid #FF8F00;
-  }
-  #LoopRollButton::pressed {
-    border: 1px solid #FF8F00;
-  }
-  /* See also #LoopIndicator near DeckButtons */
-
-#BeatJumpBackwardButton, #LoopBeatForwardJumpButton {
-  background-color: #333333;
-  }
-  #BeatJumpBackwardButton:hover, #LoopBeatForwardJumpButton:hover {
-    border: 1px solid #888888;
-  }
-#BeatJumpBackwardButton {
-  image: url(skin:/buttons/btn_backward.svg) left center;
-}
-#BeatJumpForwardButton {
-  image: url(skin:/buttons/btn_forward.svg) left center;
-}
 
 #ReloopButton[displayValue="0"] {
   background-color: #333333;
@@ -634,7 +685,8 @@ WWidgetGroup {
     border: 1px solid #888888;
   }
   #ReloopButton[displayValue="1"] {
-    background-color: #FF8F00;
+  /* See also #LoopIndicator near DeckButtons */
+    background-color: #ff8f00;
     }
     #ReloopButton[displayValue="1"]:hover {
       border: 1px solid #eeeeee;
@@ -642,19 +694,22 @@ WWidgetGroup {
 
 WBeatSpinBox {
   /* make it 2px smaller in each dimension,
-    border is added for actual size */
+    border is added for final size */
   min-width: 52px;
   max-width: 52px;
   min-height: 20px;
   max-height: 20px;
-  border: 1px solid #666666; /* = 54x22px */
+  border: 1px solid #666666;  /* = 54x22px */
   border-radius: 2px;
-  background-color: #0f0f0f;
+  border-top-right-radius: 11px;
+  border-bottom-right-radius: 11px;
   color: #aaaaaa;
-  selection-background-color: #d2d2d2;
+  background-color: #0f0f0f;
   selection-color: #0f0f0f;
+  selection-background-color: #d2d2d2;
   font-size: 13px/13px;
-  padding: 0;
+  padding-left: 3px;
+  margin: 0 13px 0 0;
 }
   WBeatSpinBox:hover {
     border-color: #888888;
@@ -669,58 +724,40 @@ WBeatSpinBox {
     position: relative;
     /* as with spinbox: border is added to size.
       define it with same width as hover border, otherwise size jumps */
-    width: 18px;
-    height: 18px;
-    border: 0px solid #777777; /* = 18x18px */
-    border-radius: 8px;
+    width: 16px;
+    height: 20px;
+    border-style: solid;
+    border-color: #1e1e1e;
+    border-width: 1px 0p 1px 0px; /* = 16x22px */
+    border-radius: 3px;
     background-color: #333333;
     }
 
   WBeatSpinBox::up-button {
-    image: url(skin:/buttons/btn_arrow_up.svg);
+    subcontrol-position: center right;
+    image: url(skin:/buttons/btn_beatbox_up.svg) no-repeat;
     }
     WBeatSpinBox::up-button:hover {
-      image: url(skin:/buttons/btn_arrow_up_hover.svg);
+      image: url(skin:/buttons/btn_beatbox_up_hover.svg) no-repeat;
     }
   WBeatSpinBox::down-button {
-    image: url(skin:/buttons/btn_arrow_down.svg);
+    subcontrol-position: center right;
+    left: -16px;
+    image: url(skin:/buttons/btn_beatbox_down.svg) no-repeat;
     }
     WBeatSpinBox::down-button:hover {
-      image: url(skin:/buttons/btn_arrow_down_hover.svg);
-    }
-
-  #LoopBeatJumpContainer_Right > WBeatSpinBox {
-    padding-left: 3px;
-    margin: 0 19px 0 0;
-    border-top-right-radius: 8px;
-    border-bottom-right-radius: 8px;
-    }
-    #LoopBeatJumpContainer_Right > WBeatSpinBox::up-button {
-      subcontrol-position: center right;
-      }
-    #LoopBeatJumpContainer_Right > WBeatSpinBox::down-button {
-      subcontrol-position: center right;
-      left: -13px;
-    }
-
-  #LoopBeatJumpContainer_Left > WBeatSpinBox {
-    margin: 0 0 0 19px;
-    border-top-left-radius: 8px;
-    border-bottom-left-radius: 8px;
-    }
-    #LoopBeatJumpContainer_Left > WBeatSpinBox::up-button {
-      subcontrol-position: center left;
-      right: -13px;
-      }
-    #LoopBeatJumpContainer_Left > WBeatSpinBox::down-button {
-      subcontrol-position: center left;
+      image: url(skin:/buttons/btn_beatbox_down_hover.svg) no-repeat;
     }
 
 /*################################################################
  #######  Rate Container  #######################################
 ##############################################################*/
 
-#RateContainer1, #RateContainer2, #RateContainer3, #RateContainer4, #BpmContainer {
+#RateContainer1,
+#RateContainer2,
+#RateContainer3,
+#RateContainer4,
+#BpmContainer {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
 }
 
@@ -731,7 +768,8 @@ WBeatSpinBox {
   text-align: center;
   padding-top: 1px;
   }
-  #SyncButtonOverlay[displayValue="0"]:hover, #KeyReset:hover {
+  #SyncButtonOverlay[displayValue="0"]:hover,
+  #KeyReset:hover {
     border: 1px solid #ff4800;
   }
   #SyncButtonOverlay[displayValue="1"],
@@ -746,7 +784,9 @@ WBeatSpinBox {
   #KeyDisplay {
     font-size: 13px/13px;
   }
-  #KeyDown, #KeyUp, #KeyReset {
+  #KeyDown,
+  #KeyUp,
+  #KeyReset {
     border: 1px solid #666666;
     }
     #KeyUp {
@@ -769,44 +809,37 @@ WBeatSpinBox {
 #PitchSliderContainer {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
   }
-  #PitchSlider:hover, #Crossfader:hover {
-    background-color: #0f0f0f;
-  }
 
 /*################################################################
  #######  Channel Mixer  ########################################
 ##############################################################*/
-    
-#MixerMaster {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-}
-
-#MixerHeadphone {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-}
 #MixerChannelLeft {
   qproperty-layoutAlignment: 'AlignRight | AlignTop';
   background-color: #333333;
+  border-bottom-right-radius: 3px;
 }
 #MixerChannelRight {
   qproperty-layoutAlignment: 'AlignRight | AlignTop';
   background-color: #333333;
+  border-bottom-left-radius: 3px;
 }
 
-#EQKnobs {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
+#VolumeSliderGain {
+  qproperty-layoutAlignment: 'AlignCenter';
+  margin-top: 2px;
+}
+
+#EQKnobContainerLeft {
+  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+  margin: 0px 4px 0px 2px;
+  }
+#EQKnobContainerRight {
+  qproperty-layoutAlignment: 'AlignRight | AlignTop';
+  margin: 0px 2px 0px 4px;
+}
+
+#EQKillButton {
   }
-  #EQKnobLeft {
-    qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-    margin: 4px 12px 0px 0px;
-    }
-  #EQKnobRight {
-    qproperty-layoutAlignment: 'AlignRight | AlignTop';
-    margin: 4px 0px 0px 12px;
-    }
-  #EQKillButton {
-    border-radius: 1px;
-    }
   #EQKillButton[displayValue="0"] {
     background-color: #585858;
     }
@@ -818,18 +851,40 @@ WBeatSpinBox {
     }
   #EQKillButton[displayValue="1"]:hover {
     background-color: #ca0000;
-    }
+  }
+
+#EQKillUnderlayLeft[displayValue="1"] {
+  background-color: #585858;
+  border-top-left-radius: 15px;
+  border-bottom-left-radius: 15px;
+  }
+#EQKillUnderlayRight[displayValue="1"] {
+  background-color: #585858;
+  border-top-right-radius: 15px;
+  border-bottom-right-radius: 15px;
+  }
 
-  #EQKillButtonUnderlayLeft[displayValue="1"] {
+#QuickFxEnableButton {
+  margin: 5px 0px 5px 0px;
+  }
+  #QuickFxEnableButton[displayValue="0"] {
     background-color: #585858;
-    border-top-left-radius: 15px;
-    border-bottom-left-radius: 15px;
     }
-  #EQKillButtonUnderlayRight[displayValue="1"] {
-    background-color: #585858;
-    border-top-right-radius: 15px;
-    border-bottom-right-radius: 15px;
+  #QuickFxEnableButton[displayValue="0"]:hover {
+    border: 1px solid #ff8f00;
     }
+  #QuickFxEnableButton[displayValue="1"] {
+    background-color: #ff8f00;
+    }
+  #QuickFxEnableButton[displayValue="1"]:hover {
+    border: 1px solid #ffffff;
+  }
+
+  #QuickFxEnableUnderlay[displayValue="0"] {
+    background-color: #585858;
+    border-radius: 13px;
+    margin: 2px;
+  }
 
 /*  This wouldn't scale the image:
 #PflButton[displayValue="0"] {
@@ -840,35 +895,66 @@ WBeatSpinBox {
   if it is scaled up too much (>120). Source:
   https://forum.qt.io/topic/40151/solved-scaled-background-image-using-stylesheet/6
   border-image: url(skin:/buttons/btn_pfl_off.svg) 0 0 0 0 stretch stretch; */
-        
-#VolumeSliderGain {
-  qproperty-layoutAlignment: 'AlignHCenter';
-  margin-top: 2px;
-}
+#PflBoxLeft,
+#PflBoxRight {
+  background-color: #0f0f0f;
+  border-color: #0f0f0f;
+  border-style: solid;
+  border-radius: 3px;
+  }
+  #PflBoxLeft {
+    border-width: 1px 0px 0px 1px;
+  }
+  #PflBoxRight {
+    border-width: 1px 1px 0px 0px;
+  }
+  #PflBoxLeft {
+    border-top-right-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+  #PflBoxRight {
+    border-bottom-right-radius: 0px;
+    border-top-left-radius: 0px;
+  }
+#PflButtonLeft:hover,
+#PflButtonRight:hover {
+    border: 1px solid #888888;
+  }
+  #PflButtonLeft[displayValue="0"],
+  #PflButtonRight[displayValue="0"] {
+    background-color: #333333;
+  }
+  #PflButtonLeft[displayValue="1"],
+  #PflButtonRight[displayValue="1"] {
+    background-color: #000000;
+  }
 
-#VUMeterFloating {
-  qproperty-layoutAlignment: 'AlignRight | AlignTop';
-}
 #VUMeterMixer {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';	/*
-  margin not respected!
-  margin-top: 4px;	*/
-}
-#VUMeter {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
+  margin-top: 4px;
+  }
+#VUMeterFloating, #VUMeterMaster {
+  margin-top: 3px;
+}
+
+#VUMeterMasterContainer {
+  background-color: #333333;
+  margin: 0px 5px 0px 1px;
+  border-radius: 2px;
+}
+
+#VUMeterMasterLabel {
+  image: url(skin:/buttons/btn_master_vu_label.svg) no-repeat center center;
 }
 
 /*################################################################
  ######  Skin Controls / Crossfader / Clock  ####################
 ##############################################################*/
 
-#SkinControls {
+#SkinControlsRow {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-  }
-  #SkinControlsRow {
-    qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-    background-color:  #0f0f0f;
-  }
+  background-color:  #0f0f0f;
+}
 
 #SkinControlsBarLeft {
   qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
@@ -877,24 +963,30 @@ WBeatSpinBox {
   qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
 }
 
-#GuiToggleButton, #GuiToggleButton2, #RecordingButton {
+#GuiToggleButton,
+#GuiToggleButton2,
+#RecordingButton {
   text-align: center;
   font-weight: bold;
   }
-  #GuiToggleButton[displayValue="0"]:hover, #GuiToggleButton2:hover {
+  #GuiToggleButton[displayValue="0"]:hover,
+  #GuiToggleButton2:hover {
     border: 1px solid #888888;
     }
-  #GuiToggleButton[displayValue="1"]:hover, #GuiToggleButton[displayValue="2"]:hover {
+  #GuiToggleButton[displayValue="1"]:hover,
+  #GuiToggleButton[displayValue="2"]:hover {
     border: 1px solid #eeeeee;
     }
   #GuiToggleButton:hover {
     background-color: #666666;
     }
-  #GuiToggleButton[displayValue="0"], #GuiToggleButton2 {
+  #GuiToggleButton[displayValue="0"],
+  #GuiToggleButton2 {
     color: #888888;
     background-color: #333333;
     }
-  #GuiToggleButton[displayValue="1"], #GuiToggleButton[displayValue="2"] {
+  #GuiToggleButton[displayValue="1"],
+  #GuiToggleButton[displayValue="2"] {
     color: #eeeeee;
     background-color: #666666;
     }
@@ -904,37 +996,45 @@ WBeatSpinBox {
   background-color: #333333;
   color: #888888;
 }
-  #RecordingButton[displayValue="0"]:hover, #RecordingButton[displayValue="2"] {
+  #RecordingButton[displayValue="0"]:hover,
+  #RecordingButton[displayValue="2"] {
     border: 1px solid #a90000;
   }
   #RecordingButton[displayValue="1"] {
-    color: #d2d2d2; /*
-    border: 1px solid #FFA601;  */
+    color: #d2d2d2;
     border: 1px solid #ff8f00;
   }
   #RecordingButton[displayValue="2"]:hover {
-    border: 1px solid #dddddd;
+    border: 1px solid #ff8f00;
   }
-/* RecordingDuration underneath RecordingButton */
-#RecDurationLabel {
+/* RecordingDuration underneath RecordingButton, as well as 'REC' text & Rec icon */
+#RecDurationLabel,
+#RecRec {
   /* RecordingButton is transparent so label needs bg-color */
   background-color: #333333;
   font-family: Ubuntu;
   font-weight: bold;
   font-size: 12px/12px;
   color: #d2d2d2;
+  text-align: center;
+  border-radius: 3px;
 }
+  #RecDot {
+    background: #333333 url(skin:/buttons/btn_rec_dot.svg) no-repeat center right;
+  }
 
 #ClockBox {
-  qproperty-layoutAlignment: 'AlignVCenter | AlignHCenter';	
-  }		
-  #ClockBox WLabel, #Clock {
+  qproperty-layoutAlignment: 'AlignVCenter | AlignHCenter';
+  }
+  #ClockBox WLabel,
+  #Clock {
     font-size: 13px/13px;
     color: #999999;
     text-align: center;
   }
 
-#BroadcastButton, #SkinSettingsToggler {
+#BroadcastButton,
+#SkinSettingsToggler {
   background-color: transparent;
   }
   #BroadcastButton[displayValue="0"] {
@@ -952,92 +1052,67 @@ WBeatSpinBox {
   #BroadcastButton[displayValue="3"] {
     background: transparent url(skin:/buttons/btn_broadcast_failure.svg) no-repeat center center;
     }
-    #BroadcastButton[displayValue="2"]:hover, #BroadcastButton[displayValue="3"]:hover {
-      background-color: #0f0f0f;
-      border: 1px solid #666666;
+    #BroadcastButton[displayValue="2"]:hover,
+    #BroadcastButton[displayValue="3"]:hover {
+      background: #0f0f0f url(skin:/buttons/btn_broadcast_off.svg) no-repeat center center;
     }
 
 #BroadcastButtonNetbook {
   background-color: transparent;
   }
   #BroadcastButtonNetbook[displayValue="0"] {
-    background: transparent url(skin:/buttons/btn_broadcast_mini_off.svg) no-repeat center center;
+    background: transparent url(skin:/buttons/btn_broadcast_off_netbook.svg) no-repeat center center;
     }
     #BroadcastButtonNetbook[displayValue="0"]:hover {
-      background: #0f0f0f url(skin:/buttons/btn_broadcast_mini_off_hover.svg) no-repeat center center;
+      background: #0f0f0f url(skin:/buttons/btn_broadcast_off_hover_netbook.svg) no-repeat center center;
       }
   #BroadcastButtonNetbook[displayValue="1"] {
-    background: transparent url(skin:/buttons/btn_broadcast_mini_connecting.svg) no-repeat center center;
+    background: transparent url(skin:/buttons/btn_broadcast_connecting_netbook.svg) no-repeat center center;
     }
   #BroadcastButtonNetbook[displayValue="2"] {
-    background: transparent url(skin:/buttons/btn_broadcast_mini_connected.svg) no-repeat center center;
+    background: transparent url(skin:/buttons/btn_broadcast_connected_netbook.svg) no-repeat center center;
     }
   #BroadcastButtonNetbook[displayValue="3"] {
-    background: transparent url(skin:/buttons/btn_broadcast_mini_failure.svg) no-repeat center center;
+    background: transparent url(skin:/buttons/btn_broadcast_failure_netbook.svg) no-repeat center center;
     }
-    #BroadcastButtonNetbook[displayValue="2"]:hover, #BroadcastButtonNetbook[displayValue="3"]:hover {
-      background-color: #0f0f0f;
-      border: 1px solid #666666;
+    #BroadcastButtonNetbook[displayValue="2"]:hover,
+    #BroadcastButtonNetbook[displayValue="3"]:hover {
+      background: #0f0f0f url(skin:/buttons/btn_broadcast_off_netbook.svg) no-repeat center center;
     }
 
 #SkinSettingsToggler[displayValue="0"] {
-  background: transparent url(skin:/buttons/btn_skinsettings_off.svg) no-repeat center center; 
+  background: transparent url(skin:/buttons/btn_skinsettings_off.svg) no-repeat center center;
   }
   #SkinSettingsToggler[displayValue="0"]:hover {
-    background: #0f0f0f url(skin:/buttons/btn_skinsettings_on.svg) no-repeat center center; 
+    background: #0f0f0f url(skin:/buttons/btn_skinsettings_on.svg) no-repeat center center;
   }
 #SkinSettingsToggler[displayValue="1"] {
   background: #0f0f0f url(skin:/buttons/btn_skinsettings_on.svg) no-repeat center center;
   }
   #SkinSettingsToggler[displayValue="1"]:hover {
-    border: 1px solid #666666;
+    background: #0f0f0f url(skin:/buttons/btn_skinsettings_off.svg) no-repeat center center;
   }
 
-#LogoMaxi:hover, #LogoMini:hover {
-/*  background-color: #0f0f0f;  */
+#CrossfaderNetbook {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
+  margin: 2px 0px 2px 0px;
 }
 
-#CrossfaderBox {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignBottom';
-}
 
 /*################################################################
 ######  Effects  ###############################################
 ##############################################################*/
 
-#EffectUnits12 {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-}
-#EffectUnits34 {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-}
-
-#EffectRack {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-  }
-  #EffectUnitLeft {
-    qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-    }
-  #EffectUnitRight {
-    qproperty-layoutAlignment: 'AlignRight | AlignTop';
-    }
-  #EffectUnitLeftMini {
-    qproperty-layoutAlignment: 'AlignRight | AlignTop';
-    }
-  #EffectUnitRightMini {
-    qproperty-layoutAlignment: 'AlignRight | AlignTop';
-    }
-
-#EffectUnitLabel {
+#FxUnitLabel {
   font-size: 14px/14px;
   font-weight: bold;
   color: #888888;
 }
 
-#EffectUnitControlsLeft {
+#FxUnitControlsLeft {
   qproperty-layoutAlignment: 'AlignRight;
 }
-#EffectUnitControlsRight {
+#FxUnitControlsRight {
   qproperty-layoutAlignment: 'AlignRight | AlignBottom';	/*
   This eliminates 1 black px left...	*/
   border-left: 1px solid #1e1e1e; /*
@@ -1047,13 +1122,11 @@ WBeatSpinBox {
   background-color: #1e1e1e;
 }
 
-#EffectUnitMixerLeft {
-  qproperty-layoutAlignment: 'AlignRight | AlignTop';
+#FxUnitMixerLeft {
   padding-left:1px;
   background-color: #0f0f0f;
 }
-#EffectUnitMixerRight {
-  qproperty-layoutAlignment: 'AlignRight | AlignTop';
+#FxUnitMixerRight {
   padding-right:1px;
   background-color: #0f0f0f;
 }
@@ -1063,174 +1136,242 @@ WBeatSpinBox {
   background-color: #333333;
   }
 
-#EffectSlots {
-  background-color: #0f0f0f;
+/* minimal EffectSlots in horizontal layout */
+/* with focus */
+#FxFlowUnderlay_mini_focus1[highlight="0"] {
+  border-image: url(skin:/graphics/fxChainFlow_h_unfocused1.svg) 0px 10px 0px 0px ;
+  border-width: 0px 10px 0px 0px;
+  }
+#FxFlowUnderlay_mini_focus2[highlight="0"] {
+  margin-left: 125px;
+  border-image: url(skin:/graphics/fxChainFlow_h_unfocused2.svg) 0px 10px 0px 10px;
+  border-width: 0px 10px 0px 10px;
+  }
+  #FxFlowUnderlay_mini_focus2[highlight="1"] {
+    margin-left: 125px;
+  }
+#FxFlowUnderlay_mini_focus3[highlight="0"] {
+  margin-left: 259px;
+  border-image: url(skin:/graphics/fxChainFlow_h_unfocused3.svg) 0px 0px 0px 10px;
+  border-width: 0px 0px 0px 10px;
+  }
+  #FxFlowUnderlay_mini_focus3[highlight="1"] {
+    margin-left: 259px;
+  }
+
+/* no focus */
+#FxFlowUnderlay_mini_noFocus1 {
+  border-image: url(skin:/graphics/fxChainFlow_h_unfocused1.svg) 0px 10px 0px 0px;
+  border-width: 0px 10px 0px 0px;
+}
+#FxFlowUnderlay_mini_noFocus2 {
+  margin-left: 111px;
+  border-image: url(skin:/graphics/fxChainFlow_h_unfocused2.svg) 0px 10px 0px 10px;
+  border-width: 0px 10px 0px 10px;
+}
+#FxFlowUnderlay_mini_noFocus3 {
+  margin-left: 231px;
+  border-image: url(skin:/graphics/fxChainFlow_h_unfocused3.svg) 0px 0px 0px 10px;
+  border-width: 0px 0px 0px 10px;
 }
 
-#EffectSlotLeft {
-  qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
-  background-color: #333333;
+/* maximized EffectSlots in vertical layout */
+/* right-hand FX units, with focus */
+#FxFlowUnderlay_right_focus1[highlight="0"] {
+  border-image: url(skin:/graphics/fxChainFlow_v_unfocused1.svg) 0px 0px 0px 101px ;
+  border-width: 0px 0px 0px 101px;
   }
-  #EffectSlotLeftHighlight {
-    qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
+
+#FxFlowUnderlay_right_focus2[highlight="0"] {
+  margin-top: 46px;
+  border-image: url(skin:/graphics/fxChainFlow_v_unfocused2.svg) 0px 0px 0px 101px;
+  border-width: 0px 0px 0px 101px;
   }
-  #EffectSlotLeftHighlight[highlight="0"] {
-    background-color: #333333;
+  #FxFlowUnderlay_right_focus2[highlight="1"] {
+    margin-top: 46px;
   }
-  #EffectSlotLeftHighlight[highlight="1"] {
-    background-color: #0f0f0f;
+
+#FxFlowUnderlay_right_focus3[highlight="0"] {
+  margin-top: 92px;
+  border-image: url(skin:/graphics/fxChainFlow_v_unfocused3.svg) 0px 0px 0px 101px;
+  border-width: 0px 0px 0px 101px;
   }
-#EffectSlotRight {
-  qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
-  /* Here border would show up...
-  border-left: 1px solid #0f0f0f;	*/
-  background-color: #333333;
+  #FxFlowUnderlay_right_focus3[highlight="1"] {
+    margin-top: 92px;
+  }
+
+/* right-hand FX units, no focus */
+#FxFlowUnderlay_right_noFocus1 {
+  border-image: url(skin:/graphics/fxChainFlow_v_noFocus1.svg) 0px 0px 0px 85px;
+  border-width: 0px 0px 0px 85px;
+}
+#FxFlowUnderlay_right_noFocus2 {
+  margin-top: 46px;
+  border-image: url(skin:/graphics/fxChainFlow_v_noFocus2.svg) 0px 10px 0px 85px;
+  border-width: 0px 0px 0px 85px;
+}
+#FxFlowUnderlay_right_noFocus3 {
+  margin-top: 92px;
+  border-image: url(skin:/graphics/fxChainFlow_v_noFocus3.svg) 0px 0px 0px 85px;
+  border-width: 0px 0px 0px 85px;
+}
+
+/* maximized EffectSlots in vertical layout */
+/* left-hand FX units, with focus */
+#FxFlowUnderlay_left_focus1[highlight="0"] {
+  border-image: url(skin:/graphics/fxChainFlow_v_unfocused1.svg) 0px 111px 0px 0px;
+  border-width: 0px 111px 0px 0px;
   }
-  #EffectSlotRightHighlight {
-    qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
-    /* ...and here it wouldn't. Use spacer instead
-    border-left: 1px solid #0f0f0f;	*/
+
+#FxFlowUnderlay_left_focus2[highlight="0"] {
+  margin-top: 46px;
+  border-image: url(skin:/graphics/fxChainFlow_v_unfocused2.svg) 0px 111px 0px 0px;
+  border-width: 0px 111px 0px 0px;
   }
-  #EffectSlotRightHighlight[highlight="0"] {
-    background-color: #333333;
+  #FxFlowUnderlay_left_focus2[highlight="1"] {
+    margin-top: 46px;
   }
-  #EffectSlotRightHighlight[highlight="1"] {
-    background-color: #0f0f0f;
+
+#FxFlowUnderlay_left_focus3[highlight="0"] {
+  margin-top: 92px;
+  border-image: url(skin:/graphics/fxChainFlow_v_unfocused3.svg) 0px 111px 0px 0px;
+  border-width: 0px 111px 0px 0px;
+  }
+  #FxFlowUnderlay_left_focus3[highlight="1"] {
+    margin-top: 92px;
   }
 
-#EffectSlotParameters {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+/* left-hand FX units, no focus */
+#FxFlowUnderlay_left_noFocus1 {
+  border-image: url(skin:/graphics/fxChainFlow_v_noFocus1.svg) 0px 95px 0px 0px;
+  border-width: 0px 95px 0px 0px;
+}
+#FxFlowUnderlay_left_noFocus2 {
+  margin-top: 46px;
+  border-image: url(skin:/graphics/fxChainFlow_v_noFocus2.svg) 0px 95px 0px 0px;
+  border-width: 0px 95px 0px 0px;
+}
+#FxFlowUnderlay_left_noFocus3 {
+  margin-top: 92px;
+  border-image: url(skin:/graphics/fxChainFlow_v_noFocus3.svg) 0px 95px 0px 0px;
+  border-width: 0px 95px 0px 0px;
 }
 
-#EffectFocusButton {
+#FxFocusButton {
   background-color: transparent;
 }
-  #EffectFocusButton[displayValue="0"] {
+  #FxFocusButton[displayValue="0"] {
     image: url(skin:/buttons/btn_fx_focus_off.svg) no-repeat center center;
     }
-    #EffectFocusButton[displayValue="0"]:hover {
+    #FxFocusButton[displayValue="0"]:hover {
       image: url(skin:/buttons/btn_fx_focus_off_hover.svg) no-repeat center center;
     }
-  #EffectFocusButton[displayValue="1"] {
+  #FxFocusButton[displayValue="1"] {
     image: url(skin:/buttons/btn_fx_focus_on.svg) no-repeat center center;
     }
-    #EffectFocusButton[displayValue="1"]:hover {
+    #FxFocusButton[displayValue="1"]:hover {
       image: url(skin:/buttons/btn_fx_focus_on_hover.svg) no-repeat center center;
     }
 
-#EffectTogglerMetaKnob, #EffectToggler {
+#FxToggleSelector {
   qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
-}
-#EffectToggler {
   border-radius: 3px;
-}
-
-  #EffectToggleButton {
+  }
+  #FxToggleButton[displayValue="0"]:hover {
+    border: 1px solid #ff8f00;
     }
-    #EffectToggleButton[displayValue="0"]:hover { /*
-      border: 1px solid #ffb401;  */
-      border: 1px solid #ff8f00;
-      }
-    #EffectToggleButton[displayValue="1"]:hover {
-      border: 1px solid #FFFFFF;
-      }
-    #EffectToggleButtonUnderlay[displayValue="0"] {
-      background-color: #777777;
-      }
-    #EffectToggleButtonUnderlay[displayValue="1"] { /*
-      background-color: #ffa601;*/
-      background-color: #ff8f00;	/* yellow2 	*/
-      }
-    #fxNameContainer {
-      padding: 1px;
-      qproperty-layoutAlignment: 'AlignLeft';
+  #FxToggleButton[displayValue="1"]:hover {
+    border: 1px solid #ffffff;
+    }
+  #FxToggleButtonUnderlay[displayValue="0"] {
+    background-color: #777777;
+    }
+  #FxToggleButtonUnderlay[displayValue="1"] {
+    background-color: #ff8f00;
+    }
+  #FxNameContainer {
+    padding: 1px;
+    qproperty-layoutAlignment: 'AlignLeft';
+    }
+    #FxName {
+      qproperty-alignment: 'AlignLeft | AlignVCenter';
+      color: #000000;
+      text-align: left;
+      font-size: 13px/12px;
+    }
+
+  WEffectSelector {
+    font-family: Ubuntu;
+    font-weight: normal;
+    font-size: 13px/13px;
+    color: #cccccc;
+    background-color: transparent;
+    /* Fixes the white bars on the top/bottom of the popup on Mac OS X */
+    margin: 0px;
+    /* If you use margin top/bottom 0, the combo box shrinks in width (go figure) and
+        names start getting cut off. Adding explicit padding improves this. */
+    padding: 0px;
+    /* The 3D frame on the combo box becomes flat when you give it a border */
+    border: 0px solid #666666;
+    border-radius: 3px;
+    }
+    WEffectSelector::drop-down {
+      width: 10px;
+      height: 20px;
+      border: 0;
+    }
+    WEffectSelector::down-arrow {
+      width: 10px;
+      height: 20px;
+      image: url(skin:/buttons/btn_fx_selector_list.svg);
       }
-      #fxName {
-        qproperty-alignment: 'AlignLeft | AlignVCenter';
-        color: #000000;
-        text-align: left;
-        font-size: 13px/12px;
+      WEffectSelector::down-arrow:hover {
+        width: 10px;
+        height: 20px;
+        image: url(skin:/buttons/btn_fx_selector_list_hover.svg);
       }
 
-    /* TODO: copied from Deere */
-    WEffectSelector {
+    WEffectSelector QAbstractItemView {
+      min-width: 142px;
+      max-width: 142px;
+      background-color: #202020;
+      /* padding-left: 6px; */
       font-family: Ubuntu;
-      font-weight: normal;
       font-size: 13px/13px;
-      color: #c1cabe;
-      background-color: transparent;
-      /* Fixes the white bars on the top/bottom of the popup on Mac OS X */
-      margin: 0px;
-      /* If you use margin top/bottom 0, the combo box shrinks in width (go figure) and
-      * names start getting cut off. Adding explicit padding improves this. */
-      padding: 0px;
-      /* The 3D frame on the combo box becomes flat when you give it a border */
-      border: 0px solid #666666;
+      /* On Linux, this is not applied but font color from WEffectSelector
+      is inherited.
+      On Windows, it must be defined here */
+      color: #cccccc;
+      border: 0px;
       border-radius: 2px;
-      }
-    #EffectTogglerLeft > WEffectSelector {
-      margin: 0px -73px 0px 2px;
-      }
-      WEffectSelector::drop-down {
-        /* This causes the Qt theme's widget style to magically not apply. Go figure. */
-        border: 0;
-      }
-      #EffectTogglerLeft > WEffectSelector::drop-down {
-        subcontrol-origin: margin;
-        subcontrol-position: bottom left;
-        /* This causes the Qt theme's widget style to magically not apply. Go figure. */
-        border: 0;
-      }
-      WEffectSelector::down-arrow {
-        width: 16px;
-        height: 16px; /*
-        margin-right: -2px;
-        image: url(skin:/buttons/btn_arrow_down.svg);
-        background-color: #FF00CA; */
-        image: url(skin:/buttons/btn_fx_selector.svg);
-        }
-        WEffectSelector::down-arrow:hover {
-          width: 16px;
-          height: 16px; /*
-          image: url(skin:/buttons/btn_arrow_down_hover.svg); */
-          image: url(skin:/buttons/btn_fx_selector_hover.svg);
-        }
-
-      WEffectSelector QAbstractItemView {
-        min-width: 90px;
-        max-width: 90px;
-        background-color: #202020;
-        padding-left: 6px;
-        font-family: Ubuntu;
-        font-weight: normal;
-        font-size: 13px/12px;
-        color: #cccccc;
-      }
-      /* selected item */
-      WEffectSelector::checked {
-        /* not applied
-        padding-left: 5px;
-        font-weight: bold;	*/
-        color: #00B4FF;
-      }
-      /* hovered items */
-      WEffectSelector::item:selected {
-        background-color: #0f0f0f;
-      /* This moves the tick mark behind item text,
-        text sits at left border now */
-        border: 0;
-      }
+    }
+    /* selected item */
+    WEffectSelector::checked {
+      /* not applied
+      padding-left: 5px;
+      font-weight: bold;	*/
+      color: #00b4ff;
+    }
+    /* hovered items */
+    WEffectSelector::item:selected {
+      background-color: #0f0f0f;
+    /* This moves the tick mark behind item text,
+      text sits at left border now
+      border: 0; */
+    }
+    WEffectSelector::indicator {
     /* This is sufficient to completely hide the tick mark, but
-      this alone would show an empty, shadowed box instead of tick mark */
-      WEffectSelector::indicator {
-        background-color: transparent;
-      }
+      this alone would show an empty, shadowed box instead of tick mark
+      background-color: transparent;
+      This should decrease the tick mark's left & right margin but is not respected */
+      margin: 0px -4px 0px -4px;
+    }
 
-#EffectKnobParameter {
+#FxParameterKnob {
   qproperty-layoutAlignment: 'AlignCenter';
   margin-right: 1px;
   }
-  #EffectKnobParameterName {
+  #FxParameterKnobName {
     qproperty-alignment: 'AlignLeft | AlignTop';
     font-size: 10px/10px;
     font-weight: bold;
@@ -1238,110 +1379,109 @@ WBeatSpinBox {
     margin-top: 19px;
   }
 
-#EffectButtonParameter {
+#FxParameterButton {
   qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
   margin-right: 1px;
   }
-  #EffectButtonParameterOverlay:hover {
+  #FxParameterButtonOverlay[displayValue="0"]:hover {
+    border: 1px solid #888888;
+  }
+  #FxParameterButtonOverlay[displayValue="1"]:hover {
     border: 1px solid #eeeeee;
-    }
-  #EffectButtonParameterUnderlay[displayValue="0"] {
+  }
+
+  #FxParameterButtonUnderlay[displayValue="0"] {
     background-color: #4b4b4b;
-    }
-  #EffectButtonParameterUnderlay[displayValue="1"] {
+  }
+  #FxParameterButtonUnderlay[displayValue="1"] {
     background-color: #006596;
-    }
-  #EffectButtonParameterName {
+  }
+  #FxParameterButtonName_0,
+  #FxParameterButtonName_1 {
     font-size: 10px/10px;
     font-weight: bold;
-    color: #999999;
     qproperty-alignment: 'AlignLeft | AlignVCenter';
     margin-left: 1px;
     }
-
-  #EffectLinkTypeButton[value="0"],
-  #EffectLinkInvertButton[displayValue="0"] {
-    background-color: #4b4b4b;
-    }
-    #EffectLinkTypeButton[value="0"]:hover,
-    #EffectLinkInvertButton[displayValue="0"]:hover {
-      background-color: #888888;
-    }
-  #EffectLinkTypeButton[value="1"] {
-    background-color: #006596;
+    #FxParameterButtonName_0 {
+      color: #aaaaaa;
     }
-    #EffectLinkTypeButton[value="1"]:hover {
-      background-color: #078DCD;
+    #FxParameterButtonName_1 {
+      color: #eeeeee;
     }
-  #EffectLinkTypeButton[value="2"] {	/*
+
+#FxSuperLinkButton[value="0"],
+#FxSuperLinkInvertButton[displayValue="0"] {
+  background-color: #4b4b4b;
+}
+#FxSuperLinkButton[value="0"]:hover {
+  border: 1px solid #888888;
+}
+
+#FxSuperLinkInvertButton[displayValue="0"]:hover {
+  background-color: #888888;
+}
+#FxSuperLinkInvertButton[displayValue="1"] {
+  background-color: #a90000;
+  }
+  #FxSuperLinkInvertButton[displayValue="1"]:hover {
+    background-color: #ff0000;
+  }
+
+#FxSuperLinkButton[value="1"] {
+  background-color: #006596;
+  }
+  #FxSuperLinkButton[value="1"]:hover {
+    background-color: #078dcd;
+  }
+#FxSuperLinkButton[value="2"] {	/*
+  a simple way to achive a partitioning in thirds	*/
+  background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
+    stop: 0 #006596,
+    stop: 0.33 #006596,
+    stop: 0.34 #4b4b4b,
+    stop: 1 #4b4b4b);
+  }
+  #FxSuperLinkButton[value="2"]:hover {	/*
     a simple way to achive a partitioning in thirds	*/
     background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
-      stop: 0 #006596,
-      stop: 0.33 #006596,
+      stop: 0 #078dcd,
+      stop: 0.33 #078dcd,
       stop: 0.34 #4b4b4b,
       stop: 1 #4b4b4b);
     }
-    #EffectLinkTypeButton[value="2"]:hover {	/*
-      a simple way to achive a partitioning in thirds	*/
-      background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
-        stop: 0 #078dcd,
-        stop: 0.33 #078dcd,
-        stop: 0.34 #4b4b4b,
-        stop: 1 #4b4b4b);
-      }
-  #EffectLinkTypeButton[value="3"] {
+#FxSuperLinkButton[value="3"] {
+  background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
+    stop: 0 #4b4b4b,
+    stop: 0.66 #4b4b4b,
+    stop: 0.67 #006596,
+    stop: 1 #006596);
+  }
+  #FxSuperLinkButton[value="3"]:hover {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
       stop: 0 #4b4b4b,
       stop: 0.66 #4b4b4b,
-      stop: 0.67 #006596,
-      stop: 1 #006596);
-    }
-    #EffectLinkTypeButton[value="3"]:hover {
-      background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
-        stop: 0 #4b4b4b,
-        stop: 0.66 #4b4b4b,
-        stop: 0.67 #078dcd,
-        stop: 1 #078dcd);
-      }
-  #EffectLinkTypeButton[value="4"] {
+      stop: 0.67 #078dcd,
+      stop: 1 #078dcd);
+    }
+#FxSuperLinkButton[value="4"] {
+  background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
+    stop: 0 #006596,
+    stop: 0.330000 #006596,
+    stop: 0.340000 #4b4b4b,
+    stop: 0.660000 #4b4b4b,
+    stop: 0.670000 #006596,
+    stop: 1 #006596);
+  }
+  #FxSuperLinkButton[value="4"]:hover {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
-      stop: 0 #006596,
-      stop: 0.330000 #006596,
+      stop: 0 #078dcd,
+      stop: 0.330000 #078dcd,
       stop: 0.340000 #4b4b4b,
       stop: 0.660000 #4b4b4b,
-      stop: 0.670000 #006596,
-      stop: 1 #006596);
-    }
-    #EffectLinkTypeButton[value="4"]:hover {
-      background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
-        stop: 0 #078dcd,
-        stop: 0.330000 #078dcd,
-        stop: 0.340000 #4b4b4b,
-        stop: 0.660000 #4b4b4b,
-        stop: 0.670000 #078dcd,
-        stop: 1 #078dcd);
-    }
-
-  #EffectLinkInvertButton[displayValue="1"] {
-    background-color: #a90000;
-    }
-    #EffectLinkInvertButton[displayValue="1"]:hover {
-      background-color: #ff0000;
-    }
-
-#EffectUnitToggleButton[displayValue="0"] {
-  background: #333333 url(skin:/buttons/btn_off.svg) no-repeat center center;
-  }
-  #EffectUnitToggleButton[displayValue="0"]:hover {
-    background: #333333 url(skin:/buttons/btn_on.svg) no-repeat center center;
-    border: 1px solid #888888;
+      stop: 0.670000 #078dcd,
+      stop: 1 #078dcd);
   }
-#EffectUnitToggleButton[displayValue="1"] {
-    background: #666666 url(skin:/buttons/btn_on.svg) no-repeat center center;
-  }
-  #EffectUnitToggleButton[displayValue="1"]:hover {
-      border: 1px solid #eeeeee;
-    }
 
 #FxAssignButton {
   font-size: 13px/13px;
@@ -1360,16 +1500,27 @@ WBeatSpinBox {
     border: 1px solid #ff8f00;
     }
     #FxAssignButton[displayValue="1"]:hover {
-      border: 1px solid #FFFFFF;
+      border: 1px solid #ffffff;
     }
 
-#EffectEject {
+#FxHeadMasterButton {
+  font-size: 13px/13px;
+  font-weight: bold;
+  text-align: center;
   background-color: #333333;
   }
-  #EffectEject:hover {
-    background-color: #ca0000;
-    border: 1px solid #ff0000;
-  }
+  #FxHeadMasterButton[displayValue="0"] {
+    color: #888888;
+    }
+    #FxHeadMasterButton[displayValue="0"]:hover {
+      border: 1px solid #ff8f00;
+    }
+  #FxHeadMasterButton[displayValue="1"] {
+    background-color: #ff8f00;
+    }
+    #FxHeadMasterButton[displayValue="1"]:hover {
+      border: 1px solid #ffffff;
+    }
 
 /*################################################################
  ######  Samplers  ##############################################
@@ -1384,52 +1535,60 @@ WBeatSpinBox {
 }
 
 #SamplerDeck {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop'; /*
-  margin-top: 3px;  */
-  margin-top: 5px;
+  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+  margin-bottom: 5px;
 }
 
-#FXSamplersMiniMaxiButton[displayValue="0"] {
-  image: url(skin:/buttons/btn_arrow_down_thin.svg) no-repeat top center;
+#FxSamplersMiniMaxi[displayValue="0"] {
+  image: url(skin:/buttons/btn_arrow_down.svg) no-repeat top center;
   }
-  #FXSamplersMiniMaxiButton[displayValue="0"]:hover {
-    image: url(skin:/buttons/btn_arrow_down_thin_hover.svg) no-repeat top center;
+  #FxSamplersMiniMaxi[displayValue="0"]:hover {
+    image: url(skin:/buttons/btn_arrow_down_hover.svg) no-repeat top center;
   }
-#FXSamplersMiniMaxiButton[displayValue="1"] {
-  image: url(skin:/buttons/btn_arrow_up_thin.svg) no-repeat top center;
+#FxSamplersMiniMaxi[displayValue="1"] {
+  image: url(skin:/buttons/btn_arrow_up.svg) no-repeat top center;
   }
-  #FXSamplersMiniMaxiButton[displayValue="1"]:hover {
-    image: url(skin:/buttons/btn_arrow_up_thin_hover.svg) no-repeat top center;
+  #FxSamplersMiniMaxi[displayValue="1"]:hover {
+    image: url(skin:/buttons/btn_arrow_up_hover.svg) no-repeat top center;
   }
 
-#SamplerPlayBox, #SamplerPlayBox_mini {
-  border-color: #0f0f0f;
-  background-color: #333333;
-}
-#SamplerPlayBox {
-  border-width: 1px 1px 1px 0px;
-}
-#SamplerPlayBox_mini {
-  padding: 0px 1px 0px 0px;
-}
-  #SamplerPlayCue, #SamplerPlayCueUnderlay {
-    border-radius: 0px;
+#FxSamplersMiniMaxi_Focus[displayValue="0"] {
+  image: url(skin:/buttons/btn_arrow_down_black.svg) no-repeat top center;
+  background-color: #ff8f00;
   }
-  #SamplerPlayCue[displayValue="0"]:hover {
-    border: 1px solid #666666;
-    background-color: #333333;
+  #FxSamplersMiniMaxi_Focus[displayValue="0"]:hover {
+    image: url(skin:/buttons/btn_arrow_down_black_hover.svg) no-repeat top center;
+    background-color: #ff8f00;
   }
-  #SamplerPlayCue[displayValue="1"] {
-    border: 1px solid #ca0000;
-    background-color: #a90000;
+
+#SamplerPlayBox,
+#SamplerPlayBox_mini {
+  border-color: #0f0f0f;
+  background-color: #333333;
   }
-  #SamplerPlayCue[displayValue="1"]:hover {
-    border: 1px solid #ff0000;
+  #SamplerPlayBox {
+    border-width: 1px 1px 1px 0px;
   }
-
-  #SamplerPlayCueUnderlay[displayValue="1"] {
-    background: #a90000;
+  #SamplerPlayBox_mini {
+    padding: 0px 1px 0px 0px;
+    }
+    #SamplerPlayCue,
+    #SamplerPlayCueUnderlay {
+      border-radius: 0px;
     }
+    #SamplerPlayCue[displayValue="0"]:hover {
+      border: 1px solid #666666;
+    }
+    #SamplerPlayCue[displayValue="1"] {
+      border: 1px solid #ca0000;
+      background-color: #a90000;
+    }
+    #SamplerPlayCue[displayValue="1"]:hover {
+      border: 1px solid #ff0000;
+    }
+    #SamplerPlayCueUnderlay[displayValue="1"] {
+      background: #a90000;
+      }
 
 WTrackProperty#SamplerTitle {
   font-size: 14px/18px;
@@ -1448,52 +1607,46 @@ WTrackProperty#SamplerTitle_mini {
   padding: 0px 2px 0px 0px;
 }
 
-#SamplerOverviewRow, #PreviewOverview {
-  background-color: #1a1a1a;
-}
-
-#SamplerOverview_mini {
-}
-
 #SamplerSyncGainPfl {
-  padding: 1px;	
+  padding: 1px;
 }
 
-#SamplerButton, #SamplerButton_mini {
+#SamplerButton,
+#SamplerButton_mini {
   font-size: 14px/14px;
   font-weight: bold;
   text-align: center;
   color: #888888;
 }
-#SamplerButton_mini, #SamplerGainKnob {
+#SamplerButton_mini,
+#SamplerGainKnob {
   background-color: #333333;
   border-radius: 2px;
-}
-  #SamplerButton:hover, #SamplerButton_mini:hover {
-    background-color: #0f0f0f;
   }
-  #SamplerKeylock {
-    margin-left: 3px;
+  #SamplerButton:hover,
+  #SamplerButton_mini:hover {
+    background-color: #0f0f0f;
   }
+#SamplerKeylock {
+  margin-left: 3px;
+}
 
-#SamplerVU, #SamplerPitchSlider {
+#SamplerVU,
+#SamplerPitchSlider {
   background-color: #333333;
-  }
+}
 
 #SamplerVU {
   padding: 2px 2px 1px 2px;
 }
 
-#SamplerPlay {
-  margin: 1px 1px 1px 0px;
-}
 #SamplerPlay_mini {
   margin-right: 1px;
 }
-        
+
 #SamplerSyncButton {
   background-color: #0f0f0f;
-}
+  }
   #SamplerSyncButton:hover {
     background-color: #0f0f0f;
     border: 1px solid #888888;
@@ -1521,7 +1674,9 @@ WTrackProperty#SamplerTitle_mini {
   background-color: #0f0f0f;
   border-bottom: 5px solid #1e1e1e;
 }
-#PreviewTitle, #PreviewEject, #PreviewGainKnob {
+#PreviewTitle,
+#PreviewEject,
+#PreviewGainKnob {
   background-color: #333333;
 }
 #PreviewTitleEject {
@@ -1541,16 +1696,15 @@ WTrackProperty#SamplerTitle_mini {
     text-align: left;
     color: #bababa;
   }
-  #PreviewEject {
-  }
   #PreviewEject:hover {
     border: 1px solid #eeeeee;
   }
-  #PreviewPlay, #PreviewOverview {
+  #PreviewPlay,
+  #PreviewOverview {
     margin-right: 1px;
   }
   #PreviewGainKnob {
-    padding-top: 2px;
+    padding-top: 6px;
   }
 
 
@@ -1560,22 +1714,10 @@ WTrackProperty#SamplerTitle_mini {
 
 QToolTip {
   background-color: #1e1e1e;
-  color: #CCCCCC;
+  color: #cccccc;
   border: 1px solid #333333;
 }
 
-#KnobTextless {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
-}
-#KnobLabel {
-  qproperty-alignment: 'AlignCenter | AlignBottom';
-  font-size: 10px/12px;
-  font-weight: bold;
-  color: #585858;
-  text-align: center;
-  padding-top: -1px;
-}
-
 #TEST {
   background-color: #451278;
 }
@@ -1591,26 +1733,30 @@ QToolTip {
     stop: 0 #0f0f0f,
     stop: 1 #006596);
   }
+
+#AlignTop {
+  qproperty-layoutAlignment: 'AlignTop';
+}
 #AlignLeft{
   qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
-  }
-  #AlignTopLeft {
-    qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-  }
-  #AlignBottomLeft {
-    qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
-  }
+}
+#AlignTopLeft {
+  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+}
+#AlignBottomLeft {
+  qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
+}
 #AlignRight {
-  qproperty-layoutAlignment: 'AlignRight | AlignBottom';
-  }
-  #AlignRightCenter {
-    qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
-  }
+qproperty-layoutAlignment: 'AlignRight | AlignBottom';
+}
+#AlignRightCenter {
+  qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
+}
 #AlignVCenter {
   qproperty-layoutAlignment: 'AlignVCenter';
 }
-#AlignTop {
-  qproperty-layoutAlignment: 'AlignTop';
+#AlignCenter {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
 }
 
 #Spacer0f {
@@ -1628,19 +1774,23 @@ QToolTip {
 #Spacer58 {
   background-color: #585858;
 }
+#SpacerFF {
+  background-color: #ffffff;
+}
 #Text33 {
   color: #333333;
   font-size: 1px/1px;
 }
+#RoundFiller25 {
+  background-color: #252525;
+  border-radius: 3px;
+}
 
 /*################################################################
  ######  Library styling is hard  ###############################
  ################### most of it was LateNight & Deere ##########
 ############ added styling for AutoDJ & Recording etc ##### */
 
-#Library {
-}
-
 #LibMiniMaxiButton {
   margin-bottom: 12px;
   }
@@ -1657,45 +1807,48 @@ QToolTip {
       image: url(skin:/buttons/btn_lib_mini_hover.svg) no-repeat center top;
     }
 
-#LibCoverbutton {
+#LibCoverArtButton {
   margin: 0px 0px 4px 2px;
   }
-  #LibCoverbutton[displayValue="0"] {
+  #LibCoverArtButton[displayValue="0"] {
     image: url(skin:/buttons/btn_lib_cover_off.svg) no-repeat center center;
     }
-    #LibCoverbutton[displayValue="1"], #LibCoverbutton[displayValue="0"]:hover {
+    #LibCoverArtButton[displayValue="1"],
+    #LibCoverArtButton[displayValue="0"]:hover {
       image: url(skin:/buttons/btn_lib_cover_on.svg) no-repeat center center;
       background-color: #0f0f0f;
     }
-    #LibCoverbutton[displayValue="1"]:hover {
+    #LibCoverArtButton[displayValue="1"]:hover {
       border: 1px solid #d2d2d2;
     }
 
-QTableView, QTextBrowser, QTreeView {
-  border: 1px solid #585858;  /*
-  font-family: Ubuntu;  */
+QTableView,
+QTextBrowser,
+QTreeView {
+  border: 1px solid #585858;
   font-weight: normal;
-  color: #9E9E9E;
+  color: #9e9e9e;
   background-color: #0f0f0f;
   alternate-background-color: #1a1a1a;
-  selection-color: #D9D9D9;
-  selection-background-color: #7A7A7A;
+  selection-color: #e6e6e6;
+  selection-background-color: #666666;
 }
 
 QTreeView {
   min-height: 90px;
   min-width: 90px;
-  border-width: 1px 1px 0px 0px;
+  border-width: 1px 1px 1px 0px;
   border-style: solid;
   border-color: #585858;
-  show-decoration-selected: 1;	/*
+  show-decoration-selected: 0;	/*
   Don't define top margin here, it won't shift ScrollBar.
-  Defined by SearchBox	*/ 
+  Defined by SearchBox	*/
   margin: 0px;
 }
-QTreeView:focus, QTableView:focus { /*
+QTreeView:focus,
+QTableView:focus { /*
   New Library navigation COs only work if TreeView or TableView have focus.
-  Clicking on buttons, sliders and visuals removes focus from Library.
+  Clicking on buttons, sliders and visuals elsewhere removes focus from Library.
   In conjuction with [Library],MoveFocusBackward/..Forward, this helps a lot. */
   border-color: #dddddd;
 }
@@ -1730,9 +1883,7 @@ QTreeView::item:selected {
   color: #cfcfcf;
   }
 
-QTableView {	/*
-  padding-top: 1px;
-  border-top: 0px;	*/
+QTableView {
 }
 
 QHeaderView {
@@ -1748,7 +1899,7 @@ QHeaderView {
     padding-left: 4px;
     padding-top: 1px;
     /*	set right border so that first column header
-    on the left doesn't have double border on the left	*/ 
+    on the left doesn't have double border on the left	*/
     border-right: 1px solid #585858;
     background-color: #333333;
     border-radius: 0px;
@@ -1757,29 +1908,31 @@ QHeaderView {
     background-color: #585858;
     border-radius: 0px;
     }
-  
+
 /* Scroll bars */
 QScrollBar:horizontal {
   min-width: 12px;
   height: 8px;
-  background: #1a1a1a;
+  background: #000000;
   border-radius: 2px;
   }
   QScrollBar:vertical {
     min-height: 12px;
     width: 8px;
-    background: #1a1a1a;
+    background: #000000;
     border-radius: 2px;
     }
   /* "add-page" and "sub-page" are the gutter of the scrollbar */
-  QScrollBar::add-page, QScrollBar::sub-page {
+  QScrollBar::add-page,
+  QScrollBar::sub-page {
     min-width: 15px;
     min-height: 15px;
-    background-color: #1b1b1b;
+    background-color: #0f0f0f;
     }
   QScrollBar::handle:horizontal {
     min-width: 25px;
     background: #595959;
+    border-radius:2px;
     }
     QScrollBar::handle:horizontal:hover {
       background: #888888;
@@ -1787,20 +1940,23 @@ QScrollBar:horizontal {
   QScrollBar::handle:vertical {
     min-height: 25px;
     background: #595959;
+    border-radius:2px;
     }
     QScrollBar::handle:vertical:hover {
       background: #888888;
     }
   /* Turn off scroll buttons */
-  QScrollBar::add-line:horizontal, QScrollBar::add-line:vertical {
+  QScrollBar::add-line:horizontal,
+  QScrollBar::add-line:vertical {
     width: 0px;
     height: 0px;
   }
-  QScrollBar::sub-line:horizontal, QScrollBar::sub-line:vertical {
+  QScrollBar::sub-line:horizontal,
+  QScrollBar::sub-line:vertical {
     width: 0px;
     height: 0px;
   }
-    
+
 /* splitters between treeview and library table */
 #LibrarySplitter::handle:horizontal {
   image: url(skin:/graphics/splitterHori_handle.png);
@@ -1848,7 +2004,7 @@ Library features and their buttons:
   DlgRecording
     QLabel#label > "Status: ..."
     QPushButton#pushButtonRecording > un/checked
-    
+
   	*/
 QPushButton {
   text-align: center;
@@ -1873,17 +2029,16 @@ QPushButton {
     }
   QPushButton:checked {
     color: #000000;
-    font-weight: bold;	/*
-    background-color: #666666;	*/
-    background-color: #FF7B00;
+    font-weight: bold;
+    background-color: #ff7b00;
     }
   QPushButton:checked:hover {
-    border: 1px solid #FF3F00;
+    border: 1px solid #ff3f00;
     }
   /* 'Enable AutoDJ' button	*/
   QPushButton#pushButtonAutoDJ:unchecked:hover {
     min-width: 112px;
-    background-color: #FF7B00;
+    background-color: #ff7b00;
   }
   /* 'Start/Stop Recording' button	*/
   QPushButton#pushButtonRecording {
@@ -1909,11 +2064,11 @@ QPushButton {
       image: url(skin:/graphics/bpm_unlocked.png);
       }
     #LibraryBPMButton::item {
-      color: #CFCFCF;
+      color: #cfcfcf;
       }
     #LibraryBPMButton::item:selected {
-      color: #EDEDED;
-      background-color: #7A7A7A;
+      color: #ededed;
+      background-color: #666666;
       }
   #LibraryTimesPlayed::item {
     color: #cfcfcf;
@@ -1925,37 +2080,38 @@ QPushButton {
     height: 12px;
     background: transparent;
     border: 0px;
+    margin: 0px;
+    padding: 0px;
     }
-
     QPushButton#LibraryPreviewButton:!checked{
       image: url(skin:/graphics/library_preview_play.png);
       }
     QPushButton#LibraryPreviewButton:checked{
       image: url(skin:/graphics/library_preview_pause.png);
       }
-      
+
   /* checkbox in library "Played" column */
   QTableView::indicator {
     width: 12px;
     height: 12px;
     margin: 0px;
     padding: 0px;
-    color: #CFCFCF;
+    color: #cfcfcf;
     }
     QTableView::indicator:checked {
       background: transparent url(skin:/graphics/checkbox_checked.png) no-repeat center center;
-      color: #CFCFCF;
+      color: #cfcfcf;
       }
     QTableView::indicator:unchecked {
       background: transparent url(skin:/graphics/checkbox_unchecked.png) no-repeat center center;
-      color: #CFCFCF;
+      color: #cfcfcf;
       }
-  /* selected table row */ 
+  /* selected table row */
   QTableView::item:selected {
-    color: #D9D9D9;
-    background-color: #7A7A7A;
+    color: #ffffff;
+    background-color: #666666;
   }
-  
+
 /* SpinBox, currently only used for transition time in Auto DJ tab */
 WLibrary QSpinBox {
   min-height: 20px;
@@ -1965,12 +2121,12 @@ WLibrary QSpinBox {
   }
   WLibrary QSpinBox:editable {
     background: transparent;
-    color: #FFA600;
+    color: #ffa600;
     selection-background-color: #d2d2d2;
     selection-color: #0f0f0f;
   }
   WLibrary QSpinBox:editable:focus {
-    border: 1px solid #FF6600;
+    border: 1px solid #ff6600;
   }
 
 /* library search text box */
@@ -1980,20 +2136,25 @@ WSearchLineEdit {
   border-left: 0px;
   font-family: Ubuntu;
   font-weight: normal;
-  font-size: 12px/12px;
+  font-size: 14px/14px;
   background: #0f0f0f;
-  color: #CFCFCF;
+  color: #cfcfcf;
   selection-background-color: #d2d2d2;
   selection-color: #0f0f0f;
   margin-bottom: 5px;
   }
   WSearchLineEdit:focus {
+    border: 2px solid #ff6600;
+    color: #eeeeee;
     padding: 2px;
-    border: 2px solid #FF6600;
-    color: #eeeeee;	/* grey	*/
-    }
+  }
+  /* Clear button next to text field */
+  WSearchLineEdit QToolButton {
+    margin-bottom: 4px;
+  }
 
-QLabel, QRadioButton {	/* 
+QLabel,
+QRadioButton {	/*
   background: transparent;
   Extra declaration for QRadioButton otherwise it shows up with
   wrong colors in Linux with Gnome 	*/
diff --git a/res/skins/Tango/crossfader_skincontrols_netbook.xml b/res/skins/Tango/topbar_netbook.xml
similarity index 56%
rename from res/skins/Tango/crossfader_skincontrols_netbook.xml
rename to res/skins/Tango/topbar_netbook.xml
index c177445652b4..d2f426431624 100644
--- a/res/skins/Tango/crossfader_skincontrols_netbook.xml
+++ b/res/skins/Tango/topbar_netbook.xml
@@ -15,7 +15,7 @@ Description:
     <Layout>horizontal</Layout>
     <SizePolicy>me,min</SizePolicy>
     <Children>
-    
+
       <WidgetGroup><!-- Skin Controls -->
         <Layout>horizontal</Layout>
         <ObjectName>SkinControlsBarLeft</ObjectName>
@@ -28,10 +28,10 @@ Description:
             <SetVariable name="Size">34f,20f</SetVariable>
             <SetVariable name="state_0_text">FX</SetVariable>
             <SetVariable name="state_1_text">FX</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[EffectRack1],show</SetVariable>
+            <SetVariable name="ConfigKey">[EffectRack1],show</SetVariable>
           </Template>
 
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size><Children/></WidgetGroup>
+          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
           <Template src="skin:button_2state_persist.xml"><!-- Samplers -->
             <SetVariable name="TooltipId">show_samplers</SetVariable>
@@ -39,10 +39,10 @@ Description:
             <SetVariable name="Size">34f,20f</SetVariable>
             <SetVariable name="state_0_text">SAM</SetVariable>
             <SetVariable name="state_1_text">SAM</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Samplers],show_samplers</SetVariable>
+            <SetVariable name="ConfigKey">[Samplers],show_samplers</SetVariable>
           </Template>
 
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size><Children/></WidgetGroup>
+          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
           <Template src="skin:button_2state_persist.xml"><!-- Library -->
             <SetVariable name="TooltipId">show_library</SetVariable>
@@ -50,10 +50,10 @@ Description:
             <SetVariable name="Size">34f,20f</SetVariable>
             <SetVariable name="state_0_text">LIB</SetVariable>
             <SetVariable name="state_1_text">LIB</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Library],show_library</SetVariable>
+            <SetVariable name="ConfigKey">[Library],show_library</SetVariable>
           </Template>
 
-          <WidgetGroup><Size>10f,1min</Size><Children/></WidgetGroup>
+          <WidgetGroup><Size>10f,1min</Size></WidgetGroup>
 
           <Template src="skin:button_2state_persist.xml"><!-- 4 Decks -->
             <SetVariable name="ObjectName">GuiToggleButton2</SetVariable>
@@ -63,10 +63,10 @@ Description:
             <SetVariable name="state_0_unpressed">2decks.svg</SetVariable>
             <SetVariable name="state_1_pressed">4decks.svg</SetVariable>
             <SetVariable name="state_1_unpressed">4decks.svg</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Master],show_4decks</SetVariable>
+            <SetVariable name="ConfigKey">[Master],show_4decks</SetVariable>
           </Template>
 
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size><Children/></WidgetGroup>
+          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
           <Template src="skin:button_2state_persist.xml"><!-- Waveforms -->
             <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
@@ -75,10 +75,10 @@ Description:
             <SetVariable name="state_0_unpressed">wave_off.svg</SetVariable>
             <SetVariable name="state_1_pressed">wave_on.svg</SetVariable>
             <SetVariable name="state_1_unpressed">wave_on.svg</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Tango],stacked_waveforms</SetVariable>
+            <SetVariable name="ConfigKey">[Tango],stacked_waveforms</SetVariable>
           </Template>
 
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size><Children/></WidgetGroup>
+          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
           <Template src="skin:button_2state_persist.xml"><!-- Spinny -->
             <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
@@ -87,23 +87,22 @@ Description:
             <SetVariable name="state_0_unpressed">mixerbar_off.svg</SetVariable>
             <SetVariable name="state_1_pressed">mixerbar_on.svg</SetVariable>
             <SetVariable name="state_1_unpressed">mixerbar_on.svg</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Tango],mixerbar</SetVariable>
+            <SetVariable name="ConfigKey">[Tango],mixerbar</SetVariable>
           </Template>
 
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size><Children/></WidgetGroup>
+          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
           <Template src="skin:button_2state_persist.xml">
-              <SetVariable name="TooltipId"></SetVariable>
-              <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
-              <SetVariable name="Size">20f,20f</SetVariable>
-              <SetVariable name="state_0_unpressed">hotcues_off.svg</SetVariable>
-              <SetVariable name="state_0_pressed">hotcues_off.svg</SetVariable>
-              <SetVariable name="state_1_unpressed">hotcues_on.svg</SetVariable>
-              <SetVariable name="state_1_pressed">hotcues_on.svg</SetVariable>
-              <SetVariable name="ConfigKeyPerm">[Tango],hotcues</SetVariable>
+            <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
+            <SetVariable name="Size">20f,20f</SetVariable>
+            <SetVariable name="state_0_unpressed">hotcues_off.svg</SetVariable>
+            <SetVariable name="state_0_pressed">hotcues_off.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">hotcues_on.svg</SetVariable>
+            <SetVariable name="state_1_pressed">hotcues_on.svg</SetVariable>
+            <SetVariable name="ConfigKey">[Tango],hotcues</SetVariable>
           </Template>
 
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size><Children/></WidgetGroup>
+          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
           <Template src="skin:button_2state_persist.xml"><!-- Mixer -->
             <SetVariable name="TooltipId">show_mixer</SetVariable>
@@ -113,7 +112,7 @@ Description:
             <SetVariable name="state_0_unpressed">mixer_off.svg</SetVariable>
             <SetVariable name="state_1_pressed">mixer_on.svg</SetVariable>
             <SetVariable name="state_1_unpressed">mixer_on.svg</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Tango],channel_mixer</SetVariable>
+            <SetVariable name="ConfigKey">[Tango],channel_mixer</SetVariable>
           </Template>
 
         </Children>
@@ -129,13 +128,12 @@ Description:
         <Children>
 
           <WidgetGroup><!-- Crossfader -->
-            <ObjectName>AlignHCenter</ObjectName>
+            <ObjectName>CrossfaderNetbook</ObjectName>
             <SizePolicy>min,min</SizePolicy>
             <Layout>horizontal</Layout>
             <Children>
-              <WidgetGroup><Size>10f,1min</Size><Children/></WidgetGroup>
+              <WidgetGroup><Size>10f,1min</Size></WidgetGroup>
               <SliderComposed>
-                <ObjectName>Crossfader</ObjectName>
                 <TooltipId>crossfader</TooltipId>
                 <Handle>skin:/knobs_sliders/slider_crossfader_handle.svg</Handle>
                 <Slider>skin:/knobs_sliders/slider_crossfader_scale.svg</Slider>
@@ -144,7 +142,7 @@ Description:
                   <ConfigKey>[Master],crossfader</ConfigKey>
                 </Connection>
               </SliderComposed>
-              <WidgetGroup><Size>10f,1min</Size><Children/></WidgetGroup>
+              <WidgetGroup><Size>10f,1min</Size></WidgetGroup>
             </Children>
             <Connection>
               <ConfigKey persist="true">[Tango],crossfader</ConfigKey>
@@ -152,155 +150,29 @@ Description:
             </Connection>
           </WidgetGroup><!-- /Crossfader -->
 
-          <!-- Spacers instead of Crossfader -->
-          <WidgetGroup>
-            <SizePolicy>max,1f</SizePolicy>
-            <Layout>horizontal</Layout>
-            <Children>
-
-              <WidgetGroup><!-- Spacer between decks -->
-                <Size>6f,0f</Size>
-                <Children/>
-              </WidgetGroup>
-
-              <WidgetGroup><!-- Pitch fader spacer -->
-                <Size>106f,0f</Size>
-                <Children/>
-                <Connection>
-                  <ConfigKey>[Tango],pitch_fader</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <WidgetGroup><!-- VU Meter spacer when Channel Mixer is hidden -->
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <WidgetGroup>
-                    <Layout>horizontal</Layout>
-                    <Size>22f,0f</Size>
-                    <Children/>
-                    <Connection>
-                      <ConfigKey>[Tango],vumeter</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
-                  <WidgetGroup>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Children>
-                      <WidgetGroup>
-                        <Layout>horizontal</Layout>
-                        <Size>228f,0f</Size>
-                        <Children/>
-                        <Connection>
-                          <ConfigKey>[Tango],spinny_cover_none</ConfigKey>
-                          <Transform><IsEqual>2</IsEqual><Not/></Transform>
-                          <BindProperty>visible</BindProperty>
-                        </Connection>
-                      </WidgetGroup>
-                    </Children>
-                    <Connection>
-                      <ConfigKey>[Tango],spinnyCoverBIG</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Tango],channel_mixer</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                  <Transform><Not/></Transform>
-                </Connection>
-              </WidgetGroup>
-
-              <WidgetGroup><!-- Channel Mixer, optional VU meter, EQs and Filter knobs -->
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <WidgetGroup><!-- Basic mixer -->
-                    <Layout>horizontal</Layout>
-                    <Size>88f,0f</Size>
-                    <Children/>
-                  </WidgetGroup>
-                  <WidgetGroup><!-- VU meter -->
-                    <Layout>horizontal</Layout>
-                    <Size>24f,0f</Size>
-                    <Children/>
-                    <Connection>
-                      <ConfigKey>[Tango],vumeter</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
-                  <WidgetGroup><!-- EQ knobs, optional Filter knob -->
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Children>
-                      <WidgetGroup>
-                        <Size>108f,0f</Size>
-                        <Children/>
-                      </WidgetGroup>
-                      <WidgetGroup>
-                        <Layout>horizontal</Layout>
-                        <Size>12f,0f</Size>
-                        <Children/>
-                        <Connection>
-                          <ConfigKey>[Tango],filter_knob</ConfigKey>
-                          <BindProperty>visible</BindProperty>
-                        </Connection>
-                      </WidgetGroup>
-                    </Children>
-                    <Connection>
-                      <ConfigKey>[Tango],eq_knobs</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup><!-- /EQ knobs, optional Filter knob -->
-                </Children>
-                <Connection>
-                  <ConfigKey>[Tango],channel_mixer</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-            </Children>
-          </WidgetGroup><!-- /Spacers instead of Crossfader -->
+          <!-- zero-height spacers below Crossfader -->
+          <Template src="skin:spacer_topbar_netbook.xml"/>
 
         </Children>
       </WidgetGroup><!-- Stack of spacers for PitchSlider, VUMeter etc.
                       Crossfader lies on top if enabled -->
-      
+
       <WidgetGroup><!-- Logo, Rec, Broadcast, Clock, Skinsettings -->
         <Layout>horizontal</Layout>
         <ObjectName>SkinControlsBarRight</ObjectName>
         <SizePolicy>me,min</SizePolicy>
         <Children>
-
-          <Template src="skin:button_2state.xml">
-            <SetVariable name="ObjectName">SkinSettingsToggler</SetVariable>
-            <SetVariable name="Size">24f,24f</SetVariable>
-            <SetVariable name="ConfigKey">[Tango],skin_settings</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
-
-          <Time>
-            <TooltipId>time</TooltipId>
-            <ObjectName>Clock</ObjectName>
-            <Size>30min,20f</Size>
-            <ShowSeconds>false</ShowSeconds>
-            <!-- This has no effect, neither has 'text-align' in qss.
-            <Align>center</Align>   -->
-          </Time>
-
-          <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
-
-          <Template src="skin:button_4state_display.xml">
-            <SetVariable name="TooltipId">broadcast_enabled</SetVariable>
-            <SetVariable name="ObjectName">BroadcastButtonNetbook</SetVariable>
-            <SetVariable name="Size">24f,24f</SetVariable>
-            <SetVariable name="ConfigKey">[Shoutcast],enabled</SetVariable>
-            <SetVariable name="ConfigKeyDisp">[Shoutcast],status</SetVariable>
+          <Template src="skin:button_2state_persist.xml">
+            <SetVariable name="ObjectName">LogoMaxi</SetVariable>
+            <SetVariable name="Size">81f,20f</SetVariable>
+            <SetVariable name="state_0_pressed">logo_104x26_grey.svg</SetVariable>
+            <SetVariable name="state_0_unpressed">logo_104x26_grey.svg</SetVariable>
+            <SetVariable name="state_1_pressed">logo_104x26.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">logo_104x26.svg</SetVariable>
+            <SetVariable name="ConfigKey">[Tango],colorLogo</SetVariable>
           </Template>
 
-          <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
+          <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
 
           <WidgetGroup><!-- Recording button & recording duration label -->
             <Layout>stacked</Layout>
@@ -308,30 +180,82 @@ Description:
             <Children>
               <Template src="skin:button_3state_display.xml">
                 <SetVariable name="ObjectName">RecordingButton</SetVariable>
+                <SetVariable name="TooltipId">toggle_recording</SetVariable>
                 <SetVariable name="Size">60f,20f</SetVariable>
                 <SetVariable name="state_0_text">REC</SetVariable>
                 <SetVariable name="state_1_text">. . .</SetVariable>
+                <!-- Empty to show the RecordingDuration underneath -->
+                <SetVariable name="state_2_text"></SetVariable>
                 <SetVariable name="ConfigKey">[Recording],toggle_recording</SetVariable>
                 <SetVariable name="ConfigKeyDisp">[Recording],status</SetVariable>
               </Template>
-              <RecordingDuration>
-                <ObjectName>RecDurationLabel</ObjectName>
+
+              <WidgetGroup><!-- Rec dot + RecDuration -->
+                <Layout>horizontal</Layout>
                 <Size>60f,20f</Size>
-                <Alignment>center</Alignment>
-              </RecordingDuration>
+                <Children>
+                  <WidgetGroup>
+                    <ObjectName>RecDot</ObjectName>
+                    <Size>15f,20f</Size>
+                  </WidgetGroup>
+
+                  <RecordingDuration>
+                    <ObjectName>RecDurationLabel</ObjectName>
+                    <Size>45f,20f</Size>
+                    <Alignment>center</Alignment>
+                  </RecordingDuration>
+                </Children>
+              </WidgetGroup><!-- /Rec dot + RecDuration -->
             </Children>
           </WidgetGroup><!-- /Recording button & recording duration label -->
 
-          <WidgetGroup><Size>5f,1min</Size><Children/></WidgetGroup>
-          
-          <Template src="skin:button_2state_persist.xml">
-            <SetVariable name="ObjectName">LogoMaxi</SetVariable>
-            <SetVariable name="Size">81f,20f</SetVariable>
-            <SetVariable name="state_0_pressed">logo_104x26_grey.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">logo_104x26_grey.svg</SetVariable>
-            <SetVariable name="state_1_pressed">logo_104x26.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">logo_104x26.svg</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Tango],colorLogo</SetVariable>
+          <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+          <Template src="skin:button_4state_display.xml">
+            <SetVariable name="TooltipId">broadcast_enabled</SetVariable>
+            <SetVariable name="ObjectName">BroadcastButtonNetbook</SetVariable>
+            <SetVariable name="Size">24f,24f</SetVariable>
+            <SetVariable name="ConfigKey">[Shoutcast],enabled</SetVariable>
+            <SetVariable name="ConfigKeyDisp">[Shoutcast],status</SetVariable>
+          </Template>
+
+          <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
+
+          <WidgetGroup><!-- Clock + latency display -->
+            <Size>32f,24min</Size>
+            <Layout>vertical</Layout>
+            <Children>
+              <Time>
+                <TooltipId>time</TooltipId>
+                <ObjectName>Clock</ObjectName>
+                <Size>32f,16f</Size>
+                <ShowSeconds>false</ShowSeconds>
+                <!-- This has no effect, neither has 'text-align' in qss.
+                <Align>center</Align>   -->
+              </Time>
+              <VuMeter><!-- latency usage -->
+                <Size>31f,3f</Size>
+                <TooltipId>audio_latency_usage</TooltipId>
+                <PathVu>skin:/graphics/latency_usage_over.png</PathVu>
+                <PathBack>skin:/graphics/latency_usage.png</PathBack>
+                <Horizontal>true</Horizontal>
+                <PeakHoldSize>5</PeakHoldSize>
+                <PeakHoldTime>1000</PeakHoldTime>
+                <PeakFallTime>100</PeakFallTime>
+                <PeakFallStep>1</PeakFallStep>
+                <Connection>
+                  <ConfigKey>[Master],audio_latency_usage</ConfigKey>
+                </Connection>
+              </VuMeter><!-- /latency usage -->
+            </Children>
+          </WidgetGroup><!-- Clock + latency display -->
+
+          <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
+
+          <Template src="skin:button_2state.xml">
+            <SetVariable name="ObjectName">SkinSettingsToggler</SetVariable>
+            <SetVariable name="Size">24f,24f</SetVariable>
+            <SetVariable name="ConfigKey">[Tango],skin_settings</SetVariable>
           </Template>
 
         </Children>
diff --git a/res/skins/Tango/vinyl_controls_left.xml b/res/skins/Tango/vinyl_controls_left.xml
index 0a14bf96904e..9a879b3fc7db 100644
--- a/res/skins/Tango/vinyl_controls_left.xml
+++ b/res/skins/Tango/vinyl_controls_left.xml
@@ -10,7 +10,7 @@ Variables:
 -->
 <Template>
   <WidgetGroup>
-    <ObjectName>VinylControls</ObjectName>
+    <ObjectName>Spacer0f</ObjectName>
     <Layout>vertical</Layout>
     <Size>1min,50f</Size>
     <Children>
@@ -20,22 +20,35 @@ Variables:
         <Size>80f,24f</Size>
         <Children>
 
-          <Template src="skin:button_2state_persist.xml">
-            <SetVariable name="TooltipId">vinylcontrol_enabled</SetVariable>
-            <SetVariable name="ObjectName">VinylButton</SetVariable>
-            <SetVariable name="Size">40f,24f</SetVariable>
-            <SetVariable name="state_0_text">VINYL</SetVariable>
-            <SetVariable name="state_1_text">VINYL</SetVariable>
-            <SetVariable name="ConfigKeyPerm"><Variable name="group"/>,vinylcontrol_enabled</SetVariable>
-          </Template>
+          <WidgetGroup>
+            <Layout>stacked</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <Template src="skin:button_2state.xml">
+                <SetVariable name="TooltipId">vinylcontrol_enabled</SetVariable>
+                <SetVariable name="ObjectName">VinylControlButton</SetVariable>
+                <SetVariable name="Size">40f,24f</SetVariable>
+                <SetVariable name="state_0_text">VINYL</SetVariable>
+                <SetVariable name="state_1_text">VINYL</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="group"/>,vinylcontrol_enabled</SetVariable>
+                <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,vinylcontrol_status</SetVariable>
+              </Template>
 
-          <Template src="skin:button_2state_persist.xml">
+              <Template src="skin:statuslight_4state.xml">
+                <SetVariable name="ObjectName">VinylControlStatus</SetVariable>
+                <SetVariable name="Size">40f,24f</SetVariable>
+                <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,vinylcontrol_status</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <Template src="skin:button_2state.xml">
             <SetVariable name="TooltipId">passthrough_enabled</SetVariable>
-            <SetVariable name="ObjectName">VinylButton</SetVariable>
+            <SetVariable name="ObjectName">PassthroughButton</SetVariable>
             <SetVariable name="Size">40f,24f</SetVariable>
             <SetVariable name="state_0_text">PASS</SetVariable>
             <SetVariable name="state_1_text">PASS</SetVariable>
-            <SetVariable name="ConfigKeyPerm"><Variable name="group"/>,passthrough</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="group"/>,passthrough</SetVariable>
           </Template>
 
         </Children>
@@ -55,22 +68,21 @@ Variables:
             <SetVariable name="state_0_text">ABS</SetVariable>
             <SetVariable name="state_1_text">REL</SetVariable>
             <SetVariable name="state_2_text">CONST</SetVariable>
-            <SetVariable name="ConfigKeyPerm"><Variable name="group"/>,vinylcontrol_mode</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="group"/>,vinylcontrol_mode</SetVariable>
           </Template>
 
           <WidgetGroup><!-- Cue mode button with translucent cover -->
             <Layout>stacked</Layout>
-            <Size>40f,23me</Size>
+            <Size>40f,24f</Size>
             <Children>
               <!-- index 0 due to bug -->
               <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
 
-              <!-- Block mouse when Vinyl control not RELATIVE mode -->
+              <!-- Block mouse when Vinyl control is not in RELATIVE mode -->
               <WidgetGroup>
                 <ObjectName>SubmenuCover</ObjectName>
                 <Layout>vertical</Layout>
-                <SizePolicy>me,me</SizePolicy>
-                <Children/>
+                <Size>40f,24f</Size>
                 <Connection>
                   <ConfigKey persist="true"><Variable name="group"/>,vinylcontrol_mode</ConfigKey>
                   <Transform><IsEqual>1</IsEqual><Not/></Transform>
@@ -80,12 +92,12 @@ Variables:
 
               <Template src="skin:button_3state_persist.xml">
                 <SetVariable name="TooltipId">vinylcontrol_cueing</SetVariable>
-                <SetVariable name="ObjectName">VinylButton</SetVariable>
-                <SetVariable name="Size">40f,23me</SetVariable>
+                <SetVariable name="ObjectName">VinylCueModeButton</SetVariable>
+                <SetVariable name="Size">40f,24f</SetVariable>
                 <SetVariable name="state_0_text">CUE</SetVariable>
                 <SetVariable name="state_1_text">CUE</SetVariable>
                 <SetVariable name="state_2_text">HOT</SetVariable>
-                <SetVariable name="ConfigKeyPerm"><Variable name="group"/>,vinylcontrol_cueing</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="group"/>,vinylcontrol_cueing</SetVariable>
               </Template>
             </Children>
           </WidgetGroup><!-- /Cue mode button with translucent covers -->
@@ -93,7 +105,7 @@ Variables:
         </Children>
       </WidgetGroup>
 
-      <WidgetGroup><Size>1min,1f</Size><Children/></WidgetGroup>
+      <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
 
     </Children>
     <Connection>
diff --git a/res/skins/Tango/vinyl_controls_right.xml b/res/skins/Tango/vinyl_controls_right.xml
index 06cacafd67aa..6294f7eee0a7 100644
--- a/res/skins/Tango/vinyl_controls_right.xml
+++ b/res/skins/Tango/vinyl_controls_right.xml
@@ -10,14 +10,13 @@ Variables:
 -->
 <Template>
   <WidgetGroup>
-    <ObjectName>VinylControls</ObjectName>
+    <ObjectName>Spacer0f</ObjectName>
     <Layout>vertical</Layout>
     <Size>1min,50f</Size>
     <Children>
 
       <WidgetGroup>
         <Size>1min,1f</Size>
-        <Children/>
         <Connection>
           <ConfigKey persist="true">[Tango],symmetric_overviews</ConfigKey>
           <Transform><Not/></Transform>
@@ -26,36 +25,34 @@ Variables:
       </WidgetGroup>
 
       <WidgetGroup>
-        <ObjectName>blaaa1</ObjectName>
         <Layout>horizontal</Layout>
         <Size>80f,24f</Size>
         <Children>
 
-          <Template src="skin:button_2state_persist.xml">
+          <Template src="skin:button_2state.xml">
             <SetVariable name="TooltipId">vinylcontrol_enabled</SetVariable>
             <SetVariable name="ObjectName">VinylButton</SetVariable>
             <SetVariable name="Size">40f,24f</SetVariable>
             <SetVariable name="state_0_text">VINYL</SetVariable>
             <SetVariable name="state_1_text">VINYL</SetVariable>
-            <SetVariable name="ConfigKeyPerm"><Variable name="group"/>,vinylcontrol_enabled</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="group"/>,vinylcontrol_enabled</SetVariable>
           </Template>
 
-          <Template src="skin:button_2state_persist.xml">
+          <Template src="skin:button_2state.xml">
             <SetVariable name="TooltipId">passthrough_enabled</SetVariable>
-            <SetVariable name="ObjectName">VinylButton</SetVariable>
+            <SetVariable name="ObjectName">PassthroughButton</SetVariable>
             <SetVariable name="Size">40f,24f</SetVariable>
             <SetVariable name="state_0_text">PASS</SetVariable>
             <SetVariable name="state_1_text">PASS</SetVariable>
-            <SetVariable name="ConfigKeyPerm"><Variable name="group"/>,passthrough</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="group"/>,passthrough</SetVariable>
           </Template>
 
         </Children>
       </WidgetGroup>
 
-      <WidgetGroup><Size>1min,1f</Size><Children/></WidgetGroup>
+      <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
 
       <WidgetGroup>
-        <ObjectName>blaaa2</ObjectName>
         <Layout>horizontal</Layout>
         <Size>80f,23min</Size>
         <Children>
@@ -67,7 +64,7 @@ Variables:
             <SetVariable name="state_0_text">ABS</SetVariable>
             <SetVariable name="state_1_text">REL</SetVariable>
             <SetVariable name="state_2_text">CONST</SetVariable>
-            <SetVariable name="ConfigKeyPerm"><Variable name="group"/>,vinylcontrol_mode</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="group"/>,vinylcontrol_mode</SetVariable>
           </Template>
 
           <WidgetGroup><!-- Cue mode button with translucent cover -->
@@ -77,12 +74,11 @@ Variables:
               <!-- index 0 due to bug -->
               <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
 
-              <!-- Block mouse when Vinyl control not RELATIVE mode -->
+              <!-- Block mouse when Vinyl control is not in RELATIVE mode -->
               <WidgetGroup>
                 <ObjectName>SubmenuCover</ObjectName>
                 <Layout>vertical</Layout>
-                <SizePolicy>me,me</SizePolicy>
-                <Children/>
+                <Size>40f,23me</Size>
                 <Connection>
                   <ConfigKey persist="true"><Variable name="group"/>,vinylcontrol_mode</ConfigKey>
                   <Transform><IsEqual>1</IsEqual><Not/></Transform>
@@ -97,7 +93,7 @@ Variables:
                 <SetVariable name="state_0_text">CUE</SetVariable>
                 <SetVariable name="state_1_text">CUE</SetVariable>
                 <SetVariable name="state_2_text">HOT</SetVariable>
-                <SetVariable name="ConfigKeyPerm"><Variable name="group"/>,vinylcontrol_cueing</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="group"/>,vinylcontrol_cueing</SetVariable>
               </Template>
             </Children>
           </WidgetGroup><!-- /Cue mode button with translucent covers -->
@@ -107,7 +103,6 @@ Variables:
 
       <WidgetGroup>
         <Size>1min,1f</Size>
-        <Children/>
         <Connection>
           <ConfigKey persist="true">[Tango],symmetric_overviews</ConfigKey>
           <BindProperty>visible</BindProperty>
diff --git a/res/skins/Tango/vumeter_floating.xml b/res/skins/Tango/vumeter_floating.xml
index 4f344a590c2a..451038abbd2a 100644
--- a/res/skins/Tango/vumeter_floating.xml
+++ b/res/skins/Tango/vumeter_floating.xml
@@ -7,18 +7,17 @@ Variables:
 -->
 <Template>
   <WidgetGroup>
-    <ObjectName>VUMeterFloating</ObjectName>
+    <ObjectName>TEST1</ObjectName>
     <Layout>horizontal</Layout>
     <SizePolicy>min,me</SizePolicy>
     <Children>
-      
       <WidgetGroup><!-- Left VU -->
-        <ObjectName>VUMeter</ObjectName>
+        <ObjectName>VUMeterFloating</ObjectName>
         <Layout>stacked</Layout>
         <Size>4f,1me</Size>
         <Children>
           <StatusLight>
-            <TooltiId>channel_VuMeter</TooltiId>
+            <TooltipId>channel_VuMeterL</TooltipId>
             <PathStatusLight>skin:/graphics/vumeter_floating_clipping_over.png</PathStatusLight>
             <PathBack>skin:/graphics/vumeter_floating_clipping.png</PathBack>
             <Connection>
@@ -41,12 +40,12 @@ Variables:
       </WidgetGroup><!-- /Left VU -->
       
       <WidgetGroup><!-- Right VU -->
-        <ObjectName>VUMeter</ObjectName>
+        <ObjectName>VUMeterFloating</ObjectName>
         <Layout>stacked</Layout>
         <Size>4f,1me</Size>
         <Children>
           <StatusLight>
-            <TooltiId>channel_VuMeter</TooltiId>
+            <TooltipId>channel_VuMeterR</TooltipId>
             <PathStatusLight>skin:/graphics/vumeter_floating_clipping_over.png</PathStatusLight>
             <PathBack>skin:/graphics/vumeter_floating_clipping.png</PathBack>
             <Connection>
@@ -67,7 +66,6 @@ Variables:
           </VuMeter>
         </Children>
       </WidgetGroup><!-- /Right VU -->
-      
     </Children>
     <Connection>
       <ConfigKey persist="true">[Tango],vumeter</ConfigKey>
diff --git a/res/skins/Tango/vumeter_master.xml b/res/skins/Tango/vumeter_master.xml
new file mode 100644
index 000000000000..65c19aa03ac5
--- /dev/null
+++ b/res/skins/Tango/vumeter_master.xml
@@ -0,0 +1,87 @@
+<!--
+Description:
+  The master level meter.
+  This template is embedded in vumeter_master_container.xml
+  whic controls visibility for various configurations.
+Variables:
+  group : [ChannelXY]
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>VUMeterMasterContainer</ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>min,max</SizePolicy>
+    <Children>
+      <WidgetGroup><!-- Left + Right VU -->
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,max</SizePolicy>
+        <Children>
+          <WidgetGroup><!-- Left VU -->
+            <ObjectName>VUMeterFloating</ObjectName>
+            <Layout>stacked</Layout>
+            <Size>4f,-1min</Size>
+            <Children>
+              <StatusLight>
+                <TooltipId>master_VuMeterL</TooltipId>
+                <PathStatusLight>skin:/graphics/vumeter_master_clipping_over.png</PathStatusLight>
+                <PathBack>skin:/graphics/vumeter_master_clipping.png</PathBack>
+                <Connection>
+                  <ConfigKey>[Master],PeakIndicatorL</ConfigKey>
+                </Connection>
+              </StatusLight>
+              <VuMeter>
+                <PathVu>skin:/graphics/vumeter_master_over.png</PathVu>
+                <PathBack>skin:/graphics/vumeter_master.png</PathBack>
+                <Horizontal>false</Horizontal>
+                <PeakHoldSize>5</PeakHoldSize>
+                <PeakHoldTime>500</PeakHoldTime>
+                <PeakFallTime>50</PeakFallTime>
+                <PeakFallStep>2</PeakFallStep>
+                <Connection>
+                  <ConfigKey>[Master],VuMeterL</ConfigKey>
+                </Connection>
+              </VuMeter>
+            </Children>
+          </WidgetGroup><!-- /Left VU -->
+                  
+          <WidgetGroup><!-- Right VU -->
+            <ObjectName>VUMeterFloating</ObjectName>
+            <Layout>stacked</Layout>
+            <Size>4f,-1min</Size>
+            <Children>
+              <StatusLight>
+                <TooltipId>master_VuMeterR</TooltipId>
+                <PathStatusLight>skin:/graphics/vumeter_master_clipping_over.png</PathStatusLight>
+                <PathBack>skin:/graphics/vumeter_master_clipping.png</PathBack>
+                <Connection>
+                  <ConfigKey>[Master],PeakIndicatorR</ConfigKey>
+                </Connection>
+              </StatusLight>
+              <VuMeter>
+                <PathVu>skin:/graphics/vumeter_master_over.png</PathVu>
+                <PathBack>skin:/graphics/vumeter_master.png</PathBack>
+                <Horizontal>false</Horizontal>
+                <PeakHoldSize>5</PeakHoldSize>
+                <PeakHoldTime>500</PeakHoldTime>
+                <PeakFallTime>50</PeakFallTime>
+                <PeakFallStep>2</PeakFallStep>
+                <Connection>
+                  <ConfigKey>[Master],VuMeterR</ConfigKey>
+                </Connection>
+              </VuMeter>
+            </Children>
+          </WidgetGroup><!-- /Right VU -->
+        </Children>
+      </WidgetGroup><!-- /Left + Right VU -->
+
+      <WidgetGroup><Size>0min,2f</Size></WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>VUMeterMasterLabel</ObjectName>
+        <Size>16f,20f</Size>
+      </WidgetGroup>
+
+      <WidgetGroup><Size>0min,2f</Size></WidgetGroup>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Tango/vumeter_master_container.xml b/res/skins/Tango/vumeter_master_container.xml
new file mode 100644
index 000000000000..87649727bd2c
--- /dev/null
+++ b/res/skins/Tango/vumeter_master_container.xml
@@ -0,0 +1,59 @@
+<!--
+Description:
+  The channel mixer containing
+  * EQ knobs incl. Kill buttons ] if enabled
+  * QuickEffect knob            ]
+  * Headphone cue button
+  * Volume slider
+  * Gain knob
+  * VUMeter
+Variables:
+  group : [ChannelXY]
+-->
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>max,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup><!-- Master VU when mixer is shown -->
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:vumeter_master.xml"/>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Tango],channel_mixer</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /Master VU when mixer is shown -->
+
+      <!-- Master VU when mixer is hidden but permament level meters are shown -->
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <ObjectName></ObjectName>
+            <Size>min,min</Size>
+            <Layout>vertical</Layout>
+            <Children>
+              <Template src="skin:vumeter_master.xml"/>
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[Tango],vumeter</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Tango],channel_mixer</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+      <!-- /Master VU when mixer is hidden but permament level meters are shown -->
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Tango/vumeter_mixer.xml b/res/skins/Tango/vumeter_mixer.xml
index b596265fa847..845494f0939c 100644
--- a/res/skins/Tango/vumeter_mixer.xml
+++ b/res/skins/Tango/vumeter_mixer.xml
@@ -8,76 +8,62 @@ Variables:
 <Template>
   <WidgetGroup>
     <ObjectName>VUMeterMixer</ObjectName>
-    <Layout>vertical</Layout>
-    <Size>12f,1me</Size>
+    <Layout>horizontal</Layout>
+    <Size>12me,1me</Size>
     <Children>
-      <!-- BUG: margin not respected, so we need a spacer here -->
-      <WidgetGroup><Size>1me,4f</Size><Children/></WidgetGroup>
+      <WidgetGroup><!-- Left -->
+        <Layout>stacked</Layout>
+        <Size>4f,1me</Size>
+        <Children>
+          <StatusLight>
+            <TooltipId>channel_VuMeterL</TooltipId>
+            <PathStatusLight>skin:/graphics/vumeter_mixer_clipping_over.png</PathStatusLight>
+            <PathBack>skin:/graphics/vumeter_mixer_clipping.png</PathBack>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,PeakIndicatorL</ConfigKey>
+            </Connection>
+          </StatusLight>
+          <VuMeter>
+            <PathVu>skin:/graphics/vumeter_mixer_over.png</PathVu>
+            <PathBack>skin:/graphics/vumeter_mixer.png</PathBack>
+            <Horizontal>false</Horizontal>
+            <PeakHoldSize>5</PeakHoldSize>
+            <PeakHoldTime>500</PeakHoldTime>
+            <PeakFallTime>50</PeakFallTime>
+            <PeakFallStep>2</PeakFallStep>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,VuMeterL</ConfigKey>
+            </Connection>
+          </VuMeter>
+        </Children>
+      </WidgetGroup><!-- /Left -->
 
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Size>12f,1me</Size>
+      <WidgetGroup><!-- Right -->
+        <Layout>stacked</Layout>
+        <Size>4f,1me</Size>
         <Children>
-          <WidgetGroup><!-- Left -->
-            <ObjectName>VUMeter</ObjectName>
-            <Layout>stacked</Layout>
-            <Size>4f,1me</Size>
-            <Children>
-              <StatusLight>
-                <TooltiId>channel_VuMeter</TooltiId>
-                <PathStatusLight>skin:/graphics/vumeter_mixer_clipping_over.png</PathStatusLight>
-                <PathBack>skin:/graphics/vumeter_mixer_clipping.png</PathBack>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,PeakIndicatorL</ConfigKey>
-                </Connection>
-              </StatusLight>
-              <VuMeter>
-                <PathVu>skin:/graphics/vumeter_mixer_over.png</PathVu>
-                <PathBack>skin:/graphics/vumeter_mixer.png</PathBack>
-                <Horizontal>false</Horizontal>
-                <PeakHoldSize>5</PeakHoldSize>
-                <PeakHoldTime>500</PeakHoldTime>
-                <PeakFallTime>50</PeakFallTime>
-                <PeakFallStep>2</PeakFallStep>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,VuMeterL</ConfigKey>
-                </Connection>
-              </VuMeter>
-            </Children>
-          </WidgetGroup><!-- /Left -->
-          <WidgetGroup><!-- Right -->
-            <ObjectName>VUMeter</ObjectName>
-            <Layout>stacked</Layout>
-            <Size>4f,1me</Size>
-            <Children>
-              <StatusLight>
-                <TooltiId>channel_VuMeter</TooltiId>
-                <PathStatusLight>skin:/graphics/vumeter_mixer_clipping_over.png</PathStatusLight>
-                <PathBack>skin:/graphics/vumeter_mixer_clipping.png</PathBack>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,PeakIndicatorR</ConfigKey>
-                </Connection>
-              </StatusLight>
-              <VuMeter>
-                <PathVu>skin:/graphics/vumeter_mixer_over.png</PathVu>
-                <PathBack>skin:/graphics/vumeter_mixer.png</PathBack>
-                <Horizontal>false</Horizontal>
-                <PeakHoldSize>5</PeakHoldSize>
-                <PeakHoldTime>500</PeakHoldTime>
-                <PeakFallTime>50</PeakFallTime>
-                <PeakFallStep>2</PeakFallStep>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,VuMeterR</ConfigKey>
-                </Connection>
-              </VuMeter>
-            </Children>
-          </WidgetGroup><!-- /Right -->
+          <StatusLight>
+            <TooltipId>channel_VuMeterR</TooltipId>
+            <PathStatusLight>skin:/graphics/vumeter_mixer_clipping_over.png</PathStatusLight>
+            <PathBack>skin:/graphics/vumeter_mixer_clipping.png</PathBack>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,PeakIndicatorR</ConfigKey>
+            </Connection>
+          </StatusLight>
+          <VuMeter>
+            <PathVu>skin:/graphics/vumeter_mixer_over.png</PathVu>
+            <PathBack>skin:/graphics/vumeter_mixer.png</PathBack>
+            <Horizontal>false</Horizontal>
+            <PeakHoldSize>5</PeakHoldSize>
+            <PeakHoldTime>500</PeakHoldTime>
+            <PeakFallTime>50</PeakFallTime>
+            <PeakFallStep>2</PeakFallStep>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,VuMeterR</ConfigKey>
+            </Connection>
+          </VuMeter>
         </Children>
-      </WidgetGroup>
+      </WidgetGroup><!-- /Right -->
     </Children>
-    <Connection>
-      <ConfigKey persist="true">[Tango],vumeter</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Tango/waveform.xml b/res/skins/Tango/waveform.xml
index 659946342ec8..fef4ac2364e9 100644
--- a/res/skins/Tango/waveform.xml
+++ b/res/skins/Tango/waveform.xml
@@ -80,92 +80,83 @@ Variables:
         </Mark>
       </Visual>
 
-      <WidgetGroup><!-- Container for beatgrid buttons -->
-        <ObjectName>BeatgridButtonBox</ObjectName>
-        <Layout>horizontal</Layout>
-        <Size>75f,50me</Size>
+      <WidgetGroup><!-- Transparent container for beatgrid buttons -->
+        <Layout>vertical</Layout>
+        <Size>82f,50me</Size>
         <Children>
+          <WidgetGroup><Size>1me,0me</Size></WidgetGroup>
+          <WidgetGroup><Size>1me,1f</Size></WidgetGroup>
 
-            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-
-          <WidgetGroup>
-            <Layout>vertical</Layout>
+          <WidgetGroup><!-- beat grid buttons row -->
+            <ObjectName>Spacer0f</ObjectName>
+            <Layout>horizontal</Layout>
             <SizePolicy>f,f</SizePolicy>
             <Children>
-                <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
               <Template src="skin:button_1state.xml">
                 <SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
-                <SetVariable name="ObjectName">BeatgridButton</SetVariable>
+                <SetVariable name="ObjectName">BeatgridCurpos</SetVariable>
                 <SetVariable name="Size">24f,49f</SetVariable>
-                <SetVariable name="state_0_pressed">beats_curpos.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">beats_curpos.svg</SetVariable>
                 <SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_curpos</SetVariable>
               </Template>
-            </Children>
-          </WidgetGroup>
 
+              <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
 
-            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+              <WidgetGroup><!-- beats earlier & faster -->
+                <Layout>vertical</Layout>
+                <SizePolicy>f,f</SizePolicy>
+                <Children>
+                  <Template src="skin:button_1state.xml">
+                    <SetVariable name="TooltipId">beats_translate_earlier</SetVariable>
+                    <SetVariable name="ObjectName">BeatgridEarlier</SetVariable>
+                    <SetVariable name="Size">28f,24f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_earlier</SetVariable>
+                  </Template>
 
-          <WidgetGroup>
-            <Layout>vertical</Layout>
-            <SizePolicy>f,f</SizePolicy>
-            <Children>
-                <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
-              <Template src="skin:button_1state.xml">
-                <SetVariable name="TooltipId">beats_translate_earlier</SetVariable>
-                <SetVariable name="ObjectName">BeatgridButton</SetVariable>
-                <SetVariable name="Size">24f,24f</SetVariable>
-                <SetVariable name="state_0_pressed">beats_earlier.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">beats_earlier.svg</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_earlier</SetVariable>
-              </Template>
-                <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
-              <Template src="skin:button_1state.xml">
-                <SetVariable name="TooltipId">beats_adjust_faster</SetVariable>
-                <SetVariable name="ObjectName">BeatgridButton</SetVariable>
-                <SetVariable name="Size">24f,24f</SetVariable>
-                <SetVariable name="state_0_pressed">beats_faster.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">beats_faster.svg</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="group"/>,beats_adjust_faster</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
+                  <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
 
-            <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+                  <Template src="skin:button_1state.xml">
+                    <SetVariable name="TooltipId">beats_adjust_faster</SetVariable>
+                    <SetVariable name="ObjectName">BeatgridFaster</SetVariable>
+                    <SetVariable name="Size">28f,24f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,beats_adjust_faster</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup><!-- /beats earlier & faster -->
 
-          <WidgetGroup><!-- beats slower & faster -->
-            <Layout>vertical</Layout>
-            <SizePolicy>f,f</SizePolicy>
-            <Children>
-                <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
-              <Template src="skin:button_1state.xml">
-                <SetVariable name="TooltipId">beats_translate_later</SetVariable>
-                <SetVariable name="ObjectName">BeatgridButton</SetVariable>
-                <SetVariable name="Size">24f,24f</SetVariable>
-                <SetVariable name="state_0_pressed">beats_later.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">beats_later.svg</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_later</SetVariable>
-              </Template>
-                <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
-              <Template src="skin:button_1state.xml">
-                <SetVariable name="TooltipId">beats_adjust_slower</SetVariable>
-                <SetVariable name="ObjectName">BeatgridButton</SetVariable>
-                <SetVariable name="Size">24f,24f</SetVariable>
-                <SetVariable name="state_0_pressed">beats_slower.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">beats_slower.svg</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="group"/>,beats_adjust_slower</SetVariable>
-              </Template>
+              <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+
+              <WidgetGroup><!-- beats later & slower -->
+                <Layout>vertical</Layout>
+                <SizePolicy>f,f</SizePolicy>
+                <Children>
+                  <Template src="skin:button_1state.xml">
+                    <SetVariable name="TooltipId">beats_translate_later</SetVariable>
+                    <SetVariable name="ObjectName">BeatgridLater</SetVariable>
+                    <SetVariable name="Size">28f,24f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_later</SetVariable>
+                  </Template>
+
+                  <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
+
+                  <Template src="skin:button_1state.xml">
+                    <SetVariable name="TooltipId">beats_adjust_slower</SetVariable>
+                    <SetVariable name="ObjectName">BeatgridSlower</SetVariable>
+                    <SetVariable name="Size">28f,24f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,beats_adjust_slower</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup><!-- /beats later & slower -->
             </Children>
-          </WidgetGroup>
+          </WidgetGroup><!-- /beat grid buttons row -->
 
+          <WidgetGroup><Size>1me,0me</Size></WidgetGroup>
+          <WidgetGroup><Size>1me,1f</Size></WidgetGroup>
         </Children>
         <Connection>
           <ConfigKey persist="true">[Tango],beatgrid_buttons</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- /Container for beatgrid buttons -->
-
+      </WidgetGroup><!-- /Transparent container for beatgrid buttons -->
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Tango/waveforms_container.xml b/res/skins/Tango/waveforms_container.xml
index daa1529261c0..4e34617ffc97 100644
--- a/res/skins/Tango/waveforms_container.xml
+++ b/res/skins/Tango/waveforms_container.xml
@@ -66,8 +66,8 @@ Variables:
 
       <Template src="skin:button_2state_persist.xml">
         <SetVariable name="ObjectName">BeatgridButtonToggler</SetVariable>
-        <SetVariable name="Size">18f,22me</SetVariable>
-        <SetVariable name="ConfigKeyPerm">[Tango],beatgrid_buttons</SetVariable>
+        <SetVariable name="Size">14f,22me</SetVariable>
+        <SetVariable name="ConfigKey">[Tango],beatgrid_buttons</SetVariable>
       </Template>
     </Children>
   </WidgetGroup>