diff --git a/mRemoteV1/Properties/Resources.resx b/mRemoteV1/Properties/Resources.resx
index 04b54e901..3dcd32c7b 100644
--- a/mRemoteV1/Properties/Resources.resx
+++ b/mRemoteV1/Properties/Resources.resx
@@ -212,133 +212,133 @@
     <value>..\Resources\Images\Config.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Config_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons_FamFamFam\Config_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\FamFamFam\Config_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Donate" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Donate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Donate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Info" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Info.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Info.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_FamFamFam\Inheritance.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Inheritance.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Keyboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Keyboard.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Keyboard.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Options" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Options.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Options.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Options_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons_FamFamFam\Options_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\FamFamFam\Options_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Panels" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Panels.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Panels.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Panel_Add" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Panel_Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Panel_Add.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_FamFamFam\Panel_Close.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Panel_Close.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Quit" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Quit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Quit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Save" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Save.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Save.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Save_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons_FamFamFam\Save_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\FamFamFam\Save_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Screenshot" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Screenshot.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Screenshot.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Screenshot_Add" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Screenshot_Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Screenshot_Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Screenshot_Copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Screenshot_Copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Screenshot_Copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Screenshot_Delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Screenshot_Delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Screenshot_Delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Screenshot_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons_FamFamFam\Screenshot_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\FamFamFam\Screenshot_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Screenshot_Save" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Screenshot_Save.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Screenshot_Save.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Search" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Search.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Search.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_FamFamFam\View.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\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="Website" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Website.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Website.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Appearance_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons_FamFamFam\Appearance_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\FamFamFam\Appearance_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Arrow_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Arrow_Down.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Arrow_Down.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Arrow_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Arrow_Up.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Arrow_Up.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Bug" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Bug.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Bug.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Connections_SaveAs_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Icons\Connections_SaveAs_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Connection_Add" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Connection_Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Connection_Add.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_FamFamFam\Connection_Duplicate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Connection_Duplicate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ExtApp" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\ExtApp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\ExtApp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ExtApp_Add" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\ExtApp_Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\ExtApp_Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ExtApp_Delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\ExtApp_Delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\ExtApp_Delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ExtApp_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons_FamFamFam\ExtApp_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\FamFamFam\ExtApp_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ExtApp_Start" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\ExtApp_Start.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\ExtApp_Start.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="File" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\File.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\File.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Folder_Add" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Folder_Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Folder_Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Help_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons_FamFamFam\Help_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\FamFamFam\Help_Icon.ico;System.Drawing.Icon, 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_FamFamFam\Page.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Page.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Pause" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Images\Pause.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -347,76 +347,76 @@
     <value>..\Resources\Images\Play.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="PortScan" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\PortScan.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\PortScan.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="PortScan_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons_FamFamFam\PortScan_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\FamFamFam\PortScan_Icon.ico;System.Drawing.Icon, 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_FamFamFam\Properties.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\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_FamFamFam\Properties_Default.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Properties_Default.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Refresh.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Refresh.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_FamFamFam\Sessions.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Sessions.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Sessions_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons_FamFamFam\Sessions_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\FamFamFam\Sessions_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Session_LogOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Session_LogOff.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Session_LogOff.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="SmartSize" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\SmartSize.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\SmartSize.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="SSHTransfer" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\SSHTransfer.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\SSHTransfer.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="SSHTransfer_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons_FamFamFam\SSHTransfer_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\FamFamFam\SSHTransfer_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="StartupExit_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons_FamFamFam\StartupExit_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\FamFamFam\StartupExit_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Tab_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons_FamFamFam\Tab_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\FamFamFam\Tab_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Tools" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Tools.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Tools.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Update" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Update.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Update.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Update_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons_FamFamFam\Update_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\FamFamFam\Update_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Console" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Console.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Console.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_FamFamFam\Inheritance_Default.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Inheritance_Default.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Chat" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Chat.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Chat.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Panels_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons_FamFamFam\Panels_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\FamFamFam\Panels_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="JumpTo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\JumpTo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\JumpTo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Images\Logo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Monitor" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Monitor_GoTo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\Monitor_GoTo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\Monitor_GoTo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="UVNC_SC" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Images\UVNC_SC.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -440,40 +440,40 @@
     <value>..\Resources\Icons\ActiveDirectory_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="News_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons_FamFamFam\News_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\FamFamFam\News_Icon.ico;System.Drawing.Icon, 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_FamFamFam\News.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\News.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="PuttySessions" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Images\PuttySessions.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="key_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\key_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\key_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="application_side_tree" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\application_side_tree.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\application_side_tree.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="arrow_out" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\arrow_out.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\arrow_out.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="cog_error" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\cog_error.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\cog_error.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="user_comment" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\user_comment.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\user_comment.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="monitor_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\monitor_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\monitor_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="monitor_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\monitor_go.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\monitor_go.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="cog" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\images_famfamfam\cog.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\resources\Images\FamFamFam\cog.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="page_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\images_famfamfam\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\resources\Images\FamFamFam\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="RDCMan_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\icons\rdcman_icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -488,22 +488,22 @@
     <value>..\Resources\Images\green_arrow2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="shield" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons_FamFamFam\shield.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\FamFamFam\shield.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="key" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="key_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\key_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\key_add.png;System.Drawing.Bitmap, 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_FamFamFam\key.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\FamFamFam\key.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="brick" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\brick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\brick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="folder_key" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\folder_key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\folder_key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="keepass_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Images\keepass_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -512,15 +512,15 @@
     <value>..\Resources\Images\xml.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="arrow_left" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\arrow_left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\arrow_left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="tick" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\tick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\tick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="_lock" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="exclamation" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images_FamFamFam\exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\FamFamFam\exclamation.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/mRemoteV1/Resources/Icons_FamFamFam/Appearance_Icon.ico b/mRemoteV1/Resources/Icons/FamFamFam/Appearance_Icon.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/Appearance_Icon.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/Appearance_Icon.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/Config_Icon.ico b/mRemoteV1/Resources/Icons/FamFamFam/Config_Icon.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/Config_Icon.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/Config_Icon.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/ExtApp_Icon.ico b/mRemoteV1/Resources/Icons/FamFamFam/ExtApp_Icon.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/ExtApp_Icon.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/ExtApp_Icon.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/Help_Icon.ico b/mRemoteV1/Resources/Icons/FamFamFam/Help_Icon.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/Help_Icon.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/Help_Icon.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/News_Icon.ico b/mRemoteV1/Resources/Icons/FamFamFam/News_Icon.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/News_Icon.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/News_Icon.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/Options_Icon.ico b/mRemoteV1/Resources/Icons/FamFamFam/Options_Icon.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/Options_Icon.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/Options_Icon.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/Panels_Icon.ico b/mRemoteV1/Resources/Icons/FamFamFam/Panels_Icon.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/Panels_Icon.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/Panels_Icon.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/PortScan_Icon.ico b/mRemoteV1/Resources/Icons/FamFamFam/PortScan_Icon.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/PortScan_Icon.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/PortScan_Icon.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/SSHTransfer_Icon.ico b/mRemoteV1/Resources/Icons/FamFamFam/SSHTransfer_Icon.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/SSHTransfer_Icon.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/SSHTransfer_Icon.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/Save_Icon.ico b/mRemoteV1/Resources/Icons/FamFamFam/Save_Icon.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/Save_Icon.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/Save_Icon.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/Screenshot_Icon.ico b/mRemoteV1/Resources/Icons/FamFamFam/Screenshot_Icon.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/Screenshot_Icon.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/Screenshot_Icon.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/Sessions_Icon.ico b/mRemoteV1/Resources/Icons/FamFamFam/Sessions_Icon.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/Sessions_Icon.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/Sessions_Icon.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/StartupExit_Icon.ico b/mRemoteV1/Resources/Icons/FamFamFam/StartupExit_Icon.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/StartupExit_Icon.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/StartupExit_Icon.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/Tab_Icon.ico b/mRemoteV1/Resources/Icons/FamFamFam/Tab_Icon.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/Tab_Icon.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/Tab_Icon.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/Update_Icon.ico b/mRemoteV1/Resources/Icons/FamFamFam/Update_Icon.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/Update_Icon.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/Update_Icon.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/comments.ico b/mRemoteV1/Resources/Icons/FamFamFam/comments.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/comments.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/comments.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/database.ico b/mRemoteV1/Resources/Icons/FamFamFam/database.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/database.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/database.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/error.ico b/mRemoteV1/Resources/Icons/FamFamFam/error.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/error.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/error.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/key.ico b/mRemoteV1/Resources/Icons/FamFamFam/key.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/key.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/key.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/keyboard.ico b/mRemoteV1/Resources/Icons/FamFamFam/keyboard.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/keyboard.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/keyboard.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/page_white_edit.ico b/mRemoteV1/Resources/Icons/FamFamFam/page_white_edit.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/page_white_edit.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/page_white_edit.ico
diff --git a/mRemoteV1/Resources/Icons_FamFamFam/shield.ico b/mRemoteV1/Resources/Icons/FamFamFam/shield.ico
similarity index 100%
rename from mRemoteV1/Resources/Icons_FamFamFam/shield.ico
rename to mRemoteV1/Resources/Icons/FamFamFam/shield.ico
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Arrow_Down.png b/mRemoteV1/Resources/Images/FamFamFam/Arrow_Down.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Arrow_Down.png
rename to mRemoteV1/Resources/Images/FamFamFam/Arrow_Down.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Arrow_Up.png b/mRemoteV1/Resources/Images/FamFamFam/Arrow_Up.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Arrow_Up.png
rename to mRemoteV1/Resources/Images/FamFamFam/Arrow_Up.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Bug.png b/mRemoteV1/Resources/Images/FamFamFam/Bug.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Bug.png
rename to mRemoteV1/Resources/Images/FamFamFam/Bug.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Chat.png b/mRemoteV1/Resources/Images/FamFamFam/Chat.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Chat.png
rename to mRemoteV1/Resources/Images/FamFamFam/Chat.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Config.png b/mRemoteV1/Resources/Images/FamFamFam/Config.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Config.png
rename to mRemoteV1/Resources/Images/FamFamFam/Config.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Connection_Add.png b/mRemoteV1/Resources/Images/FamFamFam/Connection_Add.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Connection_Add.png
rename to mRemoteV1/Resources/Images/FamFamFam/Connection_Add.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Connection_Duplicate.png b/mRemoteV1/Resources/Images/FamFamFam/Connection_Duplicate.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Connection_Duplicate.png
rename to mRemoteV1/Resources/Images/FamFamFam/Connection_Duplicate.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Console.png b/mRemoteV1/Resources/Images/FamFamFam/Console.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Console.png
rename to mRemoteV1/Resources/Images/FamFamFam/Console.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Copy.png b/mRemoteV1/Resources/Images/FamFamFam/Copy.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Copy.png
rename to mRemoteV1/Resources/Images/FamFamFam/Copy.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Delete.png b/mRemoteV1/Resources/Images/FamFamFam/Delete.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Delete.png
rename to mRemoteV1/Resources/Images/FamFamFam/Delete.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Donate.png b/mRemoteV1/Resources/Images/FamFamFam/Donate.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Donate.png
rename to mRemoteV1/Resources/Images/FamFamFam/Donate.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/ExtApp.png b/mRemoteV1/Resources/Images/FamFamFam/ExtApp.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/ExtApp.png
rename to mRemoteV1/Resources/Images/FamFamFam/ExtApp.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/ExtApp_Add.png b/mRemoteV1/Resources/Images/FamFamFam/ExtApp_Add.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/ExtApp_Add.png
rename to mRemoteV1/Resources/Images/FamFamFam/ExtApp_Add.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/ExtApp_Delete.png b/mRemoteV1/Resources/Images/FamFamFam/ExtApp_Delete.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/ExtApp_Delete.png
rename to mRemoteV1/Resources/Images/FamFamFam/ExtApp_Delete.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/ExtApp_Start.png b/mRemoteV1/Resources/Images/FamFamFam/ExtApp_Start.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/ExtApp_Start.png
rename to mRemoteV1/Resources/Images/FamFamFam/ExtApp_Start.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/File.png b/mRemoteV1/Resources/Images/FamFamFam/File.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/File.png
rename to mRemoteV1/Resources/Images/FamFamFam/File.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Folder.png b/mRemoteV1/Resources/Images/FamFamFam/Folder.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Folder.png
rename to mRemoteV1/Resources/Images/FamFamFam/Folder.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Folder_Add.png b/mRemoteV1/Resources/Images/FamFamFam/Folder_Add.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Folder_Add.png
rename to mRemoteV1/Resources/Images/FamFamFam/Folder_Add.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Help.png b/mRemoteV1/Resources/Images/FamFamFam/Help.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Help.png
rename to mRemoteV1/Resources/Images/FamFamFam/Help.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Info.png b/mRemoteV1/Resources/Images/FamFamFam/Info.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Info.png
rename to mRemoteV1/Resources/Images/FamFamFam/Info.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Inheritance.png b/mRemoteV1/Resources/Images/FamFamFam/Inheritance.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Inheritance.png
rename to mRemoteV1/Resources/Images/FamFamFam/Inheritance.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Inheritance_Default.png b/mRemoteV1/Resources/Images/FamFamFam/Inheritance_Default.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Inheritance_Default.png
rename to mRemoteV1/Resources/Images/FamFamFam/Inheritance_Default.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/JumpTo.png b/mRemoteV1/Resources/Images/FamFamFam/JumpTo.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/JumpTo.png
rename to mRemoteV1/Resources/Images/FamFamFam/JumpTo.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Keyboard.png b/mRemoteV1/Resources/Images/FamFamFam/Keyboard.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Keyboard.png
rename to mRemoteV1/Resources/Images/FamFamFam/Keyboard.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Link.png b/mRemoteV1/Resources/Images/FamFamFam/Link.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Link.png
rename to mRemoteV1/Resources/Images/FamFamFam/Link.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Monitor.png b/mRemoteV1/Resources/Images/FamFamFam/Monitor.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Monitor.png
rename to mRemoteV1/Resources/Images/FamFamFam/Monitor.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Monitor_GoTo.png b/mRemoteV1/Resources/Images/FamFamFam/Monitor_GoTo.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Monitor_GoTo.png
rename to mRemoteV1/Resources/Images/FamFamFam/Monitor_GoTo.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/News.png b/mRemoteV1/Resources/Images/FamFamFam/News.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/News.png
rename to mRemoteV1/Resources/Images/FamFamFam/News.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Options.png b/mRemoteV1/Resources/Images/FamFamFam/Options.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Options.png
rename to mRemoteV1/Resources/Images/FamFamFam/Options.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Page.png b/mRemoteV1/Resources/Images/FamFamFam/Page.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Page.png
rename to mRemoteV1/Resources/Images/FamFamFam/Page.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Panel_Add.png b/mRemoteV1/Resources/Images/FamFamFam/Panel_Add.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Panel_Add.png
rename to mRemoteV1/Resources/Images/FamFamFam/Panel_Add.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Panel_Close.png b/mRemoteV1/Resources/Images/FamFamFam/Panel_Close.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Panel_Close.png
rename to mRemoteV1/Resources/Images/FamFamFam/Panel_Close.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Panels.png b/mRemoteV1/Resources/Images/FamFamFam/Panels.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Panels.png
rename to mRemoteV1/Resources/Images/FamFamFam/Panels.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Pause.png b/mRemoteV1/Resources/Images/FamFamFam/Pause.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Pause.png
rename to mRemoteV1/Resources/Images/FamFamFam/Pause.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Play.png b/mRemoteV1/Resources/Images/FamFamFam/Play.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Play.png
rename to mRemoteV1/Resources/Images/FamFamFam/Play.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/PortScan.png b/mRemoteV1/Resources/Images/FamFamFam/PortScan.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/PortScan.png
rename to mRemoteV1/Resources/Images/FamFamFam/PortScan.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Properties.png b/mRemoteV1/Resources/Images/FamFamFam/Properties.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Properties.png
rename to mRemoteV1/Resources/Images/FamFamFam/Properties.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Properties_Default.png b/mRemoteV1/Resources/Images/FamFamFam/Properties_Default.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Properties_Default.png
rename to mRemoteV1/Resources/Images/FamFamFam/Properties_Default.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Quit.png b/mRemoteV1/Resources/Images/FamFamFam/Quit.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Quit.png
rename to mRemoteV1/Resources/Images/FamFamFam/Quit.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Refresh.png b/mRemoteV1/Resources/Images/FamFamFam/Refresh.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Refresh.png
rename to mRemoteV1/Resources/Images/FamFamFam/Refresh.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/SSHTransfer.png b/mRemoteV1/Resources/Images/FamFamFam/SSHTransfer.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/SSHTransfer.png
rename to mRemoteV1/Resources/Images/FamFamFam/SSHTransfer.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Save.png b/mRemoteV1/Resources/Images/FamFamFam/Save.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Save.png
rename to mRemoteV1/Resources/Images/FamFamFam/Save.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Screenshot.png b/mRemoteV1/Resources/Images/FamFamFam/Screenshot.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Screenshot.png
rename to mRemoteV1/Resources/Images/FamFamFam/Screenshot.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Screenshot_Add.png b/mRemoteV1/Resources/Images/FamFamFam/Screenshot_Add.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Screenshot_Add.png
rename to mRemoteV1/Resources/Images/FamFamFam/Screenshot_Add.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Screenshot_Copy.png b/mRemoteV1/Resources/Images/FamFamFam/Screenshot_Copy.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Screenshot_Copy.png
rename to mRemoteV1/Resources/Images/FamFamFam/Screenshot_Copy.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Screenshot_Delete.png b/mRemoteV1/Resources/Images/FamFamFam/Screenshot_Delete.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Screenshot_Delete.png
rename to mRemoteV1/Resources/Images/FamFamFam/Screenshot_Delete.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Screenshot_Save.png b/mRemoteV1/Resources/Images/FamFamFam/Screenshot_Save.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Screenshot_Save.png
rename to mRemoteV1/Resources/Images/FamFamFam/Screenshot_Save.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Search.png b/mRemoteV1/Resources/Images/FamFamFam/Search.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Search.png
rename to mRemoteV1/Resources/Images/FamFamFam/Search.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Session_LogOff.png b/mRemoteV1/Resources/Images/FamFamFam/Session_LogOff.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Session_LogOff.png
rename to mRemoteV1/Resources/Images/FamFamFam/Session_LogOff.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Sessions.png b/mRemoteV1/Resources/Images/FamFamFam/Sessions.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Sessions.png
rename to mRemoteV1/Resources/Images/FamFamFam/Sessions.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/SmartSize.png b/mRemoteV1/Resources/Images/FamFamFam/SmartSize.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/SmartSize.png
rename to mRemoteV1/Resources/Images/FamFamFam/SmartSize.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Tools.png b/mRemoteV1/Resources/Images/FamFamFam/Tools.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Tools.png
rename to mRemoteV1/Resources/Images/FamFamFam/Tools.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Update.png b/mRemoteV1/Resources/Images/FamFamFam/Update.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Update.png
rename to mRemoteV1/Resources/Images/FamFamFam/Update.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/View.png b/mRemoteV1/Resources/Images/FamFamFam/View.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/View.png
rename to mRemoteV1/Resources/Images/FamFamFam/View.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Warning_Small.png b/mRemoteV1/Resources/Images/FamFamFam/Warning_Small.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Warning_Small.png
rename to mRemoteV1/Resources/Images/FamFamFam/Warning_Small.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/Website.png b/mRemoteV1/Resources/Images/FamFamFam/Website.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/Website.png
rename to mRemoteV1/Resources/Images/FamFamFam/Website.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/application_side_tree.png b/mRemoteV1/Resources/Images/FamFamFam/application_side_tree.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/application_side_tree.png
rename to mRemoteV1/Resources/Images/FamFamFam/application_side_tree.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/arrow_left.png b/mRemoteV1/Resources/Images/FamFamFam/arrow_left.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/arrow_left.png
rename to mRemoteV1/Resources/Images/FamFamFam/arrow_left.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/arrow_out.png b/mRemoteV1/Resources/Images/FamFamFam/arrow_out.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/arrow_out.png
rename to mRemoteV1/Resources/Images/FamFamFam/arrow_out.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/brick.png b/mRemoteV1/Resources/Images/FamFamFam/brick.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/brick.png
rename to mRemoteV1/Resources/Images/FamFamFam/brick.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/cog.png b/mRemoteV1/Resources/Images/FamFamFam/cog.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/cog.png
rename to mRemoteV1/Resources/Images/FamFamFam/cog.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/cog_error.png b/mRemoteV1/Resources/Images/FamFamFam/cog_error.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/cog_error.png
rename to mRemoteV1/Resources/Images/FamFamFam/cog_error.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/database.png b/mRemoteV1/Resources/Images/FamFamFam/database.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/database.png
rename to mRemoteV1/Resources/Images/FamFamFam/database.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/exclamation.png b/mRemoteV1/Resources/Images/FamFamFam/exclamation.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/exclamation.png
rename to mRemoteV1/Resources/Images/FamFamFam/exclamation.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/folder_key.png b/mRemoteV1/Resources/Images/FamFamFam/folder_key.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/folder_key.png
rename to mRemoteV1/Resources/Images/FamFamFam/folder_key.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/key.png b/mRemoteV1/Resources/Images/FamFamFam/key.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/key.png
rename to mRemoteV1/Resources/Images/FamFamFam/key.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/key_add.png b/mRemoteV1/Resources/Images/FamFamFam/key_add.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/key_add.png
rename to mRemoteV1/Resources/Images/FamFamFam/key_add.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/key_delete.png b/mRemoteV1/Resources/Images/FamFamFam/key_delete.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/key_delete.png
rename to mRemoteV1/Resources/Images/FamFamFam/key_delete.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/key_go.png b/mRemoteV1/Resources/Images/FamFamFam/key_go.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/key_go.png
rename to mRemoteV1/Resources/Images/FamFamFam/key_go.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/lock.png b/mRemoteV1/Resources/Images/FamFamFam/lock.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/lock.png
rename to mRemoteV1/Resources/Images/FamFamFam/lock.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/monitor_delete.png b/mRemoteV1/Resources/Images/FamFamFam/monitor_delete.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/monitor_delete.png
rename to mRemoteV1/Resources/Images/FamFamFam/monitor_delete.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/monitor_go.png b/mRemoteV1/Resources/Images/FamFamFam/monitor_go.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/monitor_go.png
rename to mRemoteV1/Resources/Images/FamFamFam/monitor_go.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/page_copy.png b/mRemoteV1/Resources/Images/FamFamFam/page_copy.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/page_copy.png
rename to mRemoteV1/Resources/Images/FamFamFam/page_copy.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/shield.png b/mRemoteV1/Resources/Images/FamFamFam/shield.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/shield.png
rename to mRemoteV1/Resources/Images/FamFamFam/shield.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/tick.png b/mRemoteV1/Resources/Images/FamFamFam/tick.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/tick.png
rename to mRemoteV1/Resources/Images/FamFamFam/tick.png
diff --git a/mRemoteV1/Resources/Images_FamFamFam/user_comment.png b/mRemoteV1/Resources/Images/FamFamFam/user_comment.png
similarity index 100%
rename from mRemoteV1/Resources/Images_FamFamFam/user_comment.png
rename to mRemoteV1/Resources/Images/FamFamFam/user_comment.png
diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj
index 10d834f47..93ac43954 100644
--- a/mRemoteV1/mRemoteV1.csproj
+++ b/mRemoteV1/mRemoteV1.csproj
@@ -1158,37 +1158,37 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Resources\Icons\RDCMan_Icon.ico" />
-    <None Include="Resources\Images_FamFamFam\tick.png" />
-    <None Include="Resources\Icons_FamFamFam\shield.ico" />
-    <None Include="Resources\Icons_FamFamFam\key.ico" />
-    <None Include="Resources\Images_FamFamFam\bricks.png" />
-    <None Include="Resources\Images_FamFamFam\brick.png" />
-    <None Include="Resources\Images_FamFamFam\bricks_greyscale.png" />
-    <None Include="Resources\Images_FamFamFam\brick_large.png" />
-    <None Include="Resources\Images_FamFamFam\brick1.png" />
-    <None Include="Resources\Images_FamFamFam\bricks1.png" />
+    <None Include="Resources\Images\FamFamFam\tick.png" />
+    <None Include="Resources\Icons\FamFamFam\shield.ico" />
+    <None Include="Resources\Icons\FamFamFam\key.ico" />
+    <None Include="Resources\Images\FamFamFam\bricks.png" />
+    <None Include="Resources\Images\FamFamFam\brick.png" />
+    <None Include="Resources\Images\FamFamFam\bricks_greyscale.png" />
+    <None Include="Resources\Images\FamFamFam\brick_large.png" />
+    <None Include="Resources\Images\FamFamFam\brick1.png" />
+    <None Include="Resources\Images\FamFamFam\bricks1.png" />
     <None Include="Resources\Images\xml.png" />
     <None Include="Resources\Images\keepass_32x32.png" />
-    <None Include="Resources\Images_FamFamFam\arrow_left.png" />
-    <Content Include="Resources\Images_FamFamFam\Config.png" />
-    <Content Include="Resources\Images_FamFamFam\database.png" />
-    <None Include="Resources\Images_FamFamFam\key.png" />
-    <None Include="Resources\Images_FamFamFam\key_add.png" />
-    <None Include="Resources\Images_FamFamFam\eye.png" />
-    <None Include="Resources\Images_FamFamFam\lightbulb.png" />
-    <None Include="Resources\Images_FamFamFam\lightning.png" />
-    <None Include="Resources\Images_FamFamFam\folder_key.png" />
-    <None Include="Resources\Images_FamFamFam\exclamation.png" />
-    <Content Include="Resources\Images_FamFamFam\Link.png" />
-    <None Include="Resources\Images_FamFamFam\lock.png" />
-    <Content Include="Resources\Images_FamFamFam\page_copy.png" />
+    <None Include="Resources\Images\FamFamFam\arrow_left.png" />
+    <Content Include="Resources\Images\FamFamFam\Config.png" />
+    <Content Include="Resources\Images\FamFamFam\database.png" />
+    <None Include="Resources\Images\FamFamFam\key.png" />
+    <None Include="Resources\Images\FamFamFam\key_add.png" />
+    <None Include="Resources\Images\FamFamFam\eye.png" />
+    <None Include="Resources\Images\FamFamFam\lightbulb.png" />
+    <None Include="Resources\Images\FamFamFam\lightning.png" />
+    <None Include="Resources\Images\FamFamFam\folder_key.png" />
+    <None Include="Resources\Images\FamFamFam\exclamation.png" />
+    <Content Include="Resources\Images\FamFamFam\Link.png" />
+    <None Include="Resources\Images\FamFamFam\lock.png" />
+    <Content Include="Resources\Images\FamFamFam\page_copy.png" />
     <Content Include="Resources\Images\green_arrow1.png" />
     <Content Include="Resources\Images\green_arrow2.png" />
     <None Include="Resources\Images\puttycm.png" />
-    <None Include="Resources\Images_FamFamFam\monitor_go.png" />
-    <None Include="Resources\Images_FamFamFam\monitor_delete.png" />
-    <None Include="Resources\Images_FamFamFam\user_comment.png" />
-    <None Include="Resources\Images_FamFamFam\key_delete.png" />
+    <None Include="Resources\Images\FamFamFam\monitor_go.png" />
+    <None Include="Resources\Images\FamFamFam\monitor_delete.png" />
+    <None Include="Resources\Images\FamFamFam\user_comment.png" />
+    <None Include="Resources\Images\FamFamFam\key_delete.png" />
     <None Include="Resources\Images\PuttySessions.png" />
     <None Include="Resources\Images\PuttyConfig.png" />
     <None Include="Resources\Images\Play_Quick.png" />
@@ -1216,81 +1216,81 @@
     <None Include="Resources\Images\Duplicate.png" />
     <None Include="Resources\Images\PortScan.png" />
     <None Include="Resources\Icons\PortScan_Icon.ico" />
-    <None Include="Resources\Images_FamFamFam\Copy.png" />
-    <None Include="Resources\Images_FamFamFam\Delete.png" />
-    <None Include="Resources\Icons_FamFamFam\Config_Icon.ico" />
-    <None Include="Resources\Icons_FamFamFam\Options_Icon.ico" />
-    <None Include="Resources\Icons_FamFamFam\Save_Icon.ico" />
-    <None Include="Resources\Icons_FamFamFam\Screenshot_Icon.ico" />
-    <None Include="Resources\Images_FamFamFam\Donate.png" />
-    <None Include="Resources\Images_FamFamFam\Info.png" />
-    <None Include="Resources\Images_FamFamFam\Inheritance.png" />
-    <None Include="Resources\Images_FamFamFam\Keyboard.png" />
-    <None Include="Resources\Images_FamFamFam\Options.png" />
-    <None Include="Resources\Images_FamFamFam\Panel_Close.png" />
-    <None Include="Resources\Images_FamFamFam\Panels.png" />
-    <None Include="Resources\Images_FamFamFam\Panel_Add.png" />
-    <None Include="Resources\Images_FamFamFam\Quit.png" />
-    <None Include="Resources\Images_FamFamFam\Save.png" />
-    <None Include="Resources\Images_FamFamFam\Screenshot.png" />
-    <None Include="Resources\Images_FamFamFam\Screenshot_Add.png" />
-    <None Include="Resources\Images_FamFamFam\Screenshot_Copy.png" />
-    <None Include="Resources\Images_FamFamFam\Screenshot_Delete.png" />
-    <None Include="Resources\Images_FamFamFam\Screenshot_Save.png" />
-    <None Include="Resources\Images_FamFamFam\Search.png" />
-    <None Include="Resources\Images_FamFamFam\View.png" />
-    <None Include="Resources\Images_FamFamFam\Warning_Small.png" />
-    <None Include="Resources\Images_FamFamFam\Website.png" />
-    <None Include="Resources\Images_FamFamFam\ExtApp.png" />
-    <None Include="Resources\Icons_FamFamFam\ExtApp_Icon.ico" />
-    <None Include="Resources\Icons_FamFamFam\Sessions_Icon.ico" />
-    <None Include="Resources\Images_FamFamFam\Sessions.png" />
-    <None Include="Resources\Images_FamFamFam\Session_LogOff.png" />
-    <None Include="Resources\Images_FamFamFam\File.png" />
-    <None Include="Resources\Images_FamFamFam\Refresh.png" />
-    <None Include="Resources\Images_FamFamFam\Properties_Default.png" />
-    <None Include="Resources\Images_FamFamFam\Properties.png" />
-    <None Include="Resources\Images_FamFamFam\Arrow_Down.png" />
-    <None Include="Resources\Images_FamFamFam\Arrow_Up.png" />
-    <None Include="Resources\Images_FamFamFam\Tools.png" />
-    <None Include="Resources\Images_FamFamFam\Bug.png" />
-    <None Include="Resources\Icons_FamFamFam\Help_Icon.ico" />
-    <None Include="Resources\Images_FamFamFam\Help.png" />
-    <None Include="Resources\Images_FamFamFam\Page.png" />
-    <None Include="Resources\Images_FamFamFam\SmartSize.png" />
-    <None Include="Resources\Images_FamFamFam\Update.png" />
-    <None Include="Resources\Icons_FamFamFam\Update_Icon.ico" />
-    <None Include="Resources\Images_FamFamFam\Folder.png" />
-    <None Include="Resources\Images_FamFamFam\Folder_Add.png" />
-    <None Include="Resources\Images_FamFamFam\Pause.png" />
-    <None Include="Resources\Images_FamFamFam\Play.png" />
-    <None Include="Resources\Images_FamFamFam\Connection_Add.png" />
-    <None Include="Resources\Images_FamFamFam\Connection_Duplicate.png" />
-    <None Include="Resources\Images_FamFamFam\ExtApp_Add.png" />
-    <None Include="Resources\Images_FamFamFam\ExtApp_Delete.png" />
-    <None Include="Resources\Images_FamFamFam\ExtApp_Start.png" />
-    <None Include="Resources\Images_FamFamFam\SSHTransfer.png" />
-    <None Include="Resources\Icons_FamFamFam\SSHTransfer_Icon.ico" />
-    <None Include="Resources\Images_FamFamFam\PortScan.png" />
-    <None Include="Resources\Icons_FamFamFam\PortScan_Icon.ico" />
-    <None Include="Resources\Icons_FamFamFam\Appearance_Icon.ico" />
-    <None Include="Resources\Icons_FamFamFam\Tab_Icon.ico" />
-    <None Include="Resources\Icons_FamFamFam\StartupExit_Icon.ico" />
-    <None Include="Resources\Images_FamFamFam\Console.png" />
-    <None Include="Resources\Images_FamFamFam\Inheritance_Default.png" />
-    <None Include="Resources\Images_FamFamFam\Chat.png" />
-    <None Include="Resources\Icons_FamFamFam\Panels_Icon.ico" />
-    <None Include="Resources\Images_FamFamFam\JumpTo.png" />
-    <None Include="Resources\Images_FamFamFam\Monitor_GoTo.png" />
-    <None Include="Resources\Images_FamFamFam\Monitor.png" />
+    <None Include="Resources\Images\FamFamFam\Copy.png" />
+    <None Include="Resources\Images\FamFamFam\Delete.png" />
+    <None Include="Resources\Icons\FamFamFam\Config_Icon.ico" />
+    <None Include="Resources\Icons\FamFamFam\Options_Icon.ico" />
+    <None Include="Resources\Icons\FamFamFam\Save_Icon.ico" />
+    <None Include="Resources\Icons\FamFamFam\Screenshot_Icon.ico" />
+    <None Include="Resources\Images\FamFamFam\Donate.png" />
+    <None Include="Resources\Images\FamFamFam\Info.png" />
+    <None Include="Resources\Images\FamFamFam\Inheritance.png" />
+    <None Include="Resources\Images\FamFamFam\Keyboard.png" />
+    <None Include="Resources\Images\FamFamFam\Options.png" />
+    <None Include="Resources\Images\FamFamFam\Panel_Close.png" />
+    <None Include="Resources\Images\FamFamFam\Panels.png" />
+    <None Include="Resources\Images\FamFamFam\Panel_Add.png" />
+    <None Include="Resources\Images\FamFamFam\Quit.png" />
+    <None Include="Resources\Images\FamFamFam\Save.png" />
+    <None Include="Resources\Images\FamFamFam\Screenshot.png" />
+    <None Include="Resources\Images\FamFamFam\Screenshot_Add.png" />
+    <None Include="Resources\Images\FamFamFam\Screenshot_Copy.png" />
+    <None Include="Resources\Images\FamFamFam\Screenshot_Delete.png" />
+    <None Include="Resources\Images\FamFamFam\Screenshot_Save.png" />
+    <None Include="Resources\Images\FamFamFam\Search.png" />
+    <None Include="Resources\Images\FamFamFam\View.png" />
+    <None Include="Resources\Images\FamFamFam\Warning_Small.png" />
+    <None Include="Resources\Images\FamFamFam\Website.png" />
+    <None Include="Resources\Images\FamFamFam\ExtApp.png" />
+    <None Include="Resources\Icons\FamFamFam\ExtApp_Icon.ico" />
+    <None Include="Resources\Icons\FamFamFam\Sessions_Icon.ico" />
+    <None Include="Resources\Images\FamFamFam\Sessions.png" />
+    <None Include="Resources\Images\FamFamFam\Session_LogOff.png" />
+    <None Include="Resources\Images\FamFamFam\File.png" />
+    <None Include="Resources\Images\FamFamFam\Refresh.png" />
+    <None Include="Resources\Images\FamFamFam\Properties_Default.png" />
+    <None Include="Resources\Images\FamFamFam\Properties.png" />
+    <None Include="Resources\Images\FamFamFam\Arrow_Down.png" />
+    <None Include="Resources\Images\FamFamFam\Arrow_Up.png" />
+    <None Include="Resources\Images\FamFamFam\Tools.png" />
+    <None Include="Resources\Images\FamFamFam\Bug.png" />
+    <None Include="Resources\Icons\FamFamFam\Help_Icon.ico" />
+    <None Include="Resources\Images\FamFamFam\Help.png" />
+    <None Include="Resources\Images\FamFamFam\Page.png" />
+    <None Include="Resources\Images\FamFamFam\SmartSize.png" />
+    <None Include="Resources\Images\FamFamFam\Update.png" />
+    <None Include="Resources\Icons\FamFamFam\Update_Icon.ico" />
+    <None Include="Resources\Images\FamFamFam\Folder.png" />
+    <None Include="Resources\Images\FamFamFam\Folder_Add.png" />
+    <None Include="Resources\Images\FamFamFam\Pause.png" />
+    <None Include="Resources\Images\FamFamFam\Play.png" />
+    <None Include="Resources\Images\FamFamFam\Connection_Add.png" />
+    <None Include="Resources\Images\FamFamFam\Connection_Duplicate.png" />
+    <None Include="Resources\Images\FamFamFam\ExtApp_Add.png" />
+    <None Include="Resources\Images\FamFamFam\ExtApp_Delete.png" />
+    <None Include="Resources\Images\FamFamFam\ExtApp_Start.png" />
+    <None Include="Resources\Images\FamFamFam\SSHTransfer.png" />
+    <None Include="Resources\Icons\FamFamFam\SSHTransfer_Icon.ico" />
+    <None Include="Resources\Images\FamFamFam\PortScan.png" />
+    <None Include="Resources\Icons\FamFamFam\PortScan_Icon.ico" />
+    <None Include="Resources\Icons\FamFamFam\Appearance_Icon.ico" />
+    <None Include="Resources\Icons\FamFamFam\Tab_Icon.ico" />
+    <None Include="Resources\Icons\FamFamFam\StartupExit_Icon.ico" />
+    <None Include="Resources\Images\FamFamFam\Console.png" />
+    <None Include="Resources\Images\FamFamFam\Inheritance_Default.png" />
+    <None Include="Resources\Images\FamFamFam\Chat.png" />
+    <None Include="Resources\Icons\FamFamFam\Panels_Icon.ico" />
+    <None Include="Resources\Images\FamFamFam\JumpTo.png" />
+    <None Include="Resources\Images\FamFamFam\Monitor_GoTo.png" />
+    <None Include="Resources\Images\FamFamFam\Monitor.png" />
     <None Include="Resources\Icons\UVNC_SC_Icon.ico" />
     <None Include="Resources\Images\UVNC_SC.png" />
     <None Include="Resources\Images\Bad_Symbol.png" />
     <None Include="Resources\Images\Good_Symbol.png" />
     <None Include="Resources\Images\ComponentsCheck.png" />
     <None Include="Resources\Icons\ComponentsCheck_Icon.ico" />
-    <None Include="Resources\Icons_FamFamFam\News_Icon.ico" />
-    <None Include="Resources\Images_FamFamFam\News.png" />
+    <None Include="Resources\Icons\FamFamFam\News_Icon.ico" />
+    <None Include="Resources\Images\FamFamFam\News.png" />
     <Content Include="Resources\Help\Main.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -1384,12 +1384,12 @@
     <Content Include="Icons\Workstation.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <None Include="Resources\Images_FamFamFam\application_side_tree.png" />
-    <None Include="Resources\Images_FamFamFam\arrow_out.png" />
-    <None Include="Resources\Images_FamFamFam\cog_error.png" />
-    <Content Include="Resources\Icons_FamFamFam\database.ico" />
-    <Content Include="Resources\Icons_FamFamFam\keyboard.ico" />
-    <Content Include="Resources\Images_FamFamFam\cog.png" />
+    <None Include="Resources\Images\FamFamFam\application_side_tree.png" />
+    <None Include="Resources\Images\FamFamFam\arrow_out.png" />
+    <None Include="Resources\Images\FamFamFam\cog_error.png" />
+    <Content Include="Resources\Icons\FamFamFam\database.ico" />
+    <Content Include="Resources\Icons\FamFamFam\keyboard.ico" />
+    <Content Include="Resources\Images\FamFamFam\cog.png" />
     <Content Include="Resources\Images\database.bmp" />
     <None Include="Resources\Images\Copy.png" />
     <None Include="Resources\Icons\mRemote_Icon.ico" />