diff --git a/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml b/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml
index b6578e27..b976ecd5 100644
--- a/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml
+++ b/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml
@@ -44,10 +44,10 @@
       <Skin/>
       <SkinArrowLeft>Minus</SkinArrowLeft>
       <SkinArrowRight>Plus</SkinArrowRight>
-      <SkinSelected>Invisible</SkinSelected>
+      <SkinSelected />
       <SkinArrowLeftSelected>Minus</SkinArrowLeftSelected>
       <SkinArrowRightSelected>Plus</SkinArrowRightSelected>
-      <SkinHighlighted>Invisible</SkinHighlighted>
+      <SkinHighlighted />
       <Rect>
         <X>1090</X>
         <Y>680</Y>
diff --git a/Output/Themes/Ambient/Screens/ScreenSong.xml b/Output/Themes/Ambient/Screens/ScreenSong.xml
index f10c0b57..7da931cb 100644
--- a/Output/Themes/Ambient/Screens/ScreenSong.xml
+++ b/Output/Themes/Ambient/Screens/ScreenSong.xml
@@ -667,7 +667,7 @@
     </Button>
     <Button Name="ButtonOpenOptions">
       <Skin/>
-      <SkinSelected>Invisible</SkinSelected>
+      <SkinSelected />
       <Rect>
         <X>40</X>
         <Y>40</Y>
@@ -1166,8 +1166,8 @@
         <Skin />
         <Color Name="Visible" />
         <Rect>
-          <X>4</X>
-          <Y>2</Y>
+          <X>0</X>
+          <Y>0</Y>
           <W>46</W>
           <H>46</H>
           <Z>-1</Z>
@@ -1200,7 +1200,7 @@
       </StaticPlaylistFooter>
       <ButtonPlaylistName Name="ButtonPlaylistName">
         <Skin/>
-        <SkinSelected>Invisible</SkinSelected>
+        <SkinSelected />
         <Rect>
           <X>975</X>
           <Y>45</Y>