diff --git a/src/Artemis.UI/ResourceDictionaries/LayerBrushDescriptors.xaml b/src/Artemis.UI/ResourceDictionaries/LayerBrushDescriptors.xaml
index 0817791c9..2868fe67d 100644
--- a/src/Artemis.UI/ResourceDictionaries/LayerBrushDescriptors.xaml
+++ b/src/Artemis.UI/ResourceDictionaries/LayerBrushDescriptors.xaml
@@ -1,9 +1,10 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes">
+                    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+                    xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared">
     <DataTemplate x:Key="SimpleLayerBrushDescriptorTemplate">
         <StackPanel Orientation="Horizontal">
-            <materialDesign:PackIcon Kind="{Binding Icon}" Height="13" Width="13" Margin="0 1 3 0" />
+            <shared:ArtemisIcon Icon="{Binding Icon}" Height="13" Width="13" Margin="0 1 3 0" />
             <TextBlock Text="{Binding DisplayName}" />
         </StackPanel>
     </DataTemplate>
@@ -17,7 +18,7 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
-            <materialDesign:PackIcon Grid.Row="0" Grid.RowSpan="2" Kind="{Binding Icon}" Height="20" Width="20" Margin="-5 -2 10 0" VerticalAlignment="Center" />
+            <shared:ArtemisIcon Grid.Row="0" Grid.RowSpan="2" Icon="{Binding Icon}" Height="20" Width="20" Margin="-5 -2 10 0" VerticalAlignment="Center" />
             <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding DisplayName}" TextWrapping="Wrap" MaxWidth="350" />
             <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Description}" TextWrapping="Wrap" MaxWidth="350" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}" />
         </Grid>
diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml
index 2e8460ced..aa7bca3e7 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml
@@ -8,6 +8,7 @@
              xmlns:s="https://github.com/canton7/Stylet"
              xmlns:behaviors="clr-namespace:Artemis.UI.Behaviors"
              xmlns:layerEffect="clr-namespace:Artemis.Core.LayerEffects;assembly=Artemis.Core"
+             xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
              d:DataContext="{d:DesignInstance local:EffectsViewModel}">
@@ -38,7 +39,7 @@
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="*" />
                             </Grid.ColumnDefinitions>
-                            <materialDesign:PackIcon Kind="{Binding Icon}" Width="20" Height="20" VerticalAlignment="Center" />
+                            <shared:ArtemisIcon Icon="{Binding Icon}" Width="20" Height="20" VerticalAlignment="Center" />
                             <StackPanel Margin="8 0 0 0" Grid.Column="1" VerticalAlignment="Stretch">
                                 <TextBlock FontWeight="Bold" Text="{Binding DisplayName}" TextWrapping="Wrap" />
                                 <TextBlock Text="{Binding Description}" TextWrapping="Wrap" />
diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesView.xaml
index d43e6ef30..a747494d1 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesView.xaml
@@ -317,12 +317,12 @@
                             Margin="6"
                             Visibility="{Binding SelectedLayer, Converter={StaticResource NullToVisibilityConverter}}">
                     <materialDesign:PackIcon Kind="Layers" Width="16" />
-                    <materialDesign:PackIcon Kind="{Binding SelectedLayer.LayerBrush.Descriptor.Icon}"
-                                             Width="16"
-                                             Margin="5 0 0 0"
-                                             ToolTip="{Binding SelectedLayer.LayerBrush.Descriptor.DisplayName, Mode=OneWay}"
-                                             Background="Transparent"
-                                             Visibility="{Binding SelectedLayer.LayerBrush, Converter={StaticResource NullToVisibilityConverter}}" />
+                    <shared:ArtemisIcon Icon="{Binding SelectedLayer.LayerBrush.Descriptor.Icon}"
+                                        Width="16"
+                                        Margin="5 0 0 0"
+                                        ToolTip="{Binding SelectedLayer.LayerBrush.Descriptor.DisplayName, Mode=OneWay}"
+                                        Background="Transparent"
+                                        Visibility="{Binding SelectedLayer.LayerBrush, Converter={StaticResource NullToVisibilityConverter}}" />
                     <TextBlock Text="{Binding SelectedLayer.Name}" Margin="5 0 0 0" />
                 </StackPanel>
                 <StackPanel Grid.Column="0"
diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeGroupView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeGroupView.xaml
index 5450b245a..3ac1166d2 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeGroupView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeGroupView.xaml
@@ -9,11 +9,12 @@
              xmlns:converters="clr-namespace:Artemis.UI.Converters"
              xmlns:dd="urn:gong-wpf-dragdrop"
              xmlns:layerProperties="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties"
+             xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
              mc:Ignorable="d"
              d:DataContext="{d:DesignInstance local:TreeGroupViewModel}"
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
-        <converters:InverseBooleanConverter x:Key="InverseBooleanConverter"/>
+        <converters:InverseBooleanConverter x:Key="InverseBooleanConverter" />
         <converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
         <converters:PropertyTreeMarginConverter Length="20" x:Key="PropertyTreeMarginConverter" />
     </UserControl.Resources>
@@ -105,9 +106,9 @@
                                 </Style.Triggers>
                             </Style>
                         </Grid.Style>
-                        <materialDesign:PackIcon Grid.Column="0"
-                                                 Kind="{Binding LayerPropertyGroup.LayerBrush.Descriptor.Icon}"
-                                                 Margin="0 5 5 0" />
+                        <shared:ArtemisIcon Grid.Column="0"
+                                            Icon="{Binding LayerPropertyGroup.LayerBrush.Descriptor.Icon}"
+                                            Margin="0 5 5 0" />
                         <TextBlock Grid.Column="1"
                                    ToolTip="{Binding LayerPropertyGroup.LayerBrush.Descriptor.Description}"
                                    Margin="0 5 0 0">
@@ -151,10 +152,10 @@
                                 </Style.Triggers>
                             </Style>
                         </Grid.Style>
-                        <materialDesign:PackIcon
+                        <shared:ArtemisIcon
                             Grid.Column="0"
                             Cursor="SizeNS"
-                            Kind="{Binding LayerPropertyGroup.LayerEffect.Descriptor.Icon}"
+                            Icon="{Binding LayerPropertyGroup.LayerEffect.Descriptor.Icon}"
                             Margin="0 5 5 0"
                             Background="Transparent" />
                         <TextBlock Grid.Column="1" ToolTip="{Binding LayerPropertyGroup.LayerEffect.Descriptor.Description}" Margin="0 5 0 0">
diff --git a/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/LayerView.xaml b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/LayerView.xaml
index 6182e9357..eca32dc70 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/LayerView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/LayerView.xaml
@@ -6,7 +6,9 @@
              xmlns:s="https://github.com/canton7/Stylet"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:treeItem1="clr-namespace:Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem"
-             xmlns:Converters="clr-namespace:Artemis.UI.Converters" x:Class="Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem.LayerView"
+             xmlns:Converters="clr-namespace:Artemis.UI.Converters"
+             xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
+             x:Class="Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem.LayerView"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
              d:DataContext="{d:DesignInstance {x:Type treeItem1:LayerViewModel}}">
@@ -53,14 +55,14 @@
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <materialDesign:PackIcon Grid.Column="0" Kind="Layers" Width="16" VerticalAlignment="Center" />
-            <materialDesign:PackIcon Grid.Column="1"
-                                     VerticalAlignment="Center"
-                                     Kind="{Binding Layer.LayerBrush.Descriptor.Icon}"
-                                     Width="16"
-                                     Margin="5 0 0 0"
-                                     ToolTip="{Binding Layer.LayerBrush.Descriptor.DisplayName, Mode=OneWay}"
-                                     Visibility="{Binding ShowIcons, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}"
-                                     Background="Transparent" />
+            <shared:ArtemisIcon Grid.Column="1"
+                                VerticalAlignment="Center"
+                                Icon="{Binding Layer.LayerBrush.Descriptor.Icon}"
+                                Width="16"
+                                Margin="5 0 0 0"
+                                ToolTip="{Binding Layer.LayerBrush.Descriptor.DisplayName, Mode=OneWay}"
+                                Visibility="{Binding ShowIcons, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}"
+                                Background="Transparent" />
             <TextBlock Grid.Column="2" Text="{Binding Layer.Name}" VerticalAlignment="Center" Margin="5 0 0 0" />
             <ToggleButton Grid.Column="3"
                           Style="{StaticResource MaterialDesignFlatToggleButton}"
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Windows/LayerBrushSettingsWindowView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Windows/LayerBrushSettingsWindowView.xaml
index 25256ee61..208a1ba50 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Windows/LayerBrushSettingsWindowView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Windows/LayerBrushSettingsWindowView.xaml
@@ -7,6 +7,7 @@
                          xmlns:s="https://github.com/canton7/Stylet"
                          xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
                          xmlns:windows="clr-namespace:Artemis.UI.Screens.ProfileEditor.Windows"
+                         xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
                          mc:Ignorable="d"
                          Title="Layer brush configuration"
                          Background="{DynamicResource MaterialDesignPaper}"
@@ -25,7 +26,7 @@
         <DockPanel>
             <controls:AppBar Type="Dense" Title="{Binding ActiveItem.LayerBrush.Descriptor.DisplayName}" DockPanel.Dock="Top" Margin="-18 0 0 0" ShowShadow="False">
                 <controls:AppBar.AppIcon>
-                    <materialDesign:PackIcon Kind="{Binding ActiveItem.LayerBrush.Descriptor.Icon}" Width="20" Height="28" />
+                    <shared:ArtemisIcon Icon="{Binding ActiveItem.LayerBrush.Descriptor.Icon}" Width="20" Height="28" />
                 </controls:AppBar.AppIcon>
             </controls:AppBar>
 
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Windows/LayerEffectSettingsWindowView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Windows/LayerEffectSettingsWindowView.xaml
index a7cb413e4..ea915b311 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Windows/LayerEffectSettingsWindowView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Windows/LayerEffectSettingsWindowView.xaml
@@ -7,6 +7,7 @@
                          xmlns:s="https://github.com/canton7/Stylet"
                          xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
                          xmlns:windows="clr-namespace:Artemis.UI.Screens.ProfileEditor.Windows"
+                         xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
                          mc:Ignorable="d"
                          Title="Layer effect configuration"
                          Background="{DynamicResource MaterialDesignPaper}"
@@ -23,7 +24,7 @@
     <DockPanel>
         <controls:AppBar Type="Dense" Title="{Binding ActiveItem.LayerEffect.Descriptor.DisplayName}" DockPanel.Dock="Top" Margin="-18 0 0 0" ShowShadow="False">
             <controls:AppBar.AppIcon>
-                <materialDesign:PackIcon Kind="{Binding ActiveItem.LayerEffect.Descriptor.Icon}" Width="20" Height="28" />
+                <shared:ArtemisIcon Icon="{Binding ActiveItem.LayerEffect.Descriptor.Icon}" Width="20" Height="28" />
             </controls:AppBar.AppIcon>
         </controls:AppBar>