diff --git a/BrickController2/BrickController2.Android/MainApplication.cs b/BrickController2/BrickController2.Android/MainApplication.cs
index f14cd75ee..84f708c99 100644
--- a/BrickController2/BrickController2.Android/MainApplication.cs
+++ b/BrickController2/BrickController2.Android/MainApplication.cs
@@ -22,7 +22,6 @@ protected override MauiApp CreateMauiApp() => ApplicationBuilder.Create()
             {
                 handlers
                     .AddHandler<ExtendedSlider, ExtendedSliderHandler>()
-                    .AddHandler<ColorImage, ColorImageHandler>()
                 ;
             })
             .ConfigureContainer((containerBuilder) =>
diff --git a/BrickController2/BrickController2.Android/UI/CustomHandlers/ColorImageRenderer.cs b/BrickController2/BrickController2.Android/UI/CustomHandlers/ColorImageRenderer.cs
deleted file mode 100644
index f7439af87..000000000
--- a/BrickController2/BrickController2.Android/UI/CustomHandlers/ColorImageRenderer.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using Android.Graphics;
-using Android.Widget;
-using BrickController2.UI.Controls;
-using Microsoft.Maui.Controls.Internals;
-using Microsoft.Maui.Platform;
-using Microsoft.Maui.Handlers;
-
-namespace BrickController2.Droid.UI.CustomRenderers
-{
-    public class ColorImageHandler : ImageHandler
-    {
-        public static readonly PropertyMapper<ColorImage, ColorImageHandler> PropertyMapper = new(ImageHandler.Mapper)
-        {
-            [ColorImage.ColorProperty.PropertyName] = SetColor,
-            [ColorImage.SourceProperty.PropertyName] = MapSourceAndColor
-        };
-
-        public ColorImageHandler() : base(PropertyMapper)
-        {
-        }
-
-        private static IResourceDictionary ResourceDictionary => Application.Current.Resources;
-
-        protected override void ConnectHandler(ImageView platformView)
-        {
-            base.ConnectHandler(platformView);
-            SetColor();
-
-            // react on theme change
-            ResourceDictionary.ValuesChanged += (sender, args) => SetColor();
-        }
-
-        private void SetColor() => SetColor(this, VirtualView as ColorImage);
-
-        private static void MapSourceAndColor(ColorImageHandler handler, ColorImage colorImage)
-        {
-            SetColor(handler, colorImage);
-            MapSource(handler, colorImage);
-        }
-
-        private static void SetColor(ColorImageHandler handler, ColorImage colorImage)
-        {
-            if (colorImage is null)
-            {
-                return;
-            }
-
-            if (colorImage.Color.Equals(Colors.Transparent))
-            {
-                if (handler.PlatformView.ColorFilter != null)
-                {
-                    handler.PlatformView.ClearColorFilter();
-                }
-            }
-            else
-            {
-                var colorFilter = new PorterDuffColorFilter(colorImage.Color.ToPlatform(), PorterDuff.Mode.SrcIn);
-                handler.PlatformView.SetColorFilter(colorFilter);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/BrickController2/BrickController2.WinUI/App.xaml.cs b/BrickController2/BrickController2.WinUI/App.xaml.cs
index b7b8b2180..1cd9e2535 100644
--- a/BrickController2/BrickController2.WinUI/App.xaml.cs
+++ b/BrickController2/BrickController2.WinUI/App.xaml.cs
@@ -23,7 +23,6 @@ protected override MauiApp CreateMauiApp() => ApplicationBuilder.Create()
             {
                 handlers
                     .AddHandler<ExtendedSlider, ExtendedSliderHandler>()
-                    .AddHandler<PageBase, CustomPageHandler>()
                 ;
 
                 // handle swipe if there is no touch screen
diff --git a/BrickController2/BrickController2.WinUI/UI/CustomHandlers/CustomPageHandler.cs b/BrickController2/BrickController2.WinUI/UI/CustomHandlers/CustomPageHandler.cs
deleted file mode 100644
index a553bde34..000000000
--- a/BrickController2/BrickController2.WinUI/UI/CustomHandlers/CustomPageHandler.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using BrickController2.UI.Pages;
-using Microsoft.Maui.Handlers;
-using Microsoft.Maui.Platform;
-
-namespace BrickController2.Windows.UI.CustomHandlers;
-
-/// <summary>
-/// Applies TitleView adjustments to resolve issue: TitleView content does not expand across the entire width
-/// https://github.com/dotnet/maui/issues/10703
-/// </summary>
-internal class CustomPageHandler : PageHandler
-{
-    protected override void ConnectHandler(ContentPanel platformView)
-    {
-        base.ConnectHandler(platformView);
-
-        if (VirtualView is PageBase page)
-        {
-            var window = page.Window;
-
-            window.SizeChanged += Window_SizeChanged;
-            page.Unloaded += (sender, args) => window.SizeChanged -= Window_SizeChanged;
-
-            ApplyTitleViewWidth(page);
-        }
-    }
-
-    private void Window_SizeChanged(object sender, EventArgs e)
-    {
-        ApplyTitleViewWidth(VirtualView as PageBase);
-    }
-
-    private static void ApplyTitleViewWidth(PageBase page)
-    {
-        var view = NavigationPage.GetTitleView(page);
-        if (view != null)
-        {
-            view.WidthRequest = page.Window.Width;
-        }
-    }
-}
diff --git a/BrickController2/BrickController2.iOS/UI/CustomRenderers/ColorImageRenderer.cs b/BrickController2/BrickController2.iOS/UI/CustomRenderers/ColorImageRenderer.cs
deleted file mode 100644
index 5f6e4cfa4..000000000
--- a/BrickController2/BrickController2.iOS/UI/CustomRenderers/ColorImageRenderer.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System.ComponentModel;
-using BrickController2.iOS.UI.CustomRenderers;
-using BrickController2.UI.Controls;
-using UIKit;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.iOS;
-
-[assembly:ExportRenderer(typeof(ColorImage), typeof(ColorImageRenderer))]
-namespace BrickController2.iOS.UI.CustomRenderers
-{
-    public class ColorImageRenderer : ImageRenderer
-    {
-        protected override void OnElementChanged(ElementChangedEventArgs<Image> e)
-        {
-            base.OnElementChanged(e);
-            SetColor();
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            base.OnElementPropertyChanged(sender, e);
-
-            if (e.PropertyName == ColorImage.ColorProperty.PropertyName || e.PropertyName == ColorImage.SourceProperty.PropertyName || e.PropertyName == ColorImage.IsLoadingProperty.PropertyName)
-            {
-                SetColor();
-            }
-        }
-
-        private void SetColor()
-        {
-            if (Control == null || Control.Image == null || !(Element is ColorImage colorImage))
-            {
-                return;
-            }
-
-            if (colorImage.Color.Equals(Xamarin.Forms.Color.Transparent))
-            {
-                Control.Image = Control.Image.ImageWithRenderingMode(UIImageRenderingMode.Automatic);
-                Control.TintColor = null;
-            }
-            else
-            {
-                Control.Image = Control.Image.ImageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate);
-                Control.TintColor = colorImage.Color.ToUIColor();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/BrickController2/BrickController2/App.xaml b/BrickController2/BrickController2/App.xaml
index 06db2b222..eba03f440 100644
--- a/BrickController2/BrickController2/App.xaml
+++ b/BrickController2/BrickController2/App.xaml
@@ -68,12 +68,6 @@
             <Setter Property="TextColor" Value="{DynamicResource NavigationBarItemColor}"/>
             <Setter Property="FontSize" Value="Large"/>
         </Style>
-
-        <Style x:Key="NavigationBarImageButtonStyle" TargetType="controls:ImageButton">
-            <Setter Property="WidthRequest" Value="30"/>
-            <Setter Property="HeightRequest" Value="30"/>
-            <Setter Property="ImageColor" Value="{DynamicResource NavigationBarItemColor}"/>
-        </Style>
         
         <!-- Header bar -->
 
@@ -83,12 +77,6 @@
             <Setter Property="ColumnSpacing" Value="6"/>
         </Style>
 
-        <Style x:Key="HeaderBarImageButtonStyle" TargetType="controls:ImageButton">
-            <Setter Property="WidthRequest" Value="30"/>
-            <Setter Property="HeightRequest" Value="30"/>
-            <Setter Property="ImageColor" Value="{DynamicResource HeaderItemColor}"/>
-        </Style>
-
         <!-- Footer bar -->
 
         <Style x:Key="FooterGridStyle" TargetType="Grid">
@@ -172,12 +160,22 @@
 
         <!-- Floating button styles -->
         <Style x:Key="FloatingActionButtonStyle" TargetType="controls:FloatingActionButton">
-            <Setter Property="ButtonColor" Value="{DynamicResource FloatingButtonColor}"/>
-            <Setter Property="ImageColor" Value="{DynamicResource PrimaryTextColor}"/>
+            <Setter Property="BackgroundColor" Value="{DynamicResource FloatingButtonColor}"/>
+            <Setter Property="ImageColor" Value="{DynamicResource NavigationBarItemColor}"/>
+            <Setter Property="Aspect" Value="Center"/>
+            <Setter Property="CornerRadius" Value="25"/>
+            <Setter Property="Padding" Value="0"/>
+            <Setter Property="HeightRequest" Value="50"/>
+            <Setter Property="WidthRequest" Value="50"/>
         </Style>
         <Style x:Key="InlineActionButtonStyle" TargetType="controls:FloatingActionButton">
-            <Setter Property="ButtonColor" Value="{DynamicResource InlineButtonColor}"/>
-            <Setter Property="ImageColor" Value="{DynamicResource PrimaryTextColor}"/>
+            <Setter Property="BackgroundColor" Value="{DynamicResource InlineButtonColor}"/>
+            <Setter Property="ImageColor" Value="{DynamicResource NavigationBarItemColor}"/>
+            <Setter Property="Aspect" Value="Center"/>
+            <Setter Property="CornerRadius" Value="23"/>
+            <Setter Property="Padding" Value="0"/>
+            <Setter Property="HeightRequest" Value="46"/>
+            <Setter Property="WidthRequest" Value="46"/>
         </Style>
 
         <!-- Misc -->
diff --git a/BrickController2/BrickController2/BrickController2.csproj b/BrickController2/BrickController2/BrickController2.csproj
index 6c473a005..17faf2597 100644
--- a/BrickController2/BrickController2/BrickController2.csproj
+++ b/BrickController2/BrickController2/BrickController2.csproj
@@ -8,6 +8,11 @@
     <EmbeddedResource Include="UI\Images\*.png" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- Custom Fonts -->
+	<MauiFont Include="Resources\Fonts\*" />
+  </ItemGroup>	
+	
   <ItemGroup>
     <PackageReference Include="Autofac" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" />
diff --git a/BrickController2/BrickController2/DI/ApplicationBuilder.cs b/BrickController2/BrickController2/DI/ApplicationBuilder.cs
index 3a558f007..f5c1429c5 100644
--- a/BrickController2/BrickController2/DI/ApplicationBuilder.cs
+++ b/BrickController2/BrickController2/DI/ApplicationBuilder.cs
@@ -17,6 +17,11 @@ public static MauiAppBuilder Create()
         return builder
             // configure BC2 app
             .UseMauiApp<App>()
+            .ConfigureFonts(fonts =>
+            {
+                // source: https://github.com/google/material-design-icons/blob/master/font/MaterialIconsOutlined-Regular.otf
+                fonts.AddFont("MaterialIconsOutlined-Regular", "Icons");
+            })
             // configure other common dependencies if needed
             ;
     }
diff --git a/BrickController2/BrickController2/Resources/Fonts/MaterialIconsOutlined-Regular.otf b/BrickController2/BrickController2/Resources/Fonts/MaterialIconsOutlined-Regular.otf
new file mode 100644
index 000000000..9dad12bcf
Binary files /dev/null and b/BrickController2/BrickController2/Resources/Fonts/MaterialIconsOutlined-Regular.otf differ
diff --git a/BrickController2/BrickController2/Resources/TranslationResources.resx b/BrickController2/BrickController2/Resources/TranslationResources.resx
index e73160174..250b356cf 100644
--- a/BrickController2/BrickController2/Resources/TranslationResources.resx
+++ b/BrickController2/BrickController2/Resources/TranslationResources.resx
@@ -141,6 +141,9 @@
   <data name="AdvancedSettings" xml:space="preserve">
     <value>Advanced settings</value>
   </data>
+  <data name="ApplyChanges" xml:space="preserve">
+    <value>Apply changes</value>
+  </data>
   <data name="AreYouSureToDeleteControllerAction" xml:space="preserve">
     <value>Are you sure to delete this controller action?</value>
   </data>
@@ -315,6 +318,15 @@
   <data name="ErrorDuringScanning" xml:space="preserve">
     <value>Error during scanning</value>
   </data>
+  <data name="ExportControllerProfile" xml:space="preserve">
+    <value>Export the controller profile</value>
+  </data>
+  <data name="ExportCreation" xml:space="preserve">
+    <value>Export the creation</value>
+  </data>
+  <data name="ExportSequence" xml:space="preserve">
+    <value>Export the sequence</value>
+  </data>
   <data name="ExportSuccessful" xml:space="preserve">
     <value>Export successful:</value>
   </data>
@@ -348,6 +360,15 @@
   <data name="IconSet" xml:space="preserve">
     <value>Icon set</value>
   </data>
+  <data name="ImportControllerProfile" xml:space="preserve">
+    <value>Import a controller profile</value>
+  </data>
+  <data name="ImportCreation" xml:space="preserve">
+    <value>Import a creation</value>
+  </data>
+  <data name="ImportSequence" xml:space="preserve">
+    <value>Import a sequence</value>
+  </data>
   <data name="Information" xml:space="preserve">
     <value>Information</value>
   </data>
diff --git a/BrickController2/BrickController2/UI/Commands/CommandExtensions.cs b/BrickController2/BrickController2/UI/Commands/CommandExtensions.cs
new file mode 100644
index 000000000..f81b09eb0
--- /dev/null
+++ b/BrickController2/BrickController2/UI/Commands/CommandExtensions.cs
@@ -0,0 +1,14 @@
+using System.Windows.Input;
+
+namespace BrickController2.UI.Commands;
+
+internal static class CommandExtensions
+{
+    internal static void RaiseCanExecuteChanged(this ICommand command)
+    {
+        if (command is IExtendableCommand cmd)
+        {
+            cmd.RaiseCanExecuteChanged();
+        }
+    }
+}
diff --git a/BrickController2/BrickController2/UI/Commands/IExtendableCommand.cs b/BrickController2/BrickController2/UI/Commands/IExtendableCommand.cs
new file mode 100644
index 000000000..617c8cd00
--- /dev/null
+++ b/BrickController2/BrickController2/UI/Commands/IExtendableCommand.cs
@@ -0,0 +1,8 @@
+using System.Windows.Input;
+
+namespace BrickController2.UI.Commands;
+
+internal interface IExtendableCommand
+{
+    void RaiseCanExecuteChanged();
+}
diff --git a/BrickController2/BrickController2/UI/Commands/SafeCommand.cs b/BrickController2/BrickController2/UI/Commands/SafeCommand.cs
index 63cf85209..3b2ef3868 100644
--- a/BrickController2/BrickController2/UI/Commands/SafeCommand.cs
+++ b/BrickController2/BrickController2/UI/Commands/SafeCommand.cs
@@ -1,10 +1,8 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows.Input;
+using System.Windows.Input;
 
 namespace BrickController2.UI.Commands
 {
-    public class SafeCommand : ICommand
+    public class SafeCommand : ICommand, IExtendableCommand
     {
         private readonly Func<object, Task> _execute;
         private readonly Predicate<object> _canExecute;
@@ -58,13 +56,13 @@ public async void Execute(object parameter)
             }
         }
 
-        private void RaiseCanExecuteChanged()
+        public void RaiseCanExecuteChanged()
         {
             CanExecuteChanged?.Invoke(this, EventArgs.Empty);
         }
     }
 
-    public class SafeCommand<TExecute> : ICommand
+    public class SafeCommand<TExecute> : ICommand, IExtendableCommand
     {
         private readonly Func<TExecute, Task> _execute;
         private readonly Predicate<object> _canExecute;
@@ -106,7 +104,7 @@ public async void Execute(object parameter)
             }
         }
 
-        private void RaiseCanExecuteChanged()
+        public void RaiseCanExecuteChanged()
         {
             CanExecuteChanged?.Invoke(this, EventArgs.Empty);
         }
diff --git a/BrickController2/BrickController2/UI/Controls/CheckBox.xaml b/BrickController2/BrickController2/UI/Controls/CheckBox.xaml
index a43ba86a9..955a760cb 100644
--- a/BrickController2/BrickController2/UI/Controls/CheckBox.xaml
+++ b/BrickController2/BrickController2/UI/Controls/CheckBox.xaml
@@ -14,7 +14,11 @@
             <Border x:Name="UncheckedShape" WidthRequest="25" HeightRequest="25" VerticalOptions="Center" HorizontalOptions="Center" Padding="1" StrokeShape="RoundRectangle 12" Stroke="{DynamicResource SecondaryColor}" BackgroundColor="{DynamicResource PageBackgroundColor}">
             </Border>
             <Border x:Name="CheckedShape" WidthRequest="25" HeightRequest="25" VerticalOptions="Center" HorizontalOptions="Center" Padding="1" StrokeShape="RoundRectangle 12" BackgroundColor="{DynamicResource CheckBoxCheckedColor}">
-                <controls:ColorImage Source="{extensions:ImageResource Source=ic_checkmark.png}" Color="{DynamicResource PageBackgroundColor}" WidthRequest="20" HeightRequest="20" HorizontalOptions="Center" VerticalOptions="Center"/>
+                <Image>
+                    <Image.Source>
+                        <FontImageSource Color="{DynamicResource PageBackgroundColor}" FontFamily="Icons" Glyph="check"/>
+                    </Image.Source>
+                </Image>
             </Border>
         </Grid>
     </ContentView.Content>
diff --git a/BrickController2/BrickController2/UI/Controls/ColorImage.cs b/BrickController2/BrickController2/UI/Controls/ColorImage.cs
deleted file mode 100644
index cb480bb0c..000000000
--- a/BrickController2/BrickController2/UI/Controls/ColorImage.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace BrickController2.UI.Controls
-{
-    // Reference: https://github.com/shrutinambiar/xamarin-forms-tinted-image
-    public class ColorImage : Image
-    {
-        public static BindableProperty ColorProperty = BindableProperty.Create(nameof(Color), typeof(Color), typeof(ColorImage), default(Color));
-
-        public Color Color
-        {
-            get => (Color)GetValue(ColorProperty);
-            set => SetValue(ColorProperty, value);
-        }
-    }
-}
diff --git a/BrickController2/BrickController2/UI/Controls/ColorImage.xaml b/BrickController2/BrickController2/UI/Controls/ColorImage.xaml
new file mode 100644
index 000000000..f0be27e08
--- /dev/null
+++ b/BrickController2/BrickController2/UI/Controls/ColorImage.xaml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Image
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:controls="clr-namespace:BrickController2.UI.Controls"
+    x:Class="BrickController2.UI.Controls.ColorImage">
+	<Image.Source>
+        <FontImageSource x:Name="ImageSource" FontFamily="Icons" />
+    </Image.Source>
+</Image>
\ No newline at end of file
diff --git a/BrickController2/BrickController2/UI/Controls/ColorImage.xaml.cs b/BrickController2/BrickController2/UI/Controls/ColorImage.xaml.cs
new file mode 100644
index 000000000..0e7776d64
--- /dev/null
+++ b/BrickController2/BrickController2/UI/Controls/ColorImage.xaml.cs
@@ -0,0 +1,42 @@
+namespace BrickController2.UI.Controls
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class ColorImage : Image
+    {
+        public static readonly BindableProperty IconProperty = BindableProperty.Create(nameof(Icon), typeof(string), typeof(ColorImage), null, BindingMode.OneWay, null, IconChanged);
+        public static readonly BindableProperty ColorProperty = BindableProperty.Create(nameof(Color), typeof(Color), typeof(ColorImage), default(Color), BindingMode.OneWay, null, ColorChanged);
+
+        public ColorImage()
+        {
+            InitializeComponent();
+        }
+
+        public string Icon
+        {
+            get => (string)GetValue(IconProperty);
+            set => SetValue(IconProperty, value);
+        }
+
+        public Color Color
+        {
+            get => (Color)GetValue(ColorProperty);
+            set => SetValue(ColorProperty, value);
+        }
+
+        private static void IconChanged(BindableObject bindable, object oldValue, object newValue)
+        {
+            if (bindable is ColorImage image && newValue is string iconName)
+            {
+                image.ImageSource.Glyph = iconName;
+            }
+        }
+
+        private static void ColorChanged(BindableObject bindable, object oldValue, object newValue)
+        {
+            if (bindable is ColorImage image && newValue is Color color)
+            {
+                image.ImageSource.Color = color;
+            }
+        }
+    }
+}
diff --git a/BrickController2/BrickController2/UI/Controls/FloatingActionButton.xaml b/BrickController2/BrickController2/UI/Controls/FloatingActionButton.xaml
index ba56f21e4..13f088d31 100644
--- a/BrickController2/BrickController2/UI/Controls/FloatingActionButton.xaml
+++ b/BrickController2/BrickController2/UI/Controls/FloatingActionButton.xaml
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ContentView
+<ImageButton
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:controls="clr-namespace:BrickController2.UI.Controls"
     x:Class="BrickController2.UI.Controls.FloatingActionButton">
-    
-  <ContentView.Content>
-        <Frame x:Name="ImageFrame" WidthRequest="50" HeightRequest="50" CornerRadius="25" Padding="0">
-            <Frame.GestureRecognizers>
-                <TapGestureRecognizer x:Name="TapGuestureRecognizer"/>
-            </Frame.GestureRecognizers>
-            <controls:ColorImage x:Name="Image" WidthRequest="20" HeightRequest="20" HorizontalOptions="Center" VerticalOptions="Center"/>
-        </Frame>
-    </ContentView.Content>
-</ContentView>
\ No newline at end of file
+
+    <ImageButton.Source>
+        <FontImageSource x:Name="ImageSource" FontFamily="Icons" />
+    </ImageButton.Source>
+</ImageButton>
\ No newline at end of file
diff --git a/BrickController2/BrickController2/UI/Controls/FloatingActionButton.xaml.cs b/BrickController2/BrickController2/UI/Controls/FloatingActionButton.xaml.cs
index f6264f99d..d6f4c6fcc 100644
--- a/BrickController2/BrickController2/UI/Controls/FloatingActionButton.xaml.cs
+++ b/BrickController2/BrickController2/UI/Controls/FloatingActionButton.xaml.cs
@@ -3,28 +3,20 @@
 namespace BrickController2.UI.Controls
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FloatingActionButton : ContentView
+    public partial class FloatingActionButton : ImageButton
     {
         public FloatingActionButton()
         {
             InitializeComponent();
         }
 
-        public static readonly BindableProperty ButtonColorProperty = BindableProperty.Create(nameof(ButtonColor), typeof(Color), typeof(FloatingActionButton), default(Color), BindingMode.OneWay, null, ButtonColorChanged);
-        public static readonly BindableProperty ImageSourceProperty = BindableProperty.Create(nameof(ImageSource), typeof(ImageSource), typeof(FloatingActionButton), null, BindingMode.OneWay, null, ImageSourceChanged);
+        public static readonly BindableProperty IconProperty = BindableProperty.Create(nameof(Icon), typeof(string), typeof(FloatingActionButton), null, BindingMode.OneWay, null, IconChanged);
         public static readonly BindableProperty ImageColorProperty = BindableProperty.Create(nameof(ImageColor), typeof(Color), typeof(FloatingActionButton), null, BindingMode.OneWay, null, ImageColorChanged);
-        public static readonly BindableProperty CommandProperty = BindableProperty.Create(nameof(Command), typeof(ICommand), typeof(FloatingActionButton), null, BindingMode.OneWay, null, CommandChanged);
 
-        public Color ButtonColor
+        public string Icon
         {
-            get => (Color)GetValue(ButtonColorProperty);
-            set => SetValue(ButtonColorProperty, value);
-        }
-
-        public ImageSource ImageSource
-        {
-            get => (ImageSource)GetValue(ImageSourceProperty);
-            set => SetValue(ImageSourceProperty, value);
+            get => (string)GetValue(IconProperty);
+            set => SetValue(IconProperty, value);
         }
 
         public Color ImageColor
@@ -33,25 +25,11 @@ public Color ImageColor
             set => SetValue(ImageColorProperty, value);
         }
 
-        public ICommand Command
-        {
-            get => (ICommand)GetValue(CommandProperty);
-            set => SetValue(CommandProperty, value);
-        }
-
-        private static void ButtonColorChanged(BindableObject bindable, object oldValue, object newValue)
-        {
-            if (bindable is FloatingActionButton fab && newValue is Color backgroundColor)
-            {
-                fab.ImageFrame.BackgroundColor = backgroundColor;
-            }
-        }
-
-        private static void ImageSourceChanged(BindableObject bindable, object oldValue, object newValue)
+        private static void IconChanged(BindableObject bindable, object oldValue, object newValue)
         {
-            if (bindable is FloatingActionButton fab && newValue is ImageSource imageSource)
+            if (bindable is FloatingActionButton fab && newValue is string iconName)
             {
-                fab.Image.Source = imageSource;
+                fab.ImageSource.Glyph = iconName;
             }
         }
 
@@ -59,15 +37,7 @@ private static void ImageColorChanged(BindableObject bindable, object oldValue,
         {
             if (bindable is FloatingActionButton fab && newValue is Color imageColor)
             {
-                fab.Image.Color = imageColor;
-            }
-        }
-
-        private static void CommandChanged(BindableObject bindable, object oldValue, object newValue)
-        {
-            if (bindable is FloatingActionButton fab && newValue is ICommand command)
-            {
-                fab.TapGuestureRecognizer.Command = command;
+                fab.ImageSource.Color = imageColor;
             }
         }
     }
diff --git a/BrickController2/BrickController2/UI/Controls/ImageButton.xaml b/BrickController2/BrickController2/UI/Controls/ImageButton.xaml
deleted file mode 100644
index 38bc6570e..000000000
--- a/BrickController2/BrickController2/UI/Controls/ImageButton.xaml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:controls="clr-namespace:BrickController2.UI.Controls"
-    x:Class="BrickController2.UI.Controls.ImageButton">
-    
-  <ContentView.Content>
-        <StackLayout x:Name="ImageFrame" BackgroundColor="Transparent" Padding="0">
-            <StackLayout.GestureRecognizers>
-                <TapGestureRecognizer x:Name="TapGuestureRecognizer"/>
-            </StackLayout.GestureRecognizers>
-            <controls:ColorImage x:Name="Image" HorizontalOptions="Center" VerticalOptions="Center" Aspect="AspectFill"/>
-        </StackLayout>
-    </ContentView.Content>
-</ContentView>
\ No newline at end of file
diff --git a/BrickController2/BrickController2/UI/Controls/ImageButton.xaml.cs b/BrickController2/BrickController2/UI/Controls/ImageButton.xaml.cs
deleted file mode 100644
index e13dd81df..000000000
--- a/BrickController2/BrickController2/UI/Controls/ImageButton.xaml.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System.Windows.Input;
-
-namespace BrickController2.UI.Controls
-{
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class ImageButton : ContentView
-    {
-        public ImageButton()
-        {
-            InitializeComponent();
-        }
-
-        public static readonly BindableProperty ImageSourceProperty = BindableProperty.Create(nameof(ImageSource), typeof(ImageSource), typeof(ImageButton), null, BindingMode.OneWay, null, ImageSourceChanged);
-        public static readonly BindableProperty ImageColorProperty = BindableProperty.Create(nameof(ImageColor), typeof(Color), typeof(ImageButton), default(Color), BindingMode.OneWay, null, ImageColorChanged);
-        public static readonly BindableProperty CommandProperty = BindableProperty.Create(nameof(Command), typeof(ICommand), typeof(ImageButton), null, BindingMode.OneWay, null, CommandChanged);
-        public static readonly BindableProperty CommandParameterProperty = BindableProperty.Create(nameof(Command), typeof(object), typeof(ImageButton), null, BindingMode.OneWay, null, CommandParameterChanged);
-
-        public ImageSource ImageSource
-        {
-            get => (ImageSource)GetValue(ImageSourceProperty);
-            set => SetValue(ImageSourceProperty, value);
-        }
-
-        public Color ImageColor
-        {
-            get => (Color)GetValue(ImageColorProperty);
-            set => SetValue(ImageColorProperty, value);
-        }
-
-        public ICommand Command
-        {
-            get => (ICommand)GetValue(CommandProperty);
-            set => SetValue(CommandProperty, value);
-        }
-
-        public object CommandParameter
-        {
-            get => GetValue(CommandParameterProperty);
-            set => SetValue(CommandParameterProperty, value);
-        }
-
-        private static void ImageSourceChanged(BindableObject bindable, object oldValue, object newValue)
-        {
-            if (bindable is ImageButton imageButton && newValue is ImageSource imageSource)
-            {
-                imageButton.Image.Source = imageSource;
-            }
-        }
-
-        private static void ImageColorChanged(BindableObject bindable, object oldValue, object newValue)
-        {
-            if (bindable is ImageButton imageButton && newValue is Color color)
-            {
-                imageButton.Image.Color = color;
-            }
-        }
-
-        private static void CommandChanged(BindableObject bindable, object oldValue, object newValue)
-        {
-            if (bindable is ImageButton imageButton && newValue is ICommand command)
-            {
-                imageButton.TapGuestureRecognizer.Command = command;
-            }
-        }
-
-        private static void CommandParameterChanged(BindableObject bindable, object oldValue, object newValue)
-        {
-            if (bindable is ImageButton imageButton)
-            {
-                imageButton.TapGuestureRecognizer.CommandParameter = newValue;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/BrickController2/BrickController2/UI/Controls/SwipeIcon.xaml b/BrickController2/BrickController2/UI/Controls/SwipeIcon.xaml
new file mode 100644
index 000000000..26596157e
--- /dev/null
+++ b/BrickController2/BrickController2/UI/Controls/SwipeIcon.xaml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SwipeItem
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:controls="clr-namespace:BrickController2.UI.Controls"
+    x:Class="BrickController2.UI.Controls.SwipeIcon">
+    <SwipeItem.IconImageSource>
+        <FontImageSource x:Name="ImageSource" Color="{DynamicResource NavigationBarItemColor}" FontFamily="Icons"/>
+    </SwipeItem.IconImageSource>
+</SwipeItem>
\ No newline at end of file
diff --git a/BrickController2/BrickController2/UI/Controls/SwipeIcon.xaml.cs b/BrickController2/BrickController2/UI/Controls/SwipeIcon.xaml.cs
new file mode 100644
index 000000000..938826805
--- /dev/null
+++ b/BrickController2/BrickController2/UI/Controls/SwipeIcon.xaml.cs
@@ -0,0 +1,26 @@
+namespace BrickController2.UI.Controls;
+
+[XamlCompilation(XamlCompilationOptions.Compile)]
+public partial class SwipeIcon : SwipeItem
+{
+    public SwipeIcon()
+    {
+        InitializeComponent();
+    }
+
+    public static readonly BindableProperty IconProperty = BindableProperty.Create(nameof(Icon), typeof(string), typeof(SwipeIcon), null, BindingMode.OneWay, null, IconChanged);
+
+    public string Icon
+    {
+        get => (string)GetValue(IconProperty);
+        set => SetValue(IconProperty, value);
+    }
+
+    private static void IconChanged(BindableObject bindable, object oldValue, object newValue)
+    {
+        if (bindable is SwipeIcon icon && newValue is string iconName)
+        {
+            icon.ImageSource.Glyph = iconName;
+        }
+    }
+}
\ No newline at end of file
diff --git a/BrickController2/BrickController2/UI/Controls/ToolbarIcon.xaml b/BrickController2/BrickController2/UI/Controls/ToolbarIcon.xaml
new file mode 100644
index 000000000..ffac3f533
--- /dev/null
+++ b/BrickController2/BrickController2/UI/Controls/ToolbarIcon.xaml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ToolbarItem
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:controls="clr-namespace:BrickController2.UI.Controls"
+    x:Class="BrickController2.UI.Controls.ToolbarIcon"
+    Order="Primary">
+    <ToolbarItem.IconImageSource>
+        <FontImageSource x:Name="ImageSource" Color="{DynamicResource NavigationBarItemColor}" FontFamily="Icons" />
+    </ToolbarItem.IconImageSource>
+</ToolbarItem>
\ No newline at end of file
diff --git a/BrickController2/BrickController2/UI/Controls/ToolbarIcon.xaml.cs b/BrickController2/BrickController2/UI/Controls/ToolbarIcon.xaml.cs
new file mode 100644
index 000000000..61f807cd4
--- /dev/null
+++ b/BrickController2/BrickController2/UI/Controls/ToolbarIcon.xaml.cs
@@ -0,0 +1,26 @@
+namespace BrickController2.UI.Controls;
+
+[XamlCompilation(XamlCompilationOptions.Compile)]
+public partial class ToolbarIcon : ToolbarItem
+{
+    public ToolbarIcon()
+    {
+        InitializeComponent();
+    }
+
+    public static readonly BindableProperty IconProperty = BindableProperty.Create(nameof(Icon), typeof(string), typeof(ToolbarIcon), null, BindingMode.OneWay, null, IconChanged);
+
+    public string Icon
+    {
+        get => (string)GetValue(IconProperty);
+        set => SetValue(IconProperty, value);
+    }
+
+    private static void IconChanged(BindableObject bindable, object oldValue, object newValue)
+    {
+        if (bindable is ToolbarIcon toolbarIcon && newValue is string iconName)
+        {
+            toolbarIcon.ImageSource.Glyph = iconName;
+        }
+    }
+}
\ No newline at end of file
diff --git a/BrickController2/BrickController2/UI/Converters/GameControllerEventTypeToImageConverter.cs b/BrickController2/BrickController2/UI/Converters/GameControllerEventTypeToImageConverter.cs
index 63a1df344..a5adb7e76 100644
--- a/BrickController2/BrickController2/UI/Converters/GameControllerEventTypeToImageConverter.cs
+++ b/BrickController2/BrickController2/UI/Converters/GameControllerEventTypeToImageConverter.cs
@@ -1,5 +1,4 @@
 using BrickController2.PlatformServices.GameController;
-using BrickController2.Helpers;
 using System.Globalization;
 
 namespace BrickController2.UI.Converters
@@ -12,19 +11,14 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             return Convert(eventType);
         }
 
-        public ImageSource Convert(GameControllerEventType eventType)
+        public string Convert(GameControllerEventType eventType)
         {
-            switch (eventType)
+            return eventType switch
             {
-                case GameControllerEventType.Button:
-                    return ResourceHelper.GetImageResource("ic_buttons.png");
-
-                case GameControllerEventType.Axis:
-                    return ResourceHelper.GetImageResource("ic_joystick.png");
-
-                default:
-                    return null;
-            }
+                GameControllerEventType.Button => "abc",
+                GameControllerEventType.Axis => "gamepad",
+                _ => null,
+            };
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/BrickController2/BrickController2/UI/Images/ic_add.png b/BrickController2/BrickController2/UI/Images/ic_add.png
deleted file mode 100644
index d4adc7b88..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_add.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Images/ic_back.png b/BrickController2/BrickController2/UI/Images/ic_back.png
deleted file mode 100644
index 9eed3fb29..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_back.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Images/ic_buttons.png b/BrickController2/BrickController2/UI/Images/ic_buttons.png
deleted file mode 100644
index 1f6ec02ee..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_buttons.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Images/ic_checkmark.png b/BrickController2/BrickController2/UI/Images/ic_checkmark.png
deleted file mode 100644
index 5be2eced7..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_checkmark.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Images/ic_checkmark_filled.png b/BrickController2/BrickController2/UI/Images/ic_checkmark_filled.png
deleted file mode 100644
index 9a314dfaf..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_checkmark_filled.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Images/ic_circle.png b/BrickController2/BrickController2/UI/Images/ic_circle.png
deleted file mode 100644
index b88b5909c..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_circle.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Images/ic_console.png b/BrickController2/BrickController2/UI/Images/ic_console.png
deleted file mode 100644
index 9e4358900..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_console.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Images/ic_delete.png b/BrickController2/BrickController2/UI/Images/ic_delete.png
deleted file mode 100644
index d581fa527..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_delete.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Images/ic_edit.png b/BrickController2/BrickController2/UI/Images/ic_edit.png
deleted file mode 100644
index 61a9ccce7..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_edit.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Images/ic_exclamation_mark.png b/BrickController2/BrickController2/UI/Images/ic_exclamation_mark.png
deleted file mode 100644
index a5dfca11e..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_exclamation_mark.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Images/ic_export.png b/BrickController2/BrickController2/UI/Images/ic_export.png
deleted file mode 100644
index 2a53394ba..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_export.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Images/ic_import.png b/BrickController2/BrickController2/UI/Images/ic_import.png
deleted file mode 100644
index ff0bfc665..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_import.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Images/ic_info.png b/BrickController2/BrickController2/UI/Images/ic_info.png
deleted file mode 100644
index 2a3800268..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_info.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Images/ic_joystick.png b/BrickController2/BrickController2/UI/Images/ic_joystick.png
deleted file mode 100644
index ceda964a5..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_joystick.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Images/ic_link.png b/BrickController2/BrickController2/UI/Images/ic_link.png
deleted file mode 100644
index c6ea2e8b3..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_link.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Images/ic_menu.png b/BrickController2/BrickController2/UI/Images/ic_menu.png
deleted file mode 100644
index ed110746b..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_menu.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Images/ic_play.png b/BrickController2/BrickController2/UI/Images/ic_play.png
deleted file mode 100644
index d936ff6e7..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_play.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Images/ic_search.png b/BrickController2/BrickController2/UI/Images/ic_search.png
deleted file mode 100644
index 25cd5f11f..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_search.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Images/ic_sequence.png b/BrickController2/BrickController2/UI/Images/ic_sequence.png
deleted file mode 100644
index dfa9bba83..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_sequence.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Images/ic_settings.png b/BrickController2/BrickController2/UI/Images/ic_settings.png
deleted file mode 100644
index 1b1408645..000000000
Binary files a/BrickController2/BrickController2/UI/Images/ic_settings.png and /dev/null differ
diff --git a/BrickController2/BrickController2/UI/Pages/AboutPage.xaml b/BrickController2/BrickController2/UI/Pages/AboutPage.xaml
index 2b0060167..8c31d3355 100644
--- a/BrickController2/BrickController2/UI/Pages/AboutPage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/AboutPage.xaml
@@ -11,12 +11,6 @@
     ios:Page.UseSafeArea="True"
     BackgroundColor="{DynamicResource PageBackgroundColor}">
 
-    <NavigationPage.TitleView>
-        <Grid HorizontalOptions="FillAndExpand">
-            <Label Text="{extensions:Translate About}" TextColor="{DynamicResource NavigationBarItemColor}" FontSize="Medium" FontAttributes="Bold" HorizontalOptions="Start" VerticalOptions="Center"/>
-        </Grid>
-    </NavigationPage.TitleView>
-
     <local:PageBase.Content>
         <AbsoluteLayout HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
             <Grid RowSpacing="0" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All">
@@ -46,7 +40,7 @@
                         <BoxView Style="{StaticResource DividerBoxViewStyle}" Margin="5,16,5,16"/>
 
                         <Label Text="{extensions:Translate IconSet}" FontAttributes="Bold"/>
-                        <Label Text="FlatIcon"/>
+                        <Label Text="Material Icons"/>
 
                         <BoxView Style="{StaticResource DividerBoxViewStyle}" Margin="5,16,5,16"/>
 
diff --git a/BrickController2/BrickController2/UI/Pages/ChannelSetupPage.xaml b/BrickController2/BrickController2/UI/Pages/ChannelSetupPage.xaml
index 26c9f238a..a6b7b89a9 100644
--- a/BrickController2/BrickController2/UI/Pages/ChannelSetupPage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/ChannelSetupPage.xaml
@@ -22,12 +22,9 @@
         </ResourceDictionary>
     </local:PageBase.Resources>
 
-    <NavigationPage.TitleView>
-        <Grid HorizontalOptions="FillAndExpand">
-            <Label Text="{extensions:Translate ChannelSetup}" TextColor="{DynamicResource NavigationBarItemColor}" FontSize="Medium" FontAttributes="Bold" HorizontalOptions="Start" VerticalOptions="Center"/>
-            <controls:ImageButton ImageSource="{extensions:ImageResource Source=ic_checkmark.png}" Command="{Binding SaveChannelSettingsCommand}" Style="{StaticResource NavigationBarImageButtonStyle}" HorizontalOptions="End" Margin="12,0"/>
-        </Grid>
-    </NavigationPage.TitleView>
+    <ContentPage.ToolbarItems>
+        <controls:ToolbarIcon Icon="done_outline" Text="{extensions:Translate ApplyChanges}" Command="{Binding SaveChannelSettingsCommand}" />
+    </ContentPage.ToolbarItems>
 
     <local:PageBase.Content>
         <AbsoluteLayout HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
diff --git a/BrickController2/BrickController2/UI/Pages/ControllerActionPage.xaml b/BrickController2/BrickController2/UI/Pages/ControllerActionPage.xaml
index 088e9bc0e..a1a189cf2 100644
--- a/BrickController2/BrickController2/UI/Pages/ControllerActionPage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/ControllerActionPage.xaml
@@ -21,12 +21,9 @@
         </ResourceDictionary>
     </local:PageBase.Resources>
 
-    <NavigationPage.TitleView>
-        <Grid HorizontalOptions="FillAndExpand">
-            <Label Text="{extensions:Translate ControllerAction}" TextColor="{DynamicResource NavigationBarItemColor}" FontSize="Medium" FontAttributes="Bold" HorizontalOptions="Start" VerticalOptions="Center"/>
-            <controls:ImageButton ImageSource="{extensions:ImageResource Source=ic_checkmark.png}" Command="{Binding SaveControllerActionCommand}" Style="{StaticResource NavigationBarImageButtonStyle}" HorizontalOptions="End" Margin="12,0"/>
-        </Grid>
-    </NavigationPage.TitleView>
+    <ContentPage.ToolbarItems>
+        <controls:ToolbarIcon Icon="done_outline" Text="{extensions:Translate ApplyChanges}" Command="{Binding SaveControllerActionCommand}" />
+    </ContentPage.ToolbarItems>
 
     <local:PageBase.Content>
         <AbsoluteLayout HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
@@ -46,7 +43,7 @@
 
                             <Label Grid.Column="0" Text="{extensions:Translate Device}" VerticalOptions="Center"/>
                             <Button Grid.Column="1" Text="{Binding SelectedDevice.Name}" Command="{Binding SelectDeviceCommand}" Style="{StaticResource PickerButtonStyle}"/>
-                            <controls:FloatingActionButton Grid.Column="2" Style="{StaticResource InlineActionButtonStyle}" ImageSource="{extensions:ImageResource Source=ic_link.png}" Command="{Binding OpenDeviceDetailsCommand}" VerticalOptions="Center"/>
+                            <controls:FloatingActionButton Grid.Column="2" Style="{StaticResource InlineActionButtonStyle}" Icon="contactless" Command="{Binding OpenDeviceDetailsCommand}" VerticalOptions="Center"/>
                         </Grid>
 
                         <BoxView Style="{StaticResource DividerBoxViewStyle}" Margin="5,8,5,8"/>
@@ -93,7 +90,7 @@
                                     </Grid.ColumnDefinitions>
 
                                     <Button Grid.Column="0" Text="{Binding Action.ChannelOutputType}" Command="{Binding SelectChannelOutputTypeCommand}" Style="{StaticResource PickerButtonStyle}"/>
-                                    <controls:FloatingActionButton Grid.Column="1" Style="{StaticResource InlineActionButtonStyle}" ImageSource="{extensions:ImageResource Source=ic_settings.png}" Command="{Binding OpenChannelSetupCommand}" IsVisible="False">
+                                    <controls:FloatingActionButton Grid.Column="1" Style="{StaticResource InlineActionButtonStyle}" Icon="settings" Command="{Binding OpenChannelSetupCommand}" IsVisible="False">
                                         <controls:FloatingActionButton.Triggers>
                                             <DataTrigger TargetType="controls:FloatingActionButton" Binding="{Binding Action.ChannelOutputType}" Value="{x:Static creationManagement:ChannelOutputType.ServoMotor}">
                                                 <Setter Property="IsVisible" Value="True"/>
@@ -188,7 +185,7 @@
                                             <ColumnDefinition Width="auto"/>
                                         </Grid.ColumnDefinitions>
                                         <Button Grid.Column="0" Text="{Binding Action.SequenceName}" Command="{Binding SelectSequenceCommand}" Style="{StaticResource PickerButtonStyle}"/>
-                                        <controls:FloatingActionButton Grid.Column="1" Style="{StaticResource FloatingActionButtonStyle}" ButtonColor="Gray" ImageSource="{extensions:ImageResource Source=ic_settings.png}" Command="{Binding OpenSequenceEditorCommand}" VerticalOptions="Center"/>
+                                        <controls:FloatingActionButton Grid.Column="1" Style="{StaticResource FloatingActionButtonStyle}" BackgroundColor="Gray" Icon="settings" Command="{Binding OpenSequenceEditorCommand}" VerticalOptions="Center"/>
                                     </Grid>
                                 </Grid>
                             </StackLayout>
diff --git a/BrickController2/BrickController2/UI/Pages/ControllerProfilePage.xaml b/BrickController2/BrickController2/UI/Pages/ControllerProfilePage.xaml
index 9e283f872..78c4a927a 100644
--- a/BrickController2/BrickController2/UI/Pages/ControllerProfilePage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/ControllerProfilePage.xaml
@@ -20,14 +20,9 @@
         </ResourceDictionary>
     </local:PageBase.Resources>
 
-    <NavigationPage.TitleView>
-        <Grid HorizontalOptions="FillAndExpand">
-            <Label Text="{extensions:Translate ControllerProfile}" TextColor="{DynamicResource NavigationBarItemColor}" FontSize="Medium" FontAttributes="Bold" HorizontalOptions="Start" VerticalOptions="Center"/>
-            <StackLayout Orientation="Horizontal" HorizontalOptions="End" Margin="12,0" Spacing="12">
-                <controls:ImageButton ImageSource="{extensions:ImageResource Source=ic_export.png}" Command="{Binding ExportControllerProfileCommand}" Style="{StaticResource NavigationBarImageButtonStyle}" IsVisible="{Binding SharedFileStorageService.IsSharedStorageAvailable}"/>
-            </StackLayout>
-        </Grid>
-    </NavigationPage.TitleView>
+    <ContentPage.ToolbarItems>
+        <controls:ToolbarIcon Icon="file_upload" Text="{extensions:Translate ExportControllerProfile}" Command="{Binding ExportControllerProfileCommand}" />
+    </ContentPage.ToolbarItems>
 
     <local:PageBase.Content>
         <AbsoluteLayout HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
@@ -44,7 +39,7 @@
                             <TapGestureRecognizer Command="{Binding RenameProfileCommand}"/>
                         </Label.GestureRecognizers>
                     </Label>
-                    <controls:FloatingActionButton Style="{StaticResource InlineActionButtonStyle}" ImageSource="{extensions:ImageResource Source=ic_play.png}" Command="{Binding PlayCommand}" HorizontalOptions="End" VerticalOptions="Center"/>
+                    <controls:FloatingActionButton Style="{StaticResource InlineActionButtonStyle}" Icon="play_arrow" Command="{Binding PlayCommand}" HorizontalOptions="End" VerticalOptions="Center"/>
                 </Grid>
 
                 <!-- Controller event list -->
@@ -56,7 +51,7 @@
                             <SwipeView>
                                 <SwipeView.LeftItems>
                                     <SwipeItems Mode="Execute">
-                                        <SwipeItem Text="{extensions:Translate Delete}" IconImageSource="{extensions:ImageResource Source=ic_delete.png}" BackgroundColor="{DynamicResource DeleteSwipeItemBackgroundColor}" Command="{Binding BindingContext.DeleteControllerEventCommand, Source={x:Reference Page}}" CommandParameter="{Binding ControllerEvent}"/>
+                                        <controls:SwipeIcon Text="{extensions:Translate Delete}" Icon="cancel" BackgroundColor="{DynamicResource DeleteSwipeItemBackgroundColor}" Command="{Binding BindingContext.DeleteControllerEventCommand, Source={x:Reference Page}}" CommandParameter="{Binding ControllerEvent}"/>
                                     </SwipeItems>
                                 </SwipeView.LeftItems>
                                 <Grid Style="{StaticResource CollectionViewHeaderGridStyle}">
@@ -64,7 +59,7 @@
                                         <ColumnDefinition Width="Auto"/>
                                         <ColumnDefinition Width="*"/>
                                     </Grid.ColumnDefinitions>
-                                    <controls:ColorImage Grid.Column="0" Source="{Binding ControllerEvent.EventType, Converter={StaticResource EventTypeToImage}}" Color="{DynamicResource PrimaryColor}" WidthRequest="30" HeightRequest="30" VerticalOptions="Center"/>
+                                    <controls:ColorImage Grid.Column="0" Icon="{Binding ControllerEvent.EventType, Converter={StaticResource EventTypeToImage}}" Color="{DynamicResource PrimaryColor}" WidthRequest="30" HeightRequest="30" VerticalOptions="Center"/>
                                     <StackLayout Grid.Column="1" Orientation="Horizontal" VerticalOptions="Center">
                                         <Label Text="{Binding ControllerEvent.EventCode}" FontSize="Large" FontAttributes="Bold"/>
                                     </StackLayout>
@@ -79,7 +74,7 @@
                             <SwipeView>
                                 <SwipeView.LeftItems>
                                     <SwipeItems Mode="Execute">
-                                        <SwipeItem Text="{extensions:Translate Delete}" IconImageSource="{extensions:ImageResource Source=ic_delete.png}" BackgroundColor="{DynamicResource DeleteSwipeItemBackgroundColor}" Command="{Binding BindingContext.DeleteControllerActionCommand, Source={x:Reference Page}}" CommandParameter="{Binding ControllerAction}"/>
+                                        <controls:SwipeIcon Text="{extensions:Translate Delete}" Icon="cancel"  BackgroundColor="{DynamicResource DeleteSwipeItemBackgroundColor}" Command="{Binding BindingContext.DeleteControllerActionCommand, Source={x:Reference Page}}" CommandParameter="{Binding ControllerAction}"/>
                                     </SwipeItems>
                                 </SwipeView.LeftItems>
                                 <Grid Style="{StaticResource CollectionItemGridStyle}">
@@ -90,7 +85,7 @@
                                         <ColumnDefinition Width="Auto"/>
                                         <ColumnDefinition Width="*"/>
                                     </Grid.ColumnDefinitions>
-                                    <controls:ColorImage Grid.Column="0" Source="{extensions:ImageResource Source=ic_exclamation_mark.png}" Color="{DynamicResource NegativeColor}" IsVisible="{Binding ControllerActionValid, Converter={StaticResource InverseBool}}" WidthRequest="30" HeightRequest="30" VerticalOptions="Center"/>
+                                    <controls:ColorImage Grid.Column="0" Icon="warning_amber" Color="{DynamicResource NegativeColor}" IsVisible="{Binding ControllerActionValid, Converter={StaticResource InverseBool}}" WidthRequest="30" HeightRequest="30" VerticalOptions="Center"/>
                                     <StackLayout Grid.Column="1" Orientation="Horizontal" VerticalOptions="Center" Margin="0,4" Spacing="6">
                                         <Label Text="{extensions:Translate Device}"/>
                                         <Label Text=":"/>
@@ -111,7 +106,7 @@
                     </CollectionView.EmptyView>
                 </CollectionView>
 
-                <controls:FloatingActionButton Grid.Row="0" Grid.RowSpan="2" Style="{StaticResource FloatingActionButtonStyle}" ImageSource="{extensions:ImageResource Source=ic_add.png}" Command="{Binding AddControllerEventCommand}" HorizontalOptions="End" VerticalOptions="End" Margin="10"/>
+                <controls:FloatingActionButton Grid.Row="0" Grid.RowSpan="2" Style="{StaticResource FloatingActionButtonStyle}" Icon="add" Command="{Binding AddControllerEventCommand}" HorizontalOptions="End" VerticalOptions="End" Margin="10"/>
 
             </Grid>
 
diff --git a/BrickController2/BrickController2/UI/Pages/ControllerTesterPage.xaml b/BrickController2/BrickController2/UI/Pages/ControllerTesterPage.xaml
index e7acdd240..92f320e5a 100644
--- a/BrickController2/BrickController2/UI/Pages/ControllerTesterPage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/ControllerTesterPage.xaml
@@ -18,12 +18,6 @@
         </OnPlatform>
     </local:PageBase.Padding>
 
-    <NavigationPage.TitleView>
-        <Grid HorizontalOptions="FillAndExpand">
-            <Label Text="{extensions:Translate ControllerTester}" TextColor="{DynamicResource NavigationBarItemColor}" FontSize="Medium" FontAttributes="Bold" HorizontalOptions="Start" VerticalOptions="Center"/>
-        </Grid>
-    </NavigationPage.TitleView>
-
     <local:PageBase.Content>
         <AbsoluteLayout HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
             <Grid RowSpacing="0" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All">
diff --git a/BrickController2/BrickController2/UI/Pages/CreationListPage.xaml b/BrickController2/BrickController2/UI/Pages/CreationListPage.xaml
index 2cd6cf62e..8b6f24f8a 100644
--- a/BrickController2/BrickController2/UI/Pages/CreationListPage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/CreationListPage.xaml
@@ -20,15 +20,10 @@
         </ResourceDictionary>
     </local:PageBase.Resources>
 
-    <NavigationPage.TitleView>
-        <Grid HorizontalOptions="FillAndExpand">
-            <Label Text="{extensions:Translate Creations}" TextColor="{DynamicResource NavigationBarItemColor}" FontSize="Medium" FontAttributes="Bold" HorizontalOptions="Start" VerticalOptions="Center"/>
-            <StackLayout Orientation="Horizontal" HorizontalOptions="End" Margin="12,0" Spacing="12">
-                <controls:ImageButton ImageSource="{extensions:ImageResource Source=ic_import.png}" Command="{Binding ImportCreationCommand}" Style="{StaticResource NavigationBarImageButtonStyle}" IsVisible="{Binding SharedFileStorageService.IsSharedStorageAvailable}"/>
-                <controls:ImageButton ImageSource="{extensions:ImageResource Source=ic_settings.png}" Command="{Binding OpenSettingsPageCommand}" Style="{StaticResource NavigationBarImageButtonStyle}"/>
-            </StackLayout>
-        </Grid>
-    </NavigationPage.TitleView>
+    <ContentPage.ToolbarItems>
+        <controls:ToolbarIcon Icon="file_download" Text="{extensions:Translate ImportCreation}" Command="{Binding ImportCreationCommand}" />
+        <controls:ToolbarIcon Icon="settings" Text="{extensions:Translate Śettings}" Command="{Binding OpenSettingsPageCommand}" />
+    </ContentPage.ToolbarItems>
 
     <local:PageBase.Content>
         <AbsoluteLayout HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
@@ -45,7 +40,7 @@
                             <SwipeView>
                                 <SwipeView.LeftItems>
                                     <SwipeItems Mode="Execute">
-                                        <SwipeItem Text="{extensions:Translate Delete}" IconImageSource="{extensions:ImageResource Source=ic_delete.png}" BackgroundColor="{DynamicResource DeleteSwipeItemBackgroundColor}" Command="{Binding BindingContext.DeleteCreationCommand, Source={x:Reference Page}}" CommandParameter="{Binding .}"/>
+                                        <controls:SwipeIcon Text="{extensions:Translate Delete}" Icon="cancel" BackgroundColor="{DynamicResource DeleteSwipeItemBackgroundColor}" Command="{Binding BindingContext.DeleteCreationCommand, Source={x:Reference Page}}" CommandParameter="{Binding .}"/>
                                     </SwipeItems>
                                 </SwipeView.LeftItems>
                                 <Grid Style="{StaticResource CollectionItemGridStyle}">
@@ -83,7 +78,7 @@
                             <TapGestureRecognizer Command="{Binding NavigateToDevicesCommand}"/>
                         </Frame.GestureRecognizers>
                         <VerticalStackLayout HorizontalOptions="Center" Spacing="6">
-                            <controls:ColorImage Source="{extensions:ImageResource Source=ic_link.png}" Style="{StaticResource FooterColorImageStyle}"/>
+                            <controls:ColorImage Icon="hub" Style="{StaticResource FooterColorImageStyle}"/>
                             <Label Text="{extensions:Translate Devices}" FontSize="Small"/>
                         </VerticalStackLayout>
                     </Frame>
@@ -92,7 +87,7 @@
                             <TapGestureRecognizer Command="{Binding NavigateToControllerTesterCommand}"/>
                         </Frame.GestureRecognizers>
                         <VerticalStackLayout HorizontalOptions="Center" Spacing="6">
-                            <controls:ColorImage Source="{extensions:ImageResource Source=ic_console.png}" Style="{StaticResource FooterColorImageStyle}"/>
+                            <controls:ColorImage Icon="sports_esports" Style="{StaticResource FooterColorImageStyle}"/>
                             <Label Text="{extensions:Translate Controller}" FontSize="Small"/>
                         </VerticalStackLayout>
                     </Frame>
@@ -101,7 +96,7 @@
                             <TapGestureRecognizer Command="{Binding NavigateToSequencesCommand}"/>
                         </Frame.GestureRecognizers>
                         <VerticalStackLayout HorizontalOptions="Center" Spacing="6">
-                            <controls:ColorImage Source="{extensions:ImageResource Source=ic_sequence.png}" Style="{StaticResource FooterColorImageStyle}"/>
+                            <controls:ColorImage Icon="format_list_bulleted" Style="{StaticResource FooterColorImageStyle}"/>
                             <Label Text="{extensions:Translate Sequences}" FontSize="Small"/>
                         </VerticalStackLayout>
                     </Frame>
@@ -110,13 +105,13 @@
                             <TapGestureRecognizer Command="{Binding NavigateToAboutCommand}"/>
                         </Frame.GestureRecognizers>
                         <VerticalStackLayout HorizontalOptions="Center" Spacing="6">
-                            <controls:ColorImage Source="{extensions:ImageResource Source=ic_info.png}" Style="{StaticResource FooterColorImageStyle}"/>
+                            <controls:ColorImage Icon="info" Style="{StaticResource FooterColorImageStyle}"/>
                             <Label Text="{extensions:Translate About}" FontSize="Small"/>
                         </VerticalStackLayout>
                     </Frame>
                 </Grid>
 
-                <controls:FloatingActionButton Grid.Row="0" Style="{StaticResource FloatingActionButtonStyle}" ImageSource="{extensions:ImageResource Source=ic_add.png}" Command="{Binding AddCreationCommand}" HorizontalOptions="End" VerticalOptions="End" Margin="10"/>
+                <controls:FloatingActionButton Grid.Row="0" Style="{StaticResource FloatingActionButtonStyle}" Icon="add" Command="{Binding AddCreationCommand}" HorizontalOptions="End" VerticalOptions="End" Margin="10"/>
             </Grid>
 
             <controls:Dialogs x:Name="Dialogs" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All"/>
diff --git a/BrickController2/BrickController2/UI/Pages/CreationPage.xaml b/BrickController2/BrickController2/UI/Pages/CreationPage.xaml
index 15ef5bad6..0babf1ab1 100644
--- a/BrickController2/BrickController2/UI/Pages/CreationPage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/CreationPage.xaml
@@ -12,15 +12,10 @@
     ios:Page.UseSafeArea="True"
     BackgroundColor="{DynamicResource PageBackgroundColor}">
 
-    <NavigationPage.TitleView>
-        <Grid HorizontalOptions="FillAndExpand">
-            <Label Text="{extensions:Translate Creation}" TextColor="{DynamicResource NavigationBarItemColor}" FontSize="Medium" FontAttributes="Bold" HorizontalOptions="Start" VerticalOptions="Center"/>
-            <StackLayout Orientation="Horizontal" HorizontalOptions="End" Margin="12,0" Spacing="12">
-                <controls:ImageButton ImageSource="{extensions:ImageResource Source=ic_import.png}" Command="{Binding ImportControllerProfileCommand}" Style="{StaticResource NavigationBarImageButtonStyle}" IsVisible="{Binding SharedFileStorageService.IsSharedStorageAvailable}"/>
-                <controls:ImageButton ImageSource="{extensions:ImageResource Source=ic_export.png}" Command="{Binding ExportCreationCommand}" Style="{StaticResource NavigationBarImageButtonStyle}" IsVisible="{Binding SharedFileStorageService.IsSharedStorageAvailable}"/>
-            </StackLayout>
-        </Grid>
-    </NavigationPage.TitleView>
+    <ContentPage.ToolbarItems>
+        <controls:ToolbarIcon Icon="file_download" Text="{extensions:Translate ImportControllerProfile}" Command="{Binding ImportControllerProfileCommand}" />
+        <controls:ToolbarIcon Icon="file_upload" Text="{extensions:Translate ExportCreation}" Command="{Binding ExportCreationCommand}" />
+    </ContentPage.ToolbarItems>
 
     <local:PageBase.Content>
         <AbsoluteLayout HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
@@ -37,7 +32,7 @@
                             <TapGestureRecognizer Command="{Binding RenameCreationCommand}"/>
                         </Label.GestureRecognizers>
                     </Label>
-                    <controls:FloatingActionButton Style="{StaticResource InlineActionButtonStyle}" ImageSource="{extensions:ImageResource Source=ic_play.png}" Command="{Binding PlayCommand}" HorizontalOptions="End" VerticalOptions="Center"/>
+                    <controls:FloatingActionButton Style="{StaticResource InlineActionButtonStyle}" Icon="play_arrow" Command="{Binding PlayCommand}" HorizontalOptions="End" VerticalOptions="Center"/>
                 </Grid>
 
                 <!-- Controller profile list -->
@@ -47,7 +42,7 @@
                             <SwipeView>
                                 <SwipeView.LeftItems>
                                     <SwipeItems Mode="Execute">
-                                        <SwipeItem Text="{extensions:Translate Delete}" IconImageSource="{extensions:ImageResource Source=ic_delete.png}" BackgroundColor="{DynamicResource DeleteSwipeItemBackgroundColor}" Command="{Binding BindingContext.DeleteControllerProfileCommand, Source={x:Reference Page}}" CommandParameter="{Binding .}"/>
+                                        <controls:SwipeIcon Text="{extensions:Translate Delete}" Icon="cancel"  BackgroundColor="{DynamicResource DeleteSwipeItemBackgroundColor}" Command="{Binding BindingContext.DeleteControllerProfileCommand, Source={x:Reference Page}}" CommandParameter="{Binding .}"/>
                                     </SwipeItems>
                                 </SwipeView.LeftItems>
                                 <Grid Style="{StaticResource CollectionItemGridStyle}">
@@ -64,7 +59,7 @@
                     </CollectionView.EmptyView>
                 </CollectionView>
 
-                <controls:FloatingActionButton Grid.Row="0" Grid.RowSpan="2" Style="{StaticResource FloatingActionButtonStyle}" ImageSource="{extensions:ImageResource Source=ic_add.png}" Command="{Binding AddControllerProfileCommand}" HorizontalOptions="End" VerticalOptions="End" Margin="10"/>
+                <controls:FloatingActionButton Grid.Row="0" Grid.RowSpan="2" Style="{StaticResource FloatingActionButtonStyle}" Icon="add" Command="{Binding AddControllerProfileCommand}" HorizontalOptions="End" VerticalOptions="End" Margin="10"/>
 
             </Grid>
 
diff --git a/BrickController2/BrickController2/UI/Pages/DeviceListPage.xaml b/BrickController2/BrickController2/UI/Pages/DeviceListPage.xaml
index d93541e03..554f732c5 100644
--- a/BrickController2/BrickController2/UI/Pages/DeviceListPage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/DeviceListPage.xaml
@@ -19,12 +19,6 @@
         </ResourceDictionary>
     </local:PageBase.Resources>
 
-    <NavigationPage.TitleView>
-        <Grid HorizontalOptions="FillAndExpand">
-            <Label Text="{extensions:Translate Devices}" TextColor="{DynamicResource NavigationBarItemColor}" FontSize="Medium" FontAttributes="Bold" HorizontalOptions="Start" VerticalOptions="Center"/>
-        </Grid>
-    </NavigationPage.TitleView>
-
     <local:PageBase.Content>
         <AbsoluteLayout HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
             <Grid RowSpacing="0" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All">
@@ -36,7 +30,7 @@
                             <SwipeView>
                                 <SwipeView.LeftItems>
                                     <SwipeItems Mode="Execute">
-                                        <SwipeItem Text="{extensions:Translate Delete}" IconImageSource="{extensions:ImageResource Source=ic_delete.png}" BackgroundColor="{DynamicResource DeleteSwipeItemBackgroundColor}" Command="{Binding BindingContext.DeleteDeviceCommand, Source={x:Reference Page}}" CommandParameter="{Binding .}"/>
+                                        <controls:SwipeIcon Text="{extensions:Translate Delete}" Icon="cancel"  BackgroundColor="{DynamicResource DeleteSwipeItemBackgroundColor}" Command="{Binding BindingContext.DeleteDeviceCommand, Source={x:Reference Page}}" CommandParameter="{Binding .}"/>
                                     </SwipeItems>
                                 </SwipeView.LeftItems>
                                 <Grid Style="{StaticResource CollectionItemGridStyle}">
@@ -61,7 +55,7 @@
                     </CollectionView.EmptyView>
                 </CollectionView>
 
-                <controls:FloatingActionButton Style="{StaticResource FloatingActionButtonStyle}" ImageSource="{extensions:ImageResource Source=ic_search.png}" Command="{Binding ScanCommand}" HorizontalOptions="End" VerticalOptions="End" Margin="10"/>
+                <controls:FloatingActionButton Style="{StaticResource FloatingActionButtonStyle}" Icon="search" Command="{Binding ScanCommand}" HorizontalOptions="End" VerticalOptions="End" Margin="10"/>
 
             </Grid>
 
diff --git a/BrickController2/BrickController2/UI/Pages/DevicePage.xaml b/BrickController2/BrickController2/UI/Pages/DevicePage.xaml
index 5eaf74a7e..ce79bf261 100644
--- a/BrickController2/BrickController2/UI/Pages/DevicePage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/DevicePage.xaml
@@ -21,12 +21,6 @@
         </ResourceDictionary>
     </local:PageBase.Resources>
 
-    <NavigationPage.TitleView>
-        <Grid HorizontalOptions="FillAndExpand">
-            <Label Text="{extensions:Translate Device}" TextColor="{DynamicResource NavigationBarItemColor}" FontSize="Medium" FontAttributes="Bold" HorizontalOptions="Start" VerticalOptions="Center"/>
-        </Grid>
-    </NavigationPage.TitleView>
-
     <local:PageBase.Content>
         <AbsoluteLayout HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
             <Grid RowSpacing="0" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All">
@@ -130,7 +124,7 @@
                     </StackLayout>
                 </ScrollView>
 
-                <controls:FloatingActionButton Style="{StaticResource FloatingActionButtonStyle}" ImageSource="{extensions:ImageResource Source=ic_search.png}" ImageColor="White" Command="{Binding ScanCommand}" IsVisible="{Binding CanBePowerSource}" HorizontalOptions="End" VerticalOptions="End" Margin="10"/>
+                <controls:FloatingActionButton Style="{StaticResource FloatingActionButtonStyle}" Icon="search" ImageColor="White" Command="{Binding ScanCommand}" IsVisible="{Binding CanBePowerSource}" HorizontalOptions="End" VerticalOptions="End" Margin="10"/>
             </Grid>
 
             <controls:Dialogs x:Name="Dialogs" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All"/>
diff --git a/BrickController2/BrickController2/UI/Pages/PlayerPage.xaml b/BrickController2/BrickController2/UI/Pages/PlayerPage.xaml
index 984a37917..c1afd5580 100644
--- a/BrickController2/BrickController2/UI/Pages/PlayerPage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/PlayerPage.xaml
@@ -11,12 +11,6 @@
     ios:Page.UseSafeArea="True"
     BackgroundColor="{DynamicResource PageBackgroundColor}">
 
-    <NavigationPage.TitleView>
-        <Grid HorizontalOptions="FillAndExpand">
-            <Label Text="{extensions:Translate Play}" TextColor="{DynamicResource NavigationBarItemColor}" FontSize="Medium" FontAttributes="Bold" HorizontalOptions="Start" VerticalOptions="Center"/>
-        </Grid>
-    </NavigationPage.TitleView>
-
     <local:PageBase.Content>
         <AbsoluteLayout HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
             <Grid RowSpacing="0" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All">
diff --git a/BrickController2/BrickController2/UI/Pages/SequenceEditorPage.xaml b/BrickController2/BrickController2/UI/Pages/SequenceEditorPage.xaml
index f2a5d3aff..f560ea669 100644
--- a/BrickController2/BrickController2/UI/Pages/SequenceEditorPage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/SequenceEditorPage.xaml
@@ -19,15 +19,10 @@
         </ResourceDictionary>
     </local:PageBase.Resources>
 
-    <NavigationPage.TitleView>
-        <Grid HorizontalOptions="FillAndExpand">
-            <Label Text="{extensions:Translate Sequence}" TextColor="{DynamicResource NavigationBarItemColor}" FontSize="Medium" FontAttributes="Bold" HorizontalOptions="Start" VerticalOptions="Center"/>
-            <StackLayout Orientation="Horizontal" HorizontalOptions="End" Margin="12,0" Spacing="12">
-                <controls:ImageButton ImageSource="{extensions:ImageResource Source=ic_export.png}" Command="{Binding ExportSequenceCommand}" Style="{StaticResource NavigationBarImageButtonStyle}" IsVisible="{Binding SharedFileStorageService.IsSharedStorageAvailable}"/>
-                <controls:ImageButton ImageSource="{extensions:ImageResource Source=ic_checkmark.png}" Command="{Binding SaveSequenceCommand}" Style="{StaticResource NavigationBarImageButtonStyle}"/>
-            </StackLayout>
-        </Grid>
-    </NavigationPage.TitleView>
+    <ContentPage.ToolbarItems>
+        <controls:ToolbarIcon Icon="file_upload" Text="{extensions:Translate ExportSequence}" Command="{Binding ExportSequenceCommand}" />
+        <controls:ToolbarIcon Icon="done_outline" Text="{extensions:Translate ApplyChanges}" Command="{Binding SaveSequenceCommand}" />
+    </ContentPage.ToolbarItems>
     
     <local:PageBase.Content>
         <AbsoluteLayout HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
@@ -95,7 +90,11 @@
                                     <Label Text="{Binding Value, Converter={StaticResource FloatValueToPercent}}" WidthRequest="35" HorizontalOptions="End" HorizontalTextAlignment="End" VerticalTextAlignment="Center"/>
                                 </StackLayout>
                                 <Button Grid.Column="1" Text="{Binding DurationMs}" Command="{Binding BindingContext.ChangeControlPointDurationCommand, Source={x:Reference Page}}" CommandParameter="{Binding .}" Style="{StaticResource PickerButtonStyle}" FontSize="Small"/>
-                                <controls:ImageButton Grid.Column="2" ImageSource="{extensions:ImageResource Source=ic_delete.png}" ImageColor="{DynamicResource NegativeColor}" Command="{Binding BindingContext.DeleteControlPointCommand, Source={x:Reference Page}}" CommandParameter="{Binding .}" WidthRequest="30" HeightRequest="30" VerticalOptions="Center" Margin="4,0,4,0"/>
+                                <ImageButton Grid.Column="2" Command="{Binding BindingContext.DeleteControlPointCommand, Source={x:Reference Page}}" CommandParameter="{Binding .}" BackgroundColor="Transparent" WidthRequest="30" HeightRequest="30" VerticalOptions="Center" Margin="4,0,4,0">
+                                    <ImageButton.Source>
+                                        <FontImageSource x:Name="ImageSource" FontFamily="Icons" Glyph="clear" Color="{DynamicResource NegativeColor}" />
+                                    </ImageButton.Source>
+                                </ImageButton>
                             </Grid>
                         </DataTemplate>
                     </CollectionView.ItemTemplate>
@@ -104,7 +103,7 @@
                     </CollectionView.EmptyView>
                 </CollectionView>
 
-                <controls:FloatingActionButton Grid.Row="0" Grid.RowSpan="4" Style="{StaticResource FloatingActionButtonStyle}" ImageSource="{extensions:ImageResource Source=ic_add.png}" Command="{Binding AddControlPointCommand}" HorizontalOptions="End" VerticalOptions="End" Margin="10"/>
+                <controls:FloatingActionButton Grid.Row="0" Grid.RowSpan="4" Style="{StaticResource FloatingActionButtonStyle}" Icon="add" Command="{Binding AddControlPointCommand}" HorizontalOptions="End" VerticalOptions="End" Margin="10"/>
 
             </Grid>
 
diff --git a/BrickController2/BrickController2/UI/Pages/SequenceListPage.xaml b/BrickController2/BrickController2/UI/Pages/SequenceListPage.xaml
index e391f82f2..6a90bbad2 100644
--- a/BrickController2/BrickController2/UI/Pages/SequenceListPage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/SequenceListPage.xaml
@@ -20,14 +20,9 @@
         </ResourceDictionary>
     </local:PageBase.Resources>
 
-    <NavigationPage.TitleView>
-        <Grid HorizontalOptions="FillAndExpand">
-            <Label Text="{extensions:Translate Sequences}" TextColor="{DynamicResource NavigationBarItemColor}" FontSize="Medium" FontAttributes="Bold" HorizontalOptions="Start" VerticalOptions="Center"/>
-            <StackLayout Orientation="Horizontal" HorizontalOptions="End" Margin="12,0" Spacing="12">
-                <controls:ImageButton ImageSource="{extensions:ImageResource Source=ic_import.png}" Command="{Binding ImportSequenceCommand}" Style="{StaticResource NavigationBarImageButtonStyle}" IsVisible="{Binding SharedFileStorageService.IsSharedStorageAvailable}"/>
-            </StackLayout>
-        </Grid>
-    </NavigationPage.TitleView>
+    <ContentPage.ToolbarItems>
+        <controls:ToolbarIcon Icon="file_download" Text="{extensions:Translate ImportSequence}" Command="{Binding ImportSequenceCommand}" />
+    </ContentPage.ToolbarItems>
 
     <local:PageBase.Content>
         <AbsoluteLayout HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
@@ -40,7 +35,7 @@
                             <SwipeView>
                                 <SwipeView.LeftItems>
                                     <SwipeItems Mode="Execute">
-                                        <SwipeItem Text="{extensions:Translate Delete}" IconImageSource="{extensions:ImageResource Source=ic_delete.png}" BackgroundColor="{DynamicResource DeleteSwipeItemBackgroundColor}" Command="{Binding BindingContext.DeleteSequenceCommand, Source={x:Reference Page}}" CommandParameter="{Binding .}"/>
+                                        <controls:SwipeIcon Text="{extensions:Translate Delete}" Icon="cancel"  BackgroundColor="{DynamicResource DeleteSwipeItemBackgroundColor}" Command="{Binding BindingContext.DeleteSequenceCommand, Source={x:Reference Page}}" CommandParameter="{Binding .}"/>
                                     </SwipeItems>
                                 </SwipeView.LeftItems>
                                 <Grid Style="{StaticResource CollectionItemGridStyle}">
@@ -64,7 +59,7 @@
                     </CollectionView.EmptyView>
                 </CollectionView>
 
-                <controls:FloatingActionButton Style="{StaticResource FloatingActionButtonStyle}" ImageSource="{extensions:ImageResource Source=ic_add.png}" Command="{Binding AddSequenceCommand}" HorizontalOptions="End" VerticalOptions="End" Margin="10"/>
+                <controls:FloatingActionButton Style="{StaticResource FloatingActionButtonStyle}" Icon="add" Command="{Binding AddSequenceCommand}" HorizontalOptions="End" VerticalOptions="End" Margin="10"/>
 
             </Grid>
 
diff --git a/BrickController2/BrickController2/UI/Pages/SettingsPage.xaml b/BrickController2/BrickController2/UI/Pages/SettingsPage.xaml
index e138fc320..3a7703e24 100644
--- a/BrickController2/BrickController2/UI/Pages/SettingsPage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/SettingsPage.xaml
@@ -18,12 +18,6 @@
         </ResourceDictionary>
     </local:PageBase.Resources>
 
-    <NavigationPage.TitleView>
-        <Grid HorizontalOptions="FillAndExpand">
-            <Label Text="{extensions:Translate Settings}" TextColor="{DynamicResource NavigationBarItemColor}" FontSize="Medium" FontAttributes="Bold" HorizontalOptions="Start" VerticalOptions="Center"/>
-        </Grid>
-    </NavigationPage.TitleView>
-
     <local:PageBase.Content>
         <AbsoluteLayout HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
             <Grid RowSpacing="0" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All">
diff --git a/BrickController2/BrickController2/UI/ViewModels/CreationListPageViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/CreationListPageViewModel.cs
index b6321fb18..a52a24369 100644
--- a/BrickController2/BrickController2/UI/ViewModels/CreationListPageViewModel.cs
+++ b/BrickController2/BrickController2/UI/ViewModels/CreationListPageViewModel.cs
@@ -133,6 +133,8 @@ await _dialogService.ShowMessageBoxAsync(
                     }
 
                     SharedFileStorageService.IsPermissionGranted = storagePermissionStatus == PermissionStatus.Granted;
+                    // update command enablement
+                    ImportCreationCommand.RaiseCanExecuteChanged();
                 }
             }
             catch (OperationCanceledException)
diff --git a/BrickController2/BrickController2/UI/ViewModels/DevicePageViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/DevicePageViewModel.cs
index 98d3f5902..2f408c246 100644
--- a/BrickController2/BrickController2/UI/ViewModels/DevicePageViewModel.cs
+++ b/BrickController2/BrickController2/UI/ViewModels/DevicePageViewModel.cs
@@ -205,6 +205,8 @@ await _dialogService.ShowMessageBoxAsync(
                             {
                                 SetBuWizzOutputLevel(BuWizz2OutputLevel);
                             }
+                            // update command enablement
+                            ScanCommand.RaiseCanExecuteChanged();
                         }
                     }
                 }