diff --git a/src/Calculator.Droid/Calculator.Droid.csproj b/src/Calculator.Droid/Calculator.Droid.csproj
index 9181501b..d57e2c20 100644
--- a/src/Calculator.Droid/Calculator.Droid.csproj
+++ b/src/Calculator.Droid/Calculator.Droid.csproj
@@ -66,7 +66,7 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>12.0.2</Version>
     </PackageReference>
-    <PackageReference Include="Uno.UI" Version="1.45.0-dev.1560" />
+    <PackageReference Include="Uno.UI" Version="1.45.0-dev.1595" />
     <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.32" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
diff --git a/src/Calculator.Shared/Views/Calculator.xaml.cs b/src/Calculator.Shared/Views/Calculator.xaml.cs
index bddf99f0..67812635 100644
--- a/src/Calculator.Shared/Views/Calculator.xaml.cs
+++ b/src/Calculator.Shared/Views/Calculator.xaml.cs
@@ -85,7 +85,7 @@ namespace CalculatorApp
         string m_openHistoryFlyoutAutomationName;
         string m_closeHistoryFlyoutAutomationName;
 
-        public ICommand HistoryButtonPressed;
+		public ICommand HistoryButtonPressed;
 
         Windows.UI.Xaml.Controls.PivotItem m_pivotItem;
         bool m_IsDigit = false;
@@ -598,7 +598,8 @@ namespace CalculatorApp
                 HistoryButton.Focus(FocusState.Programmatic);
             }
 
-            FullscreenFlyoutClosed();
+			// UNO TODO
+			//FullscreenFlyoutClosed();
         }
 
         public void CloseHistoryFlyout()
@@ -692,7 +693,8 @@ namespace CalculatorApp
                 MemoryButton.Focus(FocusState.Programmatic);
             }
 
-            FullscreenFlyoutClosed();
+			// UNO TODO
+			//FullscreenFlyoutClosed();
         }
 
         Memory GetMemory()
diff --git a/src/Calculator.Shared/Views/HistoryList.xaml b/src/Calculator.Shared/Views/HistoryList.xaml
index 3c7b6580..46021e44 100644
--- a/src/Calculator.Shared/Views/HistoryList.xaml
+++ b/src/Calculator.Shared/Views/HistoryList.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="CalculatorApp.HistoryList"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:xamarin="http://platform.uno/xamarin"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:automation="using:CalculatorApp.Common.Automation"
              xmlns:controls="using:CalculatorApp.Controls"
@@ -12,7 +13,7 @@
              xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
              AutomationProperties.AutomationId="HistoryList"
              FlowDirection="LeftToRight"
-             mc:Ignorable="d">
+             mc:Ignorable="d xamarin">
 	
              <!-- UNO TODO x:Name="HistoryList"-->
 
@@ -41,6 +42,12 @@
 			</ResourceDictionary.ThemeDictionaries>
 			<converters:ItemSizeToVisibilityNegationConverter x:Key="ItemSizeToVisibilityNegationConverter"/>
 			<converters:ItemSizeToVisibilityConverter x:Key="ItemSizeToVisibilityConverter"/>
+			<!--Workaround for nventive/Uno#935-->
+			<xamarin:Style x:Key="BodyTextBlockMediumStyle"
+                           BasedOn="{StaticResource BodyTextBlockStyle}"
+                           TargetType="TextBlock">
+				<Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}"/>
+			</xamarin:Style>
 
 			<!--UNO TODO-->
 			<win:MenuFlyout x:Key="HistoryContextMenu">
diff --git a/src/Calculator.Shared/Views/MainPage.xaml b/src/Calculator.Shared/Views/MainPage.xaml
index 2fba9c78..264156d5 100644
--- a/src/Calculator.Shared/Views/MainPage.xaml
+++ b/src/Calculator.Shared/Views/MainPage.xaml
@@ -170,10 +170,9 @@
 									<FontIcon FontFamily="{StaticResource CalculatorFontFamily}"
 											  Glyph="&#xe946;" />
 								</NavigationViewItem.Icon>
-								<TextBlock Text=""
-										   x:Name="AboutText" />
-								<NavigationViewItem.ContextFlyout>
-
+								
+								<FlyoutBase.AttachedFlyout>
+									
 									<Flyout x:Name="AboutPageFlyout"
 											x:Uid="AboutPageFlyout"
 											Closed="OnAboutFlyoutClosed"
@@ -183,7 +182,7 @@
 										<local:AboutFlyout x:Name="AboutPage"
 														   x:Load="False" />
 									</Flyout>
-								</NavigationViewItem.ContextFlyout>
+								</FlyoutBase.AttachedFlyout>
 							</NavigationViewItem>
 						</NavigationViewList.Items>
 					</NavigationViewList>
diff --git a/src/Calculator.Shared/Views/MainPage.xaml.cs b/src/Calculator.Shared/Views/MainPage.xaml.cs
index e9a112c7..9977fbc4 100644
--- a/src/Calculator.Shared/Views/MainPage.xaml.cs
+++ b/src/Calculator.Shared/Views/MainPage.xaml.cs
@@ -62,22 +62,15 @@ namespace CalculatorApp
 
             double sizeInInches = 0.0;
 
-			// UNO TODO
-			//if (SUCCEEDED(GetIntegratedDisplaySize(&sizeInInches)))
-			//{
-			//    if (sizeInInches < 7.0) // If device's display size (diagonal length) is less than 7 inches then keep the calc always in Portrait mode only
-			//    {
-			//        DisplayInformation.AutoRotationPreferences = DisplayOrientations.Portrait | DisplayOrientations.PortraitFlipped;
-			//    }
-			//}       
-
-			//UNO_TODO /Workaround to have both the Text localisation and the glyph working on all platforms
-			var resourceLoader = Windows.ApplicationModel.Resources.ResourceLoader.GetForCurrentView();
-			if (AboutText != null)
-			{
-				AboutText.Text = resourceLoader.GetString("AboutButton/Content");
-			}
-		}
+            // UNO TODO
+            //if (SUCCEEDED(GetIntegratedDisplaySize(&sizeInInches)))
+            //{
+            //    if (sizeInInches < 7.0) // If device's display size (diagonal length) is less than 7 inches then keep the calc always in Portrait mode only
+            //    {
+            //        DisplayInformation.AutoRotationPreferences = DisplayOrientations.Portrait | DisplayOrientations.PortraitFlipped;
+            //    }
+            //}
+        }
 
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
@@ -508,7 +501,7 @@ namespace CalculatorApp
                 this.FindName("AboutPage");
             }
 
-			AboutButton.ContextFlyout.ShowAt(AboutButton);
+            FlyoutBase.ShowAttachedFlyout(AboutButton);
         }
 
         void UnregisterEventHandlers()
diff --git a/src/Calculator.UWP/Calculator.UWP.csproj b/src/Calculator.UWP/Calculator.UWP.csproj
index 0860f29b..4f2c9088 100644
--- a/src/Calculator.UWP/Calculator.UWP.csproj
+++ b/src/Calculator.UWP/Calculator.UWP.csproj
@@ -9,7 +9,7 @@
       <Version>4.3.1</Version>
     </PackageReference>
     <PackageReference Include="Uno.UI">
-      <Version>1.45.0-dev.1560</Version>
+      <Version>1.45.0-dev.1595</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>
diff --git a/src/Calculator.Wasm/Calculator.Wasm.csproj b/src/Calculator.Wasm/Calculator.Wasm.csproj
index 450406ca..43b5980b 100644
--- a/src/Calculator.Wasm/Calculator.Wasm.csproj
+++ b/src/Calculator.Wasm/Calculator.Wasm.csproj
@@ -44,7 +44,7 @@
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
 		<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-		<PackageReference Include="Uno.UI" Version="1.45.0-dev.1560" />
+		<PackageReference Include="Uno.UI" Version="1.45.0-dev.1595" />
 		<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.0-dev.281" />
 		<DotNetCliToolReference Include="Uno.Wasm.Bootstrap.Cli" Version="1.0.0-dev.276" />
 	</ItemGroup>
diff --git a/src/Calculator.iOS/Calculator.iOS.csproj b/src/Calculator.iOS/Calculator.iOS.csproj
index 0a2b0695..353e5528 100644
--- a/src/Calculator.iOS/Calculator.iOS.csproj
+++ b/src/Calculator.iOS/Calculator.iOS.csproj
@@ -208,7 +208,7 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>12.0.2</Version>
     </PackageReference>
-    <PackageReference Include="Uno.UI" Version="1.45.0-dev.1560" />
+    <PackageReference Include="Uno.UI" Version="1.45.0-dev.1595" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
   </ItemGroup>