diff --git a/2.x/trunk/plugins/ToolStatus/ToolStatus.rc b/2.x/trunk/plugins/ToolStatus/ToolStatus.rc
index d89bb1a07..3a81bfd48 100644
--- a/2.x/trunk/plugins/ToolStatus/ToolStatus.rc
+++ b/2.x/trunk/plugins/ToolStatus/ToolStatus.rc
@@ -124,8 +124,8 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,188,154,157,10
     PUSHBUTTON      "Reset",IDC_RESET,258,170,50,14
     DEFPUSHBUTTON   "Close",IDCANCEL,312,170,50,14
-    LTEXT           "Theme:",IDC_STATIC,7,174,45,8
-    COMBOBOX        IDC_THEMEOPTIONS,56,171,123,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Theme:",IDC_STATIC,7,174,45,8,NOT WS_VISIBLE
+    COMBOBOX        IDC_THEMEOPTIONS,56,171,123,30,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_CUSTOMIZE_SB DIALOGEX 0, 0, 373, 142
diff --git a/2.x/trunk/plugins/ToolStatus/customizetb.c b/2.x/trunk/plugins/ToolStatus/customizetb.c
index d592385ec..a7a77b51f 100644
--- a/2.x/trunk/plugins/ToolStatus/customizetb.c
+++ b/2.x/trunk/plugins/ToolStatus/customizetb.c
@@ -485,7 +485,8 @@ static VOID CustomizeResetToolbarImages(
     VOID
     )
 {
-    // Reset the image cache with the new icons
+    // Reset the image cache with the new icons.
+    // TODO: Move function to Toolbar.c
     for (INT i = 0; i < ARRAYSIZE(ToolbarButtons); i++)
     {
         if (ToolbarButtons[i].iBitmap != I_IMAGECALLBACK)
@@ -505,75 +506,6 @@ static VOID CustomizeResetToolbarImages(
             }
         }
     }
-
-    // First attempt
-    //INT buttonIndex;
-    //INT buttonCount;
-    //
-    //buttonCount = (INT)SendMessage(ToolBarHandle, TB_BUTTONCOUNT, 0, 0);
-    //
-    //for (buttonIndex = 0; buttonIndex < buttonCount; buttonIndex++)
-    //{
-    //    TBBUTTON button;
-    //
-    //    memset(&button, 0, sizeof(TBBUTTON));
-    //
-    //    if (SendMessage(ToolBarHandle, TB_GETBUTTON, buttonIndex, (LPARAM)&button))
-    //    {
-    //        HBITMAP buttonImage;
-    //
-    //        if (button.fsStyle & BTNS_SEP)
-    //            continue;
-    //
-    //        if (buttonImage = ToolbarGetImage(button.idCommand))
-    //        {
-    //            ImageList_Replace(
-    //                ToolBarImageList,
-    //                button.iBitmap,
-    //                buttonImage,
-    //                NULL
-    //                );
-    //            DeleteObject(buttonImage);
-    //        }
-    //    }
-    //}
-
-    // Second attempt
-    //INT buttonIndex;
-    //INT buttonCount;
-    //
-    //buttonCount = (INT)SendMessage(ToolBarHandle, TB_BUTTONCOUNT, 0, 0);
-    //
-    //for (buttonIndex = 0; buttonIndex < buttonCount; buttonIndex++)
-    //{
-    //    TBBUTTONINFO buttonInfo =
-    //    {
-    //        sizeof(TBBUTTONINFO),
-    //        TBIF_BYINDEX | TBIF_IMAGE | TBIF_STYLE | TBIF_COMMAND
-    //    };
-    //
-    //    if (SendMessage(ToolBarHandle, TB_GETBUTTONINFO, buttonIndex, (LPARAM)&buttonInfo) != -1)
-    //    {
-    //        HBITMAP buttonImage;
-    //
-    //        if (buttonInfo.fsStyle & BTNS_SEP)
-    //            continue;
-    //
-    //        if (buttonImage = ToolbarGetImage(buttonInfo.idCommand))
-    //        {
-    //                ImageList_Replace(
-    //                    ToolBarImageList,
-    //                    buttonInfo.iImage,
-    //                    buttonImage,
-    //                    NULL
-    //                    );
-    //
-    //            DeleteObject(buttonImage);
-    //        }
-    //
-    //        //SendMessage(ToolBarHandle, TB_SETBUTTONINFO, buttonIndex, (LPARAM)&buttonInfo);
-    //    }
-    //}
 }
 
 static INT_PTR CALLBACK CustomizeDialogProc(
@@ -895,9 +827,9 @@ static INT_PTR CALLBACK CustomizeDialogProc(
 
                         ToolbarLoadSettings();
 
-                        //CustomizeLoadItems(context);
                         CustomizeResetImages(context);
                         CustomizeResetToolbarImages();
+                        //CustomizeLoadItems(context);
                     }
                 }
                 break;