diff --git a/Contrib/Modern UI 2/Pages/Finish.nsh b/Contrib/Modern UI 2/Pages/Finish.nsh
index 45b67cc4..54ac816b 100644
--- a/Contrib/Modern UI 2/Pages/Finish.nsh	
+++ b/Contrib/Modern UI 2/Pages/Finish.nsh	
@@ -71,9 +71,7 @@ Finish page (implemented using nsDialogs)
     !endif
   !endif
 
-  !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAPS
-    !insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"  
-  !endif
+  !insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"  
 
 !macroend
 
@@ -254,7 +252,7 @@ Finish page (implemented using nsDialogs)
     
     ;Enable cancel button if set in script
     !ifdef MUI_FINISHPAGE_CANCEL_ENABLED
-      EnableWindow $mui.Button.Next 1
+      EnableWindow $mui.Button.Cancel 1
     !endif
     
     ;Create dialog
diff --git a/Contrib/Modern UI 2/Pages/Welcome.nsh b/Contrib/Modern UI 2/Pages/Welcome.nsh
index a65917af..a2e80c89 100644
--- a/Contrib/Modern UI 2/Pages/Welcome.nsh	
+++ b/Contrib/Modern UI 2/Pages/Welcome.nsh	
@@ -23,9 +23,7 @@ Welcome page (implemented using nsDialogs)
     Var mui.WelcomePage.Text    
   !endif
   
-  !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAPS
-    !insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"  
-  !endif
+  !insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"  
 
 !macroend