diff --git a/mRemoteNG/Properties/Resources.Designer.cs b/mRemoteNG/Properties/Resources.Designer.cs
index 269528cc..d2bb2681 100644
--- a/mRemoteNG/Properties/Resources.Designer.cs
+++ b/mRemoteNG/Properties/Resources.Designer.cs
@@ -120,16 +120,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Bad_Symbol {
-            get {
-                object obj = ResourceManager.GetObject("Bad_Symbol", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -190,16 +180,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Connection_Duplicate {
-            get {
-                object obj = ResourceManager.GetObject("Connection_Duplicate", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
         /// </summary>
@@ -280,16 +260,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Error {
-            get {
-                object obj = ResourceManager.GetObject("Error", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
         /// </summary>
@@ -300,26 +270,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap ErrorsAndInfos {
-            get {
-                object obj = ResourceManager.GetObject("ErrorsAndInfos", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap ErrorSmall {
-            get {
-                object obj = ResourceManager.GetObject("ErrorSmall", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -430,16 +380,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Good_Symbol {
-            get {
-                object obj = ResourceManager.GetObject("Good_Symbol", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -500,46 +440,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Information {
-            get {
-                object obj = ResourceManager.GetObject("Information", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap InformationSmall {
-            get {
-                object obj = ResourceManager.GetObject("InformationSmall", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Inheritance {
-            get {
-                object obj = ResourceManager.GetObject("Inheritance", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Inheritance_Default {
-            get {
-                object obj = ResourceManager.GetObject("Inheritance_Default", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -550,16 +450,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Key_Delete {
-            get {
-                object obj = ResourceManager.GetObject("Key_Delete", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
         /// </summary>
@@ -590,6 +480,26 @@ namespace mRemoteNG.Properties {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap LogError_16x {
+            get {
+                object obj = ResourceManager.GetObject("LogError_16x", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap LogWarning_16x {
+            get {
+                object obj = ResourceManager.GetObject("LogWarning_16x", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -646,16 +556,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap News {
-            get {
-                object obj = ResourceManager.GetObject("News", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
         /// </summary>
@@ -686,26 +586,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Page {
-            get {
-                object obj = ResourceManager.GetObject("Page", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Page_Copy {
-            get {
-                object obj = ResourceManager.GetObject("Page_Copy", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -716,16 +596,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Panel_Close {
-            get {
-                object obj = ResourceManager.GetObject("Panel_Close", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
         /// </summary>
@@ -756,36 +626,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Properties {
-            get {
-                object obj = ResourceManager.GetObject("Properties", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Properties_Default {
-            get {
-                object obj = ResourceManager.GetObject("Properties_Default", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap PropertiesDefault {
-            get {
-                object obj = ResourceManager.GetObject("PropertiesDefault", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -899,9 +739,19 @@ namespace mRemoteNG.Properties {
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap SchemaCompare_16x {
+        internal static System.Drawing.Bitmap Schema_16x {
             get {
-                object obj = ResourceManager.GetObject("SchemaCompare_16x", resourceCulture);
+                object obj = ResourceManager.GetObject("Schema_16x", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap SchemaObjectProperty_16x {
+            get {
+                object obj = ResourceManager.GetObject("SchemaObjectProperty_16x", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -926,16 +776,6 @@ namespace mRemoteNG.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Sessions {
-            get {
-                object obj = ResourceManager.GetObject("Sessions", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
         /// </summary>
@@ -1006,6 +846,16 @@ namespace mRemoteNG.Properties {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap StatusInformation_16x {
+            get {
+                object obj = ResourceManager.GetObject("StatusInformation_16x", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
@@ -1019,29 +869,9 @@ namespace mRemoteNG.Properties {
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap tab_add {
+        internal static System.Drawing.Bitmap SyncArrow_16x {
             get {
-                object obj = ResourceManager.GetObject("tab_add", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap tab_delete {
-            get {
-                object obj = ResourceManager.GetObject("tab_delete", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap tab_edit {
-            get {
-                object obj = ResourceManager.GetObject("tab_edit", resourceCulture);
+                object obj = ResourceManager.GetObject("SyncArrow_16x", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -1086,6 +916,16 @@ namespace mRemoteNG.Properties {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap UniqueKeyError_16x {
+            get {
+                object obj = ResourceManager.GetObject("UniqueKeyError_16x", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
         /// </summary>
@@ -1109,9 +949,9 @@ namespace mRemoteNG.Properties {
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap View {
+        internal static System.Drawing.Bitmap ViewDownBySchema_16x {
             get {
-                object obj = ResourceManager.GetObject("View", resourceCulture);
+                object obj = ResourceManager.GetObject("ViewDownBySchema_16x", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -1135,25 +975,5 @@ namespace mRemoteNG.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Warning {
-            get {
-                object obj = ResourceManager.GetObject("Warning", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap WarningSmall {
-            get {
-                object obj = ResourceManager.GetObject("WarningSmall", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
     }
 }
diff --git a/mRemoteNG/Properties/Resources.resx b/mRemoteNG/Properties/Resources.resx
index 630826af..9437ea15 100644
--- a/mRemoteNG/Properties/Resources.resx
+++ b/mRemoteNG/Properties/Resources.resx
@@ -118,60 +118,6 @@
     <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="ErrorSmall" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\ErrorSmall.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Information" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\Information.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="InformationSmall" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\InformationSmall.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Warning" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\Warning.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ErrorsAndInfos" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\ErrorsAndInfos.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Inheritance" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\Inheritance.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Panel_Close" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\Panel_Close.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="View" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\View.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="WarningSmall" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\WarningSmall.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Connection_Duplicate" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\Connection_Duplicate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Page" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\Page.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\Properties.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Properties_Default" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\Properties_Default.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Sessions" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\Sessions.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Inheritance_Default" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\Inheritance_Default.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Bad_Symbol" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\Bad_Symbol.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Good_Symbol" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\Good_Symbol.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="News" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\News.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="ConnectedOverlay" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ConnectedOverlay.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -265,33 +211,12 @@
   <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="tab_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\tab_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="tab_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\tab_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="tab_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\tab_edit.png;System.Drawing.Bitmap, 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="Error" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\Error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="PropertiesDefault" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\PropertiesDefault.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Key_Delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\Key_Delete.png;System.Drawing.Bitmap, 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>
-  <data name="Page_Copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\Page_Copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="AddFolder_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\AddFolder_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -412,9 +337,6 @@
   <data name="Console_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Console_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="SchemaCompare_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\SchemaCompare_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="SearchAndApps_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\SearchAndApps_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -445,4 +367,28 @@
   <data name="Resize_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Resize_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="LogError_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\LogError_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="LogWarning_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\LogWarning_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SchemaObjectProperty_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SchemaObjectProperty_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Schema_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Schema_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="StatusInformation_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\StatusInformation_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SyncArrow_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SyncArrow_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="UniqueKeyError_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\UniqueKeyError_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <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>
 </root>
\ No newline at end of file
diff --git a/mRemoteNG/Resources/Images/Bad_Symbol.png b/mRemoteNG/Resources/Images/Bad_Symbol.png
deleted file mode 100644
index ca97ab75..00000000
Binary files a/mRemoteNG/Resources/Images/Bad_Symbol.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/Connection_Duplicate.png b/mRemoteNG/Resources/Images/Connection_Duplicate.png
deleted file mode 100644
index 02649ab6..00000000
Binary files a/mRemoteNG/Resources/Images/Connection_Duplicate.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/Error.png b/mRemoteNG/Resources/Images/Error.png
deleted file mode 100644
index 9d9737af..00000000
Binary files a/mRemoteNG/Resources/Images/Error.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/ErrorSmall.png b/mRemoteNG/Resources/Images/ErrorSmall.png
deleted file mode 100644
index ed633b43..00000000
Binary files a/mRemoteNG/Resources/Images/ErrorSmall.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/ErrorsAndInfos.png b/mRemoteNG/Resources/Images/ErrorsAndInfos.png
deleted file mode 100644
index e623ba28..00000000
Binary files a/mRemoteNG/Resources/Images/ErrorsAndInfos.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/Good_Symbol.png b/mRemoteNG/Resources/Images/Good_Symbol.png
deleted file mode 100644
index 22af10bf..00000000
Binary files a/mRemoteNG/Resources/Images/Good_Symbol.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/Information.png b/mRemoteNG/Resources/Images/Information.png
deleted file mode 100644
index 705d27d4..00000000
Binary files a/mRemoteNG/Resources/Images/Information.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/InformationSmall.png b/mRemoteNG/Resources/Images/InformationSmall.png
deleted file mode 100644
index c8235849..00000000
Binary files a/mRemoteNG/Resources/Images/InformationSmall.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/Inheritance.png b/mRemoteNG/Resources/Images/Inheritance.png
deleted file mode 100644
index c32d25c1..00000000
Binary files a/mRemoteNG/Resources/Images/Inheritance.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/Inheritance_Default.png b/mRemoteNG/Resources/Images/Inheritance_Default.png
deleted file mode 100644
index eae300fd..00000000
Binary files a/mRemoteNG/Resources/Images/Inheritance_Default.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/News.png b/mRemoteNG/Resources/Images/News.png
deleted file mode 100644
index 356c3b86..00000000
Binary files a/mRemoteNG/Resources/Images/News.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/Page.png b/mRemoteNG/Resources/Images/Page.png
deleted file mode 100644
index 813f712f..00000000
Binary files a/mRemoteNG/Resources/Images/Page.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/Panel_Close.png b/mRemoteNG/Resources/Images/Panel_Close.png
deleted file mode 100644
index 4bd45f13..00000000
Binary files a/mRemoteNG/Resources/Images/Panel_Close.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/Properties.png b/mRemoteNG/Resources/Images/Properties.png
deleted file mode 100644
index abcd9368..00000000
Binary files a/mRemoteNG/Resources/Images/Properties.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/PropertiesDefault.png b/mRemoteNG/Resources/Images/PropertiesDefault.png
deleted file mode 100644
index 03dca178..00000000
Binary files a/mRemoteNG/Resources/Images/PropertiesDefault.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/Properties_Default.png b/mRemoteNG/Resources/Images/Properties_Default.png
deleted file mode 100644
index 2a3e5c4d..00000000
Binary files a/mRemoteNG/Resources/Images/Properties_Default.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/Sessions.png b/mRemoteNG/Resources/Images/Sessions.png
deleted file mode 100644
index c1a52a52..00000000
Binary files a/mRemoteNG/Resources/Images/Sessions.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/View.png b/mRemoteNG/Resources/Images/View.png
deleted file mode 100644
index 00818f63..00000000
Binary files a/mRemoteNG/Resources/Images/View.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/Warning.png b/mRemoteNG/Resources/Images/Warning.png
deleted file mode 100644
index 3390da3e..00000000
Binary files a/mRemoteNG/Resources/Images/Warning.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/WarningSmall.png b/mRemoteNG/Resources/Images/WarningSmall.png
deleted file mode 100644
index 87419a6c..00000000
Binary files a/mRemoteNG/Resources/Images/WarningSmall.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/key_delete.png b/mRemoteNG/Resources/Images/key_delete.png
deleted file mode 100644
index 00dec80d..00000000
Binary files a/mRemoteNG/Resources/Images/key_delete.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/page_copy.png b/mRemoteNG/Resources/Images/page_copy.png
deleted file mode 100644
index 195dc6d6..00000000
Binary files a/mRemoteNG/Resources/Images/page_copy.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/tab_add.png b/mRemoteNG/Resources/Images/tab_add.png
deleted file mode 100644
index d3b99364..00000000
Binary files a/mRemoteNG/Resources/Images/tab_add.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/tab_delete.png b/mRemoteNG/Resources/Images/tab_delete.png
deleted file mode 100644
index 100da2f1..00000000
Binary files a/mRemoteNG/Resources/Images/tab_delete.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/tab_edit.png b/mRemoteNG/Resources/Images/tab_edit.png
deleted file mode 100644
index 4c09c0fd..00000000
Binary files a/mRemoteNG/Resources/Images/tab_edit.png and /dev/null differ
diff --git a/mRemoteNG/Resources/LogError_16x.png b/mRemoteNG/Resources/LogError_16x.png
new file mode 100644
index 00000000..907f1f61
Binary files /dev/null and b/mRemoteNG/Resources/LogError_16x.png differ
diff --git a/mRemoteNG/Resources/LogWarning_16x.png b/mRemoteNG/Resources/LogWarning_16x.png
new file mode 100644
index 00000000..c857c19d
Binary files /dev/null and b/mRemoteNG/Resources/LogWarning_16x.png differ
diff --git a/mRemoteNG/Resources/SchemaCompare_16x.png b/mRemoteNG/Resources/SchemaCompare_16x.png
deleted file mode 100644
index a4d2a859..00000000
Binary files a/mRemoteNG/Resources/SchemaCompare_16x.png and /dev/null differ
diff --git a/mRemoteNG/Resources/SchemaObjectProperty_16x.png b/mRemoteNG/Resources/SchemaObjectProperty_16x.png
new file mode 100644
index 00000000..0cdd20ca
Binary files /dev/null and b/mRemoteNG/Resources/SchemaObjectProperty_16x.png differ
diff --git a/mRemoteNG/Resources/Schema_16x.png b/mRemoteNG/Resources/Schema_16x.png
new file mode 100644
index 00000000..bbfc742b
Binary files /dev/null and b/mRemoteNG/Resources/Schema_16x.png differ
diff --git a/mRemoteNG/Resources/StatusInformation_16x.png b/mRemoteNG/Resources/StatusInformation_16x.png
new file mode 100644
index 00000000..3acae84a
Binary files /dev/null and b/mRemoteNG/Resources/StatusInformation_16x.png differ
diff --git a/mRemoteNG/Resources/SyncArrow_16x.png b/mRemoteNG/Resources/SyncArrow_16x.png
new file mode 100644
index 00000000..556402ca
Binary files /dev/null and b/mRemoteNG/Resources/SyncArrow_16x.png differ
diff --git a/mRemoteNG/Resources/UniqueKeyError_16x.png b/mRemoteNG/Resources/UniqueKeyError_16x.png
new file mode 100644
index 00000000..4fab4c31
Binary files /dev/null and b/mRemoteNG/Resources/UniqueKeyError_16x.png differ
diff --git a/mRemoteNG/Resources/ViewDownBySchema_16x.png b/mRemoteNG/Resources/ViewDownBySchema_16x.png
new file mode 100644
index 00000000..c468fc8b
Binary files /dev/null and b/mRemoteNG/Resources/ViewDownBySchema_16x.png differ
diff --git a/mRemoteNG/UI/Controls/ConnectionContextMenu.cs b/mRemoteNG/UI/Controls/ConnectionContextMenu.cs
index 74b83907..53c3ad17 100644
--- a/mRemoteNG/UI/Controls/ConnectionContextMenu.cs
+++ b/mRemoteNG/UI/Controls/ConnectionContextMenu.cs
@@ -194,7 +194,7 @@ namespace mRemoteNG.UI.Controls
             // 
             // cMenTreeConnectWithOptionsNoCredentials
             // 
-            _cMenTreeConnectWithOptionsNoCredentials.Image = Properties.Resources.Key_Delete;
+            _cMenTreeConnectWithOptionsNoCredentials.Image = Properties.Resources.UniqueKeyError_16x;
             _cMenTreeConnectWithOptionsNoCredentials.Name = "_cMenTreeConnectWithOptionsNoCredentials";
             _cMenTreeConnectWithOptionsNoCredentials.Size = new System.Drawing.Size(245, 22);
             _cMenTreeConnectWithOptionsNoCredentials.Text = "Connect without credentials";
@@ -211,7 +211,7 @@ namespace mRemoteNG.UI.Controls
             // 
             // cMenTreeConnectWithOptionsViewOnly
             // 
-            _cMenTreeConnectWithOptionsViewOnly.Image = Properties.Resources.View;
+            _cMenTreeConnectWithOptionsViewOnly.Image = Properties.Resources.Monitor_16x;
             _cMenTreeConnectWithOptionsViewOnly.Name =
                 "_cMenTreeConnectWithOptionsViewOnly";
             _cMenTreeConnectWithOptionsViewOnly.Size = new System.Drawing.Size(245, 22);
@@ -240,7 +240,7 @@ namespace mRemoteNG.UI.Controls
             // 
             // cMenTreeToolsTransferFile
             // 
-            _cMenTreeToolsTransferFile.Image = Properties.Resources.SchemaCompare_16x;
+            _cMenTreeToolsTransferFile.Image = Properties.Resources.SyncArrow_16x;
             _cMenTreeToolsTransferFile.Name = "_cMenTreeToolsTransferFile";
             _cMenTreeToolsTransferFile.Size = new System.Drawing.Size(199, 22);
             _cMenTreeToolsTransferFile.Text = "Transfer File (SSH)";
@@ -253,7 +253,7 @@ namespace mRemoteNG.UI.Controls
             // 
             // cMenTreeDuplicate
             // 
-            _cMenTreeDuplicate.Image = Properties.Resources.Page_Copy;
+            _cMenTreeDuplicate.Image = Properties.Resources.Copy_16x;
             _cMenTreeDuplicate.Name = "_cMenTreeDuplicate";
             _cMenTreeDuplicate.Size = new System.Drawing.Size(199, 22);
             _cMenTreeDuplicate.Text = "Duplicate";
diff --git a/mRemoteNG/UI/Controls/NewPasswordWithVerification.Designer.cs b/mRemoteNG/UI/Controls/NewPasswordWithVerification.Designer.cs
index 992e2c53..64f99a4c 100644
--- a/mRemoteNG/UI/Controls/NewPasswordWithVerification.Designer.cs
+++ b/mRemoteNG/UI/Controls/NewPasswordWithVerification.Designer.cs
@@ -67,7 +67,7 @@
             // 
             // imgError
             // 
-            this.imgError.Image = global::mRemoteNG.Properties.Resources.ErrorSmall;
+            this.imgError.Image = global::mRemoteNG.Properties.Resources.LogError_16x;
             this.imgError.Location = new System.Drawing.Point(3, 81);
             this.imgError.Name = "imgError";
             this.imgError.Size = new System.Drawing.Size(16, 16);
diff --git a/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs b/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs
index 7a0c35b9..4fee7875 100644
--- a/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs
+++ b/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs
@@ -165,7 +165,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
         {
             imgConnectionStatus.Image = connectionSuccess
                 ? Properties.Resources.Test_16x
-                : Properties.Resources.ErrorSmall;
+                : Properties.Resources.LogError_16x;
         }
 
         private string BuildTestFailedMessage(string specificMessage)
diff --git a/mRemoteNG/UI/Menu/ToolsMenu.cs b/mRemoteNG/UI/Menu/ToolsMenu.cs
index 0c8d8c76..32f83022 100644
--- a/mRemoteNG/UI/Menu/ToolsMenu.cs
+++ b/mRemoteNG/UI/Menu/ToolsMenu.cs
@@ -43,7 +43,7 @@ namespace mRemoteNG.UI.Menu
             // 
             // mMenToolsSSHTransfer
             // 
-            _mMenToolsSshTransfer.Image = Properties.Resources.SchemaCompare_16x;
+            _mMenToolsSshTransfer.Image = Properties.Resources.SyncArrow_16x;
             _mMenToolsSshTransfer.Name = "mMenToolsSSHTransfer";
             _mMenToolsSshTransfer.Size = new System.Drawing.Size(184, 22);
             _mMenToolsSshTransfer.Text = Language.SshFileTransfer;
diff --git a/mRemoteNG/UI/Panels/PanelAdder.cs b/mRemoteNG/UI/Panels/PanelAdder.cs
index 233bc210..356e2fed 100644
--- a/mRemoteNG/UI/Panels/PanelAdder.cs
+++ b/mRemoteNG/UI/Panels/PanelAdder.cs
@@ -95,7 +95,7 @@ namespace mRemoteNG.UI.Panels
             var cMenClose = new ToolStripMenuItem
             {
                 Text = Language._Close,
-                Image = Properties.Resources.Panel_Close,
+                Image = Properties.Resources.Close_16x,
                 Tag = pnlcForm
             };
             cMenClose.Click += cMenConnectionPanelClose_Click;
diff --git a/mRemoteNG/UI/Window/ConfigWindow.cs b/mRemoteNG/UI/Window/ConfigWindow.cs
index 522e51a3..0068706f 100644
--- a/mRemoteNG/UI/Window/ConfigWindow.cs
+++ b/mRemoteNG/UI/Window/ConfigWindow.cs
@@ -129,7 +129,7 @@ namespace mRemoteNG.UI.Window
             //btnShowInheritance
             //
             _btnShowInheritance.DisplayStyle = ToolStripItemDisplayStyle.Image;
-            _btnShowInheritance.Image = Properties.Resources.Inheritance;
+            _btnShowInheritance.Image = Properties.Resources.ViewDownBySchema_16x;
             _btnShowInheritance.ImageTransparentColor = Color.Magenta;
             _btnShowInheritance.Name = "_btnShowInheritance";
             _btnShowInheritance.Size = new Size(23, 22);
@@ -138,7 +138,7 @@ namespace mRemoteNG.UI.Window
             //btnShowDefaultInheritance
             //
             _btnShowDefaultInheritance.DisplayStyle = ToolStripItemDisplayStyle.Image;
-            _btnShowDefaultInheritance.Image = Properties.Resources.Inheritance_Default;
+            _btnShowDefaultInheritance.Image = Properties.Resources.ViewDownBySchema_16x;
             _btnShowDefaultInheritance.ImageTransparentColor = Color.Magenta;
             _btnShowDefaultInheritance.Name = "_btnShowDefaultInheritance";
             _btnShowDefaultInheritance.Size = new Size(23, 22);
@@ -149,7 +149,7 @@ namespace mRemoteNG.UI.Window
             _btnShowProperties.Checked = true;
             _btnShowProperties.CheckState = CheckState.Checked;
             _btnShowProperties.DisplayStyle = ToolStripItemDisplayStyle.Image;
-            _btnShowProperties.Image = Properties.Resources.Properties;
+            _btnShowProperties.Image = Properties.Resources.Schema_16x;
             _btnShowProperties.ImageTransparentColor = Color.Magenta;
             _btnShowProperties.Name = "_btnShowProperties";
             _btnShowProperties.Size = new Size(23, 22);
@@ -158,7 +158,7 @@ namespace mRemoteNG.UI.Window
             //btnShowDefaultProperties
             //
             _btnShowDefaultProperties.DisplayStyle = ToolStripItemDisplayStyle.Image;
-            _btnShowDefaultProperties.Image = Properties.Resources.Properties_Default;
+            _btnShowDefaultProperties.Image = Properties.Resources.SchemaObjectProperty_16x;
             _btnShowDefaultProperties.ImageTransparentColor = Color.Magenta;
             _btnShowDefaultProperties.Name = "_btnShowDefaultProperties";
             _btnShowDefaultProperties.Size = new Size(23, 22);
diff --git a/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs b/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs
index 39b2f5c1..70bff5b0 100644
--- a/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs
+++ b/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs
@@ -101,35 +101,35 @@ namespace mRemoteNG.UI.Window
             // 
             // cmenTabDisconnect
             // 
-            this.cmenTabDisconnect.Image = global::mRemoteNG.Properties.Resources.tab_delete;
+            this.cmenTabDisconnect.Image = global::mRemoteNG.Properties.Resources.Remove_16x;
             this.cmenTabDisconnect.Name = "cmenTabDisconnect";
             this.cmenTabDisconnect.Size = new System.Drawing.Size(230, 22);
             this.cmenTabDisconnect.Text = "Disconnect";
             // 
             // cmenTabDisconnectOthers
             // 
-            this.cmenTabDisconnectOthers.Image = global::mRemoteNG.Properties.Resources.tab_delete;
+            this.cmenTabDisconnectOthers.Image = global::mRemoteNG.Properties.Resources.Remove_16x;
             this.cmenTabDisconnectOthers.Name = "cmenTabDisconnectOthers";
             this.cmenTabDisconnectOthers.Size = new System.Drawing.Size(230, 22);
             this.cmenTabDisconnectOthers.Text = "Disconnect Other Tabs";
             // 
             // cmenTabDisconnectOthersRight
             // 
-            this.cmenTabDisconnectOthersRight.Image = global::mRemoteNG.Properties.Resources.tab_delete;
+            this.cmenTabDisconnectOthersRight.Image = global::mRemoteNG.Properties.Resources.Remove_16x;
             this.cmenTabDisconnectOthersRight.Name = "cmenTabDisconnectOthersRight";
             this.cmenTabDisconnectOthersRight.Size = new System.Drawing.Size(230, 22);
             this.cmenTabDisconnectOthersRight.Text = "Disconnect Tabs To The Right";
             // 
             // cmenTabRenameTab
             // 
-            this.cmenTabRenameTab.Image = global::mRemoteNG.Properties.Resources.tab_edit;
+            this.cmenTabRenameTab.Image = global::mRemoteNG.Properties.Resources.Rename_16x;
             this.cmenTabRenameTab.Name = "cmenTabRenameTab";
             this.cmenTabRenameTab.Size = new System.Drawing.Size(230, 22);
             this.cmenTabRenameTab.Text = "Rename Tab";
             // 
             // cmenTabDuplicateTab
             // 
-            this.cmenTabDuplicateTab.Image = global::mRemoteNG.Properties.Resources.tab_add;
+            this.cmenTabDuplicateTab.Image = global::mRemoteNG.Properties.Resources.Add_16x;
             this.cmenTabDuplicateTab.Name = "cmenTabDuplicateTab";
             this.cmenTabDuplicateTab.Size = new System.Drawing.Size(230, 22);
             this.cmenTabDuplicateTab.Text = "Duplicate Tab";
@@ -155,7 +155,7 @@ namespace mRemoteNG.UI.Window
             // 
             // cmenTabViewOnly
             // 
-            this.cmenTabViewOnly.Image = global::mRemoteNG.Properties.Resources.View;
+            this.cmenTabViewOnly.Image = global::mRemoteNG.Properties.Resources.Monitor_16x;
             this.cmenTabViewOnly.Name = "cmenTabViewOnly";
             this.cmenTabViewOnly.Size = new System.Drawing.Size(230, 22);
             this.cmenTabViewOnly.Text = "View Only (VNC)";
@@ -177,7 +177,7 @@ namespace mRemoteNG.UI.Window
             // 
             // cmenTabTransferFile
             // 
-            this.cmenTabTransferFile.Image = global::mRemoteNG.Properties.Resources.SchemaCompare_16x;
+            this.cmenTabTransferFile.Image = global::mRemoteNG.Properties.Resources.SyncArrow_16x;
             this.cmenTabTransferFile.Name = "cmenTabTransferFile";
             this.cmenTabTransferFile.Size = new System.Drawing.Size(230, 22);
             this.cmenTabTransferFile.Text = "Transfer File (SSH)";
diff --git a/mRemoteNG/UI/Window/ErrorAndInfoWindow.cs b/mRemoteNG/UI/Window/ErrorAndInfoWindow.cs
index 53b1b0ca..a6edf891 100644
--- a/mRemoteNG/UI/Window/ErrorAndInfoWindow.cs
+++ b/mRemoteNG/UI/Window/ErrorAndInfoWindow.cs
@@ -78,9 +78,9 @@ namespace mRemoteNG.UI.Window
         {
             imgListMC.ImageSize = _display.ScaleSize(imgListMC.ImageSize);
             imgListMC.Images.Add(_display.ScaleImage(Properties.Resources.Test_16x));
-            imgListMC.Images.Add(_display.ScaleImage(Properties.Resources.InformationSmall));
-            imgListMC.Images.Add(_display.ScaleImage(Properties.Resources.WarningSmall));
-            imgListMC.Images.Add(_display.ScaleImage(Properties.Resources.ErrorSmall));
+            imgListMC.Images.Add(_display.ScaleImage(Properties.Resources.StatusInformation_16x));
+            imgListMC.Images.Add(_display.ScaleImage(Properties.Resources.LogWarning_16x));
+            imgListMC.Images.Add(_display.ScaleImage(Properties.Resources.LogError_16x));
         }
 
         private void LayoutVertical()
@@ -229,7 +229,7 @@ namespace mRemoteNG.UI.Window
 
                         break;
                     case MessageClass.InformationMsg:
-                        pbError.Image = _display.ScaleImage(Properties.Resources.Information);
+                        pbError.Image = _display.ScaleImage(Properties.Resources.StatusInformation_16x);
                         if (_themeManager.ThemingActive)
                         {
                             pnlErrorMsg.BackColor = Color.LightSteelBlue;
@@ -239,7 +239,7 @@ namespace mRemoteNG.UI.Window
 
                         break;
                     case MessageClass.WarningMsg:
-                        pbError.Image = _display.ScaleImage(Properties.Resources.Warning);
+                        pbError.Image = _display.ScaleImage(Properties.Resources.LogWarning_16x);
                         if (_themeManager.ActiveAndExtended)
                         {
                             //Inverse colors for dramatic effect
@@ -259,7 +259,7 @@ namespace mRemoteNG.UI.Window
 
                         break;
                     case MessageClass.ErrorMsg:
-                        pbError.Image = _display.ScaleImage(Properties.Resources.Error);
+                        pbError.Image = _display.ScaleImage(Properties.Resources.LogError_16x);
                         if (_themeManager.ActiveAndExtended)
                         {
                             pnlErrorMsg.BackColor =
diff --git a/mRemoteNG/UI/Window/SSHTransferWindow.cs b/mRemoteNG/UI/Window/SSHTransferWindow.cs
index a6374677..054fbaf6 100644
--- a/mRemoteNG/UI/Window/SSHTransferWindow.cs
+++ b/mRemoteNG/UI/Window/SSHTransferWindow.cs
@@ -104,7 +104,7 @@ namespace mRemoteNG.UI.Window
             // 
             btnTransfer._mice = MrngButton.MouseState.HOVER;
             btnTransfer.FlatStyle = FlatStyle.Flat;
-            btnTransfer.Image = Properties.Resources.SchemaCompare_16x;
+            btnTransfer.Image = Properties.Resources.SyncArrow_16x;
             btnTransfer.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             btnTransfer.Location = new System.Drawing.Point(562, 145);
             btnTransfer.Name = "btnTransfer";
diff --git a/mRemoteNG/mRemoteNG.csproj b/mRemoteNG/mRemoteNG.csproj
index ed5316e1..b8135af7 100644
--- a/mRemoteNG/mRemoteNG.csproj
+++ b/mRemoteNG/mRemoteNG.csproj
@@ -1126,9 +1126,6 @@
     <None Include="Resources\Icons\ConnectionsSaveAs_Icon.ico" />
     <None Include="Resources\Icons\Update_Icon.ico" />
     <None Include="Resources\Icons\UVNC_SC_Icon.ico" />
-    <None Include="Resources\Images\tab_add.png" />
-    <None Include="Resources\Images\tab_edit.png" />
-    <None Include="Resources\Images\tab_delete.png" />
     <Content Include="Icons\Infrastructure.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -1142,15 +1139,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <None Include="Resources\ConnectedOverlay.png" />
-    <None Include="Resources\Images\Connection_Duplicate.png" />
-    <None Include="Resources\Images\Inheritance_Default.png" />
-    <None Include="Resources\Images\News.png" />
-    <None Include="Resources\Images\Page.png" />
-    <None Include="Resources\Images\Panel_Close.png" />
-    <None Include="Resources\Images\Properties_Default.png" />
-    <None Include="Resources\Images\Key_Delete.png" />
     <None Include="Resources\Loading_Spinner.gif" />
-    <None Include="Resources\Images\Page_Copy.png" />
     <None Include="Resources\AddFolder_16x.png" />
     <None Include="Resources\CloseSolution_16x.png" />
     <None Include="Resources\CollapseAll_16x.png" />
@@ -1192,7 +1181,6 @@
     <None Include="Resources\OpenFile_16x.png" />
     <None Include="Resources\Console_16x.png" />
     <None Include="Resources\SearchAndApps_16x.png" />
-    <None Include="Resources\SchemaCompare_16x.png" />
     <None Include="Resources\Panel_16x.png" />
     <None Include="Resources\InsertPanel_16x.png" />
     <None Include="Resources\Run_16x.png" />
@@ -1202,6 +1190,14 @@
     <None Include="Resources\Remove_16x.png" />
     <None Include="Resources\Add_16x.png" />
     <None Include="Resources\Monitor_16x.png" />
+    <None Include="Resources\UniqueKeyError_16x.png" />
+    <None Include="Resources\SyncArrow_16x.png" />
+    <None Include="Resources\ViewDownBySchema_16x.png" />
+    <None Include="Resources\SchemaObjectProperty_16x.png" />
+    <None Include="Resources\Schema_16x.png" />
+    <None Include="Resources\StatusInformation_16x.png" />
+    <None Include="Resources\LogWarning_16x.png" />
+    <None Include="Resources\LogError_16x.png" />
     <Content Include="Schemas\mremoteng_confcons_v2_6.xsd">
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -1216,11 +1212,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\Images\ErrorsAndInfos.png" />
-    <None Include="Resources\Images\Sessions.png" />
-    <None Include="Resources\Images\PropertiesDefault.png" />
-    <None Include="Resources\Images\Bad_Symbol.png" />
-    <None Include="Resources\Images\Good_Symbol.png" />
     <Content Include="Icons\Anti Virus.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -1317,10 +1308,6 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </None>
-    <None Include="Resources\Images\InformationSmall.png" />
-    <None Include="Resources\Images\Information.png" />
-    <None Include="Resources\Images\ErrorSmall.png" />
-    <None Include="Resources\Images\Error.png" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">