diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml
index dffc8c746..9314fb9fb 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml
@@ -65,6 +65,20 @@
                         Value="True" />
             </Style>
 
+            <Style x:Key="SettingsEntryStyle"
+                   TargetType="{x:Type Entry}"
+                   BasedOn="{StaticResource EntryStyle}">
+                <Setter Property="Margin"
+                        Value="12, 0" />
+            </Style>
+
+             <Style x:Key="SettingsUwpEntryStyle"
+                   TargetType="{x:Type Entry}"
+                   BasedOn="{StaticResource UwpEntryStyle}">
+                <Setter Property="Margin"
+                        Value="12, 0" />
+            </Style>
+            
             <Style x:Key="HeaderLabelStyle" 
                TargetType="{x:Type Label}">
                 <Setter Property="FontFamily"
@@ -169,9 +183,9 @@
                             <Entry.Style>
                                 <OnPlatform 
                                     x:TypeArguments="Style"
-                                    iOS="{StaticResource EntryStyle}"
-                                    Android="{StaticResource EntryStyle}"
-                                    WinPhone="{StaticResource UwpEntryStyle}"/>
+                                    iOS="{StaticResource SettingsEntryStyle}"
+                                    Android="{StaticResource SettingsEntryStyle}"
+                                    WinPhone="{StaticResource SettingsUwpEntryStyle}"/>
                             </Entry.Style>
                         </Entry>
                     </StackLayout>
@@ -226,9 +240,9 @@
                             <Entry.Style>
                                 <OnPlatform 
                                     x:TypeArguments="Style"
-                                    iOS="{StaticResource EntryStyle}"
-                                    Android="{StaticResource EntryStyle}"
-                                    WinPhone="{StaticResource UwpEntryStyle}"/>
+                                    iOS="{StaticResource SettingsEntryStyle}"
+                                    Android="{StaticResource SettingsEntryStyle}"
+                                    WinPhone="{StaticResource SettingsUwpEntryStyle}"/>
                             </Entry.Style>
                         </Entry>
                         <Label
@@ -240,9 +254,9 @@
                             <Entry.Style>
                                 <OnPlatform 
                                     x:TypeArguments="Style"
-                                    iOS="{StaticResource EntryStyle}"
-                                    Android="{StaticResource EntryStyle}"
-                                    WinPhone="{StaticResource UwpEntryStyle}"/>
+                                    iOS="{StaticResource SettingsEntryStyle}"
+                                    Android="{StaticResource SettingsEntryStyle}"
+                                    WinPhone="{StaticResource SettingsUwpEntryStyle}"/>
                             </Entry.Style>
                         </Entry>
                         <Button