diff --git a/ch02_DesigningViews/ex_CustomToolbar/MainPage.xaml b/ch02_DesigningViews/ex_CustomToolbar/MainPage.xaml
index b47a6f8..15f1b38 100644
--- a/ch02_DesigningViews/ex_CustomToolbar/MainPage.xaml
+++ b/ch02_DesigningViews/ex_CustomToolbar/MainPage.xaml
@@ -84,34 +84,34 @@
                     BackgroundColor="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource PrimaryDark}}"
                     Padding="4">
                 <VerticalStackLayout>
-                    <HorizontalStackLayout MaximumHeightRequest="{OnPlatform 24, WinUI=40}" Margin="0, 4">
+                    <HorizontalStackLayout MaximumHeightRequest="{OnPlatform 24, WinUI=40}" Margin="{OnPlatform '0,6', WinUI='0,4'}">
                         <ImageButton Source="captions_bubble.png"
-                                     MinimumHeightRequest="{OnPlatform WinUI=24}" 
-                                     MinimumWidthRequest="{OnPlatform WinUI=24}" 
-                                     HeightRequest="{OnPlatform WinUI=24}" 
-                                     Margin="{OnPlatform WinUI='0,0,4,0'}"
-                                     BackgroundColor="Transparent">
+                                     MinimumHeightRequest="{OnPlatform 16, WinUI=24}" 
+                                     MinimumWidthRequest="{OnPlatform 16, WinUI=24}" 
+                                     HeightRequest="{OnPlatform 16, WinUI=24}" 
+                                     Margin="{OnPlatform '12,0', WinUI='0,0,4,0', Android='0'}"
+                                     BackgroundColor="Transparent" VerticalOptions="Center">
                             <ImageButton.Behaviors>
                                 <toolkit:IconTintColorBehavior TintColor="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource PrimaryDarkText}}"  />
                             </ImageButton.Behaviors>
                         </ImageButton>
                         <Label Text="Menu 1" VerticalOptions="Center" TextColor="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource PrimaryDarkText}}"
-                               FontSize="{OnPlatform WinUI=Micro}"/>
+                               FontSize="{OnPlatform Small, WinUI=Micro}"/>
                     </HorizontalStackLayout>
 
-                    <HorizontalStackLayout MaximumHeightRequest="{OnPlatform 24, WinUI=40}" Margin="0, 4" >
+                    <HorizontalStackLayout MaximumHeightRequest="{OnPlatform 24, WinUI=40}" Margin="{OnPlatform '0,6', WinUI='0,4'}" >
                         <ImageButton Source="quote_bubble.png"
-                                     MinimumHeightRequest="{OnPlatform WinUI=24}" 
-                                     MinimumWidthRequest="{OnPlatform WinUI=24}" 
-                                     HeightRequest="{OnPlatform WinUI=24}" 
-                                     Margin="{OnPlatform WinUI='0,0,4,0'}"
+                                     MinimumHeightRequest="{OnPlatform 16, WinUI=24}" 
+                                     MinimumWidthRequest="{OnPlatform 16, WinUI=24}" 
+                                     HeightRequest="{OnPlatform 16, WinUI=24}" 
+                                     Margin="{OnPlatform '12,0', WinUI='0,0,4,0', Android='0'}"
                                      BackgroundColor="Transparent" VerticalOptions="Center">
                             <ImageButton.Behaviors>
                                 <toolkit:IconTintColorBehavior TintColor="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource PrimaryDarkText}}"  />
                             </ImageButton.Behaviors>
                         </ImageButton>
-                        <Label Text="Menu 2" VerticalOptions="Center" VerticalTextAlignment="Center"
-                               FontSize="{OnPlatform WinUI=Micro}"
+                        <Label Text="Menu 2" VerticalOptions="Center"
+                               FontSize="{OnPlatform Small, WinUI=Micro}"
                                TextColor="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource PrimaryDarkText}}" />
                     </HorizontalStackLayout>
                 </VerticalStackLayout>