diff --git a/BrickController2/BrickController2/App.xaml b/BrickController2/BrickController2/App.xaml
index 132be36fa..8360b5b84 100644
--- a/BrickController2/BrickController2/App.xaml
+++ b/BrickController2/BrickController2/App.xaml
@@ -150,12 +150,11 @@
         </Style>
 
         <!-- Dialog related -->
-
-        <Style x:Key="DialogFrameStyle" TargetType="Frame">
+        <Style x:Key="DialogBorderStyle" TargetType="Border">
             <Setter Property="BackgroundColor" Value="{DynamicResource DialogBackgroundColor}"/>
-            <Setter Property="BorderColor" Value="{DynamicResource DialogBorderColor}"/>
-            <Setter Property="CornerRadius" Value="10"/>
-            <Setter Property="HasShadow" Value="True"/>
+            <Setter Property="Stroke" Value="{DynamicResource DialogBorderColor}"/>
+            <Setter Property="StrokeShape" Value="RoundRectangle 10"/>
+            <Setter Property="StrokeThickness" Value="1"/>
         </Style>
         
         <!-- Picker button -->
diff --git a/BrickController2/BrickController2/UI/Controls/Dialogs.xaml b/BrickController2/BrickController2/UI/Controls/Dialogs.xaml
index 1462d07b5..45d294509 100644
--- a/BrickController2/BrickController2/UI/Controls/Dialogs.xaml
+++ b/BrickController2/BrickController2/UI/Controls/Dialogs.xaml
@@ -12,19 +12,19 @@
 
             <!-- Message box -->
             <ContentView x:Name="MessageBox" IsVisible="false" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All">
-                <Frame x:Name="MessageBoxFrame" Style="{StaticResource DialogFrameStyle}" HorizontalOptions="Center" VerticalOptions="Center" WidthRequest="280" Padding="20">
+                <Border x:Name="MessageBoxBorder" Style="{StaticResource DialogBorderStyle}" HorizontalOptions="Center" VerticalOptions="Center" WidthRequest="280" Padding="20">
                     <StackLayout Orientation="Vertical">
                         <Label x:Name="MessageBoxTitle" HorizontalOptions="Center" FontAttributes="Bold" FontSize="Large"/>
                         <Label x:Name="MessageBoxMessage" HorizontalOptions="Center"/>
                         <BoxView Style="{StaticResource DividerBoxViewStyle}" Margin="0,16,0,16"/>
                         <Button x:Name="MessageBoxButton"/>
                     </StackLayout>
-                </Frame>
+                </Border>
             </ContentView>
 
             <!-- Question dialog -->
             <ContentView x:Name="QuestionDialog" IsVisible="false" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All">
-                <Frame x:Name="QuestionDialogFrame" Style="{StaticResource DialogFrameStyle}" HorizontalOptions="Center" VerticalOptions="Center" WidthRequest="280" Padding="20">
+                <Border x:Name="QuestionDialogBorder" Style="{StaticResource DialogBorderStyle}" HorizontalOptions="Center" VerticalOptions="Center" WidthRequest="280" Padding="20">
                     <StackLayout Orientation="Vertical">
                         <Label x:Name="QuestionDialogTitle" HorizontalOptions="Center" FontAttributes="Bold" FontSize="Large"/>
                         <Label x:Name="QuestionDialogMessage" HorizontalOptions="Center"/>
@@ -38,12 +38,12 @@
                             <Button x:Name="QuestionDialogNegativeButton" Grid.Column="1" BackgroundColor="{DynamicResource NegativeColor}"/>
                         </Grid>
                     </StackLayout>
-                </Frame>
+                </Border>
             </ContentView>
 
             <!-- Input dialog -->
             <ContentView x:Name="InputDialog" IsVisible="false" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All">
-                <Frame x:Name="InputDialogFrame" Style="{StaticResource DialogFrameStyle}" HorizontalOptions="Center" VerticalOptions="Start" WidthRequest="280" Margin="0,10,0,0" Padding="20">
+                <Border x:Name="InputDialogBorder" Style="{StaticResource DialogBorderStyle}" HorizontalOptions="Center" VerticalOptions="Start" WidthRequest="280" Margin="0,10,0,0" Padding="20">
                     <StackLayout Orientation="Vertical">
                         <Entry x:Name="InputDialogEntry" HorizontalOptions="FillAndExpand"/>
                         <BoxView Style="{StaticResource DividerBoxViewStyle}" Margin="0,16,0,16"/>
@@ -56,12 +56,12 @@
                             <Button x:Name="InputDialogNegativeButton" Grid.Column="1" BackgroundColor="{DynamicResource NegativeColor}"/>
                         </Grid>
                     </StackLayout>
-                </Frame>
+                </Border>
             </ContentView>
 
             <!-- Selection dialog -->
             <ContentView x:Name="SelectionDialog" IsVisible="false" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All">
-                <Frame x:Name="SelectionDialogFrame" Style="{StaticResource DialogFrameStyle}" HorizontalOptions="Center" VerticalOptions="Start" WidthRequest="280" Margin="0,50,0,50" Padding="20">
+                <Border x:Name="SelectionDialogBorder" Style="{StaticResource DialogBorderStyle}" HorizontalOptions="Center" VerticalOptions="Start" WidthRequest="280" Margin="0,50,0,50" Padding="20">
                     <StackLayout Orientation="Vertical">
                         <Label x:Name="SelectionDialogTitle" HorizontalOptions="Center" FontAttributes="Bold" FontSize="Large"/>
                         <BoxView Style="{StaticResource DividerBoxViewStyle}" Margin="0,8,0,8"/>
@@ -75,12 +75,12 @@
                         <BoxView Style="{StaticResource DividerBoxViewStyle}" Margin="0,16,0,16"/>
                         <Button x:Name="SelectionDialogCancelButton" BackgroundColor="{DynamicResource NegativeColor}"/>
                     </StackLayout>
-                </Frame>
+                </Border>
             </ContentView>
 
             <!-- Progress dialog -->
             <ContentView x:Name="ProgressDialog" IsVisible="false" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All">
-                <Frame x:Name="ProgressDialogFrame" Style="{StaticResource DialogFrameStyle}" HorizontalOptions="Center" VerticalOptions="Center" WidthRequest="280" Padding="20">
+                <Border x:Name="ProgressDialogBorder" Style="{StaticResource DialogBorderStyle}" HorizontalOptions="Center" VerticalOptions="Center" WidthRequest="280" Padding="20">
                     <StackLayout Orientation="Vertical">
                         <Label x:Name="ProgressDialogTitle" HorizontalOptions="Center" FontAttributes="Bold" FontSize="Large"/>
                         <Label x:Name="ProgressDialogMessage" HorizontalOptions="Center"/>
@@ -91,19 +91,19 @@
                             <Button x:Name="ProgressDialogCancelButton" BackgroundColor="{DynamicResource NegativeColor}"/>
                         </StackLayout>
                     </StackLayout>
-                </Frame>
+                </Border>
             </ContentView>
 
             <!-- Game controller event dialog -->
             <ContentView x:Name="GameControllerEventDialog" IsVisible="false" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All">
-                <Frame x:Name="GameControllerEventDialogFrame" Style="{StaticResource DialogFrameStyle}" HorizontalOptions="Center" VerticalOptions="Center" WidthRequest="280" Padding="20">
+                <Border x:Name="GameControllerEventDialogBorder" Style="{StaticResource DialogBorderStyle}" HorizontalOptions="Center" VerticalOptions="Center" WidthRequest="280" Padding="20">
                     <StackLayout Orientation="Vertical">
                         <Label x:Name="GameControllerEventDialogTitle" HorizontalOptions="Center" FontAttributes="Bold" FontSize="Large"/>
                         <Label x:Name="GameControllerEventDialogMessage" HorizontalOptions="Center"/>
                         <BoxView Style="{StaticResource DividerBoxViewStyle}" Margin="0,16,0,16"/>
                         <Button x:Name="GameControllerEventDialogCancelButton" BackgroundColor="{DynamicResource NegativeColor}"/>
                     </StackLayout>
-                </Frame>
+                </Border>
             </ContentView>
 
         </AbsoluteLayout>
diff --git a/BrickController2/BrickController2/UI/Controls/FloatingActionButton.xaml b/BrickController2/BrickController2/UI/Controls/FloatingActionButton.xaml
index c265234a6..0a7003530 100644
--- a/BrickController2/BrickController2/UI/Controls/FloatingActionButton.xaml
+++ b/BrickController2/BrickController2/UI/Controls/FloatingActionButton.xaml
@@ -6,11 +6,11 @@
     x:Class="BrickController2.UI.Controls.FloatingActionButton">
     
   <ContentView.Content>
-        <Frame x:Name="MyFrame" WidthRequest="50" HeightRequest="50" CornerRadius="25" Padding="0">
-            <Frame.GestureRecognizers>
+        <Border x:Name="MyFrame" WidthRequest="50" HeightRequest="50" StrokeShape="RoundRectangle 25" Padding="0">
+            <Border.GestureRecognizers>
                 <TapGestureRecognizer x:Name="MyTapGuestureRecognizer"/>
-            </Frame.GestureRecognizers>
+            </Border.GestureRecognizers>
             <controls:ColorImage x:Name="MyImage" WidthRequest="20" HeightRequest="20" HorizontalOptions="Center" VerticalOptions="Center"/>
-        </Frame>
+        </Border>
     </ContentView.Content>
 </ContentView>
\ No newline at end of file
diff --git a/BrickController2/BrickController2/UI/Controls/SegmentedControl.xaml.cs b/BrickController2/BrickController2/UI/Controls/SegmentedControl.xaml.cs
index 24f3a7490..0da65b442 100644
--- a/BrickController2/BrickController2/UI/Controls/SegmentedControl.xaml.cs
+++ b/BrickController2/BrickController2/UI/Controls/SegmentedControl.xaml.cs
@@ -106,16 +106,15 @@ private void Build(IList<string> items)
 #pragma warning restore CS0618 // Type or member is obsolete
                 _labels.Add(label);
 
-                var frame = new Frame
+                var border = new Border
                 {
                     BackgroundColor = Colors.Transparent,
-                    Padding = new Thickness(1),
-                    HasShadow = false
+                    Padding = new Thickness(1)
                 };
-                frame.GestureRecognizers.Add(new TapGestureRecognizer { Command = new SafeCommand<int>(i => ItemTapped(i)), CommandParameter = index });
-                frame.Content = label;
+                border.GestureRecognizers.Add(new TapGestureRecognizer { Command = new SafeCommand<int>(i => ItemTapped(i)), CommandParameter = index });
+                border.Content = label;
 
-                MyStackLayout.Children.Add(frame);
+                MyStackLayout.Children.Add(border);
             }
 
             SetSelection(SelectedIndex);
diff --git a/BrickController2/BrickController2/UI/Pages/CreationListPage.xaml b/BrickController2/BrickController2/UI/Pages/CreationListPage.xaml
index f5475f1c4..5819a6c20 100644
--- a/BrickController2/BrickController2/UI/Pages/CreationListPage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/CreationListPage.xaml
@@ -57,9 +57,9 @@
                                             <ColumnDefinition Width="Auto"/>
                                             <ColumnDefinition Width="*"/>
                                         </Grid.ColumnDefinitions>
-                                        <Frame Grid.Column="0" WidthRequest="40" HeightRequest="40" BackgroundColor="{Binding Id, Converter={StaticResource IntToColor}}" CornerRadius="20" Padding="0" HasShadow="False" VerticalOptions="Center">
+                                        <Border Grid.Column="0" WidthRequest="40" HeightRequest="40" BackgroundColor="{Binding Id, Converter={StaticResource IntToColor}}" StrokeShape="RoundRectangle 20" Padding="0" VerticalOptions="Center">
                                             <Label Text="{Binding Name, Converter={StaticResource TextToCapitalInitial}}" TextColor="White" FontSize="Medium" HorizontalOptions="Center" VerticalOptions="Center"/>
-                                        </Frame>
+                                        </Border>
                                         <Label Grid.Column="1" Text="{Binding Name}" FontSize="Large" FontAttributes="Bold" VerticalOptions="CenterAndExpand"/>
                                     </Grid>
                                     <BoxView Style="{StaticResource DividerBoxViewStyle}" Margin="6,6,6,0"/>
@@ -81,42 +81,42 @@
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
-                    <Frame Grid.Column="0" HorizontalOptions="Fill" Padding="2" BackgroundColor="Transparent" HasShadow="False">
-                        <Frame.GestureRecognizers>
+                    <Border Grid.Column="0" HorizontalOptions="Fill" Padding="2" BackgroundColor="Transparent">
+                        <Border.GestureRecognizers>
                             <TapGestureRecognizer Command="{Binding NavigateToDevicesCommand}"/>
-                        </Frame.GestureRecognizers>
+                        </Border.GestureRecognizers>
                         <VerticalStackLayout HorizontalOptions="CenterAndExpand" Spacing="6">
                             <controls:ColorImage Source="{extensions:ImageResource Source=ic_link.png}" Style="{StaticResource FooterColorImageStyle}"/>
                             <Label Text="{extensions:Translate Devices}" FontSize="Small"/>
                         </VerticalStackLayout>
-                    </Frame>
-                    <Frame Grid.Column="1" HorizontalOptions="Fill" Padding="2" BackgroundColor="Transparent" HasShadow="False">
-                        <Frame.GestureRecognizers>
+                    </Border>
+                    <Border Grid.Column="1" HorizontalOptions="Fill" Padding="2" BackgroundColor="Transparent">
+                        <Border.GestureRecognizers>
                             <TapGestureRecognizer Command="{Binding NavigateToControllerTesterCommand}"/>
-                        </Frame.GestureRecognizers>
+                        </Border.GestureRecognizers>
                         <VerticalStackLayout HorizontalOptions="CenterAndExpand" Spacing="6">
                             <controls:ColorImage Source="{extensions:ImageResource Source=ic_console.png}" Style="{StaticResource FooterColorImageStyle}"/>
                             <Label Text="{extensions:Translate Controller}" FontSize="Small"/>
                         </VerticalStackLayout>
-                    </Frame>
-                    <Frame Grid.Column="2" HorizontalOptions="Fill" Padding="2" BackgroundColor="Transparent" HasShadow="False">
-                        <Frame.GestureRecognizers>
+                    </Border>
+                    <Border Grid.Column="2" HorizontalOptions="Fill" Padding="2" BackgroundColor="Transparent">
+                        <Border.GestureRecognizers>
                             <TapGestureRecognizer Command="{Binding NavigateToSequencesCommand}"/>
-                        </Frame.GestureRecognizers>
+                        </Border.GestureRecognizers>
                         <VerticalStackLayout HorizontalOptions="CenterAndExpand" Spacing="6">
                             <controls:ColorImage Source="{extensions:ImageResource Source=ic_sequence.png}" Style="{StaticResource FooterColorImageStyle}"/>
                             <Label Text="{extensions:Translate Sequences}" FontSize="Small"/>
                         </VerticalStackLayout>
-                    </Frame>
-                    <Frame Grid.Column="3" HorizontalOptions="Fill" Padding="2" BackgroundColor="Transparent" HasShadow="False">
-                        <Frame.GestureRecognizers>
+                    </Border>
+                    <Border Grid.Column="3" HorizontalOptions="Fill" Padding="2" BackgroundColor="Transparent">
+                        <Border.GestureRecognizers>
                             <TapGestureRecognizer Command="{Binding NavigateToAboutCommand}"/>
-                        </Frame.GestureRecognizers>
+                        </Border.GestureRecognizers>
                         <VerticalStackLayout HorizontalOptions="CenterAndExpand" Spacing="6">
                             <controls:ColorImage Source="{extensions:ImageResource Source=ic_info.png}" Style="{StaticResource FooterColorImageStyle}"/>
                             <Label Text="{extensions:Translate About}" FontSize="Small"/>
                         </VerticalStackLayout>
-                    </Frame>
+                    </Border>
                 </Grid>
 
                 <controls:FloatingActionButton Grid.Row="0" ButtonColor="Red" ImageSource="{extensions:ImageResource Source=ic_add.png}" ImageColor="White" Command="{Binding AddCreationCommand}" HorizontalOptions="End" VerticalOptions="End" Margin="10"/>
diff --git a/BrickController2/BrickController2/UI/Pages/SequenceListPage.xaml b/BrickController2/BrickController2/UI/Pages/SequenceListPage.xaml
index 2a7450fd9..c4204ce67 100644
--- a/BrickController2/BrickController2/UI/Pages/SequenceListPage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/SequenceListPage.xaml
@@ -52,9 +52,9 @@
                                             <ColumnDefinition Width="Auto"/>
                                             <ColumnDefinition Width="*"/>
                                         </Grid.ColumnDefinitions>
-                                        <Frame Grid.Column="0" WidthRequest="40" HeightRequest="40" BackgroundColor="{Binding Id, Converter={StaticResource IntToColor}}" CornerRadius="20" Padding="0" HasShadow="False" VerticalOptions="Center">
+                                        <Border Grid.Column="0" WidthRequest="40" HeightRequest="40" BackgroundColor="{Binding Id, Converter={StaticResource IntToColor}}" StrokeShape="RoundRectangle 20" Padding="0" VerticalOptions="Center">
                                             <Label Text="{Binding Name, Converter={StaticResource TextToCapitalInitial}}" TextColor="White" FontSize="Medium" HorizontalOptions="Center" VerticalOptions="Center"/>
-                                        </Frame>
+                                        </Border>
                                         <Label Grid.Column="1" Text="{Binding Name}" FontSize="Large" FontAttributes="Bold" VerticalOptions="CenterAndExpand"/>
                                     </Grid>
                                     <BoxView Style="{StaticResource DividerBoxViewStyle}" Margin="6,6,6,0"/>