diff --git a/src/Calculator.Shared/Styles.xaml b/src/Calculator.Shared/Styles.xaml
index 1b92a499..1f5d34e7 100644
--- a/src/Calculator.Shared/Styles.xaml
+++ b/src/Calculator.Shared/Styles.xaml
@@ -307,7 +307,8 @@
 	<x:Double x:Key="CalcButtonCaptionSize">34</x:Double>
 	<x:Double x:Key="CalcStandardOperatorCaptionSizeLarge">24</x:Double>
 	<!-- Numpad Standard/Scientific in Fill/Full -->
-	<x:Double x:Key="CalcStandardOperatorCaptionSize">20</x:Double>
+	<!-- UNO TODO Temp fix, value should be 20 -->
+	<x:Double x:Key="CalcStandardOperatorCaptionSize">17</x:Double>
 	<!-- Standard Operators Standard/Scientific in Fill/Full -->
 	<x:Double x:Key="CalcOperatorCaptionSize">15</x:Double>
 
diff --git a/src/Calculator.Shared/Views/CalculatorProgrammerRadixOperators.xaml b/src/Calculator.Shared/Views/CalculatorProgrammerRadixOperators.xaml
index ce529b67..6e65c7ed 100644
--- a/src/Calculator.Shared/Views/CalculatorProgrammerRadixOperators.xaml
+++ b/src/Calculator.Shared/Views/CalculatorProgrammerRadixOperators.xaml
@@ -124,7 +124,7 @@
 								Value="{StaticResource TitleFontSize}" />
 
 						<Setter Target="NumberPad.ButtonStyle"
-								Value="{StaticResource NumericButtonStyle24}" />
+										Value="{StaticResource NumericButtonStyle18}" />
 					</VisualState.Setters>
 				</VisualState>
 
diff --git a/src/Calculator.Shared/Views/CalculatorScientificOperators.xaml b/src/Calculator.Shared/Views/CalculatorScientificOperators.xaml
index 8e2767d7..13d22554 100644
--- a/src/Calculator.Shared/Views/CalculatorScientificOperators.xaml
+++ b/src/Calculator.Shared/Views/CalculatorScientificOperators.xaml
@@ -256,11 +256,23 @@
 						<Setter Target="equalButton.FontSize"
 								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="NumberPad.ButtonStyle"
-								Value="{ThemeResource NumericButtonStyle34}" />
+								Value="{ThemeResource NumericButtonStyle12}" />
 					</VisualState.Setters>
 					<Storyboard Completed="WideLayout_Completed" />
 				</VisualState>
 
+				<!-- UNO TODO Temp fix for iphoneX-->
+				<VisualState x:Name="Landscape">
+					<VisualState.StateTriggers>
+						<AdaptiveTrigger MinWindowHeight="768"
+										 MinWindowWidth="1366" />
+					</VisualState.StateTriggers>
+					<VisualState.Setters>
+						<Setter Target="NumberPad.ButtonStyle"
+								Value="{ThemeResource NumericButtonStyle12}" />
+					</VisualState.Setters>
+				</VisualState>
+				
 				<VisualState x:Name="WideL">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="768"
@@ -1027,6 +1039,9 @@
 								   ButtonId="CloseParenthesis"
 								   Content=")" />
 
+		<!-- UNO TODO Temp fix for iphone7 Landscape mode
+		 ButtonStyle should be "{StaticResource NumericButtonStyle24}"
+		-->
 		<local:NumberPad x:Name="NumberPad"
 						 x:Uid="NumberPad"
 						 Grid.Row="5"
@@ -1034,7 +1049,6 @@
 						 Grid.Column="6"
 						 Grid.ColumnSpan="3"
 						 AutomationProperties.HeadingLevel="Level1"
-						 ButtonStyle="{StaticResource NumericButtonStyle24}"
-						 DecimalButtonStyle="{StaticResource DecimalButtonStyle}" />
+						 ButtonStyle="{StaticResource NumericButtonStyle18}" />
 	</Grid>
 </UserControl>