diff --git a/Output/Themes/Ambient/Screens/ScreenProfiles.xml b/Output/Themes/Ambient/Screens/ScreenProfiles.xml
index 06cf67ca..9e161ea7 100644
--- a/Output/Themes/Ambient/Screens/ScreenProfiles.xml
+++ b/Output/Themes/Ambient/Screens/ScreenProfiles.xml
@@ -697,7 +697,7 @@
       <SkinSelected>Button</SkinSelected>
       <!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
       <X>300</X>
-      <Y>210</Y>
+      <Y>205</Y>
       <Z>0,00</Z>
       <W>150</W>
       <H>50</H>
@@ -735,17 +735,9 @@
       <!--<Reflection> If exists:-->
       <!--   <Space>: Reflection Space-->
       <!--   <Height>: Reflection Height-->
-      <Reflection>
-        <Space>10</Space>
-        <Height>26</Height>
-      </Reflection>
       <!--<SReflection> If exists:-->
       <!--   <Space>: Reflection Space of selected button-->
       <!--   <Height>: Reflection Height of selected button-->
-      <SReflection>
-        <Space>10</Space>
-        <Height>26</Height>
-      </SReflection>
     </ButtonSaveSnapshot>
     <ButtonDiscardSnapshot>
       <!--<Skin>: Texture name-->
@@ -754,7 +746,7 @@
       <SkinSelected>Button</SkinSelected>
       <!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
       <X>300</X>
-      <Y>110</Y>
+      <Y>125</Y>
       <Z>0,00</Z>
       <W>150</W>
       <H>50</H>
@@ -792,17 +784,9 @@
       <!--<Reflection> If exists:-->
       <!--   <Space>: Reflection Space-->
       <!--   <Height>: Reflection Height-->
-      <Reflection>
-        <Space>10</Space>
-        <Height>26</Height>
-      </Reflection>
       <!--<SReflection> If exists:-->
       <!--   <Space>: Reflection Space of selected button-->
       <!--   <Height>: Reflection Height of selected button-->
-      <SReflection>
-        <Space>10</Space>
-        <Height>26</Height>
-      </SReflection>
     </ButtonDiscardSnapshot>
     <SelectSlideProfiles>
       <!--<Skin>: Texture name-->
@@ -1130,4 +1114,4 @@
       <NumVisible>2</NumVisible>
     </SelectSlideActive>
   </ScreenProfiles>
-</root>
\ No newline at end of file
+</root>
diff --git a/Vocaluxe/Screens/CScreenProfiles.cs b/Vocaluxe/Screens/CScreenProfiles.cs
index 822ebc5f..ba280fd0 100644
--- a/Vocaluxe/Screens/CScreenProfiles.cs
+++ b/Vocaluxe/Screens/CScreenProfiles.cs
@@ -206,6 +206,8 @@ namespace Vocaluxe.Screens
                 {
                     CProfiles.SetAvatar(SelectSlides[htSelectSlides(SelectSlideProfiles)].Selection,
                         SelectSlides[htSelectSlides(SelectSlideAvatars)].Selection);
+                    if (CWebcam.GetDevices().Length > 0 && _WebcamTexture.index > 0)
+                        OnDiscardSnapshot();
                 } else if (SelectSlides[htSelectSlides(SelectSlideGuestProfile)].Selected)
                 {
                     CProfiles.SetGuestProfile(SelectSlides[htSelectSlides(SelectSlideProfiles)].Selection,
@@ -339,6 +341,13 @@ namespace Vocaluxe.Screens
             UpdateGame();
         }
 
+        public override void OnClose()
+        {
+            base.OnClose();
+
+            OnDiscardSnapshot();
+        }
+
         public override bool Draw()
         {
             return base.Draw();