diff --git a/rufus.c b/rufus.c
index 3f27ac9e..c56548f9 100644
--- a/rufus.c
+++ b/rufus.c
@@ -590,6 +590,7 @@ static void EnableControls(BOOL bEnable)
 static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
 	HDC hDC;
+	HICON hSmallIcon, hBigIcon;
 	DRAWITEMSTRUCT* pDI;
 	int nDeviceIndex, fs;
 	DWORD DeviceNum;
@@ -623,6 +624,11 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
 		hDC = GetDC(hDlg);
 		fScale = GetDeviceCaps(hDC, LOGPIXELSX) / 96.0f;
 		ReleaseDC(hDlg, hDC);
+		// Create the title bar icon
+		hSmallIcon = (HICON)LoadImage(hMainInstance, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 16, 16, 0);
+		SendMessage (hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hSmallIcon);
+		hBigIcon = (HICON)LoadImage(hMainInstance, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 32, 32, 0);
+		SendMessage (hDlg, WM_SETICON, ICON_BIG, (LPARAM)hBigIcon);
 		// Create the status line
 		CreateStatusBar();
 		// Display the version in the right area of the status bar
diff --git a/rufus.ico b/rufus.ico
index b1d228f9..09913990 100644
Binary files a/rufus.ico and b/rufus.ico differ
diff --git a/rufus.rc b/rufus.rc
index 97bdc74d..26068663 100644
--- a/rufus.rc
+++ b/rufus.rc
@@ -63,7 +63,7 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,231,175,50,14,WS_GROUP
     CONTROL         "<a href=""https://github.com/pbatard/rufus/wiki/Rufus"">https://github.com/pbatard/rufus</a>",IDC_ABOUT_RUFUS_URL,
                     "SysLink",WS_TABSTOP,46,47,114,9
-    LTEXT           "Version 1.0.0 (Build 63)",IDC_STATIC,46,19,78,8
+    LTEXT           "Version 1.0.0 (Build 64)",IDC_STATIC,46,19,78,8
     PUSHBUTTON      "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP
     EDITTEXT        IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL
     LTEXT           "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8
@@ -162,8 +162,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,63
- PRODUCTVERSION 1,0,0,63
+ FILEVERSION 1,0,0,64
+ PRODUCTVERSION 1,0,0,64
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -180,13 +180,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "1.0.0.63"
+            VALUE "FileVersion", "1.0.0.64"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "1.0.0.63"
+            VALUE "ProductVersion", "1.0.0.64"
         END
     END
     BLOCK "VarFileInfo"
@@ -212,7 +212,7 @@ IDI_ICON                ICON                    "rufus.ico"
 
 STRINGTABLE
 BEGIN
-    IDS_VERSION             "Rufus v1.0.0.63"
+    IDS_VERSION             "Rufus v1.0.0.64"
 END
 
 #endif    // English resources