diff --git a/ShiftOS.Server/Properties/Resources.Designer.cs b/ShiftOS.Server/Properties/Resources.Designer.cs
index 6ac4f08..aabab90 100644
--- a/ShiftOS.Server/Properties/Resources.Designer.cs
+++ b/ShiftOS.Server/Properties/Resources.Designer.cs
@@ -1,28 +1,4 @@
-/*
- * MIT License
- * 
- * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -85,15 +61,20 @@ namespace ShiftOS.Server.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &lt;html&gt;
+        ///   Looks up a localized string similar to &lt;!DOCTYPE html&gt;
+        ///&lt;html lang=&quot;en&quot; dir=&quot;ltr&quot;&gt;
         ///	&lt;head&gt;
         ///		&lt;title&gt;ShiftOS Multi-User Domain &amp;bull; Admin Panel&lt;/title&gt;
+        ///		&lt;meta charset=&quot;UTF-8&quot;&gt;
+        ///		&lt;link rel=&quot;stylesheet&quot; href=&quot;http://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css&quot;/&gt;
+        ///		&lt;script src=&quot;http://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js&quot;&gt;&lt;/script&gt;
+        ///
         ///	&lt;/head&gt;
         ///	&lt;body&gt;
-        ///		&lt;h1&gt;Welcome.&lt;/h1&gt;
-        ///		&lt;p&gt;There&apos;s nothing here, but hey, it works!&lt;/p&gt;
-        ///	&lt;/body&gt;
-        ///&lt;/html&gt;.
+        ///		&lt;nav class=&quot;navbar navbar-inverse navbar-fixed-top&quot;&gt;
+        ///			&lt;div class=&quot;container&quot;&gt;
+        ///				&lt;a class=&quot;navbar-brand&quot; href=&quot;/&quot;&gt;MUD Admin Panel&lt;/a&gt;
+        ///				&lt;ul  [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string Home {
             get {
@@ -102,15 +83,378 @@ namespace ShiftOS.Server.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &lt;html&gt;
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconArtpad {
+            get {
+                object obj = ResourceManager.GetObject("iconArtpad", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconAudioPlayer {
+            get {
+                object obj = ResourceManager.GetObject("iconAudioPlayer", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconBitnoteDigger {
+            get {
+                object obj = ResourceManager.GetObject("iconBitnoteDigger", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconBitnoteWallet {
+            get {
+                object obj = ResourceManager.GetObject("iconBitnoteWallet", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconCalculator {
+            get {
+                object obj = ResourceManager.GetObject("iconCalculator", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconClock {
+            get {
+                object obj = ResourceManager.GetObject("iconClock", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconColourPicker_fw {
+            get {
+                object obj = ResourceManager.GetObject("iconColourPicker_fw", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconDodge {
+            get {
+                object obj = ResourceManager.GetObject("iconDodge", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconDownloader {
+            get {
+                object obj = ResourceManager.GetObject("iconDownloader", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconFileOpener_fw {
+            get {
+                object obj = ResourceManager.GetObject("iconFileOpener_fw", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconFileSaver_fw {
+            get {
+                object obj = ResourceManager.GetObject("iconFileSaver_fw", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconFileSkimmer {
+            get {
+                object obj = ResourceManager.GetObject("iconFileSkimmer", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconfloodgate {
+            get {
+                object obj = ResourceManager.GetObject("iconfloodgate", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap icongraphicpicker {
+            get {
+                object obj = ResourceManager.GetObject("icongraphicpicker", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconIconManager {
+            get {
+                object obj = ResourceManager.GetObject("iconIconManager", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconInfoBox_fw {
+            get {
+                object obj = ResourceManager.GetObject("iconInfoBox_fw", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconKnowledgeInput {
+            get {
+                object obj = ResourceManager.GetObject("iconKnowledgeInput", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconmaze {
+            get {
+                object obj = ResourceManager.GetObject("iconmaze", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconNameChanger {
+            get {
+                object obj = ResourceManager.GetObject("iconNameChanger", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconoctocat {
+            get {
+                object obj = ResourceManager.GetObject("iconoctocat", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconorcwrite {
+            get {
+                object obj = ResourceManager.GetObject("iconorcwrite", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconPong {
+            get {
+                object obj = ResourceManager.GetObject("iconPong", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconShifter {
+            get {
+                object obj = ResourceManager.GetObject("iconShifter", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconShiftnet {
+            get {
+                object obj = ResourceManager.GetObject("iconShiftnet", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconShiftorium {
+            get {
+                object obj = ResourceManager.GetObject("iconShiftorium", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconshutdown {
+            get {
+                object obj = ResourceManager.GetObject("iconshutdown", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconSkinLoader {
+            get {
+                object obj = ResourceManager.GetObject("iconSkinLoader", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconSkinShifter {
+            get {
+                object obj = ResourceManager.GetObject("iconSkinShifter", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconSnakey {
+            get {
+                object obj = ResourceManager.GetObject("iconSnakey", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconSysinfo {
+            get {
+                object obj = ResourceManager.GetObject("iconSysinfo", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconTerminal {
+            get {
+                object obj = ResourceManager.GetObject("iconTerminal", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconTextPad {
+            get {
+                object obj = ResourceManager.GetObject("iconTextPad", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconunitytoggle {
+            get {
+                object obj = ResourceManager.GetObject("iconunitytoggle", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconVideoPlayer {
+            get {
+                object obj = ResourceManager.GetObject("iconVideoPlayer", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconvirusscanner {
+            get {
+                object obj = ResourceManager.GetObject("iconvirusscanner", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconWebBrowser {
+            get {
+                object obj = ResourceManager.GetObject("iconWebBrowser", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;!DOCTYPE html&gt;
+        ///&lt;html lang=&quot;en&quot; dir=&quot;ltr&gt;
         ///	&lt;head&gt;
         ///		&lt;title&gt;Multi-User Domain &amp;bull; Administration Panel - Page not found.&lt;/title&gt;
+        ///		&lt;meta charset=&quot;UTF-8&quot;&gt;
         ///	&lt;/head&gt;
         ///	&lt;body&gt;
         ///		&lt;h1&gt;This page wasn&apos;t found.&lt;/h1&gt;
         ///		&lt;p&gt;We couldn&apos;t find this page...&lt;/p&gt;
         ///	&lt;/body&gt;
-        ///&lt;/html&gt;.
+        ///&lt;/html&gt;
+        ///.
         /// </summary>
         internal static string NotFound {
             get {
diff --git a/ShiftOS.Server/Properties/Resources.resx b/ShiftOS.Server/Properties/Resources.resx
index dacce92..c8d0f26 100644
--- a/ShiftOS.Server/Properties/Resources.resx
+++ b/ShiftOS.Server/Properties/Resources.resx
@@ -121,7 +121,115 @@
   <data name="Home" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\index.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="iconArtpad" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconArtpad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconAudioPlayer" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconAudioPlayer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconBitnoteDigger" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconBitnoteDigger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconBitnoteWallet" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconBitnoteWallet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconCalculator" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconCalculator.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconClock" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconClock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconColourPicker_fw" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconColourPicker.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconDodge" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconDodge.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconDownloader" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconDownloader.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconFileOpener_fw" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconFileOpener.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconFileSaver_fw" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconFileSaver.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconFileSkimmer" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconFileSkimmer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconfloodgate" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconfloodgate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="icongraphicpicker" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icongraphicpicker.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconIconManager" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconIconManager.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconInfoBox_fw" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconInfoBox.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconKnowledgeInput" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconKnowledgeInput.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconmaze" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconmaze.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconNameChanger" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconNameChanger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconoctocat" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconoctocat.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconorcwrite" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconorcwrite.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconPong" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconPong.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconShifter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconShifter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconShiftnet" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconShiftnet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconShiftorium" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconShiftorium.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconshutdown" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconshutdown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconSkinLoader" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconSkinLoader.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconSkinShifter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconSkinShifter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconSnakey" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconSnakey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconSysinfo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconSysinfo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconTerminal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconTerminal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconTextPad" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconTextPad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconunitytoggle" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconunitytoggle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconVideoPlayer" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconVideoPlayer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconvirusscanner" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconvirusscanner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconWebBrowser" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\iconWebBrowser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="NotFound" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\404.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-</root>
+</root>
\ No newline at end of file
diff --git a/ShiftOS.Server/Resources/iconArtpad.png b/ShiftOS.Server/Resources/iconArtpad.png
new file mode 100644
index 0000000..103eef8
Binary files /dev/null and b/ShiftOS.Server/Resources/iconArtpad.png differ
diff --git a/ShiftOS.Server/Resources/iconAudioPlayer.png b/ShiftOS.Server/Resources/iconAudioPlayer.png
new file mode 100644
index 0000000..a445af4
Binary files /dev/null and b/ShiftOS.Server/Resources/iconAudioPlayer.png differ
diff --git a/ShiftOS.Server/Resources/iconBitnoteDigger.png b/ShiftOS.Server/Resources/iconBitnoteDigger.png
new file mode 100644
index 0000000..42cbae3
Binary files /dev/null and b/ShiftOS.Server/Resources/iconBitnoteDigger.png differ
diff --git a/ShiftOS.Server/Resources/iconBitnoteWallet.png b/ShiftOS.Server/Resources/iconBitnoteWallet.png
new file mode 100644
index 0000000..1f06a17
Binary files /dev/null and b/ShiftOS.Server/Resources/iconBitnoteWallet.png differ
diff --git a/ShiftOS.Server/Resources/iconCalculator.png b/ShiftOS.Server/Resources/iconCalculator.png
new file mode 100644
index 0000000..4a15583
Binary files /dev/null and b/ShiftOS.Server/Resources/iconCalculator.png differ
diff --git a/ShiftOS.Server/Resources/iconClock.png b/ShiftOS.Server/Resources/iconClock.png
new file mode 100644
index 0000000..2bcd19a
Binary files /dev/null and b/ShiftOS.Server/Resources/iconClock.png differ
diff --git a/ShiftOS.Server/Resources/iconColourPicker.fw.png b/ShiftOS.Server/Resources/iconColourPicker.fw.png
new file mode 100644
index 0000000..ece25ab
Binary files /dev/null and b/ShiftOS.Server/Resources/iconColourPicker.fw.png differ
diff --git a/ShiftOS.Server/Resources/iconDodge.png b/ShiftOS.Server/Resources/iconDodge.png
new file mode 100644
index 0000000..9a23b57
Binary files /dev/null and b/ShiftOS.Server/Resources/iconDodge.png differ
diff --git a/ShiftOS.Server/Resources/iconDownloader.png b/ShiftOS.Server/Resources/iconDownloader.png
new file mode 100644
index 0000000..9a3ef2b
Binary files /dev/null and b/ShiftOS.Server/Resources/iconDownloader.png differ
diff --git a/ShiftOS.Server/Resources/iconFileOpener.fw.png b/ShiftOS.Server/Resources/iconFileOpener.fw.png
new file mode 100644
index 0000000..578d499
Binary files /dev/null and b/ShiftOS.Server/Resources/iconFileOpener.fw.png differ
diff --git a/ShiftOS.Server/Resources/iconFileSaver.fw.png b/ShiftOS.Server/Resources/iconFileSaver.fw.png
new file mode 100644
index 0000000..351b5d4
Binary files /dev/null and b/ShiftOS.Server/Resources/iconFileSaver.fw.png differ
diff --git a/ShiftOS.Server/Resources/iconFileSkimmer.png b/ShiftOS.Server/Resources/iconFileSkimmer.png
new file mode 100644
index 0000000..cb4262b
Binary files /dev/null and b/ShiftOS.Server/Resources/iconFileSkimmer.png differ
diff --git a/ShiftOS.Server/Resources/iconIconManager.png b/ShiftOS.Server/Resources/iconIconManager.png
new file mode 100644
index 0000000..99246e9
Binary files /dev/null and b/ShiftOS.Server/Resources/iconIconManager.png differ
diff --git a/ShiftOS.Server/Resources/iconInfoBox.fw.png b/ShiftOS.Server/Resources/iconInfoBox.fw.png
new file mode 100644
index 0000000..0c9ebbd
Binary files /dev/null and b/ShiftOS.Server/Resources/iconInfoBox.fw.png differ
diff --git a/ShiftOS.Server/Resources/iconKnowledgeInput.png b/ShiftOS.Server/Resources/iconKnowledgeInput.png
new file mode 100644
index 0000000..b5e513f
Binary files /dev/null and b/ShiftOS.Server/Resources/iconKnowledgeInput.png differ
diff --git a/ShiftOS.Server/Resources/iconNameChanger.png b/ShiftOS.Server/Resources/iconNameChanger.png
new file mode 100644
index 0000000..7d94b21
Binary files /dev/null and b/ShiftOS.Server/Resources/iconNameChanger.png differ
diff --git a/ShiftOS.Server/Resources/iconPong.png b/ShiftOS.Server/Resources/iconPong.png
new file mode 100644
index 0000000..c96cd58
Binary files /dev/null and b/ShiftOS.Server/Resources/iconPong.png differ
diff --git a/ShiftOS.Server/Resources/iconShifter.png b/ShiftOS.Server/Resources/iconShifter.png
new file mode 100644
index 0000000..07344bf
Binary files /dev/null and b/ShiftOS.Server/Resources/iconShifter.png differ
diff --git a/ShiftOS.Server/Resources/iconShiftnet.png b/ShiftOS.Server/Resources/iconShiftnet.png
new file mode 100644
index 0000000..405662d
Binary files /dev/null and b/ShiftOS.Server/Resources/iconShiftnet.png differ
diff --git a/ShiftOS.Server/Resources/iconShiftorium.png b/ShiftOS.Server/Resources/iconShiftorium.png
new file mode 100644
index 0000000..a72239e
Binary files /dev/null and b/ShiftOS.Server/Resources/iconShiftorium.png differ
diff --git a/ShiftOS.Server/Resources/iconSkinLoader.png b/ShiftOS.Server/Resources/iconSkinLoader.png
new file mode 100644
index 0000000..1df8f53
Binary files /dev/null and b/ShiftOS.Server/Resources/iconSkinLoader.png differ
diff --git a/ShiftOS.Server/Resources/iconSkinShifter.png b/ShiftOS.Server/Resources/iconSkinShifter.png
new file mode 100644
index 0000000..cccc0d1
Binary files /dev/null and b/ShiftOS.Server/Resources/iconSkinShifter.png differ
diff --git a/ShiftOS.Server/Resources/iconSnakey.png b/ShiftOS.Server/Resources/iconSnakey.png
new file mode 100644
index 0000000..469367c
Binary files /dev/null and b/ShiftOS.Server/Resources/iconSnakey.png differ
diff --git a/ShiftOS.Server/Resources/iconSysinfo.png b/ShiftOS.Server/Resources/iconSysinfo.png
new file mode 100644
index 0000000..0d1146b
Binary files /dev/null and b/ShiftOS.Server/Resources/iconSysinfo.png differ
diff --git a/ShiftOS.Server/Resources/iconTerminal.png b/ShiftOS.Server/Resources/iconTerminal.png
new file mode 100644
index 0000000..df5e779
Binary files /dev/null and b/ShiftOS.Server/Resources/iconTerminal.png differ
diff --git a/ShiftOS.Server/Resources/iconTextPad.png b/ShiftOS.Server/Resources/iconTextPad.png
new file mode 100644
index 0000000..0d536ce
Binary files /dev/null and b/ShiftOS.Server/Resources/iconTextPad.png differ
diff --git a/ShiftOS.Server/Resources/iconVideoPlayer.png b/ShiftOS.Server/Resources/iconVideoPlayer.png
new file mode 100644
index 0000000..17a9043
Binary files /dev/null and b/ShiftOS.Server/Resources/iconVideoPlayer.png differ
diff --git a/ShiftOS.Server/Resources/iconWebBrowser.png b/ShiftOS.Server/Resources/iconWebBrowser.png
new file mode 100644
index 0000000..e22117f
Binary files /dev/null and b/ShiftOS.Server/Resources/iconWebBrowser.png differ
diff --git a/ShiftOS.Server/Resources/iconfloodgate.png b/ShiftOS.Server/Resources/iconfloodgate.png
new file mode 100644
index 0000000..2a7c483
Binary files /dev/null and b/ShiftOS.Server/Resources/iconfloodgate.png differ
diff --git a/ShiftOS.Server/Resources/icongraphicpicker.png b/ShiftOS.Server/Resources/icongraphicpicker.png
new file mode 100644
index 0000000..59ded9f
Binary files /dev/null and b/ShiftOS.Server/Resources/icongraphicpicker.png differ
diff --git a/ShiftOS.Server/Resources/iconmaze.png b/ShiftOS.Server/Resources/iconmaze.png
new file mode 100644
index 0000000..18c3c3f
Binary files /dev/null and b/ShiftOS.Server/Resources/iconmaze.png differ
diff --git a/ShiftOS.Server/Resources/iconoctocat.bmp b/ShiftOS.Server/Resources/iconoctocat.bmp
new file mode 100644
index 0000000..b1addaa
Binary files /dev/null and b/ShiftOS.Server/Resources/iconoctocat.bmp differ
diff --git a/ShiftOS.Server/Resources/iconorcwrite.png b/ShiftOS.Server/Resources/iconorcwrite.png
new file mode 100644
index 0000000..e1c2862
Binary files /dev/null and b/ShiftOS.Server/Resources/iconorcwrite.png differ
diff --git a/ShiftOS.Server/Resources/iconshutdown.png b/ShiftOS.Server/Resources/iconshutdown.png
new file mode 100644
index 0000000..d4959c2
Binary files /dev/null and b/ShiftOS.Server/Resources/iconshutdown.png differ
diff --git a/ShiftOS.Server/Resources/iconunitytoggle.png b/ShiftOS.Server/Resources/iconunitytoggle.png
new file mode 100644
index 0000000..450b092
Binary files /dev/null and b/ShiftOS.Server/Resources/iconunitytoggle.png differ
diff --git a/ShiftOS.Server/Resources/iconvirusscanner.png b/ShiftOS.Server/Resources/iconvirusscanner.png
new file mode 100644
index 0000000..5fcb50c
Binary files /dev/null and b/ShiftOS.Server/Resources/iconvirusscanner.png differ
diff --git a/ShiftOS.Server/ShiftOS.Server.csproj b/ShiftOS.Server/ShiftOS.Server.csproj
index 6c039c2..d68aa3e 100644
--- a/ShiftOS.Server/ShiftOS.Server.csproj
+++ b/ShiftOS.Server/ShiftOS.Server.csproj
@@ -38,6 +38,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -82,6 +83,114 @@
   <ItemGroup>
     <None Include="Resources\Home.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconArtpad.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconAudioPlayer.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconBitnoteDigger.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconBitnoteWallet.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconCalculator.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconClock.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconColourPicker.fw.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconDodge.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconDownloader.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconFileOpener.fw.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconFileSaver.fw.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconFileSkimmer.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconfloodgate.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\icongraphicpicker.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconIconManager.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconInfoBox.fw.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconKnowledgeInput.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconmaze.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconNameChanger.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconoctocat.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconorcwrite.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconPong.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconShifter.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconShiftnet.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconShiftorium.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconshutdown.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconSkinLoader.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconSkinShifter.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconSnakey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconSysinfo.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconTerminal.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconTextPad.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconunitytoggle.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconVideoPlayer.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconvirusscanner.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\iconWebBrowser.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ShiftOS.WinForms/Program.cs b/ShiftOS.WinForms/Program.cs
index 0ed5b02..06f495f 100644
--- a/ShiftOS.WinForms/Program.cs
+++ b/ShiftOS.WinForms/Program.cs
@@ -33,6 +33,7 @@ using Newtonsoft.Json;
 using static ShiftOS.Objects.ShiftFS.Utils;
 using ShiftOS.WinForms.Applications;
 using ShiftOS.WinForms.Tools;
+using System.Reflection;
 
 namespace ShiftOS.WinForms
 {
@@ -71,6 +72,26 @@ namespace ShiftOS.WinForms
         }
     }
 
+    internal class ShiftOSIconProvider : IIconProber
+    {
+        public Image GetIcon(DefaultIconAttribute attr)
+        {
+            
+            var res = typeof(Properties.Resources);
+            foreach(var prop in res.GetProperties(BindingFlags.NonPublic | BindingFlags.Static))
+            {
+                if(prop.PropertyType.BaseType == typeof(Image))
+                {
+                    if(prop.Name == attr.ID)
+                    {
+                        return prop.GetValue(null) as Image;
+                    }
+                }
+            }
+            return new Bitmap(16, 16);
+        }
+    }
+
     internal class WinformsShiftoriumProvider : IShiftoriumProvider
     {
         public List<ShiftoriumUpgrade> GetDefaults()
diff --git a/ShiftOS.WinForms/Properties/Resources.Designer.cs b/ShiftOS.WinForms/Properties/Resources.Designer.cs
index 7fc4cd7..f0a5e03 100644
--- a/ShiftOS.WinForms/Properties/Resources.Designer.cs
+++ b/ShiftOS.WinForms/Properties/Resources.Designer.cs
@@ -489,6 +489,16 @@ namespace ShiftOS.WinForms.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap IconTerminal {
+            get {
+                object obj = ResourceManager.GetObject("IconTerminal", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to [
         ///	&quot;english&quot;
diff --git a/ShiftOS.WinForms/Properties/Resources.resx b/ShiftOS.WinForms/Properties/Resources.resx
index 8efe1d1..604a466 100644
--- a/ShiftOS.WinForms/Properties/Resources.resx
+++ b/ShiftOS.WinForms/Properties/Resources.resx
@@ -268,4 +268,7 @@
   <data name="DefaultMouse" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\DefaultMouse.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="IconTerminal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\IconTerminal.bmp;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/ShiftOS.WinForms/Resources/IconTerminal.bmp b/ShiftOS.WinForms/Resources/IconTerminal.bmp
new file mode 100644
index 0000000..9a5d373
Binary files /dev/null and b/ShiftOS.WinForms/Resources/IconTerminal.bmp differ
diff --git a/ShiftOS.WinForms/Resources/Shiftorium.txt b/ShiftOS.WinForms/Resources/Shiftorium.txt
index cf637f4..af30613 100644
--- a/ShiftOS.WinForms/Resources/Shiftorium.txt
+++ b/ShiftOS.WinForms/Resources/Shiftorium.txt
@@ -5,6 +5,11 @@
 		Description: "Some basic commands for the terminal that'll help you out in the multi-user domain.",
 		Dependencies: null
 	},
+	{
+		Name: "Audio Volume",
+		Cost: 50,
+		Description: "Want to adjust the volume of ShiftOS's audio? This upgrade will let you."
+	},
 	{
 		Name: "Color Depth Dithering",
 		Cost: 1000,
diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
index d86e502..f2a65ac 100644
--- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj
+++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
@@ -463,6 +463,7 @@
     <None Include="Resources\strings_en.txt" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\IconTerminal.bmp" />
     <None Include="Resources\sys_shiftoriumstory.txt" />
     <None Include="Resources\DefaultMouse.bmp" />
     <Content Include="Resources\hello.txt" />
diff --git a/ShiftOS.WinForms/SystemIcons/iconArtpad.png b/ShiftOS.WinForms/SystemIcons/iconArtpad.png
new file mode 100644
index 0000000..103eef8
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconArtpad.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconAudioPlayer.png b/ShiftOS.WinForms/SystemIcons/iconAudioPlayer.png
new file mode 100644
index 0000000..a445af4
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconAudioPlayer.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconBitnoteDigger.png b/ShiftOS.WinForms/SystemIcons/iconBitnoteDigger.png
new file mode 100644
index 0000000..42cbae3
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconBitnoteDigger.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconBitnoteWallet.png b/ShiftOS.WinForms/SystemIcons/iconBitnoteWallet.png
new file mode 100644
index 0000000..1f06a17
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconBitnoteWallet.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconCalculator.png b/ShiftOS.WinForms/SystemIcons/iconCalculator.png
new file mode 100644
index 0000000..4a15583
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconCalculator.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconClock.png b/ShiftOS.WinForms/SystemIcons/iconClock.png
new file mode 100644
index 0000000..2bcd19a
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconClock.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconColourPicker.fw.png b/ShiftOS.WinForms/SystemIcons/iconColourPicker.fw.png
new file mode 100644
index 0000000..ece25ab
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconColourPicker.fw.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconDodge.png b/ShiftOS.WinForms/SystemIcons/iconDodge.png
new file mode 100644
index 0000000..9a23b57
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconDodge.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconDownloader.png b/ShiftOS.WinForms/SystemIcons/iconDownloader.png
new file mode 100644
index 0000000..9a3ef2b
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconDownloader.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconFileOpener.fw.png b/ShiftOS.WinForms/SystemIcons/iconFileOpener.fw.png
new file mode 100644
index 0000000..578d499
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconFileOpener.fw.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconFileSaver.fw.png b/ShiftOS.WinForms/SystemIcons/iconFileSaver.fw.png
new file mode 100644
index 0000000..351b5d4
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconFileSaver.fw.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconFileSkimmer.png b/ShiftOS.WinForms/SystemIcons/iconFileSkimmer.png
new file mode 100644
index 0000000..cb4262b
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconFileSkimmer.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconIconManager.png b/ShiftOS.WinForms/SystemIcons/iconIconManager.png
new file mode 100644
index 0000000..99246e9
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconIconManager.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconInfoBox.fw.png b/ShiftOS.WinForms/SystemIcons/iconInfoBox.fw.png
new file mode 100644
index 0000000..0c9ebbd
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconInfoBox.fw.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconKnowledgeInput.png b/ShiftOS.WinForms/SystemIcons/iconKnowledgeInput.png
new file mode 100644
index 0000000..b5e513f
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconKnowledgeInput.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconNameChanger.png b/ShiftOS.WinForms/SystemIcons/iconNameChanger.png
new file mode 100644
index 0000000..7d94b21
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconNameChanger.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconPong.png b/ShiftOS.WinForms/SystemIcons/iconPong.png
new file mode 100644
index 0000000..c96cd58
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconPong.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconShifter.png b/ShiftOS.WinForms/SystemIcons/iconShifter.png
new file mode 100644
index 0000000..07344bf
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconShifter.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconShiftnet.png b/ShiftOS.WinForms/SystemIcons/iconShiftnet.png
new file mode 100644
index 0000000..405662d
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconShiftnet.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconShiftorium.png b/ShiftOS.WinForms/SystemIcons/iconShiftorium.png
new file mode 100644
index 0000000..a72239e
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconShiftorium.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconSkinLoader.png b/ShiftOS.WinForms/SystemIcons/iconSkinLoader.png
new file mode 100644
index 0000000..1df8f53
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconSkinLoader.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconSkinShifter.png b/ShiftOS.WinForms/SystemIcons/iconSkinShifter.png
new file mode 100644
index 0000000..cccc0d1
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconSkinShifter.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconSnakey.png b/ShiftOS.WinForms/SystemIcons/iconSnakey.png
new file mode 100644
index 0000000..469367c
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconSnakey.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconSysinfo.png b/ShiftOS.WinForms/SystemIcons/iconSysinfo.png
new file mode 100644
index 0000000..0d1146b
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconSysinfo.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconTerminal.png b/ShiftOS.WinForms/SystemIcons/iconTerminal.png
new file mode 100644
index 0000000..df5e779
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconTerminal.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconTextPad.png b/ShiftOS.WinForms/SystemIcons/iconTextPad.png
new file mode 100644
index 0000000..0d536ce
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconTextPad.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconVideoPlayer.png b/ShiftOS.WinForms/SystemIcons/iconVideoPlayer.png
new file mode 100644
index 0000000..17a9043
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconVideoPlayer.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconWebBrowser.png b/ShiftOS.WinForms/SystemIcons/iconWebBrowser.png
new file mode 100644
index 0000000..e22117f
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconWebBrowser.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconfloodgate.png b/ShiftOS.WinForms/SystemIcons/iconfloodgate.png
new file mode 100644
index 0000000..2a7c483
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconfloodgate.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/icongraphicpicker.png b/ShiftOS.WinForms/SystemIcons/icongraphicpicker.png
new file mode 100644
index 0000000..59ded9f
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/icongraphicpicker.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconmaze.png b/ShiftOS.WinForms/SystemIcons/iconmaze.png
new file mode 100644
index 0000000..18c3c3f
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconmaze.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconoctocat.bmp b/ShiftOS.WinForms/SystemIcons/iconoctocat.bmp
new file mode 100644
index 0000000..b1addaa
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconoctocat.bmp differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconorcwrite.png b/ShiftOS.WinForms/SystemIcons/iconorcwrite.png
new file mode 100644
index 0000000..e1c2862
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconorcwrite.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconshutdown.png b/ShiftOS.WinForms/SystemIcons/iconshutdown.png
new file mode 100644
index 0000000..d4959c2
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconshutdown.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconunitytoggle.png b/ShiftOS.WinForms/SystemIcons/iconunitytoggle.png
new file mode 100644
index 0000000..450b092
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconunitytoggle.png differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconvirusscanner.png b/ShiftOS.WinForms/SystemIcons/iconvirusscanner.png
new file mode 100644
index 0000000..5fcb50c
Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconvirusscanner.png differ
diff --git a/ShiftOS_TheReturn/Skinning.cs b/ShiftOS_TheReturn/Skinning.cs
index d155688..4cf3834 100644
--- a/ShiftOS_TheReturn/Skinning.cs
+++ b/ShiftOS_TheReturn/Skinning.cs
@@ -33,6 +33,7 @@ using Newtonsoft.Json;
 using System.Windows.Forms;
 using static ShiftOS.Engine.SaveSystem;
 using ShiftOS.Objects.ShiftFS;
+using System.Reflection;
 
 namespace ShiftOS.Engine {
     public static class SkinEngine {
@@ -113,13 +114,51 @@ namespace ShiftOS.Engine {
             Utils.WriteAllText(Paths.GetPath("skin.json"), JsonConvert.SerializeObject(LoadedSkin, Formatting.Indented));
         }
 
+        private static IIconProber _iconProber = null;
+
+        public static Image GetDefaultIcon(string id)
+        {
+            if (_iconProber == null)
+            {
+                return new Bitmap(16, 16);
+            }
+            else
+            {
+                foreach(var f in System.IO.Directory.GetFiles(Environment.CurrentDirectory))
+                {
+                    if(f.EndsWith(".exe") || f.EndsWith(".dll"))
+                    {
+                        try
+                        {
+                            var asm = Assembly.LoadFile(f);
+                            foreach(var type in asm.GetTypes())
+                            {
+                                if(type.Name == id)
+                                {
+                                    foreach(var attr in type.GetCustomAttributes(true))
+                                    {
+                                        if(attr is DefaultIconAttribute)
+                                        {
+                                            return _iconProber.GetIcon(attr as DefaultIconAttribute);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        catch { }
+                    }
+                }
+                return new Bitmap(16, 16);
+            }
+        }
+
         public static Image GetIcon(string id)
         {
             if (!LoadedSkin.AppIcons.ContainsKey(id))
                 LoadedSkin.AppIcons.Add(id, null);
 
             if (LoadedSkin.AppIcons[id] == null)
-                return new Bitmap(16, 16);
+                return GetDefaultIcon(id);
             else
             {
                 using (var sr = new MemoryStream(LoadedSkin.AppIcons[id]))
@@ -131,6 +170,21 @@ namespace ShiftOS.Engine {
         }
     }
 
+    public interface IIconProber
+    {
+        Image GetIcon(DefaultIconAttribute attr);
+    }
+
+    public class DefaultIconAttribute : Attribute
+    {
+        public DefaultIconAttribute(string id)
+        {
+            ID = id;
+        }
+
+        public string ID { get; private set; }
+    }
+
     public class Skin {
         //borrowing from the discourse theme for the default skin
         private static readonly Color DefaultBackground = Color.FromArgb(0, 0x44, 0x00);