Index: Core/Gui/src/Core.Gui/Controls/IconButton.xaml
===================================================================
diff -u -r13c4306b8789108100e221e090f3f096e008b535 -ra5af013e2d8df86949c9a86b1bc8bbc7412d074f
--- Core/Gui/src/Core.Gui/Controls/IconButton.xaml	(.../IconButton.xaml)	(revision 13c4306b8789108100e221e090f3f096e008b535)
+++ Core/Gui/src/Core.Gui/Controls/IconButton.xaml	(.../IconButton.xaml)	(revision a5af013e2d8df86949c9a86b1bc8bbc7412d074f)
@@ -31,7 +31,7 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/Core.Gui;component/Style/DeltaresGeneralStyle.xaml" /> 
-                <ResourceDictionary Source="pack://application:,,,/Core.Gui;component/Style/Symbols/RiskeerSymbols.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/Core.Gui;component/Style/Symbols/Symbols.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Button.Resources>
@@ -62,7 +62,7 @@
                         <Border Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}}">
                             <StackPanel Orientation="Horizontal">
                                 <TextBlock Foreground="{Binding Foreground, ElementName=ButtonParent}"
-                                           FontFamily="{StaticResource RiskeerFont}"
+                                           FontFamily="{StaticResource Symbols}"
                                            FontSize="{Binding IconSize, ElementName=ButtonParent}"
                                            Text="{Binding Icon,  ElementName=ButtonParent}" />
                                 <TextBlock Foreground="{Binding Foreground, ElementName=ButtonParent}"
Index: Core/Gui/src/Core.Gui/Core.Gui.csproj
===================================================================
diff -u -r1a60f22e14b4329aa02e1cc6b5674d3587de89a8 -ra5af013e2d8df86949c9a86b1bc8bbc7412d074f
--- Core/Gui/src/Core.Gui/Core.Gui.csproj	(.../Core.Gui.csproj)	(revision 1a60f22e14b4329aa02e1cc6b5674d3587de89a8)
+++ Core/Gui/src/Core.Gui/Core.Gui.csproj	(.../Core.Gui.csproj)	(revision a5af013e2d8df86949c9a86b1bc8bbc7412d074f)
@@ -61,16 +61,11 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <None Remove="Style\DeltaresBackstageStyle.xaml" />
     <Page Include="Style\DeltaresBackstageStyle.xaml" />
-    <None Remove="Style\DeltaresButtonStyle.xaml" />
     <Page Include="Style\DeltaresButtonStyle.xaml" />
-    <None Remove="Style\DeltaresGeneralStyle.xaml" />
     <Page Include="Style\DeltaresGeneralStyle.xaml" />
-    <None Remove="Style\DeltaresStyle.xaml" />
     <Page Include="Style\DeltaresStyle.xaml" />
-    <None Remove="Style\Symbols\RiskeerSymbols.xaml" />
-    <Page Include="Style\Symbols\RiskeerSymbols.xaml" />
+    <Page Include="Style\Symbols\Symbols.xaml" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\application_import_blue.ico" />
@@ -90,8 +85,7 @@
     <Resource Include="Resources\PropertiesHS.png" />
     <Resource Include="Resources\Riskeer.ico" />
     <Resource Include="Resources\SplashScreenBackground.png" />
-    <None Remove="Style\Symbols\Deltares-Riskeer-Symbols.ttf" />
-    <Resource Include="Style\Symbols\Deltares-Riskeer-Symbols.ttf" />
+    <Resource Include="Style\Symbols\Symbols.ttf" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\arrow-000-medium-question-mark.ico" />
Index: Core/Gui/src/Core.Gui/Forms/Backstage/BackstageControl.xaml
===================================================================
diff -u -r997a544497b66e9eede0cb4d72fdcb82940c4bd9 -ra5af013e2d8df86949c9a86b1bc8bbc7412d074f
--- Core/Gui/src/Core.Gui/Forms/Backstage/BackstageControl.xaml	(.../BackstageControl.xaml)	(revision 997a544497b66e9eede0cb4d72fdcb82940c4bd9)
+++ Core/Gui/src/Core.Gui/Forms/Backstage/BackstageControl.xaml	(.../BackstageControl.xaml)	(revision a5af013e2d8df86949c9a86b1bc8bbc7412d074f)
@@ -148,7 +148,7 @@
                         Command="{x:Static commands:MainWindowCommands.ToggleBackstageCommand}">
                     <TextBlock Style="{StaticResource ButtonLargeIconStyle}"
                                FontSize="42"
-                               Text="&#xE916;" />
+                               Text="&#xE903;" />
                 </Button>
 
                 <controls:OneWayToggleButton Style="{StaticResource BackstageToggleButtonStyle}"
Index: Core/Gui/src/Core.Gui/Forms/Backstage/SupportBackstagePage.xaml
===================================================================
diff -u -r49861b2d7698649a70eb22308a7858dd364109f1 -ra5af013e2d8df86949c9a86b1bc8bbc7412d074f
--- Core/Gui/src/Core.Gui/Forms/Backstage/SupportBackstagePage.xaml	(.../SupportBackstagePage.xaml)	(revision 49861b2d7698649a70eb22308a7858dd364109f1)
+++ Core/Gui/src/Core.Gui/Forms/Backstage/SupportBackstagePage.xaml	(.../SupportBackstagePage.xaml)	(revision a5af013e2d8df86949c9a86b1bc8bbc7412d074f)
@@ -34,7 +34,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/Core.Gui;component/Style/Symbols/RiskeerSymbols.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/Core.Gui;component/Style/Symbols/Symbols.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Core.Gui;component/Style/DeltaresGeneralStyle.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Core.Gui;component/Style/DeltaresBackstageStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
@@ -54,7 +54,7 @@
             </Style>
 
             <Style x:Key="BigButtonIconStyle" TargetType="{x:Type TextBlock}">
-                <Setter Property="FontFamily" Value="{StaticResource RiskeerFont}" />
+                <Setter Property="FontFamily" Value="{StaticResource Symbols}" />
                 <Setter Property="HorizontalAlignment" Value="Center" />
                 <Setter Property="VerticalAlignment" Value="Center" />
                 <Setter Property="FontSize" Value="56" />
@@ -77,7 +77,7 @@
                                     <TextBlock FontSize="13" DockPanel.Dock="Bottom" HorizontalAlignment="Center">
                                         <ContentPresenter Content="{TemplateBinding Tag}" />
                                     </TextBlock>
-                                    <TextBlock FontFamily="{StaticResource RiskeerFont}"
+                                    <TextBlock FontFamily="{StaticResource Symbols}"
                                                HorizontalAlignment="Center"
                                                VerticalAlignment="Center" FontSize="40">
                                         <ContentPresenter />
@@ -133,21 +133,21 @@
                             Tag="{x:Static properties:Resources.VisitWebsite_DisplayName}"
                             Command="{x:Static commands:MainWindowCommands.OpenHelpdeskWaterWebsiteCommand}">
                         <TextBlock Style="{StaticResource BigButtonIconStyle}"
-                                   Text="&#xE903;"/>
+                                   Text="&#xE904;"/>
                     </Button>
 
                     <Button Style="{StaticResource BackstageBigButtonStyle}"
                             Tag="{x:Static properties:Resources.CallSupport_DisplayName}"
                             Command="{x:Static commands:MainWindowCommands.CallHelpdeskWaterWebsiteCommand}">
                         <TextBlock Style="{StaticResource BigButtonIconStyle}"
-                                   Text="&#xE904;"/>
+                                   Text="&#xE905;"/>
                     </Button>
     
                     <Button Style="{StaticResource BackstageBigButtonStyle}"
                             Tag="{x:Static properties:Resources.EmailSupport_DisplayName}"
                             Command="{x:Static commands:MainWindowCommands.EmailHelpdeskWaterWebsiteCommand}">
                         <TextBlock Style="{StaticResource BigButtonIconStyle}"
-                                   Text="&#xE905;"/>
+                                   Text="&#xE906;"/>
                     </Button>
                 </StackPanel>
             </StackPanel>
Index: Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml
===================================================================
diff -u -r49861b2d7698649a70eb22308a7858dd364109f1 -ra5af013e2d8df86949c9a86b1bc8bbc7412d074f
--- Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision 49861b2d7698649a70eb22308a7858dd364109f1)
+++ Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision a5af013e2d8df86949c9a86b1bc8bbc7412d074f)
@@ -124,35 +124,35 @@
                                   ToolTip="{x:Static properties:Resources.ViewStateBar_ProjectExplorer_ToolTip}"
                                   Command="{Binding Path=ToggleProjectExplorerCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=metro:MetroWindow}}"
                                   AutomationProperties.AutomationId="ViewStateButtonBarShowProjectExplorer">
-                        <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE906;"/>
+                        <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE907;"/>
                     </ToggleButton>
                     <ToggleButton Name="ButtonShowProperties"
                                   Style="{StaticResource ViewStateBarToggleButtonStyle}"
                                   ToolTip="{x:Static properties:Resources.ViewStateBar_Properties_ToolTip}"
                                   Command="{Binding Path=TogglePropertyGridViewCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=metro:MetroWindow}}"
                                   AutomationProperties.AutomationId="ViewStateButtonBarShowProperties">
-                        <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE907;"/>
+                        <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE908;"/>
                     </ToggleButton>
                     <ToggleButton Name="ButtonShowMessages"
                                   Style="{StaticResource ViewStateBarToggleButtonStyle}"
                                   ToolTip="{x:Static properties:Resources.ViewStateBar_Messages_ToolTip}"
                                   Command="{Binding Path=ToggleMessageWindowCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=metro:MetroWindow}}"
                                   AutomationProperties.AutomationId="ViewStateButtonBarShowMessages">
-                        <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE908;"/>
+                        <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE909;"/>
                     </ToggleButton>
                     <ToggleButton Name="ButtonShowMapLegendView"
                                   Style="{StaticResource ViewStateBarToggleButtonStyle}"
                                   ToolTip="{x:Static properties:Resources.ViewStateBar_Map_ToolTip}"
                                   Command="{Binding Path=ToggleMapLegendViewCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=metro:MetroWindow}}"
                                   AutomationProperties.AutomationId="ViewStateButtonBarShowMap">
-                        <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE909;"/>
+                        <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE90A;"/>
                     </ToggleButton>
                     <ToggleButton Name="ButtonShowChartLegendView"
                                   Style="{StaticResource ViewStateBarToggleButtonStyle}"
                                   ToolTip="{x:Static properties:Resources.ViewStateBar_Chart_ToolTip}"
                                   Command="{Binding Path=ToggleChartLegendViewCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=metro:MetroWindow}}"
                                   AutomationProperties.AutomationId="ViewStateButtonBarShowChart">
-                        <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE90A;"/>
+                        <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE90B;"/>
                     </ToggleButton>
                 </StackPanel>
             </DockPanel>
Index: Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r6c6e35803f103849428c1e9bea47c817fe55c496 -ra5af013e2d8df86949c9a86b1bc8bbc7412d074f
--- Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 6c6e35803f103849428c1e9bea47c817fe55c496)
+++ Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision a5af013e2d8df86949c9a86b1bc8bbc7412d074f)
@@ -542,7 +542,7 @@
                     Data = applicationSelection.Selection
                 };
 
-                viewController.ViewHost.AddToolView(propertyGrid, ToolViewLocation.Right, "\uE907");
+                viewController.ViewHost.AddToolView(propertyGrid, ToolViewLocation.Right, "\uE908");
             }
             else
             {
@@ -566,7 +566,7 @@
         {
             ProjectExplorer = new ProjectExplorer.ProjectExplorer(gui.ViewCommands, gui.GetTreeNodeInfos());
 
-            viewController.ViewHost.AddToolView(ProjectExplorer, ToolViewLocation.Left, "\uE906");
+            viewController.ViewHost.AddToolView(ProjectExplorer, ToolViewLocation.Left, "\uE907");
 
             UpdateProjectExplorer();
         }
@@ -584,14 +584,14 @@
         {
             MapLegendView = new MapLegendView(gui);
 
-            viewController.ViewHost.AddToolView(MapLegendView, ToolViewLocation.Left, "\uE909");
+            viewController.ViewHost.AddToolView(MapLegendView, ToolViewLocation.Left, "\uE90A");
         }
 
         private void InitChartLegendWindow()
         {
             ChartLegendView = new ChartLegendView(gui);
 
-            viewController.ViewHost.AddToolView(ChartLegendView, ToolViewLocation.Left, "\uE90A");
+            viewController.ViewHost.AddToolView(ChartLegendView, ToolViewLocation.Left, "\uE90B");
         }
 
         #endregion
Index: Core/Gui/src/Core.Gui/Forms/StartScreen/StartScreen.xaml
===================================================================
diff -u -r49861b2d7698649a70eb22308a7858dd364109f1 -ra5af013e2d8df86949c9a86b1bc8bbc7412d074f
--- Core/Gui/src/Core.Gui/Forms/StartScreen/StartScreen.xaml	(.../StartScreen.xaml)	(revision 49861b2d7698649a70eb22308a7858dd364109f1)
+++ Core/Gui/src/Core.Gui/Forms/StartScreen/StartScreen.xaml	(.../StartScreen.xaml)	(revision a5af013e2d8df86949c9a86b1bc8bbc7412d074f)
@@ -41,7 +41,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/Core.Gui;component/Style/DeltaresStyle.xaml" /> 
                 <ResourceDictionary Source="pack://application:,,,/Core.Gui;component/Style/DeltaresBackstageStyle.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/Core.Gui;component/Style/Symbols/RiskeerSymbols.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/Core.Gui;component/Style/Symbols/Symbols.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
             <Style x:Key="BigButtonStyle" TargetType="{x:Type Button}">
@@ -157,7 +157,7 @@
                                        Command="{Binding NewProjectCommand}"
                                        IsDefault="True">
                             <TextBlock Text="&#xE900;"
-                                       FontFamily="{StaticResource RiskeerFont}"
+                                       FontFamily="{StaticResource Symbols}"
                                        HorizontalAlignment="Center"
                                        VerticalAlignment="Center" FontSize="56" />
                         </Button>
Index: Core/Gui/src/Core.Gui/Style/DeltaresButtonStyle.xaml
===================================================================
diff -u -rac11dc0cff110f04dfbbc62f42a12a3c2c2feb37 -ra5af013e2d8df86949c9a86b1bc8bbc7412d074f
--- Core/Gui/src/Core.Gui/Style/DeltaresButtonStyle.xaml	(.../DeltaresButtonStyle.xaml)	(revision ac11dc0cff110f04dfbbc62f42a12a3c2c2feb37)
+++ Core/Gui/src/Core.Gui/Style/DeltaresButtonStyle.xaml	(.../DeltaresButtonStyle.xaml)	(revision a5af013e2d8df86949c9a86b1bc8bbc7412d074f)
@@ -7,7 +7,7 @@
 
     <Style x:Key="ButtonIconStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="TextAlignment" Value="Center" />
-        <Setter Property="FontFamily" Value="{StaticResource RiskeerFont}" />
+        <Setter Property="FontFamily" Value="{StaticResource Symbols}" />
         <Setter Property="FontSize" Value="20" />
     </Style>
 
Index: Core/Gui/src/Core.Gui/Style/DeltaresGeneralStyle.xaml
===================================================================
diff -u -r13c4306b8789108100e221e090f3f096e008b535 -ra5af013e2d8df86949c9a86b1bc8bbc7412d074f
--- Core/Gui/src/Core.Gui/Style/DeltaresGeneralStyle.xaml	(.../DeltaresGeneralStyle.xaml)	(revision 13c4306b8789108100e221e090f3f096e008b535)
+++ Core/Gui/src/Core.Gui/Style/DeltaresGeneralStyle.xaml	(.../DeltaresGeneralStyle.xaml)	(revision a5af013e2d8df86949c9a86b1bc8bbc7412d074f)
@@ -27,7 +27,7 @@
                     xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls"
                     xmlns:startScreen="clr-namespace:Core.Gui.Forms.StartScreen">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Core.Gui;component/Style/Symbols/RiskeerSymbols.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Core.Gui;component/Style/Symbols/Symbols.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Color x:Key="DeltaresBlue">#008BBF</Color>
Index: Core/Gui/src/Core.Gui/Style/Symbols/Deltares-Riskeer-Symbols.ttf
===================================================================
diff -u -r49861b2d7698649a70eb22308a7858dd364109f1 -ra5af013e2d8df86949c9a86b1bc8bbc7412d074f
Binary files differ
Fisheye: Tag a5af013e2d8df86949c9a86b1bc8bbc7412d074f refers to a dead (removed) revision in file `Core/Gui/src/Core.Gui/Style/Symbols/RiskeerSymbols.xaml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Gui/src/Core.Gui/Style/Symbols/Symbols.ttf
===================================================================
diff -u
Binary files differ
Index: Core/Gui/src/Core.Gui/Style/Symbols/Symbols.xaml
===================================================================
diff -u
--- Core/Gui/src/Core.Gui/Style/Symbols/Symbols.xaml	(revision 0)
+++ Core/Gui/src/Core.Gui/Style/Symbols/Symbols.xaml	(revision a5af013e2d8df86949c9a86b1bc8bbc7412d074f)
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <FontFamily x:Key="Symbols">pack://application:,,,/Core.Gui;component/Style/Symbols/#Symbols</FontFamily>
+</ResourceDictionary>
\ No newline at end of file