diff --git a/mRemoteNG/Properties/Resources.Designer.cs b/mRemoteNG/Properties/Resources.Designer.cs
index d2bb26814..a047b0d3d 100644
--- a/mRemoteNG/Properties/Resources.Designer.cs
+++ b/mRemoteNG/Properties/Resources.Designer.cs
@@ -60,16 +60,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon ActiveDirectory_Icon {
-            get {
-                object obj = ResourceManager.GetObject("ActiveDirectory_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -101,12 +91,12 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Icon Appearance_Icon {
+        internal static System.Drawing.Bitmap AppearanceEditor_16x {
             get {
-                object obj = ResourceManager.GetObject("Appearance_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
+                object obj = ResourceManager.GetObject("AppearanceEditor_16x", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
             }
         }
         
@@ -150,26 +140,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon Comments_Icon {
-            get {
-                object obj = ResourceManager.GetObject("Comments_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon Config_Icon {
-            get {
-                object obj = ResourceManager.GetObject("Config_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -180,16 +150,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon ConnectionsSaveAs_Icon {
-            get {
-                object obj = ResourceManager.GetObject("ConnectionsSaveAs_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -210,16 +170,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon Database_Icon {
-            get {
-                object obj = ResourceManager.GetObject("Database_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -250,26 +200,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon EditPage_Icon {
-            get {
-                object obj = ResourceManager.GetObject("EditPage_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon Error_Icon {
-            get {
-                object obj = ResourceManager.GetObject("Error_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -291,12 +221,12 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Icon ExtApp_Icon {
+        internal static System.Drawing.Bitmap Export_16x {
             get {
-                object obj = ResourceManager.GetObject("ExtApp_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
+                object obj = ResourceManager.GetObject("Export_16x", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
             }
         }
         
@@ -390,16 +320,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon Help_Icon {
-            get {
-                object obj = ResourceManager.GetObject("Help_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -430,16 +350,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon Info_Icon {
-            get {
-                object obj = ResourceManager.GetObject("Info_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -451,22 +361,12 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Icon Key_Icon {
+        internal static System.Drawing.Bitmap Key_16x {
             get {
-                object obj = ResourceManager.GetObject("Key_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon Keyboard_Icon {
-            get {
-                object obj = ResourceManager.GetObject("Keyboard_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
+                object obj = ResourceManager.GetObject("Key_16x", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
             }
         }
         
@@ -480,6 +380,16 @@ namespace mRemoteNG.Properties {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Lock_16x {
+            get {
+                object obj = ResourceManager.GetObject("Lock_16x", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -556,16 +466,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon News_Icon {
-            get {
-                object obj = ResourceManager.GetObject("News_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -576,16 +476,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon Options_Icon {
-            get {
-                object obj = ResourceManager.GetObject("Options_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -596,36 +486,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon Panels_Icon {
-            get {
-                object obj = ResourceManager.GetObject("Panels_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon PortScan_Icon {
-            get {
-                object obj = ResourceManager.GetObject("PortScan_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon PowerShell {
-            get {
-                object obj = ResourceManager.GetObject("PowerShell", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -686,16 +546,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon Root_Icon {
-            get {
-                object obj = ResourceManager.GetObject("Root_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -726,16 +576,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon Save_Icon {
-            get {
-                object obj = ResourceManager.GetObject("Save_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -776,16 +616,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon Sessions_Icon {
-            get {
-                object obj = ResourceManager.GetObject("Sessions_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -796,16 +626,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon Shield_Icon {
-            get {
-                object obj = ResourceManager.GetObject("Shield_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -827,22 +647,22 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Icon SSHTransfer_Icon {
+        internal static System.Drawing.Bitmap SQLDatabase_16x {
             get {
-                object obj = ResourceManager.GetObject("SSHTransfer_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
+                object obj = ResourceManager.GetObject("SQLDatabase_16x", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
             }
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Icon StartupExit_Icon {
+        internal static System.Drawing.Bitmap StartupProject_16x {
             get {
-                object obj = ResourceManager.GetObject("StartupExit_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
+                object obj = ResourceManager.GetObject("StartupProject_16x", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
             }
         }
         
@@ -877,12 +697,12 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Icon Tab_Icon {
+        internal static System.Drawing.Bitmap Tab_16x {
             get {
-                object obj = ResourceManager.GetObject("Tab_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
+                object obj = ResourceManager.GetObject("Tab_16x", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
             }
         }
         
@@ -926,26 +746,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon Update_Icon {
-            get {
-                object obj = ResourceManager.GetObject("Update_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
-        /// </summary>
-        internal static System.Drawing.Icon UVNC_SC_Icon {
-            get {
-                object obj = ResourceManager.GetObject("UVNC_SC_Icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
diff --git a/mRemoteNG/Properties/Resources.resx b/mRemoteNG/Properties/Resources.resx
index 9437ea153..14830220e 100644
--- a/mRemoteNG/Properties/Resources.resx
+++ b/mRemoteNG/Properties/Resources.resx
@@ -130,90 +130,6 @@
   <data name="VisualElements_70" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Tiles\VisualElements_70.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ActiveDirectory_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\ActiveDirectory_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Appearance_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\Appearance_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Comments_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\Comments_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Config_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\Config_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ConnectionsSaveAs_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\ConnectionsSaveAs_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Database_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\Database_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="EditPage_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\EditPage_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Error_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\Error_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ExtApp_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\ExtApp_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Help_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\Help_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Info_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\Info_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Keyboard_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\Keyboard_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Key_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\Key_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="mRemoteNG_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\mRemoteNG_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="News_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\News_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Options_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\Options_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Panels_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\Panels_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="PortScan_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\PortScan_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Root_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\Root_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Save_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\Save_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Sessions_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\Sessions_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Shield_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\Shield_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="SSHTransfer_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\SSHTransfer_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="StartupExit_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\StartupExit_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Tab_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\Tab_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Update_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\Update_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="UVNC_SC_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\UVNC_SC_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="PowerShell" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Icons\PowerShell.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Loading_Spinner" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Loading_Spinner.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -391,4 +307,28 @@
   <data name="ViewDownBySchema_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ViewDownBySchema_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="mRemoteNG_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mRemoteNG_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Key_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Key_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SQLDatabase_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SQLDatabase_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Tab_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Tab_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="AppearanceEditor_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\AppearanceEditor_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Export_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Export_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Lock_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Lock_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="StartupProject_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\StartupProject_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/mRemoteNG/Resources/AppearanceEditor_16x.png b/mRemoteNG/Resources/AppearanceEditor_16x.png
new file mode 100644
index 000000000..86c59f7ff
Binary files /dev/null and b/mRemoteNG/Resources/AppearanceEditor_16x.png differ
diff --git a/mRemoteNG/Resources/Export_16x.png b/mRemoteNG/Resources/Export_16x.png
new file mode 100644
index 000000000..ace97e20f
Binary files /dev/null and b/mRemoteNG/Resources/Export_16x.png differ
diff --git a/mRemoteNG/Resources/Icons/ActiveDirectory_Icon.ico b/mRemoteNG/Resources/Icons/ActiveDirectory_Icon.ico
deleted file mode 100644
index 2c1b2b23e..000000000
Binary files a/mRemoteNG/Resources/Icons/ActiveDirectory_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/Appearance_Icon.ico b/mRemoteNG/Resources/Icons/Appearance_Icon.ico
deleted file mode 100644
index 4aea5a645..000000000
Binary files a/mRemoteNG/Resources/Icons/Appearance_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/Comments_Icon.ico b/mRemoteNG/Resources/Icons/Comments_Icon.ico
deleted file mode 100644
index bfa94ca15..000000000
Binary files a/mRemoteNG/Resources/Icons/Comments_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/Config_Icon.ico b/mRemoteNG/Resources/Icons/Config_Icon.ico
deleted file mode 100644
index 04736abcb..000000000
Binary files a/mRemoteNG/Resources/Icons/Config_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/ConnectionsSaveAs_Icon.ico b/mRemoteNG/Resources/Icons/ConnectionsSaveAs_Icon.ico
deleted file mode 100644
index 0cb5d8896..000000000
Binary files a/mRemoteNG/Resources/Icons/ConnectionsSaveAs_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/Database_Icon.ico b/mRemoteNG/Resources/Icons/Database_Icon.ico
deleted file mode 100644
index 9704872c8..000000000
Binary files a/mRemoteNG/Resources/Icons/Database_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/EditPage_Icon.ico b/mRemoteNG/Resources/Icons/EditPage_Icon.ico
deleted file mode 100644
index 99983485f..000000000
Binary files a/mRemoteNG/Resources/Icons/EditPage_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/Error_Icon.ico b/mRemoteNG/Resources/Icons/Error_Icon.ico
deleted file mode 100644
index 3c1460f46..000000000
Binary files a/mRemoteNG/Resources/Icons/Error_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/ExtApp_Icon.ico b/mRemoteNG/Resources/Icons/ExtApp_Icon.ico
deleted file mode 100644
index f8d9517b9..000000000
Binary files a/mRemoteNG/Resources/Icons/ExtApp_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/Help_Icon.ico b/mRemoteNG/Resources/Icons/Help_Icon.ico
deleted file mode 100644
index 48f3c5289..000000000
Binary files a/mRemoteNG/Resources/Icons/Help_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/Info_Icon.ico b/mRemoteNG/Resources/Icons/Info_Icon.ico
deleted file mode 100644
index 2728dd14c..000000000
Binary files a/mRemoteNG/Resources/Icons/Info_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/Key_Icon.ico b/mRemoteNG/Resources/Icons/Key_Icon.ico
deleted file mode 100644
index f1372678f..000000000
Binary files a/mRemoteNG/Resources/Icons/Key_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/Keyboard_Icon.ico b/mRemoteNG/Resources/Icons/Keyboard_Icon.ico
deleted file mode 100644
index cb4322d2f..000000000
Binary files a/mRemoteNG/Resources/Icons/Keyboard_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/News_Icon.ico b/mRemoteNG/Resources/Icons/News_Icon.ico
deleted file mode 100644
index e443efa28..000000000
Binary files a/mRemoteNG/Resources/Icons/News_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/Options_Icon.ico b/mRemoteNG/Resources/Icons/Options_Icon.ico
deleted file mode 100644
index 75ea960da..000000000
Binary files a/mRemoteNG/Resources/Icons/Options_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/Panels_Icon.ico b/mRemoteNG/Resources/Icons/Panels_Icon.ico
deleted file mode 100644
index d2e3a095b..000000000
Binary files a/mRemoteNG/Resources/Icons/Panels_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/PortScan_Icon.ico b/mRemoteNG/Resources/Icons/PortScan_Icon.ico
deleted file mode 100644
index 60f0200b9..000000000
Binary files a/mRemoteNG/Resources/Icons/PortScan_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/Root_Icon.ico b/mRemoteNG/Resources/Icons/Root_Icon.ico
deleted file mode 100644
index 95cc05e00..000000000
Binary files a/mRemoteNG/Resources/Icons/Root_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/SSHTransfer_Icon.ico b/mRemoteNG/Resources/Icons/SSHTransfer_Icon.ico
deleted file mode 100644
index 0d3f2527e..000000000
Binary files a/mRemoteNG/Resources/Icons/SSHTransfer_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/Save_Icon.ico b/mRemoteNG/Resources/Icons/Save_Icon.ico
deleted file mode 100644
index eb522217d..000000000
Binary files a/mRemoteNG/Resources/Icons/Save_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/Sessions_Icon.ico b/mRemoteNG/Resources/Icons/Sessions_Icon.ico
deleted file mode 100644
index 8b3d2c1ad..000000000
Binary files a/mRemoteNG/Resources/Icons/Sessions_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/Shield_Icon.ico b/mRemoteNG/Resources/Icons/Shield_Icon.ico
deleted file mode 100644
index cae34721c..000000000
Binary files a/mRemoteNG/Resources/Icons/Shield_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/StartupExit_Icon.ico b/mRemoteNG/Resources/Icons/StartupExit_Icon.ico
deleted file mode 100644
index 0f733a92d..000000000
Binary files a/mRemoteNG/Resources/Icons/StartupExit_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/Tab_Icon.ico b/mRemoteNG/Resources/Icons/Tab_Icon.ico
deleted file mode 100644
index 434212737..000000000
Binary files a/mRemoteNG/Resources/Icons/Tab_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/UVNC_SC_Icon.ico b/mRemoteNG/Resources/Icons/UVNC_SC_Icon.ico
deleted file mode 100644
index 393489755..000000000
Binary files a/mRemoteNG/Resources/Icons/UVNC_SC_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Icons/Update_Icon.ico b/mRemoteNG/Resources/Icons/Update_Icon.ico
deleted file mode 100644
index 57ea6cc8a..000000000
Binary files a/mRemoteNG/Resources/Icons/Update_Icon.ico and /dev/null differ
diff --git a/mRemoteNG/Resources/Key_16x.png b/mRemoteNG/Resources/Key_16x.png
new file mode 100644
index 000000000..258480fa2
Binary files /dev/null and b/mRemoteNG/Resources/Key_16x.png differ
diff --git a/mRemoteNG/Resources/Lock_16x.png b/mRemoteNG/Resources/Lock_16x.png
new file mode 100644
index 000000000..f41aeeb4c
Binary files /dev/null and b/mRemoteNG/Resources/Lock_16x.png differ
diff --git a/mRemoteNG/Resources/SQLDatabase_16x.png b/mRemoteNG/Resources/SQLDatabase_16x.png
new file mode 100644
index 000000000..7bc21aaa0
Binary files /dev/null and b/mRemoteNG/Resources/SQLDatabase_16x.png differ
diff --git a/mRemoteNG/Resources/StartupProject_16x.png b/mRemoteNG/Resources/StartupProject_16x.png
new file mode 100644
index 000000000..6791f811e
Binary files /dev/null and b/mRemoteNG/Resources/StartupProject_16x.png differ
diff --git a/mRemoteNG/Resources/Tab_16x.png b/mRemoteNG/Resources/Tab_16x.png
new file mode 100644
index 000000000..7d9d55292
Binary files /dev/null and b/mRemoteNG/Resources/Tab_16x.png differ
diff --git a/mRemoteNG/Resources/Icons/mRemoteNG_Icon.ico b/mRemoteNG/Resources/mRemoteNG_Icon.ico
similarity index 100%
rename from mRemoteNG/Resources/Icons/mRemoteNG_Icon.ico
rename to mRemoteNG/Resources/mRemoteNG_Icon.ico
diff --git a/mRemoteNG/UI/Forms/FrmExport.Designer.cs b/mRemoteNG/UI/Forms/FrmExport.Designer.cs
index d6d81caee..5951ff366 100644
--- a/mRemoteNG/UI/Forms/FrmExport.Designer.cs
+++ b/mRemoteNG/UI/Forms/FrmExport.Designer.cs
@@ -295,7 +295,6 @@ namespace mRemoteNG.UI.Forms
             this.Controls.Add(this.btnOK);
             this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.Icon = global::mRemoteNG.Properties.Resources.ConnectionsSaveAs_Icon;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "ExportForm";
diff --git a/mRemoteNG/UI/Forms/FrmExport.cs b/mRemoteNG/UI/Forms/FrmExport.cs
index 7a7d003ba..4078ec414 100644
--- a/mRemoteNG/UI/Forms/FrmExport.cs
+++ b/mRemoteNG/UI/Forms/FrmExport.cs
@@ -131,6 +131,7 @@ namespace mRemoteNG.UI.Forms
         public FrmExport()
         {
             InitializeComponent();
+            Icon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Export_16x);
             FontOverrider.FontOverride(this);
             SelectedFolder = null;
             SelectedConnection = null;
diff --git a/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.cs b/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.cs
index 6a4698302..7c6ad3185 100644
--- a/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.cs
+++ b/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.cs
@@ -17,7 +17,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
         {
             InitializeComponent();
             ApplyTheme();
-            PageIcon = Properties.Resources.Config_Icon;
+            PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Settings_16x);
             var display = new DisplayProperties();
             var img = display.ScaleImage(Properties.Resources.PuttyConfig);
             btnLaunchPutty.Image = img;
diff --git a/mRemoteNG/UI/Forms/OptionsPages/AppearancePage.cs b/mRemoteNG/UI/Forms/OptionsPages/AppearancePage.cs
index 7077288c2..b53894f43 100644
--- a/mRemoteNG/UI/Forms/OptionsPages/AppearancePage.cs
+++ b/mRemoteNG/UI/Forms/OptionsPages/AppearancePage.cs
@@ -13,7 +13,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
         {
             InitializeComponent();
             ApplyTheme();
-            PageIcon = Properties.Resources.Panels_Icon;
+            PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Panel_16x);
         }
 
         public override string PageName
diff --git a/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.cs
index f4d306dee..2df46cbe4 100644
--- a/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.cs
+++ b/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.cs
@@ -13,7 +13,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
         {
             InitializeComponent();
             ApplyTheme();
-            PageIcon = Properties.Resources.Root_Icon;
+            PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.ASPWebSite_16x);
         }
 
         public override string PageName
diff --git a/mRemoteNG/UI/Forms/OptionsPages/CredentialsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/CredentialsPage.cs
index 29ffa06fa..aed561c7a 100644
--- a/mRemoteNG/UI/Forms/OptionsPages/CredentialsPage.cs
+++ b/mRemoteNG/UI/Forms/OptionsPages/CredentialsPage.cs
@@ -12,7 +12,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
         {
             InitializeComponent();
             ApplyTheme();
-            PageIcon = Properties.Resources.Key_Icon;
+            PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Key_16x);
         }
 
         public override string PageName
diff --git a/mRemoteNG/UI/Forms/OptionsPages/NotificationsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/NotificationsPage.cs
index aad68bf63..c3bcdb6bd 100644
--- a/mRemoteNG/UI/Forms/OptionsPages/NotificationsPage.cs
+++ b/mRemoteNG/UI/Forms/OptionsPages/NotificationsPage.cs
@@ -13,7 +13,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
         {
             InitializeComponent();
             ApplyTheme();
-            PageIcon = Properties.Resources.Error_Icon;
+            PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.LogError_16x);
         }
 
         public override string PageName
diff --git a/mRemoteNG/UI/Forms/OptionsPages/SecurityPage.cs b/mRemoteNG/UI/Forms/OptionsPages/SecurityPage.cs
index bb59d2511..86d35f783 100644
--- a/mRemoteNG/UI/Forms/OptionsPages/SecurityPage.cs
+++ b/mRemoteNG/UI/Forms/OptionsPages/SecurityPage.cs
@@ -20,7 +20,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
             PopulateEncryptionEngineDropDown();
             PopulateBlockCipherDropDown();
             ApplyTheme();
-            PageIcon = Properties.Resources.Shield_Icon;
+            PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Lock_16x);
         }
 
         [Browsable(false)]
diff --git a/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs b/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs
index 4fee78752..b21657ae8 100644
--- a/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs
+++ b/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs
@@ -16,7 +16,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
         {
             InitializeComponent();
             ApplyTheme();
-            PageIcon = Properties.Resources.Database_Icon;
+            PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.SQLDatabase_16x);
             _databaseConnectionTester = new DatabaseConnectionTester();
         }
 
diff --git a/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs b/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs
index 90352c578..71c76bc52 100644
--- a/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs
+++ b/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs
@@ -10,7 +10,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
         {
             InitializeComponent();
             ApplyTheme();
-            PageIcon = Properties.Resources.StartupExit_Icon;
+            PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.StartupProject_16x);
         }
 
         public override string PageName
diff --git a/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs
index 14440ffb8..c89997945 100644
--- a/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs
+++ b/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs
@@ -1,4 +1,4 @@
-using mRemoteNG.Properties;
+using mRemoteNG.Properties;
 using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.UI.Forms.OptionsPages
@@ -9,7 +9,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
         {
             InitializeComponent();
             ApplyTheme();
-            PageIcon = Properties.Resources.Tab_Icon;
+            PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Tab_16x);
         }
 
         public override string PageName
diff --git a/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs b/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs
index 8bb02aed1..edb7a4aca 100644
--- a/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs
+++ b/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs
@@ -23,7 +23,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
         public ThemePage()
         {
             InitializeComponent();
-            PageIcon = Properties.Resources.Appearance_Icon;
+            PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.AppearanceEditor_16x);
             _themeManager = ThemeManager.getInstance();
             if (!_themeManager.ThemingActive) return;
             _themeManager = ThemeManager.getInstance();
diff --git a/mRemoteNG/UI/Forms/OptionsPages/UpdatesPage.cs b/mRemoteNG/UI/Forms/OptionsPages/UpdatesPage.cs
index e9a852948..50c283925 100644
--- a/mRemoteNG/UI/Forms/OptionsPages/UpdatesPage.cs
+++ b/mRemoteNG/UI/Forms/OptionsPages/UpdatesPage.cs
@@ -24,7 +24,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
         {
             InitializeComponent();
             ApplyTheme();
-            PageIcon = Properties.Resources.Update_Icon;
+            PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.RunUpdate_16x);
         }
 
         #region Public Methods
diff --git a/mRemoteNG/UI/Forms/frmChoosePanel.Designer.cs b/mRemoteNG/UI/Forms/frmChoosePanel.Designer.cs
index 161d00950..e21cfe3d0 100644
--- a/mRemoteNG/UI/Forms/frmChoosePanel.Designer.cs
+++ b/mRemoteNG/UI/Forms/frmChoosePanel.Designer.cs
@@ -92,7 +92,6 @@ namespace mRemoteNG.UI.Forms
             this.Controls.Add(this.cbPanels);
             this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-            this.Icon = global::mRemoteNG.Properties.Resources.Panels_Icon;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "FrmChoosePanel";
diff --git a/mRemoteNG/UI/Forms/frmChoosePanel.cs b/mRemoteNG/UI/Forms/frmChoosePanel.cs
index 8b69c86aa..c8c119820 100644
--- a/mRemoteNG/UI/Forms/frmChoosePanel.cs
+++ b/mRemoteNG/UI/Forms/frmChoosePanel.cs
@@ -13,6 +13,7 @@ namespace mRemoteNG.UI.Forms
         public FrmChoosePanel()
         {
             InitializeComponent();
+            Icon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Panel_16x);
             _panelAdder = new PanelAdder();
         }
 
diff --git a/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.Designer.cs b/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.Designer.cs
index b78fa638a..9f18cdafc 100644
--- a/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.Designer.cs
+++ b/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.Designer.cs
@@ -116,7 +116,6 @@ namespace mRemoteNG.UI.Window
             this.Controls.Add(this.btnChangeDomain);
             this.Controls.Add(this.btnImport);
             this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Icon = global::mRemoteNG.Properties.Resources.ActiveDirectory_Icon;
             this.Name = "ActiveDirectoryImportWindow";
             this.TabText = "Active Directory Import";
             this.Text = "Active Directory Import";
diff --git a/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.cs b/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.cs
index 95a2dfc7d..6273c19cd 100644
--- a/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.cs
+++ b/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.cs
@@ -17,6 +17,7 @@ namespace mRemoteNG.UI.Window
         {
             WindowType = WindowType.ActiveDirectoryImport;
             DockPnl = new DockContent();
+            Icon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Schema_16x);
             InitializeComponent();
             FontOverrider.FontOverride(this);
             ApplyTheme();
diff --git a/mRemoteNG/UI/Window/ConfigWindow.cs b/mRemoteNG/UI/Window/ConfigWindow.cs
index 0068706f9..803f95b25 100644
--- a/mRemoteNG/UI/Window/ConfigWindow.cs
+++ b/mRemoteNG/UI/Window/ConfigWindow.cs
@@ -195,7 +195,6 @@ namespace mRemoteNG.UI.Window
             Controls.Add(_pGrid);
             Font = new Font("Segoe UI", 8.25F, FontStyle.Regular, GraphicsUnit.Point, Convert.ToByte(0));
             HideOnClose = true;
-            Icon = Properties.Resources.Config_Icon;
             Name = "ConfigWindow";
             TabText = @"Config";
             Text = @"Config";
@@ -237,6 +236,7 @@ namespace mRemoteNG.UI.Window
         {
             WindowType = WindowType.Config;
             DockPnl = panel;
+            Icon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Settings_16x);
             InitializeComponent();
             ApplyLanguage();
         }
diff --git a/mRemoteNG/UI/Window/ConnectionTreeWindow.Designer.cs b/mRemoteNG/UI/Window/ConnectionTreeWindow.Designer.cs
index 9d2668bf6..b293ffb23 100644
--- a/mRemoteNG/UI/Window/ConnectionTreeWindow.Designer.cs
+++ b/mRemoteNG/UI/Window/ConnectionTreeWindow.Designer.cs
@@ -197,7 +197,6 @@ namespace mRemoteNG.UI.Window
             this.Controls.Add(this.msMain);
             this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.HideOnClose = true;
-            this.Icon = global::mRemoteNG.Properties.Resources.Root_Icon;
             this.Name = "ConnectionTreeWindow";
             this.TabText = "Connections";
             this.Text = "Connections";
diff --git a/mRemoteNG/UI/Window/ConnectionTreeWindow.cs b/mRemoteNG/UI/Window/ConnectionTreeWindow.cs
index b395b2f78..715e4ec00 100644
--- a/mRemoteNG/UI/Window/ConnectionTreeWindow.cs
+++ b/mRemoteNG/UI/Window/ConnectionTreeWindow.cs
@@ -40,6 +40,7 @@ namespace mRemoteNG.UI.Window
         {
             WindowType = WindowType.Tree;
             DockPnl = panel;
+            Icon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.ASPWebSite_16x);
             InitializeComponent();
             SetMenuEventHandlers();
             SetConnectionTreeEventHandlers();
diff --git a/mRemoteNG/UI/Window/ErrorAndInfoWindow.Designer.cs b/mRemoteNG/UI/Window/ErrorAndInfoWindow.Designer.cs
index 34768f8e9..b7359c952 100644
--- a/mRemoteNG/UI/Window/ErrorAndInfoWindow.Designer.cs
+++ b/mRemoteNG/UI/Window/ErrorAndInfoWindow.Designer.cs
@@ -151,7 +151,6 @@ namespace mRemoteNG.UI.Window
             this.Controls.Add(this.pnlErrorMsg);
             this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.HideOnClose = true;
-            this.Icon = global::mRemoteNG.Properties.Resources.Info_Icon;
             this.Name = "ErrorAndInfoWindow";
             this.TabText = global::mRemoteNG.Resources.Language.Language.Notifications;
             this.Text = "Notifications";
diff --git a/mRemoteNG/UI/Window/ErrorAndInfoWindow.cs b/mRemoteNG/UI/Window/ErrorAndInfoWindow.cs
index a6edf891c..d8ebc6420 100644
--- a/mRemoteNG/UI/Window/ErrorAndInfoWindow.cs
+++ b/mRemoteNG/UI/Window/ErrorAndInfoWindow.cs
@@ -30,6 +30,7 @@ namespace mRemoteNG.UI.Window
         {
             WindowType = WindowType.ErrorsAndInfos;
             DockPnl = panel;
+            Icon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.StatusInformation_16x);
             _display = new DisplayProperties();
             InitializeComponent();
             lblMsgDate.Width = _display.ScaleWidth(lblMsgDate.Width);
diff --git a/mRemoteNG/UI/Window/UltraVNCWindow.cs b/mRemoteNG/UI/Window/UltraVNCWindow.cs
index b847b51da..0f98f46f6 100644
--- a/mRemoteNG/UI/Window/UltraVNCWindow.cs
+++ b/mRemoteNG/UI/Window/UltraVNCWindow.cs
@@ -68,7 +68,6 @@ namespace mRemoteNG.UI.Window
             this.Controls.Add(this.tsMain);
             this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular,
                                                 System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Icon = global::mRemoteNG.Properties.Resources.UVNC_SC_Icon;
             this.Name = "UltraVNCWindow";
             this.TabText = "UltraVNC SC";
             this.Text = "UltraVNC SC";
diff --git a/mRemoteNG/UI/Window/UpdateWindow.Designer.cs b/mRemoteNG/UI/Window/UpdateWindow.Designer.cs
index 4cdf7dd2c..e19c49175 100644
--- a/mRemoteNG/UI/Window/UpdateWindow.Designer.cs
+++ b/mRemoteNG/UI/Window/UpdateWindow.Designer.cs
@@ -203,7 +203,6 @@ namespace mRemoteNG.UI.Window
             this.ClientSize = new System.Drawing.Size(734, 418);
             this.Controls.Add(this.tableLayoutPanel1);
             this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Icon = global::mRemoteNG.Properties.Resources.Update_Icon;
             this.Name = "UpdateWindow";
             this.TabText = "Update";
             this.Text = "Update";
diff --git a/mRemoteNG/UI/Window/UpdateWindow.cs b/mRemoteNG/UI/Window/UpdateWindow.cs
index 912efb41a..ac2f70108 100644
--- a/mRemoteNG/UI/Window/UpdateWindow.cs
+++ b/mRemoteNG/UI/Window/UpdateWindow.cs
@@ -29,6 +29,7 @@ namespace mRemoteNG.UI.Window
         {
             WindowType = WindowType.Update;
             DockPnl = panel;
+            Icon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.RunUpdate_16x);
             InitializeComponent();
             FontOverrider.FontOverride(this);
         }
diff --git a/mRemoteNG/mRemoteNG.csproj b/mRemoteNG/mRemoteNG.csproj
index b8135af76..679576841 100644
--- a/mRemoteNG/mRemoteNG.csproj
+++ b/mRemoteNG/mRemoteNG.csproj
@@ -19,7 +19,7 @@
     </UpgradeBackupLocation>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
-    <ApplicationIcon>Resources\Icons\mRemoteNG_Icon.ico</ApplicationIcon>
+    <ApplicationIcon>Resources\mRemoteNG_Icon.ico</ApplicationIcon>
     <OptionStrict>Off</OptionStrict>
     <ManifestCertificateThumbprint>B249710A6BB08171F8E75082CF2355AE2890911A</ManifestCertificateThumbprint>
     <ManifestKeyFile>mRemoteV1_TemporaryKey.pfx</ManifestKeyFile>
@@ -221,6 +221,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="Resources\ImageConverter.cs" />
     <Compile Include="Resources\Language\Language.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -1099,33 +1100,6 @@
     <None Include="Resources\Tiles\VisualElements_150.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Resources\Icons\Appearance_Icon.ico" />
-    <None Include="Resources\Icons\mRemoteNG_Icon.ico" />
-    <None Include="Resources\Icons\Comments_Icon.ico" />
-    <None Include="Resources\Icons\Config_Icon.ico" />
-    <None Include="Resources\Icons\Database_Icon.ico" />
-    <None Include="Resources\Icons\Error_Icon.ico" />
-    <None Include="Resources\Icons\ExtApp_Icon.ico" />
-    <None Include="Resources\Icons\Help_Icon.ico" />
-    <None Include="Resources\Icons\Key_Icon.ico" />
-    <None Include="Resources\Icons\Keyboard_Icon.ico" />
-    <None Include="Resources\Icons\News_Icon.ico" />
-    <None Include="Resources\Icons\Options_Icon.ico" />
-    <None Include="Resources\Icons\EditPage_Icon.ico" />
-    <None Include="Resources\Icons\Panels_Icon.ico" />
-    <None Include="Resources\Icons\PortScan_Icon.ico" />
-    <None Include="Resources\Icons\Save_Icon.ico" />
-    <None Include="Resources\Icons\Sessions_Icon.ico" />
-    <None Include="Resources\Icons\Shield_Icon.ico" />
-    <None Include="Resources\Icons\SSHTransfer_Icon.ico" />
-    <None Include="Resources\Icons\StartupExit_Icon.ico" />
-    <None Include="Resources\Icons\Tab_Icon.ico" />
-    <None Include="Resources\Icons\ActiveDirectory_Icon.ico" />
-    <None Include="Resources\Icons\Info_Icon.ico" />
-    <None Include="Resources\Icons\Root_Icon.ico" />
-    <None Include="Resources\Icons\ConnectionsSaveAs_Icon.ico" />
-    <None Include="Resources\Icons\Update_Icon.ico" />
-    <None Include="Resources\Icons\UVNC_SC_Icon.ico" />
     <Content Include="Icons\Infrastructure.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -1198,6 +1172,14 @@
     <None Include="Resources\StatusInformation_16x.png" />
     <None Include="Resources\LogWarning_16x.png" />
     <None Include="Resources\LogError_16x.png" />
+    <None Include="Resources\mRemoteNG_Icon.ico" />
+    <None Include="Resources\Tab_16x.png" />
+    <None Include="Resources\SQLDatabase_16x.png" />
+    <None Include="Resources\Key_16x.png" />
+    <None Include="Resources\StartupProject_16x.png" />
+    <None Include="Resources\AppearanceEditor_16x.png" />
+    <None Include="Resources\Lock_16x.png" />
+    <None Include="Resources\Export_16x.png" />
     <Content Include="Schemas\mremoteng_confcons_v2_6.xsd">
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>