Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Ribbon.xaml
===================================================================
diff -u -r79b1cdcf9dcdbe4c015f5fc6b42605a00386b120 -r8b0b93c09c3e5b312e000aea70d808fcac0ba6ee
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/Ribbon.xaml	(.../Ribbon.xaml)	(revision 79b1cdcf9dcdbe4c015f5fc6b42605a00386b120)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Ribbon.xaml	(.../Ribbon.xaml)	(revision 8b0b93c09c3e5b312e000aea70d808fcac0ba6ee)
@@ -5,14 +5,15 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:fluent="clr-namespace:Fluent;assembly=Fluent"
              xmlns:resx="clr-namespace:Core.Plugins.ProjectExplorer.Properties"
+             xmlns:gui="clr-namespace:Core.Common.Gui;assembly=Core.Common.Gui"
              mc:Ignorable="d" Width="686.4" Height="168" Background="White">
     <UserControl.Resources>
-        <ResourceDictionary Source="/Fluent;Component/Themes/generic.xaml"/>
+        <gui:PngToIconConverter x:Key="IconConverter" />
     </UserControl.Resources>
     <fluent:Ribbon x:Name="RibbonControl" x:FieldModifier="private">
         <fluent:RibbonTabItem Header="{x:Static resx:Resources.Ribbon_TabItem_View}" fluent:KeyTip.Keys="V" >
             <fluent:RibbonGroupBox Header="{x:Static resx:Resources.Ribbon_GroupBox_ShowHide}" fluent:KeyTip.Keys="ZS">
-                <fluent:ToggleButton x:Name="ButtonShowProjectExplorerToolWindow" Header="{x:Static resx:Resources.Ribbon_ProjectExplorer}" Icon="pack://application:,,,/Core.Plugins.ProjectExplorer;component\Resources\folder_wrench.png" SizeDefinition="Middle" Click="ButtonShowProjectExplorerToolWindowClick" fluent:KeyTip.Keys="P" />
+                <fluent:ToggleButton x:Name="ButtonShowProjectExplorerToolWindow" Header="{x:Static resx:Resources.Ribbon_ProjectExplorer}" Icon="{Binding Source={x:Static resx:Resources.folder_wrench}, Converter={StaticResource IconConverter}}" SizeDefinition="Middle" Click="ButtonShowProjectExplorerToolWindowClick" fluent:KeyTip.Keys="P" />
             </fluent:RibbonGroupBox>
         </fluent:RibbonTabItem>
     </fluent:Ribbon>
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -re5cd358fe021d2c9d042e226cc00db06578619e3 -r8b0b93c09c3e5b312e000aea70d808fcac0ba6ee
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision e5cd358fe021d2c9d042e226cc00db06578619e3)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 8b0b93c09c3e5b312e000aea70d808fcac0ba6ee)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Runtime Version:4.0.30319.34209
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -277,6 +277,16 @@
         }
         
         /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap ExportIcon {
+            get {
+                object obj = ResourceManager.GetObject("ExportIcon", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to De beschikbare gegevens van de feature..
         /// </summary>
         public static string FeatureDataRowProperties_Data_Description {
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.resx
===================================================================
diff -u -re5cd358fe021d2c9d042e226cc00db06578619e3 -r8b0b93c09c3e5b312e000aea70d808fcac0ba6ee
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision e5cd358fe021d2c9d042e226cc00db06578619e3)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 8b0b93c09c3e5b312e000aea70d808fcac0ba6ee)
@@ -758,4 +758,7 @@
   <data name="buttonAddLayer_Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\buttonAddLayer.Image.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ExportIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\exporticon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Ribbon.xaml
===================================================================
diff -u -raa5887c5cd44df8768c05651b7013ed50f7902d9 -r8b0b93c09c3e5b312e000aea70d808fcac0ba6ee
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Ribbon.xaml	(.../Ribbon.xaml)	(revision aa5887c5cd44df8768c05651b7013ed50f7902d9)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Ribbon.xaml	(.../Ribbon.xaml)	(revision 8b0b93c09c3e5b312e000aea70d808fcac0ba6ee)
@@ -5,35 +5,36 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:fluent="clr-namespace:Fluent;assembly=Fluent"
              xmlns:p="clr-namespace:Core.Plugins.SharpMapGis.Gui.Properties"
+             xmlns:gui="clr-namespace:Core.Common.Gui;assembly=Core.Common.Gui"
              mc:Ignorable="d" Width="686.4" Height="168" Background="White">
     <UserControl.Resources>
-        <ResourceDictionary Source="/Fluent;Component/Themes/generic.xaml"/>
+        <gui:PngToIconConverter x:Key="IconConverter"/>
     </UserControl.Resources>
     <fluent:Ribbon x:Name="RibbonControl" x:FieldModifier="private">
         <fluent:Ribbon.ContextualGroups>
             <fluent:RibbonContextualTabGroup Header="GIS" Visibility="Visible" x:Name="geospatialContextualGroup" Background="Green" BorderBrush="Green" />
         </fluent:Ribbon.ContextualGroups>
         <fluent:RibbonTabItem Header="{x:Static p:Resources.Ribbon_View_Header}" fluent:KeyTip.Keys="V">
             <fluent:RibbonGroupBox Header="{x:Static p:Resources.Ribbon_View_ShowHide_Header}" fluent:KeyTip.Keys="ZS">
-                <fluent:ToggleButton x:Name="ButtonShowMapContentsToolWindow" Header="{x:Static p:Resources.Ribbon_View_MapContents_Header}" Icon="pack://application:,,,/Core.Plugins.SharpMapGis.Gui;component\Resources\map.png" Click="ButtonShowMapContentsToolWindow_Click" SizeDefinition="Middle" fluent:KeyTip.Keys="A"/>
+                <fluent:ToggleButton x:Name="ButtonShowMapContentsToolWindow" Header="{x:Static p:Resources.Ribbon_View_MapContents_Header}" Icon="{Binding Source={x:Static p:Resources.Map}, Converter={StaticResource IconConverter}}" Click="ButtonShowMapContentsToolWindow_Click" SizeDefinition="Middle" fluent:KeyTip.Keys="A"/>
             </fluent:RibbonGroupBox>
         </fluent:RibbonTabItem>
         <fluent:RibbonTabItem Header="{x:Static p:Resources.Ribbon_Map_Header}" ReduceOrder="Decorations,Select,Tools,Zoom,Edit,Profile,SpatialOperationsGroup" Group="{Binding ElementName=geospatialContextualGroup}" x:Name="mapTab" fluent:KeyTip.Keys="M">
-            <fluent:RibbonGroupBox Header="{x:Static p:Resources.Ribbon_Map_Decorations_Header}" x:Name="Decorations" Icon="pack://application:,,,/Core.Plugins.SharpMapGis.Gui;component\Resources\map--pencil.png" fluent:KeyTip.Keys="ZO">
-                <fluent:ToggleButton x:Name="ButtonMapShowNorthArrow" Header="{x:Static p:Resources.Ribbon_Map_ShowNorthArrow_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_ShowNorthArrow_ToolTip}" Icon="pack://application:,,,/Core.Plugins.SharpMapGis.Gui;component\Resources\northArrowIcon.png" Click="ButtonMapShowNorthArrow_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="DN"/>
-                <fluent:ToggleButton x:Name="ButtonMapShowLegend" Header="{x:Static p:Resources.Ribbon_Map_Legend_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_Legend_ToolTip}" Icon="pack://application:,,,/Core.Plugins.SharpMapGis.Gui;component\Resources\legendIcon.png" Click="ButtonMapShowLegend_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="DL"/>
-                <fluent:ToggleButton x:Name="ButtonMapShowScaleBar" Header="{x:Static p:Resources.Ribbon_Map_ScaleBar_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_ScaleBar_ToolTip}" Icon="pack://application:,,,/Core.Plugins.SharpMapGis.Gui;component\Resources\scaleBarIcon.png" Click="ButtonMapShowScaleBar_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="DS"/>
+            <fluent:RibbonGroupBox Header="{x:Static p:Resources.Ribbon_Map_Decorations_Header}" x:Name="Decorations" Icon="{Binding Source={x:Static p:Resources.MapPencil}, Converter={StaticResource IconConverter}}" fluent:KeyTip.Keys="ZO">
+                <fluent:ToggleButton x:Name="ButtonMapShowNorthArrow" Header="{x:Static p:Resources.Ribbon_Map_ShowNorthArrow_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_ShowNorthArrow_ToolTip}" Icon="{Binding Source={x:Static p:Resources.NorthArrowIconImage}, Converter={StaticResource IconConverter}}" Click="ButtonMapShowNorthArrow_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="DN"/>
+                <fluent:ToggleButton x:Name="ButtonMapShowLegend" Header="{x:Static p:Resources.Ribbon_Map_Legend_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_Legend_ToolTip}" Icon="{Binding Source={x:Static p:Resources.LegendIconImage}, Converter={StaticResource IconConverter}}" Click="ButtonMapShowLegend_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="DL"/>
+                <fluent:ToggleButton x:Name="ButtonMapShowScaleBar" Header="{x:Static p:Resources.Ribbon_Map_ScaleBar_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_ScaleBar_ToolTip}" Icon="{Binding Source={x:Static p:Resources.ScaleBarIconImage}, Converter={StaticResource IconConverter}}" Click="ButtonMapShowScaleBar_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="DS"/>
             </fluent:RibbonGroupBox>
-            <fluent:RibbonGroupBox Header="{x:Static p:Resources.Ribbon_Map_Tools_Header}" x:Name="Tools" Icon="pack://application:,,,/Core.Plugins.SharpMapGis.Gui;component\Resources\pencil-ruler.png" fluent:KeyTip.Keys="ZT">
-                <fluent:ToggleButton x:Name="ButtonMapSelect" Header="{x:Static p:Resources.Ribbon_Map_Select_Header}" Icon="pack://application:,,,/Core.Plugins.SharpMapGis.Gui;component\Resources\select.png" Click="ButtonMapSelectFeature_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="S"/>
-                <fluent:ToggleButton x:Name="ButtonMapPanZoom" Header="{x:Static p:Resources.Ribbon_Map_Pan_Header}" Icon="pack://application:,,,/Core.Plugins.SharpMapGis.Gui;component\Resources\MapPanZoomImage.png" Click="ButtonMapPanZoom_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="P"/>
-                <fluent:Button x:Name="ButtonMapZoomToExtent" Header="{x:Static p:Resources.Ribbon_Map_ZoomToExtent_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_ZoomToExtent_ToolTip}" Icon="pack://application:,,,/Core.Plugins.SharpMapGis.Gui;component\Resources\MapZoomToExtentsImage.png" Click="ButtonMapZoomToExtent_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="X"/>
-                <fluent:ToggleButton x:Name="ButtonMapZoomUsingRectangle" Header="{x:Static p:Resources.Ribbon_Map_ZoomByRectange_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_ZoomByRectange_ToolTip}" Icon="pack://application:,,,/Core.Plugins.SharpMapGis.Gui;component\Resources\MapZoomRectangleImage.png" Click="ButtonMapZoomUsingRectangle_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="OR"/>
-                <fluent:Button x:Name="ButtonMapZoomPrevious" Header="{x:Static p:Resources.Ribbon_Map_ZoomPrevious_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_ZoomPrevious_ToolTip}" Icon="pack://application:,,,/Core.Plugins.SharpMapGis.Gui;component\Resources\previous.png" Click="ButtonMapZoomPrevious_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="OP"/>
-                <fluent:Button x:Name="ButtonMapZoomNext" Header="{x:Static p:Resources.Ribbon_Map_NextZoom_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_NextZoom_ToolTip}" Icon="pack://application:,,,/Core.Plugins.SharpMapGis.Gui;component\Resources\next.png" Click="ButtonMapZoomNext_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="ON"/>
-                <fluent:Button x:Name="ButtonMapChangeCoordinateSystem" Header="{x:Static p:Resources.Ribbon_Map_CoordinateSystem_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_CoordinateSystem_ToolTip}" Icon="pack://application:,,,/Core.Plugins.SharpMapGis.Gui;component\Resources\globe--pencil.png" Click="ButtonMapChangeCoordinateSystem_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="CC"/>
-                <fluent:ToggleButton x:Name="ButtonMapMeasure" Header="{x:Static p:Resources.Ribbon_Map_MeasureDistance_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_MeasureDistance_ToolTip}" Icon="pack://application:,,,/Core.Plugins.SharpMapGis.Gui;component\Resources\measureTool.png" Click="ButtonMapMeasure_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="TM"/>
-                <fluent:Button x:Name="ButtonExportMapAsImage" Header="{x:Static p:Resources.Ribbon_Map_ExportAsImage_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_ExportAsImage_ToolTip}" Icon="pack://application:,,,/Core.Plugins.SharpMapGis.Gui;component\Resources\exportIcon.png" Click="ButtonExportMapAsImage_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="TX"/>
+            <fluent:RibbonGroupBox Header="{x:Static p:Resources.Ribbon_Map_Tools_Header}" x:Name="Tools" Icon="{Binding Source={x:Static p:Resources.PencilRuler}, Converter={StaticResource IconConverter}}" fluent:KeyTip.Keys="ZT">
+                <fluent:ToggleButton x:Name="ButtonMapSelect" Header="{x:Static p:Resources.Ribbon_Map_Select_Header}" Icon="{Binding Source={x:Static p:Resources.Select}, Converter={StaticResource IconConverter}}" Click="ButtonMapSelectFeature_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="S"/>
+                <fluent:ToggleButton x:Name="ButtonMapPanZoom" Header="{x:Static p:Resources.Ribbon_Map_Pan_Header}" Icon="{Binding Source={x:Static p:Resources.MapPanZoomImage}, Converter={StaticResource IconConverter}}" Click="ButtonMapPanZoom_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="P"/>
+                <fluent:Button x:Name="ButtonMapZoomToExtent" Header="{x:Static p:Resources.Ribbon_Map_ZoomToExtent_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_ZoomToExtent_ToolTip}" Icon="{Binding Source={x:Static p:Resources.MapZoomToExtentsImage}, Converter={StaticResource IconConverter}}" Click="ButtonMapZoomToExtent_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="X"/>
+                <fluent:ToggleButton x:Name="ButtonMapZoomUsingRectangle" Header="{x:Static p:Resources.Ribbon_Map_ZoomByRectange_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_ZoomByRectange_ToolTip}" Icon="{Binding Source={x:Static p:Resources.MapZoomRectangleImage}, Converter={StaticResource IconConverter}}" Click="ButtonMapZoomUsingRectangle_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="OR"/>
+                <fluent:Button x:Name="ButtonMapZoomPrevious" Header="{x:Static p:Resources.Ribbon_Map_ZoomPrevious_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_ZoomPrevious_ToolTip}" Icon="{Binding Source={x:Static p:Resources.MapZoomPreviousImage}, Converter={StaticResource IconConverter}}" Click="ButtonMapZoomPrevious_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="OP"/>
+                <fluent:Button x:Name="ButtonMapZoomNext" Header="{x:Static p:Resources.Ribbon_Map_NextZoom_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_NextZoom_ToolTip}" Icon="{Binding Source={x:Static p:Resources.MapZoomNextImage}, Converter={StaticResource IconConverter}}" Click="ButtonMapZoomNext_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="ON"/>
+                <fluent:Button x:Name="ButtonMapChangeCoordinateSystem" Header="{x:Static p:Resources.Ribbon_Map_CoordinateSystem_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_CoordinateSystem_ToolTip}" Icon="{Binding Source={x:Static p:Resources.GlobePencil}, Converter={StaticResource IconConverter}}" Click="ButtonMapChangeCoordinateSystem_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="CC"/>
+                <fluent:ToggleButton x:Name="ButtonMapMeasure" Header="{x:Static p:Resources.Ribbon_Map_MeasureDistance_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_MeasureDistance_ToolTip}" Icon="{Binding Source={x:Static p:Resources.MeasureToolImage}, Converter={StaticResource IconConverter}}" Click="ButtonMapMeasure_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="TM"/>
+                <fluent:Button x:Name="ButtonExportMapAsImage" Header="{x:Static p:Resources.Ribbon_Map_ExportAsImage_Header}" ToolTip="{x:Static p:Resources.Ribbon_Map_ExportAsImage_ToolTip}" Icon="{Binding Source={x:Static p:Resources.ExportIcon}, Converter={StaticResource IconConverter}}" Click="ButtonExportMapAsImage_Click" SizeDefinition="Middle,Small,Small" fluent:KeyTip.Keys="TX"/>
             </fluent:RibbonGroupBox>
         </fluent:RibbonTabItem>
     </fluent:Ribbon>