diff --git a/res/skins/Tango/crossfader12_skincontrols.xml b/res/skins/Tango/crossfader12_skincontrols.xml
index 6c8345878bc2..2694ddfe346a 100644
--- a/res/skins/Tango/crossfader12_skincontrols.xml
+++ b/res/skins/Tango/crossfader12_skincontrols.xml
@@ -51,13 +51,13 @@ Description:
             <SetVariable name="TooltipId">show_spinny</SetVariable>
             <SetVariable name="ObjectName">GuiToggleButton2</SetVariable>
             <SetVariable name="Size">20f,20f</SetVariable>
-            <SetVariable name="state_0_pressed">spinny.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">spinny.svg</SetVariable>
-            <SetVariable name="state_1_pressed">cover.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">cover.svg</SetVariable>
-            <SetVariable name="state_2_pressed">cover_off.svg</SetVariable>
-            <SetVariable name="state_2_unpressed">cover_off.svg</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Tango],empty_spinny_cover</SetVariable>
+            <SetVariable name="state_0_pressed">cover.svg</SetVariable>
+            <SetVariable name="state_0_unpressed">cover.svg</SetVariable>
+            <SetVariable name="state_1_pressed">cover_off.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">cover_off.svg</SetVariable>
+            <SetVariable name="state_2_pressed">spinny.svg</SetVariable>
+            <SetVariable name="state_2_unpressed">spinny.svg</SetVariable>
+            <SetVariable name="ConfigKeyPerm">[Tango],spinny_cover_none</SetVariable>
           </Template>
 
           <WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
diff --git a/res/skins/Tango/crossfader_skincontrols_netbook.xml b/res/skins/Tango/crossfader_skincontrols_netbook.xml
index e94deeac9efc..183c3aeed2ca 100644
--- a/res/skins/Tango/crossfader_skincontrols_netbook.xml
+++ b/res/skins/Tango/crossfader_skincontrols_netbook.xml
@@ -53,13 +53,13 @@ Description:
             <SetVariable name="TooltipId">show_spinny</SetVariable>
             <SetVariable name="ObjectName">GuiToggleButton2</SetVariable>
             <SetVariable name="Size">20f,20f</SetVariable>
-            <SetVariable name="state_0_pressed">spinny.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">spinny.svg</SetVariable>
-            <SetVariable name="state_1_pressed">cover.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">cover.svg</SetVariable>
-            <SetVariable name="state_2_pressed">cover_off.svg</SetVariable>
-            <SetVariable name="state_2_unpressed">cover_off.svg</SetVariable>
-            <SetVariable name="ConfigKeyPerm">[Tango],empty_spinny_cover</SetVariable>
+            <SetVariable name="state_0_pressed">cover.svg</SetVariable>
+            <SetVariable name="state_0_unpressed">cover.svg</SetVariable>
+            <SetVariable name="state_1_pressed">cover_off.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">cover_off.svg</SetVariable>
+            <SetVariable name="state_2_pressed">spinny.svg</SetVariable>
+            <SetVariable name="state_2_unpressed">spinny.svg</SetVariable>
+            <SetVariable name="ConfigKeyPerm">[Tango],spinny_cover_none</SetVariable>
           </Template>
 
           <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size><Children/></WidgetGroup>
diff --git a/res/skins/Tango/deck_left.xml b/res/skins/Tango/deck_left.xml
index 95585dd4adf8..b57860a54eb8 100644
--- a/res/skins/Tango/deck_left.xml
+++ b/res/skins/Tango/deck_left.xml
@@ -69,12 +69,12 @@ Variables:
                     </Children>
                   </WidgetGroup><!-- /Mixer -->
 
-                  <WidgetGroup><!-- [Spinny / Cover] + VUMeter -->
+                  <WidgetGroup><!-- [Spinny / Cover / none] + VUMeter -->
                     <Layout>horizontal</Layout>
                     <SizePolicy>min,me</SizePolicy>
                     <Children>
 
-                      <WidgetGroup><!-- [Spinny / Cover] -->
+                      <WidgetGroup><!-- [Spinny / Cover / none] -->
                         <Layout>horizontal</Layout>
                         <SizePolicy>min,min</SizePolicy>
                         <Children>
@@ -98,10 +98,11 @@ Variables:
                           </WidgetGroup>
                         </Children>
                         <Connection>
-                          <ConfigKey persist="true">[Tango],empty_spinny_cover</ConfigKey>
+                          <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
+                          <Transform><IsEqual>2</IsEqual><Not/></Transform>
                           <BindProperty>visible</BindProperty>
                         </Connection>
-                      </WidgetGroup><!-- /[Spinny / Cover] -->
+                      </WidgetGroup><!-- /[Spinny / Cover /none] -->
 
                       <WidgetGroup>
                         <Size>3f,1me</Size>
@@ -115,10 +116,10 @@ Variables:
                       <Template src="skin:vumeter_floating.xml"/>
 
                     </Children>
-                  </WidgetGroup><!-- / [Spinny / Cover] + VUMeter -->
+                  </WidgetGroup><!-- / [Spinny / Cover / none] + VUMeter -->
 
                 </Children>
-              </WidgetStack><!-- /Mixer / [ [Spinny / Cover] + VUMeter ] -->
+              </WidgetStack><!-- /Mixer / [ [Spinny / Cover / none] + VUMeter ] -->
 
               <WidgetGroup><!-- Pitch slider & Key controls -->
                 <Size>3f,1me</Size>
diff --git a/res/skins/Tango/deck_overview_left.xml b/res/skins/Tango/deck_overview_left.xml
index a82288dd003e..7d56b0c9ad01 100644
--- a/res/skins/Tango/deck_overview_left.xml
+++ b/res/skins/Tango/deck_overview_left.xml
@@ -86,7 +86,7 @@ Variables:
             </Connection>
           </WidgetGroup><!-- /Vinyl Controls -->
 
-          <WidgetGroup><!-- Spinny / Cover -->
+          <WidgetGroup><!-- [Spinny / Cover / none] -->
             <Layout>vertical</Layout>
             <!-- Do not declare Size/Policy here. Otherwise this widget will always occupy 50x50px,
                 even when set invible. Maybe too many Connections... WidgetStack was buggy. -->
@@ -128,10 +128,11 @@ Variables:
 
             </Children>
             <Connection>
-              <ConfigKey persist="true">[Tango],empty_spinny_cover</ConfigKey>
+              <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
+              <Transform><IsEqual>2</IsEqual><Not/></Transform>
               <BindProperty>visible</BindProperty>
             </Connection>
-          </WidgetGroup><!-- /Spinny / Cover -->
+          </WidgetGroup><!-- /[Spinny / Cover / none] -->
 
         </Children>
       </WidgetGroup><!-- /Overview Row -->
diff --git a/res/skins/Tango/deck_overview_right.xml b/res/skins/Tango/deck_overview_right.xml
index 25bd482ddfdf..a10d35082761 100644
--- a/res/skins/Tango/deck_overview_right.xml
+++ b/res/skins/Tango/deck_overview_right.xml
@@ -27,7 +27,7 @@ Variables:
         <SizePolicy>me,f</SizePolicy>
         <Children>
 
-          <WidgetGroup><!-- Spinny / CoverArt -->
+          <WidgetGroup><!-- [Spinny / Cover / none] -->
             <Layout>vertical</Layout>
             <!-- Do not declare Size/Policy here. Otherwise this widget will always occupy 50x50px,
                 even when set invible. Maybe too many Connections... WidgetStack was buggy. -->
@@ -71,10 +71,11 @@ Variables:
 
             </Children>
             <Connection>
-              <ConfigKey persist="true">[Tango],empty_spinny_cover</ConfigKey>
+              <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
+              <Transform><IsEqual>2</IsEqual><Not/></Transform>
               <BindProperty>visible</BindProperty>
             </Connection>
-          </WidgetGroup><!-- /Spinny / CoverArt -->
+          </WidgetGroup><!-- /[Spinny / Cover / none] -->
 
           <WidgetGroup><!-- Vinyl Controls -->
             <Layout>horizontal</Layout>
diff --git a/res/skins/Tango/deck_right.xml b/res/skins/Tango/deck_right.xml
index bf7abda936e6..db03d232cd08 100644
--- a/res/skins/Tango/deck_right.xml
+++ b/res/skins/Tango/deck_right.xml
@@ -21,11 +21,11 @@ Variables:
 
       <WidgetGroup><Size>3f,1min</Size><Children/></WidgetGroup>
 
-      <WidgetGroup><!-- Mixer / [ [Spinny / Cover] + VUMeter ] + Pitch + spacer -->
+      <WidgetGroup><!-- Mixer / [ [Spinny / Cover / none] + VUMeter ] + Pitch + spacer -->
         <Layout>vertical</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <WidgetGroup><!-- Mixer / [ [Spinny / Cover] + VUMeter ] + Pitch -->
+          <WidgetGroup><!-- Mixer / [ [Spinny / Cover / none] + VUMeter ] + Pitch -->
             <Layout>horizontal</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
@@ -58,7 +58,7 @@ Variables:
                     </Children>
                   </WidgetGroup><!-- /Mixer -->
                   
-                  <WidgetGroup><!-- [Spinny / Cover] + VUMeter -->
+                  <WidgetGroup><!-- [Spinny / Cover / none] + VUMeter -->
                     <Layout>horizontal</Layout>
                     <SizePolicy>min,me</SizePolicy>
                     <Children>
@@ -74,7 +74,7 @@ Variables:
                         </Connection>
                       </WidgetGroup>
                     
-                      <WidgetGroup><!-- Spinny/Cover -->
+                      <WidgetGroup><!-- [Spinny / Cover / none] -->
                         <Layout>horizontal</Layout>
                         <SizePolicy>min,min</SizePolicy>
                         <Children>
@@ -95,22 +95,20 @@ Variables:
                           </WidgetGroup>
                         </Children>
                         <Connection>
-                          <ConfigKey persist="true">[Tango],empty_spinny_cover</ConfigKey>
+                          <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
+                          <Transform><IsEqual>2</IsEqual><Not/></Transform>
                           <BindProperty>visible</BindProperty>
                         </Connection>
                       </WidgetGroup>
                         
                     </Children>
-                  </WidgetGroup><!-- /[Spinny / Cover] + VUMeter -->
+                  </WidgetGroup><!-- /[Spinny / Cover / none] + VUMeter -->
                     
                 </Children>
-              </WidgetStack><!-- /Mixer / [ [Spinny / Cover] + VUMeter ] -->
+              </WidgetStack><!-- /Mixer / [ [Spinny / Cover / none] + VUMeter ] -->
             
             </Children>
-          </WidgetGroup><!-- /Mixer / [ [Spinny / Cover] + VUMeter ] + Pitch -->
-          
-          <!-- 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><!-- /Mixer / [ [Spinny / Cover / none] + VUMeter ] + Pitch -->
           
           Expanding spacer, necessary because obviously WidgetStack breaks
           qproperty-layoutAlignment of parent Widget -->
diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml
index 1f8bc144a2c3..c46b896e0c2e 100644
--- a/res/skins/Tango/skin.xml
+++ b/res/skins/Tango/skin.xml
@@ -65,7 +65,6 @@
       <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],empty_spinny_cover">2</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],key_controls">1</attribute>
@@ -91,12 +90,9 @@
       <attribute persist="true" config_key="[Tango],stacked_waveforms">1</attribute>
       <attribute persist="true" config_key="[Tango],stars">1</attribute>
       <attribute persist="true" config_key="[Tango],trackComment">1</attribute>
-      <!-- keeps Spinny/Cover selection when switching between small and big version -->
-      <attribute persist="true" config_key="[Tango],spinny0_cover1_stack">1</attribute>
+      <attribute persist="true" config_key="[Tango],spinny_cover_none">1</attribute>
       <attribute persist="true" config_key="[Tango],spinnyCoverBIG">1</attribute>
       <attribute persist="true" config_key="[Tango],spinnyWithCoverArt">1</attribute>
-      <!-- keeps CoverArt option when switching between small and big Spinny -->
-      <attribute persist="true" config_key="[Tango],spinnyWithCoverArt_stack">1</attribute>
       <attribute persist="true" config_key="[Tango],vinylControlsDeck1">0</attribute>
       <attribute persist="true" config_key="[Tango],vinylControlsDeck2">0</attribute>
       <attribute persist="true" config_key="[Tango],vinylControlsDeck3">0</attribute>
diff --git a/res/skins/Tango/skin_settings.xml b/res/skins/Tango/skin_settings.xml
index 84e5cc6cef74..2f9c7df7b8d3 100644
--- a/res/skins/Tango/skin_settings.xml
+++ b/res/skins/Tango/skin_settings.xml
@@ -221,10 +221,10 @@ Description:
             <Children>
 
               <Template src="skin:skin_settings_button_3state.xml">
-                <SetVariable name="state_0_text">      Spinny  /  Cover</SetVariable>
-                <SetVariable name="state_1_text"> &#10004; Spinny&#9668; Cover</SetVariable>
-                <SetVariable name="state_2_text"> &#10004; Spinny &#9658;Cover</SetVariable>
-                <SetVariable name="Setting">[Tango],empty_spinny_cover</SetVariable>
+                <SetVariable name="state_0_text"> &#10004; Spinny &#9668; Cover</SetVariable>
+                <SetVariable name="state_1_text"> &#10004; Spinny &#9658; Cover</SetVariable>
+                <SetVariable name="state_2_text">      Spinny  /  Cover</SetVariable>
+                <SetVariable name="Setting">[Tango],spinny_cover_none</SetVariable>
               </Template>
 
               <WidgetGroup><!-- SpinnyCover submenu -->
@@ -240,9 +240,9 @@ Description:
                     <SizePolicy>me,me</SizePolicy>
                     <Children/>
                     <Connection>
-                      <ConfigKey persist="true">[Tango],empty_spinny_cover</ConfigKey>
+                      <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
                       <BindProperty>visible</BindProperty>
-                      <Transform><Not/></Transform>
+                      <Transform><IsEqual>2</IsEqual></Transform>
                     </Connection>
                   </WidgetGroup>
 
@@ -252,8 +252,8 @@ Description:
                     <Children>
 
                     <Template src="skin:skin_settings_button_2state.xml">
-                        <SetVariable name="state_0_text">      °&#9668; O</SetVariable>
-                        <SetVariable name="state_1_text">      ° &#9658;O</SetVariable>
+                        <SetVariable name="state_0_text">      ° &#9668; O</SetVariable>
+                        <SetVariable name="state_1_text">      ° &#9658; O</SetVariable>
                         <SetVariable name="Setting">[Tango],spinnyCoverBIG</SetVariable>
                       </Template>
 
@@ -281,8 +281,8 @@ Description:
             <Children>
 
               <Template src="skin:skin_settings_button_2state.xml">
-                <SetVariable name="state_0_text">      2&#9668; 4  Effect Units</SetVariable>
-                <SetVariable name="state_1_text">      2 &#9658;4  Effect Units</SetVariable>
+                <SetVariable name="state_0_text">      2 &#9668; 4  Effect Units</SetVariable>
+                <SetVariable name="state_1_text">      2 &#9658; 4  Effect Units</SetVariable>
                 <SetVariable name="Setting">[Tango],2or4_fxUnits</SetVariable>
               </Template>
 
diff --git a/res/skins/Tango/spinnyCover.xml b/res/skins/Tango/spinnyCover.xml
index 01e0154b1ba5..565cc5bc94f6 100644
--- a/res/skins/Tango/spinnyCover.xml
+++ b/res/skins/Tango/spinnyCover.xml
@@ -4,21 +4,21 @@ Description:
   Displayed next to decks where channel mixer would be.
 Variables:
   group   : [ChannelN]
-  [Tango],spinny0_cover1_stack (show Spinny or CoverArt)
-          : keeps Spinny/Cover selection when switching between small and big version
-  [Tango],spinnyWithCoverArt_stack (show Spinny with or without Cover)
-          : keeps CoverArt option when switching between small and big Spinny
 -->
-<Template>	
-  <WidgetStack currentpage="[Tango],spinny0_cover1_stack" persist="true">
+<Template>
+  <WidgetGroup>
     <ObjectName>SpinnyCover</ObjectName>
-    <Size>111f,136f</Size>
+    <SizePolicy>min,min</SizePolicy>
+    <Layout>vertical</Layout>
     <Children>
 
-      <WidgetStack currentpage="[Tango],spinnyWithCoverArt_stack" persist="true">
+      <!-- spinny -->
+      <WidgetGroup>
         <Size>111f,111f</Size>
+        <Layout>vertical</Layout>
         <Children>
-          <Spinny><!-- no Cover on Spinny -->
+          <!-- no Cover on Spinny -->
+          <Spinny>
             <TooltipId>spinny</TooltipId>
             <Size>111f,111f</Size>
             <Group><Variable name="group"/></Group>
@@ -27,9 +27,14 @@ Variables:
             <PathForeground scalemode="STRETCH_ASPECT">skin:/graphics/spinny_indicator.svg</PathForeground>
             <PathGhost scalemode="STRETCH_ASPECT">skin:/graphics/spinny_indicator_ghost.svg</PathGhost>
             <ShowCover>false</ShowCover>
+            <Connection>
+              <ConfigKey persist="true">[Tango],spinnyWithCoverArt</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
           </Spinny>
           <!-- Cover on Spinny -->
-          <Spinny trigger="[Tango],spinnyWithCoverArt" persist="true" on-hide-select="0">
+          <Spinny>
             <TooltipId>spinny</TooltipId>
             <Size>111f,111f</Size>
             <Group><Variable name="group"/></Group>
@@ -45,11 +50,11 @@ Variables:
           </Spinny>
         </Children>
         <Connection>
-          <ConfigKey persist="true">[Tango],empty_spinny_cover</ConfigKey>
-          <Transform><IsEqual>1</IsEqual></Transform>
+          <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
+          <Transform><IsEqual>0</IsEqual></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetStack>
+      </WidgetGroup>
 
       <CoverArt>
         <TooltipId>coverart</TooltipId>
@@ -57,12 +62,23 @@ Variables:
         <Group><Variable name="group"/></Group>
         <DefaultCover>skin:/graphics/cover_default.svg</DefaultCover>
         <Connection>
-          <ConfigKey persist="true">[Tango],empty_spinny_cover</ConfigKey>
-          <Transform><IsEqual>2</IsEqual></Transform>
+          <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
+          <Transform><IsEqual>1</IsEqual></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
       </CoverArt>
 
+      <!-- none -->
+      <WidgetGroup>
+        <Size>0f,0f</Size>
+        <Children/>
+        <Connection>
+          <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
+          <Transform><IsEqual>2</IsEqual></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
     </Children>
-  </WidgetStack>
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/Tango/spinnyCover_mini.xml b/res/skins/Tango/spinnyCover_mini.xml
index 3d8a3114caa1..6bb15809a149 100644
--- a/res/skins/Tango/spinnyCover_mini.xml
+++ b/res/skins/Tango/spinnyCover_mini.xml
@@ -5,22 +5,21 @@ Description:
 Variables:
   channum : channel number
   group   : [ChannelXY]
-  [Tango],spinny0_cover1_stack (show Spinny or CoverArt)
-          : keeps Spinny/Cover selection when switching between small and big version
-  [Tango],spinnyWithCoverArt_stack (show Spinny with or without Cover)
-          : keeps CoverArt option when switching between small and big Spinny
 -->
 <Template>
-  <WidgetStack currentpage="[Tango],spinny0_cover1_stack" persist="true">
+  <WidgetGroup>
     <ObjectName>SpinnyCoverMini</ObjectName>
-    <Size>50f,50f</Size>
+    <SizePolicy>min,min</SizePolicy>
+    <Layout>vertical</Layout>
     <Children>
 
-      <WidgetStack currentpage="[Tango],spinnyWithCoverArt_stack" persist="true">
-        <Size>111f,111f</Size>
+      <!-- spinny -->
+      <WidgetGroup>
+        <Size>50f,50f</Size>
+        <Layout>vertical</Layout>
         <Children>
-
-          <Spinny><!-- no Cover on Spinny -->
+          <!-- no Cover on Spinny -->
+          <Spinny>
             <ObjectName>SpinnyMini</ObjectName>
             <Size>50f,50f</Size>
             <TooltipId>spinny</TooltipId>
@@ -30,9 +29,14 @@ Variables:
             <PathMask scalemode="STRETCH_ASPECT">skin:/graphics/spinnyMini_<Variable name="channum"/>_mask.svg</PathMask>
             <PathGhost scalemode="STRETCH_ASPECT">skin:/graphics/spinnyMini_indicator_ghost.svg</PathGhost>
             <ShowCover>false</ShowCover>
+            <Connection>
+              <ConfigKey persist="true">[Tango],spinnyWithCoverArt</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
           </Spinny>
           <!-- Cover on Spinny -->
-          <Spinny trigger="[Tango],spinnyWithCoverArt" persist="true">
+          <Spinny>
             <ObjectName>SpinnyMini</ObjectName>
             <Size>50f,50f</Size>
             <TooltipId>spinny</TooltipId>
@@ -44,17 +48,16 @@ Variables:
             <ShowCover>true</ShowCover>
             <Connection>
               <ConfigKey persist="true">[Tango],spinnyWithCoverArt</ConfigKey>
-          <Transform><IsEqual>1</IsEqual></Transform>
               <BindProperty>visible</BindProperty>
             </Connection>
           </Spinny>
-
         </Children>
         <Connection>
-          <ConfigKey persist="true">[Tango],empty_spinny_cover</ConfigKey>
+          <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
+          <Transform><IsEqual>0</IsEqual></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetStack>
+      </WidgetGroup>
 
       <CoverArt>
         <TooltipId>coverart</TooltipId>
@@ -62,12 +65,23 @@ Variables:
         <Group>[Channel<Variable name="channum"/>]</Group>
         <DefaultCover>skin:/graphics/cover_default_mini_<Variable name="channum"/>.svg</DefaultCover>
         <Connection>
-          <ConfigKey persist="true">[Tango],empty_spinny_cover</ConfigKey>
-          <Transform><IsEqual>2</IsEqual></Transform>
+          <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
+          <Transform><IsEqual>1</IsEqual></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
       </CoverArt>
 
+      <!-- none -->
+      <WidgetGroup>
+        <Size>0f,0f</Size>
+        <Children/>
+        <Connection>
+          <ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
+          <Transform><IsEqual>2</IsEqual></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
     </Children>
-  </WidgetStack>
+  </WidgetGroup>
 </Template>