diff --git a/reactos/boot/bootdata/hivecls.inf b/reactos/boot/bootdata/hivecls.inf
index bb25f836f0d..80adc7e7263 100644
--- a/reactos/boot/bootdata/hivecls.inf
+++ b/reactos/boot/bootdata/hivecls.inf
@@ -166,19 +166,19 @@ HKCR,"jpegfile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\syst
 ; Bitmap Images
 HKCR,".bmp","",0x00000000,"bmpfile"
 HKCR,"bmpfile","",0x00000000,"Bitmap Image"
-HKCR,"bmpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,0"
+HKCR,"bmpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,1"
 HKCR,"bmpfile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1"
 
 ; PNG Images
 HKCR,".png","",0x00000000,"pngfile"
 HKCR,"pngfile","",0x00000000,"PNG Image"
-HKCR,"pngfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,0"
+HKCR,"pngfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,2"
 HKCR,"pngfile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1"
 
 ; GIF Images
 HKCR,".gif","",0x00000000,"giffile"
 HKCR,"giffile","",0x00000000,"GIF Image"
-HKCR,"giffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,0"
+HKCR,"giffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,2"
 HKCR,"giffile\shell\open\command","",0x00020000,"""%programfiles%\Internet Explorer\iexplore.exe"" %1"
 
 ; Configuration Files
diff --git a/reactos/dll/win32/shimgvw/res/bmp.ico b/reactos/dll/win32/shimgvw/res/bmp.ico
new file mode 100644
index 00000000000..805964de684
Binary files /dev/null and b/reactos/dll/win32/shimgvw/res/bmp.ico differ
diff --git a/reactos/dll/win32/shimgvw/res/png.ico b/reactos/dll/win32/shimgvw/res/png.ico
new file mode 100644
index 00000000000..9e58061f801
Binary files /dev/null and b/reactos/dll/win32/shimgvw/res/png.ico differ
diff --git a/reactos/dll/win32/shimgvw/shimgvw.rc b/reactos/dll/win32/shimgvw/shimgvw.rc
index 89c5d92dda1..4a089b8aad9 100644
--- a/reactos/dll/win32/shimgvw/shimgvw.rc
+++ b/reactos/dll/win32/shimgvw/shimgvw.rc
@@ -9,6 +9,8 @@
 #include <reactos/version.rc>
 
 IDI_APPICON ICON "res/main.ico"
+IDI_BMP_ICON ICON "res/bmp.ico"
+IDI_PNG_ICON ICON "res/png.ico"
 
 IDB_PREVICON BITMAP "res/prev.bmp"
 IDB_NEXTICON BITMAP "res/next.bmp"