diff --git a/source/BugTrap.8.sln b/source/BugTrap.8.sln
index 324e7a0..78d307c 100644
--- a/source/BugTrap.8.sln
+++ b/source/BugTrap.8.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BugTrap", "BugTrap.2005.vcproj", "{E8CF1ADA-264A-4127-86C2-FD7057D3792C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BugTrap", "BugTrap.8.vcproj", "{E8CF1ADA-264A-4127-86C2-FD7057D3792C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/source/BugTrap.rc b/source/BugTrap.rc
index ed14103..a9164ee 100644
--- a/source/BugTrap.rc
+++ b/source/BugTrap.rc
@@ -98,7 +98,7 @@ CAPTION "
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     ICON            IDI_BUG,IDC_STATIC,7,7,20,20,WS_GROUP
-    LTEXT           "BugTrap - softwarefehler berichterstattung\nVersion 1.3",IDC_VERSION_STRING,34,7,146,16
+    LTEXT           "BugTrap - Softwarefehler Berichterstattung\nVersion 1.3",IDC_VERSION_STRING,34,7,146,16
     LTEXT           "Copyright © 2005-2009 IntelleSoft",IDC_STATIC,7,32,113,8
     LTEXT           "http://www.intellesoft.net",IDC_URL,7,42,72,10,WS_TABSTOP
     LTEXT           " GUI design basierend auf Jim Crafton's BlackBox library",IDC_PORTIONS_COPYRIGHT,7,59,228,10,SS_NOPREFIX | SS_SUNKEN
@@ -128,7 +128,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX        "Laufende Prozesse beim Absturz",IDC_PROCESS_LIST_FRAME,7,7,250,97,WS_GROUP,WS_EX_TRANSPARENT
     CONTROL         "",IDC_PROCESS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,12,17,239,80
-    GROUPBOX        "Vom Gewählten Prozess Geladene Module",IDC_PROCESS_MODULES_LIST_FRAME,7,107,250,108,WS_GROUP,WS_EX_TRANSPARENT
+    GROUPBOX        "Vom gewählten Prozess geladene Module",IDC_PROCESS_MODULES_LIST_FRAME,7,107,250,108,WS_GROUP,WS_EX_TRANSPARENT
     CONTROL         "",IDC_PROCESS_MODULES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,12,117,239,92
     DEFPUSHBUTTON   "Schließen",IDCANCEL,264,11,51,14,WS_GROUP
 END
@@ -409,8 +409,8 @@ BEGIN
     CONTROL         "",IDC_FILESLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | WS_BORDER | WS_GROUP | WS_TABSTOP,3,3,336,55
     CONTROL         "",IDC_FILEVIEW,"Static",SS_GRAYRECT | WS_BORDER | WS_GROUP | WS_TABSTOP,3,61,336,125
     CONTROL         "",IDC_FILEFORMAT_FRAME,"Static",SS_ETCHEDFRAME | NOT WS_VISIBLE | WS_GROUP,3,190,122,18,WS_EX_TRANSPARENT
-    CONTROL         "&Textblick",IDC_TEXTVIEW,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_GROUP | WS_TABSTOP,13,194,44,10
-    CONTROL         "&Hexblick",IDC_HEXVIEW,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,68,194,42,10
+    CONTROL         "&Text",IDC_TEXTVIEW,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_GROUP | WS_TABSTOP,13,194,44,10
+    CONTROL         "&Hex",IDC_HEXVIEW,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,68,194,42,10
     CONTROL         "",IDC_IMAGE_COMMANDS,"ToolbarWindow32",NOT WS_VISIBLE | 0x4c,3,191,121,16
     DEFPUSHBUTTON   "Close",IDCANCEL,284,192,50,14,WS_GROUP
 END
diff --git a/source/BugTrapUI.cpp b/source/BugTrapUI.cpp
index 3cf5394..91d4eb6 100644
--- a/source/BugTrapUI.cpp
+++ b/source/BugTrapUI.cpp
@@ -1354,7 +1354,7 @@ static void ExecuteHandlerAction(void)
 			{
 				if (g_dwFlags & BTF_SHOWADVANCEDUI)
 					DialogBox(g_hInstance, MAKEINTRESOURCE(IDD_MAIN_DLG), NULL, MainDlgProc);
-				else if (DialogBox(g_hInstance, MAKEINTRESOURCE(IDD_SIMPLE_DLG), NULL, SimpleDlgProc) == TRUE)
+				else if (DialogBox(g_hInstance, MAKEINTRESOURCE(IDD_SIMPLE_DLG), GetForegroundWindow(), SimpleDlgProc) == TRUE)
 					DialogBox(g_hInstance, MAKEINTRESOURCE(IDD_MAIN_DLG), NULL, MainDlgProc);
 			}
 			break;
diff --git a/source/ResManager.cpp b/source/ResManager.cpp
index 276a64e..9c353c2 100644
--- a/source/ResManager.cpp
+++ b/source/ResManager.cpp
@@ -124,14 +124,30 @@ CResManager::CResManager(HWND hwndParent)
 	if (m_hSmallAppIcon == NULL)
 	{
 		m_bDestroySmallAppIcon = true;;
-		m_hSmallAppIcon = (HICON)LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_BUG), IMAGE_ICON, nCXSmallIcon, nCYSmallIcon, LR_DEFAULTCOLOR);
+		TCHAR szModuleFileName[MAX_PATH];
+		if (GetModuleFileName(NULL, szModuleFileName, countof(szModuleFileName)))
+		{
+			ExtractIconEx(szModuleFileName, 0, NULL, &m_hSmallAppIcon, 1);
+		}
+		if (m_hSmallAppIcon == NULL)
+		{
+			m_hSmallAppIcon = (HICON)LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_BUG), IMAGE_ICON, nCXSmallIcon, nCYSmallIcon, LR_DEFAULTCOLOR);
+		}
 	}
 	int nCXIcon = GetSystemMetrics(SM_CXICON);
 	int nCYIcon = GetSystemMetrics(SM_CYICON);
 	if (m_hBigAppIcon == NULL)
 	{
-		m_bDestroyBigAppIcon = true;;
-		m_hBigAppIcon = (HICON)LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_BUG), IMAGE_ICON, nCXIcon, nCYIcon, LR_DEFAULTCOLOR);
+		m_bDestroyBigAppIcon = true;
+		TCHAR szModuleFileName[MAX_PATH];
+		if (GetModuleFileName(NULL, szModuleFileName, countof(szModuleFileName)))
+		{
+			ExtractIconEx(szModuleFileName, 0, &m_hBigAppIcon, NULL, 1);
+		}
+		if (m_hBigAppIcon == NULL)
+		{
+			m_hBigAppIcon = (HICON)LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_BUG), IMAGE_ICON, nCXIcon, nCYIcon, LR_DEFAULTCOLOR);
+		}
 	}
 	if (m_hBigAppIcon != NULL)
 	{