diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml
index f1e431a31..db204f4c7 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml
@@ -37,7 +37,7 @@
                 <Setter Property="VerticalOptions" 
                         Value="Center" />
                 <Setter Property="Margin" 
-                        Value="12, 0" />
+                        Value="12, 12, 12, 0" />
             </Style>
             
         </ResourceDictionary>
@@ -83,15 +83,15 @@
                         Style="{StaticResource SettingsToggleButtonStyle}">
                         <controls:ToggleButton.CheckedImage>
                             <OnPlatform x:TypeArguments="ImageSource"
-                              Android="toggle_azure"
-                              iOS="toggle_azure"
-                              WinPhone="Assets/toggle_azure.png"/>
+                              Android="switchOn"
+                              iOS="switchOn"
+                              WinPhone="Assets/switchOn.png"/>
                         </controls:ToggleButton.CheckedImage>
                         <controls:ToggleButton.UnCheckedImage>
                             <OnPlatform x:TypeArguments="ImageSource"
-                              Android="toggle_local"
-                              iOS="toggle_local"
-                              WinPhone="Assets/toggle_local.png"/>
+                              Android="switchOff"
+                              iOS="switchOff"
+                              WinPhone="Assets/switchOff.png"/>
                         </controls:ToggleButton.UnCheckedImage>
                     </controls:ToggleButton>
                     <Grid 
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs
index 124c8f87a..be775d492 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs
@@ -2330,10 +2330,10 @@ namespace eShopOnContainers.Droid
 			public const int splash_drawable = 2130837680;
 			
 			// aapt resource value: 0x7f0200b1
-			public const int toggle_azure = 2130837681;
+			public const int switch_off = 2130837681;
 			
 			// aapt resource value: 0x7f0200b2
-			public const int toggle_local = 2130837682;
+			public const int switch_on = 2130837682;
 			
 			static Drawable()
 			{
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-hdpi/switch_off.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-hdpi/switch_off.png
new file mode 100644
index 000000000..413697f17
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-hdpi/switch_off.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-hdpi/switch_on.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-hdpi/switch_on.png
new file mode 100644
index 000000000..2ae959fb3
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-hdpi/switch_on.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-hdpi/toggle_azure.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-hdpi/toggle_azure.png
deleted file mode 100644
index 42e1d3c49..000000000
Binary files a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-hdpi/toggle_azure.png and /dev/null differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-hdpi/toggle_local.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-hdpi/toggle_local.png
deleted file mode 100644
index 44c4098c9..000000000
Binary files a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-hdpi/toggle_local.png and /dev/null differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xhdpi/switch_off.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xhdpi/switch_off.png
new file mode 100644
index 000000000..76ecb6fec
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xhdpi/switch_off.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xhdpi/switch_on.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xhdpi/switch_on.png
new file mode 100644
index 000000000..61c6bc59a
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xhdpi/switch_on.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xhdpi/toggle_azure.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xhdpi/toggle_azure.png
deleted file mode 100644
index b3134525c..000000000
Binary files a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xhdpi/toggle_azure.png and /dev/null differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xhdpi/toggle_local.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xhdpi/toggle_local.png
deleted file mode 100644
index 1a3cedf0a..000000000
Binary files a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xhdpi/toggle_local.png and /dev/null differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xxhdpi/switch_off.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xxhdpi/switch_off.png
new file mode 100644
index 000000000..efecb33d9
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xxhdpi/switch_off.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xxhdpi/switch_on.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xxhdpi/switch_on.png
new file mode 100644
index 000000000..a26aa9ffc
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xxhdpi/switch_on.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xxhdpi/toggle_azure.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xxhdpi/toggle_azure.png
deleted file mode 100644
index a6fd10a02..000000000
Binary files a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xxhdpi/toggle_azure.png and /dev/null differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xxhdpi/toggle_local.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xxhdpi/toggle_local.png
deleted file mode 100644
index bb62ef7d1..000000000
Binary files a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xxhdpi/toggle_local.png and /dev/null differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj
index ab4f318a0..f2f0d9c05 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj
@@ -318,31 +318,31 @@
     <AndroidResource Include="Resources\drawable\fake_product_05.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\toggle_local.png" />
+    <AndroidResource Include="Resources\drawable-hdpi\app_settings.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\toggle_local.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\app_settings.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\toggle_local.png" />
+    <AndroidResource Include="Resources\drawable-xxhdpi\app_settings.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\app_settings.png" />
+    <AndroidResource Include="Resources\drawable-hdpi\switch_on.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\app_settings.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\switch_on.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\app_settings.png" />
+    <AndroidResource Include="Resources\drawable-xxhdpi\switch_on.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\toggle_azure.png" />
+    <AndroidResource Include="Resources\drawable-hdpi\switch_off.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\toggle_azure.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\switch_off.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\toggle_azure.png" />
+    <AndroidResource Include="Resources\drawable-xxhdpi\switch_off.png" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/switchOff.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/switchOff.png
new file mode 100644
index 000000000..8e60f6dee
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/switchOff.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/switchOn.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/switchOn.png
new file mode 100644
index 000000000..94f49dd38
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/switchOn.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/toggle_azure.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/toggle_azure.png
deleted file mode 100644
index 715e55ae3..000000000
Binary files a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/toggle_azure.png and /dev/null differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/toggle_local.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/toggle_local.png
deleted file mode 100644
index e484d2a2c..000000000
Binary files a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/toggle_local.png and /dev/null differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj
index 43ebaa39c..672f0d24d 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj
@@ -139,8 +139,8 @@
     <Content Include="Assets\menu_filter.png" />
     <Content Include="Assets\menu_profile.png" />
     <Content Include="Assets\product_add.png" />
-    <Content Include="Assets\toggle_azure.png" />
-    <Content Include="Assets\toggle_local.png" />
+    <Content Include="Assets\switchOff.png" />
+    <Content Include="Assets\switchOn.png" />
     <Content Include="Properties\Default.rd.xml" />
     <Content Include="Assets\LockScreenLogo.scale-200.png" />
     <Content Include="Assets\SplashScreen.scale-200.png" />
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/switchOff.png b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/switchOff.png
new file mode 100644
index 000000000..ba9804e9e
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/switchOff.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/switchOff@2x.png b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/switchOff@2x.png
new file mode 100644
index 000000000..d6e55997c
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/switchOff@2x.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/switchOff@3x.png b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/switchOff@3x.png
new file mode 100644
index 000000000..8e60f6dee
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/switchOff@3x.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/switchOn.png b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/switchOn.png
new file mode 100644
index 000000000..94c02a6de
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/switchOn.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/switchOn@2x.png b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/switchOn@2x.png
new file mode 100644
index 000000000..fb825596d
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/switchOn@2x.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/switchOn@3x.png b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/switchOn@3x.png
new file mode 100644
index 000000000..94f49dd38
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/switchOn@3x.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/toggle_azure.png b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/toggle_azure.png
deleted file mode 100644
index 10a3a29e6..000000000
Binary files a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/toggle_azure.png and /dev/null differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/toggle_azure@2x.png b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/toggle_azure@2x.png
deleted file mode 100644
index b3134525c..000000000
Binary files a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/toggle_azure@2x.png and /dev/null differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/toggle_azure@3x.png b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/toggle_azure@3x.png
deleted file mode 100644
index a6fd10a02..000000000
Binary files a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/toggle_azure@3x.png and /dev/null differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/toggle_local.png b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/toggle_local.png
deleted file mode 100644
index 005218f39..000000000
Binary files a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/toggle_local.png and /dev/null differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/toggle_local@2x.png b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/toggle_local@2x.png
deleted file mode 100644
index 1a3cedf0a..000000000
Binary files a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/toggle_local@2x.png and /dev/null differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/toggle_local@3x.png b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/toggle_local@3x.png
deleted file mode 100644
index bb62ef7d1..000000000
Binary files a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/toggle_local@3x.png and /dev/null differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj
index 0646637a5..5f0fdcd70 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj
@@ -296,31 +296,31 @@
     <BundleResource Include="Resources\product_add%403x.png" />
   </ItemGroup>
   <ItemGroup>
-    <BundleResource Include="Resources\toggle_local.png" />
+    <BundleResource Include="Resources\app_settings%403x.png" />
   </ItemGroup>
   <ItemGroup>
-    <BundleResource Include="Resources\toggle_local%402x.png" />
+    <BundleResource Include="Resources\app_settings.png" />
   </ItemGroup>
   <ItemGroup>
-    <BundleResource Include="Resources\toggle_local%403x.png" />
+    <BundleResource Include="Resources\app_settings%402x.png" />
   </ItemGroup>
   <ItemGroup>
-    <BundleResource Include="Resources\app_settings%403x.png" />
+    <BundleResource Include="Resources\switchOff.png" />
   </ItemGroup>
   <ItemGroup>
-    <BundleResource Include="Resources\app_settings.png" />
+    <BundleResource Include="Resources\switchOff%402x.png" />
   </ItemGroup>
   <ItemGroup>
-    <BundleResource Include="Resources\app_settings%402x.png" />
+    <BundleResource Include="Resources\switchOff%403x.png" />
   </ItemGroup>
   <ItemGroup>
-    <BundleResource Include="Resources\toggle_azure%402x.png" />
+    <BundleResource Include="Resources\switchOn.png" />
   </ItemGroup>
   <ItemGroup>
-    <BundleResource Include="Resources\toggle_azure%403x.png" />
+    <BundleResource Include="Resources\switchOn%402x.png" />
   </ItemGroup>
   <ItemGroup>
-    <BundleResource Include="Resources\toggle_azure.png" />
+    <BundleResource Include="Resources\switchOn%403x.png" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">