Index: Core/Plugins/src/Core.Plugins.DotSpatial/Core.Plugins.DotSpatial.csproj
===================================================================
diff -u -ra76df67ff1bcdceeb8297286983072a14dd1229e -r42224239a0064ba76fe66a2df18db59cd9c5b04a
--- Core/Plugins/src/Core.Plugins.DotSpatial/Core.Plugins.DotSpatial.csproj	(.../Core.Plugins.DotSpatial.csproj)	(revision a76df67ff1bcdceeb8297286983072a14dd1229e)
+++ Core/Plugins/src/Core.Plugins.DotSpatial/Core.Plugins.DotSpatial.csproj	(.../Core.Plugins.DotSpatial.csproj)	(revision 42224239a0064ba76fe66a2df18db59cd9c5b04a)
@@ -32,73 +32,16 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DotSpatial.Controls, Version=1.7.0.0, Culture=neutral, PublicKeyToken=4d9e49339a7d240c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Controls.1.7\lib\net40-Client\DotSpatial.Controls.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Data, Version=1.7.0.0, Culture=neutral, PublicKeyToken=c29dbf30e059ca9d, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Data.1.7\lib\net40-Client\DotSpatial.Data.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Data.Forms, Version=1.7.0.0, Culture=neutral, PublicKeyToken=53ab5a198378d4c1, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Data.Forms.1.7\lib\net40-Client\DotSpatial.Data.Forms.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Extensions, Version=1.7.0.0, Culture=neutral, PublicKeyToken=4d9e49339a7d240c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Extensions.1.7\lib\net40-Client\DotSpatial.Extensions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Modeling.Forms, Version=1.7.0.0, Culture=neutral, PublicKeyToken=712bef29a31a9354, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Modeling.Forms.1.7\lib\net40-Client\DotSpatial.Modeling.Forms.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Mono, Version=1.7.0.0, Culture=neutral, PublicKeyToken=425ba4de41127026, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Mono.1.7\lib\net40-Client\DotSpatial.Mono.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Projections, Version=1.7.0.0, Culture=neutral, PublicKeyToken=272632bddd08a38b, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Projections.1.7\lib\net40-Client\DotSpatial.Projections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Projections.Forms, Version=1.7.0.0, Culture=neutral, PublicKeyToken=52099474f11b7ff0, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Projections.Forms.1.7\lib\net40-Client\DotSpatial.Projections.Forms.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Serialization, Version=1.7.0.0, Culture=neutral, PublicKeyToken=441f200f827611e7, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Serialization.1.7\lib\net40-Client\DotSpatial.Serialization.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Symbology, Version=1.7.0.0, Culture=neutral, PublicKeyToken=6178c08da7998387, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Symbology.1.7\lib\net40-Client\DotSpatial.Symbology.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Symbology.Forms, Version=1.7.0.0, Culture=neutral, PublicKeyToken=0544cdeefb662382, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Symbology.Forms.1.7\lib\net40-Client\DotSpatial.Symbology.Forms.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Topology, Version=1.7.0.0, Culture=neutral, PublicKeyToken=a66b5e9434ca3671, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Topology.1.7\lib\net40-Client\DotSpatial.Topology.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Fluent, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Fluent.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Windows.Shell, Version=3.5.41019.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Microsoft.Windows.Shell.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
@@ -163,7 +106,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Resources\document.png" />
+    <None Include="Resources\map.png" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Index: Core/Plugins/src/Core.Plugins.DotSpatial/MapRibbon.xaml
===================================================================
diff -u -ra29bbf84cad8d8e7d3aa12c8fe84d9cf4b3653f9 -r42224239a0064ba76fe66a2df18db59cd9c5b04a
--- Core/Plugins/src/Core.Plugins.DotSpatial/MapRibbon.xaml	(.../MapRibbon.xaml)	(revision a29bbf84cad8d8e7d3aa12c8fe84d9cf4b3653f9)
+++ Core/Plugins/src/Core.Plugins.DotSpatial/MapRibbon.xaml	(.../MapRibbon.xaml)	(revision 42224239a0064ba76fe66a2df18db59cd9c5b04a)
@@ -15,7 +15,7 @@
         
         <fluent:RibbonTabItem Header="{x:Static p:Resources.Ribbon_Demo_Header}" fluent:KeyTip.Keys="F">
             <fluent:RibbonGroupBox Header="{x:Static p:Resources.General_Map}" fluent:KeyTip.Keys="M">
-                <fluent:Button Name="OpenMapViewButton" Header="{x:Static p:Resources.General_Map}" ToolTip="{x:Static p:Resources.OpenMapView_ToolTip}" LargeIcon="{Binding Source={x:Static p:Resources.DocumentIcon}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="ButtonOpenMapView_Click"/>  
+                <fluent:Button Name="OpenMapViewButton" Header="{x:Static p:Resources.General_Map}" ToolTip="{x:Static p:Resources.OpenMapView_ToolTip}" LargeIcon="{Binding Source={x:Static p:Resources.map}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="ButtonOpenMapView_Click"/>  
             </fluent:RibbonGroupBox>
         </fluent:RibbonTabItem>
         
Index: Core/Plugins/src/Core.Plugins.DotSpatial/Properties/Resources.Designer.cs
===================================================================
diff -u -ra29bbf84cad8d8e7d3aa12c8fe84d9cf4b3653f9 -r42224239a0064ba76fe66a2df18db59cd9c5b04a
--- Core/Plugins/src/Core.Plugins.DotSpatial/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision a29bbf84cad8d8e7d3aa12c8fe84d9cf4b3653f9)
+++ Core/Plugins/src/Core.Plugins.DotSpatial/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 42224239a0064ba76fe66a2df18db59cd9c5b04a)
@@ -61,21 +61,21 @@
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Looks up a localized string similar to Kaart.
         /// </summary>
-        public static System.Drawing.Bitmap DocumentIcon {
+        public static string General_Map {
             get {
-                object obj = ResourceManager.GetObject("DocumentIcon", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
+                return ResourceManager.GetString("General_Map", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Kaart.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        public static string General_Map {
+        public static System.Drawing.Bitmap map {
             get {
-                return ResourceManager.GetString("General_Map", resourceCulture);
+                object obj = ResourceManager.GetObject("map", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
             }
         }
         
Index: Core/Plugins/src/Core.Plugins.DotSpatial/Properties/Resources.resx
===================================================================
diff -u -ra29bbf84cad8d8e7d3aa12c8fe84d9cf4b3653f9 -r42224239a0064ba76fe66a2df18db59cd9c5b04a
--- Core/Plugins/src/Core.Plugins.DotSpatial/Properties/Resources.resx	(.../Resources.resx)	(revision a29bbf84cad8d8e7d3aa12c8fe84d9cf4b3653f9)
+++ Core/Plugins/src/Core.Plugins.DotSpatial/Properties/Resources.resx	(.../Resources.resx)	(revision 42224239a0064ba76fe66a2df18db59cd9c5b04a)
@@ -117,13 +117,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="DocumentIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\document.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="General_Map" xml:space="preserve">
     <value>Kaart</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="map" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\map.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="OpenMapView_ToolTip" xml:space="preserve">
     <value>Open een documentvenster met een kaart.</value>
   </data>
Index: Core/Plugins/src/Core.Plugins.DotSpatial/Resources/document.png
===================================================================
diff -u -ra29bbf84cad8d8e7d3aa12c8fe84d9cf4b3653f9 -r42224239a0064ba76fe66a2df18db59cd9c5b04a
Binary files differ
Index: Core/Plugins/src/Core.Plugins.DotSpatial/Resources/map.png
===================================================================
diff -u
Binary files differ