Index: base/applications/fontview/fontview.c
===================================================================
--- base/applications/fontview/fontview.c	(revision 59798)
+++ base/applications/fontview/fontview.c	(working copy)
@@ -191,12 +191,12 @@
 	wincl.cbClsExtra = 0;
 	wincl.cbWndExtra = 0;
 	wincl.hInstance = hThisInstance;
-	wincl.hIcon = LoadIcon (NULL, IDI_APPLICATION);
+	wincl.hIcon = LoadIcon (GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_TT));
 	wincl.hCursor = LoadCursor (NULL, IDC_ARROW);
 	wincl.hbrBackground = (HBRUSH)COLOR_BACKGROUND;
 	wincl.lpszMenuName = NULL;
 	wincl.lpszClassName = g_szFontViewClassName;
-	wincl.hIconSm = LoadIcon (NULL, IDI_APPLICATION);
+	wincl.hIconSm = LoadIcon (GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_TT));
 
 	/* Register the window class, and if it fails quit the program */
 	if (!RegisterClassExW (&wincl))
Index: base/applications/fontview/resource.h
===================================================================
--- base/applications/fontview/resource.h	(revision 59798)
+++ base/applications/fontview/resource.h	(working copy)
@@ -13,3 +13,5 @@
 #define IDS_CHARSLOWER 700
 #define IDS_CHARSUPPER 701
 #define IDS_SPECIALCHARS 702
+
+#define IDI_TT 800