diff --git a/Contrib/Modern UI 2/Pages/Finish.nsh b/Contrib/Modern UI 2/Pages/Finish.nsh
index 4d6d7031..45b67cc4 100644
--- a/Contrib/Modern UI 2/Pages/Finish.nsh	
+++ b/Contrib/Modern UI 2/Pages/Finish.nsh	
@@ -17,12 +17,6 @@ Finish page (implemented using nsDialogs)
     Var mui.FinishPage.Image
     Var mui.FinishPage.Image.Bitmap
     
-    !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
-      Var mui.FinishPage.Image.Rect
-      Var mui.FinishPage.Image.Width
-      Var mui.FinishPage.Image.Height
-    !endif
-    
     Var mui.FinishPage.Title
     Var mui.FinishPage.Title.Font
     
@@ -273,21 +267,10 @@ Finish page (implemented using nsDialogs)
     ${NSD_CreateBitmap} 0u 0u 109u 193u ""
     Pop $mui.FinishPage.Image
     !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
-      System::Call '*(i, i, i, i) i.s'
-      Pop $mui.FinishPage.Image.Rect
-      ${If} $mui.FinishPage.Image.Rect <> 0
-        System::Call 'user32::GetClientRect(i $mui.FinishPage.Image, i $mui.FinishPage.Image.Rect)'
-        System::Call '*$mui.FinishPage.Image.Rect(i, i, i .s, i .s)'
-        System::Free $mui.FinishPage.Image.Rect
-        Pop $mui.FinishPage.Image.Width
-        Pop $mui.FinishPage.Image.Height
-      ${EndIf}
-      System::Call 'user32::LoadImage(i 0, t s, i ${IMAGE_BITMAP}, i $mui.FinishPage.Image.Width, i $mui.FinishPage.Image.Height, i ${LR_LOADFROMFILE}) i.s' "$PLUGINSDIR\modern-wizard.bmp"
+      ${NSD_SetStretchedImage} $mui.FinishPage.Image $PLUGINSDIR\modern-wizard.bmp $mui.FinishPage.Image.Bitmap
     !else
-      System::Call 'user32::LoadImage(i 0, t s, i ${IMAGE_BITMAP}, i 0, i 0, i ${LR_LOADFROMFILE}) i.s' "$PLUGINSDIR\modern-wizard.bmp"
+      ${NSD_SetImage} $mui.FinishPage.Image $PLUGINSDIR\modern-wizard.bmp $mui.FinishPage.Image.Bitmap
     !endif
-    Pop $mui.FinishPage.Image.Bitmap
-    SendMessage $mui.FinishPage.Image ${STM_SETIMAGE} ${IMAGE_BITMAP} $mui.FinishPage.Image.Bitmap
     
     ;Positiong of controls
 
@@ -436,7 +419,7 @@ Finish page (implemented using nsDialogs)
     !endif
     
     ;Delete image from memory
-    System::Call gdi32::DeleteObject(i$mui.FinishPage.Image.Bitmap)
+    ${NSD_FreeImage} $mui.FinishPage.Image.Bitmap
     
     !insertmacro MUI_UNSET MUI_FINISHPAGE_TITLE_HEIGHT
     !insertmacro MUI_UNSET MUI_FINISHPAGE_TEXT_TOP
diff --git a/Contrib/Modern UI 2/Pages/Welcome.nsh b/Contrib/Modern UI 2/Pages/Welcome.nsh
index eabe6521..a65917af 100644
--- a/Contrib/Modern UI 2/Pages/Welcome.nsh	
+++ b/Contrib/Modern UI 2/Pages/Welcome.nsh	
@@ -17,12 +17,6 @@ Welcome page (implemented using nsDialogs)
     Var mui.WelcomePage.Image
     Var mui.WelcomePage.Image.Bitmap
     
-    !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
-      Var mui.WelcomePage.Image.Rect
-      Var mui.WelcomePage.Image.Width
-      Var mui.WelcomePage.Image.Height
-    !endif
-    
     Var mui.WelcomePage.Title
     Var mui.WelcomePage.Title.Font
     
@@ -135,21 +129,10 @@ Welcome page (implemented using nsDialogs)
     ${NSD_CreateBitmap} 0u 0u 109u 193u ""
     Pop $mui.WelcomePage.Image
     !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
-      System::Call '*(i, i, i, i) i.s'
-      Pop $mui.WelcomePage.Image.Rect
-      ${If} $mui.WelcomePage.Image.Rect <> 0
-        System::Call 'user32::GetClientRect(i $mui.WelcomePage.Image, i $mui.WelcomePage.Image.Rect)'
-        System::Call '*$mui.WelcomePage.Image.Rect(i, i, i .s, i .s)'
-        System::Free $mui.WelcomePage.Image.Rect
-        Pop $mui.WelcomePage.Image.Width
-        Pop $mui.WelcomePage.Image.Height
-      ${EndIf}
-      System::Call 'user32::LoadImage(i 0, t s, i ${IMAGE_BITMAP}, i $mui.WelcomePage.Image.Width, i $mui.WelcomePage.Image.Height, i ${LR_LOADFROMFILE}) i.s' "$PLUGINSDIR\modern-wizard.bmp"
+      ${NSD_SetStretchedImage} $mui.WelcomePage.Image $PLUGINSDIR\modern-wizard.bmp $mui.WelcomePage.Image.Bitmap
     !else
-      System::Call 'user32::LoadImage(i 0, t s, i ${IMAGE_BITMAP}, i 0, i 0, i ${LR_LOADFROMFILE}) i.s' "$PLUGINSDIR\modern-wizard.bmp"
+      ${NSD_SetImage} $mui.WelcomePage.Image $PLUGINSDIR\modern-wizard.bmp $mui.WelcomePage.Image.Bitmap
     !endif
-    Pop $mui.WelcomePage.Image.Bitmap
-    SendMessage $mui.WelcomePage.Image ${STM_SETIMAGE} ${IMAGE_BITMAP} $mui.WelcomePage.Image.Bitmap
 
     ;Positiong of controls
 
@@ -183,7 +166,7 @@ Welcome page (implemented using nsDialogs)
     Call ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}muiPageUnloadFullWindow    
 
     ;Delete image from memory
-    System::Call gdi32::DeleteObject(i$mui.WelcomePage.Image.Bitmap)
+    ${NSD_FreeImage} $mui.WelcomePage.Image.Bitmap
 
     !insertmacro MUI_UNSET MUI_WELCOMEPAGE_TITLE_HEIGHT
     !insertmacro MUI_UNSET MUI_WELCOMEPAGE_TEXT_TOP