diff --git a/Grabby/Grabby.ico b/Grabby/Grabby.ico
deleted file mode 100644
index d551aa3..0000000
Binary files a/Grabby/Grabby.ico and /dev/null differ
diff --git a/Grabby/Grabby.rc b/Grabby/Grabby.rc
index d973872..24049c8 100644
--- a/Grabby/Grabby.rc
+++ b/Grabby/Grabby.rc
@@ -70,9 +70,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_GRABBY              ICON                    "Grabby.ico"
-IDI_SMALL               ICON                    "small.ico"
-IDI_ICON1               ICON                    "icon1.ico"
+IDI_GRABBY              ICON                    "Icon32.ico"
+IDI_SMALL               ICON                    "Icon16.ico"
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Grabby/Icon16.ico b/Grabby/Icon16.ico
new file mode 100644
index 0000000..7af718f
Binary files /dev/null and b/Grabby/Icon16.ico differ
diff --git a/Grabby/Icon32.ico b/Grabby/Icon32.ico
new file mode 100644
index 0000000..b986c7b
Binary files /dev/null and b/Grabby/Icon32.ico differ
diff --git a/Grabby/icon1.ico b/Grabby/icon1.ico
deleted file mode 100644
index c2746b0..0000000
Binary files a/Grabby/icon1.ico and /dev/null differ
diff --git a/Grabby/resource.h b/Grabby/resource.h
index da08ba3..22d5e61 100644
--- a/Grabby/resource.h
+++ b/Grabby/resource.h
@@ -7,11 +7,11 @@
 #define IDS_APP_TITLE                   103
 #define IDM_ABOUT                       104
 #define IDM_EXIT                        105
-#define IDI_GRABBY                      107
-#define IDI_SMALL                       108
+#define IDI_GRABBY                      105
 #define IDC_GRABBY                      109
 #define IDR_MAINFRAME                   128
-#define IDI_ICON1                       129
+#define IDI_ICON2                       134
+#define IDI_SMALL                       134
 #define IDC_TABVIEW                     1000
 #define IDC_APPLY                       1001
 #define IDC_EDIT1                       1004
@@ -28,7 +28,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
-#define _APS_NEXT_RESOURCE_VALUE        132
+#define _APS_NEXT_RESOURCE_VALUE        135
 #define _APS_NEXT_COMMAND_VALUE         32771
 #define _APS_NEXT_CONTROL_VALUE         1010
 #define _APS_NEXT_SYMED_VALUE           110
diff --git a/Grabby/small.ico b/Grabby/small.ico
deleted file mode 100644
index d551aa3..0000000
Binary files a/Grabby/small.ico and /dev/null differ
diff --git a/GrbyCfg/GrbyCfg.ico b/GrbyCfg/GrbyCfg.ico
deleted file mode 100644
index d551aa3..0000000
Binary files a/GrbyCfg/GrbyCfg.ico and /dev/null differ
diff --git a/GrbyCfg/GrbyCfg.rc b/GrbyCfg/GrbyCfg.rc
index db7f070..fc588e4 100644
--- a/GrbyCfg/GrbyCfg.rc
+++ b/GrbyCfg/GrbyCfg.rc
@@ -23,46 +23,6 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 #pragma code_page(932)
 #endif //_WIN32
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_GRBYCFG             ICON                    "GrbyCfg.ico"
-IDI_SMALL               ICON                    "small.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDC_GRBYCFG MENU 
-BEGIN
-    POPUP "&File"
-    BEGIN
-        MENUITEM "E&xit",                       IDM_EXIT
-    END
-    POPUP "&Help"
-    BEGIN
-        MENUITEM "&About ...",                  IDM_ABOUT
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Accelerator
-//
-
-IDC_GRBYCFG ACCELERATORS 
-BEGIN
-    "?",            IDM_ABOUT,              ASCII,  ALT
-    "/",            IDM_ABOUT,              ASCII,  ALT
-END
-
-
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -90,18 +50,6 @@ END
 
 #endif    // APSTUDIO_INVOKED
 
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE 
-BEGIN
-    IDS_APP_TITLE           "GrbyCfg"
-    IDC_GRBYCFG             "GRBYCFG"
-END
-
 #endif    // Japanese resources
 /////////////////////////////////////////////////////////////////////////////
 
@@ -253,6 +201,16 @@ BEGIN
 END
 #endif    // APSTUDIO_INVOKED
 
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_GRBYCFG             ICON                    "Icon32.ico"
+IDI_SMALL               ICON                    "Icon16.ico"
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/GrbyCfg/Icon16.ico b/GrbyCfg/Icon16.ico
new file mode 100644
index 0000000..8dfeb90
Binary files /dev/null and b/GrbyCfg/Icon16.ico differ
diff --git a/GrbyCfg/Icon32.ico b/GrbyCfg/Icon32.ico
new file mode 100644
index 0000000..cf80321
Binary files /dev/null and b/GrbyCfg/Icon32.ico differ
diff --git a/GrbyCfg/resource.h b/GrbyCfg/resource.h
index ce6dc24..f222722 100644
--- a/GrbyCfg/resource.h
+++ b/GrbyCfg/resource.h
@@ -9,11 +9,11 @@
 #define IDM_ABOUT                       104
 #define IDM_EXIT                        105
 #define IDD_GENCONFIG                   106
-#define IDI_GRBYCFG                     107
-#define IDI_SMALL                       108
-#define IDC_GRBYCFG                     109
 #define IDR_MAINFRAME                   128
 #define IDD_UPLOADCONFIG                130
+#define IDI_GRBYCFG                     130
+#define IDI_ICON1                       132
+#define IDI_SMALL                       132
 #define IDC_TABVIEW                     1000
 #define IDC_APPLY                       1001
 #define IDC_SCRNDIR                     1004
@@ -34,7 +34,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
-#define _APS_NEXT_RESOURCE_VALUE        130
+#define _APS_NEXT_RESOURCE_VALUE        133
 #define _APS_NEXT_COMMAND_VALUE         32771
 #define _APS_NEXT_CONTROL_VALUE         1012
 #define _APS_NEXT_SYMED_VALUE           110
diff --git a/GrbyCfg/small.ico b/GrbyCfg/small.ico
deleted file mode 100644
index d551aa3..0000000
Binary files a/GrbyCfg/small.ico and /dev/null differ