diff --git a/SampleApps/WinUiApp/MainWindow.xaml b/SampleApps/WinUiApp/MainWindow.xaml
index 8646b81c..7058a81f 100644
--- a/SampleApps/WinUiApp/MainWindow.xaml
+++ b/SampleApps/WinUiApp/MainWindow.xaml
@@ -209,79 +209,82 @@
         </StackPanel>
 
         <StackPanel HorizontalAlignment="Left" VerticalAlignment="Top" Margin="6">
-            <tools:MapLayersMenuButton x:Name="mapLayersMenuButton"
-                Margin="2" Padding="8" ToolTipService.ToolTip="Map Layers and Overlays"
-                Map="{Binding ElementName=map}">
-                <tools:MapLayerItem Text="OpenStreetMap">
+            <tools:MenuButton x:Name="mapLayersMenuButton"
+                Icon="&#xE81E;" Margin="2" Padding="8" ToolTipService.ToolTip="Map Layers and Overlays" Map="{Binding ElementName=map}">
+                <tools:MapLayerMenuItem Text="OpenStreetMap">
                     <map:MapTileLayer
                         TileSource="https://tile.openstreetmap.org/{z}/{x}/{y}.png"
                         SourceName="OpenStreetMap"
                         Description="© [OpenStreetMap contributors](http://www.openstreetmap.org/copyright)"/>
-                </tools:MapLayerItem>
-                <tools:MapLayerItem Text="OpenStreetMap German">
+                </tools:MapLayerMenuItem>
+                <tools:MapLayerMenuItem Text="OpenStreetMap German">
                     <map:MapTileLayer
                         TileSource="https://tile.openstreetmap.de/{z}/{x}/{y}.png"
                         SourceName="OpenStreetMap German"
                         Description="© [OpenStreetMap Deutschland](https://www.openstreetmap.de) © [OpenStreetMap contributors](http://www.openstreetmap.org/copyright)"/>
-                </tools:MapLayerItem>
-                <tools:MapLayerItem Text="OpenStreetMap French">
+                </tools:MapLayerMenuItem>
+                <tools:MapLayerMenuItem Text="OpenStreetMap French">
                     <map:MapTileLayer
                         TileSource="http://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png"
                         SourceName="OpenStreetMap French"
                         Description="© [OpenStreetMap France](https://www.openstreetmap.fr/mentions-legales/) © [OpenStreetMap contributors](http://www.openstreetmap.org/copyright)"/>
-                </tools:MapLayerItem>
-                <tools:MapLayerItem Text="OpenTopoMap">
+                </tools:MapLayerMenuItem>
+                <tools:MapLayerMenuItem Text="OpenTopoMap">
                     <map:MapTileLayer
                         TileSource="https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png"
                         SourceName="OpenTopoMap"
                         Description="© [OpenTopoMap](https://opentopomap.org/) © [OpenStreetMap contributors](http://www.openstreetmap.org/copyright)"/>
-                </tools:MapLayerItem>
-                <tools:MapLayerItem Text="TopPlusOpen WMTS">
+                </tools:MapLayerMenuItem>
+                <tools:MapLayerMenuItem Text="TopPlusOpen WMTS">
                     <map:WmtsTileLayer
                         CapabilitiesUri="https://sgx.geodatenzentrum.de/wmts_topplus_open/1.0.0/WMTSCapabilities.xml"
                         SourceName="TopPlusOpen"
                         Description="© [BKG](https://gdz.bkg.bund.de/index.php/default/webdienste/topplus-produkte/wmts-topplusopen-wmts-topplus-open.html)"/>
-                </tools:MapLayerItem>
-                <tools:MapLayerItem Text="TopPlusOpen WMS">
+                </tools:MapLayerMenuItem>
+                <tools:MapLayerMenuItem Text="TopPlusOpen WMS">
                     <map:WmsImageLayer
                         ServiceUri="https://sgx.geodatenzentrum.de/wms_topplus_open"
                         Description="© [BKG](https://gdz.bkg.bund.de/index.php/default/webdienste/topplus-produkte/wms-topplusopen-mit-layer-fur-normalausgabe-und-druck-wms-topplus-open.html)"/>
-                </tools:MapLayerItem>
-                <tools:MapLayerItem Text="OpenStreetMap WMS">
+                </tools:MapLayerMenuItem>
+                <tools:MapLayerMenuItem Text="OpenStreetMap WMS">
                     <map:WmsImageLayer
                         ServiceUri="http://ows.terrestris.de/osm/service"
                         Description="© [terrestris GmbH &amp; Co. KG](http://ows.terrestris.de/) © [OpenStreetMap contributors](http://www.openstreetmap.org/copyright)"/>
-                </tools:MapLayerItem>
-                <tools:MapLayersMenuButton.MapOverlays>
-                    <tools:MapLayerItem Text="Sample Image">
-                        <Image Source="10_535_330.jpg" Stretch="Fill"
-                               map:MapPanel.BoundingBox="53.54031,8.08594,53.74871,8.43750"/>
-                    </tools:MapLayerItem>
-                    <tools:MapLayerItem Text="Mount Etna KML">
-                        <map:GroundOverlay SourcePath="etna.kml"/>
-                    </tools:MapLayerItem>
-                    <tools:MapLayerItem Text="Seamarks">
-                        <map:MapTileLayer
-                            TileSource="http://tiles.openseamap.org/seamark/{z}/{x}/{y}.png"
-                            SourceName="Seamarks"
-                            MinZoomLevel="9" MaxZoomLevel="18"/>
-                    </tools:MapLayerItem>
-                    <tools:MapLayerItem Text="Graticule">
-                        <map:MapGraticule Opacity="0.7"/>
-                    </tools:MapLayerItem>
-                    <tools:MapLayerItem Text="Scale">
-                        <map:MapScale HorizontalAlignment="Center" VerticalAlignment="Bottom"/>
-                    </tools:MapLayerItem>
-                </tools:MapLayersMenuButton.MapOverlays>
-            </tools:MapLayersMenuButton>
+                </tools:MapLayerMenuItem>
+                <MenuFlyoutSeparator/>
+                <tools:MapOverlayMenuItem Text="Sample Image">
+                    <Image Source="10_535_330.jpg" Stretch="Fill"
+                        map:MapPanel.BoundingBox="53.54031,8.08594,53.74871,8.43750"/>
+                </tools:MapOverlayMenuItem>
+                <tools:MapOverlayMenuItem Text="Mount Etna KML">
+                    <map:GroundOverlay SourcePath="etna.kml"/>
+                </tools:MapOverlayMenuItem>
+                <tools:MapOverlayMenuItem Text="Seamarks">
+                    <map:MapTileLayer
+                        TileSource="http://tiles.openseamap.org/seamark/{z}/{x}/{y}.png"
+                        SourceName="Seamarks"
+                        MinZoomLevel="9" MaxZoomLevel="18"/>
+                </tools:MapOverlayMenuItem>
+                <tools:MapOverlayMenuItem Text="Graticule">
+                    <map:MapGraticule Opacity="0.7"/>
+                </tools:MapOverlayMenuItem>
+                <tools:MapOverlayMenuItem Text="Scale">
+                    <map:MapScale HorizontalAlignment="Center" VerticalAlignment="Bottom"/>
+                </tools:MapOverlayMenuItem>
+            </tools:MenuButton>
 
-            <tools:MapProjectionsMenuButton x:Name="mapProjectionsMenuButton"
-                Margin="2" Padding="8" ToolTipService.ToolTip="Map Projections"
-                Map="{Binding ElementName=map}">
-                <tools:MapProjectionItem Text="Web Mercator" Projection="EPSG:3857"/>
-                <tools:MapProjectionItem Text="Equirectangular" Projection="EPSG:4326"/>
-                <tools:MapProjectionItem Text="ETRS89 / UTM zone 32N" Projection="EPSG:25832"/>
-            </tools:MapProjectionsMenuButton>
+            <tools:MenuButton x:Name="mapProjectionsMenuButton"
+                Icon="&#xE809;" Padding="8" Margin="2" ToolTipService.ToolTip="Map Projections" Map="{Binding ElementName=map}">
+                <tools:MapProjectionMenuItem Text="Web Mercator">
+                    EPSG:3857
+                </tools:MapProjectionMenuItem>
+                <tools:MapProjectionMenuItem Text="Equirectangular">
+                    EPSG:4326
+                </tools:MapProjectionMenuItem>
+                <tools:MapProjectionMenuItem Text="ETRS89 / UTM zone 32N">
+                    EPSG:25832
+                </tools:MapProjectionMenuItem>
+            </tools:MenuButton>
 
             <Slider Orientation="Vertical" Margin="4,8" Height="100"
                     Minimum="{Binding MinZoomLevel, ElementName=map}"