Index: dll/win32/browseui/addressband.cpp =================================================================== --- dll/win32/browseui/addressband.cpp (revision 75688) +++ dll/win32/browseui/addressband.cpp (working copy) @@ -527,12 +527,12 @@ void CAddressBand::CreateGoButton() { const TBBUTTON buttonInfo [] = { { 0, 1, TBSTATE_ENABLED, 0 } }; - HINSTANCE shellInstance; + HINSTANCE instance; - shellInstance = _AtlBaseModule.GetResourceInstance(); - m_himlNormal = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), + instance = GetModuleHandle(L"browseui.dll"); + m_himlNormal = ImageList_LoadImageW(instance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); - m_himlHot = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), + m_himlHot = ImageList_LoadImageW(instance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); fGoButton = CreateWindowEx(WS_EX_TOOLWINDOW, TOOLBARCLASSNAMEW, 0, WS_CHILD | WS_CLIPSIBLINGS | Index: dll/win32/browseui/brandband.cpp =================================================================== --- dll/win32/browseui/brandband.cpp (revision 75688) +++ dll/win32/browseui/brandband.cpp (working copy) @@ -101,7 +101,7 @@ resourceID += 2; else if (clientSize >= gMediumImageSize) resourceID += 1; - fImageBitmap = LoadBitmap(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(resourceID)); + fImageBitmap = LoadBitmap(GetModuleHandle(L"browseui.dll"), MAKEINTRESOURCE(resourceID)); GetObjectW(fImageBitmap, sizeof(bitmapInfo), &bitmapInfo); fBitmapSize = bitmapInfo.bmWidth; fMaxFrameCount = bitmapInfo.bmHeight / fBitmapSize; Index: dll/win32/browseui/toolsband.cpp =================================================================== --- dll/win32/browseui/toolsband.cpp (revision 75688) +++ dll/win32/browseui/toolsband.cpp (working copy) @@ -295,11 +295,12 @@ SendMessage(TB_SETMAXTEXTROWS, 1, 0); SendMessage(TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_MIXEDBUTTONS | TBSTYLE_EX_DRAWDDARROWS); - m_himlNormal = ImageList_LoadImageW(_AtlBaseModule.GetResourceInstance(), + HINSTANCE instance = GetModuleHandle(_T("browseui.dll")); + m_himlNormal = ImageList_LoadImageW(instance, MAKEINTRESOURCE(IDB_SHELL_EXPLORER_LG), 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); - m_himlHot = ImageList_LoadImageW(_AtlBaseModule.GetResourceInstance(), + m_himlHot = ImageList_LoadImageW(instance, MAKEINTRESOURCE(IDB_SHELL_EXPLORER_LG_HOT), 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION);