diff --git a/build.cmd b/build.cmd
index 112dbe7..fc16420 100644
--- a/build.cmd
+++ b/build.cmd
@@ -12,7 +12,7 @@ set /P GIT_HASH=<%DIR_RELEASE%\.git_hash
 set "GIT_HASH=%GIT_HASH:~0,8%"
 
 if "%1" == "debug" (
-    set CL=/MT /Od /Zi /RTC1 /Fdprogmgr.pdb /fsanitize=address /DUNICODE /DPROGMGR_DEBUG /DPROGMGR_GIT_HASH="%GIT_HASH%"
+    set CL=/MT /Od /Zi /RTC1 /Fdprogmgr.pdb /fsanitize=address /DUNICODE /D_DEBUG /DPROGMGR_DEBUG /DPROGMGR_GIT_HASH="%GIT_HASH%"
     set LINK=/DEBUG
 ) else (
     set CL=/O1 /GS- /DUNICODE /DNDEBUG /DPROGMGR_RELEASE /DPROGMGR_GIT_HASH="%GIT_HASH%"
diff --git a/progmgr/icons/progmgrd.ico b/progmgr/icons/progmgrd.ico
new file mode 100644
index 0000000..63d4c33
Binary files /dev/null and b/progmgr/icons/progmgrd.ico differ
diff --git a/progmgr/icons/src/progmgrd.ico b/progmgr/icons/src/progmgrd.ico
new file mode 100644
index 0000000..63d4c33
Binary files /dev/null and b/progmgr/icons/src/progmgrd.ico differ
diff --git a/progmgr/icons/src/progmgrd.pdn b/progmgr/icons/src/progmgrd.pdn
new file mode 100644
index 0000000..ef068fb
Binary files /dev/null and b/progmgr/icons/src/progmgrd.pdn differ
diff --git a/progmgr/lang/res_en-US.rc b/progmgr/lang/res_en-US.rc
index c104f3e..5e24f46 100644
Binary files a/progmgr/lang/res_en-US.rc and b/progmgr/lang/res_en-US.rc differ
diff --git a/progmgr/progmgr.c b/progmgr/progmgr.c
index a503170..b65ac82 100644
--- a/progmgr/progmgr.c
+++ b/progmgr/progmgr.c
@@ -18,6 +18,11 @@
 
 /* Variables */
 // Global
+#ifdef _DEBUG
+BOOL		bIsDebugBuild = TRUE;
+#else
+BOOL		bIsDebugBuild = FALSE;
+#endif
 BOOL		bIsDefaultShell = FALSE;
 // Handles
 HINSTANCE	hAppInstance;
@@ -27,7 +32,7 @@ HWND		hWndProgMgr = NULL;
 HICON		hProgMgrIcon = NULL;
 HICON		hGroupIcon = NULL;
 // Global Strings
-WCHAR		szAppTitle[32];
+WCHAR		szAppTitle[64];
 WCHAR		szProgMgr[] = L"progmgr";
 WCHAR		szWebsite[64];
 WCHAR		szClass[16];
diff --git a/progmgr/progmgr.h b/progmgr/progmgr.h
index 112d81c..2f20e0e 100644
--- a/progmgr/progmgr.h
+++ b/progmgr/progmgr.h
@@ -39,7 +39,7 @@ extern HWND			hWndProgMgr;
 extern HICON		hProgMgrIcon;
 extern HICON		hGroupIcon;
 // Strings
-extern WCHAR		szAppTitle[32];
+extern WCHAR		szAppTitle[64];
 extern WCHAR		szProgMgr[];
 extern WCHAR		szWebsite[64];
 extern WCHAR		szClass[16];
diff --git a/progmgr/progmgr.vcxproj b/progmgr/progmgr.vcxproj
index cdf8790..3258dcd 100644
--- a/progmgr/progmgr.vcxproj
+++ b/progmgr/progmgr.vcxproj
@@ -104,6 +104,9 @@
       <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
       <ManifestFile>$(IntDir)$(TargetName)$(TargetExt).manifest</ManifestFile>
     </Link>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -138,6 +141,9 @@
       <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
       <ManifestFile>$(IntDir)$(TargetName)$(TargetExt).manifest</ManifestFile>
     </Link>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
diff --git a/progmgr/resource.h b/progmgr/resource.h
index cc1706e..9077a12 100644
Binary files a/progmgr/resource.h and b/progmgr/resource.h differ
diff --git a/progmgr/resource.rc b/progmgr/resource.rc
index e614d41..bc3568d 100644
--- a/progmgr/resource.rc
+++ b/progmgr/resource.rc
@@ -21,7 +21,11 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* Icon Library */
 // Primary
+#ifndef _DEBUG
 IDI_PROGMGR		ICON	icons\progmgr.ico
+#else
+IDI_PROGMGR		ICON	icons\progmgrd.ico
+#endif
 IDI_PROGGRP		ICON	icons\pmgroup.ico
 IDI_PROGITM		ICON	icons\pmitem.ico
 IDI_COMMON		ICON	icons\common.ico