diff --git a/ShiftOS.WinForms/Applications/Artpad.cs b/ShiftOS.WinForms/Applications/Artpad.cs
index ec26cef..c3b717b 100644
--- a/ShiftOS.WinForms/Applications/Artpad.cs
+++ b/ShiftOS.WinForms/Applications/Artpad.cs
@@ -44,6 +44,7 @@ namespace ShiftOS.WinForms.Applications
     [Launcher("Artpad", true, "al_artpad", "Graphics")]
     [RequiresUpgrade("artpad")]
     [WinOpen("artpad")]
+    [DefaultIcon("iconArtpad")]
     public partial class Artpad : UserControl, IShiftOSWindow
     {
         /// <summary>
diff --git a/ShiftOS.WinForms/Applications/MUDControlCentre.cs b/ShiftOS.WinForms/Applications/MUDControlCentre.cs
index 0479268..595d2e8 100644
--- a/ShiftOS.WinForms/Applications/MUDControlCentre.cs
+++ b/ShiftOS.WinForms/Applications/MUDControlCentre.cs
@@ -41,6 +41,7 @@ namespace ShiftOS.WinForms.Applications
     [RequiresUpgrade("mud_fundamentals")]
     [Launcher("MUD Control Centre", true, "al_mud_control_centre", "Networking")]
     [WinOpen("mud_control_centre")]
+    [DefaultIcon("iconSysinfo")]
     [DefaultTitle("MUD Control Centre")]
     public partial class MUDControlCentre : UserControl, IShiftOSWindow
     {
diff --git a/ShiftOS.WinForms/Applications/NameChanger.cs b/ShiftOS.WinForms/Applications/NameChanger.cs
index c983841..d78c329 100644
--- a/ShiftOS.WinForms/Applications/NameChanger.cs
+++ b/ShiftOS.WinForms/Applications/NameChanger.cs
@@ -180,17 +180,22 @@ namespace ShiftOS.WinForms.Applications {
         }
 
         public static string GetName(IShiftOSWindow win)
+        {
+            return GetNameRaw(win.GetType());
+        }
+
+        internal static string GetNameRaw(Type type)
         {
             if (SkinEngine.LoadedSkin == null)
-                return AppearanceManager.GetDefaultTitle(win.GetType());
+                return AppearanceManager.GetDefaultTitle(type);
 
             if (SkinEngine.LoadedSkin.AppNames == null)
                 SkinEngine.LoadedSkin.AppNames = GetDefault();
 
-            if (!SkinEngine.LoadedSkin.AppNames.ContainsKey(win.GetType().Name))
-                SkinEngine.LoadedSkin.AppNames.Add(win.GetType().Name, AppearanceManager.GetDefaultTitle(win.GetType()));
+            if (!SkinEngine.LoadedSkin.AppNames.ContainsKey(type.Name))
+                SkinEngine.LoadedSkin.AppNames.Add(type.Name, AppearanceManager.GetDefaultTitle(type));
 
-            return SkinEngine.LoadedSkin.AppNames[win.GetType().Name];
+            return SkinEngine.LoadedSkin.AppNames[type.Name];
         }
     }
 }
diff --git a/ShiftOS.WinForms/Applications/Pong.cs b/ShiftOS.WinForms/Applications/Pong.cs
index 82c86e5..d61e1fd 100644
--- a/ShiftOS.WinForms/Applications/Pong.cs
+++ b/ShiftOS.WinForms/Applications/Pong.cs
@@ -39,6 +39,7 @@ namespace ShiftOS.WinForms.Applications
 {
     [Launcher("Pong", true, "al_pong", "Games")]
     [WinOpen("pong")]
+    [DefaultIcon("iconPong")]
     public partial class Pong : UserControl, IShiftOSWindow
     {
         int xVel = 7;
diff --git a/ShiftOS.WinForms/Applications/Shifter.cs b/ShiftOS.WinForms/Applications/Shifter.cs
index 5b9ea41..4d29cf8 100644
--- a/ShiftOS.WinForms/Applications/Shifter.cs
+++ b/ShiftOS.WinForms/Applications/Shifter.cs
@@ -43,6 +43,7 @@ namespace ShiftOS.WinForms.Applications
     [Launcher("Shifter", true, "al_shifter", "Customization")]
     [RequiresUpgrade("shifter")]
     [WinOpen("shifter")]
+    [DefaultIcon("iconShifter")]
     public partial class Shifter : UserControl, IShiftOSWindow
     {
         public Shifter()
diff --git a/ShiftOS.WinForms/Applications/Shiftnet.cs b/ShiftOS.WinForms/Applications/Shiftnet.cs
index 2425910..48a9147 100644
--- a/ShiftOS.WinForms/Applications/Shiftnet.cs
+++ b/ShiftOS.WinForms/Applications/Shiftnet.cs
@@ -14,6 +14,7 @@ using static ShiftOS.Engine.SkinEngine;
 namespace ShiftOS.WinForms.Applications
 {
     [Launcher("Shiftnet", false, null, "Networking")]
+    [DefaultIcon("iconShiftnet")]
     public partial class Shiftnet : UserControl, IShiftOSWindow
     {
         public Shiftnet()
diff --git a/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs b/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs
index 2e4dce0..b3724ae 100644
--- a/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs
+++ b/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs
@@ -41,6 +41,7 @@ namespace ShiftOS.WinForms.Applications
     [RequiresUpgrade("shiftorium_gui")]
     [WinOpen("shiftorium")]
     [DefaultTitle("Shiftorium")]
+    [DefaultIcon("iconShiftorium")]
     public partial class ShiftoriumFrontend : UserControl, IShiftOSWindow
     {
 
diff --git a/ShiftOS.WinForms/Applications/Skin Loader.cs b/ShiftOS.WinForms/Applications/Skin Loader.cs
index 9933633..58b444c 100644
--- a/ShiftOS.WinForms/Applications/Skin Loader.cs	
+++ b/ShiftOS.WinForms/Applications/Skin Loader.cs	
@@ -41,6 +41,7 @@ namespace ShiftOS.WinForms.Applications
     [RequiresUpgrade("skinning")]
     [WinOpen("skin_loader")]
     [DefaultTitle("Skin Loader")]
+    [DefaultIcon("iconSkinLoader")]
     public partial class Skin_Loader : UserControl, IShiftOSWindow
     {
         public Skin_Loader()
diff --git a/ShiftOS.WinForms/Applications/Terminal.cs b/ShiftOS.WinForms/Applications/Terminal.cs
index 54a89d7..ff3569b 100644
--- a/ShiftOS.WinForms/Applications/Terminal.cs
+++ b/ShiftOS.WinForms/Applications/Terminal.cs
@@ -48,6 +48,7 @@ namespace ShiftOS.WinForms.Applications
 {
     [Launcher("Terminal", false, null, "Utilities")]
     [WinOpen("terminal")]
+    [DefaultIcon("iconTerminal")]
     public partial class Terminal : UserControl, IShiftOSWindow
     {
         public static Stack<string> ConsoleStack = new Stack<string>();
diff --git a/ShiftOS.WinForms/Applications/TextPad.cs b/ShiftOS.WinForms/Applications/TextPad.cs
index bbf4846..b70a72c 100644
--- a/ShiftOS.WinForms/Applications/TextPad.cs
+++ b/ShiftOS.WinForms/Applications/TextPad.cs
@@ -39,6 +39,7 @@ namespace ShiftOS.WinForms.Applications
     [Launcher("TextPad", true, "al_textpad", "Accessories")]
     [RequiresUpgrade("textpad")]
     [WinOpen("textpad")]
+    [DefaultIcon("iconTextPad")]
     public partial class TextPad : UserControl, IShiftOSWindow
     {
         public TextPad()
diff --git a/ShiftOS.WinForms/Program.cs b/ShiftOS.WinForms/Program.cs
index 06f495f..1042f23 100644
--- a/ShiftOS.WinForms/Program.cs
+++ b/ShiftOS.WinForms/Program.cs
@@ -48,6 +48,7 @@ namespace ShiftOS.WinForms
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             //if ANYONE puts code before those two winforms config lines they will be declared a drunky. - Michael
+            SkinEngine.SetIconProber(new ShiftOSIconProvider());
             ShiftOS.Engine.AudioManager.Init(new ShiftOSAudioProvider());
             Localization.RegisterProvider(new WFLanguageProvider());
             Shiftorium.RegisterProvider(new WinformsShiftoriumProvider());
diff --git a/ShiftOS.WinForms/Properties/Resources.Designer.cs b/ShiftOS.WinForms/Properties/Resources.Designer.cs
index f0a5e03..a87a0b4 100644
--- a/ShiftOS.WinForms/Properties/Resources.Designer.cs
+++ b/ShiftOS.WinForms/Properties/Resources.Designer.cs
@@ -489,6 +489,306 @@ namespace ShiftOS.WinForms.Properties {
             }
         }
         
+        /// <summary>
+        ///   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>
@@ -499,6 +799,66 @@ namespace ShiftOS.WinForms.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap iconTerminal1 {
+            get {
+                object obj = ResourceManager.GetObject("iconTerminal1", 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 [
         ///	&quot;english&quot;
@@ -520,9 +880,14 @@ namespace ShiftOS.WinForms.Properties {
         ///		Dependencies: null
         ///	},
         ///	{
+        ///		Name: &quot;Audio Volume&quot;,
+        ///		Cost: 50,
+        ///		Description: &quot;Want to adjust the volume of ShiftOS&apos;s audio? This upgrade will let you.&quot;
+        ///	},
+        ///	{
         ///		Name: &quot;Color Depth Dithering&quot;,
         ///		Cost: 1000,
-        ///		Description: &quot;Right now, if you try to display images on the screen, with a low color depth like we have, the image will be totally unrecognizable! With this upgrade, we can adapt a simple 1-dimensional dithering algorithm into the video driver to hopefully smooth out the trans [rest of string was truncated]&quot;;.
+        ///		Description: &quot;Right now, if you try to display images on the screen, with a low color depth like we have, the image will be totally unrecogn [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string Shiftorium {
             get {
diff --git a/ShiftOS.WinForms/Properties/Resources.resx b/ShiftOS.WinForms/Properties/Resources.resx
index 604a466..ba994b3 100644
--- a/ShiftOS.WinForms/Properties/Resources.resx
+++ b/ShiftOS.WinForms/Properties/Resources.resx
@@ -271,4 +271,112 @@
   <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>
+  <data name="iconArtpad" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\iconSysinfo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iconTerminal1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\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>..\SystemIcons\iconWebBrowser.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/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
index f2a65ac..e836119 100644
--- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj
+++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
@@ -463,6 +463,42 @@
     <None Include="Resources\strings_en.txt" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="SystemIcons\iconArtpad.png" />
+    <Content Include="SystemIcons\iconAudioPlayer.png" />
+    <Content Include="SystemIcons\iconBitnoteDigger.png" />
+    <Content Include="SystemIcons\iconBitnoteWallet.png" />
+    <Content Include="SystemIcons\iconCalculator.png" />
+    <Content Include="SystemIcons\iconClock.png" />
+    <Content Include="SystemIcons\iconColourPicker.fw.png" />
+    <Content Include="SystemIcons\iconDodge.png" />
+    <Content Include="SystemIcons\iconDownloader.png" />
+    <Content Include="SystemIcons\iconFileOpener.fw.png" />
+    <Content Include="SystemIcons\iconFileSaver.fw.png" />
+    <Content Include="SystemIcons\iconFileSkimmer.png" />
+    <Content Include="SystemIcons\iconfloodgate.png" />
+    <Content Include="SystemIcons\icongraphicpicker.png" />
+    <Content Include="SystemIcons\iconIconManager.png" />
+    <Content Include="SystemIcons\iconInfoBox.fw.png" />
+    <Content Include="SystemIcons\iconKnowledgeInput.png" />
+    <Content Include="SystemIcons\iconmaze.png" />
+    <Content Include="SystemIcons\iconNameChanger.png" />
+    <Content Include="SystemIcons\iconoctocat.bmp" />
+    <Content Include="SystemIcons\iconorcwrite.png" />
+    <Content Include="SystemIcons\iconPong.png" />
+    <Content Include="SystemIcons\iconShifter.png" />
+    <Content Include="SystemIcons\iconShiftnet.png" />
+    <Content Include="SystemIcons\iconShiftorium.png" />
+    <Content Include="SystemIcons\iconshutdown.png" />
+    <Content Include="SystemIcons\iconSkinLoader.png" />
+    <Content Include="SystemIcons\iconSkinShifter.png" />
+    <Content Include="SystemIcons\iconSnakey.png" />
+    <Content Include="SystemIcons\iconSysinfo.png" />
+    <Content Include="SystemIcons\iconTerminal.png" />
+    <Content Include="SystemIcons\iconTextPad.png" />
+    <Content Include="SystemIcons\iconunitytoggle.png" />
+    <Content Include="SystemIcons\iconVideoPlayer.png" />
+    <Content Include="SystemIcons\iconvirusscanner.png" />
+    <Content Include="SystemIcons\iconWebBrowser.png" />
     <None Include="Resources\IconTerminal.bmp" />
     <None Include="Resources\sys_shiftoriumstory.txt" />
     <None Include="Resources\DefaultMouse.bmp" />
diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs
index 7f8f232..0e20da8 100644
--- a/ShiftOS.WinForms/WinformsDesktop.cs
+++ b/ShiftOS.WinForms/WinformsDesktop.cs
@@ -299,7 +299,8 @@ namespace ShiftOS.WinForms
             foreach (var kv in items)
             {
                 var item = new ToolStripMenuItem();
-                item.Text = kv.DisplayData.Name;
+                item.Text = (kv.LaunchType == null) ? kv.DisplayData.Name : Applications.NameChangerBackend.GetNameRaw(kv.LaunchType);
+                item.Image = (kv.LaunchType == null) ? null : SkinEngine.GetIcon(kv.LaunchType.Name);
                 item.Click += (o, a) =>
                 {
                     if (kv is LuaLauncherItem)
diff --git a/ShiftOS_TheReturn/Skinning.cs b/ShiftOS_TheReturn/Skinning.cs
index 4cf3834..7434088 100644
--- a/ShiftOS_TheReturn/Skinning.cs
+++ b/ShiftOS_TheReturn/Skinning.cs
@@ -64,6 +64,11 @@ namespace ShiftOS.Engine {
             return null;
         }
 
+        public static void SetIconProber(IIconProber prober)
+        {
+            _iconProber = prober;
+        }
+
         public static Image ImageFromBinary(byte[] image) {
             if (image == null)
                 return null;