diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/NestedPages/MaterialTopBarSampleNestedPage.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/NestedPages/MaterialTopBarSampleNestedPage.xaml
index 58f075219..dbe765e16 100644
--- a/Uno.Gallery/Uno.Gallery.Shared/Views/NestedPages/MaterialTopBarSampleNestedPage.xaml
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/NestedPages/MaterialTopBarSampleNestedPage.xaml
@@ -5,7 +5,7 @@
 	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	  xmlns:utu="using:Uno.Toolkit.UI"
 	  mc:Ignorable="d"
-	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+	  Background="{ThemeResource SurfaceBrush}">
 
 	<Grid>
 		<Grid.RowDefinitions>
@@ -42,32 +42,32 @@
 			<Grid x:Name="Home" Visibility="Collapsed">
 				<Border Background="LightGray">
 					<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-						<FontIcon Glyph="{StaticResource HomeIcon}" />
-						<TextBlock Text="Home" TextAlignment="Center" />
+						<FontIcon  Foreground="{ThemeResource OnSurfaceBrush}"  Glyph="{StaticResource HomeIcon}" />
+						<TextBlock Foreground="{ThemeResource OnSurfaceBrush}" Text="Home" TextAlignment="Center" />
 					</StackPanel>
 				</Border>
 			</Grid>
 			<Grid x:Name="Search" Visibility="Collapsed">
 				<Border Background="LightGray">
 					<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-						<FontIcon Glyph="{StaticResource SearchIcon}" />
-						<TextBlock Text="Search" TextAlignment="Center" />
+						<FontIcon  Foreground="{ThemeResource OnSurfaceBrush}" Glyph="{StaticResource SearchIcon}" />
+						<TextBlock Foreground="{ThemeResource OnSurfaceBrush}" Text="Search" TextAlignment="Center" />
 					</StackPanel>
 				</Border>
 			</Grid>
 			<Grid x:Name="Support" Visibility="Collapsed">
 				<Border Background="LightGray">
-					<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-						<FontIcon Glyph="{StaticResource SupportIcon}" />
-						<TextBlock Text="Support" TextAlignment="Center" />
+					<StackPanel  HorizontalAlignment="Center" VerticalAlignment="Center">
+						<FontIcon  Foreground="{ThemeResource OnSurfaceBrush}"  Glyph="{StaticResource SupportIcon}" />
+						<TextBlock Foreground="{ThemeResource OnSurfaceBrush}"   Text="Support" TextAlignment="Center" />
 					</StackPanel>
 				</Border>
 			</Grid>
 			<Grid x:Name="About" Visibility="Collapsed">
 				<Border Background="LightGray">
 					<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-						<FontIcon Glyph="{StaticResource AboutIcon}" />
-						<TextBlock Text="About" TextAlignment="Center" />
+						<FontIcon  Foreground="{ThemeResource OnSurfaceBrush}"  Glyph="{StaticResource AboutIcon}" />
+						<TextBlock Foreground="{ThemeResource OnSurfaceBrush}"  Text="About" TextAlignment="Center" />
 					</StackPanel>
 				</Border>
 			</Grid>