diff --git a/client/win/resource.aps b/client/win/resource.aps
index 8cb3288e84..04d3eb4d5d 100644
Binary files a/client/win/resource.aps and b/client/win/resource.aps differ
diff --git a/client/win/resource.h b/client/win/resource.h
index b236b7836b..5abe3e8482 100755
--- a/client/win/resource.h
+++ b/client/win/resource.h
@@ -9,6 +9,8 @@
 #define IDD_ABOUTBOX                    108
 #define IDB_LOGOSM                      110
 #define IDR_POPUP                       111
+#define IDI_ICON                        114
+#define IDI_ICONSM                      115
 #define IDC_LOGIN_URL                   1000
 #define IDC_LOGIN_AUTH                  1002
 #define ID_ACCT_LOGIN                   40001
@@ -22,7 +24,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        112
+#define _APS_NEXT_RESOURCE_VALUE        115
 #define _APS_NEXT_COMMAND_VALUE         40014
 #define _APS_NEXT_CONTROL_VALUE         1005
 #define _APS_NEXT_SYMED_VALUE           101
diff --git a/client/win/resource.rc b/client/win/resource.rc
index 415f08f6e5..dad24e0163 100755
--- a/client/win/resource.rc
+++ b/client/win/resource.rc
@@ -52,15 +52,17 @@ END
 // Dialog
 //
 
-IDD_LOGIN DIALOG DISCARDABLE  0, 0, 186, 90
+IDD_LOGIN DIALOG DISCARDABLE  0, 0, 231, 70
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Login"
 FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,129,24,50,14
-    EDITTEXT        IDC_LOGIN_URL,31,18,40,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_LOGIN_AUTH,34,50,40,14,ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,174,7,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,174,24,50,14
+    EDITTEXT        IDC_LOGIN_URL,66,7,96,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_LOGIN_AUTH,65,32,98,14,ES_AUTOHSCROLL
+    LTEXT           "URL:",IDC_STATIC,7,7,18,8
+    LTEXT           "Authentication:",IDC_STATIC,7,32,48,8
 END
 
 IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 230, 65
@@ -70,7 +72,7 @@ FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,173,7,50,14
     LTEXT           "Info about BOINC goes here.",IDC_STATIC,56,17,96,31
-    CONTROL         110,IDC_STATIC,"Static",SS_BITMAP,17,16,33,31
+    CONTROL         110,IDC_STATIC,"Static",SS_BITMAP,13,17,33,31
 END
 
 
@@ -85,9 +87,9 @@ BEGIN
     IDD_LOGIN, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 179
+        RIGHTMARGIN, 224
         TOPMARGIN, 7
-        BOTTOMMARGIN, 83
+        BOTTOMMARGIN, 63
     END
 
     IDD_ABOUTBOX, DIALOG
@@ -145,6 +147,24 @@ BEGIN
     END
 END
 
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_LOGO                BITMAP  DISCARDABLE     "res\\boinc.bmp"
+IDB_LOGOSM              BITMAP  DISCARDABLE     "res\\boincsm.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON                ICON    DISCARDABLE     "res\\icon.ico"
+IDI_ICONSM              ICON    DISCARDABLE     "res\\iconsm.ico"
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////