diff --git a/Quasar.Server/Properties/Resources.resx b/Quasar.Server/Properties/Resources.resx
index 4bdf3dfb..c6fb5233 100644
--- a/Quasar.Server/Properties/Resources.resx
+++ b/Quasar.Server/Properties/Resources.resx
@@ -250,7 +250,7 @@ SOFTWARE.
..\Images\keyboard_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\icons\Quasar_Server.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Images\Icons\Quasar_Server.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Images\keyboard_magnify.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -282,4 +282,4 @@ SOFTWARE.
..\Images\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
\ No newline at end of file
+
diff --git a/Quasar.Server/images/actions.png b/Quasar.Server/images/actions.png
deleted file mode 100644
index d7da5017..00000000
Binary files a/Quasar.Server/images/actions.png and /dev/null differ
diff --git a/Quasar.Server/images/application.png b/Quasar.Server/images/application.png
deleted file mode 100644
index 9d372aab..00000000
Binary files a/Quasar.Server/images/application.png and /dev/null differ
diff --git a/Quasar.Server/images/application_add.png b/Quasar.Server/images/application_add.png
deleted file mode 100644
index 2e945076..00000000
Binary files a/Quasar.Server/images/application_add.png and /dev/null differ
diff --git a/Quasar.Server/images/application_cascade.png b/Quasar.Server/images/application_cascade.png
deleted file mode 100644
index da5c622e..00000000
Binary files a/Quasar.Server/images/application_cascade.png and /dev/null differ
diff --git a/Quasar.Server/images/application_delete.png b/Quasar.Server/images/application_delete.png
deleted file mode 100644
index 0a335acf..00000000
Binary files a/Quasar.Server/images/application_delete.png and /dev/null differ
diff --git a/Quasar.Server/images/application_edit.png b/Quasar.Server/images/application_edit.png
deleted file mode 100644
index fb2efb87..00000000
Binary files a/Quasar.Server/images/application_edit.png and /dev/null differ
diff --git a/Quasar.Server/images/application_go.png b/Quasar.Server/images/application_go.png
deleted file mode 100644
index 5cc2b0dd..00000000
Binary files a/Quasar.Server/images/application_go.png and /dev/null differ
diff --git a/Quasar.Server/images/archive.png b/Quasar.Server/images/archive.png
deleted file mode 100644
index f0756cd2..00000000
Binary files a/Quasar.Server/images/archive.png and /dev/null differ
diff --git a/Quasar.Server/images/arrow_down.png b/Quasar.Server/images/arrow_down.png
deleted file mode 100644
index 2c4e2793..00000000
Binary files a/Quasar.Server/images/arrow_down.png and /dev/null differ
diff --git a/Quasar.Server/images/arrow_up.png b/Quasar.Server/images/arrow_up.png
deleted file mode 100644
index 1ebb1932..00000000
Binary files a/Quasar.Server/images/arrow_up.png and /dev/null differ
diff --git a/Quasar.Server/images/back.png b/Quasar.Server/images/back.png
deleted file mode 100644
index d9c50c4d..00000000
Binary files a/Quasar.Server/images/back.png and /dev/null differ
diff --git a/Quasar.Server/images/bricks.png b/Quasar.Server/images/bricks.png
deleted file mode 100644
index 0905f933..00000000
Binary files a/Quasar.Server/images/bricks.png and /dev/null differ
diff --git a/Quasar.Server/images/broom.png b/Quasar.Server/images/broom.png
deleted file mode 100644
index 2c6152ef..00000000
Binary files a/Quasar.Server/images/broom.png and /dev/null differ
diff --git a/Quasar.Server/images/cancel.png b/Quasar.Server/images/cancel.png
deleted file mode 100644
index c149c2bc..00000000
Binary files a/Quasar.Server/images/cancel.png and /dev/null differ
diff --git a/Quasar.Server/images/cog.png b/Quasar.Server/images/cog.png
deleted file mode 100644
index 67de2c6c..00000000
Binary files a/Quasar.Server/images/cog.png and /dev/null differ
diff --git a/Quasar.Server/images/computer.png b/Quasar.Server/images/computer.png
deleted file mode 100644
index 9bc37dce..00000000
Binary files a/Quasar.Server/images/computer.png and /dev/null differ
diff --git a/Quasar.Server/images/delete.png b/Quasar.Server/images/delete.png
deleted file mode 100644
index 08f24936..00000000
Binary files a/Quasar.Server/images/delete.png and /dev/null differ
diff --git a/Quasar.Server/images/done.png b/Quasar.Server/images/done.png
deleted file mode 100644
index a9925a06..00000000
Binary files a/Quasar.Server/images/done.png and /dev/null differ
diff --git a/Quasar.Server/images/drive_go.png b/Quasar.Server/images/drive_go.png
deleted file mode 100644
index fc53379e..00000000
Binary files a/Quasar.Server/images/drive_go.png and /dev/null differ
diff --git a/Quasar.Server/images/eye.png b/Quasar.Server/images/eye.png
deleted file mode 100644
index 564a1a97..00000000
Binary files a/Quasar.Server/images/eye.png and /dev/null differ
diff --git a/Quasar.Server/images/file.png b/Quasar.Server/images/file.png
deleted file mode 100644
index d60cc398..00000000
Binary files a/Quasar.Server/images/file.png and /dev/null differ
diff --git a/Quasar.Server/images/folder.png b/Quasar.Server/images/folder.png
deleted file mode 100644
index 784e8fa4..00000000
Binary files a/Quasar.Server/images/folder.png and /dev/null differ
diff --git a/Quasar.Server/images/image.png b/Quasar.Server/images/image.png
deleted file mode 100644
index 2c6e4ce0..00000000
Binary files a/Quasar.Server/images/image.png and /dev/null differ
diff --git a/Quasar.Server/images/information.png b/Quasar.Server/images/information.png
deleted file mode 100644
index 12cd1aef..00000000
Binary files a/Quasar.Server/images/information.png and /dev/null differ
diff --git a/Quasar.Server/images/key_go.png b/Quasar.Server/images/key_go.png
deleted file mode 100644
index 30b0dc31..00000000
Binary files a/Quasar.Server/images/key_go.png and /dev/null differ
diff --git a/Quasar.Server/images/keyboard_add.png b/Quasar.Server/images/keyboard_add.png
deleted file mode 100644
index 26938dd0..00000000
Binary files a/Quasar.Server/images/keyboard_add.png and /dev/null differ
diff --git a/Quasar.Server/images/keyboard_delete.png b/Quasar.Server/images/keyboard_delete.png
deleted file mode 100644
index 1786ed5b..00000000
Binary files a/Quasar.Server/images/keyboard_delete.png and /dev/null differ
diff --git a/Quasar.Server/images/keyboard_magnify.png b/Quasar.Server/images/keyboard_magnify.png
deleted file mode 100644
index 928fc17b..00000000
Binary files a/Quasar.Server/images/keyboard_magnify.png and /dev/null differ
diff --git a/Quasar.Server/images/lightning.png b/Quasar.Server/images/lightning.png
deleted file mode 100644
index 9680afd1..00000000
Binary files a/Quasar.Server/images/lightning.png and /dev/null differ
diff --git a/Quasar.Server/images/monitor.png b/Quasar.Server/images/monitor.png
deleted file mode 100644
index d040bd02..00000000
Binary files a/Quasar.Server/images/monitor.png and /dev/null differ
diff --git a/Quasar.Server/images/monitoring.png b/Quasar.Server/images/monitoring.png
deleted file mode 100644
index 110dc865..00000000
Binary files a/Quasar.Server/images/monitoring.png and /dev/null differ
diff --git a/Quasar.Server/images/mouse_add.png b/Quasar.Server/images/mouse_add.png
deleted file mode 100644
index 65bcab52..00000000
Binary files a/Quasar.Server/images/mouse_add.png and /dev/null differ
diff --git a/Quasar.Server/images/mouse_delete.png b/Quasar.Server/images/mouse_delete.png
deleted file mode 100644
index 72865668..00000000
Binary files a/Quasar.Server/images/mouse_delete.png and /dev/null differ
diff --git a/Quasar.Server/images/movie.png b/Quasar.Server/images/movie.png
deleted file mode 100644
index b4ad8738..00000000
Binary files a/Quasar.Server/images/movie.png and /dev/null differ
diff --git a/Quasar.Server/images/music.png b/Quasar.Server/images/music.png
deleted file mode 100644
index 3956a26c..00000000
Binary files a/Quasar.Server/images/music.png and /dev/null differ
diff --git a/Quasar.Server/images/page_copy.png b/Quasar.Server/images/page_copy.png
deleted file mode 100644
index 195dc6d6..00000000
Binary files a/Quasar.Server/images/page_copy.png and /dev/null differ
diff --git a/Quasar.Server/images/pdf.png b/Quasar.Server/images/pdf.png
deleted file mode 100644
index 7a6dcb42..00000000
Binary files a/Quasar.Server/images/pdf.png and /dev/null differ
diff --git a/Quasar.Server/images/refresh.png b/Quasar.Server/images/refresh.png
deleted file mode 100644
index 0de26566..00000000
Binary files a/Quasar.Server/images/refresh.png and /dev/null differ
diff --git a/Quasar.Server/images/reg_binary.png b/Quasar.Server/images/reg_binary.png
deleted file mode 100644
index 1485bf89..00000000
Binary files a/Quasar.Server/images/reg_binary.png and /dev/null differ
diff --git a/Quasar.Server/images/reg_string.png b/Quasar.Server/images/reg_string.png
deleted file mode 100644
index a451501e..00000000
Binary files a/Quasar.Server/images/reg_string.png and /dev/null differ
diff --git a/Quasar.Server/images/registry.png b/Quasar.Server/images/registry.png
deleted file mode 100644
index cfc2702a..00000000
Binary files a/Quasar.Server/images/registry.png and /dev/null differ
diff --git a/Quasar.Server/images/restart.png b/Quasar.Server/images/restart.png
deleted file mode 100644
index 97be114a..00000000
Binary files a/Quasar.Server/images/restart.png and /dev/null differ
diff --git a/Quasar.Server/images/save.png b/Quasar.Server/images/save.png
deleted file mode 100644
index 0d531eb7..00000000
Binary files a/Quasar.Server/images/save.png and /dev/null differ
diff --git a/Quasar.Server/images/server.png b/Quasar.Server/images/server.png
deleted file mode 100644
index 720a237c..00000000
Binary files a/Quasar.Server/images/server.png and /dev/null differ
diff --git a/Quasar.Server/images/server_add.png b/Quasar.Server/images/server_add.png
deleted file mode 100644
index 3f10a3a9..00000000
Binary files a/Quasar.Server/images/server_add.png and /dev/null differ
diff --git a/Quasar.Server/images/server_delete.png b/Quasar.Server/images/server_delete.png
deleted file mode 100644
index 61e740fe..00000000
Binary files a/Quasar.Server/images/server_delete.png and /dev/null differ
diff --git a/Quasar.Server/images/server_disconnect.png b/Quasar.Server/images/server_disconnect.png
deleted file mode 100644
index 49b26914..00000000
Binary files a/Quasar.Server/images/server_disconnect.png and /dev/null differ
diff --git a/Quasar.Server/images/server_go.png b/Quasar.Server/images/server_go.png
deleted file mode 100644
index 540c8e26..00000000
Binary files a/Quasar.Server/images/server_go.png and /dev/null differ
diff --git a/Quasar.Server/images/server_link.png b/Quasar.Server/images/server_link.png
deleted file mode 100644
index e8821dfd..00000000
Binary files a/Quasar.Server/images/server_link.png and /dev/null differ
diff --git a/Quasar.Server/images/shutdown.png b/Quasar.Server/images/shutdown.png
deleted file mode 100644
index baaedc9d..00000000
Binary files a/Quasar.Server/images/shutdown.png and /dev/null differ
diff --git a/Quasar.Server/images/standby.png b/Quasar.Server/images/standby.png
deleted file mode 100644
index 68debea3..00000000
Binary files a/Quasar.Server/images/standby.png and /dev/null differ
diff --git a/Quasar.Server/images/terminal.png b/Quasar.Server/images/terminal.png
deleted file mode 100644
index 4efd07a4..00000000
Binary files a/Quasar.Server/images/terminal.png and /dev/null differ
diff --git a/Quasar.Server/images/text.png b/Quasar.Server/images/text.png
deleted file mode 100644
index ed841a02..00000000
Binary files a/Quasar.Server/images/text.png and /dev/null differ
diff --git a/Quasar.Server/images/textfield_rename.png b/Quasar.Server/images/textfield_rename.png
deleted file mode 100644
index 4e3688ed..00000000
Binary files a/Quasar.Server/images/textfield_rename.png and /dev/null differ
diff --git a/Quasar.Server/images/transmit_blue.png b/Quasar.Server/images/transmit_blue.png
deleted file mode 100644
index 7b1142fc..00000000
Binary files a/Quasar.Server/images/transmit_blue.png and /dev/null differ
diff --git a/Quasar.Server/images/uac_shield.png b/Quasar.Server/images/uac_shield.png
deleted file mode 100644
index 6a21ee58..00000000
Binary files a/Quasar.Server/images/uac_shield.png and /dev/null differ
diff --git a/Quasar.Server/images/user.png b/Quasar.Server/images/user.png
deleted file mode 100644
index 79f35ccb..00000000
Binary files a/Quasar.Server/images/user.png and /dev/null differ
diff --git a/Quasar.Server/images/website.png b/Quasar.Server/images/website.png
deleted file mode 100644
index b8895dde..00000000
Binary files a/Quasar.Server/images/website.png and /dev/null differ
diff --git a/Quasar.Server/images/word.png b/Quasar.Server/images/word.png
deleted file mode 100644
index 462d894d..00000000
Binary files a/Quasar.Server/images/word.png and /dev/null differ
diff --git a/Quasar.Server/images/world_go.png b/Quasar.Server/images/world_go.png
deleted file mode 100644
index aee9c97f..00000000
Binary files a/Quasar.Server/images/world_go.png and /dev/null differ
diff --git a/Quasar.Server/images/world_link.png b/Quasar.Server/images/world_link.png
deleted file mode 100644
index b8edc126..00000000
Binary files a/Quasar.Server/images/world_link.png and /dev/null differ