diff --git a/common/bitmap.cpp b/common/bitmap.cpp
index d728f72d6e..f6eca539d9 100644
--- a/common/bitmap.cpp
+++ b/common/bitmap.cpp
@@ -101,9 +101,9 @@ BITMAP_STORE* GetBitmapStore()
 }
 
 
-wxBitmap KiBitmap( BITMAPS aBitmap )
+wxBitmap KiBitmap( BITMAPS aBitmap, int aHeightTag )
 {
-    return GetBitmapStore()->GetBitmap( aBitmap );
+    return GetBitmapStore()->GetBitmap( aBitmap, aHeightTag );
 }
 
 
diff --git a/include/bitmaps/bitmap_types.h b/include/bitmaps/bitmap_types.h
index 6844e3c9cb..9a2a0d5f9e 100644
--- a/include/bitmaps/bitmap_types.h
+++ b/include/bitmaps/bitmap_types.h
@@ -45,8 +45,9 @@ BITMAP_STORE* GetBitmapStore();
  * Construct a wxBitmap from an image identifier
  * Returns the image from the active theme if the image has multiple theme variants.
  * @param aBitmap is from the BITMAPS enum in bitmaps_list.h
+ * @param aHeightTag is the requested height tag for multi-res bitmaps (-1 for any)
  */
-wxBitmap KiBitmap( BITMAPS aBitmap );
+wxBitmap KiBitmap( BITMAPS aBitmap, int aHeightTag = -1 );
 
 /**
  * Compatibility shim for pcb_calculator until its images are pulled into the PNG pipeline
diff --git a/kicad/dialogs/panel_kicad_launcher.cpp b/kicad/dialogs/panel_kicad_launcher.cpp
index 249aa13863..77bee3735a 100644
--- a/kicad/dialogs/panel_kicad_launcher.cpp
+++ b/kicad/dialogs/panel_kicad_launcher.cpp
@@ -97,35 +97,35 @@ void PANEL_KICAD_LAUNCHER::CreateLaunchers()
         };
 
     addLauncher( KICAD_MANAGER_ACTIONS::editSchematic,
-                 KiScaledBitmap( BITMAPS::icon_eeschema, this, 48 ),
+                 KiBitmap( BITMAPS::icon_eeschema, 48 ),
                  _( "Edit the project schematic" ) );
 
     addLauncher( KICAD_MANAGER_ACTIONS::editSymbols,
-                 KiScaledBitmap( BITMAPS::icon_libedit, this, 48 ),
+                 KiBitmap( BITMAPS::icon_libedit, 48 ),
                  _( "Edit global and/or project schematic symbol libraries" ) );
 
     addLauncher( KICAD_MANAGER_ACTIONS::editPCB,
-                 KiScaledBitmap( BITMAPS::icon_pcbnew, this, 48 ),
+                 KiBitmap( BITMAPS::icon_pcbnew, 48 ),
                  _( "Edit the project PCB design" ) );
 
     addLauncher( KICAD_MANAGER_ACTIONS::editFootprints,
-                 KiScaledBitmap( BITMAPS::icon_modedit, this, 48 ),
+                 KiBitmap( BITMAPS::icon_modedit, 48 ),
                  _( "Edit global and/or project PCB footprint libraries" ) );
 
     addLauncher( KICAD_MANAGER_ACTIONS::viewGerbers,
-                 KiScaledBitmap( BITMAPS::icon_gerbview, this, 48 ),
+                 KiBitmap( BITMAPS::icon_gerbview, 48 ),
                  _( "Preview Gerber files" ) );
 
     addLauncher( KICAD_MANAGER_ACTIONS::convertImage,
-                 KiScaledBitmap( BITMAPS::icon_bitmap2component, this, 48 ),
+                 KiBitmap( BITMAPS::icon_bitmap2component, 48 ),
                  _( "Convert bitmap images to schematic symbols or PCB footprints" ) );
 
     addLauncher( KICAD_MANAGER_ACTIONS::showCalculator,
-                 KiScaledBitmap( BITMAPS::icon_pcbcalculator, this, 48 ),
+                 KiBitmap( BITMAPS::icon_pcbcalculator, 48 ),
                  _( "Show tools for calculating resistance, current capacity, etc." ) );
 
     addLauncher( KICAD_MANAGER_ACTIONS::editDrawingSheet,
-                 KiScaledBitmap( BITMAPS::icon_pagelayout_editor, this, 48 ),
+                 KiBitmap( BITMAPS::icon_pagelayout_editor, 48 ),
                  _( "Edit drawing sheet borders and title blocks for use in schematics and PCB "
                     "designs" ) );