diff --git a/3d-viewer/dialogs/panel_preview_3d_model.cpp b/3d-viewer/dialogs/panel_preview_3d_model.cpp
index 49ab0286a3..3788b5ecf5 100644
--- a/3d-viewer/dialogs/panel_preview_3d_model.cpp
+++ b/3d-viewer/dialogs/panel_preview_3d_model.cpp
@@ -79,16 +79,16 @@ PANEL_PREVIEW_3D_MODEL::PANEL_PREVIEW_3D_MODEL( wxWindow* aParent, PCB_BASE_FRAM
     m_previewLabel->SetFont( KIUI::GetStatusFont( this ) );
 
     // Set the bitmap of 3D view buttons:
-    m_bpvTop->SetBitmap( KiBitmap( BITMAPS::axis3d_top ) );
-    m_bpvFront->SetBitmap( KiBitmap( BITMAPS::axis3d_front ) );
-    m_bpvBack->SetBitmap( KiBitmap( BITMAPS::axis3d_back ) );
-    m_bpvLeft->SetBitmap( KiBitmap( BITMAPS::axis3d_left ) );
-    m_bpvRight->SetBitmap( KiBitmap( BITMAPS::axis3d_right ) );
-    m_bpvBottom->SetBitmap( KiBitmap( BITMAPS::axis3d_bottom ) );
-    m_bpvISO->SetBitmap( KiBitmap( BITMAPS::ortho ) );
-    m_bpvBodyStyle->SetBitmap( KiBitmap( BITMAPS::axis3d ) );
-    m_bpUpdate->SetBitmap( KiBitmap( BITMAPS::reload ) );
-    m_bpSettings->SetBitmap( KiBitmap( BITMAPS::options_3drender ) );
+    m_bpvTop->SetBitmap( KiBitmapBundle( BITMAPS::axis3d_top ) );
+    m_bpvFront->SetBitmap( KiBitmapBundle( BITMAPS::axis3d_front ) );
+    m_bpvBack->SetBitmap( KiBitmapBundle( BITMAPS::axis3d_back ) );
+    m_bpvLeft->SetBitmap( KiBitmapBundle( BITMAPS::axis3d_left ) );
+    m_bpvRight->SetBitmap( KiBitmapBundle( BITMAPS::axis3d_right ) );
+    m_bpvBottom->SetBitmap( KiBitmapBundle( BITMAPS::axis3d_bottom ) );
+    m_bpvISO->SetBitmap( KiBitmapBundle( BITMAPS::ortho ) );
+    m_bpvBodyStyle->SetBitmap( KiBitmapBundle( BITMAPS::axis3d ) );
+    m_bpUpdate->SetBitmap( KiBitmapBundle( BITMAPS::reload ) );
+    m_bpSettings->SetBitmap( KiBitmapBundle( BITMAPS::options_3drender ) );
 
     // Set the min and max values of spin buttons (mandatory on Linux)
     // They are not used, so they are set to min and max 32 bits int values
diff --git a/common/bitmap.cpp b/common/bitmap.cpp
index d52567a4a2..75e0f4d424 100644
--- a/common/bitmap.cpp
+++ b/common/bitmap.cpp
@@ -107,8 +107,22 @@ wxBitmap KiBitmap( BITMAPS aBitmap, int aHeightTag )
 }
 
 
+wxBitmapBundle KiBitmapBundle( BITMAPS aBitmap )
+{
+    return GetBitmapStore()->GetBitmapBundle( aBitmap );
+}
+
+
+wxBitmapBundle KiDisabledBitmapBundle( BITMAPS aBitmap )
+{
+    return GetBitmapStore()->GetDisabledBitmapBundle( aBitmap );
+}
+
+
 int KiIconScale( wxWindow* aWindow )
 {
+    // For historical reasons, "4" here means unity (no scaling)
+
     #if defined( __WXMSW__)
     // Basically don't try and scale within kicad and let wx do its thing
     // with wx introducing bitmap bundles, it will auto scale automatically with dpi
@@ -197,4 +211,4 @@ wxBitmap* KiBitmapNew( BITMAPS aBitmap )
     wxBitmap* bitmap = new wxBitmap( GetBitmapStore()->GetBitmap( aBitmap ) );
 
     return bitmap;
-}
\ No newline at end of file
+}
diff --git a/common/bitmap_info.cpp b/common/bitmap_info.cpp
index e750ca8f6d..a188575d1d 100644
--- a/common/bitmap_info.cpp
+++ b/common/bitmap_info.cpp
@@ -186,6 +186,166 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::visibility].emplace_back( BITMAPS::visibility, wxT( "visibility_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::visibility_off].emplace_back( BITMAPS::visibility_off, wxT( "visibility_off_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::www].emplace_back( BITMAPS::www, wxT( "www_dark_16.png" ), 16, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::e_24].emplace_back( BITMAPS::e_24, wxT( "e_24_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::e_48].emplace_back( BITMAPS::e_48, wxT( "e_48_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::e_96].emplace_back( BITMAPS::e_96, wxT( "e_96_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::e_192].emplace_back( BITMAPS::e_192, wxT( "e_192_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::git_add].emplace_back( BITMAPS::git_add, wxT( "git_add_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::git_changed_ahead].emplace_back( BITMAPS::git_changed_ahead, wxT( "git_changed_ahead_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::git_conflict].emplace_back( BITMAPS::git_conflict, wxT( "git_conflict_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::git_delete].emplace_back( BITMAPS::git_delete, wxT( "git_delete_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::git_good_check].emplace_back( BITMAPS::git_good_check, wxT( "git_good_check_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::git_modified].emplace_back( BITMAPS::git_modified, wxT( "git_modified_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::git_out_of_date].emplace_back( BITMAPS::git_out_of_date, wxT( "git_out_of_date_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::icon_bitmap2component_16].emplace_back( BITMAPS::icon_bitmap2component_16, wxT( "icon_bitmap2component_16_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::icon_eeschema_16].emplace_back( BITMAPS::icon_eeschema_16, wxT( "icon_eeschema_16_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::icon_gerbview_16].emplace_back( BITMAPS::icon_gerbview_16, wxT( "icon_gerbview_16_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::icon_kicad_16].emplace_back( BITMAPS::icon_kicad_16, wxT( "icon_kicad_16_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::icon_kicad_nightly_16].emplace_back( BITMAPS::icon_kicad_nightly_16, wxT( "icon_kicad_nightly_16_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::icon_libedit_16].emplace_back( BITMAPS::icon_libedit_16, wxT( "icon_libedit_16_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::icon_modedit_16].emplace_back( BITMAPS::icon_modedit_16, wxT( "icon_modedit_16_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::icon_pagelayout_editor_16].emplace_back( BITMAPS::icon_pagelayout_editor_16, wxT( "icon_pagelayout_editor_16_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::icon_pcbcalculator_16].emplace_back( BITMAPS::icon_pcbcalculator_16, wxT( "icon_pcbcalculator_16_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::icon_pcbnew_16].emplace_back( BITMAPS::icon_pcbnew_16, wxT( "icon_pcbnew_16_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::label_align_left].emplace_back( BITMAPS::label_align_left, wxT( "label_align_left_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::label_align_right].emplace_back( BITMAPS::label_align_right, wxT( "label_align_right_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::label_align_top].emplace_back( BITMAPS::label_align_top, wxT( "label_align_top_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::label_align_bottom].emplace_back( BITMAPS::label_align_bottom, wxT( "label_align_bottom_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::list_nets_16].emplace_back( BITMAPS::list_nets_16, wxT( "list_nets_16_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::notifications].emplace_back( BITMAPS::notifications, wxT( "notifications_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::options_generic_16].emplace_back( BITMAPS::options_generic_16, wxT( "options_generic_16_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pinorient_right].emplace_back( BITMAPS::pinorient_right, wxT( "pinorient_right_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pinorient_left].emplace_back( BITMAPS::pinorient_left, wxT( "pinorient_left_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pinorient_up].emplace_back( BITMAPS::pinorient_up, wxT( "pinorient_up_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pinorient_down].emplace_back( BITMAPS::pinorient_down, wxT( "pinorient_down_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pinshape_normal].emplace_back( BITMAPS::pinshape_normal, wxT( "pinshape_normal_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pinshape_invert].emplace_back( BITMAPS::pinshape_invert, wxT( "pinshape_invert_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pinshape_clock_normal].emplace_back( BITMAPS::pinshape_clock_normal, wxT( "pinshape_clock_normal_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pinshape_clock_invert].emplace_back( BITMAPS::pinshape_clock_invert, wxT( "pinshape_clock_invert_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pinshape_active_low_input].emplace_back( BITMAPS::pinshape_active_low_input, wxT( "pinshape_active_low_input_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pinshape_clock_active_low].emplace_back( BITMAPS::pinshape_clock_active_low, wxT( "pinshape_clock_active_low_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pinshape_active_low_output].emplace_back( BITMAPS::pinshape_active_low_output, wxT( "pinshape_active_low_output_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pinshape_clock_fall].emplace_back( BITMAPS::pinshape_clock_fall, wxT( "pinshape_clock_fall_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pinshape_nonlogic].emplace_back( BITMAPS::pinshape_nonlogic, wxT( "pinshape_nonlogic_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pintype_input].emplace_back( BITMAPS::pintype_input, wxT( "pintype_input_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pintype_output].emplace_back( BITMAPS::pintype_output, wxT( "pintype_output_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pintype_bidi].emplace_back( BITMAPS::pintype_bidi, wxT( "pintype_bidi_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pintype_3states].emplace_back( BITMAPS::pintype_3states, wxT( "pintype_3states_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pintype_passive].emplace_back( BITMAPS::pintype_passive, wxT( "pintype_passive_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pintype_notspecif].emplace_back( BITMAPS::pintype_notspecif, wxT( "pintype_notspecif_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pintype_powerinput].emplace_back( BITMAPS::pintype_powerinput, wxT( "pintype_powerinput_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pintype_poweroutput].emplace_back( BITMAPS::pintype_poweroutput, wxT( "pintype_poweroutput_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pintype_opencoll].emplace_back( BITMAPS::pintype_opencoll, wxT( "pintype_opencoll_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pintype_openemit].emplace_back( BITMAPS::pintype_openemit, wxT( "pintype_openemit_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pintype_nic].emplace_back( BITMAPS::pintype_nic, wxT( "pintype_nic_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pintype_noconnect].emplace_back( BITMAPS::pintype_noconnect, wxT( "pintype_noconnect_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::small_down].emplace_back( BITMAPS::small_down, wxT( "small_down_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::small_edit].emplace_back( BITMAPS::small_edit, wxT( "small_edit_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::small_folder].emplace_back( BITMAPS::small_folder, wxT( "small_folder_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::small_library].emplace_back( BITMAPS::small_library, wxT( "small_library_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::small_plus].emplace_back( BITMAPS::small_plus, wxT( "small_plus_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::small_refresh].emplace_back( BITMAPS::small_refresh, wxT( "small_refresh_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::small_sort_desc].emplace_back( BITMAPS::small_sort_desc, wxT( "small_sort_desc_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::small_trash].emplace_back( BITMAPS::small_trash, wxT( "small_trash_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::small_up].emplace_back( BITMAPS::small_up, wxT( "small_up_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::small_warning].emplace_back( BITMAPS::small_warning, wxT( "small_warning_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::text_horizontal].emplace_back( BITMAPS::text_horizontal, wxT( "text_horizontal_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::text_vertical].emplace_back( BITMAPS::text_vertical, wxT( "text_vertical_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::text_align_left].emplace_back( BITMAPS::text_align_left, wxT( "text_align_left_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::text_align_center].emplace_back( BITMAPS::text_align_center, wxT( "text_align_center_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::text_align_right].emplace_back( BITMAPS::text_align_right, wxT( "text_align_right_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::text_align_bottom].emplace_back( BITMAPS::text_align_bottom, wxT( "text_align_bottom_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::text_align_middle].emplace_back( BITMAPS::text_align_middle, wxT( "text_align_middle_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::text_align_top].emplace_back( BITMAPS::text_align_top, wxT( "text_align_top_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::text_valign_top].emplace_back( BITMAPS::text_valign_top, wxT( "text_valign_top_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::text_valign_center].emplace_back( BITMAPS::text_valign_center, wxT( "text_valign_center_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::text_valign_bottom].emplace_back( BITMAPS::text_valign_bottom, wxT( "text_valign_bottom_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::text_bold].emplace_back( BITMAPS::text_bold, wxT( "text_bold_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::text_italic].emplace_back( BITMAPS::text_italic, wxT( "text_italic_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::text_mirrored].emplace_back( BITMAPS::text_mirrored, wxT( "text_mirrored_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::tree_nosel].emplace_back( BITMAPS::tree_nosel, wxT( "tree_nosel_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::tree_sel].emplace_back( BITMAPS::tree_sel, wxT( "tree_sel_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::visibility].emplace_back( BITMAPS::visibility, wxT( "visibility_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::visibility_off].emplace_back( BITMAPS::visibility_off, wxT( "visibility_off_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::www].emplace_back( BITMAPS::www, wxT( "www_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::git_add].emplace_back( BITMAPS::git_add, wxT( "git_add_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::git_changed_ahead].emplace_back( BITMAPS::git_changed_ahead, wxT( "git_changed_ahead_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::git_conflict].emplace_back( BITMAPS::git_conflict, wxT( "git_conflict_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::git_delete].emplace_back( BITMAPS::git_delete, wxT( "git_delete_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::git_good_check].emplace_back( BITMAPS::git_good_check, wxT( "git_good_check_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::git_modified].emplace_back( BITMAPS::git_modified, wxT( "git_modified_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::git_out_of_date].emplace_back( BITMAPS::git_out_of_date, wxT( "git_out_of_date_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::icon_bitmap2component_16].emplace_back( BITMAPS::icon_bitmap2component_16, wxT( "icon_bitmap2component_16_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::icon_eeschema_16].emplace_back( BITMAPS::icon_eeschema_16, wxT( "icon_eeschema_16_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::icon_gerbview_16].emplace_back( BITMAPS::icon_gerbview_16, wxT( "icon_gerbview_16_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::icon_kicad_16].emplace_back( BITMAPS::icon_kicad_16, wxT( "icon_kicad_16_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::icon_kicad_nightly_16].emplace_back( BITMAPS::icon_kicad_nightly_16, wxT( "icon_kicad_nightly_16_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::icon_libedit_16].emplace_back( BITMAPS::icon_libedit_16, wxT( "icon_libedit_16_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::icon_modedit_16].emplace_back( BITMAPS::icon_modedit_16, wxT( "icon_modedit_16_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::icon_pagelayout_editor_16].emplace_back( BITMAPS::icon_pagelayout_editor_16, wxT( "icon_pagelayout_editor_16_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::icon_pcbcalculator_16].emplace_back( BITMAPS::icon_pcbcalculator_16, wxT( "icon_pcbcalculator_16_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::icon_pcbnew_16].emplace_back( BITMAPS::icon_pcbnew_16, wxT( "icon_pcbnew_16_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::label_align_left].emplace_back( BITMAPS::label_align_left, wxT( "label_align_left_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::label_align_right].emplace_back( BITMAPS::label_align_right, wxT( "label_align_right_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::label_align_top].emplace_back( BITMAPS::label_align_top, wxT( "label_align_top_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::label_align_bottom].emplace_back( BITMAPS::label_align_bottom, wxT( "label_align_bottom_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::list_nets_16].emplace_back( BITMAPS::list_nets_16, wxT( "list_nets_16_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::notifications].emplace_back( BITMAPS::notifications, wxT( "notifications_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::options_generic_16].emplace_back( BITMAPS::options_generic_16, wxT( "options_generic_16_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pinorient_right].emplace_back( BITMAPS::pinorient_right, wxT( "pinorient_right_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pinorient_left].emplace_back( BITMAPS::pinorient_left, wxT( "pinorient_left_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pinorient_up].emplace_back( BITMAPS::pinorient_up, wxT( "pinorient_up_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pinorient_down].emplace_back( BITMAPS::pinorient_down, wxT( "pinorient_down_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pinshape_normal].emplace_back( BITMAPS::pinshape_normal, wxT( "pinshape_normal_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pinshape_invert].emplace_back( BITMAPS::pinshape_invert, wxT( "pinshape_invert_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pinshape_clock_normal].emplace_back( BITMAPS::pinshape_clock_normal, wxT( "pinshape_clock_normal_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pinshape_clock_invert].emplace_back( BITMAPS::pinshape_clock_invert, wxT( "pinshape_clock_invert_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pinshape_active_low_input].emplace_back( BITMAPS::pinshape_active_low_input, wxT( "pinshape_active_low_input_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pinshape_clock_active_low].emplace_back( BITMAPS::pinshape_clock_active_low, wxT( "pinshape_clock_active_low_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pinshape_active_low_output].emplace_back( BITMAPS::pinshape_active_low_output, wxT( "pinshape_active_low_output_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pinshape_clock_fall].emplace_back( BITMAPS::pinshape_clock_fall, wxT( "pinshape_clock_fall_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pinshape_nonlogic].emplace_back( BITMAPS::pinshape_nonlogic, wxT( "pinshape_nonlogic_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pintype_input].emplace_back( BITMAPS::pintype_input, wxT( "pintype_input_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pintype_output].emplace_back( BITMAPS::pintype_output, wxT( "pintype_output_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pintype_bidi].emplace_back( BITMAPS::pintype_bidi, wxT( "pintype_bidi_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pintype_3states].emplace_back( BITMAPS::pintype_3states, wxT( "pintype_3states_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pintype_passive].emplace_back( BITMAPS::pintype_passive, wxT( "pintype_passive_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pintype_notspecif].emplace_back( BITMAPS::pintype_notspecif, wxT( "pintype_notspecif_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pintype_powerinput].emplace_back( BITMAPS::pintype_powerinput, wxT( "pintype_powerinput_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pintype_poweroutput].emplace_back( BITMAPS::pintype_poweroutput, wxT( "pintype_poweroutput_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pintype_opencoll].emplace_back( BITMAPS::pintype_opencoll, wxT( "pintype_opencoll_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pintype_openemit].emplace_back( BITMAPS::pintype_openemit, wxT( "pintype_openemit_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pintype_nic].emplace_back( BITMAPS::pintype_nic, wxT( "pintype_nic_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pintype_noconnect].emplace_back( BITMAPS::pintype_noconnect, wxT( "pintype_noconnect_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::small_down].emplace_back( BITMAPS::small_down, wxT( "small_down_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::small_edit].emplace_back( BITMAPS::small_edit, wxT( "small_edit_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::small_folder].emplace_back( BITMAPS::small_folder, wxT( "small_folder_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::small_library].emplace_back( BITMAPS::small_library, wxT( "small_library_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::small_plus].emplace_back( BITMAPS::small_plus, wxT( "small_plus_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::small_refresh].emplace_back( BITMAPS::small_refresh, wxT( "small_refresh_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::small_sort_desc].emplace_back( BITMAPS::small_sort_desc, wxT( "small_sort_desc_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::small_trash].emplace_back( BITMAPS::small_trash, wxT( "small_trash_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::small_up].emplace_back( BITMAPS::small_up, wxT( "small_up_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::small_warning].emplace_back( BITMAPS::small_warning, wxT( "small_warning_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::text_horizontal].emplace_back( BITMAPS::text_horizontal, wxT( "text_horizontal_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::text_vertical].emplace_back( BITMAPS::text_vertical, wxT( "text_vertical_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::text_align_left].emplace_back( BITMAPS::text_align_left, wxT( "text_align_left_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::text_align_center].emplace_back( BITMAPS::text_align_center, wxT( "text_align_center_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::text_align_right].emplace_back( BITMAPS::text_align_right, wxT( "text_align_right_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::text_align_bottom].emplace_back( BITMAPS::text_align_bottom, wxT( "text_align_bottom_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::text_align_middle].emplace_back( BITMAPS::text_align_middle, wxT( "text_align_middle_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::text_align_top].emplace_back( BITMAPS::text_align_top, wxT( "text_align_top_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::text_valign_top].emplace_back( BITMAPS::text_valign_top, wxT( "text_valign_top_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::text_valign_center].emplace_back( BITMAPS::text_valign_center, wxT( "text_valign_center_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::text_valign_bottom].emplace_back( BITMAPS::text_valign_bottom, wxT( "text_valign_bottom_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::text_bold].emplace_back( BITMAPS::text_bold, wxT( "text_bold_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::text_italic].emplace_back( BITMAPS::text_italic, wxT( "text_italic_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::text_mirrored].emplace_back( BITMAPS::text_mirrored, wxT( "text_mirrored_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::tree_nosel].emplace_back( BITMAPS::tree_nosel, wxT( "tree_nosel_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::tree_sel].emplace_back( BITMAPS::tree_sel, wxT( "tree_sel_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::visibility].emplace_back( BITMAPS::visibility, wxT( "visibility_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::visibility_off].emplace_back( BITMAPS::visibility_off, wxT( "visibility_off_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::www].emplace_back( BITMAPS::www, wxT( "www_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::about].emplace_back( BITMAPS::about, wxT( "about_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::add_aligned_dimension].emplace_back( BITMAPS::add_aligned_dimension, wxT( "add_aligned_dimension_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::add_arc].emplace_back( BITMAPS::add_arc, wxT( "add_arc_24.png" ), 24, wxT( "light" ) );
@@ -971,6 +1131,791 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::zoom_in].emplace_back( BITMAPS::zoom_in, wxT( "zoom_in_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::zoom_out].emplace_back( BITMAPS::zoom_out, wxT( "zoom_out_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::zoom_selection].emplace_back( BITMAPS::zoom_selection, wxT( "zoom_selection_dark_24.png" ), 24, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::about].emplace_back( BITMAPS::about, wxT( "about_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_aligned_dimension].emplace_back( BITMAPS::add_aligned_dimension, wxT( "add_aligned_dimension_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_arc].emplace_back( BITMAPS::add_arc, wxT( "add_arc_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_board].emplace_back( BITMAPS::add_board, wxT( "add_board_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_bus2bus].emplace_back( BITMAPS::add_bus2bus, wxT( "add_bus2bus_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_bus].emplace_back( BITMAPS::add_bus, wxT( "add_bus_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_center_dimension].emplace_back( BITMAPS::add_center_dimension, wxT( "add_center_dimension_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_class_flag].emplace_back( BITMAPS::add_class_flag, wxT( "add_class_flag_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_circle].emplace_back( BITMAPS::add_circle, wxT( "add_circle_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_component].emplace_back( BITMAPS::add_component, wxT( "add_component_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_corner].emplace_back( BITMAPS::add_corner, wxT( "add_corner_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_dashed_line].emplace_back( BITMAPS::add_dashed_line, wxT( "add_dashed_line_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_document].emplace_back( BITMAPS::add_document, wxT( "add_document_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_glabel].emplace_back( BITMAPS::add_glabel, wxT( "add_glabel_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_graphical_segments].emplace_back( BITMAPS::add_graphical_segments, wxT( "add_graphical_segments_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_graphical_polygon].emplace_back( BITMAPS::add_graphical_polygon, wxT( "add_graphical_polygon_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_hierarchical_label].emplace_back( BITMAPS::add_hierarchical_label, wxT( "add_hierarchical_label_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_hierar_pin].emplace_back( BITMAPS::add_hierar_pin, wxT( "add_hierar_pin_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_hierarchical_subsheet].emplace_back( BITMAPS::add_hierarchical_subsheet, wxT( "add_hierarchical_subsheet_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_junction].emplace_back( BITMAPS::add_junction, wxT( "add_junction_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_keepout_area].emplace_back( BITMAPS::add_keepout_area, wxT( "add_keepout_area_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_label].emplace_back( BITMAPS::add_label, wxT( "add_label_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_leader].emplace_back( BITMAPS::add_leader, wxT( "add_leader_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_library].emplace_back( BITMAPS::add_library, wxT( "add_library_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_line2bus].emplace_back( BITMAPS::add_line2bus, wxT( "add_line2bus_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_line_label].emplace_back( BITMAPS::add_line_label, wxT( "add_line_label_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_line].emplace_back( BITMAPS::add_line, wxT( "add_line_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_orthogonal_dimension].emplace_back( BITMAPS::add_orthogonal_dimension, wxT( "add_orthogonal_dimension_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_pcb_target].emplace_back( BITMAPS::add_pcb_target, wxT( "add_pcb_target_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_power].emplace_back( BITMAPS::add_power, wxT( "add_power_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_radial_dimension].emplace_back( BITMAPS::add_radial_dimension, wxT( "add_radial_dimension_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_rectangle].emplace_back( BITMAPS::add_rectangle, wxT( "add_rectangle_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_symbol_to_schematic].emplace_back( BITMAPS::add_symbol_to_schematic, wxT( "add_symbol_to_schematic_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_textbox].emplace_back( BITMAPS::add_textbox, wxT( "add_textbox_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_tracks].emplace_back( BITMAPS::add_tracks, wxT( "add_tracks_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_via].emplace_back( BITMAPS::add_via, wxT( "add_via_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_zone_cutout].emplace_back( BITMAPS::add_zone_cutout, wxT( "add_zone_cutout_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::add_zone].emplace_back( BITMAPS::add_zone, wxT( "add_zone_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::align_items].emplace_back( BITMAPS::align_items, wxT( "align_items_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::align_items_left].emplace_back( BITMAPS::align_items_left, wxT( "align_items_left_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::align_items_right].emplace_back( BITMAPS::align_items_right, wxT( "align_items_right_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::align_items_top].emplace_back( BITMAPS::align_items_top, wxT( "align_items_top_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::align_items_bottom].emplace_back( BITMAPS::align_items_bottom, wxT( "align_items_bottom_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::align_items_center].emplace_back( BITMAPS::align_items_center, wxT( "align_items_center_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::align_items_middle].emplace_back( BITMAPS::align_items_middle, wxT( "align_items_middle_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::anchor].emplace_back( BITMAPS::anchor, wxT( "anchor_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::annotate_down_right].emplace_back( BITMAPS::annotate_down_right, wxT( "annotate_down_right_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::annotate_right_down].emplace_back( BITMAPS::annotate_right_down, wxT( "annotate_right_down_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::annotate].emplace_back( BITMAPS::annotate, wxT( "annotate_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::apply_pad_settings].emplace_back( BITMAPS::apply_pad_settings, wxT( "apply_pad_settings_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::array].emplace_back( BITMAPS::array, wxT( "array_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::auto_associate].emplace_back( BITMAPS::auto_associate, wxT( "auto_associate_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::auto_track_width].emplace_back( BITMAPS::auto_track_width, wxT( "auto_track_width_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::autoplace_fields].emplace_back( BITMAPS::autoplace_fields, wxT( "autoplace_fields_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::axis3d_back].emplace_back( BITMAPS::axis3d_back, wxT( "axis3d_back_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::axis3d_bottom].emplace_back( BITMAPS::axis3d_bottom, wxT( "axis3d_bottom_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::axis3d_front].emplace_back( BITMAPS::axis3d_front, wxT( "axis3d_front_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::axis3d_left].emplace_back( BITMAPS::axis3d_left, wxT( "axis3d_left_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::axis3d_right].emplace_back( BITMAPS::axis3d_right, wxT( "axis3d_right_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::axis3d_top].emplace_back( BITMAPS::axis3d_top, wxT( "axis3d_top_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::axis3d].emplace_back( BITMAPS::axis3d, wxT( "axis3d_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::break_line].emplace_back( BITMAPS::break_line, wxT( "break_line_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::bug].emplace_back( BITMAPS::bug, wxT( "bug_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::bus_definition_tool].emplace_back( BITMAPS::bus_definition_tool, wxT( "bus_definition_tool_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::cancel].emplace_back( BITMAPS::cancel, wxT( "cancel_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::chamfer].emplace_back( BITMAPS::chamfer, wxT( "chamfer_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::change_entry_orient].emplace_back( BITMAPS::change_entry_orient, wxT( "change_entry_orient_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::checked_ok].emplace_back( BITMAPS::checked_ok, wxT( "checked_ok_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::color_materials].emplace_back( BITMAPS::color_materials, wxT( "color_materials_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::component_select_unit].emplace_back( BITMAPS::component_select_unit, wxT( "component_select_unit_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::config].emplace_back( BITMAPS::config, wxT( "config_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::convert].emplace_back( BITMAPS::convert, wxT( "convert_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::copy].emplace_back( BITMAPS::copy, wxT( "copy_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::copy_pad_settings].emplace_back( BITMAPS::copy_pad_settings, wxT( "copy_pad_settings_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::cursor_shape].emplace_back( BITMAPS::cursor_shape, wxT( "cursor_shape_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::cursor].emplace_back( BITMAPS::cursor, wxT( "cursor_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::custom_pad_to_primitives].emplace_back( BITMAPS::custom_pad_to_primitives, wxT( "custom_pad_to_primitives_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::cut].emplace_back( BITMAPS::cut, wxT( "cut_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::datasheet].emplace_back( BITMAPS::datasheet, wxT( "datasheet_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::delete_association].emplace_back( BITMAPS::delete_association, wxT( "delete_association_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::delete_cursor].emplace_back( BITMAPS::delete_cursor, wxT( "delete_cursor_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::delete_gerber].emplace_back( BITMAPS::delete_gerber, wxT( "delete_gerber_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::delete_sheet].emplace_back( BITMAPS::delete_sheet, wxT( "delete_sheet_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::directory].emplace_back( BITMAPS::directory, wxT( "directory_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::directory_browser].emplace_back( BITMAPS::directory_browser, wxT( "directory_browser_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::directory_open].emplace_back( BITMAPS::directory_open, wxT( "directory_open_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::drag_segment_withslope].emplace_back( BITMAPS::drag_segment_withslope, wxT( "drag_segment_withslope_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::drc].emplace_back( BITMAPS::drc, wxT( "drc_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::duplicate].emplace_back( BITMAPS::duplicate, wxT( "duplicate_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::edit_comp_footprint].emplace_back( BITMAPS::edit_comp_footprint, wxT( "edit_comp_footprint_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::edit_comp_ref].emplace_back( BITMAPS::edit_comp_ref, wxT( "edit_comp_ref_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::edit_comp_value].emplace_back( BITMAPS::edit_comp_value, wxT( "edit_comp_value_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::editor].emplace_back( BITMAPS::editor, wxT( "editor_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::edit_cmp_symb_links].emplace_back( BITMAPS::edit_cmp_symb_links, wxT( "edit_cmp_symb_links_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::edit].emplace_back( BITMAPS::edit, wxT( "edit_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::edge_to_copper_clearance].emplace_back( BITMAPS::edge_to_copper_clearance, wxT( "edge_to_copper_clearance_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::enter_sheet].emplace_back( BITMAPS::enter_sheet, wxT( "enter_sheet_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::ercerr].emplace_back( BITMAPS::ercerr, wxT( "ercerr_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::erc_green].emplace_back( BITMAPS::erc_green, wxT( "erc_green_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::ercwarn].emplace_back( BITMAPS::ercwarn, wxT( "ercwarn_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::erc].emplace_back( BITMAPS::erc, wxT( "erc_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::exit].emplace_back( BITMAPS::exit, wxT( "exit_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::exchange].emplace_back( BITMAPS::exchange, wxT( "exchange_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::export3d].emplace_back( BITMAPS::export3d, wxT( "export3d_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::export_cmp].emplace_back( BITMAPS::export_cmp, wxT( "export_cmp_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::export_dsn].emplace_back( BITMAPS::export_dsn, wxT( "export_dsn_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::export_idf].emplace_back( BITMAPS::export_idf, wxT( "export_idf_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::export_file].emplace_back( BITMAPS::export_file, wxT( "export_file_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::export_footprint_names].emplace_back( BITMAPS::export_footprint_names, wxT( "export_footprint_names_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::export_module].emplace_back( BITMAPS::export_module, wxT( "export_module_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::export_part].emplace_back( BITMAPS::export_part, wxT( "export_part_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::export_png].emplace_back( BITMAPS::export_png, wxT( "export_png_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::export_step].emplace_back( BITMAPS::export_step, wxT( "export_step_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::export_svg].emplace_back( BITMAPS::export_svg, wxT( "export_svg_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::export_to_pcbnew].emplace_back( BITMAPS::export_to_pcbnew, wxT( "export_to_pcbnew_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::fabrication].emplace_back( BITMAPS::fabrication, wxT( "fabrication_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::file_bom].emplace_back( BITMAPS::file_bom, wxT( "file_bom_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::file_drl].emplace_back( BITMAPS::file_drl, wxT( "file_drl_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::file_dsn].emplace_back( BITMAPS::file_dsn, wxT( "file_dsn_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::file_gbr].emplace_back( BITMAPS::file_gbr, wxT( "file_gbr_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::file_gerber_job].emplace_back( BITMAPS::file_gerber_job, wxT( "file_gerber_job_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::file_html].emplace_back( BITMAPS::file_html, wxT( "file_html_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::file_idf].emplace_back( BITMAPS::file_idf, wxT( "file_idf_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::file_pdf].emplace_back( BITMAPS::file_pdf, wxT( "file_pdf_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::file_pos].emplace_back( BITMAPS::file_pos, wxT( "file_pos_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::file_svg].emplace_back( BITMAPS::file_svg, wxT( "file_svg_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::fill_zone].emplace_back( BITMAPS::fill_zone, wxT( "fill_zone_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::fillet].emplace_back( BITMAPS::fillet, wxT( "fillet_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::filter].emplace_back( BITMAPS::filter, wxT( "filter_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::find].emplace_back( BITMAPS::find, wxT( "find_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::find_replace].emplace_back( BITMAPS::find_replace, wxT( "find_replace_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::flag].emplace_back( BITMAPS::flag, wxT( "flag_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::flip_board].emplace_back( BITMAPS::flip_board, wxT( "flip_board_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::gbr_select_mode1].emplace_back( BITMAPS::gbr_select_mode1, wxT( "gbr_select_mode1_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::gbr_select_mode2].emplace_back( BITMAPS::gbr_select_mode2, wxT( "gbr_select_mode2_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::gerbview_show_negative_objects].emplace_back( BITMAPS::gerbview_show_negative_objects, wxT( "gerbview_show_negative_objects_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::general_deletions].emplace_back( BITMAPS::general_deletions, wxT( "general_deletions_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::general_ratsnest].emplace_back( BITMAPS::general_ratsnest, wxT( "general_ratsnest_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::grid_select].emplace_back( BITMAPS::grid_select, wxT( "grid_select_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::grid_select_axis].emplace_back( BITMAPS::grid_select_axis, wxT( "grid_select_axis_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::grid_override].emplace_back( BITMAPS::grid_override, wxT( "grid_override_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::grid].emplace_back( BITMAPS::grid, wxT( "grid_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::group].emplace_back( BITMAPS::group, wxT( "group_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::group_enter].emplace_back( BITMAPS::group_enter, wxT( "group_enter_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::group_leave].emplace_back( BITMAPS::group_leave, wxT( "group_leave_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::group_remove].emplace_back( BITMAPS::group_remove, wxT( "group_remove_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::group_ungroup].emplace_back( BITMAPS::group_ungroup, wxT( "group_ungroup_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::heal_shapes].emplace_back( BITMAPS::heal_shapes, wxT( "heal_shapes_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::help].emplace_back( BITMAPS::help, wxT( "help_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::help_online].emplace_back( BITMAPS::help_online, wxT( "help_online_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::hidden_pin].emplace_back( BITMAPS::hidden_pin, wxT( "hidden_pin_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::hide_ratsnest].emplace_back( BITMAPS::hide_ratsnest, wxT( "hide_ratsnest_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::hierarchy_nav].emplace_back( BITMAPS::hierarchy_nav, wxT( "hierarchy_nav_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::hotkeys].emplace_back( BITMAPS::hotkeys, wxT( "hotkeys_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::hole_to_hole_clearance].emplace_back( BITMAPS::hole_to_hole_clearance, wxT( "hole_to_hole_clearance_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::hole_to_copper_clearance].emplace_back( BITMAPS::hole_to_copper_clearance, wxT( "hole_to_copper_clearance_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::hv45mode].emplace_back( BITMAPS::hv45mode, wxT( "hv45mode_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::icon_cvpcb_24].emplace_back( BITMAPS::icon_cvpcb_24, wxT( "icon_cvpcb_24_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::icon_footprint_browser].emplace_back( BITMAPS::icon_footprint_browser, wxT( "icon_footprint_browser_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::icon_gerbview_24].emplace_back( BITMAPS::icon_gerbview_24, wxT( "icon_gerbview_24_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::icon_pcm_24].emplace_back( BITMAPS::icon_pcm_24, wxT( "icon_pcm_24_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::import3d].emplace_back( BITMAPS::import3d, wxT( "import3d_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::image].emplace_back( BITMAPS::image, wxT( "image_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::import_brd_file].emplace_back( BITMAPS::import_brd_file, wxT( "import_brd_file_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::import_document].emplace_back( BITMAPS::import_document, wxT( "import_document_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::import_footprint_names].emplace_back( BITMAPS::import_footprint_names, wxT( "import_footprint_names_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::import_hierarchical_label].emplace_back( BITMAPS::import_hierarchical_label, wxT( "import_hierarchical_label_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::import_module].emplace_back( BITMAPS::import_module, wxT( "import_module_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::import_part].emplace_back( BITMAPS::import_part, wxT( "import_part_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::import_project].emplace_back( BITMAPS::import_project, wxT( "import_project_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::import_vector].emplace_back( BITMAPS::import_vector, wxT( "import_vector_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::import].emplace_back( BITMAPS::import, wxT( "import_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::info].emplace_back( BITMAPS::info, wxT( "info_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::insert_module_board].emplace_back( BITMAPS::insert_module_board, wxT( "insert_module_board_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::intersect_polygons].emplace_back( BITMAPS::intersect_polygons, wxT( "intersect_polygons_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::language].emplace_back( BITMAPS::language, wxT( "language_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::layers_manager].emplace_back( BITMAPS::layers_manager, wxT( "layers_manager_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::leave_sheet].emplace_back( BITMAPS::leave_sheet, wxT( "leave_sheet_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::left].emplace_back( BITMAPS::left, wxT( "left_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::libedit].emplace_back( BITMAPS::libedit, wxT( "libedit_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::lib_next].emplace_back( BITMAPS::lib_next, wxT( "lib_next_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::lib_previous].emplace_back( BITMAPS::lib_previous, wxT( "lib_previous_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::library_browser].emplace_back( BITMAPS::library_browser, wxT( "library_browser_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::library_archive].emplace_back( BITMAPS::library_archive, wxT( "library_archive_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::library_archive_as].emplace_back( BITMAPS::library_archive_as, wxT( "library_archive_as_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::library].emplace_back( BITMAPS::library, wxT( "library_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::library_table].emplace_back( BITMAPS::library_table, wxT( "library_table_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::lines_any].emplace_back( BITMAPS::lines_any, wxT( "lines_any_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::lines90].emplace_back( BITMAPS::lines90, wxT( "lines90_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::list_nets].emplace_back( BITMAPS::list_nets, wxT( "list_nets_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::load_drill].emplace_back( BITMAPS::load_drill, wxT( "load_drill_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::load_gerber].emplace_back( BITMAPS::load_gerber, wxT( "load_gerber_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::load_module_board].emplace_back( BITMAPS::load_module_board, wxT( "load_module_board_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::lock_unlock].emplace_back( BITMAPS::lock_unlock, wxT( "lock_unlock_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::locked].emplace_back( BITMAPS::locked, wxT( "locked_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::marker_exclude].emplace_back( BITMAPS::marker_exclude, wxT( "marker_exclude_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::marker_next].emplace_back( BITMAPS::marker_next, wxT( "marker_next_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::marker_previous].emplace_back( BITMAPS::marker_previous, wxT( "marker_previous_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::measurement].emplace_back( BITMAPS::measurement, wxT( "measurement_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::merge_polygons].emplace_back( BITMAPS::merge_polygons, wxT( "merge_polygons_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::mirror_h].emplace_back( BITMAPS::mirror_h, wxT( "mirror_h_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::mirror_v].emplace_back( BITMAPS::mirror_v, wxT( "mirror_v_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::mode_module].emplace_back( BITMAPS::mode_module, wxT( "mode_module_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::module_editor].emplace_back( BITMAPS::module_editor, wxT( "module_editor_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::module_wizard].emplace_back( BITMAPS::module_wizard, wxT( "module_wizard_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::module_filtered_list].emplace_back( BITMAPS::module_filtered_list, wxT( "module_filtered_list_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::module_options].emplace_back( BITMAPS::module_options, wxT( "module_options_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::module_pin_filtered_list].emplace_back( BITMAPS::module_pin_filtered_list, wxT( "module_pin_filtered_list_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::module_library_list].emplace_back( BITMAPS::module_library_list, wxT( "module_library_list_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::module].emplace_back( BITMAPS::module, wxT( "module_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::morgan1].emplace_back( BITMAPS::morgan1, wxT( "morgan1_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::morgan2].emplace_back( BITMAPS::morgan2, wxT( "morgan2_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::move_exactly].emplace_back( BITMAPS::move_exactly, wxT( "move_exactly_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::move].emplace_back( BITMAPS::move, wxT( "move_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::move_relative].emplace_back( BITMAPS::move_relative, wxT( "move_relative_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::mw_add_gap].emplace_back( BITMAPS::mw_add_gap, wxT( "mw_add_gap_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::mw_add_line].emplace_back( BITMAPS::mw_add_line, wxT( "mw_add_line_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::mw_add_shape].emplace_back( BITMAPS::mw_add_shape, wxT( "mw_add_shape_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::mw_add_stub_arc].emplace_back( BITMAPS::mw_add_stub_arc, wxT( "mw_add_stub_arc_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::mw_add_stub].emplace_back( BITMAPS::mw_add_stub, wxT( "mw_add_stub_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::net_highlight].emplace_back( BITMAPS::net_highlight, wxT( "net_highlight_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::net_highlight_schematic].emplace_back( BITMAPS::net_highlight_schematic, wxT( "net_highlight_schematic_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::netlist].emplace_back( BITMAPS::netlist, wxT( "netlist_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::new_component].emplace_back( BITMAPS::new_component, wxT( "new_component_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::new_footprint].emplace_back( BITMAPS::new_footprint, wxT( "new_footprint_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::new_generic].emplace_back( BITMAPS::new_generic, wxT( "new_generic_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::new_library].emplace_back( BITMAPS::new_library, wxT( "new_library_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::new_project].emplace_back( BITMAPS::new_project, wxT( "new_project_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::new_project_from_template].emplace_back( BITMAPS::new_project_from_template, wxT( "new_project_from_template_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::noconn].emplace_back( BITMAPS::noconn, wxT( "noconn_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::normal].emplace_back( BITMAPS::normal, wxT( "normal_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::open_project].emplace_back( BITMAPS::open_project, wxT( "open_project_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::open_project_demo].emplace_back( BITMAPS::open_project_demo, wxT( "open_project_demo_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::options_3drender].emplace_back( BITMAPS::options_3drender, wxT( "options_3drender_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::options_board].emplace_back( BITMAPS::options_board, wxT( "options_board_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::options_generic].emplace_back( BITMAPS::options_generic, wxT( "options_generic_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::options_pad].emplace_back( BITMAPS::options_pad, wxT( "options_pad_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::options_schematic].emplace_back( BITMAPS::options_schematic, wxT( "options_schematic_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::opt_show_polygon].emplace_back( BITMAPS::opt_show_polygon, wxT( "opt_show_polygon_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::ortho].emplace_back( BITMAPS::ortho, wxT( "ortho_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pack_footprints].emplace_back( BITMAPS::pack_footprints, wxT( "pack_footprints_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pad_sketch].emplace_back( BITMAPS::pad_sketch, wxT( "pad_sketch_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pad].emplace_back( BITMAPS::pad, wxT( "pad_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pad_enumerate].emplace_back( BITMAPS::pad_enumerate, wxT( "pad_enumerate_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pad_number].emplace_back( BITMAPS::pad_number, wxT( "pad_number_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pads_mask_layers].emplace_back( BITMAPS::pads_mask_layers, wxT( "pads_mask_layers_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pads_remove].emplace_back( BITMAPS::pads_remove, wxT( "pads_remove_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::path].emplace_back( BITMAPS::path, wxT( "path_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pagelayout_normal_view_mode].emplace_back( BITMAPS::pagelayout_normal_view_mode, wxT( "pagelayout_normal_view_mode_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pagelayout_special_view_mode].emplace_back( BITMAPS::pagelayout_special_view_mode, wxT( "pagelayout_special_view_mode_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::part_properties].emplace_back( BITMAPS::part_properties, wxT( "part_properties_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::paste].emplace_back( BITMAPS::paste, wxT( "paste_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::paste_special].emplace_back( BITMAPS::paste_special, wxT( "paste_special_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pcb_target].emplace_back( BITMAPS::pcb_target, wxT( "pcb_target_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pin2pin].emplace_back( BITMAPS::pin2pin, wxT( "pin2pin_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pin_size_to].emplace_back( BITMAPS::pin_size_to, wxT( "pin_size_to_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pin_show_etype].emplace_back( BITMAPS::pin_show_etype, wxT( "pin_show_etype_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pin_table].emplace_back( BITMAPS::pin_table, wxT( "pin_table_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::pin].emplace_back( BITMAPS::pin, wxT( "pin_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::plot].emplace_back( BITMAPS::plot, wxT( "plot_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::polar_coord].emplace_back( BITMAPS::polar_coord, wxT( "polar_coord_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::post_bom].emplace_back( BITMAPS::post_bom, wxT( "post_bom_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::post_compo].emplace_back( BITMAPS::post_compo, wxT( "post_compo_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::post_d356].emplace_back( BITMAPS::post_d356, wxT( "post_d356_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::post_drill].emplace_back( BITMAPS::post_drill, wxT( "post_drill_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::post_gencad].emplace_back( BITMAPS::post_gencad, wxT( "post_gencad_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::post_gerber].emplace_back( BITMAPS::post_gerber, wxT( "post_gerber_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::post_rpt].emplace_back( BITMAPS::post_rpt, wxT( "post_rpt_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::preference].emplace_back( BITMAPS::preference, wxT( "preference_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::print_button].emplace_back( BITMAPS::print_button, wxT( "print_button_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::project].emplace_back( BITMAPS::project, wxT( "project_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::project_close].emplace_back( BITMAPS::project_close, wxT( "project_close_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::project_kicad].emplace_back( BITMAPS::project_kicad, wxT( "project_kicad_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::ps_diff_pair].emplace_back( BITMAPS::ps_diff_pair, wxT( "ps_diff_pair_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::ps_diff_pair_gap].emplace_back( BITMAPS::ps_diff_pair_gap, wxT( "ps_diff_pair_gap_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::ps_diff_pair_tune_length].emplace_back( BITMAPS::ps_diff_pair_tune_length, wxT( "ps_diff_pair_tune_length_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::ps_diff_pair_tune_phase].emplace_back( BITMAPS::ps_diff_pair_tune_phase, wxT( "ps_diff_pair_tune_phase_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::ps_tune_length].emplace_back( BITMAPS::ps_tune_length, wxT( "ps_tune_length_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::push_pad_settings].emplace_back( BITMAPS::push_pad_settings, wxT( "push_pad_settings_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::puzzle_piece].emplace_back( BITMAPS::puzzle_piece, wxT( "puzzle_piece_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::py_script].emplace_back( BITMAPS::py_script, wxT( "py_script_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::recent].emplace_back( BITMAPS::recent, wxT( "recent_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::redo].emplace_back( BITMAPS::redo, wxT( "redo_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::refresh].emplace_back( BITMAPS::refresh, wxT( "refresh_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::reload].emplace_back( BITMAPS::reload, wxT( "reload_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::render_mode].emplace_back( BITMAPS::render_mode, wxT( "render_mode_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::rescue].emplace_back( BITMAPS::rescue, wxT( "rescue_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::right].emplace_back( BITMAPS::right, wxT( "right_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::router_len_tuner].emplace_back( BITMAPS::router_len_tuner, wxT( "router_len_tuner_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::router_len_tuner_setup].emplace_back( BITMAPS::router_len_tuner_setup, wxT( "router_len_tuner_setup_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::router_len_tuner_amplitude_decr].emplace_back( BITMAPS::router_len_tuner_amplitude_decr, wxT( "router_len_tuner_amplitude_decr_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::router_len_tuner_amplitude_incr].emplace_back( BITMAPS::router_len_tuner_amplitude_incr, wxT( "router_len_tuner_amplitude_incr_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::router_len_tuner_dist_decr].emplace_back( BITMAPS::router_len_tuner_dist_decr, wxT( "router_len_tuner_dist_decr_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::router_len_tuner_dist_incr].emplace_back( BITMAPS::router_len_tuner_dist_incr, wxT( "router_len_tuner_dist_incr_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::rotate_ccw].emplace_back( BITMAPS::rotate_ccw, wxT( "rotate_ccw_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::rotate_cw].emplace_back( BITMAPS::rotate_cw, wxT( "rotate_cw_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::rotate_ccw_x].emplace_back( BITMAPS::rotate_ccw_x, wxT( "rotate_ccw_x_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::rotate_cw_x].emplace_back( BITMAPS::rotate_cw_x, wxT( "rotate_cw_x_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::rotate_ccw_y].emplace_back( BITMAPS::rotate_ccw_y, wxT( "rotate_ccw_y_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::rotate_cw_y].emplace_back( BITMAPS::rotate_cw_y, wxT( "rotate_cw_y_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::rotate_ccw_z].emplace_back( BITMAPS::rotate_ccw_z, wxT( "rotate_ccw_z_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::rotate_cw_z].emplace_back( BITMAPS::rotate_cw_z, wxT( "rotate_cw_z_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::save_as].emplace_back( BITMAPS::save_as, wxT( "save_as_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::save].emplace_back( BITMAPS::save, wxT( "save_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::select_layer_pair].emplace_back( BITMAPS::select_layer_pair, wxT( "select_layer_pair_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::select_w_layer].emplace_back( BITMAPS::select_w_layer, wxT( "select_w_layer_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::select_same_sheet].emplace_back( BITMAPS::select_same_sheet, wxT( "select_same_sheet_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::shape_3d].emplace_back( BITMAPS::shape_3d, wxT( "shape_3d_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::shape_3d_back].emplace_back( BITMAPS::shape_3d_back, wxT( "shape_3d_back_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::sheetset].emplace_back( BITMAPS::sheetset, wxT( "sheetset_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::simulator].emplace_back( BITMAPS::simulator, wxT( "simulator_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::sim_add_plot].emplace_back( BITMAPS::sim_add_plot, wxT( "sim_add_plot_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::sim_command].emplace_back( BITMAPS::sim_command, wxT( "sim_command_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::sim_run].emplace_back( BITMAPS::sim_run, wxT( "sim_run_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::sim_stop].emplace_back( BITMAPS::sim_stop, wxT( "sim_stop_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::sim_tune].emplace_back( BITMAPS::sim_tune, wxT( "sim_tune_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::sim_probe].emplace_back( BITMAPS::sim_probe, wxT( "sim_probe_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::sim_add_signal].emplace_back( BITMAPS::sim_add_signal, wxT( "sim_add_signal_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::slice_line].emplace_back( BITMAPS::slice_line, wxT( "slice_line_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::search_tree].emplace_back( BITMAPS::search_tree, wxT( "search_tree_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::set_origin].emplace_back( BITMAPS::set_origin, wxT( "set_origin_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_dcodenumber].emplace_back( BITMAPS::show_dcodenumber, wxT( "show_dcodenumber_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_dnp].emplace_back( BITMAPS::show_dnp, wxT( "show_dnp_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_footprint].emplace_back( BITMAPS::show_footprint, wxT( "show_footprint_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_mod_edge].emplace_back( BITMAPS::show_mod_edge, wxT( "show_mod_edge_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_ratsnest].emplace_back( BITMAPS::show_ratsnest, wxT( "show_ratsnest_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::showtrack].emplace_back( BITMAPS::showtrack, wxT( "showtrack_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_not_in_posfile].emplace_back( BITMAPS::show_not_in_posfile, wxT( "show_not_in_posfile_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_other].emplace_back( BITMAPS::show_other, wxT( "show_other_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_tht].emplace_back( BITMAPS::show_tht, wxT( "show_tht_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_smt].emplace_back( BITMAPS::show_smt, wxT( "show_smt_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_zone].emplace_back( BITMAPS::show_zone, wxT( "show_zone_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_zone_disable].emplace_back( BITMAPS::show_zone_disable, wxT( "show_zone_disable_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_zone_outline_only].emplace_back( BITMAPS::show_zone_outline_only, wxT( "show_zone_outline_only_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_zone_triangulation].emplace_back( BITMAPS::show_zone_triangulation, wxT( "show_zone_triangulation_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_all_layers].emplace_back( BITMAPS::show_all_layers, wxT( "show_all_layers_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_no_layers].emplace_back( BITMAPS::show_no_layers, wxT( "show_no_layers_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_no_copper_layers].emplace_back( BITMAPS::show_no_copper_layers, wxT( "show_no_copper_layers_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_all_copper_layers].emplace_back( BITMAPS::show_all_copper_layers, wxT( "show_all_copper_layers_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_all_front_layers].emplace_back( BITMAPS::show_all_front_layers, wxT( "show_all_front_layers_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_all_back_layers].emplace_back( BITMAPS::show_all_back_layers, wxT( "show_all_back_layers_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_front_assembly_layers].emplace_back( BITMAPS::show_front_assembly_layers, wxT( "show_front_assembly_layers_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::show_back_assembly_layers].emplace_back( BITMAPS::show_back_assembly_layers, wxT( "show_back_assembly_layers_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::special_tools].emplace_back( BITMAPS::special_tools, wxT( "special_tools_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::spreadsheet].emplace_back( BITMAPS::spreadsheet, wxT( "spreadsheet_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::subtract_polygons].emplace_back( BITMAPS::subtract_polygons, wxT( "subtract_polygons_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::swap].emplace_back( BITMAPS::swap, wxT( "swap_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::swap_layer].emplace_back( BITMAPS::swap_layer, wxT( "swap_layer_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::switch_corner_rounding_shape].emplace_back( BITMAPS::switch_corner_rounding_shape, wxT( "switch_corner_rounding_shape_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::text].emplace_back( BITMAPS::text, wxT( "text_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::text_sketch].emplace_back( BITMAPS::text_sketch, wxT( "text_sketch_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::thermal_spokes].emplace_back( BITMAPS::thermal_spokes, wxT( "thermal_spokes_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::three_d].emplace_back( BITMAPS::three_d, wxT( "three_d_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::tool_ratsnest].emplace_back( BITMAPS::tool_ratsnest, wxT( "tool_ratsnest_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::tools].emplace_back( BITMAPS::tools, wxT( "tools_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::trash].emplace_back( BITMAPS::trash, wxT( "trash_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::undo].emplace_back( BITMAPS::undo, wxT( "undo_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::unit_inch].emplace_back( BITMAPS::unit_inch, wxT( "unit_inch_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::unit_mil].emplace_back( BITMAPS::unit_mil, wxT( "unit_mil_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::unit_mm].emplace_back( BITMAPS::unit_mm, wxT( "unit_mm_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::unknown].emplace_back( BITMAPS::unknown, wxT( "unknown_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::unlocked].emplace_back( BITMAPS::unlocked, wxT( "unlocked_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::unzip].emplace_back( BITMAPS::unzip, wxT( "unzip_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::up].emplace_back( BITMAPS::up, wxT( "up_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::update_pcb_from_sch].emplace_back( BITMAPS::update_pcb_from_sch, wxT( "update_pcb_from_sch_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::update_sch_from_pcb].emplace_back( BITMAPS::update_sch_from_pcb, wxT( "update_sch_from_pcb_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::via].emplace_back( BITMAPS::via, wxT( "via_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::via_annulus].emplace_back( BITMAPS::via_annulus, wxT( "via_annulus_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::via_buried].emplace_back( BITMAPS::via_buried, wxT( "via_buried_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::via_microvia].emplace_back( BITMAPS::via_microvia, wxT( "via_microvia_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::via_sketch].emplace_back( BITMAPS::via_sketch, wxT( "via_sketch_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::via_diameter].emplace_back( BITMAPS::via_diameter, wxT( "via_diameter_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::via_hole_diameter].emplace_back( BITMAPS::via_hole_diameter, wxT( "via_hole_diameter_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::width_conn].emplace_back( BITMAPS::width_conn, wxT( "width_conn_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::width_track_via].emplace_back( BITMAPS::width_track_via, wxT( "width_track_via_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::width_track].emplace_back( BITMAPS::width_track, wxT( "width_track_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::zip].emplace_back( BITMAPS::zip, wxT( "zip_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::zone_duplicate].emplace_back( BITMAPS::zone_duplicate, wxT( "zone_duplicate_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::zone_fillet].emplace_back( BITMAPS::zone_fillet, wxT( "zone_fillet_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::zone_unfill].emplace_back( BITMAPS::zone_unfill, wxT( "zone_unfill_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::zoom_area].emplace_back( BITMAPS::zoom_area, wxT( "zoom_area_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::zoom_auto_fit_in_page].emplace_back( BITMAPS::zoom_auto_fit_in_page, wxT( "zoom_auto_fit_in_page_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::zoom_fit_in_page].emplace_back( BITMAPS::zoom_fit_in_page, wxT( "zoom_fit_in_page_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::zoom_fit_to_objects].emplace_back( BITMAPS::zoom_fit_to_objects, wxT( "zoom_fit_to_objects_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::zoom_center_on_screen].emplace_back( BITMAPS::zoom_center_on_screen, wxT( "zoom_center_on_screen_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::zoom_in].emplace_back( BITMAPS::zoom_in, wxT( "zoom_in_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::zoom_out].emplace_back( BITMAPS::zoom_out, wxT( "zoom_out_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::zoom_selection].emplace_back( BITMAPS::zoom_selection, wxT( "zoom_selection_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::about].emplace_back( BITMAPS::about, wxT( "about_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_aligned_dimension].emplace_back( BITMAPS::add_aligned_dimension, wxT( "add_aligned_dimension_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_arc].emplace_back( BITMAPS::add_arc, wxT( "add_arc_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_board].emplace_back( BITMAPS::add_board, wxT( "add_board_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_bus2bus].emplace_back( BITMAPS::add_bus2bus, wxT( "add_bus2bus_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_bus].emplace_back( BITMAPS::add_bus, wxT( "add_bus_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_center_dimension].emplace_back( BITMAPS::add_center_dimension, wxT( "add_center_dimension_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_class_flag].emplace_back( BITMAPS::add_class_flag, wxT( "add_class_flag_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_circle].emplace_back( BITMAPS::add_circle, wxT( "add_circle_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_component].emplace_back( BITMAPS::add_component, wxT( "add_component_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_corner].emplace_back( BITMAPS::add_corner, wxT( "add_corner_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_dashed_line].emplace_back( BITMAPS::add_dashed_line, wxT( "add_dashed_line_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_document].emplace_back( BITMAPS::add_document, wxT( "add_document_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_glabel].emplace_back( BITMAPS::add_glabel, wxT( "add_glabel_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_graphical_segments].emplace_back( BITMAPS::add_graphical_segments, wxT( "add_graphical_segments_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_graphical_polygon].emplace_back( BITMAPS::add_graphical_polygon, wxT( "add_graphical_polygon_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_hierarchical_label].emplace_back( BITMAPS::add_hierarchical_label, wxT( "add_hierarchical_label_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_hierar_pin].emplace_back( BITMAPS::add_hierar_pin, wxT( "add_hierar_pin_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_hierarchical_subsheet].emplace_back( BITMAPS::add_hierarchical_subsheet, wxT( "add_hierarchical_subsheet_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_junction].emplace_back( BITMAPS::add_junction, wxT( "add_junction_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_keepout_area].emplace_back( BITMAPS::add_keepout_area, wxT( "add_keepout_area_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_label].emplace_back( BITMAPS::add_label, wxT( "add_label_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_leader].emplace_back( BITMAPS::add_leader, wxT( "add_leader_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_library].emplace_back( BITMAPS::add_library, wxT( "add_library_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_line2bus].emplace_back( BITMAPS::add_line2bus, wxT( "add_line2bus_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_line_label].emplace_back( BITMAPS::add_line_label, wxT( "add_line_label_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_line].emplace_back( BITMAPS::add_line, wxT( "add_line_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_orthogonal_dimension].emplace_back( BITMAPS::add_orthogonal_dimension, wxT( "add_orthogonal_dimension_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_pcb_target].emplace_back( BITMAPS::add_pcb_target, wxT( "add_pcb_target_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_power].emplace_back( BITMAPS::add_power, wxT( "add_power_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_radial_dimension].emplace_back( BITMAPS::add_radial_dimension, wxT( "add_radial_dimension_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_rectangle].emplace_back( BITMAPS::add_rectangle, wxT( "add_rectangle_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_symbol_to_schematic].emplace_back( BITMAPS::add_symbol_to_schematic, wxT( "add_symbol_to_schematic_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_tracks].emplace_back( BITMAPS::add_tracks, wxT( "add_tracks_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_via].emplace_back( BITMAPS::add_via, wxT( "add_via_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_zone_cutout].emplace_back( BITMAPS::add_zone_cutout, wxT( "add_zone_cutout_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::add_zone].emplace_back( BITMAPS::add_zone, wxT( "add_zone_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::align_items].emplace_back( BITMAPS::align_items, wxT( "align_items_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::align_items_left].emplace_back( BITMAPS::align_items_left, wxT( "align_items_left_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::align_items_right].emplace_back( BITMAPS::align_items_right, wxT( "align_items_right_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::align_items_top].emplace_back( BITMAPS::align_items_top, wxT( "align_items_top_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::align_items_bottom].emplace_back( BITMAPS::align_items_bottom, wxT( "align_items_bottom_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::align_items_center].emplace_back( BITMAPS::align_items_center, wxT( "align_items_center_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::align_items_middle].emplace_back( BITMAPS::align_items_middle, wxT( "align_items_middle_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::anchor].emplace_back( BITMAPS::anchor, wxT( "anchor_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::annotate_down_right].emplace_back( BITMAPS::annotate_down_right, wxT( "annotate_down_right_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::annotate_right_down].emplace_back( BITMAPS::annotate_right_down, wxT( "annotate_right_down_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::annotate].emplace_back( BITMAPS::annotate, wxT( "annotate_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::apply_pad_settings].emplace_back( BITMAPS::apply_pad_settings, wxT( "apply_pad_settings_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::array].emplace_back( BITMAPS::array, wxT( "array_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::auto_associate].emplace_back( BITMAPS::auto_associate, wxT( "auto_associate_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::auto_track_width].emplace_back( BITMAPS::auto_track_width, wxT( "auto_track_width_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::autoplace_fields].emplace_back( BITMAPS::autoplace_fields, wxT( "autoplace_fields_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::axis3d_back].emplace_back( BITMAPS::axis3d_back, wxT( "axis3d_back_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::axis3d_bottom].emplace_back( BITMAPS::axis3d_bottom, wxT( "axis3d_bottom_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::axis3d_front].emplace_back( BITMAPS::axis3d_front, wxT( "axis3d_front_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::axis3d_left].emplace_back( BITMAPS::axis3d_left, wxT( "axis3d_left_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::axis3d_right].emplace_back( BITMAPS::axis3d_right, wxT( "axis3d_right_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::axis3d_top].emplace_back( BITMAPS::axis3d_top, wxT( "axis3d_top_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::axis3d].emplace_back( BITMAPS::axis3d, wxT( "axis3d_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::break_line].emplace_back( BITMAPS::break_line, wxT( "break_line_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::bug].emplace_back( BITMAPS::bug, wxT( "bug_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::bus_definition_tool].emplace_back( BITMAPS::bus_definition_tool, wxT( "bus_definition_tool_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::cancel].emplace_back( BITMAPS::cancel, wxT( "cancel_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::chamfer].emplace_back( BITMAPS::chamfer, wxT( "chamfer_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::change_entry_orient].emplace_back( BITMAPS::change_entry_orient, wxT( "change_entry_orient_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::checked_ok].emplace_back( BITMAPS::checked_ok, wxT( "checked_ok_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::color_materials].emplace_back( BITMAPS::color_materials, wxT( "color_materials_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::component_select_unit].emplace_back( BITMAPS::component_select_unit, wxT( "component_select_unit_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::config].emplace_back( BITMAPS::config, wxT( "config_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::convert].emplace_back( BITMAPS::convert, wxT( "convert_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::copy].emplace_back( BITMAPS::copy, wxT( "copy_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::copy_pad_settings].emplace_back( BITMAPS::copy_pad_settings, wxT( "copy_pad_settings_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::cursor_shape].emplace_back( BITMAPS::cursor_shape, wxT( "cursor_shape_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::cursor].emplace_back( BITMAPS::cursor, wxT( "cursor_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::custom_pad_to_primitives].emplace_back( BITMAPS::custom_pad_to_primitives, wxT( "custom_pad_to_primitives_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::cut].emplace_back( BITMAPS::cut, wxT( "cut_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::datasheet].emplace_back( BITMAPS::datasheet, wxT( "datasheet_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::delete_association].emplace_back( BITMAPS::delete_association, wxT( "delete_association_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::delete_cursor].emplace_back( BITMAPS::delete_cursor, wxT( "delete_cursor_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::delete_gerber].emplace_back( BITMAPS::delete_gerber, wxT( "delete_gerber_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::delete_sheet].emplace_back( BITMAPS::delete_sheet, wxT( "delete_sheet_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::directory].emplace_back( BITMAPS::directory, wxT( "directory_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::directory_browser].emplace_back( BITMAPS::directory_browser, wxT( "directory_browser_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::directory_open].emplace_back( BITMAPS::directory_open, wxT( "directory_open_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::drag_segment_withslope].emplace_back( BITMAPS::drag_segment_withslope, wxT( "drag_segment_withslope_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::drc].emplace_back( BITMAPS::drc, wxT( "drc_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::duplicate].emplace_back( BITMAPS::duplicate, wxT( "duplicate_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::edit_comp_footprint].emplace_back( BITMAPS::edit_comp_footprint, wxT( "edit_comp_footprint_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::edit_comp_ref].emplace_back( BITMAPS::edit_comp_ref, wxT( "edit_comp_ref_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::edit_comp_value].emplace_back( BITMAPS::edit_comp_value, wxT( "edit_comp_value_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::editor].emplace_back( BITMAPS::editor, wxT( "editor_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::edit_cmp_symb_links].emplace_back( BITMAPS::edit_cmp_symb_links, wxT( "edit_cmp_symb_links_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::edit].emplace_back( BITMAPS::edit, wxT( "edit_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::edge_to_copper_clearance].emplace_back( BITMAPS::edge_to_copper_clearance, wxT( "edge_to_copper_clearance_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::enter_sheet].emplace_back( BITMAPS::enter_sheet, wxT( "enter_sheet_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::ercerr].emplace_back( BITMAPS::ercerr, wxT( "ercerr_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::erc_green].emplace_back( BITMAPS::erc_green, wxT( "erc_green_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::ercwarn].emplace_back( BITMAPS::ercwarn, wxT( "ercwarn_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::erc].emplace_back( BITMAPS::erc, wxT( "erc_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::exit].emplace_back( BITMAPS::exit, wxT( "exit_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::exchange].emplace_back( BITMAPS::exchange, wxT( "exchange_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::export3d].emplace_back( BITMAPS::export3d, wxT( "export3d_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::export_cmp].emplace_back( BITMAPS::export_cmp, wxT( "export_cmp_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::export_dsn].emplace_back( BITMAPS::export_dsn, wxT( "export_dsn_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::export_idf].emplace_back( BITMAPS::export_idf, wxT( "export_idf_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::export_file].emplace_back( BITMAPS::export_file, wxT( "export_file_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::export_footprint_names].emplace_back( BITMAPS::export_footprint_names, wxT( "export_footprint_names_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::export_module].emplace_back( BITMAPS::export_module, wxT( "export_module_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::export_part].emplace_back( BITMAPS::export_part, wxT( "export_part_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::export_png].emplace_back( BITMAPS::export_png, wxT( "export_png_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::export_step].emplace_back( BITMAPS::export_step, wxT( "export_step_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::export_svg].emplace_back( BITMAPS::export_svg, wxT( "export_svg_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::export_to_pcbnew].emplace_back( BITMAPS::export_to_pcbnew, wxT( "export_to_pcbnew_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::fabrication].emplace_back( BITMAPS::fabrication, wxT( "fabrication_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::file_bom].emplace_back( BITMAPS::file_bom, wxT( "file_bom_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::file_drl].emplace_back( BITMAPS::file_drl, wxT( "file_drl_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::file_dsn].emplace_back( BITMAPS::file_dsn, wxT( "file_dsn_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::file_gbr].emplace_back( BITMAPS::file_gbr, wxT( "file_gbr_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::file_gerber_job].emplace_back( BITMAPS::file_gerber_job, wxT( "file_gerber_job_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::file_html].emplace_back( BITMAPS::file_html, wxT( "file_html_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::file_idf].emplace_back( BITMAPS::file_idf, wxT( "file_idf_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::file_pdf].emplace_back( BITMAPS::file_pdf, wxT( "file_pdf_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::file_pos].emplace_back( BITMAPS::file_pos, wxT( "file_pos_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::file_svg].emplace_back( BITMAPS::file_svg, wxT( "file_svg_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::fill_zone].emplace_back( BITMAPS::fill_zone, wxT( "fill_zone_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::fillet].emplace_back( BITMAPS::fillet, wxT( "fillet_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::filter].emplace_back( BITMAPS::filter, wxT( "filter_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::find].emplace_back( BITMAPS::find, wxT( "find_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::find_replace].emplace_back( BITMAPS::find_replace, wxT( "find_replace_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::flag].emplace_back( BITMAPS::flag, wxT( "flag_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::flip_board].emplace_back( BITMAPS::flip_board, wxT( "flip_board_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::gbr_select_mode1].emplace_back( BITMAPS::gbr_select_mode1, wxT( "gbr_select_mode1_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::gbr_select_mode2].emplace_back( BITMAPS::gbr_select_mode2, wxT( "gbr_select_mode2_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::gerbview_show_negative_objects].emplace_back( BITMAPS::gerbview_show_negative_objects, wxT( "gerbview_show_negative_objects_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::general_deletions].emplace_back( BITMAPS::general_deletions, wxT( "general_deletions_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::general_ratsnest].emplace_back( BITMAPS::general_ratsnest, wxT( "general_ratsnest_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::grid_select].emplace_back( BITMAPS::grid_select, wxT( "grid_select_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::grid_select_axis].emplace_back( BITMAPS::grid_select_axis, wxT( "grid_select_axis_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::grid_override].emplace_back( BITMAPS::grid_override, wxT( "grid_override_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::grid].emplace_back( BITMAPS::grid, wxT( "grid_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::group].emplace_back( BITMAPS::group, wxT( "group_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::group_enter].emplace_back( BITMAPS::group_enter, wxT( "group_enter_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::group_leave].emplace_back( BITMAPS::group_leave, wxT( "group_leave_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::group_remove].emplace_back( BITMAPS::group_remove, wxT( "group_remove_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::group_ungroup].emplace_back( BITMAPS::group_ungroup, wxT( "group_ungroup_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::heal_shapes].emplace_back( BITMAPS::heal_shapes, wxT( "heal_shapes_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::help].emplace_back( BITMAPS::help, wxT( "help_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::help_online].emplace_back( BITMAPS::help_online, wxT( "help_online_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::hidden_pin].emplace_back( BITMAPS::hidden_pin, wxT( "hidden_pin_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::hide_ratsnest].emplace_back( BITMAPS::hide_ratsnest, wxT( "hide_ratsnest_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::hierarchy_nav].emplace_back( BITMAPS::hierarchy_nav, wxT( "hierarchy_nav_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::hotkeys].emplace_back( BITMAPS::hotkeys, wxT( "hotkeys_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::hole_to_hole_clearance].emplace_back( BITMAPS::hole_to_hole_clearance, wxT( "hole_to_hole_clearance_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::hole_to_copper_clearance].emplace_back( BITMAPS::hole_to_copper_clearance, wxT( "hole_to_copper_clearance_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::hv45mode].emplace_back( BITMAPS::hv45mode, wxT( "hv45mode_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::icon_cvpcb_24].emplace_back( BITMAPS::icon_cvpcb_24, wxT( "icon_cvpcb_24_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::icon_footprint_browser].emplace_back( BITMAPS::icon_footprint_browser, wxT( "icon_footprint_browser_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::icon_gerbview_24].emplace_back( BITMAPS::icon_gerbview_24, wxT( "icon_gerbview_24_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::icon_pcm_24].emplace_back( BITMAPS::icon_pcm_24, wxT( "icon_pcm_24_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::import3d].emplace_back( BITMAPS::import3d, wxT( "import3d_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::image].emplace_back( BITMAPS::image, wxT( "image_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::import_brd_file].emplace_back( BITMAPS::import_brd_file, wxT( "import_brd_file_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::import_document].emplace_back( BITMAPS::import_document, wxT( "import_document_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::import_footprint_names].emplace_back( BITMAPS::import_footprint_names, wxT( "import_footprint_names_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::import_hierarchical_label].emplace_back( BITMAPS::import_hierarchical_label, wxT( "import_hierarchical_label_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::import_module].emplace_back( BITMAPS::import_module, wxT( "import_module_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::import_part].emplace_back( BITMAPS::import_part, wxT( "import_part_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::import_project].emplace_back( BITMAPS::import_project, wxT( "import_project_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::import_vector].emplace_back( BITMAPS::import_vector, wxT( "import_vector_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::import].emplace_back( BITMAPS::import, wxT( "import_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::info].emplace_back( BITMAPS::info, wxT( "info_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::insert_module_board].emplace_back( BITMAPS::insert_module_board, wxT( "insert_module_board_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::intersect_polygons].emplace_back( BITMAPS::intersect_polygons, wxT( "intersect_polygons_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::language].emplace_back( BITMAPS::language, wxT( "language_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::layers_manager].emplace_back( BITMAPS::layers_manager, wxT( "layers_manager_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::leave_sheet].emplace_back( BITMAPS::leave_sheet, wxT( "leave_sheet_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::left].emplace_back( BITMAPS::left, wxT( "left_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::libedit].emplace_back( BITMAPS::libedit, wxT( "libedit_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::lib_next].emplace_back( BITMAPS::lib_next, wxT( "lib_next_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::lib_previous].emplace_back( BITMAPS::lib_previous, wxT( "lib_previous_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::library_browser].emplace_back( BITMAPS::library_browser, wxT( "library_browser_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::library_archive].emplace_back( BITMAPS::library_archive, wxT( "library_archive_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::library_archive_as].emplace_back( BITMAPS::library_archive_as, wxT( "library_archive_as_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::library].emplace_back( BITMAPS::library, wxT( "library_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::library_table].emplace_back( BITMAPS::library_table, wxT( "library_table_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::lines_any].emplace_back( BITMAPS::lines_any, wxT( "lines_any_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::lines90].emplace_back( BITMAPS::lines90, wxT( "lines90_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::list_nets].emplace_back( BITMAPS::list_nets, wxT( "list_nets_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::load_drill].emplace_back( BITMAPS::load_drill, wxT( "load_drill_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::load_gerber].emplace_back( BITMAPS::load_gerber, wxT( "load_gerber_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::load_module_board].emplace_back( BITMAPS::load_module_board, wxT( "load_module_board_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::lock_unlock].emplace_back( BITMAPS::lock_unlock, wxT( "lock_unlock_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::locked].emplace_back( BITMAPS::locked, wxT( "locked_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::marker_exclude].emplace_back( BITMAPS::marker_exclude, wxT( "marker_exclude_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::marker_next].emplace_back( BITMAPS::marker_next, wxT( "marker_next_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::marker_previous].emplace_back( BITMAPS::marker_previous, wxT( "marker_previous_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::measurement].emplace_back( BITMAPS::measurement, wxT( "measurement_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::merge_polygons].emplace_back( BITMAPS::merge_polygons, wxT( "merge_polygons_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::mirror_h].emplace_back( BITMAPS::mirror_h, wxT( "mirror_h_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::mirror_v].emplace_back( BITMAPS::mirror_v, wxT( "mirror_v_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::mode_module].emplace_back( BITMAPS::mode_module, wxT( "mode_module_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::module_editor].emplace_back( BITMAPS::module_editor, wxT( "module_editor_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::module_wizard].emplace_back( BITMAPS::module_wizard, wxT( "module_wizard_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::module_filtered_list].emplace_back( BITMAPS::module_filtered_list, wxT( "module_filtered_list_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::module_options].emplace_back( BITMAPS::module_options, wxT( "module_options_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::module_pin_filtered_list].emplace_back( BITMAPS::module_pin_filtered_list, wxT( "module_pin_filtered_list_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::module_library_list].emplace_back( BITMAPS::module_library_list, wxT( "module_library_list_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::module].emplace_back( BITMAPS::module, wxT( "module_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::morgan1].emplace_back( BITMAPS::morgan1, wxT( "morgan1_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::morgan2].emplace_back( BITMAPS::morgan2, wxT( "morgan2_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::move_exactly].emplace_back( BITMAPS::move_exactly, wxT( "move_exactly_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::move].emplace_back( BITMAPS::move, wxT( "move_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::move_relative].emplace_back( BITMAPS::move_relative, wxT( "move_relative_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::mw_add_gap].emplace_back( BITMAPS::mw_add_gap, wxT( "mw_add_gap_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::mw_add_line].emplace_back( BITMAPS::mw_add_line, wxT( "mw_add_line_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::mw_add_shape].emplace_back( BITMAPS::mw_add_shape, wxT( "mw_add_shape_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::mw_add_stub_arc].emplace_back( BITMAPS::mw_add_stub_arc, wxT( "mw_add_stub_arc_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::mw_add_stub].emplace_back( BITMAPS::mw_add_stub, wxT( "mw_add_stub_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::net_highlight].emplace_back( BITMAPS::net_highlight, wxT( "net_highlight_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::net_highlight_schematic].emplace_back( BITMAPS::net_highlight_schematic, wxT( "net_highlight_schematic_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::netlist].emplace_back( BITMAPS::netlist, wxT( "netlist_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::new_component].emplace_back( BITMAPS::new_component, wxT( "new_component_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::new_footprint].emplace_back( BITMAPS::new_footprint, wxT( "new_footprint_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::new_generic].emplace_back( BITMAPS::new_generic, wxT( "new_generic_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::new_library].emplace_back( BITMAPS::new_library, wxT( "new_library_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::new_project].emplace_back( BITMAPS::new_project, wxT( "new_project_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::new_project_from_template].emplace_back( BITMAPS::new_project_from_template, wxT( "new_project_from_template_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::noconn].emplace_back( BITMAPS::noconn, wxT( "noconn_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::normal].emplace_back( BITMAPS::normal, wxT( "normal_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::open_project].emplace_back( BITMAPS::open_project, wxT( "open_project_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::open_project_demo].emplace_back( BITMAPS::open_project_demo, wxT( "open_project_demo_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::options_3drender].emplace_back( BITMAPS::options_3drender, wxT( "options_3drender_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::options_board].emplace_back( BITMAPS::options_board, wxT( "options_board_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::options_generic].emplace_back( BITMAPS::options_generic, wxT( "options_generic_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::options_pad].emplace_back( BITMAPS::options_pad, wxT( "options_pad_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::options_schematic].emplace_back( BITMAPS::options_schematic, wxT( "options_schematic_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::opt_show_polygon].emplace_back( BITMAPS::opt_show_polygon, wxT( "opt_show_polygon_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::ortho].emplace_back( BITMAPS::ortho, wxT( "ortho_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pack_footprints].emplace_back( BITMAPS::pack_footprints, wxT( "pack_footprints_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pad_sketch].emplace_back( BITMAPS::pad_sketch, wxT( "pad_sketch_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pad].emplace_back( BITMAPS::pad, wxT( "pad_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pad_enumerate].emplace_back( BITMAPS::pad_enumerate, wxT( "pad_enumerate_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pad_number].emplace_back( BITMAPS::pad_number, wxT( "pad_number_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pads_mask_layers].emplace_back( BITMAPS::pads_mask_layers, wxT( "pads_mask_layers_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pads_remove].emplace_back( BITMAPS::pads_remove, wxT( "pads_remove_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::path].emplace_back( BITMAPS::path, wxT( "path_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pagelayout_normal_view_mode].emplace_back( BITMAPS::pagelayout_normal_view_mode, wxT( "pagelayout_normal_view_mode_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pagelayout_special_view_mode].emplace_back( BITMAPS::pagelayout_special_view_mode, wxT( "pagelayout_special_view_mode_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::part_properties].emplace_back( BITMAPS::part_properties, wxT( "part_properties_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::paste].emplace_back( BITMAPS::paste, wxT( "paste_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::paste_special].emplace_back( BITMAPS::paste_special, wxT( "paste_special_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pcb_target].emplace_back( BITMAPS::pcb_target, wxT( "pcb_target_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pin2pin].emplace_back( BITMAPS::pin2pin, wxT( "pin2pin_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pin_size_to].emplace_back( BITMAPS::pin_size_to, wxT( "pin_size_to_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pin_show_etype].emplace_back( BITMAPS::pin_show_etype, wxT( "pin_show_etype_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pin_table].emplace_back( BITMAPS::pin_table, wxT( "pin_table_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::pin].emplace_back( BITMAPS::pin, wxT( "pin_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::plot].emplace_back( BITMAPS::plot, wxT( "plot_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::polar_coord].emplace_back( BITMAPS::polar_coord, wxT( "polar_coord_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::post_bom].emplace_back( BITMAPS::post_bom, wxT( "post_bom_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::post_compo].emplace_back( BITMAPS::post_compo, wxT( "post_compo_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::post_d356].emplace_back( BITMAPS::post_d356, wxT( "post_d356_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::post_drill].emplace_back( BITMAPS::post_drill, wxT( "post_drill_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::post_gencad].emplace_back( BITMAPS::post_gencad, wxT( "post_gencad_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::post_gerber].emplace_back( BITMAPS::post_gerber, wxT( "post_gerber_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::post_rpt].emplace_back( BITMAPS::post_rpt, wxT( "post_rpt_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::preference].emplace_back( BITMAPS::preference, wxT( "preference_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::print_button].emplace_back( BITMAPS::print_button, wxT( "print_button_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::project].emplace_back( BITMAPS::project, wxT( "project_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::project_close].emplace_back( BITMAPS::project_close, wxT( "project_close_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::project_kicad].emplace_back( BITMAPS::project_kicad, wxT( "project_kicad_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::ps_diff_pair].emplace_back( BITMAPS::ps_diff_pair, wxT( "ps_diff_pair_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::ps_diff_pair_gap].emplace_back( BITMAPS::ps_diff_pair_gap, wxT( "ps_diff_pair_gap_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::ps_diff_pair_tune_length].emplace_back( BITMAPS::ps_diff_pair_tune_length, wxT( "ps_diff_pair_tune_length_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::ps_diff_pair_tune_phase].emplace_back( BITMAPS::ps_diff_pair_tune_phase, wxT( "ps_diff_pair_tune_phase_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::ps_tune_length].emplace_back( BITMAPS::ps_tune_length, wxT( "ps_tune_length_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::push_pad_settings].emplace_back( BITMAPS::push_pad_settings, wxT( "push_pad_settings_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::puzzle_piece].emplace_back( BITMAPS::puzzle_piece, wxT( "puzzle_piece_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::py_script].emplace_back( BITMAPS::py_script, wxT( "py_script_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::recent].emplace_back( BITMAPS::recent, wxT( "recent_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::redo].emplace_back( BITMAPS::redo, wxT( "redo_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::refresh].emplace_back( BITMAPS::refresh, wxT( "refresh_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::reload].emplace_back( BITMAPS::reload, wxT( "reload_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::render_mode].emplace_back( BITMAPS::render_mode, wxT( "render_mode_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::rescue].emplace_back( BITMAPS::rescue, wxT( "rescue_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::right].emplace_back( BITMAPS::right, wxT( "right_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::router_len_tuner].emplace_back( BITMAPS::router_len_tuner, wxT( "router_len_tuner_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::router_len_tuner_setup].emplace_back( BITMAPS::router_len_tuner_setup, wxT( "router_len_tuner_setup_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::router_len_tuner_amplitude_decr].emplace_back( BITMAPS::router_len_tuner_amplitude_decr, wxT( "router_len_tuner_amplitude_decr_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::router_len_tuner_amplitude_incr].emplace_back( BITMAPS::router_len_tuner_amplitude_incr, wxT( "router_len_tuner_amplitude_incr_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::router_len_tuner_dist_decr].emplace_back( BITMAPS::router_len_tuner_dist_decr, wxT( "router_len_tuner_dist_decr_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::router_len_tuner_dist_incr].emplace_back( BITMAPS::router_len_tuner_dist_incr, wxT( "router_len_tuner_dist_incr_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::rotate_ccw].emplace_back( BITMAPS::rotate_ccw, wxT( "rotate_ccw_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::rotate_cw].emplace_back( BITMAPS::rotate_cw, wxT( "rotate_cw_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::rotate_ccw_x].emplace_back( BITMAPS::rotate_ccw_x, wxT( "rotate_ccw_x_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::rotate_cw_x].emplace_back( BITMAPS::rotate_cw_x, wxT( "rotate_cw_x_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::rotate_ccw_y].emplace_back( BITMAPS::rotate_ccw_y, wxT( "rotate_ccw_y_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::rotate_cw_y].emplace_back( BITMAPS::rotate_cw_y, wxT( "rotate_cw_y_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::rotate_ccw_z].emplace_back( BITMAPS::rotate_ccw_z, wxT( "rotate_ccw_z_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::rotate_cw_z].emplace_back( BITMAPS::rotate_cw_z, wxT( "rotate_cw_z_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::save_as].emplace_back( BITMAPS::save_as, wxT( "save_as_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::save].emplace_back( BITMAPS::save, wxT( "save_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::select_layer_pair].emplace_back( BITMAPS::select_layer_pair, wxT( "select_layer_pair_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::select_w_layer].emplace_back( BITMAPS::select_w_layer, wxT( "select_w_layer_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::select_same_sheet].emplace_back( BITMAPS::select_same_sheet, wxT( "select_same_sheet_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::shape_3d].emplace_back( BITMAPS::shape_3d, wxT( "shape_3d_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::shape_3d_back].emplace_back( BITMAPS::shape_3d_back, wxT( "shape_3d_back_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::sheetset].emplace_back( BITMAPS::sheetset, wxT( "sheetset_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::simulator].emplace_back( BITMAPS::simulator, wxT( "simulator_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::sim_run].emplace_back( BITMAPS::sim_run, wxT( "sim_run_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::sim_stop].emplace_back( BITMAPS::sim_stop, wxT( "sim_stop_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::sim_tune].emplace_back( BITMAPS::sim_tune, wxT( "sim_tune_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::sim_probe].emplace_back( BITMAPS::sim_probe, wxT( "sim_probe_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::sim_add_signal].emplace_back( BITMAPS::sim_add_signal, wxT( "sim_add_signal_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::slice_line].emplace_back( BITMAPS::slice_line, wxT( "slice_line_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::search_tree].emplace_back( BITMAPS::search_tree, wxT( "search_tree_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::set_origin].emplace_back( BITMAPS::set_origin, wxT( "set_origin_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_dcodenumber].emplace_back( BITMAPS::show_dcodenumber, wxT( "show_dcodenumber_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_dnp].emplace_back( BITMAPS::show_dnp, wxT( "show_dnp_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_footprint].emplace_back( BITMAPS::show_footprint, wxT( "show_footprint_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_mod_edge].emplace_back( BITMAPS::show_mod_edge, wxT( "show_mod_edge_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_ratsnest].emplace_back( BITMAPS::show_ratsnest, wxT( "show_ratsnest_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::showtrack].emplace_back( BITMAPS::showtrack, wxT( "showtrack_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_not_in_posfile].emplace_back( BITMAPS::show_not_in_posfile, wxT( "show_not_in_posfile_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_other].emplace_back( BITMAPS::show_other, wxT( "show_other_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_tht].emplace_back( BITMAPS::show_tht, wxT( "show_tht_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_smt].emplace_back( BITMAPS::show_smt, wxT( "show_smt_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_zone].emplace_back( BITMAPS::show_zone, wxT( "show_zone_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_zone_disable].emplace_back( BITMAPS::show_zone_disable, wxT( "show_zone_disable_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_zone_outline_only].emplace_back( BITMAPS::show_zone_outline_only, wxT( "show_zone_outline_only_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_zone_triangulation].emplace_back( BITMAPS::show_zone_triangulation, wxT( "show_zone_triangulation_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_all_layers].emplace_back( BITMAPS::show_all_layers, wxT( "show_all_layers_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_no_layers].emplace_back( BITMAPS::show_no_layers, wxT( "show_no_layers_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_no_copper_layers].emplace_back( BITMAPS::show_no_copper_layers, wxT( "show_no_copper_layers_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_all_copper_layers].emplace_back( BITMAPS::show_all_copper_layers, wxT( "show_all_copper_layers_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_all_front_layers].emplace_back( BITMAPS::show_all_front_layers, wxT( "show_all_front_layers_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_all_back_layers].emplace_back( BITMAPS::show_all_back_layers, wxT( "show_all_back_layers_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_front_assembly_layers].emplace_back( BITMAPS::show_front_assembly_layers, wxT( "show_front_assembly_layers_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::show_back_assembly_layers].emplace_back( BITMAPS::show_back_assembly_layers, wxT( "show_back_assembly_layers_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::special_tools].emplace_back( BITMAPS::special_tools, wxT( "special_tools_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::spreadsheet].emplace_back( BITMAPS::spreadsheet, wxT( "spreadsheet_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::subtract_polygons].emplace_back( BITMAPS::subtract_polygons, wxT( "subtract_polygons_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::swap].emplace_back( BITMAPS::swap, wxT( "swap_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::swap_layer].emplace_back( BITMAPS::swap_layer, wxT( "swap_layer_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::switch_corner_rounding_shape].emplace_back( BITMAPS::switch_corner_rounding_shape, wxT( "switch_corner_rounding_shape_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::text].emplace_back( BITMAPS::text, wxT( "text_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::text_sketch].emplace_back( BITMAPS::text_sketch, wxT( "text_sketch_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::thermal_spokes].emplace_back( BITMAPS::thermal_spokes, wxT( "thermal_spokes_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::three_d].emplace_back( BITMAPS::three_d, wxT( "three_d_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::tool_ratsnest].emplace_back( BITMAPS::tool_ratsnest, wxT( "tool_ratsnest_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::tools].emplace_back( BITMAPS::tools, wxT( "tools_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::trash].emplace_back( BITMAPS::trash, wxT( "trash_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::undo].emplace_back( BITMAPS::undo, wxT( "undo_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::unit_inch].emplace_back( BITMAPS::unit_inch, wxT( "unit_inch_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::unit_mil].emplace_back( BITMAPS::unit_mil, wxT( "unit_mil_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::unit_mm].emplace_back( BITMAPS::unit_mm, wxT( "unit_mm_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::unknown].emplace_back( BITMAPS::unknown, wxT( "unknown_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::unlocked].emplace_back( BITMAPS::unlocked, wxT( "unlocked_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::unzip].emplace_back( BITMAPS::unzip, wxT( "unzip_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::up].emplace_back( BITMAPS::up, wxT( "up_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::update_pcb_from_sch].emplace_back( BITMAPS::update_pcb_from_sch, wxT( "update_pcb_from_sch_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::update_sch_from_pcb].emplace_back( BITMAPS::update_sch_from_pcb, wxT( "update_sch_from_pcb_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::via].emplace_back( BITMAPS::via, wxT( "via_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::via_annulus].emplace_back( BITMAPS::via_annulus, wxT( "via_annulus_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::via_buried].emplace_back( BITMAPS::via_buried, wxT( "via_buried_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::via_microvia].emplace_back( BITMAPS::via_microvia, wxT( "via_microvia_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::via_sketch].emplace_back( BITMAPS::via_sketch, wxT( "via_sketch_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::via_diameter].emplace_back( BITMAPS::via_diameter, wxT( "via_diameter_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::via_hole_diameter].emplace_back( BITMAPS::via_hole_diameter, wxT( "via_hole_diameter_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::width_conn].emplace_back( BITMAPS::width_conn, wxT( "width_conn_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::width_track_via].emplace_back( BITMAPS::width_track_via, wxT( "width_track_via_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::width_track].emplace_back( BITMAPS::width_track, wxT( "width_track_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::zip].emplace_back( BITMAPS::zip, wxT( "zip_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::zone_duplicate].emplace_back( BITMAPS::zone_duplicate, wxT( "zone_duplicate_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::zone_fillet].emplace_back( BITMAPS::zone_fillet, wxT( "zone_fillet_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::zone_unfill].emplace_back( BITMAPS::zone_unfill, wxT( "zone_unfill_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::zoom_area].emplace_back( BITMAPS::zoom_area, wxT( "zoom_area_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::zoom_auto_fit_in_page].emplace_back( BITMAPS::zoom_auto_fit_in_page, wxT( "zoom_auto_fit_in_page_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::zoom_fit_in_page].emplace_back( BITMAPS::zoom_fit_in_page, wxT( "zoom_fit_in_page_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::zoom_fit_to_objects].emplace_back( BITMAPS::zoom_fit_to_objects, wxT( "zoom_fit_to_objects_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::zoom_center_on_screen].emplace_back( BITMAPS::zoom_center_on_screen, wxT( "zoom_center_on_screen_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::zoom_in].emplace_back( BITMAPS::zoom_in, wxT( "zoom_in_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::zoom_out].emplace_back( BITMAPS::zoom_out, wxT( "zoom_out_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::zoom_selection].emplace_back( BITMAPS::zoom_selection, wxT( "zoom_selection_dark_48.png" ), 48, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::icon_bitmap2component_32].emplace_back( BITMAPS::icon_bitmap2component_32, wxT( "icon_bitmap2component_32_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::icon_eeschema_32].emplace_back( BITMAPS::icon_eeschema_32, wxT( "icon_eeschema_32_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::icon_gerbview_32].emplace_back( BITMAPS::icon_gerbview_32, wxT( "icon_gerbview_32_32.png" ), 32, wxT( "light" ) );
diff --git a/common/bitmap_store.cpp b/common/bitmap_store.cpp
index 1671deca7e..1ecb65f4f8 100644
--- a/common/bitmap_store.cpp
+++ b/common/bitmap_store.cpp
@@ -121,6 +121,39 @@ wxBitmap BITMAP_STORE::GetBitmap( BITMAPS aBitmapId, int aHeight )
 }
 
 
+wxBitmapBundle BITMAP_STORE::GetBitmapBundle( BITMAPS aBitmapId )
+{
+    wxVector<wxBitmap> bmps;
+
+    for( const BITMAP_INFO& info : m_bitmapInfoCache[aBitmapId] )
+    {
+        if( info.theme != m_theme )
+            continue;
+
+        bmps.push_back( wxBitmap( getImage( info.id, info.height ) ) );
+    }
+
+    return wxBitmapBundle::FromBitmaps( bmps );
+}
+
+
+wxBitmapBundle BITMAP_STORE::GetDisabledBitmapBundle( BITMAPS aBitmapId )
+{
+    wxVector<wxBitmap> bmps;
+
+    for( const BITMAP_INFO& info : m_bitmapInfoCache[aBitmapId] )
+    {
+        if( info.theme != m_theme )
+            continue;
+
+        bmps.push_back( wxBitmap( getImage( info.id, info.height ) )
+                                .ConvertToDisabled( KIPLATFORM::UI::IsDarkTheme() ? 70 : 255 ) );
+    }
+
+    return wxBitmapBundle::FromBitmaps( bmps );
+}
+
+
 wxBitmap BITMAP_STORE::GetBitmapScaled( BITMAPS aBitmapId, int aScaleFactor, int aHeight )
 {
     wxImage image = getImage( aBitmapId, aHeight );
@@ -139,11 +172,11 @@ wxBitmap BITMAP_STORE::GetBitmapScaled( BITMAPS aBitmapId, int aScaleFactor, int
 wxImage BITMAP_STORE::getImage( BITMAPS aBitmapId, int aHeight )
 {
     const unsigned char* data = nullptr;
-    long count;
+    long                 count;
 
     if( aBitmapId == BITMAPS::dummy_item )
     {
-        data  = s_dummyItem;
+        data = s_dummyItem;
         count = sizeof( s_dummyItem );
     }
     else
@@ -152,16 +185,17 @@ wxImage BITMAP_STORE::getImage( BITMAPS aBitmapId, int aHeight )
 
         if( count < 0 )
         {
-            wxLogTrace( traceBitmaps, "Bitmap for %d, %d, %s has an info tag with file %s,"
+            wxLogTrace( traceBitmaps,
+                        "Bitmap for %d, %d, %s has an info tag with file %s,"
                         "but that file could not be found in the archive!",
                         aBitmapId, aHeight, m_theme );
-            data  = s_imageNotFound;
+            data = s_imageNotFound;
             count = sizeof( s_imageNotFound );
         }
     }
 
     wxMemoryInputStream is( data, count );
-    wxImage image( is, wxBITMAP_TYPE_PNG );
+    wxImage             image( is, wxBITMAP_TYPE_PNG );
 
     return image;
 }
@@ -176,8 +210,8 @@ void BITMAP_STORE::ThemeChanged()
     {
         switch( settings->m_Appearance.icon_theme )
         {
-        case ICON_THEME::LIGHT:     m_theme = wxT( "light" );   break;
-        case ICON_THEME::DARK:      m_theme = wxT( "dark" );    break;
+        case ICON_THEME::LIGHT: m_theme = wxT( "light" ); break;
+        case ICON_THEME::DARK: m_theme = wxT( "dark" ); break;
         case ICON_THEME::AUTO:
             m_theme = KIPLATFORM::UI::IsDarkTheme() ? wxT( "dark" ) : wxT( "light" );
             break;
@@ -228,8 +262,8 @@ wxString BITMAP_STORE::computeBitmapName( BITMAPS aBitmapId, int aHeight )
 
     if( fn.IsEmpty() )
     {
-        wxLogTrace( traceBitmaps, "No bitmap found matching ID %d, height %d, theme %s",
-                    aBitmapId, aHeight, m_theme );
+        wxLogTrace( traceBitmaps, "No bitmap found matching ID %d, height %d, theme %s", aBitmapId,
+                    aHeight, m_theme );
         return m_bitmapInfoCache.at( aBitmapId ).begin()->filename;
     }
 
diff --git a/common/dialog_about/dialog_about.cpp b/common/dialog_about/dialog_about.cpp
index 1ddb1090c9..ead922d369 100644
--- a/common/dialog_about/dialog_about.cpp
+++ b/common/dialog_about/dialog_about.cpp
@@ -443,7 +443,7 @@ wxStaticBitmap* DIALOG_ABOUT::createStaticBitmap( wxScrolledWindow* aParent, wxB
     if( aIcon )
         bitmap->SetBitmap( *aIcon );
     else
-        bitmap->SetBitmap( KiBitmap( BITMAPS::right ) );
+        bitmap->SetBitmap( KiBitmapBundle( BITMAPS::right ) );
 
     return bitmap;
 }
diff --git a/common/dialogs/dialog_configure_paths.cpp b/common/dialogs/dialog_configure_paths.cpp
index fb217c873c..bd5361a305 100644
--- a/common/dialogs/dialog_configure_paths.cpp
+++ b/common/dialogs/dialog_configure_paths.cpp
@@ -64,8 +64,8 @@ DIALOG_CONFIGURE_PATHS::DIALOG_CONFIGURE_PATHS( wxWindow* aParent ) :
     m_helpBox( nullptr ),
     m_heightBeforeHelp( 400 )
 {
-    m_btnAddEnvVar->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_btnDeleteEnvVar->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_btnAddEnvVar->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_btnDeleteEnvVar->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
 
     m_EnvVars->ClearRows();
     m_EnvVars->AppendCols( 1 );     // for the isExternal flags
diff --git a/common/dialogs/dialog_locked_items_query.cpp b/common/dialogs/dialog_locked_items_query.cpp
index 1608c84ab2..1f00445ce9 100644
--- a/common/dialogs/dialog_locked_items_query.cpp
+++ b/common/dialogs/dialog_locked_items_query.cpp
@@ -28,7 +28,7 @@
 DIALOG_LOCKED_ITEMS_QUERY::DIALOG_LOCKED_ITEMS_QUERY( wxWindow* aParent, int aLockedItemCount ) :
     DIALOG_LOCKED_ITEMS_QUERY_BASE( aParent )
 {
-    m_icon->SetBitmap( KiBitmap( BITMAPS::locked ) );
+    m_icon->SetBitmap( KiBitmapBundle( BITMAPS::locked ) );
 
     m_messageLine1->SetLabel( wxString::Format( m_messageLine1->GetLabel(), aLockedItemCount ) );
 
diff --git a/common/dialogs/dialog_migrate_settings.cpp b/common/dialogs/dialog_migrate_settings.cpp
index be943a4024..ee174a4218 100644
--- a/common/dialogs/dialog_migrate_settings.cpp
+++ b/common/dialogs/dialog_migrate_settings.cpp
@@ -31,7 +31,7 @@ DIALOG_MIGRATE_SETTINGS::DIALOG_MIGRATE_SETTINGS( SETTINGS_MANAGER* aManager ) :
 {
     m_standardButtonsCancel->SetLabel( _( "Quit KiCad" ) );
 
-    m_btnCustomPath->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
+    m_btnCustomPath->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
 
     // Disabled for now.  See https://gitlab.com/kicad/code/kicad/-/issues/9826
     m_cbCopyLibraryTables->Hide();
diff --git a/common/dialogs/dialog_page_settings.cpp b/common/dialogs/dialog_page_settings.cpp
index 34b652ea2a..4ff89345cd 100644
--- a/common/dialogs/dialog_page_settings.cpp
+++ b/common/dialogs/dialog_page_settings.cpp
@@ -86,7 +86,7 @@ DIALOG_PAGES_SETTINGS::DIALOG_PAGES_SETTINGS( EDA_DRAW_FRAME* aParent, double aI
         m_customSizeY( aParent, m_userSizeYLabel, m_userSizeYCtrl, m_userSizeYUnits )
 {
     m_projectPath = Prj().GetProjectPath();
-    m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
+    m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
 
     m_maxPageSizeMils = aMaxUserSizeMils;
     m_tb = m_parent->GetTitleBlock();
diff --git a/common/dialogs/dialog_plugin_options.cpp b/common/dialogs/dialog_plugin_options.cpp
index 5103a8d528..36718ec643 100644
--- a/common/dialogs/dialog_plugin_options.cpp
+++ b/common/dialogs/dialog_plugin_options.cpp
@@ -76,8 +76,8 @@ DIALOG_PLUGIN_OPTIONS::DIALOG_PLUGIN_OPTIONS( wxWindow* aParent,
     m_html->SetPage( m_initial_help );
 
     // Configure button logos
-    m_append_button->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_delete_button->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_append_button->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_delete_button->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
 
     // initial focus on the grid please.
     SetInitialFocus( m_grid );
diff --git a/common/dialogs/eda_reorderable_list_dialog.cpp b/common/dialogs/eda_reorderable_list_dialog.cpp
index d0e95f35ff..02cda55a77 100644
--- a/common/dialogs/eda_reorderable_list_dialog.cpp
+++ b/common/dialogs/eda_reorderable_list_dialog.cpp
@@ -35,8 +35,8 @@ EDA_REORDERABLE_LIST_DIALOG::EDA_REORDERABLE_LIST_DIALOG( wxWindow* aParent, con
         m_selectedAvailable( 0 ),
         m_selectedEnabled( 0 )
 {
-    m_btnUp->SetBitmap( KiBitmap( BITMAPS::small_up ) );
-    m_btnDown->SetBitmap( KiBitmap( BITMAPS::small_down ) );
+    m_btnUp->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
+    m_btnDown->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
 
     // DIALOG_SHIM needs a unique hash_key because classname is not sufficient
     // because so many dialogs share this same class, with different numbers of
diff --git a/common/dialogs/git/panel_git_repos.cpp b/common/dialogs/git/panel_git_repos.cpp
index e64ba25f77..9e0e534d6e 100644
--- a/common/dialogs/git/panel_git_repos.cpp
+++ b/common/dialogs/git/panel_git_repos.cpp
@@ -36,9 +36,9 @@
 PANEL_GIT_REPOS::PANEL_GIT_REPOS( wxWindow* aParent ) : PANEL_GIT_REPOS_BASE( aParent)
 {
 
-    m_btnAddRepo->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_btnEditRepo->SetBitmap( KiBitmap( BITMAPS::small_edit ) );
-    m_btnDelete->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_btnAddRepo->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_btnEditRepo->SetBitmap( KiBitmapBundle( BITMAPS::small_edit ) );
+    m_btnDelete->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
 
 }
 
@@ -383,4 +383,4 @@ void PANEL_GIT_REPOS::onDeleteClick( wxCommandEvent& event )
     curRow = std::max( 0, curRow - 1 );
     m_grid->MakeCellVisible( curRow, m_grid->GetGridCursorCol() );
     m_grid->SetGridCursor( curRow, m_grid->GetGridCursorCol() );
-}
\ No newline at end of file
+}
diff --git a/common/dialogs/panel_common_settings.cpp b/common/dialogs/panel_common_settings.cpp
index e4f2ccfd80..1c8406cbd9 100644
--- a/common/dialogs/panel_common_settings.cpp
+++ b/common/dialogs/panel_common_settings.cpp
@@ -59,8 +59,8 @@ PANEL_COMMON_SETTINGS::PANEL_COMMON_SETTINGS( wxWindow* aParent )
     m_antialiasingFallbackLabel->Show( false );
 #endif
 
-    m_textEditorBtn->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
-    m_pdfViewerBtn->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
+    m_textEditorBtn->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
+    m_pdfViewerBtn->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
 
     /*
      * Automatic dark mode detection works fine on Mac, so no need for the explicit options.
diff --git a/common/dialogs/panel_grid_settings.cpp b/common/dialogs/panel_grid_settings.cpp
index 9d4e1a4603..24ede1d01c 100644
--- a/common/dialogs/panel_grid_settings.cpp
+++ b/common/dialogs/panel_grid_settings.cpp
@@ -75,10 +75,10 @@ PANEL_GRID_SETTINGS::PANEL_GRID_SETTINGS( wxWindow* aParent, UNITS_PROVIDER* aUn
     m_grid1HotKey->SetLabel( wxString::Format( wxT( "(%s)" ), KeyNameFromKeyCode( hk1 ) ) );
     m_grid2HotKey->SetLabel( wxString::Format( wxT( "(%s)" ), KeyNameFromKeyCode( hk2 ) ) );
 
-    m_addGridButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_removeGridButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
-    m_moveUpButton->SetBitmap( KiBitmap( BITMAPS::small_up ) );
-    m_moveDownButton->SetBitmap( KiBitmap( BITMAPS::small_down ) );
+    m_addGridButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_removeGridButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
+    m_moveUpButton->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
+    m_moveDownButton->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
 
     Layout();
 }
diff --git a/common/dialogs/panel_mouse_settings.cpp b/common/dialogs/panel_mouse_settings.cpp
index 9e018d092f..422b9fabd2 100644
--- a/common/dialogs/panel_mouse_settings.cpp
+++ b/common/dialogs/panel_mouse_settings.cpp
@@ -47,7 +47,7 @@ PANEL_MOUSE_SETTINGS::PANEL_MOUSE_SETTINGS( wxWindow* aParent ) :
     m_lblAlt->SetLabel( _( "Option" ) );
 #endif
 
-    m_scrollWarning->SetBitmap( KiBitmap( BITMAPS::small_warning ) );
+    m_scrollWarning->SetBitmap( KiBitmapBundle( BITMAPS::small_warning ) );
     m_scrollWarning->Hide();
 
     m_checkAutoZoomSpeed->Bind( wxEVT_COMMAND_CHECKBOX_CLICKED,
diff --git a/common/dialogs/panel_setup_netclasses.cpp b/common/dialogs/panel_setup_netclasses.cpp
index e8e4d1963a..49ca77b6ba 100644
--- a/common/dialogs/panel_setup_netclasses.cpp
+++ b/common/dialogs/panel_setup_netclasses.cpp
@@ -198,11 +198,11 @@ PANEL_SETUP_NETCLASSES::PANEL_SETUP_NETCLASSES( wxWindow* aParentWindow, EDA_DRA
     COMMON_SETTINGS* cfg = Pgm().GetCommonSettings();
     m_splitter->SetSashPosition( cfg->m_NetclassPanel.sash_pos );
 
-    m_addButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_removeButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_addButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_removeButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
 
-    m_addAssignmentButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_removeAssignmentButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_addAssignmentButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_removeAssignmentButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
 
     // wxFormBuilder doesn't include this event...
     m_netclassGrid->Connect( wxEVT_GRID_CELL_CHANGING,
diff --git a/common/dialogs/panel_text_variables.cpp b/common/dialogs/panel_text_variables.cpp
index 90483a6bbb..a8f6e32bb2 100644
--- a/common/dialogs/panel_text_variables.cpp
+++ b/common/dialogs/panel_text_variables.cpp
@@ -46,8 +46,8 @@ PANEL_TEXT_VARIABLES::PANEL_TEXT_VARIABLES( wxWindow* aParent, PROJECT* aProject
     m_errorRow( -1 ), m_errorCol( -1 ),
     m_gridWidthsDirty( true )
 {
-    m_btnAddTextVar->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_btnDeleteTextVar->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_btnAddTextVar->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_btnDeleteTextVar->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
 
     m_TextVars->ClearRows();
 
diff --git a/common/tool/action_toolbar.cpp b/common/tool/action_toolbar.cpp
index e7624f9b17..4f2264a5e1 100644
--- a/common/tool/action_toolbar.cpp
+++ b/common/tool/action_toolbar.cpp
@@ -48,12 +48,6 @@
 #include <wx/settings.h>
 
 
-wxBitmap MakeDisabledBitmap( const wxBitmap& aSource )
-{
-    return aSource.ConvertToDisabled( KIPLATFORM::UI::IsDarkTheme() ? 70 : 255 );
-}
-
-
 ACTION_GROUP::ACTION_GROUP( const std::string& aName,
                             const std::vector<const TOOL_ACTION*>& aActions )
 {
@@ -120,15 +114,16 @@ ACTION_TOOLBAR_PALETTE::ACTION_TOOLBAR_PALETTE( wxWindow* aParent, bool aVertica
 
 void ACTION_TOOLBAR_PALETTE::AddAction( const TOOL_ACTION& aAction )
 {
-    wxBitmap normalBmp   = KiScaledBitmap( aAction.GetIcon(), this );
-    wxBitmap disabledBmp = MakeDisabledBitmap( normalBmp );
+    // TODO(JE)
+    wxBitmapBundle normalBmp = KiBitmapBundle( aAction.GetIcon() );
 
-    int padding = ( m_buttonSize.GetWidth() - normalBmp.GetWidth() ) / 2;
+    int bmpWidth = normalBmp.GetPreferredBitmapSizeFor( this ).GetWidth();
+    int padding = ( m_buttonSize.GetWidth() - bmpWidth ) / 2;
 
     BITMAP_BUTTON* button = new BITMAP_BUTTON( m_panel, aAction.GetUIId() );
 
     button->SetBitmap( normalBmp );
-    button->SetDisabledBitmap( disabledBmp );
+    button->SetDisabledBitmap( KiDisabledBitmapBundle( aAction.GetIcon() ) );
     button->SetPadding( padding );
     button->SetToolTip( aAction.GetTooltip() );
     button->AcceptDragInAsClick();
@@ -226,10 +221,10 @@ void ACTION_TOOLBAR::Add( const TOOL_ACTION& aAction, bool aIsToggleEntry, bool
     wxASSERT( GetParent() );
     wxASSERT_MSG( !( aIsCancellable && !aIsToggleEntry ), wxS( "aIsCancellable requires aIsToggleEntry" ) );
 
-    int      toolId = aAction.GetUIId();
-    wxBitmap bmp    = KiScaledBitmap( aAction.GetIcon(), GetParent() );
+    int toolId = aAction.GetUIId();
 
-    AddTool( toolId, wxEmptyString, bmp, MakeDisabledBitmap( bmp ),
+    AddTool( toolId, wxEmptyString, KiBitmapBundle( aAction.GetIcon() ),
+             KiDisabledBitmapBundle( aAction.GetIcon() ),
              aIsToggleEntry ? wxITEM_CHECK : wxITEM_NORMAL,
              aAction.GetTooltip(), wxEmptyString, nullptr );
 
@@ -241,10 +236,10 @@ void ACTION_TOOLBAR::Add( const TOOL_ACTION& aAction, bool aIsToggleEntry, bool
 
 void ACTION_TOOLBAR::AddButton( const TOOL_ACTION& aAction )
 {
-    int      toolId = aAction.GetUIId();
-    wxBitmap bmp    = KiScaledBitmap( aAction.GetIcon(), GetParent() );
+    int toolId = aAction.GetUIId();
 
-    AddTool( toolId, wxEmptyString, bmp, MakeDisabledBitmap( bmp ),
+    AddTool( toolId, wxEmptyString, KiBitmapBundle( aAction.GetIcon() ),
+             KiDisabledBitmapBundle( aAction.GetIcon() ),
              wxITEM_NORMAL, aAction.GetTooltip(), wxEmptyString, nullptr );
 
     m_toolKinds[ toolId ] = false;
@@ -282,7 +277,6 @@ void ACTION_TOOLBAR::AddGroup( ACTION_GROUP* aGroup, bool aIsToggleEntry )
 {
     int                groupId       = aGroup->GetUIId();
     const TOOL_ACTION* defaultAction = aGroup->GetDefaultAction();
-    wxBitmap           bmp           = KiScaledBitmap( defaultAction->GetIcon(), GetParent() );
 
     wxASSERT( GetParent() );
     wxASSERT( defaultAction );
@@ -292,7 +286,8 @@ void ACTION_TOOLBAR::AddGroup( ACTION_GROUP* aGroup, bool aIsToggleEntry )
     m_actionGroups[ groupId ] = aGroup;
 
     // Add the main toolbar item representing the group
-    AddTool( groupId, wxEmptyString, bmp, MakeDisabledBitmap( bmp ),
+    AddTool( groupId, wxEmptyString, KiBitmapBundle( defaultAction->GetIcon() ),
+             KiDisabledBitmapBundle( defaultAction->GetIcon() ),
              aIsToggleEntry ? wxITEM_CHECK : wxITEM_NORMAL,
              wxEmptyString, wxEmptyString, nullptr );
 
@@ -328,9 +323,8 @@ void ACTION_TOOLBAR::doSelectAction( ACTION_GROUP* aGroup, const TOOL_ACTION& aA
 
     // Update the item information
     item->SetShortHelp( aAction.GetTooltip() );
-    item->SetBitmap( KiScaledBitmap( aAction.GetIcon(), GetParent() ) );
-    item->SetDisabledBitmap(
-            MakeDisabledBitmap( item->GetBitmapBundle().GetBitmapFor( GetParent() ) ) );
+    item->SetBitmap( KiBitmapBundle( aAction.GetIcon() ) );
+    item->SetDisabledBitmap( KiDisabledBitmapBundle( aAction.GetIcon() ) );
 
     // Register a new handler with the new UI conditions
     if( m_toolManager )
@@ -408,7 +402,10 @@ void ACTION_TOOLBAR::SetToolBitmap( const TOOL_ACTION& aAction, const wxBitmap&
     wxAuiToolBarItem* tb_item = wxAuiToolBar::FindTool( toolId );
 
     if( tb_item )
-        tb_item->SetDisabledBitmap( MakeDisabledBitmap( aBitmap ) );
+    {
+        tb_item->SetDisabledBitmap(
+                aBitmap.ConvertToDisabled( KIPLATFORM::UI::IsDarkTheme() ? 70 : 255 ) );
+    }
 }
 
 
@@ -836,10 +833,8 @@ void ACTION_TOOLBAR::RefreshBitmaps()
     {
         wxAuiToolBarItem* tool = FindTool( pair.first );
 
-        wxBitmap bmp = KiScaledBitmap( pair.second->GetIcon(), GetParent() );
-
-        tool->SetBitmap( bmp );
-        tool->SetDisabledBitmap( MakeDisabledBitmap( bmp ) );
+        tool->SetBitmap( KiBitmapBundle( pair.second->GetIcon() ) );
+        tool->SetDisabledBitmap( KiDisabledBitmapBundle( pair.second->GetIcon() ) );
     }
 
     Refresh();
diff --git a/common/widgets/kistatusbar.cpp b/common/widgets/kistatusbar.cpp
index d0e3a7f33f..c1cd05eed1 100644
--- a/common/widgets/kistatusbar.cpp
+++ b/common/widgets/kistatusbar.cpp
@@ -93,7 +93,7 @@ KISTATUSBAR::KISTATUSBAR( int aNumberFields, wxWindow* parent, wxWindowID id ) :
                                                wxDefaultSize, wxBU_EXACTFIT );
 
     m_notificationsButton->SetPadding( 0 );
-    m_notificationsButton->SetBitmap( KiBitmap( BITMAPS::notifications ) );
+    m_notificationsButton->SetBitmap( KiBitmapBundle( BITMAPS::notifications ) );
     m_notificationsButton->SetShowBadge( true );
     m_notificationsButton->SetBitmapCentered( true );
 
@@ -211,4 +211,4 @@ void KISTATUSBAR::SetNotificationCount(int aCount)
 
     // force a repaint or it wont until it gets activity
     Refresh();
-}
\ No newline at end of file
+}
diff --git a/common/widgets/lib_tree.cpp b/common/widgets/lib_tree.cpp
index b1759c99bf..f1ae9736df 100644
--- a/common/widgets/lib_tree.cpp
+++ b/common/widgets/lib_tree.cpp
@@ -85,7 +85,7 @@ LIB_TREE::LIB_TREE( wxWindow* aParent, const wxString& aRecentSearchesKey, LIB_T
 
         m_sort_ctrl = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition,
                                              wxDefaultSize, wxBU_AUTODRAW|0 );
-        m_sort_ctrl->SetBitmap( KiBitmap( BITMAPS::small_sort_desc ) );
+        m_sort_ctrl->SetBitmap( KiBitmapBundle( BITMAPS::small_sort_desc ) );
         m_sort_ctrl->Bind( wxEVT_LEFT_DOWN,
                 [&]( wxMouseEvent& aEvent )
                 {
diff --git a/cvpcb/dialogs/dialog_config_equfiles.cpp b/cvpcb/dialogs/dialog_config_equfiles.cpp
index ca14d46bcf..56de032698 100644
--- a/cvpcb/dialogs/dialog_config_equfiles.cpp
+++ b/cvpcb/dialogs/dialog_config_equfiles.cpp
@@ -44,11 +44,11 @@ DIALOG_CONFIG_EQUFILES::DIALOG_CONFIG_EQUFILES( wxWindow* aParent ) :
 {
     SetTitle( wxString::Format( _( "Project file: '%s'" ), Prj().GetProjectFullName() ) );
 
-    m_bpAdd->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
-    m_bpEdit->SetBitmap( KiBitmap( BITMAPS::small_edit ) );
-    m_bpMoveUp->SetBitmap( KiBitmap( BITMAPS::small_up ) );
-    m_bpMoveDown->SetBitmap( KiBitmap( BITMAPS::small_down ) );
-    m_bpDelete->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_bpAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
+    m_bpEdit->SetBitmap( KiBitmapBundle( BITMAPS::small_edit ) );
+    m_bpMoveUp->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
+    m_bpMoveDown->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
+    m_bpDelete->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
 
     PROJECT_FILE& project = Prj().GetProjectFile();
 
diff --git a/eeschema/dialogs/dialog_annotate.cpp b/eeschema/dialogs/dialog_annotate.cpp
index b129dfbd87..5ace765cc0 100644
--- a/eeschema/dialogs/dialog_annotate.cpp
+++ b/eeschema/dialogs/dialog_annotate.cpp
@@ -190,8 +190,8 @@ void DIALOG_ANNOTATE::InitValues()
 
     m_textNumberAfter->SetValue( wxString::Format( wxT( "%d" ), annotateStartNum ) );
 
-    annotate_down_right_bitmap->SetBitmap( KiBitmap( BITMAPS::annotate_down_right ) );
-    annotate_right_down_bitmap->SetBitmap( KiBitmap( BITMAPS::annotate_right_down ) );
+    annotate_down_right_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::annotate_down_right ) );
+    annotate_right_down_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::annotate_right_down ) );
 
     m_MessageWindow->SetVisibleSeverities( cfg->m_AnnotatePanel.messages_filter );
 
diff --git a/eeschema/dialogs/dialog_bom.cpp b/eeschema/dialogs/dialog_bom.cpp
index ad3284958b..2266c3e87b 100644
--- a/eeschema/dialogs/dialog_bom.cpp
+++ b/eeschema/dialogs/dialog_bom.cpp
@@ -122,9 +122,9 @@ DIALOG_BOM::DIALOG_BOM( SCH_EDIT_FRAME* parent ) :
         m_initialized( false ),
         m_helpWindow( nullptr )
 {
-    m_buttonAddGenerator->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_buttonDelGenerator->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
-    m_buttonEdit->SetBitmap( KiBitmap( BITMAPS::small_edit ) );
+    m_buttonAddGenerator->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_buttonDelGenerator->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
+    m_buttonEdit->SetBitmap( KiBitmapBundle( BITMAPS::small_edit ) );
 
     installGeneratorsList();
 
diff --git a/eeschema/dialogs/dialog_change_symbols.cpp b/eeschema/dialogs/dialog_change_symbols.cpp
index ba2c921b83..27a9e7c49e 100644
--- a/eeschema/dialogs/dialog_change_symbols.cpp
+++ b/eeschema/dialogs/dialog_change_symbols.cpp
@@ -85,8 +85,8 @@ DIALOG_CHANGE_SYMBOLS::DIALOG_CHANGE_SYMBOLS( SCH_EDIT_FRAME* aParent, SCH_SYMBO
         m_matchSizer->FindItem( m_matchBySelection )->Show( false );
     }
 
-    m_matchIdBrowserButton->SetBitmap( KiBitmap( BITMAPS::small_library ) );
-    m_newIdBrowserButton->SetBitmap( KiBitmap( BITMAPS::small_library ) );
+    m_matchIdBrowserButton->SetBitmap( KiBitmapBundle( BITMAPS::small_library ) );
+    m_newIdBrowserButton->SetBitmap( KiBitmapBundle( BITMAPS::small_library ) );
 
     if( m_mode == MODE::CHANGE )
     {
diff --git a/eeschema/dialogs/dialog_field_properties.cpp b/eeschema/dialogs/dialog_field_properties.cpp
index dfc745af88..5940eb6f1c 100644
--- a/eeschema/dialogs/dialog_field_properties.cpp
+++ b/eeschema/dialogs/dialog_field_properties.cpp
@@ -91,34 +91,34 @@ DIALOG_FIELD_PROPERTIES::DIALOG_FIELD_PROPERTIES( SCH_BASE_FRAME* aParent, const
     m_separator1->SetIsSeparator();
 
     m_horizontal->SetIsRadioButton();
-    m_horizontal->SetBitmap( KiBitmap( BITMAPS::text_horizontal ) );
+    m_horizontal->SetBitmap( KiBitmapBundle( BITMAPS::text_horizontal ) );
     m_vertical->SetIsRadioButton();
-    m_vertical->SetBitmap( KiBitmap( BITMAPS::text_vertical ) );
+    m_vertical->SetBitmap( KiBitmapBundle( BITMAPS::text_vertical ) );
 
     m_separator2->SetIsSeparator();
 
     m_bold->SetIsCheckButton();
-    m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
+    m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
     m_italic->SetIsCheckButton();
-    m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
+    m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
 
     m_separator3->SetIsSeparator();
 
     m_hAlignLeft->SetIsRadioButton();
-    m_hAlignLeft->SetBitmap( KiBitmap( BITMAPS::text_align_left ) );
+    m_hAlignLeft->SetBitmap( KiBitmapBundle( BITMAPS::text_align_left ) );
     m_hAlignCenter->SetIsRadioButton();
-    m_hAlignCenter->SetBitmap( KiBitmap( BITMAPS::text_align_center ) );
+    m_hAlignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_align_center ) );
     m_hAlignRight->SetIsRadioButton();
-    m_hAlignRight->SetBitmap( KiBitmap( BITMAPS::text_align_right ) );
+    m_hAlignRight->SetBitmap( KiBitmapBundle( BITMAPS::text_align_right ) );
 
     m_separator4->SetIsSeparator();
 
     m_vAlignTop->SetIsRadioButton();
-    m_vAlignTop->SetBitmap( KiBitmap( BITMAPS::text_valign_top ) );
+    m_vAlignTop->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_top ) );
     m_vAlignCenter->SetIsRadioButton();
-    m_vAlignCenter->SetBitmap( KiBitmap( BITMAPS::text_valign_center ) );
+    m_vAlignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_center ) );
     m_vAlignBottom->SetIsRadioButton();
-    m_vAlignBottom->SetBitmap( KiBitmap( BITMAPS::text_valign_bottom ) );
+    m_vAlignBottom->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_bottom ) );
 
     m_separator5->SetIsSeparator();
 
@@ -183,7 +183,7 @@ void DIALOG_FIELD_PROPERTIES::init()
     }
 
     // Show the footprint selection dialog if this is the footprint field.
-    m_TextValueSelectButton->SetBitmap( KiBitmap( BITMAPS::small_library ) );
+    m_TextValueSelectButton->SetBitmap( KiBitmapBundle( BITMAPS::small_library ) );
     m_TextValueSelectButton->Show( m_fieldId == FOOTPRINT_FIELD );
 
     if( m_fieldId == FOOTPRINT_FIELD )
diff --git a/eeschema/dialogs/dialog_label_properties.cpp b/eeschema/dialogs/dialog_label_properties.cpp
index 60a30c8f28..e4b232b5d1 100644
--- a/eeschema/dialogs/dialog_label_properties.cpp
+++ b/eeschema/dialogs/dialog_label_properties.cpp
@@ -123,17 +123,17 @@ DIALOG_LABEL_PROPERTIES::DIALOG_LABEL_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_L
     }
 
     // Configure button logos
-    m_bpAdd->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_bpDelete->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
-    m_bpMoveUp->SetBitmap( KiBitmap( BITMAPS::small_up ) );
-    m_bpMoveDown->SetBitmap( KiBitmap( BITMAPS::small_down ) );
+    m_bpAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_bpDelete->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
+    m_bpMoveUp->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
+    m_bpMoveDown->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
 
     m_separator1->SetIsSeparator();
 
     m_bold->SetIsCheckButton();
-    m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
+    m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
     m_italic->SetIsCheckButton();
-    m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
+    m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
 
     m_separator2->SetIsSeparator();
 
@@ -155,10 +155,10 @@ DIALOG_LABEL_PROPERTIES::DIALOG_LABEL_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_L
         m_diamond->Hide();
         m_rectangle->Hide();
 
-        m_spin0->SetBitmap( KiBitmap( BITMAPS::label_align_left ) );
-        m_spin1->SetBitmap( KiBitmap( BITMAPS::label_align_right ) );
-        m_spin2->SetBitmap( KiBitmap( BITMAPS::label_align_bottom ) );
-        m_spin3->SetBitmap( KiBitmap( BITMAPS::label_align_top ) );
+        m_spin0->SetBitmap( KiBitmapBundle( BITMAPS::label_align_left ) );
+        m_spin1->SetBitmap( KiBitmapBundle( BITMAPS::label_align_right ) );
+        m_spin2->SetBitmap( KiBitmapBundle( BITMAPS::label_align_bottom ) );
+        m_spin3->SetBitmap( KiBitmapBundle( BITMAPS::label_align_top ) );
     }
     else if( m_currentLabel->Type() == SCH_DIRECTIVE_LABEL_T )
     {
@@ -174,10 +174,10 @@ DIALOG_LABEL_PROPERTIES::DIALOG_LABEL_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_L
         m_bold->Hide();
         m_italic->Hide();
         m_separator2->Hide();
-        m_spin0->SetBitmap( KiBitmap( BITMAPS::pinorient_down ) );
-        m_spin1->SetBitmap( KiBitmap( BITMAPS::pinorient_up ) );
-        m_spin2->SetBitmap( KiBitmap( BITMAPS::pinorient_right ) );
-        m_spin3->SetBitmap( KiBitmap( BITMAPS::pinorient_left ) );
+        m_spin0->SetBitmap( KiBitmapBundle( BITMAPS::pinorient_down ) );
+        m_spin1->SetBitmap( KiBitmapBundle( BITMAPS::pinorient_up ) );
+        m_spin2->SetBitmap( KiBitmapBundle( BITMAPS::pinorient_right ) );
+        m_spin3->SetBitmap( KiBitmapBundle( BITMAPS::pinorient_left ) );
         m_separator3->Hide();
 
         m_formattingGB->Detach( m_fontCtrl );
@@ -188,10 +188,10 @@ DIALOG_LABEL_PROPERTIES::DIALOG_LABEL_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_L
     {
         m_shapeSizer->Show( false );
 
-        m_spin0->SetBitmap( KiBitmap( BITMAPS::text_align_left ) );
-        m_spin1->SetBitmap( KiBitmap( BITMAPS::text_align_right ) );
-        m_spin2->SetBitmap( KiBitmap( BITMAPS::text_align_bottom ) );
-        m_spin3->SetBitmap( KiBitmap( BITMAPS::text_align_top ) );
+        m_spin0->SetBitmap( KiBitmapBundle( BITMAPS::text_align_left ) );
+        m_spin1->SetBitmap( KiBitmapBundle( BITMAPS::text_align_right ) );
+        m_spin2->SetBitmap( KiBitmapBundle( BITMAPS::text_align_bottom ) );
+        m_spin3->SetBitmap( KiBitmapBundle( BITMAPS::text_align_top ) );
     }
 
     if( !m_currentLabel->AutoRotateOnPlacementSupported() )
diff --git a/eeschema/dialogs/dialog_lib_edit_pin_table.cpp b/eeschema/dialogs/dialog_lib_edit_pin_table.cpp
index 7c526c5a9d..ebd7044262 100644
--- a/eeschema/dialogs/dialog_lib_edit_pin_table.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_pin_table.cpp
@@ -804,9 +804,9 @@ DIALOG_LIB_EDIT_PIN_TABLE::DIALOG_LIB_EDIT_PIN_TABLE( SYMBOL_EDIT_FRAME* parent,
     m_grid->SetColAttr( COL_POSY, attr );
     */
 
-    m_addButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_deleteButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
-    m_refreshButton->SetBitmap( KiBitmap( BITMAPS::small_refresh ) );
+    m_addButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_deleteButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
+    m_refreshButton->SetBitmap( KiBitmapBundle( BITMAPS::small_refresh ) );
 
     m_divider1->SetIsSeparator();
     m_divider2->SetIsSeparator();
diff --git a/eeschema/dialogs/dialog_lib_symbol_properties.cpp b/eeschema/dialogs/dialog_lib_symbol_properties.cpp
index 92a888df36..ef0d4ee996 100644
--- a/eeschema/dialogs/dialog_lib_symbol_properties.cpp
+++ b/eeschema/dialogs/dialog_lib_symbol_properties.cpp
@@ -82,13 +82,13 @@ DIALOG_LIB_SYMBOL_PROPERTIES::DIALOG_LIB_SYMBOL_PROPERTIES( SYMBOL_EDIT_FRAME* a
     m_SymbolNameCtrl->SetValidator( FIELD_VALIDATOR( VALUE_FIELD ) );
 
     // Configure button logos
-    m_bpAdd->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_bpDelete->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
-    m_bpMoveUp->SetBitmap( KiBitmap( BITMAPS::small_up ) );
-    m_bpMoveDown->SetBitmap( KiBitmap( BITMAPS::small_down ) );
-    m_addFilterButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_deleteFilterButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
-    m_editFilterButton->SetBitmap( KiBitmap( BITMAPS::small_edit ) );
+    m_bpAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_bpDelete->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
+    m_bpMoveUp->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
+    m_bpMoveDown->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
+    m_addFilterButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_deleteFilterButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
+    m_editFilterButton->SetBitmap( KiBitmapBundle( BITMAPS::small_edit ) );
 
     SetupStandardButtons();
 
diff --git a/eeschema/dialogs/dialog_lib_text_properties.cpp b/eeschema/dialogs/dialog_lib_text_properties.cpp
index 9f0e5ab558..c238cb57e7 100644
--- a/eeschema/dialogs/dialog_lib_text_properties.cpp
+++ b/eeschema/dialogs/dialog_lib_text_properties.cpp
@@ -55,34 +55,34 @@ DIALOG_LIB_TEXT_PROPERTIES::DIALOG_LIB_TEXT_PROPERTIES( SYMBOL_EDIT_FRAME* aPare
     m_separator1->SetIsSeparator();
 
     m_horizontal->SetIsRadioButton();
-    m_horizontal->SetBitmap( KiBitmap( BITMAPS::text_horizontal ) );
+    m_horizontal->SetBitmap( KiBitmapBundle( BITMAPS::text_horizontal ) );
     m_vertical->SetIsRadioButton();
-    m_vertical->SetBitmap( KiBitmap( BITMAPS::text_vertical ) );
+    m_vertical->SetBitmap( KiBitmapBundle( BITMAPS::text_vertical ) );
 
     m_separator2->SetIsSeparator();
 
     m_bold->SetIsCheckButton();
-    m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
+    m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
     m_italic->SetIsCheckButton();
-    m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
+    m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
 
     m_separator3->SetIsSeparator();
 
     m_hAlignLeft->SetIsRadioButton();
-    m_hAlignLeft->SetBitmap( KiBitmap( BITMAPS::text_align_left ) );
+    m_hAlignLeft->SetBitmap( KiBitmapBundle( BITMAPS::text_align_left ) );
     m_hAlignCenter->SetIsRadioButton();
-    m_hAlignCenter->SetBitmap( KiBitmap( BITMAPS::text_align_center ) );
+    m_hAlignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_align_center ) );
     m_hAlignRight->SetIsRadioButton();
-    m_hAlignRight->SetBitmap( KiBitmap( BITMAPS::text_align_right ) );
+    m_hAlignRight->SetBitmap( KiBitmapBundle( BITMAPS::text_align_right ) );
 
     m_separator4->SetIsSeparator();
 
     m_vAlignTop->SetIsRadioButton();
-    m_vAlignTop->SetBitmap( KiBitmap( BITMAPS::text_valign_top ) );
+    m_vAlignTop->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_top ) );
     m_vAlignCenter->SetIsRadioButton();
-    m_vAlignCenter->SetBitmap( KiBitmap( BITMAPS::text_valign_center ) );
+    m_vAlignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_center ) );
     m_vAlignBottom->SetIsRadioButton();
-    m_vAlignBottom->SetBitmap( KiBitmap( BITMAPS::text_valign_bottom ) );
+    m_vAlignBottom->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_bottom ) );
 
     m_separator5->SetIsSeparator();
 
diff --git a/eeschema/dialogs/dialog_lib_textbox_properties.cpp b/eeschema/dialogs/dialog_lib_textbox_properties.cpp
index 008fc1a6dc..db4e19dec1 100644
--- a/eeschema/dialogs/dialog_lib_textbox_properties.cpp
+++ b/eeschema/dialogs/dialog_lib_textbox_properties.cpp
@@ -87,33 +87,33 @@ DIALOG_LIB_TEXTBOX_PROPERTIES::DIALOG_LIB_TEXTBOX_PROPERTIES( SYMBOL_EDIT_FRAME*
     m_separator1->SetIsSeparator();
 
     m_bold->SetIsCheckButton();
-    m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
+    m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
     m_italic->SetIsCheckButton();
-    m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
+    m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
 
     m_separator2->SetIsSeparator();
 
     m_hAlignLeft->SetIsRadioButton();
-    m_hAlignLeft->SetBitmap( KiBitmap( BITMAPS::text_align_left ) );
+    m_hAlignLeft->SetBitmap( KiBitmapBundle( BITMAPS::text_align_left ) );
     m_hAlignCenter->SetIsRadioButton();
-    m_hAlignCenter->SetBitmap( KiBitmap( BITMAPS::text_align_center ) );
+    m_hAlignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_align_center ) );
     m_hAlignRight->SetIsRadioButton();
-    m_hAlignRight->SetBitmap( KiBitmap( BITMAPS::text_align_right ) );
+    m_hAlignRight->SetBitmap( KiBitmapBundle( BITMAPS::text_align_right ) );
     m_separator3->SetIsSeparator();
 
     m_vAlignTop->SetIsRadioButton();
-    m_vAlignTop->SetBitmap( KiBitmap( BITMAPS::text_valign_top ) );
+    m_vAlignTop->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_top ) );
     m_vAlignCenter->SetIsRadioButton();
-    m_vAlignCenter->SetBitmap( KiBitmap( BITMAPS::text_valign_center ) );
+    m_vAlignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_center ) );
     m_vAlignBottom->SetIsRadioButton();
-    m_vAlignBottom->SetBitmap( KiBitmap( BITMAPS::text_valign_bottom ) );
+    m_vAlignBottom->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_bottom ) );
 
     m_separator4->SetIsSeparator();
 
     m_horizontal->SetIsRadioButton();
-    m_horizontal->SetBitmap( KiBitmap( BITMAPS::text_horizontal ) );
+    m_horizontal->SetBitmap( KiBitmapBundle( BITMAPS::text_horizontal ) );
     m_vertical->SetIsRadioButton();
-    m_vertical->SetBitmap( KiBitmap( BITMAPS::text_vertical ) );
+    m_vertical->SetBitmap( KiBitmapBundle( BITMAPS::text_vertical ) );
 
     m_separator5->SetIsSeparator();
 
diff --git a/eeschema/dialogs/dialog_pin_properties.cpp b/eeschema/dialogs/dialog_pin_properties.cpp
index b9040686c0..0ede9c1db8 100644
--- a/eeschema/dialogs/dialog_pin_properties.cpp
+++ b/eeschema/dialogs/dialog_pin_properties.cpp
@@ -217,8 +217,8 @@ DIALOG_PIN_PROPERTIES::DIALOG_PIN_PROPERTIES( SYMBOL_EDIT_FRAME* parent, LIB_PIN
     attr->SetEditor( new GRID_CELL_ICON_TEXT_POPUP( PinShapeIcons(), PinShapeNames() ) );
     m_alternatesGrid->SetColAttr( COL_SHAPE, attr );
 
-    m_addAlternate->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_deleteAlternate->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_addAlternate->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_deleteAlternate->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
     m_addAlternate->GetParent()->Layout();
 
     SetupStandardButtons();
diff --git a/eeschema/dialogs/dialog_plot_schematic.cpp b/eeschema/dialogs/dialog_plot_schematic.cpp
index 1d96265036..15514a66c0 100644
--- a/eeschema/dialogs/dialog_plot_schematic.cpp
+++ b/eeschema/dialogs/dialog_plot_schematic.cpp
@@ -67,7 +67,7 @@ DIALOG_PLOT_SCHEMATIC::DIALOG_PLOT_SCHEMATIC( SCH_EDIT_FRAME* parent )
 {
     m_configChanged = false;
 
-    m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
+    m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
 
     m_MessagesBox->SetFileName( Prj().GetProjectPath() + wxT( "report.txt" ) );
 
diff --git a/eeschema/dialogs/dialog_sch_import_settings.cpp b/eeschema/dialogs/dialog_sch_import_settings.cpp
index 1fb74f4237..0612a58289 100644
--- a/eeschema/dialogs/dialog_sch_import_settings.cpp
+++ b/eeschema/dialogs/dialog_sch_import_settings.cpp
@@ -39,7 +39,7 @@ DIALOG_SCH_IMPORT_SETTINGS::DIALOG_SCH_IMPORT_SETTINGS( wxWindow* aParent, SCH_E
         DIALOG_SCH_IMPORT_SETTINGS_BASE( aParent ),
         m_frame( aFrame )
 {
-    m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
+    m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
 
     SetupStandardButtons( { { wxID_OK, _( "Import Settings" ) } } );
 }
diff --git a/eeschema/dialogs/dialog_sheet_pin_properties.cpp b/eeschema/dialogs/dialog_sheet_pin_properties.cpp
index 20057388ef..d9162ce630 100644
--- a/eeschema/dialogs/dialog_sheet_pin_properties.cpp
+++ b/eeschema/dialogs/dialog_sheet_pin_properties.cpp
@@ -51,9 +51,9 @@ DIALOG_SHEET_PIN_PROPERTIES::DIALOG_SHEET_PIN_PROPERTIES( SCH_EDIT_FRAME* parent
     m_separator1->SetIsSeparator();
 
     m_bold->SetIsCheckButton();
-    m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
+    m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
     m_italic->SetIsCheckButton();
-    m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
+    m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
 
     m_separator2->SetIsSeparator();
 
diff --git a/eeschema/dialogs/dialog_sheet_properties.cpp b/eeschema/dialogs/dialog_sheet_properties.cpp
index 56e3a54a58..207e70c306 100644
--- a/eeschema/dialogs/dialog_sheet_properties.cpp
+++ b/eeschema/dialogs/dialog_sheet_properties.cpp
@@ -88,10 +88,10 @@ DIALOG_SHEET_PROPERTIES::DIALOG_SHEET_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_S
     SetupStandardButtons();
 
     // Configure button logos
-    m_bpAdd->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_bpDelete->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
-    m_bpMoveUp->SetBitmap( KiBitmap( BITMAPS::small_up ) );
-    m_bpMoveDown->SetBitmap( KiBitmap( BITMAPS::small_down ) );
+    m_bpAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_bpDelete->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
+    m_bpMoveUp->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
+    m_bpMoveDown->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
 
     // Set font sizes
     m_hierarchicalPathLabel->SetFont( KIUI::GetInfoFont( this ) );
diff --git a/eeschema/dialogs/dialog_sim_model.cpp b/eeschema/dialogs/dialog_sim_model.cpp
index 01231e9bba..b0bb96ec49 100644
--- a/eeschema/dialogs/dialog_sim_model.cpp
+++ b/eeschema/dialogs/dialog_sim_model.cpp
@@ -73,7 +73,7 @@ DIALOG_SIM_MODEL<T_symbol, T_field>::DIALOG_SIM_MODEL( wxWindow* aParent, T_symb
         m_lastParamGridWidth( 0 ),
         m_inKillFocus( false )
 {
-    m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
+    m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
 
     for( LIB_PIN* pin : aSymbol.GetAllLibPins() )
     {
diff --git a/eeschema/dialogs/dialog_symbol_fields_table.cpp b/eeschema/dialogs/dialog_symbol_fields_table.cpp
index 25049d9821..3c79e76916 100644
--- a/eeschema/dialogs/dialog_symbol_fields_table.cpp
+++ b/eeschema/dialogs/dialog_symbol_fields_table.cpp
@@ -172,13 +172,13 @@ DIALOG_SYMBOL_FIELDS_TABLE::DIALOG_SYMBOL_FIELDS_TABLE( SCH_EDIT_FRAME* parent )
 
     m_separator1->SetIsSeparator();
     m_separator2->SetIsSeparator();
-    m_bRefresh->SetBitmap( KiBitmap( BITMAPS::small_refresh ) );
-    m_bRefreshPreview->SetBitmap( KiBitmap( BITMAPS::small_refresh ) );
-    m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
+    m_bRefresh->SetBitmap( KiBitmapBundle( BITMAPS::small_refresh ) );
+    m_bRefreshPreview->SetBitmap( KiBitmapBundle( BITMAPS::small_refresh ) );
+    m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
 
-    m_addFieldButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_removeFieldButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
-    m_renameFieldButton->SetBitmap( KiBitmap( BITMAPS::small_edit ) );
+    m_addFieldButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_removeFieldButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
+    m_renameFieldButton->SetBitmap( KiBitmapBundle( BITMAPS::small_edit ) );
 
     m_removeFieldButton->Enable( false );
     m_renameFieldButton->Enable( false );
diff --git a/eeschema/dialogs/dialog_symbol_properties.cpp b/eeschema/dialogs/dialog_symbol_properties.cpp
index ff530ffa4a..6e19e09ad5 100644
--- a/eeschema/dialogs/dialog_symbol_properties.cpp
+++ b/eeschema/dialogs/dialog_symbol_properties.cpp
@@ -376,10 +376,10 @@ DIALOG_SYMBOL_PROPERTIES::DIALOG_SYMBOL_PROPERTIES( SCH_EDIT_FRAME* aParent,
     SetupStandardButtons();
 
     // Configure button logos
-    m_bpAdd->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_bpDelete->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
-    m_bpMoveUp->SetBitmap( KiBitmap( BITMAPS::small_up ) );
-    m_bpMoveDown->SetBitmap( KiBitmap( BITMAPS::small_down ) );
+    m_bpAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_bpDelete->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
+    m_bpMoveUp->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
+    m_bpMoveDown->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
 
     // wxFormBuilder doesn't include this event...
     m_fieldsGrid->Bind( wxEVT_GRID_CELL_CHANGING, &DIALOG_SYMBOL_PROPERTIES::OnGridCellChanging,
diff --git a/eeschema/dialogs/dialog_text_properties.cpp b/eeschema/dialogs/dialog_text_properties.cpp
index 65bbb14427..8358a3c3da 100644
--- a/eeschema/dialogs/dialog_text_properties.cpp
+++ b/eeschema/dialogs/dialog_text_properties.cpp
@@ -130,33 +130,33 @@ DIALOG_TEXT_PROPERTIES::DIALOG_TEXT_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_ITE
     m_separator1->SetIsSeparator();
 
     m_bold->SetIsCheckButton();
-    m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
+    m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
     m_italic->SetIsCheckButton();
-    m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
+    m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
 
     m_separator2->SetIsSeparator();
 
     m_hAlignLeft->SetIsRadioButton();
-    m_hAlignLeft->SetBitmap( KiBitmap( BITMAPS::text_align_left ) );
+    m_hAlignLeft->SetBitmap( KiBitmapBundle( BITMAPS::text_align_left ) );
     m_hAlignCenter->SetIsRadioButton();
-    m_hAlignCenter->SetBitmap( KiBitmap( BITMAPS::text_align_center ) );
+    m_hAlignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_align_center ) );
     m_hAlignRight->SetIsRadioButton();
-    m_hAlignRight->SetBitmap( KiBitmap( BITMAPS::text_align_right ) );
+    m_hAlignRight->SetBitmap( KiBitmapBundle( BITMAPS::text_align_right ) );
     m_separator3->SetIsSeparator();
 
     m_vAlignTop->SetIsRadioButton();
-    m_vAlignTop->SetBitmap( KiBitmap( BITMAPS::text_valign_top ) );
+    m_vAlignTop->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_top ) );
     m_vAlignCenter->SetIsRadioButton();
-    m_vAlignCenter->SetBitmap( KiBitmap( BITMAPS::text_valign_center ) );
+    m_vAlignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_center ) );
     m_vAlignBottom->SetIsRadioButton();
-    m_vAlignBottom->SetBitmap( KiBitmap( BITMAPS::text_valign_bottom ) );
+    m_vAlignBottom->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_bottom ) );
 
     m_separator4->SetIsSeparator();
 
     m_horizontal->SetIsRadioButton();
-    m_horizontal->SetBitmap( KiBitmap( BITMAPS::text_horizontal ) );
+    m_horizontal->SetBitmap( KiBitmapBundle( BITMAPS::text_horizontal ) );
     m_vertical->SetIsRadioButton();
-    m_vertical->SetBitmap( KiBitmap( BITMAPS::text_vertical ) );
+    m_vertical->SetBitmap( KiBitmapBundle( BITMAPS::text_vertical ) );
 
     m_separator5->SetIsSeparator();
 
diff --git a/eeschema/dialogs/dialog_user_defined_signals.cpp b/eeschema/dialogs/dialog_user_defined_signals.cpp
index 3dbe448109..b146aaa3f3 100644
--- a/eeschema/dialogs/dialog_user_defined_signals.cpp
+++ b/eeschema/dialogs/dialog_user_defined_signals.cpp
@@ -47,8 +47,8 @@ DIALOG_USER_DEFINED_SIGNALS::DIALOG_USER_DEFINED_SIGNALS( SIMULATOR_FRAME* aPare
     for( const auto& [ id, signal ] : *m_signals )
         addGridRow( signal, id );
 
-    m_addButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_deleteButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_addButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_deleteButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
 
     SetupStandardButtons();
     Layout();
diff --git a/eeschema/dialogs/panel_bom_presets.cpp b/eeschema/dialogs/panel_bom_presets.cpp
index f6ca109650..1c80913dd2 100644
--- a/eeschema/dialogs/panel_bom_presets.cpp
+++ b/eeschema/dialogs/panel_bom_presets.cpp
@@ -33,8 +33,8 @@
 PANEL_BOM_PRESETS::PANEL_BOM_PRESETS( wxWindow* aWindow, SCHEMATIC_SETTINGS& aSettings ) :
         PANEL_BOM_PRESETS_BASE( aWindow ), m_settings( aSettings )
 {
-    m_btnDeleteBomPreset->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
-    m_btnDeleteBomFmtPreset->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_btnDeleteBomPreset->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
+    m_btnDeleteBomFmtPreset->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
 }
 
 
diff --git a/eeschema/dialogs/panel_eeschema_annotation_options.cpp b/eeschema/dialogs/panel_eeschema_annotation_options.cpp
index 2a8aa99143..9e749e1d51 100644
--- a/eeschema/dialogs/panel_eeschema_annotation_options.cpp
+++ b/eeschema/dialogs/panel_eeschema_annotation_options.cpp
@@ -37,8 +37,8 @@ PANEL_EESCHEMA_ANNOTATION_OPTIONS::PANEL_EESCHEMA_ANNOTATION_OPTIONS(
         PANEL_EESCHEMA_ANNOTATION_OPTIONS_BASE( aWindow ),
         m_schSettingsProvider( schSettingsProvider )
 {
-    annotate_down_right_bitmap->SetBitmap( KiBitmap( BITMAPS::annotate_down_right ) );
-    annotate_right_down_bitmap->SetBitmap( KiBitmap( BITMAPS::annotate_right_down ) );
+    annotate_down_right_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::annotate_down_right ) );
+    annotate_right_down_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::annotate_right_down ) );
 }
 
 
diff --git a/eeschema/dialogs/panel_setup_buses.cpp b/eeschema/dialogs/panel_setup_buses.cpp
index cba3903e13..afcab9aa98 100644
--- a/eeschema/dialogs/panel_setup_buses.cpp
+++ b/eeschema/dialogs/panel_setup_buses.cpp
@@ -37,10 +37,10 @@ PANEL_SETUP_BUSES::PANEL_SETUP_BUSES( wxWindow* aWindow, SCH_EDIT_FRAME* aFrame
 {
     m_membersLabelTemplate = m_membersLabel->GetLabel();
 
-    m_addAlias->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_deleteAlias->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
-    m_addMember->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_removeMember->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_addAlias->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_deleteAlias->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
+    m_addMember->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_removeMember->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
 
     m_source->SetFont( KIUI::GetInfoFont( aWindow ) );
 
diff --git a/eeschema/dialogs/panel_setup_pinmap.cpp b/eeschema/dialogs/panel_setup_pinmap.cpp
index f19345150b..b09406a0b6 100644
--- a/eeschema/dialogs/panel_setup_pinmap.cpp
+++ b/eeschema/dialogs/panel_setup_pinmap.cpp
@@ -240,9 +240,9 @@ void PANEL_SETUP_PINMAP::setDRCMatrixButtonState( wxWindow *aButton, PIN_ERROR a
     if( !!bitmap_butt )
     {
         if( wxBitmapButton* wx_btn = dynamic_cast<wxBitmapButton*>( aButton ) )
-            wx_btn->SetBitmap( KiBitmap( bitmap_butt ) );
+            wx_btn->SetBitmap( KiBitmapBundle( bitmap_butt ) );
         else if( BITMAP_BUTTON* ki_btn = dynamic_cast<BITMAP_BUTTON*>( aButton ) )
-            ki_btn->SetBitmap( KiBitmap( bitmap_butt ) );
+            ki_btn->SetBitmap( KiBitmapBundle( bitmap_butt ) );
 
         aButton->SetToolTip( tooltip );
     }
diff --git a/eeschema/dialogs/panel_sym_lib_table.cpp b/eeschema/dialogs/panel_sym_lib_table.cpp
index 647332bb2d..d67ec012cb 100644
--- a/eeschema/dialogs/panel_sym_lib_table.cpp
+++ b/eeschema/dialogs/panel_sym_lib_table.cpp
@@ -374,11 +374,11 @@ PANEL_SYM_LIB_TABLE::PANEL_SYM_LIB_TABLE( DIALOG_EDIT_LIBRARY_TABLES* aParent, P
     m_parent->SetInitialFocus( m_cur_grid );
 
     // Configure button logos
-    m_append_button->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_delete_button->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
-    m_move_up_button->SetBitmap( KiBitmap( BITMAPS::small_up ) );
-    m_move_down_button->SetBitmap( KiBitmap( BITMAPS::small_down ) );
-    m_browse_button->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
+    m_append_button->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_delete_button->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
+    m_move_up_button->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
+    m_move_down_button->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
+    m_browse_button->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
 }
 
 
diff --git a/eeschema/dialogs/panel_template_fieldnames.cpp b/eeschema/dialogs/panel_template_fieldnames.cpp
index 59186e0de5..0d8965a0e1 100644
--- a/eeschema/dialogs/panel_template_fieldnames.cpp
+++ b/eeschema/dialogs/panel_template_fieldnames.cpp
@@ -54,8 +54,8 @@ PANEL_TEMPLATE_FIELDNAMES::PANEL_TEMPLATE_FIELDNAMES( wxWindow* aWindow,
             m_templateMgr->AddTemplateFieldNames( cfg->m_Drawing.field_names );
     }
 
-    m_addFieldButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_deleteFieldButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_addFieldButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_deleteFieldButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
 
     m_checkboxColWidth = m_grid->GetColSize( 1 );
 
diff --git a/eeschema/import_gfx/dialog_import_gfx_sch.cpp b/eeschema/import_gfx/dialog_import_gfx_sch.cpp
index 011d59545f..db9ed62296 100644
--- a/eeschema/import_gfx/dialog_import_gfx_sch.cpp
+++ b/eeschema/import_gfx/dialog_import_gfx_sch.cpp
@@ -70,7 +70,7 @@ DIALOG_IMPORT_GFX_SCH::DIALOG_IMPORT_GFX_SCH( SCH_BASE_FRAME* aParent ) :
         m_yOrigin( aParent, m_yLabel, m_yCtrl, m_yUnits ),
         m_defaultLineWidth( aParent, m_lineWidthLabel, m_lineWidthCtrl, m_lineWidthUnits )
 {
-    m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
+    m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
 
     auto initWidgetsFromSettings = [&]( const auto& aCfg )
     {
diff --git a/eeschema/widgets/tuner_slider.cpp b/eeschema/widgets/tuner_slider.cpp
index 667256133b..e312d97986 100644
--- a/eeschema/widgets/tuner_slider.cpp
+++ b/eeschema/widgets/tuner_slider.cpp
@@ -56,16 +56,16 @@ TUNER_SLIDER::TUNER_SLIDER( SIMULATOR_FRAME_UI* aFrame, wxWindow* aParent,
         throw KI_PARAM_ERROR( wxString::Format( _( "%s not found" ), m_ref ) );
 
     m_name->SetLabel( wxString::Format( _( "Tune %s" ), m_ref ) );
-    m_closeBtn->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_closeBtn->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
 
-    m_e24->SetBitmap( KiBitmap( BITMAPS::e_24 ) );
+    m_e24->SetBitmap( KiBitmapBundle( BITMAPS::e_24 ) );
     m_e24->SetIsCheckButton();
     m_separator->SetIsSeparator();
-    m_e48->SetBitmap( KiBitmap( BITMAPS::e_48 ) );
+    m_e48->SetBitmap( KiBitmapBundle( BITMAPS::e_48 ) );
     m_e48->SetIsCheckButton();
-    m_e96->SetBitmap( KiBitmap( BITMAPS::e_96 ) );
+    m_e96->SetBitmap( KiBitmapBundle( BITMAPS::e_96 ) );
     m_e96->SetIsCheckButton();
-    m_e192->SetBitmap( KiBitmap( BITMAPS::e_192 ) );
+    m_e192->SetBitmap( KiBitmapBundle( BITMAPS::e_192 ) );
     m_e192->SetIsCheckButton();
 
     const SIM_MODEL::PARAM* tunerParam = item->model->GetTunerParam();
diff --git a/include/bitmap_store.h b/include/bitmap_store.h
index 0d11546785..8f6ba09ced 100644
--- a/include/bitmap_store.h
+++ b/include/bitmap_store.h
@@ -23,6 +23,8 @@
 #include <memory>
 #include <unordered_map>
 
+#include <wx/bmpbndl.h>
+
 #include <bitmaps/bitmap_info.h>
 
 class ASSET_ARCHIVE;
@@ -54,6 +56,19 @@ public:
      */
     wxBitmap GetBitmap( BITMAPS aBitmapId, int aHeight = -1 );
 
+    /**
+     * Constructs and returns a bitmap bundle containing all available sizes of the given ID
+     * @param aBitmapId is from the BITMAPS enum in bitmaps_list.h
+     */
+    wxBitmapBundle GetBitmapBundle( BITMAPS aBitmapId );
+
+    /**
+     * Constructs and returns a bitmap bundle for the given icon ID, with the bitmaps
+     * converted to disabled state according to the current UI theme.
+     * @param aBitmapId is from the BITMAPS enum in bitmaps_list.h
+     */
+    wxBitmapBundle GetDisabledBitmapBundle( BITMAPS aBitmapId );
+
     /**
      * Retrieves a bitmap from the given bitmap id, scaled to a given factor.
      *
diff --git a/include/bitmaps/bitmap_types.h b/include/bitmaps/bitmap_types.h
index c02690a832..e095f126fa 100644
--- a/include/bitmaps/bitmap_types.h
+++ b/include/bitmaps/bitmap_types.h
@@ -30,6 +30,7 @@
 // test if it works under stable release
 // #include <wx/bitmap.h>   // only to define wxBitmap
 class wxBitmap;     // only to define wxBitmap
+class wxBitmapBundle;
 class wxWindow;
 class wxString;
 class BITMAP_STORE;
@@ -53,6 +54,10 @@ BITMAP_STORE* GetBitmapStore();
  */
 wxBitmap KiBitmap( BITMAPS aBitmap, int aHeightTag = -1 );
 
+wxBitmapBundle KiBitmapBundle( BITMAPS aBitmap );
+
+wxBitmapBundle KiDisabledBitmapBundle( BITMAPS aBitmap );
+
 /**
  * Wipes out the scaled bitmap cache so that the icon theme can be changed.
  * TODO: move scaling system into BITMAP_STORE so this global doesn't need to exist
diff --git a/kicad/dialogs/dialog_template_selector.cpp b/kicad/dialogs/dialog_template_selector.cpp
index d9ab020715..f234a60d6d 100644
--- a/kicad/dialogs/dialog_template_selector.cpp
+++ b/kicad/dialogs/dialog_template_selector.cpp
@@ -143,8 +143,8 @@ void DIALOG_TEMPLATE_SELECTOR::OnPageChange( wxNotebookEvent& event )
 DIALOG_TEMPLATE_SELECTOR::DIALOG_TEMPLATE_SELECTOR( wxWindow* aParent ) :
     DIALOG_TEMPLATE_SELECTOR_BASE( aParent )
 {
-    m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
-    m_reloadButton->SetBitmap( KiBitmap( BITMAPS::small_refresh ) );
+    m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
+    m_reloadButton->SetBitmap( KiBitmapBundle( BITMAPS::small_refresh ) );
 
     m_htmlWin->SetPage( _( "<h1>Template Selector</h1>" ) );
     m_notebook->Connect( wxEVT_SIZE,
diff --git a/kicad/pcm/dialogs/dialog_manage_repositories.cpp b/kicad/pcm/dialogs/dialog_manage_repositories.cpp
index ef069ec75c..a44905c38d 100644
--- a/kicad/pcm/dialogs/dialog_manage_repositories.cpp
+++ b/kicad/pcm/dialogs/dialog_manage_repositories.cpp
@@ -35,10 +35,10 @@ DIALOG_MANAGE_REPOSITORIES::DIALOG_MANAGE_REPOSITORIES(
         DIALOG_MANAGE_REPOSITORIES_BASE( parent ),
         m_pcm( pcm )
 {
-    m_buttonAdd->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_buttonRemove->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
-    m_buttonMoveUp->SetBitmap( KiBitmap( BITMAPS::small_up ) );
-    m_buttonMoveDown->SetBitmap( KiBitmap( BITMAPS::small_down ) );
+    m_buttonAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_buttonRemove->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
+    m_buttonMoveUp->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
+    m_buttonMoveDown->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
 
     // For aesthetic reasons, we must set the size of m_buttonAdd to match the other bitmaps
     // manually (for instance m_buttonRemove)
diff --git a/kicad/pcm/dialogs/dialog_pcm.cpp b/kicad/pcm/dialogs/dialog_pcm.cpp
index 172d1a6ff8..d06f515ecc 100644
--- a/kicad/pcm/dialogs/dialog_pcm.cpp
+++ b/kicad/pcm/dialogs/dialog_pcm.cpp
@@ -66,7 +66,7 @@ DIALOG_PCM::DIALOG_PCM( wxWindow* parent, std::shared_ptr<PLUGIN_CONTENT_MANAGER
 
     m_gridPendingActions->PushEventHandler( new GRID_TRICKS( m_gridPendingActions ) );
 
-    m_discardActionButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_discardActionButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
     m_panelPending->Layout();
 
     m_actionCallback = [this]( const PACKAGE_VIEW_DATA& aData, PCM_PACKAGE_ACTION aAction,
diff --git a/pagelayout_editor/dialogs/properties_frame.cpp b/pagelayout_editor/dialogs/properties_frame.cpp
index 3e769f5c0a..e5c7a28713 100644
--- a/pagelayout_editor/dialogs/properties_frame.cpp
+++ b/pagelayout_editor/dialogs/properties_frame.cpp
@@ -96,27 +96,27 @@ PROPERTIES_FRAME::PROPERTIES_FRAME( PL_EDITOR_FRAME* aParent ) :
     m_staticTextSizeInfo->SetFont( KIUI::GetInfoFont( this ).Italic() );
 
     m_bold->SetIsCheckButton();
-    m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
+    m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
     m_italic->SetIsCheckButton();
-    m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
+    m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
 
     m_separator2->SetIsSeparator();
 
     m_alignLeft->SetIsRadioButton();
-    m_alignLeft->SetBitmap( KiBitmap( BITMAPS::text_align_left ) );
+    m_alignLeft->SetBitmap( KiBitmapBundle( BITMAPS::text_align_left ) );
     m_alignCenter->SetIsRadioButton();
-    m_alignCenter->SetBitmap( KiBitmap( BITMAPS::text_align_center ) );
+    m_alignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_align_center ) );
     m_alignRight->SetIsRadioButton();
-    m_alignRight->SetBitmap( KiBitmap( BITMAPS::text_align_right ) );
+    m_alignRight->SetBitmap( KiBitmapBundle( BITMAPS::text_align_right ) );
 
     m_separator3->SetIsSeparator();
 
     m_vAlignTop->SetIsRadioButton();
-    m_vAlignTop->SetBitmap( KiBitmap( BITMAPS::text_valign_top ) );
+    m_vAlignTop->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_top ) );
     m_vAlignMiddle->SetIsRadioButton();
-    m_vAlignMiddle->SetBitmap( KiBitmap( BITMAPS::text_valign_center ) );
+    m_vAlignMiddle->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_center ) );
     m_vAlignBottom->SetIsRadioButton();
-    m_vAlignBottom->SetBitmap( KiBitmap( BITMAPS::text_valign_bottom ) );
+    m_vAlignBottom->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_bottom ) );
 
     m_separator4->SetIsSeparator();
 
diff --git a/pcb_calculator/calculator_panels/panel_color_code.cpp b/pcb_calculator/calculator_panels/panel_color_code.cpp
index 1dd1eb9b43..ea9282f277 100644
--- a/pcb_calculator/calculator_panels/panel_color_code.cpp
+++ b/pcb_calculator/calculator_panels/panel_color_code.cpp
@@ -42,12 +42,12 @@ PANEL_COLOR_CODE::~PANEL_COLOR_CODE()
 void PANEL_COLOR_CODE::ThemeChanged()
 {
     // Update the bitmaps
-    m_Band1bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value_and_name ) );
-    m_Band2bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value ) );
-    m_Band3bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value ) );
-    m_Band4bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value ) );
-    m_Band_mult_bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_multiplier ) );
-    m_Band_tol_bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_tolerance ) );
+    m_Band1bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_value_and_name ) );
+    m_Band2bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_value ) );
+    m_Band3bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_value ) );
+    m_Band4bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_value ) );
+    m_Band_mult_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_multiplier ) );
+    m_Band_tol_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_tolerance ) );
 
     Refresh();
 }
@@ -87,12 +87,12 @@ void PANEL_COLOR_CODE::ToleranceSelection( int aSelection )
     GetSizer()->Layout();
 
     // All this shouldn't be necessary but if you want the bitmaps to show up on OSX it is.
-    m_Band1bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value_and_name ) );
-    m_Band2bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value ) );
-    m_Band3bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value ) );
-    m_Band4bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value ) );
-    m_Band_mult_bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_multiplier ) );
-    m_Band_tol_bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_tolerance ) );
+    m_Band1bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_value_and_name ) );
+    m_Band2bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_value ) );
+    m_Band3bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_value ) );
+    m_Band4bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_value ) );
+    m_Band_mult_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_multiplier ) );
+    m_Band_tol_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_tolerance ) );
 
     Refresh();
 }
diff --git a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664.cpp b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664.cpp
index a39464ac23..76bf8d0c97 100644
--- a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664.cpp
+++ b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664.cpp
@@ -54,7 +54,7 @@ PANEL_ELECTRICAL_SPACING_IEC60664::PANEL_ELECTRICAL_SPACING_IEC60664( wxWindow*
     ConvertMarkdown2Html( wxGetTranslation( iec60664help ), msg );
     m_panelHelp->SetPage( msg );
 
-    m_creepageclearanceBitmap->SetBitmap( KiBitmap( BITMAPS::creepage_clearance ) );
+    m_creepageclearanceBitmap->SetBitmap( KiBitmapBundle( BITMAPS::creepage_clearance ) );
 
 	Layout();
 }
@@ -67,7 +67,7 @@ PANEL_ELECTRICAL_SPACING_IEC60664::~PANEL_ELECTRICAL_SPACING_IEC60664()
 
 void PANEL_ELECTRICAL_SPACING_IEC60664::ThemeChanged()
 {
-    m_creepageclearanceBitmap->SetBitmap( KiBitmap( BITMAPS::creepage_clearance ) );
+    m_creepageclearanceBitmap->SetBitmap( KiBitmapBundle( BITMAPS::creepage_clearance ) );
 }
 
 
diff --git a/pcb_calculator/calculator_panels/panel_regulator.cpp b/pcb_calculator/calculator_panels/panel_regulator.cpp
index f5494074fc..f558a774fb 100644
--- a/pcb_calculator/calculator_panels/panel_regulator.cpp
+++ b/pcb_calculator/calculator_panels/panel_regulator.cpp
@@ -43,8 +43,8 @@ PANEL_REGULATOR::PANEL_REGULATOR( wxWindow* parent, wxWindowID id, const wxPoint
     m_r1Units->SetLabel( wxT( "kΩ" ) );
     m_r2Units->SetLabel( wxT( "kΩ" ) );
 
-    m_bitmapRegul3pins->SetBitmap( KiBitmap( BITMAPS::regul_3pins ) );
-    m_bitmapRegul4pins->SetBitmap( KiBitmap( BITMAPS::regul ) );
+    m_bitmapRegul3pins->SetBitmap( KiBitmapBundle( BITMAPS::regul_3pins ) );
+    m_bitmapRegul4pins->SetBitmap( KiBitmapBundle( BITMAPS::regul ) );
 
     m_choiceRegulatorSelector->Append( m_RegulatorList.GetRegList() );
     SelectLastSelectedRegulator();
@@ -61,8 +61,8 @@ PANEL_REGULATOR::~PANEL_REGULATOR()
 void PANEL_REGULATOR::ThemeChanged()
 {
     // Update the bitmaps
-    m_bitmapRegul3pins->SetBitmap( KiBitmap( BITMAPS::regul_3pins ) );
-    m_bitmapRegul4pins->SetBitmap( KiBitmap( BITMAPS::regul ) );
+    m_bitmapRegul3pins->SetBitmap( KiBitmapBundle( BITMAPS::regul_3pins ) );
+    m_bitmapRegul4pins->SetBitmap( KiBitmapBundle( BITMAPS::regul ) );
 }
 
 
diff --git a/pcb_calculator/calculator_panels/panel_rf_attenuators.cpp b/pcb_calculator/calculator_panels/panel_rf_attenuators.cpp
index 498e573b06..74e7a84020 100644
--- a/pcb_calculator/calculator_panels/panel_rf_attenuators.cpp
+++ b/pcb_calculator/calculator_panels/panel_rf_attenuators.cpp
@@ -38,7 +38,7 @@ PANEL_RF_ATTENUATORS::PANEL_RF_ATTENUATORS( wxWindow* parent, wxWindowID id, con
         PANEL_RF_ATTENUATORS_BASE( parent, id, pos, size, style, name )
 {
     m_CurrAttenuator = nullptr;
-    m_bpButtonCalcAtt->SetBitmap( KiBitmap( BITMAPS::small_down ) );
+    m_bpButtonCalcAtt->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
 
     // Populate attenuator list ordered like in dialog menu list
     m_AttenuatorList.push_back( new ATTENUATOR_PI() );
@@ -71,8 +71,8 @@ PANEL_RF_ATTENUATORS::~PANEL_RF_ATTENUATORS()
 void PANEL_RF_ATTENUATORS::ThemeChanged()
 {
     // Update the bitmaps
-    m_bpButtonCalcAtt->SetBitmap( KiBitmap( BITMAPS::small_down ) );
-    m_attenuatorBitmap->SetBitmap( KiBitmap( m_CurrAttenuator->m_SchBitmapName ) );
+    m_bpButtonCalcAtt->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
+    m_attenuatorBitmap->SetBitmap( KiBitmapBundle( m_CurrAttenuator->m_SchBitmapName ) );
 
     // Update the font
     m_staticTextAttMsg->SetFont( KIUI::GetInfoFont( this ).Italic() );
@@ -88,7 +88,7 @@ void PANEL_RF_ATTENUATORS::ThemeChanged()
 
 void PANEL_RF_ATTENUATORS::UpdateUI()
 {
-    m_attenuatorBitmap->SetBitmap( KiBitmap( m_CurrAttenuator->m_SchBitmapName ) );
+    m_attenuatorBitmap->SetBitmap( KiBitmapBundle( m_CurrAttenuator->m_SchBitmapName ) );
 
     m_attenuatorBitmap->GetParent()->Layout();
     m_attenuatorBitmap->GetParent()->Refresh();
@@ -169,7 +169,7 @@ void PANEL_RF_ATTENUATORS::TransfPanelDataToAttenuator()
 
 void PANEL_RF_ATTENUATORS::TransfAttenuatorDataToPanel()
 {
-    m_attenuatorBitmap->SetBitmap( KiBitmap( m_CurrAttenuator->m_SchBitmapName ) );
+    m_attenuatorBitmap->SetBitmap( KiBitmapBundle( m_CurrAttenuator->m_SchBitmapName ) );
 
     wxString msg;
 
diff --git a/pcb_calculator/calculator_panels/panel_transline.cpp b/pcb_calculator/calculator_panels/panel_transline.cpp
index b8ad6c3509..b9b3ccc16a 100644
--- a/pcb_calculator/calculator_panels/panel_transline.cpp
+++ b/pcb_calculator/calculator_panels/panel_transline.cpp
@@ -32,8 +32,8 @@ PANEL_TRANSLINE::PANEL_TRANSLINE( wxWindow* parent, wxWindowID id, const wxPoint
         m_currTransLine( nullptr ),
         m_currTransLineType( DEFAULT_TYPE )
 {
-    m_bpButtonAnalyze->SetBitmap( KiBitmap( BITMAPS::small_down ) );
-    m_bpButtonSynthetize->SetBitmap( KiBitmap( BITMAPS::small_up ) );
+    m_bpButtonAnalyze->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
+    m_bpButtonSynthetize->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
 
 
     // Populate transline list ordered like in dialog menu list
@@ -66,9 +66,9 @@ PANEL_TRANSLINE::~PANEL_TRANSLINE()
 void PANEL_TRANSLINE::ThemeChanged()
 {
     // Update the bitmaps
-    m_bpButtonAnalyze->SetBitmap( KiBitmap( BITMAPS::small_down ) );
-    m_bpButtonSynthetize->SetBitmap( KiBitmap( BITMAPS::small_up ) );
-    m_translineBitmap->SetBitmap( KiBitmap( m_transline_list[m_currTransLineType]->m_BitmapName ) );
+    m_bpButtonAnalyze->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
+    m_bpButtonSynthetize->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
+    m_translineBitmap->SetBitmap( KiBitmapBundle( m_transline_list[m_currTransLineType]->m_BitmapName ) );
 }
 
 
diff --git a/pcb_calculator/calculator_panels/panel_via_size.cpp b/pcb_calculator/calculator_panels/panel_via_size.cpp
index 4722606cee..27721e7345 100644
--- a/pcb_calculator/calculator_panels/panel_via_size.cpp
+++ b/pcb_calculator/calculator_panels/panel_via_size.cpp
@@ -66,7 +66,7 @@ PANEL_VIA_SIZE::PANEL_VIA_SIZE( wxWindow* parent, wxWindowID id,
     m_viaThermalResUnits->SetLabel( wxT( "°C/W" ) );
     m_viaReactanceUnits->SetLabel( wxT( "Ω" ) );
 
-    m_viaBitmap->SetBitmap( KiBitmap( BITMAPS::viacalc ) );
+    m_viaBitmap->SetBitmap( KiBitmapBundle( BITMAPS::viacalc ) );
 
     // Needed on wxWidgets 3.0 to ensure sizers are correctly set
     GetSizer()->SetSizeHints( this );
@@ -80,7 +80,7 @@ PANEL_VIA_SIZE::~PANEL_VIA_SIZE()
 
 void PANEL_VIA_SIZE::ThemeChanged()
 {
-    m_viaBitmap->SetBitmap( KiBitmap( BITMAPS::viacalc ) );
+    m_viaBitmap->SetBitmap( KiBitmapBundle( BITMAPS::viacalc ) );
 }
 
 
diff --git a/pcb_calculator/transline_dlg_funct.cpp b/pcb_calculator/transline_dlg_funct.cpp
index e7d07f96b3..52ec93adcd 100644
--- a/pcb_calculator/transline_dlg_funct.cpp
+++ b/pcb_calculator/transline_dlg_funct.cpp
@@ -103,11 +103,11 @@ void PANEL_TRANSLINE::TranslineTypeSelection( enum TRANSLINE_TYPE_ID aType )
         m_currTransLineType = DEFAULT_TYPE;
     }
 
-    m_translineBitmap->SetBitmap( KiBitmap( m_transline_list[m_currTransLineType]->m_BitmapName ) );
+    m_translineBitmap->SetBitmap( KiBitmapBundle( m_transline_list[m_currTransLineType]->m_BitmapName ) );
 
     // This helper bitmap is shown for coupled microstrip only:
     m_bmCMicrostripZoddZeven->Show( aType == C_MICROSTRIP_TYPE );
-    m_bmCMicrostripZoddZeven->SetBitmap( KiBitmap( BITMAPS::microstrip_zodd_zeven ) );
+    m_bmCMicrostripZoddZeven->SetBitmap( KiBitmapBundle( BITMAPS::microstrip_zodd_zeven ) );
 
     TRANSLINE_IDENT* tr_ident = m_transline_list[m_currTransLineType];
     m_currTransLine = tr_ident->m_TLine;
diff --git a/pcbnew/dialogs/dialog_board_reannotate.cpp b/pcbnew/dialogs/dialog_board_reannotate.cpp
index a983f92fd9..99635d6682 100644
--- a/pcbnew/dialogs/dialog_board_reannotate.cpp
+++ b/pcbnew/dialogs/dialog_board_reannotate.cpp
@@ -107,14 +107,14 @@ DIALOG_BOARD_REANNOTATE::DIALOG_BOARD_REANNOTATE( PCB_EDIT_FRAME* aParentFrame )
     InitValues();
 
     // Init bitmaps associated to some wxRadioButton
-    reannotate_down_right_bitmap->SetBitmap( KiBitmap( BITMAPS::reannotate_right_down ) );
-    reannotate_right_down_bitmap->SetBitmap( KiBitmap( BITMAPS::reannotate_left_down ) );
-    reannotate_down_left_bitmap->SetBitmap( KiBitmap( BITMAPS::reannotate_right_up ) );
-    reannotate_left_down_bitmap->SetBitmap( KiBitmap( BITMAPS::reannotate_left_up ) );
-    reannotate_up_right_bitmap->SetBitmap( KiBitmap( BITMAPS::reannotate_down_left ) );
-    reannotate_right_up_bitmap->SetBitmap( KiBitmap( BITMAPS::reannotate_up_left ) );
-    reannotate_up_left_bitmap->SetBitmap( KiBitmap( BITMAPS::reannotate_down_right ) );
-    reannotate_left_up_bitmap->SetBitmap( KiBitmap( BITMAPS::reannotate_up_right ) );
+    reannotate_down_right_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::reannotate_right_down ) );
+    reannotate_right_down_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::reannotate_left_down ) );
+    reannotate_down_left_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::reannotate_right_up ) );
+    reannotate_left_down_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::reannotate_left_up ) );
+    reannotate_up_right_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::reannotate_down_left ) );
+    reannotate_right_up_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::reannotate_up_left ) );
+    reannotate_up_left_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::reannotate_down_right ) );
+    reannotate_left_up_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::reannotate_up_right ) );
 
     m_FrontRefDesStart->SetValidator( wxTextValidator( wxFILTER_DIGITS ) );
     m_BackRefDesStart->SetValidator( wxTextValidator( wxFILTER_DIGITS ) );
diff --git a/pcbnew/dialogs/dialog_dimension_properties.cpp b/pcbnew/dialogs/dialog_dimension_properties.cpp
index 81f192e1cf..423f807d4f 100644
--- a/pcbnew/dialogs/dialog_dimension_properties.cpp
+++ b/pcbnew/dialogs/dialog_dimension_properties.cpp
@@ -94,23 +94,23 @@ DIALOG_DIMENSION_PROPERTIES::DIALOG_DIMENSION_PROPERTIES( PCB_BASE_EDIT_FRAME* a
     m_separator0->SetIsSeparator();
 
     m_bold->SetIsCheckButton();
-    m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
+    m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
     m_italic->SetIsCheckButton();
-    m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
+    m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
 
     m_separator1->SetIsSeparator();
 
     m_alignLeft->SetIsRadioButton();
-    m_alignLeft->SetBitmap( KiBitmap( BITMAPS::text_align_left ) );
+    m_alignLeft->SetBitmap( KiBitmapBundle( BITMAPS::text_align_left ) );
     m_alignCenter->SetIsRadioButton();
-    m_alignCenter->SetBitmap( KiBitmap( BITMAPS::text_align_center ) );
+    m_alignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_align_center ) );
     m_alignRight->SetIsRadioButton();
-    m_alignRight->SetBitmap( KiBitmap( BITMAPS::text_align_right ) );
+    m_alignRight->SetBitmap( KiBitmapBundle( BITMAPS::text_align_right ) );
 
     m_separator2->SetIsSeparator();
 
     m_mirrored->SetIsCheckButton();
-    m_mirrored->SetBitmap( KiBitmap( BITMAPS::text_mirrored ) );
+    m_mirrored->SetBitmap( KiBitmapBundle( BITMAPS::text_mirrored ) );
 
     m_separator3->SetIsSeparator();
 
diff --git a/pcbnew/dialogs/dialog_exchange_footprints.cpp b/pcbnew/dialogs/dialog_exchange_footprints.cpp
index 98b11b22d6..7267bd859b 100644
--- a/pcbnew/dialogs/dialog_exchange_footprints.cpp
+++ b/pcbnew/dialogs/dialog_exchange_footprints.cpp
@@ -95,7 +95,7 @@ DIALOG_EXCHANGE_FOOTPRINTS::DIALOG_EXCHANGE_FOOTPRINTS( PCB_EDIT_FRAME* aParent,
     else
     {
         m_upperSizer->FindItem( m_matchAll )->Show( false );
-        m_newIDBrowseButton->SetBitmap( KiBitmap( BITMAPS::small_library ) );
+        m_newIDBrowseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_library ) );
     }
 
     if( m_currentFootprint )
@@ -113,7 +113,7 @@ DIALOG_EXCHANGE_FOOTPRINTS::DIALOG_EXCHANGE_FOOTPRINTS( PCB_EDIT_FRAME* aParent,
     if( m_currentFootprint )
         m_specifiedID->ChangeValue( From_UTF8( m_currentFootprint->GetFPID().Format().c_str() ) );
 
-    m_specifiedIDBrowseButton->SetBitmap( KiBitmap( BITMAPS::small_library ) );
+    m_specifiedIDBrowseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_library ) );
 
     m_upperSizer->SetEmptyCellSize( wxSize( 0, 0 ) );
     // The upper sizer has its content modified: re-layout it:
diff --git a/pcbnew/dialogs/dialog_export_svg.cpp b/pcbnew/dialogs/dialog_export_svg.cpp
index 57e7eb1359..24bb74dc68 100644
--- a/pcbnew/dialogs/dialog_export_svg.cpp
+++ b/pcbnew/dialogs/dialog_export_svg.cpp
@@ -79,7 +79,7 @@ DIALOG_EXPORT_SVG::DIALOG_EXPORT_SVG( PCB_EDIT_FRAME* aParent, BOARD* aBoard ) :
         m_printMirror( false ),
         m_oneFileOnly( false )
 {
-    m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
+    m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
 
     m_messagesPanel->SetFileName( Prj().GetProjectPath() + wxT( "report.txt" ) );
 
diff --git a/pcbnew/dialogs/dialog_footprint_properties.cpp b/pcbnew/dialogs/dialog_footprint_properties.cpp
index 2d56a5b403..d646a5d834 100644
--- a/pcbnew/dialogs/dialog_footprint_properties.cpp
+++ b/pcbnew/dialogs/dialog_footprint_properties.cpp
@@ -139,8 +139,8 @@ DIALOG_FOOTPRINT_PROPERTIES::DIALOG_FOOTPRINT_PROPERTIES( PCB_EDIT_FRAME* aParen
     m_solderPasteRatio.SetNegativeZero();
 
     // Configure button logos
-    m_bpAdd->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_bpDelete->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_bpAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_bpDelete->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
 
     m_tcLibraryID->SetBackgroundColour( KIPLATFORM::UI::GetDialogBGColour() );
 
diff --git a/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp b/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp
index 359a35d483..32cc9287b4 100644
--- a/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp
+++ b/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp
@@ -212,12 +212,12 @@ DIALOG_FOOTPRINT_PROPERTIES_FP_EDITOR::DIALOG_FOOTPRINT_PROPERTIES_FP_EDITOR(
     m_solderPasteRatio.SetNegativeZero();
 
     // Configure button logos
-    m_bpAdd->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_bpDelete->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
-    m_bpAddLayer->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_bpDeleteLayer->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
-    m_bpAddPadGroup->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_bpRemovePadGroup->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_bpAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_bpDelete->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
+    m_bpAddLayer->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_bpDeleteLayer->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
+    m_bpAddPadGroup->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_bpRemovePadGroup->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
 
     SetupStandardButtons();
 
diff --git a/pcbnew/dialogs/dialog_gen_footprint_position.cpp b/pcbnew/dialogs/dialog_gen_footprint_position.cpp
index 89189b5990..7a7f6ee854 100644
--- a/pcbnew/dialogs/dialog_gen_footprint_position.cpp
+++ b/pcbnew/dialogs/dialog_gen_footprint_position.cpp
@@ -170,7 +170,7 @@ private:
 
 void DIALOG_GEN_FOOTPRINT_POSITION::initDialog()
 {
-    m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
+    m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
 
     PROJECT_FILE&    projectFile = m_parent->Prj().GetProjectFile();
     PCBNEW_SETTINGS* cfg = m_parent->GetPcbNewSettings();
diff --git a/pcbnew/dialogs/dialog_gendrill.cpp b/pcbnew/dialogs/dialog_gendrill.cpp
index 44be669987..8e38ad7b13 100644
--- a/pcbnew/dialogs/dialog_gendrill.cpp
+++ b/pcbnew/dialogs/dialog_gendrill.cpp
@@ -125,7 +125,7 @@ void DIALOG_GENDRILL::initDialog()
 
 void DIALOG_GENDRILL::InitDisplayParams()
 {
-    m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
+    m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
 
     m_rbExcellon->SetValue( m_drillFileType == 0 );
     m_rbGerberX2->SetValue( m_drillFileType == 1 );
diff --git a/pcbnew/dialogs/dialog_global_edit_teardrops.cpp b/pcbnew/dialogs/dialog_global_edit_teardrops.cpp
index 229d810e00..b2c229b772 100644
--- a/pcbnew/dialogs/dialog_global_edit_teardrops.cpp
+++ b/pcbnew/dialogs/dialog_global_edit_teardrops.cpp
@@ -154,7 +154,7 @@ DIALOG_GLOBAL_EDIT_TEARDROPS::DIALOG_GLOBAL_EDIT_TEARDROPS( PCB_EDIT_FRAME* aPar
     m_parent = aParent;
     m_brd = m_parent->GetBoard();
 
-    m_bitmapTeardrop->SetBitmap( KiBitmap( BITMAPS::teardrop_sizes ) );
+    m_bitmapTeardrop->SetBitmap( KiBitmapBundle( BITMAPS::teardrop_sizes ) );
 
     m_teardropHDPercent.SetUnits( EDA_UNITS::PERCENT );
     m_teardropLenPercent.SetUnits( EDA_UNITS::PERCENT );
diff --git a/pcbnew/dialogs/dialog_group_properties.cpp b/pcbnew/dialogs/dialog_group_properties.cpp
index 0ea96900bf..d0a7aa3d4d 100644
--- a/pcbnew/dialogs/dialog_group_properties.cpp
+++ b/pcbnew/dialogs/dialog_group_properties.cpp
@@ -40,8 +40,8 @@ DIALOG_GROUP_PROPERTIES::DIALOG_GROUP_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent,
         m_toolMgr( aParent->GetToolManager() ),
         m_group( aGroup )
 {
-    m_bpAddMember->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_bpRemoveMember->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_bpAddMember->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_bpRemoveMember->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
 
     m_nameCtrl->SetValue( m_group->GetName() );
 
diff --git a/pcbnew/dialogs/dialog_import_netlist.cpp b/pcbnew/dialogs/dialog_import_netlist.cpp
index f11e2b5fad..21c0650f22 100644
--- a/pcbnew/dialogs/dialog_import_netlist.cpp
+++ b/pcbnew/dialogs/dialog_import_netlist.cpp
@@ -64,7 +64,7 @@ DIALOG_IMPORT_NETLIST::DIALOG_IMPORT_NETLIST( PCB_EDIT_FRAME* aParent,
       m_runDragCommand( false )
 {
     m_NetlistFilenameCtrl->SetValue( m_netlistPath );
-    m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
+    m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
 
     auto cfg = m_parent->GetPcbNewSettings();
 
diff --git a/pcbnew/dialogs/dialog_import_settings.cpp b/pcbnew/dialogs/dialog_import_settings.cpp
index 7d33128957..2f4c2dd106 100644
--- a/pcbnew/dialogs/dialog_import_settings.cpp
+++ b/pcbnew/dialogs/dialog_import_settings.cpp
@@ -41,7 +41,7 @@ DIALOG_IMPORT_SETTINGS::DIALOG_IMPORT_SETTINGS( wxWindow* aParent, PCB_EDIT_FRAM
 {
     wxSize sizeNeeded;
 
-    m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
+    m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
 
     // Make sure "Select All" button is big enough to hold "Deselect All"
     m_selectAllButton->SetLabel( _( "Deselect All" ) ); // Change the text temporarily
diff --git a/pcbnew/dialogs/dialog_net_inspector.cpp b/pcbnew/dialogs/dialog_net_inspector.cpp
index 1aaaae52f3..d658995d7c 100644
--- a/pcbnew/dialogs/dialog_net_inspector.cpp
+++ b/pcbnew/dialogs/dialog_net_inspector.cpp
@@ -1095,9 +1095,9 @@ DIALOG_NET_INSPECTOR::DIALOG_NET_INSPECTOR( PCB_EDIT_FRAME* aParent ) :
 
     adjustListColumns();
 
-    m_addNet->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_renameNet->SetBitmap( KiBitmap( BITMAPS::small_edit ) );
-    m_deleteNet->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_addNet->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_renameNet->SetBitmap( KiBitmapBundle( BITMAPS::small_edit ) );
+    m_deleteNet->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
 
     SetupStandardButtons();
     // Now SetupStandardButtons is called, change the label of Cancel button
diff --git a/pcbnew/dialogs/dialog_pad_properties.cpp b/pcbnew/dialogs/dialog_pad_properties.cpp
index 5529f5e11c..b0d2e9601e 100644
--- a/pcbnew/dialogs/dialog_pad_properties.cpp
+++ b/pcbnew/dialogs/dialog_pad_properties.cpp
@@ -189,9 +189,9 @@ DIALOG_PAD_PROPERTIES::DIALOG_PAD_PROPERTIES( PCB_BASE_FRAME* aParent, PAD* aPad
 
     m_cbShowPadOutline->SetValue( m_sketchPreview );
 
-    m_FlippedWarningIcon->SetBitmap( KiBitmap( BITMAPS::dialog_warning ) );
-    m_nonCopperWarningIcon->SetBitmap( KiBitmap( BITMAPS::dialog_warning ) );
-    m_legacyTeardropsIcon->SetBitmap( KiBitmap( BITMAPS::dialog_warning ) );
+    m_FlippedWarningIcon->SetBitmap( KiBitmapBundle( BITMAPS::dialog_warning ) );
+    m_nonCopperWarningIcon->SetBitmap( KiBitmapBundle( BITMAPS::dialog_warning ) );
+    m_legacyTeardropsIcon->SetBitmap( KiBitmapBundle( BITMAPS::dialog_warning ) );
 
     m_masterPad = m_parent->GetDesignSettings().m_Pad_Master.get();
     m_previewPad = new PAD( (FOOTPRINT*) nullptr );
@@ -1165,13 +1165,13 @@ bool DIALOG_PAD_PROPERTIES::Show( bool aShow )
         // It *should* work to set the stackup bitmap in the constructor, but it doesn't.
         // wxWidgets needs to have these set when the panel is visible for some reason.
         // https://gitlab.com/kicad/code/kicad/-/issues/5534
-        m_stackupImage0->SetBitmap( KiBitmap( BITMAPS::pads_reset_unused ) );
-        m_stackupImage1->SetBitmap( KiBitmap( BITMAPS::pads_remove_unused_keep_bottom ) );
-        m_stackupImage2->SetBitmap( KiBitmap( BITMAPS::pads_remove_unused ) );
-        m_stackupImage4->SetBitmap( KiBitmap( BITMAPS::pads_npth_top_bottom ) );
-        m_stackupImage5->SetBitmap( KiBitmap( BITMAPS::pads_npth_top ) );
-        m_stackupImage6->SetBitmap( KiBitmap( BITMAPS::pads_npth_bottom ) );
-        m_stackupImage7->SetBitmap( KiBitmap( BITMAPS::pads_npth ) );
+        m_stackupImage0->SetBitmap( KiBitmapBundle( BITMAPS::pads_reset_unused ) );
+        m_stackupImage1->SetBitmap( KiBitmapBundle( BITMAPS::pads_remove_unused_keep_bottom ) );
+        m_stackupImage2->SetBitmap( KiBitmapBundle( BITMAPS::pads_remove_unused ) );
+        m_stackupImage4->SetBitmap( KiBitmapBundle( BITMAPS::pads_npth_top_bottom ) );
+        m_stackupImage5->SetBitmap( KiBitmapBundle( BITMAPS::pads_npth_top ) );
+        m_stackupImage6->SetBitmap( KiBitmapBundle( BITMAPS::pads_npth_bottom ) );
+        m_stackupImage7->SetBitmap( KiBitmapBundle( BITMAPS::pads_npth ) );
 
         Layout();
     }
@@ -1655,13 +1655,13 @@ void DIALOG_PAD_PROPERTIES::updatePadSizeControls()
     {
         m_sizeXLabel->SetLabel( _( "Diameter:" ) );
         m_sizeY.Show( false );
-        m_bitmapTeardrop->SetBitmap( KiBitmap( BITMAPS::teardrop_sizes ) );
+        m_bitmapTeardrop->SetBitmap( KiBitmapBundle( BITMAPS::teardrop_sizes ) );
     }
     else
     {
         m_sizeXLabel->SetLabel( _( "Pad size X:" ) );
         m_sizeY.Show( true );
-        m_bitmapTeardrop->SetBitmap( KiBitmap( BITMAPS::teardrop_rect_sizes ) );
+        m_bitmapTeardrop->SetBitmap( KiBitmapBundle( BITMAPS::teardrop_rect_sizes ) );
     }
 
     m_sizeXLabel->GetParent()->Layout();
diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp
index 5f7168c0bc..ef5fbfd8f7 100644
--- a/pcbnew/dialogs/dialog_plot.cpp
+++ b/pcbnew/dialogs/dialog_plot.cpp
@@ -157,14 +157,14 @@ DIALOG_PLOT::DIALOG_PLOT( PCB_EDIT_FRAME* aParent ) :
 	m_bpMoveUp = new STD_BITMAP_BUTTON( sbSizer->GetStaticBox(), wxID_ANY, wxNullBitmap,
                                         wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW | 0 );
 	m_bpMoveUp->SetToolTip( _( "Move current selection up" ) );
-    m_bpMoveUp->SetBitmap( KiBitmap( BITMAPS::small_up ) );
+    m_bpMoveUp->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
 
 	bButtonSizer->Add( m_bpMoveUp, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5 );
 
 	m_bpMoveDown = new STD_BITMAP_BUTTON( sbSizer->GetStaticBox(), wxID_ANY, wxNullBitmap,
                                           wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW | 0 );
 	m_bpMoveDown->SetToolTip( _( "Move current selection down" ) );
-    m_bpMoveDown->SetBitmap( KiBitmap( BITMAPS::small_down ) );
+    m_bpMoveDown->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
 
 	bButtonSizer->Add( m_bpMoveDown, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5 );
 
@@ -209,7 +209,7 @@ void DIALOG_PLOT::init_Dialog()
 
     m_zoneFillCheck->SetValue( cfg->m_Plot.check_zones_before_plotting );
 
-    m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
+    m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
 
     // m_PSWidthAdjust is stored in mm in user config
     m_PSWidthAdjust = KiROUND( cfg->m_Plot.ps_fine_width_adjust * pcbIUScale.IU_PER_MM );
diff --git a/pcbnew/dialogs/dialog_text_properties.cpp b/pcbnew/dialogs/dialog_text_properties.cpp
index bf584e8078..35052fde13 100644
--- a/pcbnew/dialogs/dialog_text_properties.cpp
+++ b/pcbnew/dialogs/dialog_text_properties.cpp
@@ -180,32 +180,32 @@ DIALOG_TEXT_PROPERTIES::DIALOG_TEXT_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent, PC
     }
 
     m_bold->SetIsCheckButton();
-    m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
+    m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
     m_italic->SetIsCheckButton();
-    m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
+    m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
 
     m_separator1->SetIsSeparator();
 
     m_alignLeft->SetIsRadioButton();
-    m_alignLeft->SetBitmap( KiBitmap( BITMAPS::text_align_left ) );
+    m_alignLeft->SetBitmap( KiBitmapBundle( BITMAPS::text_align_left ) );
     m_alignCenter->SetIsRadioButton();
-    m_alignCenter->SetBitmap( KiBitmap( BITMAPS::text_align_center ) );
+    m_alignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_align_center ) );
     m_alignRight->SetIsRadioButton();
-    m_alignRight->SetBitmap( KiBitmap( BITMAPS::text_align_right ) );
+    m_alignRight->SetBitmap( KiBitmapBundle( BITMAPS::text_align_right ) );
 
     m_separator2->SetIsSeparator();
 
     m_valignBottom->SetIsRadioButton();
-    m_valignBottom->SetBitmap( KiBitmap( BITMAPS::text_valign_bottom ) );
+    m_valignBottom->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_bottom ) );
     m_valignCenter->SetIsRadioButton();
-    m_valignCenter->SetBitmap( KiBitmap( BITMAPS::text_valign_center ) );
+    m_valignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_center ) );
     m_valignTop->SetIsRadioButton();
-    m_valignTop->SetBitmap( KiBitmap( BITMAPS::text_valign_top ) );
+    m_valignTop->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_top ) );
 
     m_separator3->SetIsSeparator();
 
     m_mirrored->SetIsCheckButton();
-    m_mirrored->SetBitmap( KiBitmap( BITMAPS::text_mirrored ) );
+    m_mirrored->SetBitmap( KiBitmapBundle( BITMAPS::text_mirrored ) );
 
     SetTitle( title );
     m_hash_key = title;
diff --git a/pcbnew/dialogs/dialog_textbox_properties.cpp b/pcbnew/dialogs/dialog_textbox_properties.cpp
index 32abd86897..ed40ca5dd1 100644
--- a/pcbnew/dialogs/dialog_textbox_properties.cpp
+++ b/pcbnew/dialogs/dialog_textbox_properties.cpp
@@ -87,23 +87,23 @@ DIALOG_TEXTBOX_PROPERTIES::DIALOG_TEXTBOX_PROPERTIES( PCB_BASE_EDIT_FRAME* aPare
     m_separator0->SetIsSeparator();
 
     m_bold->SetIsCheckButton();
-    m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
+    m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
     m_italic->SetIsCheckButton();
-    m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
+    m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
 
     m_separator1->SetIsSeparator();
 
     m_alignLeft->SetIsRadioButton();
-    m_alignLeft->SetBitmap( KiBitmap( BITMAPS::text_align_left ) );
+    m_alignLeft->SetBitmap( KiBitmapBundle( BITMAPS::text_align_left ) );
     m_alignCenter->SetIsRadioButton();
-    m_alignCenter->SetBitmap( KiBitmap( BITMAPS::text_align_center ) );
+    m_alignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_align_center ) );
     m_alignRight->SetIsRadioButton();
-    m_alignRight->SetBitmap( KiBitmap( BITMAPS::text_align_right ) );
+    m_alignRight->SetBitmap( KiBitmapBundle( BITMAPS::text_align_right ) );
 
     m_separator2->SetIsSeparator();
 
     m_mirrored->SetIsCheckButton();
-    m_mirrored->SetBitmap( KiBitmap( BITMAPS::text_mirrored ) );
+    m_mirrored->SetBitmap( KiBitmapBundle( BITMAPS::text_mirrored ) );
 
     m_separator3->SetIsSeparator();
 
diff --git a/pcbnew/dialogs/dialog_track_via_properties.cpp b/pcbnew/dialogs/dialog_track_via_properties.cpp
index fcc3553332..d196fdfa2a 100644
--- a/pcbnew/dialogs/dialog_track_via_properties.cpp
+++ b/pcbnew/dialogs/dialog_track_via_properties.cpp
@@ -63,10 +63,10 @@ DIALOG_TRACK_VIA_PROPERTIES::DIALOG_TRACK_VIA_PROPERTIES( PCB_BASE_FRAME* aParen
 
     wxASSERT( !m_items.Empty() );
 
-    m_legacyTeardropsIcon->SetBitmap( KiBitmap( BITMAPS::dialog_warning ) );
+    m_legacyTeardropsIcon->SetBitmap( KiBitmapBundle( BITMAPS::dialog_warning ) );
     m_legacyTeardropsWarning->Show( m_frame->GetBoard()->LegacyTeardrops() );
 
-    m_bitmapTeardrop->SetBitmap( KiBitmap( BITMAPS::teardrop_sizes ) );
+    m_bitmapTeardrop->SetBitmap( KiBitmapBundle( BITMAPS::teardrop_sizes ) );
 
     m_teardropHDPercent.SetUnits( EDA_UNITS::PERCENT );
     m_teardropLenPercent.SetUnits( EDA_UNITS::PERCENT );
@@ -936,4 +936,4 @@ void DIALOG_TRACK_VIA_PROPERTIES::onCurvedEdgesUpdateUi( wxUpdateUIEvent& event
 {
     event.Enable( !m_frame->GetBoard()->LegacyTeardrops()
                   && m_curvedEdges->Get3StateValue() == wxCHK_CHECKED );
-}
\ No newline at end of file
+}
diff --git a/pcbnew/dialogs/dialog_tuning_pattern_properties.cpp b/pcbnew/dialogs/dialog_tuning_pattern_properties.cpp
index 4202ca37cc..e41d659b21 100644
--- a/pcbnew/dialogs/dialog_tuning_pattern_properties.cpp
+++ b/pcbnew/dialogs/dialog_tuning_pattern_properties.cpp
@@ -44,16 +44,16 @@ DIALOG_TUNING_PATTERN_PROPERTIES::DIALOG_TUNING_PATTERN_PROPERTIES( PCB_BASE_EDI
     switch( m_mode )
     {
     case PNS::PNS_MODE_TUNE_SINGLE:
-        m_legend->SetBitmap( KiBitmap( BITMAPS::tune_single_track_length_legend ) );
+        m_legend->SetBitmap( KiBitmapBundle( BITMAPS::tune_single_track_length_legend ) );
         break;
 
     case PNS::PNS_MODE_TUNE_DIFF_PAIR:
-        m_legend->SetBitmap( KiBitmap( BITMAPS::tune_diff_pair_length_legend ) );
+        m_legend->SetBitmap( KiBitmapBundle( BITMAPS::tune_diff_pair_length_legend ) );
         m_r.Enable( false );
         break;
 
     case PNS::PNS_MODE_TUNE_DIFF_PAIR_SKEW:
-        m_legend->SetBitmap( KiBitmap( BITMAPS::tune_diff_pair_skew_legend ) );
+        m_legend->SetBitmap( KiBitmapBundle( BITMAPS::tune_diff_pair_skew_legend ) );
         m_targetLengthLabel->SetLabel( _( "Target skew: ") );
         break;
 
@@ -141,4 +141,4 @@ void DIALOG_TUNING_PATTERN_PROPERTIES::onOverrideCustomRules( wxCommandEvent& ev
     {
         m_sourceInfo->Show( false );
     }
-}
\ No newline at end of file
+}
diff --git a/pcbnew/dialogs/dialog_unused_pad_layers.cpp b/pcbnew/dialogs/dialog_unused_pad_layers.cpp
index 91dac5039d..dd1888d1ae 100644
--- a/pcbnew/dialogs/dialog_unused_pad_layers.cpp
+++ b/pcbnew/dialogs/dialog_unused_pad_layers.cpp
@@ -41,7 +41,7 @@ DIALOG_UNUSED_PAD_LAYERS::DIALOG_UNUSED_PAD_LAYERS( PCB_BASE_FRAME* aParent,
       m_items( aItems ),
       m_commit( aCommit )
 {
-    m_image->SetBitmap( KiBitmap( BITMAPS::pads_remove_unused ) );
+    m_image->SetBitmap( KiBitmapBundle( BITMAPS::pads_remove_unused ) );
 
     // Set keep Through Hole pads on external layers ON by default.
     // Because such a pad does not allow soldering/unsoldering, disable this option
@@ -62,9 +62,9 @@ DIALOG_UNUSED_PAD_LAYERS::DIALOG_UNUSED_PAD_LAYERS( PCB_BASE_FRAME* aParent,
 void DIALOG_UNUSED_PAD_LAYERS::updateImage()
 {
     if( m_cbPreservePads->IsChecked() )
-        m_image->SetBitmap( KiBitmap( BITMAPS::pads_remove_unused_keep_bottom ) );
+        m_image->SetBitmap( KiBitmapBundle( BITMAPS::pads_remove_unused_keep_bottom ) );
     else
-        m_image->SetBitmap( KiBitmap( BITMAPS::pads_remove_unused ) );
+        m_image->SetBitmap( KiBitmapBundle( BITMAPS::pads_remove_unused ) );
 }
 
 
diff --git a/pcbnew/dialogs/panel_fp_editor_defaults.cpp b/pcbnew/dialogs/panel_fp_editor_defaults.cpp
index 60bc7beddb..f08fd39d3e 100644
--- a/pcbnew/dialogs/panel_fp_editor_defaults.cpp
+++ b/pcbnew/dialogs/panel_fp_editor_defaults.cpp
@@ -304,8 +304,8 @@ bool PANEL_FP_EDITOR_DEFAULTS::Show( bool aShow )
         // These *should* work in the constructor, and indeed they do if this panel is the
         // first displayed.  However, on OSX 3.0.5 (at least), if another panel is displayed
         // first then the icons will be blank unless they're set here.
-        m_bpAdd->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-        m_bpDelete->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+        m_bpAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+        m_bpDelete->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
     }
 
     if( aShow && m_firstShow )
diff --git a/pcbnew/dialogs/panel_fp_lib_table.cpp b/pcbnew/dialogs/panel_fp_lib_table.cpp
index 7f35837fb5..551d80f093 100644
--- a/pcbnew/dialogs/panel_fp_lib_table.cpp
+++ b/pcbnew/dialogs/panel_fp_lib_table.cpp
@@ -388,11 +388,11 @@ PANEL_FP_LIB_TABLE::PANEL_FP_LIB_TABLE( DIALOG_EDIT_LIBRARY_TABLES* aParent, PRO
     m_parent->SetInitialFocus( m_cur_grid );
 
     // Configure button logos
-    m_append_button->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_delete_button->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
-    m_move_up_button->SetBitmap( KiBitmap( BITMAPS::small_up ) );
-    m_move_down_button->SetBitmap( KiBitmap( BITMAPS::small_down ) );
-    m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
+    m_append_button->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_delete_button->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
+    m_move_up_button->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
+    m_move_down_button->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
+    m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
 
     // For aesthetic reasons, we must set the size of m_browseButton to match the other bitmaps
     // manually (for instance m_append_button)
diff --git a/pcbnew/dialogs/panel_fp_properties_3d_model.cpp b/pcbnew/dialogs/panel_fp_properties_3d_model.cpp
index 99bd84968c..137d56bfc3 100644
--- a/pcbnew/dialogs/panel_fp_properties_3d_model.cpp
+++ b/pcbnew/dialogs/panel_fp_properties_3d_model.cpp
@@ -105,9 +105,9 @@ PANEL_FP_PROPERTIES_3D_MODEL::PANEL_FP_PROPERTIES_3D_MODEL(
     m_LowerSizer3D->Add( m_previewPane, 1, wxEXPAND, 5 );
 
     // Configure button logos
-    m_button3DShapeAdd->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_button3DShapeBrowse->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
-    m_button3DShapeRemove->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_button3DShapeAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_button3DShapeBrowse->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
+    m_button3DShapeRemove->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
 }
 
 
diff --git a/pcbnew/dialogs/panel_pcbnew_action_plugins.cpp b/pcbnew/dialogs/panel_pcbnew_action_plugins.cpp
index 15772b050b..d8f73f48f1 100644
--- a/pcbnew/dialogs/panel_pcbnew_action_plugins.cpp
+++ b/pcbnew/dialogs/panel_pcbnew_action_plugins.cpp
@@ -42,11 +42,11 @@ PANEL_PCBNEW_ACTION_PLUGINS::PANEL_PCBNEW_ACTION_PLUGINS( wxWindow* aParent ) :
     m_genericIcon = KiBitmap( BITMAPS::puzzle_piece );
     m_grid->PushEventHandler( new GRID_TRICKS( m_grid ) );
 
-    m_moveUpButton->SetBitmap( KiBitmap( BITMAPS::small_up ) );
-    m_moveDownButton->SetBitmap( KiBitmap( BITMAPS::small_down ) );
-    m_openDirectoryButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
-    m_reloadButton->SetBitmap( KiBitmap( BITMAPS::small_refresh ) );
-    m_showErrorsButton->SetBitmap( KiBitmap( BITMAPS::small_warning ) );
+    m_moveUpButton->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
+    m_moveDownButton->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
+    m_openDirectoryButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
+    m_reloadButton->SetBitmap( KiBitmapBundle( BITMAPS::small_refresh ) );
+    m_showErrorsButton->SetBitmap( KiBitmapBundle( BITMAPS::small_warning ) );
 }
 
 
diff --git a/pcbnew/dialogs/panel_setup_constraints.cpp b/pcbnew/dialogs/panel_setup_constraints.cpp
index f5a7b567d9..d8451a263d 100644
--- a/pcbnew/dialogs/panel_setup_constraints.cpp
+++ b/pcbnew/dialogs/panel_setup_constraints.cpp
@@ -53,19 +53,19 @@ PANEL_SETUP_CONSTRAINTS::PANEL_SETUP_CONSTRAINTS( wxWindow* aParentWindow, PCB_E
     m_Frame = aFrame;
     m_BrdSettings = &m_Frame->GetBoard()->GetDesignSettings();
 
-    m_filletBitmap->SetBitmap( KiBitmap( BITMAPS::zone_fillet ) );
-    m_spokeBitmap->SetBitmap( KiBitmap( BITMAPS::thermal_spokes ) );
-    m_bitmapClearance->SetBitmap( KiBitmap( BITMAPS::ps_diff_pair_gap ) );
-    m_bitmapMinTrackWidth->SetBitmap( KiBitmap( BITMAPS::width_track ) );
-    m_bitmapMinConn->SetBitmap( KiBitmap( BITMAPS::width_conn ) );
-    m_bitmapMinViaAnnulus->SetBitmap( KiBitmap( BITMAPS::via_annulus ) );
-    m_bitmapMinViaDiameter->SetBitmap( KiBitmap( BITMAPS::via_diameter ) );
-    m_bitmapMinViaDrill->SetBitmap( KiBitmap( BITMAPS::via_hole_diameter ) );
-    m_bitmapMinuViaDiameter->SetBitmap( KiBitmap( BITMAPS::via_diameter ) );
-    m_bitmapMinuViaDrill->SetBitmap( KiBitmap( BITMAPS::via_hole_diameter ) );
-    m_bitmapHoleClearance->SetBitmap( KiBitmap( BITMAPS::hole_to_copper_clearance ) );
-    m_bitmapMinHoleClearance->SetBitmap( KiBitmap( BITMAPS::hole_to_hole_clearance ) );
-    m_bitmapEdgeClearance->SetBitmap( KiBitmap( BITMAPS::edge_to_copper_clearance ) );
+    m_filletBitmap->SetBitmap( KiBitmapBundle( BITMAPS::zone_fillet ) );
+    m_spokeBitmap->SetBitmap( KiBitmapBundle( BITMAPS::thermal_spokes ) );
+    m_bitmapClearance->SetBitmap( KiBitmapBundle( BITMAPS::ps_diff_pair_gap ) );
+    m_bitmapMinTrackWidth->SetBitmap( KiBitmapBundle( BITMAPS::width_track ) );
+    m_bitmapMinConn->SetBitmap( KiBitmapBundle( BITMAPS::width_conn ) );
+    m_bitmapMinViaAnnulus->SetBitmap( KiBitmapBundle( BITMAPS::via_annulus ) );
+    m_bitmapMinViaDiameter->SetBitmap( KiBitmapBundle( BITMAPS::via_diameter ) );
+    m_bitmapMinViaDrill->SetBitmap( KiBitmapBundle( BITMAPS::via_hole_diameter ) );
+    m_bitmapMinuViaDiameter->SetBitmap( KiBitmapBundle( BITMAPS::via_diameter ) );
+    m_bitmapMinuViaDrill->SetBitmap( KiBitmapBundle( BITMAPS::via_hole_diameter ) );
+    m_bitmapHoleClearance->SetBitmap( KiBitmapBundle( BITMAPS::hole_to_copper_clearance ) );
+    m_bitmapMinHoleClearance->SetBitmap( KiBitmapBundle( BITMAPS::hole_to_hole_clearance ) );
+    m_bitmapEdgeClearance->SetBitmap( KiBitmapBundle( BITMAPS::edge_to_copper_clearance ) );
 
     m_stCircleToPolyWarning->SetFont( KIUI::GetInfoFont( this ) );
 
diff --git a/pcbnew/dialogs/panel_setup_rules.cpp b/pcbnew/dialogs/panel_setup_rules.cpp
index 1fdac35ec2..929372cc38 100644
--- a/pcbnew/dialogs/panel_setup_rules.cpp
+++ b/pcbnew/dialogs/panel_setup_rules.cpp
@@ -64,7 +64,7 @@ PANEL_SETUP_RULES::PANEL_SETUP_RULES( wxWindow* aParentWindow, PCB_EDIT_FRAME* a
     m_shapeRegex.Compile( "^Shape\\s*[!=]=\\s*$", wxRE_ADVANCED );
     m_zoneConnStyleRegex.Compile( "^Zone_Connection_Style\\s*[!=]=\\s*$", wxRE_ADVANCED );
 
-    m_compileButton->SetBitmap( KiBitmap( BITMAPS::drc ) );
+    m_compileButton->SetBitmap( KiBitmapBundle( BITMAPS::drc ) );
 
     m_textEditor->SetZoom( Pgm().GetCommonSettings()->m_Appearance.text_editor_zoom );
 
diff --git a/pcbnew/dialogs/panel_setup_teardrops.cpp b/pcbnew/dialogs/panel_setup_teardrops.cpp
index 79edeee49b..ab143532c5 100644
--- a/pcbnew/dialogs/panel_setup_teardrops.cpp
+++ b/pcbnew/dialogs/panel_setup_teardrops.cpp
@@ -38,9 +38,9 @@ PANEL_SETUP_TEARDROPS::PANEL_SETUP_TEARDROPS( wxWindow* aParentWindow, PCB_EDIT_
         m_teardropMaxLenTrack( aFrame, m_stMaxLen2, m_tcTdMaxLen2, m_stMaxLenUnits2 ),
         m_teardropMaxHeightTrack( aFrame, m_stTdMaxSize2, m_tcMaxHeight2, m_stMaxHeightUnits2 )
 {
-    m_bitmapTeardrop->SetBitmap( KiBitmap( BITMAPS::teardrop_sizes ) );
-    m_bitmapTeardrop1->SetBitmap( KiBitmap( BITMAPS::teardrop_rect_sizes ) );
-    m_bitmapTeardrop2->SetBitmap( KiBitmap( BITMAPS::teardrop_track_sizes ) );
+    m_bitmapTeardrop->SetBitmap( KiBitmapBundle( BITMAPS::teardrop_sizes ) );
+    m_bitmapTeardrop1->SetBitmap( KiBitmapBundle( BITMAPS::teardrop_rect_sizes ) );
+    m_bitmapTeardrop2->SetBitmap( KiBitmapBundle( BITMAPS::teardrop_track_sizes ) );
 
     wxFont infoFont = KIUI::GetInfoFont( this ).Italic();
     m_minTrackWidthHint->SetFont( infoFont );
diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias.cpp b/pcbnew/dialogs/panel_setup_tracks_and_vias.cpp
index 4397ebe433..8d3d23ea9a 100644
--- a/pcbnew/dialogs/panel_setup_tracks_and_vias.cpp
+++ b/pcbnew/dialogs/panel_setup_tracks_and_vias.cpp
@@ -59,15 +59,15 @@ PANEL_SETUP_TRACKS_AND_VIAS::PANEL_SETUP_TRACKS_AND_VIAS( wxWindow* aParentWindo
     m_Pcb = m_Frame->GetBoard();
     m_BrdSettings = &m_Pcb->GetDesignSettings();
 
-    m_trackWidthsAddButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_trackWidthsSortButton->SetBitmap( KiBitmap( BITMAPS::small_sort_desc ) );
-    m_trackWidthsRemoveButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
-    m_viaSizesAddButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_viaSizesSortButton->SetBitmap( KiBitmap( BITMAPS::small_sort_desc ) );
-    m_viaSizesRemoveButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
-    m_diffPairsAddButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
-    m_diffPairsSortButton->SetBitmap( KiBitmap( BITMAPS::small_sort_desc ) );
-    m_diffPairsRemoveButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_trackWidthsAddButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_trackWidthsSortButton->SetBitmap( KiBitmapBundle( BITMAPS::small_sort_desc ) );
+    m_trackWidthsRemoveButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
+    m_viaSizesAddButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_viaSizesSortButton->SetBitmap( KiBitmapBundle( BITMAPS::small_sort_desc ) );
+    m_viaSizesRemoveButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
+    m_diffPairsAddButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
+    m_diffPairsSortButton->SetBitmap( KiBitmapBundle( BITMAPS::small_sort_desc ) );
+    m_diffPairsRemoveButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
 
     // Membership combobox editors require a bit more room, so increase the row size of
     // all our grids for consistency
diff --git a/pcbnew/dialogs/panel_setup_tuning_patterns.cpp b/pcbnew/dialogs/panel_setup_tuning_patterns.cpp
index c0f64d43b8..9bcd1356a1 100644
--- a/pcbnew/dialogs/panel_setup_tuning_patterns.cpp
+++ b/pcbnew/dialogs/panel_setup_tuning_patterns.cpp
@@ -44,9 +44,9 @@ PANEL_SETUP_TUNING_PATTERNS::PANEL_SETUP_TUNING_PATTERNS( wxWindow* aParent, EDA
         m_dpSettings( aDiffPairSettings ),
         m_skewSettings( aSkewSettings )
 {
-    m_singleTrackLegend->SetBitmap( KiBitmap( BITMAPS::tune_single_track_length_legend ) );
-    m_diffPairLegend->SetBitmap( KiBitmap( BITMAPS::tune_diff_pair_length_legend ) );
-    m_skewLegend->SetBitmap( KiBitmap( BITMAPS::tune_diff_pair_skew_legend ) );
+    m_singleTrackLegend->SetBitmap( KiBitmapBundle( BITMAPS::tune_single_track_length_legend ) );
+    m_diffPairLegend->SetBitmap( KiBitmapBundle( BITMAPS::tune_diff_pair_length_legend ) );
+    m_skewLegend->SetBitmap( KiBitmapBundle( BITMAPS::tune_diff_pair_skew_legend ) );
 
     m_track_r.SetUnits( EDA_UNITS::PERCENT );
     m_dp_r.SetUnits( EDA_UNITS::PERCENT );
diff --git a/pcbnew/import_gfx/dialog_import_graphics.cpp b/pcbnew/import_gfx/dialog_import_graphics.cpp
index 55980b90fa..e904494c43 100644
--- a/pcbnew/import_gfx/dialog_import_graphics.cpp
+++ b/pcbnew/import_gfx/dialog_import_graphics.cpp
@@ -101,7 +101,7 @@ DIALOG_IMPORT_GRAPHICS::DIALOG_IMPORT_GRAPHICS( PCB_BASE_FRAME* aParent ) :
 
     m_dxfUnitsChoice->SetSelection( cfg->m_ImportGraphics.dxf_units );
 
-    m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
+    m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
 
     wxCommandEvent dummy;
     onFilename( dummy );
diff --git a/pcbnew/widgets/appearance_controls.cpp b/pcbnew/widgets/appearance_controls.cpp
index 180c2b8e03..5b9705e3ee 100644
--- a/pcbnew/widgets/appearance_controls.cpp
+++ b/pcbnew/widgets/appearance_controls.cpp
@@ -451,10 +451,10 @@ APPEARANCE_CONTROLS::APPEARANCE_CONTROLS( PCB_BASE_FRAME* aParent, wxWindow* aFo
 
     createControls();
 
-    m_btnNetInspector->SetBitmap( KiBitmap( BITMAPS::list_nets_16 ) );
+    m_btnNetInspector->SetBitmap( KiBitmapBundle( BITMAPS::list_nets_16 ) );
     m_btnNetInspector->SetPadding( 2 );
 
-    m_btnConfigureNetClasses->SetBitmap( KiBitmap( BITMAPS::options_generic_16 ) );
+    m_btnConfigureNetClasses->SetBitmap( KiBitmapBundle( BITMAPS::options_generic_16 ) );
     m_btnConfigureNetClasses->SetPadding( 2 );
 
     m_txtNetFilter->SetHint( _( "Filter nets" ) );
diff --git a/resources/bitmaps_png/CMakeLists.txt b/resources/bitmaps_png/CMakeLists.txt
index 1a41fe81a4..373a00f269 100644
--- a/resources/bitmaps_png/CMakeLists.txt
+++ b/resources/bitmaps_png/CMakeLists.txt
@@ -898,8 +898,10 @@ if( MAINTAIN_PNGS )
 
     # these 3 cmake commands for each desired bitmap size set, repeat as needed:
     bitmap_dir( 16 16 "${BMAPS_SMALL}" )
+    bitmap_dir( 32 32 "${BMAPS_SMALL}" )    # 2x HiDPI
 
     bitmap_dir( 24 24 "${BMAPS_MID}" )
+    bitmap_dir( 48 48 "${BMAPS_MID}" )    # 2x HiDPI
 
     bitmap_dir( 32 32 "${BMAPS_32}" )
 
diff --git a/resources/bitmaps_png/png/about_48.png b/resources/bitmaps_png/png/about_48.png
new file mode 100644
index 0000000000..0b6290a65a
Binary files /dev/null and b/resources/bitmaps_png/png/about_48.png differ
diff --git a/resources/bitmaps_png/png/about_dark_48.png b/resources/bitmaps_png/png/about_dark_48.png
new file mode 100644
index 0000000000..5c56232ee2
Binary files /dev/null and b/resources/bitmaps_png/png/about_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_aligned_dimension_48.png b/resources/bitmaps_png/png/add_aligned_dimension_48.png
new file mode 100644
index 0000000000..38304c4388
Binary files /dev/null and b/resources/bitmaps_png/png/add_aligned_dimension_48.png differ
diff --git a/resources/bitmaps_png/png/add_aligned_dimension_dark_48.png b/resources/bitmaps_png/png/add_aligned_dimension_dark_48.png
new file mode 100644
index 0000000000..8bb88f9e27
Binary files /dev/null and b/resources/bitmaps_png/png/add_aligned_dimension_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_arc_48.png b/resources/bitmaps_png/png/add_arc_48.png
new file mode 100644
index 0000000000..5c07654174
Binary files /dev/null and b/resources/bitmaps_png/png/add_arc_48.png differ
diff --git a/resources/bitmaps_png/png/add_arc_dark_48.png b/resources/bitmaps_png/png/add_arc_dark_48.png
new file mode 100644
index 0000000000..0ce73f818f
Binary files /dev/null and b/resources/bitmaps_png/png/add_arc_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_board_48.png b/resources/bitmaps_png/png/add_board_48.png
new file mode 100644
index 0000000000..c8a76dc07b
Binary files /dev/null and b/resources/bitmaps_png/png/add_board_48.png differ
diff --git a/resources/bitmaps_png/png/add_board_dark_48.png b/resources/bitmaps_png/png/add_board_dark_48.png
new file mode 100644
index 0000000000..68969573b4
Binary files /dev/null and b/resources/bitmaps_png/png/add_board_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_bus2bus_48.png b/resources/bitmaps_png/png/add_bus2bus_48.png
new file mode 100644
index 0000000000..e1ab153d1f
Binary files /dev/null and b/resources/bitmaps_png/png/add_bus2bus_48.png differ
diff --git a/resources/bitmaps_png/png/add_bus2bus_dark_48.png b/resources/bitmaps_png/png/add_bus2bus_dark_48.png
new file mode 100644
index 0000000000..e1ab153d1f
Binary files /dev/null and b/resources/bitmaps_png/png/add_bus2bus_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_bus_48.png b/resources/bitmaps_png/png/add_bus_48.png
new file mode 100644
index 0000000000..efd11ba55c
Binary files /dev/null and b/resources/bitmaps_png/png/add_bus_48.png differ
diff --git a/resources/bitmaps_png/png/add_bus_dark_48.png b/resources/bitmaps_png/png/add_bus_dark_48.png
new file mode 100644
index 0000000000..76489ae732
Binary files /dev/null and b/resources/bitmaps_png/png/add_bus_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_center_dimension_48.png b/resources/bitmaps_png/png/add_center_dimension_48.png
new file mode 100644
index 0000000000..713eabacfc
Binary files /dev/null and b/resources/bitmaps_png/png/add_center_dimension_48.png differ
diff --git a/resources/bitmaps_png/png/add_center_dimension_dark_48.png b/resources/bitmaps_png/png/add_center_dimension_dark_48.png
new file mode 100644
index 0000000000..3d21a22e20
Binary files /dev/null and b/resources/bitmaps_png/png/add_center_dimension_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_circle_48.png b/resources/bitmaps_png/png/add_circle_48.png
new file mode 100644
index 0000000000..e88d58b7c5
Binary files /dev/null and b/resources/bitmaps_png/png/add_circle_48.png differ
diff --git a/resources/bitmaps_png/png/add_circle_dark_48.png b/resources/bitmaps_png/png/add_circle_dark_48.png
new file mode 100644
index 0000000000..cfe2541286
Binary files /dev/null and b/resources/bitmaps_png/png/add_circle_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_class_flag_48.png b/resources/bitmaps_png/png/add_class_flag_48.png
new file mode 100644
index 0000000000..56505722c8
Binary files /dev/null and b/resources/bitmaps_png/png/add_class_flag_48.png differ
diff --git a/resources/bitmaps_png/png/add_class_flag_dark_48.png b/resources/bitmaps_png/png/add_class_flag_dark_48.png
new file mode 100644
index 0000000000..5384a4a020
Binary files /dev/null and b/resources/bitmaps_png/png/add_class_flag_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_component_48.png b/resources/bitmaps_png/png/add_component_48.png
new file mode 100644
index 0000000000..6c813bf93b
Binary files /dev/null and b/resources/bitmaps_png/png/add_component_48.png differ
diff --git a/resources/bitmaps_png/png/add_component_dark_48.png b/resources/bitmaps_png/png/add_component_dark_48.png
new file mode 100644
index 0000000000..67c18d7eb2
Binary files /dev/null and b/resources/bitmaps_png/png/add_component_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_corner_48.png b/resources/bitmaps_png/png/add_corner_48.png
new file mode 100644
index 0000000000..ec434daf08
Binary files /dev/null and b/resources/bitmaps_png/png/add_corner_48.png differ
diff --git a/resources/bitmaps_png/png/add_corner_dark_48.png b/resources/bitmaps_png/png/add_corner_dark_48.png
new file mode 100644
index 0000000000..524c959be5
Binary files /dev/null and b/resources/bitmaps_png/png/add_corner_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_dashed_line_48.png b/resources/bitmaps_png/png/add_dashed_line_48.png
new file mode 100644
index 0000000000..f2afdadd01
Binary files /dev/null and b/resources/bitmaps_png/png/add_dashed_line_48.png differ
diff --git a/resources/bitmaps_png/png/add_dashed_line_dark_48.png b/resources/bitmaps_png/png/add_dashed_line_dark_48.png
new file mode 100644
index 0000000000..31c2c9587e
Binary files /dev/null and b/resources/bitmaps_png/png/add_dashed_line_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_document_48.png b/resources/bitmaps_png/png/add_document_48.png
new file mode 100644
index 0000000000..1af39b9386
Binary files /dev/null and b/resources/bitmaps_png/png/add_document_48.png differ
diff --git a/resources/bitmaps_png/png/add_document_dark_48.png b/resources/bitmaps_png/png/add_document_dark_48.png
new file mode 100644
index 0000000000..6ace9494d9
Binary files /dev/null and b/resources/bitmaps_png/png/add_document_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_glabel_48.png b/resources/bitmaps_png/png/add_glabel_48.png
new file mode 100644
index 0000000000..1ceb7fecec
Binary files /dev/null and b/resources/bitmaps_png/png/add_glabel_48.png differ
diff --git a/resources/bitmaps_png/png/add_glabel_dark_48.png b/resources/bitmaps_png/png/add_glabel_dark_48.png
new file mode 100644
index 0000000000..b862602e90
Binary files /dev/null and b/resources/bitmaps_png/png/add_glabel_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_graphical_polygon_48.png b/resources/bitmaps_png/png/add_graphical_polygon_48.png
new file mode 100644
index 0000000000..6af510d7e4
Binary files /dev/null and b/resources/bitmaps_png/png/add_graphical_polygon_48.png differ
diff --git a/resources/bitmaps_png/png/add_graphical_polygon_dark_48.png b/resources/bitmaps_png/png/add_graphical_polygon_dark_48.png
new file mode 100644
index 0000000000..2a0921ab0b
Binary files /dev/null and b/resources/bitmaps_png/png/add_graphical_polygon_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_graphical_segments_48.png b/resources/bitmaps_png/png/add_graphical_segments_48.png
new file mode 100644
index 0000000000..0c5d93c0bf
Binary files /dev/null and b/resources/bitmaps_png/png/add_graphical_segments_48.png differ
diff --git a/resources/bitmaps_png/png/add_graphical_segments_dark_48.png b/resources/bitmaps_png/png/add_graphical_segments_dark_48.png
new file mode 100644
index 0000000000..09681ae874
Binary files /dev/null and b/resources/bitmaps_png/png/add_graphical_segments_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_hierar_pin_48.png b/resources/bitmaps_png/png/add_hierar_pin_48.png
new file mode 100644
index 0000000000..a2e96dfa82
Binary files /dev/null and b/resources/bitmaps_png/png/add_hierar_pin_48.png differ
diff --git a/resources/bitmaps_png/png/add_hierar_pin_dark_48.png b/resources/bitmaps_png/png/add_hierar_pin_dark_48.png
new file mode 100644
index 0000000000..4856e63d52
Binary files /dev/null and b/resources/bitmaps_png/png/add_hierar_pin_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_hierarchical_label_48.png b/resources/bitmaps_png/png/add_hierarchical_label_48.png
new file mode 100644
index 0000000000..6870982b1e
Binary files /dev/null and b/resources/bitmaps_png/png/add_hierarchical_label_48.png differ
diff --git a/resources/bitmaps_png/png/add_hierarchical_label_dark_48.png b/resources/bitmaps_png/png/add_hierarchical_label_dark_48.png
new file mode 100644
index 0000000000..714eecfa95
Binary files /dev/null and b/resources/bitmaps_png/png/add_hierarchical_label_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_hierarchical_subsheet_48.png b/resources/bitmaps_png/png/add_hierarchical_subsheet_48.png
new file mode 100644
index 0000000000..a6df841f6f
Binary files /dev/null and b/resources/bitmaps_png/png/add_hierarchical_subsheet_48.png differ
diff --git a/resources/bitmaps_png/png/add_hierarchical_subsheet_dark_48.png b/resources/bitmaps_png/png/add_hierarchical_subsheet_dark_48.png
new file mode 100644
index 0000000000..2965b15946
Binary files /dev/null and b/resources/bitmaps_png/png/add_hierarchical_subsheet_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_junction_48.png b/resources/bitmaps_png/png/add_junction_48.png
new file mode 100644
index 0000000000..b67fcb070b
Binary files /dev/null and b/resources/bitmaps_png/png/add_junction_48.png differ
diff --git a/resources/bitmaps_png/png/add_junction_dark_48.png b/resources/bitmaps_png/png/add_junction_dark_48.png
new file mode 100644
index 0000000000..08f3cf13c7
Binary files /dev/null and b/resources/bitmaps_png/png/add_junction_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_keepout_area_48.png b/resources/bitmaps_png/png/add_keepout_area_48.png
new file mode 100644
index 0000000000..8661d79e10
Binary files /dev/null and b/resources/bitmaps_png/png/add_keepout_area_48.png differ
diff --git a/resources/bitmaps_png/png/add_keepout_area_dark_48.png b/resources/bitmaps_png/png/add_keepout_area_dark_48.png
new file mode 100644
index 0000000000..8de945f029
Binary files /dev/null and b/resources/bitmaps_png/png/add_keepout_area_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_label_48.png b/resources/bitmaps_png/png/add_label_48.png
new file mode 100644
index 0000000000..8bb7cbf2e0
Binary files /dev/null and b/resources/bitmaps_png/png/add_label_48.png differ
diff --git a/resources/bitmaps_png/png/add_label_dark_48.png b/resources/bitmaps_png/png/add_label_dark_48.png
new file mode 100644
index 0000000000..c39db18bd7
Binary files /dev/null and b/resources/bitmaps_png/png/add_label_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_leader_48.png b/resources/bitmaps_png/png/add_leader_48.png
new file mode 100644
index 0000000000..aa23bd2e7c
Binary files /dev/null and b/resources/bitmaps_png/png/add_leader_48.png differ
diff --git a/resources/bitmaps_png/png/add_leader_dark_48.png b/resources/bitmaps_png/png/add_leader_dark_48.png
new file mode 100644
index 0000000000..2b49edb084
Binary files /dev/null and b/resources/bitmaps_png/png/add_leader_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_library_48.png b/resources/bitmaps_png/png/add_library_48.png
new file mode 100644
index 0000000000..33d8f746b2
Binary files /dev/null and b/resources/bitmaps_png/png/add_library_48.png differ
diff --git a/resources/bitmaps_png/png/add_library_dark_48.png b/resources/bitmaps_png/png/add_library_dark_48.png
new file mode 100644
index 0000000000..94c385082d
Binary files /dev/null and b/resources/bitmaps_png/png/add_library_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_line2bus_48.png b/resources/bitmaps_png/png/add_line2bus_48.png
new file mode 100644
index 0000000000..e6f27af780
Binary files /dev/null and b/resources/bitmaps_png/png/add_line2bus_48.png differ
diff --git a/resources/bitmaps_png/png/add_line2bus_dark_48.png b/resources/bitmaps_png/png/add_line2bus_dark_48.png
new file mode 100644
index 0000000000..fc3118b113
Binary files /dev/null and b/resources/bitmaps_png/png/add_line2bus_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_line_48.png b/resources/bitmaps_png/png/add_line_48.png
new file mode 100644
index 0000000000..c8558b2f28
Binary files /dev/null and b/resources/bitmaps_png/png/add_line_48.png differ
diff --git a/resources/bitmaps_png/png/add_line_dark_48.png b/resources/bitmaps_png/png/add_line_dark_48.png
new file mode 100644
index 0000000000..09681ae874
Binary files /dev/null and b/resources/bitmaps_png/png/add_line_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_line_label_48.png b/resources/bitmaps_png/png/add_line_label_48.png
new file mode 100644
index 0000000000..67d249f244
Binary files /dev/null and b/resources/bitmaps_png/png/add_line_label_48.png differ
diff --git a/resources/bitmaps_png/png/add_line_label_dark_48.png b/resources/bitmaps_png/png/add_line_label_dark_48.png
new file mode 100644
index 0000000000..a48b5e26be
Binary files /dev/null and b/resources/bitmaps_png/png/add_line_label_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_orthogonal_dimension_48.png b/resources/bitmaps_png/png/add_orthogonal_dimension_48.png
new file mode 100644
index 0000000000..b180b6c6a4
Binary files /dev/null and b/resources/bitmaps_png/png/add_orthogonal_dimension_48.png differ
diff --git a/resources/bitmaps_png/png/add_orthogonal_dimension_dark_48.png b/resources/bitmaps_png/png/add_orthogonal_dimension_dark_48.png
new file mode 100644
index 0000000000..73ca291e77
Binary files /dev/null and b/resources/bitmaps_png/png/add_orthogonal_dimension_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_pcb_target_48.png b/resources/bitmaps_png/png/add_pcb_target_48.png
new file mode 100644
index 0000000000..a9b834dddf
Binary files /dev/null and b/resources/bitmaps_png/png/add_pcb_target_48.png differ
diff --git a/resources/bitmaps_png/png/add_pcb_target_dark_48.png b/resources/bitmaps_png/png/add_pcb_target_dark_48.png
new file mode 100644
index 0000000000..46d1337c13
Binary files /dev/null and b/resources/bitmaps_png/png/add_pcb_target_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_power_48.png b/resources/bitmaps_png/png/add_power_48.png
new file mode 100644
index 0000000000..79ac8ca4dc
Binary files /dev/null and b/resources/bitmaps_png/png/add_power_48.png differ
diff --git a/resources/bitmaps_png/png/add_power_dark_48.png b/resources/bitmaps_png/png/add_power_dark_48.png
new file mode 100644
index 0000000000..8a68546f67
Binary files /dev/null and b/resources/bitmaps_png/png/add_power_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_radial_dimension_48.png b/resources/bitmaps_png/png/add_radial_dimension_48.png
new file mode 100644
index 0000000000..bb6e212d8d
Binary files /dev/null and b/resources/bitmaps_png/png/add_radial_dimension_48.png differ
diff --git a/resources/bitmaps_png/png/add_radial_dimension_dark_48.png b/resources/bitmaps_png/png/add_radial_dimension_dark_48.png
new file mode 100644
index 0000000000..24b1293675
Binary files /dev/null and b/resources/bitmaps_png/png/add_radial_dimension_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_rectangle_48.png b/resources/bitmaps_png/png/add_rectangle_48.png
new file mode 100644
index 0000000000..80be5b830a
Binary files /dev/null and b/resources/bitmaps_png/png/add_rectangle_48.png differ
diff --git a/resources/bitmaps_png/png/add_rectangle_dark_48.png b/resources/bitmaps_png/png/add_rectangle_dark_48.png
new file mode 100644
index 0000000000..f9dce56ae9
Binary files /dev/null and b/resources/bitmaps_png/png/add_rectangle_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_symbol_to_schematic_48.png b/resources/bitmaps_png/png/add_symbol_to_schematic_48.png
new file mode 100644
index 0000000000..b633fa9906
Binary files /dev/null and b/resources/bitmaps_png/png/add_symbol_to_schematic_48.png differ
diff --git a/resources/bitmaps_png/png/add_symbol_to_schematic_dark_48.png b/resources/bitmaps_png/png/add_symbol_to_schematic_dark_48.png
new file mode 100644
index 0000000000..52d3f13b50
Binary files /dev/null and b/resources/bitmaps_png/png/add_symbol_to_schematic_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_textbox_48.png b/resources/bitmaps_png/png/add_textbox_48.png
new file mode 100644
index 0000000000..8f4b4a2cc7
Binary files /dev/null and b/resources/bitmaps_png/png/add_textbox_48.png differ
diff --git a/resources/bitmaps_png/png/add_tracks_48.png b/resources/bitmaps_png/png/add_tracks_48.png
new file mode 100644
index 0000000000..7d964882f0
Binary files /dev/null and b/resources/bitmaps_png/png/add_tracks_48.png differ
diff --git a/resources/bitmaps_png/png/add_tracks_dark_48.png b/resources/bitmaps_png/png/add_tracks_dark_48.png
new file mode 100644
index 0000000000..f032f13f80
Binary files /dev/null and b/resources/bitmaps_png/png/add_tracks_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_via_48.png b/resources/bitmaps_png/png/add_via_48.png
new file mode 100644
index 0000000000..5e33fa0c6e
Binary files /dev/null and b/resources/bitmaps_png/png/add_via_48.png differ
diff --git a/resources/bitmaps_png/png/add_via_dark_48.png b/resources/bitmaps_png/png/add_via_dark_48.png
new file mode 100644
index 0000000000..c2a452cc76
Binary files /dev/null and b/resources/bitmaps_png/png/add_via_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_zone_48.png b/resources/bitmaps_png/png/add_zone_48.png
new file mode 100644
index 0000000000..b817c0ff53
Binary files /dev/null and b/resources/bitmaps_png/png/add_zone_48.png differ
diff --git a/resources/bitmaps_png/png/add_zone_cutout_48.png b/resources/bitmaps_png/png/add_zone_cutout_48.png
new file mode 100644
index 0000000000..8cb554d8f7
Binary files /dev/null and b/resources/bitmaps_png/png/add_zone_cutout_48.png differ
diff --git a/resources/bitmaps_png/png/add_zone_cutout_dark_48.png b/resources/bitmaps_png/png/add_zone_cutout_dark_48.png
new file mode 100644
index 0000000000..42f89a5412
Binary files /dev/null and b/resources/bitmaps_png/png/add_zone_cutout_dark_48.png differ
diff --git a/resources/bitmaps_png/png/add_zone_dark_48.png b/resources/bitmaps_png/png/add_zone_dark_48.png
new file mode 100644
index 0000000000..05040e92a6
Binary files /dev/null and b/resources/bitmaps_png/png/add_zone_dark_48.png differ
diff --git a/resources/bitmaps_png/png/align_items_48.png b/resources/bitmaps_png/png/align_items_48.png
new file mode 100644
index 0000000000..64796b65d4
Binary files /dev/null and b/resources/bitmaps_png/png/align_items_48.png differ
diff --git a/resources/bitmaps_png/png/align_items_bottom_48.png b/resources/bitmaps_png/png/align_items_bottom_48.png
new file mode 100644
index 0000000000..a1ae846981
Binary files /dev/null and b/resources/bitmaps_png/png/align_items_bottom_48.png differ
diff --git a/resources/bitmaps_png/png/align_items_bottom_dark_48.png b/resources/bitmaps_png/png/align_items_bottom_dark_48.png
new file mode 100644
index 0000000000..1ee427a184
Binary files /dev/null and b/resources/bitmaps_png/png/align_items_bottom_dark_48.png differ
diff --git a/resources/bitmaps_png/png/align_items_center_48.png b/resources/bitmaps_png/png/align_items_center_48.png
new file mode 100644
index 0000000000..4c4a5fe308
Binary files /dev/null and b/resources/bitmaps_png/png/align_items_center_48.png differ
diff --git a/resources/bitmaps_png/png/align_items_center_dark_48.png b/resources/bitmaps_png/png/align_items_center_dark_48.png
new file mode 100644
index 0000000000..ae0deed657
Binary files /dev/null and b/resources/bitmaps_png/png/align_items_center_dark_48.png differ
diff --git a/resources/bitmaps_png/png/align_items_dark_48.png b/resources/bitmaps_png/png/align_items_dark_48.png
new file mode 100644
index 0000000000..3478736351
Binary files /dev/null and b/resources/bitmaps_png/png/align_items_dark_48.png differ
diff --git a/resources/bitmaps_png/png/align_items_left_48.png b/resources/bitmaps_png/png/align_items_left_48.png
new file mode 100644
index 0000000000..8194f716f9
Binary files /dev/null and b/resources/bitmaps_png/png/align_items_left_48.png differ
diff --git a/resources/bitmaps_png/png/align_items_left_dark_48.png b/resources/bitmaps_png/png/align_items_left_dark_48.png
new file mode 100644
index 0000000000..c1e46d1f6e
Binary files /dev/null and b/resources/bitmaps_png/png/align_items_left_dark_48.png differ
diff --git a/resources/bitmaps_png/png/align_items_middle_48.png b/resources/bitmaps_png/png/align_items_middle_48.png
new file mode 100644
index 0000000000..5108e7ff36
Binary files /dev/null and b/resources/bitmaps_png/png/align_items_middle_48.png differ
diff --git a/resources/bitmaps_png/png/align_items_middle_dark_48.png b/resources/bitmaps_png/png/align_items_middle_dark_48.png
new file mode 100644
index 0000000000..dc9affbcbf
Binary files /dev/null and b/resources/bitmaps_png/png/align_items_middle_dark_48.png differ
diff --git a/resources/bitmaps_png/png/align_items_right_48.png b/resources/bitmaps_png/png/align_items_right_48.png
new file mode 100644
index 0000000000..8483a7157b
Binary files /dev/null and b/resources/bitmaps_png/png/align_items_right_48.png differ
diff --git a/resources/bitmaps_png/png/align_items_right_dark_48.png b/resources/bitmaps_png/png/align_items_right_dark_48.png
new file mode 100644
index 0000000000..b484c97f5c
Binary files /dev/null and b/resources/bitmaps_png/png/align_items_right_dark_48.png differ
diff --git a/resources/bitmaps_png/png/align_items_top_48.png b/resources/bitmaps_png/png/align_items_top_48.png
new file mode 100644
index 0000000000..020a45bc31
Binary files /dev/null and b/resources/bitmaps_png/png/align_items_top_48.png differ
diff --git a/resources/bitmaps_png/png/align_items_top_dark_48.png b/resources/bitmaps_png/png/align_items_top_dark_48.png
new file mode 100644
index 0000000000..31424f4de0
Binary files /dev/null and b/resources/bitmaps_png/png/align_items_top_dark_48.png differ
diff --git a/resources/bitmaps_png/png/anchor_48.png b/resources/bitmaps_png/png/anchor_48.png
new file mode 100644
index 0000000000..e36ee8bc13
Binary files /dev/null and b/resources/bitmaps_png/png/anchor_48.png differ
diff --git a/resources/bitmaps_png/png/anchor_dark_48.png b/resources/bitmaps_png/png/anchor_dark_48.png
new file mode 100644
index 0000000000..4800074612
Binary files /dev/null and b/resources/bitmaps_png/png/anchor_dark_48.png differ
diff --git a/resources/bitmaps_png/png/annotate_48.png b/resources/bitmaps_png/png/annotate_48.png
new file mode 100644
index 0000000000..e44c21c01d
Binary files /dev/null and b/resources/bitmaps_png/png/annotate_48.png differ
diff --git a/resources/bitmaps_png/png/annotate_dark_48.png b/resources/bitmaps_png/png/annotate_dark_48.png
new file mode 100644
index 0000000000..83084bd155
Binary files /dev/null and b/resources/bitmaps_png/png/annotate_dark_48.png differ
diff --git a/resources/bitmaps_png/png/annotate_down_right_48.png b/resources/bitmaps_png/png/annotate_down_right_48.png
new file mode 100644
index 0000000000..80b033021d
Binary files /dev/null and b/resources/bitmaps_png/png/annotate_down_right_48.png differ
diff --git a/resources/bitmaps_png/png/annotate_down_right_dark_48.png b/resources/bitmaps_png/png/annotate_down_right_dark_48.png
new file mode 100644
index 0000000000..c038fcaf4a
Binary files /dev/null and b/resources/bitmaps_png/png/annotate_down_right_dark_48.png differ
diff --git a/resources/bitmaps_png/png/annotate_right_down_48.png b/resources/bitmaps_png/png/annotate_right_down_48.png
new file mode 100644
index 0000000000..c79fd5234b
Binary files /dev/null and b/resources/bitmaps_png/png/annotate_right_down_48.png differ
diff --git a/resources/bitmaps_png/png/annotate_right_down_dark_48.png b/resources/bitmaps_png/png/annotate_right_down_dark_48.png
new file mode 100644
index 0000000000..61884ad88d
Binary files /dev/null and b/resources/bitmaps_png/png/annotate_right_down_dark_48.png differ
diff --git a/resources/bitmaps_png/png/apply_pad_settings_48.png b/resources/bitmaps_png/png/apply_pad_settings_48.png
new file mode 100644
index 0000000000..8733fe8f99
Binary files /dev/null and b/resources/bitmaps_png/png/apply_pad_settings_48.png differ
diff --git a/resources/bitmaps_png/png/apply_pad_settings_dark_48.png b/resources/bitmaps_png/png/apply_pad_settings_dark_48.png
new file mode 100644
index 0000000000..863bf75e30
Binary files /dev/null and b/resources/bitmaps_png/png/apply_pad_settings_dark_48.png differ
diff --git a/resources/bitmaps_png/png/array_48.png b/resources/bitmaps_png/png/array_48.png
new file mode 100644
index 0000000000..dbd2cdb5ce
Binary files /dev/null and b/resources/bitmaps_png/png/array_48.png differ
diff --git a/resources/bitmaps_png/png/array_dark_48.png b/resources/bitmaps_png/png/array_dark_48.png
new file mode 100644
index 0000000000..074d0d4141
Binary files /dev/null and b/resources/bitmaps_png/png/array_dark_48.png differ
diff --git a/resources/bitmaps_png/png/auto_associate_48.png b/resources/bitmaps_png/png/auto_associate_48.png
new file mode 100644
index 0000000000..361ab1b6b1
Binary files /dev/null and b/resources/bitmaps_png/png/auto_associate_48.png differ
diff --git a/resources/bitmaps_png/png/auto_associate_dark_48.png b/resources/bitmaps_png/png/auto_associate_dark_48.png
new file mode 100644
index 0000000000..c399b59131
Binary files /dev/null and b/resources/bitmaps_png/png/auto_associate_dark_48.png differ
diff --git a/resources/bitmaps_png/png/auto_track_width_48.png b/resources/bitmaps_png/png/auto_track_width_48.png
new file mode 100644
index 0000000000..4f5a8dbf28
Binary files /dev/null and b/resources/bitmaps_png/png/auto_track_width_48.png differ
diff --git a/resources/bitmaps_png/png/auto_track_width_dark_48.png b/resources/bitmaps_png/png/auto_track_width_dark_48.png
new file mode 100644
index 0000000000..a315dd0d53
Binary files /dev/null and b/resources/bitmaps_png/png/auto_track_width_dark_48.png differ
diff --git a/resources/bitmaps_png/png/autoplace_fields_48.png b/resources/bitmaps_png/png/autoplace_fields_48.png
new file mode 100644
index 0000000000..53fe3cd1a6
Binary files /dev/null and b/resources/bitmaps_png/png/autoplace_fields_48.png differ
diff --git a/resources/bitmaps_png/png/autoplace_fields_dark_48.png b/resources/bitmaps_png/png/autoplace_fields_dark_48.png
new file mode 100644
index 0000000000..ae046d8a0d
Binary files /dev/null and b/resources/bitmaps_png/png/autoplace_fields_dark_48.png differ
diff --git a/resources/bitmaps_png/png/axis3d_48.png b/resources/bitmaps_png/png/axis3d_48.png
new file mode 100644
index 0000000000..54671274fe
Binary files /dev/null and b/resources/bitmaps_png/png/axis3d_48.png differ
diff --git a/resources/bitmaps_png/png/axis3d_back_48.png b/resources/bitmaps_png/png/axis3d_back_48.png
new file mode 100644
index 0000000000..1648c72378
Binary files /dev/null and b/resources/bitmaps_png/png/axis3d_back_48.png differ
diff --git a/resources/bitmaps_png/png/axis3d_back_dark_48.png b/resources/bitmaps_png/png/axis3d_back_dark_48.png
new file mode 100644
index 0000000000..db2bd164c2
Binary files /dev/null and b/resources/bitmaps_png/png/axis3d_back_dark_48.png differ
diff --git a/resources/bitmaps_png/png/axis3d_bottom_48.png b/resources/bitmaps_png/png/axis3d_bottom_48.png
new file mode 100644
index 0000000000..058e6ca276
Binary files /dev/null and b/resources/bitmaps_png/png/axis3d_bottom_48.png differ
diff --git a/resources/bitmaps_png/png/axis3d_bottom_dark_48.png b/resources/bitmaps_png/png/axis3d_bottom_dark_48.png
new file mode 100644
index 0000000000..ab1c419cf5
Binary files /dev/null and b/resources/bitmaps_png/png/axis3d_bottom_dark_48.png differ
diff --git a/resources/bitmaps_png/png/axis3d_dark_48.png b/resources/bitmaps_png/png/axis3d_dark_48.png
new file mode 100644
index 0000000000..b2cc354e94
Binary files /dev/null and b/resources/bitmaps_png/png/axis3d_dark_48.png differ
diff --git a/resources/bitmaps_png/png/axis3d_front_48.png b/resources/bitmaps_png/png/axis3d_front_48.png
new file mode 100644
index 0000000000..892cfbb778
Binary files /dev/null and b/resources/bitmaps_png/png/axis3d_front_48.png differ
diff --git a/resources/bitmaps_png/png/axis3d_front_dark_48.png b/resources/bitmaps_png/png/axis3d_front_dark_48.png
new file mode 100644
index 0000000000..d0e6c9b06f
Binary files /dev/null and b/resources/bitmaps_png/png/axis3d_front_dark_48.png differ
diff --git a/resources/bitmaps_png/png/axis3d_left_48.png b/resources/bitmaps_png/png/axis3d_left_48.png
new file mode 100644
index 0000000000..99f741c652
Binary files /dev/null and b/resources/bitmaps_png/png/axis3d_left_48.png differ
diff --git a/resources/bitmaps_png/png/axis3d_left_dark_48.png b/resources/bitmaps_png/png/axis3d_left_dark_48.png
new file mode 100644
index 0000000000..7fb9472072
Binary files /dev/null and b/resources/bitmaps_png/png/axis3d_left_dark_48.png differ
diff --git a/resources/bitmaps_png/png/axis3d_right_48.png b/resources/bitmaps_png/png/axis3d_right_48.png
new file mode 100644
index 0000000000..6ccf3438a0
Binary files /dev/null and b/resources/bitmaps_png/png/axis3d_right_48.png differ
diff --git a/resources/bitmaps_png/png/axis3d_right_dark_48.png b/resources/bitmaps_png/png/axis3d_right_dark_48.png
new file mode 100644
index 0000000000..a3a6e4d2e0
Binary files /dev/null and b/resources/bitmaps_png/png/axis3d_right_dark_48.png differ
diff --git a/resources/bitmaps_png/png/axis3d_top_48.png b/resources/bitmaps_png/png/axis3d_top_48.png
new file mode 100644
index 0000000000..8e8c1b09ef
Binary files /dev/null and b/resources/bitmaps_png/png/axis3d_top_48.png differ
diff --git a/resources/bitmaps_png/png/axis3d_top_dark_48.png b/resources/bitmaps_png/png/axis3d_top_dark_48.png
new file mode 100644
index 0000000000..dcc3ba5e5b
Binary files /dev/null and b/resources/bitmaps_png/png/axis3d_top_dark_48.png differ
diff --git a/resources/bitmaps_png/png/break_line_48.png b/resources/bitmaps_png/png/break_line_48.png
new file mode 100644
index 0000000000..3f6e7c6950
Binary files /dev/null and b/resources/bitmaps_png/png/break_line_48.png differ
diff --git a/resources/bitmaps_png/png/break_line_dark_48.png b/resources/bitmaps_png/png/break_line_dark_48.png
new file mode 100644
index 0000000000..c2560d0361
Binary files /dev/null and b/resources/bitmaps_png/png/break_line_dark_48.png differ
diff --git a/resources/bitmaps_png/png/bug_48.png b/resources/bitmaps_png/png/bug_48.png
new file mode 100644
index 0000000000..be058b8ab3
Binary files /dev/null and b/resources/bitmaps_png/png/bug_48.png differ
diff --git a/resources/bitmaps_png/png/bug_dark_48.png b/resources/bitmaps_png/png/bug_dark_48.png
new file mode 100644
index 0000000000..83fe7d9c7d
Binary files /dev/null and b/resources/bitmaps_png/png/bug_dark_48.png differ
diff --git a/resources/bitmaps_png/png/bus_definition_tool_48.png b/resources/bitmaps_png/png/bus_definition_tool_48.png
new file mode 100644
index 0000000000..615beec905
Binary files /dev/null and b/resources/bitmaps_png/png/bus_definition_tool_48.png differ
diff --git a/resources/bitmaps_png/png/bus_definition_tool_dark_48.png b/resources/bitmaps_png/png/bus_definition_tool_dark_48.png
new file mode 100644
index 0000000000..319088e61c
Binary files /dev/null and b/resources/bitmaps_png/png/bus_definition_tool_dark_48.png differ
diff --git a/resources/bitmaps_png/png/cancel_48.png b/resources/bitmaps_png/png/cancel_48.png
new file mode 100644
index 0000000000..6d2de9b430
Binary files /dev/null and b/resources/bitmaps_png/png/cancel_48.png differ
diff --git a/resources/bitmaps_png/png/cancel_dark_48.png b/resources/bitmaps_png/png/cancel_dark_48.png
new file mode 100644
index 0000000000..040210a6e6
Binary files /dev/null and b/resources/bitmaps_png/png/cancel_dark_48.png differ
diff --git a/resources/bitmaps_png/png/chamfer_48.png b/resources/bitmaps_png/png/chamfer_48.png
new file mode 100644
index 0000000000..75a247f5aa
Binary files /dev/null and b/resources/bitmaps_png/png/chamfer_48.png differ
diff --git a/resources/bitmaps_png/png/chamfer_dark_48.png b/resources/bitmaps_png/png/chamfer_dark_48.png
new file mode 100644
index 0000000000..ff96354f48
Binary files /dev/null and b/resources/bitmaps_png/png/chamfer_dark_48.png differ
diff --git a/resources/bitmaps_png/png/change_entry_orient_48.png b/resources/bitmaps_png/png/change_entry_orient_48.png
new file mode 100644
index 0000000000..722a6c98e6
Binary files /dev/null and b/resources/bitmaps_png/png/change_entry_orient_48.png differ
diff --git a/resources/bitmaps_png/png/change_entry_orient_dark_48.png b/resources/bitmaps_png/png/change_entry_orient_dark_48.png
new file mode 100644
index 0000000000..6fa0430f67
Binary files /dev/null and b/resources/bitmaps_png/png/change_entry_orient_dark_48.png differ
diff --git a/resources/bitmaps_png/png/checked_ok_48.png b/resources/bitmaps_png/png/checked_ok_48.png
new file mode 100644
index 0000000000..338cdfe154
Binary files /dev/null and b/resources/bitmaps_png/png/checked_ok_48.png differ
diff --git a/resources/bitmaps_png/png/checked_ok_dark_48.png b/resources/bitmaps_png/png/checked_ok_dark_48.png
new file mode 100644
index 0000000000..16f0c1f679
Binary files /dev/null and b/resources/bitmaps_png/png/checked_ok_dark_48.png differ
diff --git a/resources/bitmaps_png/png/color_materials_48.png b/resources/bitmaps_png/png/color_materials_48.png
new file mode 100644
index 0000000000..fb6ab07b44
Binary files /dev/null and b/resources/bitmaps_png/png/color_materials_48.png differ
diff --git a/resources/bitmaps_png/png/color_materials_dark_48.png b/resources/bitmaps_png/png/color_materials_dark_48.png
new file mode 100644
index 0000000000..eec6d26e7b
Binary files /dev/null and b/resources/bitmaps_png/png/color_materials_dark_48.png differ
diff --git a/resources/bitmaps_png/png/component_select_unit_48.png b/resources/bitmaps_png/png/component_select_unit_48.png
new file mode 100644
index 0000000000..91b10e2825
Binary files /dev/null and b/resources/bitmaps_png/png/component_select_unit_48.png differ
diff --git a/resources/bitmaps_png/png/component_select_unit_dark_48.png b/resources/bitmaps_png/png/component_select_unit_dark_48.png
new file mode 100644
index 0000000000..c2fc153fde
Binary files /dev/null and b/resources/bitmaps_png/png/component_select_unit_dark_48.png differ
diff --git a/resources/bitmaps_png/png/config_48.png b/resources/bitmaps_png/png/config_48.png
new file mode 100644
index 0000000000..d2e29eec79
Binary files /dev/null and b/resources/bitmaps_png/png/config_48.png differ
diff --git a/resources/bitmaps_png/png/config_dark_48.png b/resources/bitmaps_png/png/config_dark_48.png
new file mode 100644
index 0000000000..0f332707df
Binary files /dev/null and b/resources/bitmaps_png/png/config_dark_48.png differ
diff --git a/resources/bitmaps_png/png/contrast_mode_48.png b/resources/bitmaps_png/png/contrast_mode_48.png
new file mode 100644
index 0000000000..3a208fc8d0
Binary files /dev/null and b/resources/bitmaps_png/png/contrast_mode_48.png differ
diff --git a/resources/bitmaps_png/png/contrast_mode_dark_48.png b/resources/bitmaps_png/png/contrast_mode_dark_48.png
new file mode 100644
index 0000000000..33d9f384d3
Binary files /dev/null and b/resources/bitmaps_png/png/contrast_mode_dark_48.png differ
diff --git a/resources/bitmaps_png/png/convert_48.png b/resources/bitmaps_png/png/convert_48.png
new file mode 100644
index 0000000000..95bbc22a4a
Binary files /dev/null and b/resources/bitmaps_png/png/convert_48.png differ
diff --git a/resources/bitmaps_png/png/convert_dark_48.png b/resources/bitmaps_png/png/convert_dark_48.png
new file mode 100644
index 0000000000..e5fff090f4
Binary files /dev/null and b/resources/bitmaps_png/png/convert_dark_48.png differ
diff --git a/resources/bitmaps_png/png/copy_48.png b/resources/bitmaps_png/png/copy_48.png
new file mode 100644
index 0000000000..14fe107f4e
Binary files /dev/null and b/resources/bitmaps_png/png/copy_48.png differ
diff --git a/resources/bitmaps_png/png/copy_dark_48.png b/resources/bitmaps_png/png/copy_dark_48.png
new file mode 100644
index 0000000000..1962443c84
Binary files /dev/null and b/resources/bitmaps_png/png/copy_dark_48.png differ
diff --git a/resources/bitmaps_png/png/copy_pad_settings_48.png b/resources/bitmaps_png/png/copy_pad_settings_48.png
new file mode 100644
index 0000000000..de91ba3048
Binary files /dev/null and b/resources/bitmaps_png/png/copy_pad_settings_48.png differ
diff --git a/resources/bitmaps_png/png/copy_pad_settings_dark_48.png b/resources/bitmaps_png/png/copy_pad_settings_dark_48.png
new file mode 100644
index 0000000000..bca2a38a63
Binary files /dev/null and b/resources/bitmaps_png/png/copy_pad_settings_dark_48.png differ
diff --git a/resources/bitmaps_png/png/cursor_48.png b/resources/bitmaps_png/png/cursor_48.png
new file mode 100644
index 0000000000..9fe94d85ce
Binary files /dev/null and b/resources/bitmaps_png/png/cursor_48.png differ
diff --git a/resources/bitmaps_png/png/cursor_dark_48.png b/resources/bitmaps_png/png/cursor_dark_48.png
new file mode 100644
index 0000000000..fcd640b2c7
Binary files /dev/null and b/resources/bitmaps_png/png/cursor_dark_48.png differ
diff --git a/resources/bitmaps_png/png/cursor_shape_48.png b/resources/bitmaps_png/png/cursor_shape_48.png
new file mode 100644
index 0000000000..dec8d9d7b9
Binary files /dev/null and b/resources/bitmaps_png/png/cursor_shape_48.png differ
diff --git a/resources/bitmaps_png/png/cursor_shape_dark_48.png b/resources/bitmaps_png/png/cursor_shape_dark_48.png
new file mode 100644
index 0000000000..86fad49981
Binary files /dev/null and b/resources/bitmaps_png/png/cursor_shape_dark_48.png differ
diff --git a/resources/bitmaps_png/png/curved_ratsnest_48.png b/resources/bitmaps_png/png/curved_ratsnest_48.png
new file mode 100644
index 0000000000..a9b3e878f4
Binary files /dev/null and b/resources/bitmaps_png/png/curved_ratsnest_48.png differ
diff --git a/resources/bitmaps_png/png/curved_ratsnest_dark_48.png b/resources/bitmaps_png/png/curved_ratsnest_dark_48.png
new file mode 100644
index 0000000000..73826f52aa
Binary files /dev/null and b/resources/bitmaps_png/png/curved_ratsnest_dark_48.png differ
diff --git a/resources/bitmaps_png/png/custom_pad_to_primitives_48.png b/resources/bitmaps_png/png/custom_pad_to_primitives_48.png
new file mode 100644
index 0000000000..5b0a562fa5
Binary files /dev/null and b/resources/bitmaps_png/png/custom_pad_to_primitives_48.png differ
diff --git a/resources/bitmaps_png/png/custom_pad_to_primitives_dark_48.png b/resources/bitmaps_png/png/custom_pad_to_primitives_dark_48.png
new file mode 100644
index 0000000000..258d7c5a69
Binary files /dev/null and b/resources/bitmaps_png/png/custom_pad_to_primitives_dark_48.png differ
diff --git a/resources/bitmaps_png/png/cut_48.png b/resources/bitmaps_png/png/cut_48.png
new file mode 100644
index 0000000000..81b79419ec
Binary files /dev/null and b/resources/bitmaps_png/png/cut_48.png differ
diff --git a/resources/bitmaps_png/png/cut_dark_48.png b/resources/bitmaps_png/png/cut_dark_48.png
new file mode 100644
index 0000000000..3fe8624fd4
Binary files /dev/null and b/resources/bitmaps_png/png/cut_dark_48.png differ
diff --git a/resources/bitmaps_png/png/datasheet_48.png b/resources/bitmaps_png/png/datasheet_48.png
new file mode 100644
index 0000000000..4bc4b1f946
Binary files /dev/null and b/resources/bitmaps_png/png/datasheet_48.png differ
diff --git a/resources/bitmaps_png/png/datasheet_dark_48.png b/resources/bitmaps_png/png/datasheet_dark_48.png
new file mode 100644
index 0000000000..99ff319e1a
Binary files /dev/null and b/resources/bitmaps_png/png/datasheet_dark_48.png differ
diff --git a/resources/bitmaps_png/png/delete_association_48.png b/resources/bitmaps_png/png/delete_association_48.png
new file mode 100644
index 0000000000..213a484089
Binary files /dev/null and b/resources/bitmaps_png/png/delete_association_48.png differ
diff --git a/resources/bitmaps_png/png/delete_association_dark_48.png b/resources/bitmaps_png/png/delete_association_dark_48.png
new file mode 100644
index 0000000000..b3b1563488
Binary files /dev/null and b/resources/bitmaps_png/png/delete_association_dark_48.png differ
diff --git a/resources/bitmaps_png/png/delete_cursor_48.png b/resources/bitmaps_png/png/delete_cursor_48.png
new file mode 100644
index 0000000000..afc63ccfbd
Binary files /dev/null and b/resources/bitmaps_png/png/delete_cursor_48.png differ
diff --git a/resources/bitmaps_png/png/delete_cursor_dark_48.png b/resources/bitmaps_png/png/delete_cursor_dark_48.png
new file mode 100644
index 0000000000..3604761a42
Binary files /dev/null and b/resources/bitmaps_png/png/delete_cursor_dark_48.png differ
diff --git a/resources/bitmaps_png/png/delete_gerber_48.png b/resources/bitmaps_png/png/delete_gerber_48.png
new file mode 100644
index 0000000000..fa0f4662a8
Binary files /dev/null and b/resources/bitmaps_png/png/delete_gerber_48.png differ
diff --git a/resources/bitmaps_png/png/delete_gerber_dark_48.png b/resources/bitmaps_png/png/delete_gerber_dark_48.png
new file mode 100644
index 0000000000..b9bef98245
Binary files /dev/null and b/resources/bitmaps_png/png/delete_gerber_dark_48.png differ
diff --git a/resources/bitmaps_png/png/delete_sheet_48.png b/resources/bitmaps_png/png/delete_sheet_48.png
new file mode 100644
index 0000000000..f473f812e1
Binary files /dev/null and b/resources/bitmaps_png/png/delete_sheet_48.png differ
diff --git a/resources/bitmaps_png/png/delete_sheet_dark_48.png b/resources/bitmaps_png/png/delete_sheet_dark_48.png
new file mode 100644
index 0000000000..d8041e2311
Binary files /dev/null and b/resources/bitmaps_png/png/delete_sheet_dark_48.png differ
diff --git a/resources/bitmaps_png/png/directory_48.png b/resources/bitmaps_png/png/directory_48.png
new file mode 100644
index 0000000000..60441a5947
Binary files /dev/null and b/resources/bitmaps_png/png/directory_48.png differ
diff --git a/resources/bitmaps_png/png/directory_browser_48.png b/resources/bitmaps_png/png/directory_browser_48.png
new file mode 100644
index 0000000000..e3b3965573
Binary files /dev/null and b/resources/bitmaps_png/png/directory_browser_48.png differ
diff --git a/resources/bitmaps_png/png/directory_browser_dark_48.png b/resources/bitmaps_png/png/directory_browser_dark_48.png
new file mode 100644
index 0000000000..9e63da9a87
Binary files /dev/null and b/resources/bitmaps_png/png/directory_browser_dark_48.png differ
diff --git a/resources/bitmaps_png/png/directory_dark_48.png b/resources/bitmaps_png/png/directory_dark_48.png
new file mode 100644
index 0000000000..8c44481618
Binary files /dev/null and b/resources/bitmaps_png/png/directory_dark_48.png differ
diff --git a/resources/bitmaps_png/png/directory_open_48.png b/resources/bitmaps_png/png/directory_open_48.png
new file mode 100644
index 0000000000..19733fa2d4
Binary files /dev/null and b/resources/bitmaps_png/png/directory_open_48.png differ
diff --git a/resources/bitmaps_png/png/directory_open_dark_48.png b/resources/bitmaps_png/png/directory_open_dark_48.png
new file mode 100644
index 0000000000..aa334b3f39
Binary files /dev/null and b/resources/bitmaps_png/png/directory_open_dark_48.png differ
diff --git a/resources/bitmaps_png/png/distribute_horizontal_48.png b/resources/bitmaps_png/png/distribute_horizontal_48.png
new file mode 100644
index 0000000000..6e0920883a
Binary files /dev/null and b/resources/bitmaps_png/png/distribute_horizontal_48.png differ
diff --git a/resources/bitmaps_png/png/distribute_horizontal_dark_48.png b/resources/bitmaps_png/png/distribute_horizontal_dark_48.png
new file mode 100644
index 0000000000..f44f5d41b5
Binary files /dev/null and b/resources/bitmaps_png/png/distribute_horizontal_dark_48.png differ
diff --git a/resources/bitmaps_png/png/distribute_vertical_48.png b/resources/bitmaps_png/png/distribute_vertical_48.png
new file mode 100644
index 0000000000..611272e7e9
Binary files /dev/null and b/resources/bitmaps_png/png/distribute_vertical_48.png differ
diff --git a/resources/bitmaps_png/png/distribute_vertical_dark_48.png b/resources/bitmaps_png/png/distribute_vertical_dark_48.png
new file mode 100644
index 0000000000..38cc2a02df
Binary files /dev/null and b/resources/bitmaps_png/png/distribute_vertical_dark_48.png differ
diff --git a/resources/bitmaps_png/png/down_48.png b/resources/bitmaps_png/png/down_48.png
new file mode 100644
index 0000000000..52239032de
Binary files /dev/null and b/resources/bitmaps_png/png/down_48.png differ
diff --git a/resources/bitmaps_png/png/down_dark_48.png b/resources/bitmaps_png/png/down_dark_48.png
new file mode 100644
index 0000000000..b4a0d3e40c
Binary files /dev/null and b/resources/bitmaps_png/png/down_dark_48.png differ
diff --git a/resources/bitmaps_png/png/drag_48.png b/resources/bitmaps_png/png/drag_48.png
new file mode 100644
index 0000000000..d0e9cdd04d
Binary files /dev/null and b/resources/bitmaps_png/png/drag_48.png differ
diff --git a/resources/bitmaps_png/png/drag_dark_48.png b/resources/bitmaps_png/png/drag_dark_48.png
new file mode 100644
index 0000000000..7d26925725
Binary files /dev/null and b/resources/bitmaps_png/png/drag_dark_48.png differ
diff --git a/resources/bitmaps_png/png/drag_segment_withslope_48.png b/resources/bitmaps_png/png/drag_segment_withslope_48.png
new file mode 100644
index 0000000000..2545f6378a
Binary files /dev/null and b/resources/bitmaps_png/png/drag_segment_withslope_48.png differ
diff --git a/resources/bitmaps_png/png/drag_segment_withslope_dark_48.png b/resources/bitmaps_png/png/drag_segment_withslope_dark_48.png
new file mode 100644
index 0000000000..3440fb6d53
Binary files /dev/null and b/resources/bitmaps_png/png/drag_segment_withslope_dark_48.png differ
diff --git a/resources/bitmaps_png/png/drc_48.png b/resources/bitmaps_png/png/drc_48.png
new file mode 100644
index 0000000000..6c5fa6a280
Binary files /dev/null and b/resources/bitmaps_png/png/drc_48.png differ
diff --git a/resources/bitmaps_png/png/drc_dark_48.png b/resources/bitmaps_png/png/drc_dark_48.png
new file mode 100644
index 0000000000..5c956ed8fa
Binary files /dev/null and b/resources/bitmaps_png/png/drc_dark_48.png differ
diff --git a/resources/bitmaps_png/png/duplicate_48.png b/resources/bitmaps_png/png/duplicate_48.png
new file mode 100644
index 0000000000..fe5c90000e
Binary files /dev/null and b/resources/bitmaps_png/png/duplicate_48.png differ
diff --git a/resources/bitmaps_png/png/duplicate_dark_48.png b/resources/bitmaps_png/png/duplicate_dark_48.png
new file mode 100644
index 0000000000..55352ce501
Binary files /dev/null and b/resources/bitmaps_png/png/duplicate_dark_48.png differ
diff --git a/resources/bitmaps_png/png/e_192_32.png b/resources/bitmaps_png/png/e_192_32.png
new file mode 100644
index 0000000000..83905f8f6a
Binary files /dev/null and b/resources/bitmaps_png/png/e_192_32.png differ
diff --git a/resources/bitmaps_png/png/e_24_32.png b/resources/bitmaps_png/png/e_24_32.png
new file mode 100644
index 0000000000..81326638dc
Binary files /dev/null and b/resources/bitmaps_png/png/e_24_32.png differ
diff --git a/resources/bitmaps_png/png/e_48_32.png b/resources/bitmaps_png/png/e_48_32.png
new file mode 100644
index 0000000000..ea2bad3870
Binary files /dev/null and b/resources/bitmaps_png/png/e_48_32.png differ
diff --git a/resources/bitmaps_png/png/e_96_32.png b/resources/bitmaps_png/png/e_96_32.png
new file mode 100644
index 0000000000..a1a232941e
Binary files /dev/null and b/resources/bitmaps_png/png/e_96_32.png differ
diff --git a/resources/bitmaps_png/png/edge_to_copper_clearance_48.png b/resources/bitmaps_png/png/edge_to_copper_clearance_48.png
new file mode 100644
index 0000000000..d8a1424773
Binary files /dev/null and b/resources/bitmaps_png/png/edge_to_copper_clearance_48.png differ
diff --git a/resources/bitmaps_png/png/edge_to_copper_clearance_dark_48.png b/resources/bitmaps_png/png/edge_to_copper_clearance_dark_48.png
new file mode 100644
index 0000000000..ba40f08985
Binary files /dev/null and b/resources/bitmaps_png/png/edge_to_copper_clearance_dark_48.png differ
diff --git a/resources/bitmaps_png/png/edit_48.png b/resources/bitmaps_png/png/edit_48.png
new file mode 100644
index 0000000000..8961279392
Binary files /dev/null and b/resources/bitmaps_png/png/edit_48.png differ
diff --git a/resources/bitmaps_png/png/edit_cmp_symb_links_48.png b/resources/bitmaps_png/png/edit_cmp_symb_links_48.png
new file mode 100644
index 0000000000..11a3e0827c
Binary files /dev/null and b/resources/bitmaps_png/png/edit_cmp_symb_links_48.png differ
diff --git a/resources/bitmaps_png/png/edit_cmp_symb_links_dark_48.png b/resources/bitmaps_png/png/edit_cmp_symb_links_dark_48.png
new file mode 100644
index 0000000000..ab9a1273c0
Binary files /dev/null and b/resources/bitmaps_png/png/edit_cmp_symb_links_dark_48.png differ
diff --git a/resources/bitmaps_png/png/edit_comp_footprint_48.png b/resources/bitmaps_png/png/edit_comp_footprint_48.png
new file mode 100644
index 0000000000..3f751de01d
Binary files /dev/null and b/resources/bitmaps_png/png/edit_comp_footprint_48.png differ
diff --git a/resources/bitmaps_png/png/edit_comp_footprint_dark_48.png b/resources/bitmaps_png/png/edit_comp_footprint_dark_48.png
new file mode 100644
index 0000000000..969728d717
Binary files /dev/null and b/resources/bitmaps_png/png/edit_comp_footprint_dark_48.png differ
diff --git a/resources/bitmaps_png/png/edit_comp_ref_48.png b/resources/bitmaps_png/png/edit_comp_ref_48.png
new file mode 100644
index 0000000000..2f80c5156e
Binary files /dev/null and b/resources/bitmaps_png/png/edit_comp_ref_48.png differ
diff --git a/resources/bitmaps_png/png/edit_comp_ref_dark_48.png b/resources/bitmaps_png/png/edit_comp_ref_dark_48.png
new file mode 100644
index 0000000000..ab578e8989
Binary files /dev/null and b/resources/bitmaps_png/png/edit_comp_ref_dark_48.png differ
diff --git a/resources/bitmaps_png/png/edit_comp_value_48.png b/resources/bitmaps_png/png/edit_comp_value_48.png
new file mode 100644
index 0000000000..dd9f8fa40a
Binary files /dev/null and b/resources/bitmaps_png/png/edit_comp_value_48.png differ
diff --git a/resources/bitmaps_png/png/edit_comp_value_dark_48.png b/resources/bitmaps_png/png/edit_comp_value_dark_48.png
new file mode 100644
index 0000000000..44b9b36684
Binary files /dev/null and b/resources/bitmaps_png/png/edit_comp_value_dark_48.png differ
diff --git a/resources/bitmaps_png/png/edit_dark_48.png b/resources/bitmaps_png/png/edit_dark_48.png
new file mode 100644
index 0000000000..3006b2b321
Binary files /dev/null and b/resources/bitmaps_png/png/edit_dark_48.png differ
diff --git a/resources/bitmaps_png/png/editor_48.png b/resources/bitmaps_png/png/editor_48.png
new file mode 100644
index 0000000000..130515764b
Binary files /dev/null and b/resources/bitmaps_png/png/editor_48.png differ
diff --git a/resources/bitmaps_png/png/editor_dark_48.png b/resources/bitmaps_png/png/editor_dark_48.png
new file mode 100644
index 0000000000..b3a1d6e08d
Binary files /dev/null and b/resources/bitmaps_png/png/editor_dark_48.png differ
diff --git a/resources/bitmaps_png/png/enter_sheet_48.png b/resources/bitmaps_png/png/enter_sheet_48.png
new file mode 100644
index 0000000000..297c319363
Binary files /dev/null and b/resources/bitmaps_png/png/enter_sheet_48.png differ
diff --git a/resources/bitmaps_png/png/enter_sheet_dark_48.png b/resources/bitmaps_png/png/enter_sheet_dark_48.png
new file mode 100644
index 0000000000..8dbdacee26
Binary files /dev/null and b/resources/bitmaps_png/png/enter_sheet_dark_48.png differ
diff --git a/resources/bitmaps_png/png/erc_48.png b/resources/bitmaps_png/png/erc_48.png
new file mode 100644
index 0000000000..a0557df806
Binary files /dev/null and b/resources/bitmaps_png/png/erc_48.png differ
diff --git a/resources/bitmaps_png/png/erc_dark_48.png b/resources/bitmaps_png/png/erc_dark_48.png
new file mode 100644
index 0000000000..aea6eae1e3
Binary files /dev/null and b/resources/bitmaps_png/png/erc_dark_48.png differ
diff --git a/resources/bitmaps_png/png/erc_green_48.png b/resources/bitmaps_png/png/erc_green_48.png
new file mode 100644
index 0000000000..761f0aa50c
Binary files /dev/null and b/resources/bitmaps_png/png/erc_green_48.png differ
diff --git a/resources/bitmaps_png/png/erc_green_dark_48.png b/resources/bitmaps_png/png/erc_green_dark_48.png
new file mode 100644
index 0000000000..6f053b1ea3
Binary files /dev/null and b/resources/bitmaps_png/png/erc_green_dark_48.png differ
diff --git a/resources/bitmaps_png/png/ercerr_48.png b/resources/bitmaps_png/png/ercerr_48.png
new file mode 100644
index 0000000000..fcdc83cd13
Binary files /dev/null and b/resources/bitmaps_png/png/ercerr_48.png differ
diff --git a/resources/bitmaps_png/png/ercerr_dark_48.png b/resources/bitmaps_png/png/ercerr_dark_48.png
new file mode 100644
index 0000000000..a69f1e8026
Binary files /dev/null and b/resources/bitmaps_png/png/ercerr_dark_48.png differ
diff --git a/resources/bitmaps_png/png/ercwarn_48.png b/resources/bitmaps_png/png/ercwarn_48.png
new file mode 100644
index 0000000000..6d7f340a6c
Binary files /dev/null and b/resources/bitmaps_png/png/ercwarn_48.png differ
diff --git a/resources/bitmaps_png/png/ercwarn_dark_48.png b/resources/bitmaps_png/png/ercwarn_dark_48.png
new file mode 100644
index 0000000000..7e5792c00e
Binary files /dev/null and b/resources/bitmaps_png/png/ercwarn_dark_48.png differ
diff --git a/resources/bitmaps_png/png/exchange_48.png b/resources/bitmaps_png/png/exchange_48.png
new file mode 100644
index 0000000000..b840ad631f
Binary files /dev/null and b/resources/bitmaps_png/png/exchange_48.png differ
diff --git a/resources/bitmaps_png/png/exchange_dark_48.png b/resources/bitmaps_png/png/exchange_dark_48.png
new file mode 100644
index 0000000000..e5802b8690
Binary files /dev/null and b/resources/bitmaps_png/png/exchange_dark_48.png differ
diff --git a/resources/bitmaps_png/png/exit_48.png b/resources/bitmaps_png/png/exit_48.png
new file mode 100644
index 0000000000..d28735924d
Binary files /dev/null and b/resources/bitmaps_png/png/exit_48.png differ
diff --git a/resources/bitmaps_png/png/exit_dark_48.png b/resources/bitmaps_png/png/exit_dark_48.png
new file mode 100644
index 0000000000..51746b7936
Binary files /dev/null and b/resources/bitmaps_png/png/exit_dark_48.png differ
diff --git a/resources/bitmaps_png/png/export3d_48.png b/resources/bitmaps_png/png/export3d_48.png
new file mode 100644
index 0000000000..5be885ba5b
Binary files /dev/null and b/resources/bitmaps_png/png/export3d_48.png differ
diff --git a/resources/bitmaps_png/png/export3d_dark_48.png b/resources/bitmaps_png/png/export3d_dark_48.png
new file mode 100644
index 0000000000..0e82904981
Binary files /dev/null and b/resources/bitmaps_png/png/export3d_dark_48.png differ
diff --git a/resources/bitmaps_png/png/export_cmp_48.png b/resources/bitmaps_png/png/export_cmp_48.png
new file mode 100644
index 0000000000..0aa1840af1
Binary files /dev/null and b/resources/bitmaps_png/png/export_cmp_48.png differ
diff --git a/resources/bitmaps_png/png/export_cmp_dark_48.png b/resources/bitmaps_png/png/export_cmp_dark_48.png
new file mode 100644
index 0000000000..ed25d83cb4
Binary files /dev/null and b/resources/bitmaps_png/png/export_cmp_dark_48.png differ
diff --git a/resources/bitmaps_png/png/export_dsn_48.png b/resources/bitmaps_png/png/export_dsn_48.png
new file mode 100644
index 0000000000..d2e4b6213a
Binary files /dev/null and b/resources/bitmaps_png/png/export_dsn_48.png differ
diff --git a/resources/bitmaps_png/png/export_dsn_dark_48.png b/resources/bitmaps_png/png/export_dsn_dark_48.png
new file mode 100644
index 0000000000..579efd1086
Binary files /dev/null and b/resources/bitmaps_png/png/export_dsn_dark_48.png differ
diff --git a/resources/bitmaps_png/png/export_file_48.png b/resources/bitmaps_png/png/export_file_48.png
new file mode 100644
index 0000000000..171eae25e5
Binary files /dev/null and b/resources/bitmaps_png/png/export_file_48.png differ
diff --git a/resources/bitmaps_png/png/export_file_dark_48.png b/resources/bitmaps_png/png/export_file_dark_48.png
new file mode 100644
index 0000000000..bc195c19ec
Binary files /dev/null and b/resources/bitmaps_png/png/export_file_dark_48.png differ
diff --git a/resources/bitmaps_png/png/export_footprint_names_48.png b/resources/bitmaps_png/png/export_footprint_names_48.png
new file mode 100644
index 0000000000..4cd2b5dc0c
Binary files /dev/null and b/resources/bitmaps_png/png/export_footprint_names_48.png differ
diff --git a/resources/bitmaps_png/png/export_footprint_names_dark_48.png b/resources/bitmaps_png/png/export_footprint_names_dark_48.png
new file mode 100644
index 0000000000..0cebe2163b
Binary files /dev/null and b/resources/bitmaps_png/png/export_footprint_names_dark_48.png differ
diff --git a/resources/bitmaps_png/png/export_idf_48.png b/resources/bitmaps_png/png/export_idf_48.png
new file mode 100644
index 0000000000..b61b12fc34
Binary files /dev/null and b/resources/bitmaps_png/png/export_idf_48.png differ
diff --git a/resources/bitmaps_png/png/export_idf_dark_48.png b/resources/bitmaps_png/png/export_idf_dark_48.png
new file mode 100644
index 0000000000..6c6ebea181
Binary files /dev/null and b/resources/bitmaps_png/png/export_idf_dark_48.png differ
diff --git a/resources/bitmaps_png/png/export_module_48.png b/resources/bitmaps_png/png/export_module_48.png
new file mode 100644
index 0000000000..85a97bab97
Binary files /dev/null and b/resources/bitmaps_png/png/export_module_48.png differ
diff --git a/resources/bitmaps_png/png/export_module_dark_48.png b/resources/bitmaps_png/png/export_module_dark_48.png
new file mode 100644
index 0000000000..cf2b738c3b
Binary files /dev/null and b/resources/bitmaps_png/png/export_module_dark_48.png differ
diff --git a/resources/bitmaps_png/png/export_part_48.png b/resources/bitmaps_png/png/export_part_48.png
new file mode 100644
index 0000000000..375a21d3ff
Binary files /dev/null and b/resources/bitmaps_png/png/export_part_48.png differ
diff --git a/resources/bitmaps_png/png/export_part_dark_48.png b/resources/bitmaps_png/png/export_part_dark_48.png
new file mode 100644
index 0000000000..05e9d8bfdb
Binary files /dev/null and b/resources/bitmaps_png/png/export_part_dark_48.png differ
diff --git a/resources/bitmaps_png/png/export_png_48.png b/resources/bitmaps_png/png/export_png_48.png
new file mode 100644
index 0000000000..38866ec38a
Binary files /dev/null and b/resources/bitmaps_png/png/export_png_48.png differ
diff --git a/resources/bitmaps_png/png/export_png_dark_48.png b/resources/bitmaps_png/png/export_png_dark_48.png
new file mode 100644
index 0000000000..7e6cbb3b91
Binary files /dev/null and b/resources/bitmaps_png/png/export_png_dark_48.png differ
diff --git a/resources/bitmaps_png/png/export_step_48.png b/resources/bitmaps_png/png/export_step_48.png
new file mode 100644
index 0000000000..9b5f537f7b
Binary files /dev/null and b/resources/bitmaps_png/png/export_step_48.png differ
diff --git a/resources/bitmaps_png/png/export_step_dark_48.png b/resources/bitmaps_png/png/export_step_dark_48.png
new file mode 100644
index 0000000000..1c6f61cbde
Binary files /dev/null and b/resources/bitmaps_png/png/export_step_dark_48.png differ
diff --git a/resources/bitmaps_png/png/export_svg_48.png b/resources/bitmaps_png/png/export_svg_48.png
new file mode 100644
index 0000000000..5d80967ea0
Binary files /dev/null and b/resources/bitmaps_png/png/export_svg_48.png differ
diff --git a/resources/bitmaps_png/png/export_svg_dark_48.png b/resources/bitmaps_png/png/export_svg_dark_48.png
new file mode 100644
index 0000000000..a6e8ed31e4
Binary files /dev/null and b/resources/bitmaps_png/png/export_svg_dark_48.png differ
diff --git a/resources/bitmaps_png/png/export_to_pcbnew_48.png b/resources/bitmaps_png/png/export_to_pcbnew_48.png
new file mode 100644
index 0000000000..7a92010c15
Binary files /dev/null and b/resources/bitmaps_png/png/export_to_pcbnew_48.png differ
diff --git a/resources/bitmaps_png/png/export_to_pcbnew_dark_48.png b/resources/bitmaps_png/png/export_to_pcbnew_dark_48.png
new file mode 100644
index 0000000000..1bf96fb1db
Binary files /dev/null and b/resources/bitmaps_png/png/export_to_pcbnew_dark_48.png differ
diff --git a/resources/bitmaps_png/png/fabrication_48.png b/resources/bitmaps_png/png/fabrication_48.png
new file mode 100644
index 0000000000..d6f335ce03
Binary files /dev/null and b/resources/bitmaps_png/png/fabrication_48.png differ
diff --git a/resources/bitmaps_png/png/fabrication_dark_48.png b/resources/bitmaps_png/png/fabrication_dark_48.png
new file mode 100644
index 0000000000..fd0ed94c9a
Binary files /dev/null and b/resources/bitmaps_png/png/fabrication_dark_48.png differ
diff --git a/resources/bitmaps_png/png/file_bom_48.png b/resources/bitmaps_png/png/file_bom_48.png
new file mode 100644
index 0000000000..b41db4da7b
Binary files /dev/null and b/resources/bitmaps_png/png/file_bom_48.png differ
diff --git a/resources/bitmaps_png/png/file_bom_dark_48.png b/resources/bitmaps_png/png/file_bom_dark_48.png
new file mode 100644
index 0000000000..c384575cf7
Binary files /dev/null and b/resources/bitmaps_png/png/file_bom_dark_48.png differ
diff --git a/resources/bitmaps_png/png/file_drl_48.png b/resources/bitmaps_png/png/file_drl_48.png
new file mode 100644
index 0000000000..cf2f054d1b
Binary files /dev/null and b/resources/bitmaps_png/png/file_drl_48.png differ
diff --git a/resources/bitmaps_png/png/file_drl_dark_48.png b/resources/bitmaps_png/png/file_drl_dark_48.png
new file mode 100644
index 0000000000..bbd53514ea
Binary files /dev/null and b/resources/bitmaps_png/png/file_drl_dark_48.png differ
diff --git a/resources/bitmaps_png/png/file_dsn_48.png b/resources/bitmaps_png/png/file_dsn_48.png
new file mode 100644
index 0000000000..62298aef65
Binary files /dev/null and b/resources/bitmaps_png/png/file_dsn_48.png differ
diff --git a/resources/bitmaps_png/png/file_dsn_dark_48.png b/resources/bitmaps_png/png/file_dsn_dark_48.png
new file mode 100644
index 0000000000..1774ffad81
Binary files /dev/null and b/resources/bitmaps_png/png/file_dsn_dark_48.png differ
diff --git a/resources/bitmaps_png/png/file_gbr_48.png b/resources/bitmaps_png/png/file_gbr_48.png
new file mode 100644
index 0000000000..42e880ce6e
Binary files /dev/null and b/resources/bitmaps_png/png/file_gbr_48.png differ
diff --git a/resources/bitmaps_png/png/file_gbr_dark_48.png b/resources/bitmaps_png/png/file_gbr_dark_48.png
new file mode 100644
index 0000000000..4b5eba7f22
Binary files /dev/null and b/resources/bitmaps_png/png/file_gbr_dark_48.png differ
diff --git a/resources/bitmaps_png/png/file_gerber_job_48.png b/resources/bitmaps_png/png/file_gerber_job_48.png
new file mode 100644
index 0000000000..b81e33e8e0
Binary files /dev/null and b/resources/bitmaps_png/png/file_gerber_job_48.png differ
diff --git a/resources/bitmaps_png/png/file_gerber_job_dark_48.png b/resources/bitmaps_png/png/file_gerber_job_dark_48.png
new file mode 100644
index 0000000000..dd846f516c
Binary files /dev/null and b/resources/bitmaps_png/png/file_gerber_job_dark_48.png differ
diff --git a/resources/bitmaps_png/png/file_html_48.png b/resources/bitmaps_png/png/file_html_48.png
new file mode 100644
index 0000000000..cd3969b273
Binary files /dev/null and b/resources/bitmaps_png/png/file_html_48.png differ
diff --git a/resources/bitmaps_png/png/file_html_dark_48.png b/resources/bitmaps_png/png/file_html_dark_48.png
new file mode 100644
index 0000000000..9d80b2d056
Binary files /dev/null and b/resources/bitmaps_png/png/file_html_dark_48.png differ
diff --git a/resources/bitmaps_png/png/file_idf_48.png b/resources/bitmaps_png/png/file_idf_48.png
new file mode 100644
index 0000000000..96f82f70a5
Binary files /dev/null and b/resources/bitmaps_png/png/file_idf_48.png differ
diff --git a/resources/bitmaps_png/png/file_idf_dark_48.png b/resources/bitmaps_png/png/file_idf_dark_48.png
new file mode 100644
index 0000000000..c8a8e7af7e
Binary files /dev/null and b/resources/bitmaps_png/png/file_idf_dark_48.png differ
diff --git a/resources/bitmaps_png/png/file_pdf_48.png b/resources/bitmaps_png/png/file_pdf_48.png
new file mode 100644
index 0000000000..60886c9863
Binary files /dev/null and b/resources/bitmaps_png/png/file_pdf_48.png differ
diff --git a/resources/bitmaps_png/png/file_pdf_dark_48.png b/resources/bitmaps_png/png/file_pdf_dark_48.png
new file mode 100644
index 0000000000..6fd39dfb04
Binary files /dev/null and b/resources/bitmaps_png/png/file_pdf_dark_48.png differ
diff --git a/resources/bitmaps_png/png/file_pos_48.png b/resources/bitmaps_png/png/file_pos_48.png
new file mode 100644
index 0000000000..85407e5e06
Binary files /dev/null and b/resources/bitmaps_png/png/file_pos_48.png differ
diff --git a/resources/bitmaps_png/png/file_pos_dark_48.png b/resources/bitmaps_png/png/file_pos_dark_48.png
new file mode 100644
index 0000000000..61c8fcc14a
Binary files /dev/null and b/resources/bitmaps_png/png/file_pos_dark_48.png differ
diff --git a/resources/bitmaps_png/png/file_svg_48.png b/resources/bitmaps_png/png/file_svg_48.png
new file mode 100644
index 0000000000..30ce7cae1c
Binary files /dev/null and b/resources/bitmaps_png/png/file_svg_48.png differ
diff --git a/resources/bitmaps_png/png/file_svg_dark_48.png b/resources/bitmaps_png/png/file_svg_dark_48.png
new file mode 100644
index 0000000000..b5a99fd5c8
Binary files /dev/null and b/resources/bitmaps_png/png/file_svg_dark_48.png differ
diff --git a/resources/bitmaps_png/png/fill_zone_48.png b/resources/bitmaps_png/png/fill_zone_48.png
new file mode 100644
index 0000000000..8934d5756b
Binary files /dev/null and b/resources/bitmaps_png/png/fill_zone_48.png differ
diff --git a/resources/bitmaps_png/png/fill_zone_dark_48.png b/resources/bitmaps_png/png/fill_zone_dark_48.png
new file mode 100644
index 0000000000..a9097b4e73
Binary files /dev/null and b/resources/bitmaps_png/png/fill_zone_dark_48.png differ
diff --git a/resources/bitmaps_png/png/fillet_48.png b/resources/bitmaps_png/png/fillet_48.png
new file mode 100644
index 0000000000..df613e5109
Binary files /dev/null and b/resources/bitmaps_png/png/fillet_48.png differ
diff --git a/resources/bitmaps_png/png/fillet_dark_48.png b/resources/bitmaps_png/png/fillet_dark_48.png
new file mode 100644
index 0000000000..954cbdab08
Binary files /dev/null and b/resources/bitmaps_png/png/fillet_dark_48.png differ
diff --git a/resources/bitmaps_png/png/filter_48.png b/resources/bitmaps_png/png/filter_48.png
new file mode 100644
index 0000000000..e9bad4f81d
Binary files /dev/null and b/resources/bitmaps_png/png/filter_48.png differ
diff --git a/resources/bitmaps_png/png/filter_dark_48.png b/resources/bitmaps_png/png/filter_dark_48.png
new file mode 100644
index 0000000000..7b19c1e3fa
Binary files /dev/null and b/resources/bitmaps_png/png/filter_dark_48.png differ
diff --git a/resources/bitmaps_png/png/find_48.png b/resources/bitmaps_png/png/find_48.png
new file mode 100644
index 0000000000..e2e291af58
Binary files /dev/null and b/resources/bitmaps_png/png/find_48.png differ
diff --git a/resources/bitmaps_png/png/find_dark_48.png b/resources/bitmaps_png/png/find_dark_48.png
new file mode 100644
index 0000000000..df9f2bea16
Binary files /dev/null and b/resources/bitmaps_png/png/find_dark_48.png differ
diff --git a/resources/bitmaps_png/png/find_replace_48.png b/resources/bitmaps_png/png/find_replace_48.png
new file mode 100644
index 0000000000..8f3481681a
Binary files /dev/null and b/resources/bitmaps_png/png/find_replace_48.png differ
diff --git a/resources/bitmaps_png/png/find_replace_dark_48.png b/resources/bitmaps_png/png/find_replace_dark_48.png
new file mode 100644
index 0000000000..e9d02e4bf7
Binary files /dev/null and b/resources/bitmaps_png/png/find_replace_dark_48.png differ
diff --git a/resources/bitmaps_png/png/flag_48.png b/resources/bitmaps_png/png/flag_48.png
new file mode 100644
index 0000000000..3d4151c827
Binary files /dev/null and b/resources/bitmaps_png/png/flag_48.png differ
diff --git a/resources/bitmaps_png/png/flag_dark_48.png b/resources/bitmaps_png/png/flag_dark_48.png
new file mode 100644
index 0000000000..f68b0a34eb
Binary files /dev/null and b/resources/bitmaps_png/png/flag_dark_48.png differ
diff --git a/resources/bitmaps_png/png/flip_board_48.png b/resources/bitmaps_png/png/flip_board_48.png
new file mode 100644
index 0000000000..f9a6c5c90f
Binary files /dev/null and b/resources/bitmaps_png/png/flip_board_48.png differ
diff --git a/resources/bitmaps_png/png/flip_board_dark_48.png b/resources/bitmaps_png/png/flip_board_dark_48.png
new file mode 100644
index 0000000000..d503708fc5
Binary files /dev/null and b/resources/bitmaps_png/png/flip_board_dark_48.png differ
diff --git a/resources/bitmaps_png/png/gbr_select_mode1_48.png b/resources/bitmaps_png/png/gbr_select_mode1_48.png
new file mode 100644
index 0000000000..cc36cafc60
Binary files /dev/null and b/resources/bitmaps_png/png/gbr_select_mode1_48.png differ
diff --git a/resources/bitmaps_png/png/gbr_select_mode1_dark_48.png b/resources/bitmaps_png/png/gbr_select_mode1_dark_48.png
new file mode 100644
index 0000000000..c5e8944098
Binary files /dev/null and b/resources/bitmaps_png/png/gbr_select_mode1_dark_48.png differ
diff --git a/resources/bitmaps_png/png/gbr_select_mode2_48.png b/resources/bitmaps_png/png/gbr_select_mode2_48.png
new file mode 100644
index 0000000000..14d32deb21
Binary files /dev/null and b/resources/bitmaps_png/png/gbr_select_mode2_48.png differ
diff --git a/resources/bitmaps_png/png/gbr_select_mode2_dark_48.png b/resources/bitmaps_png/png/gbr_select_mode2_dark_48.png
new file mode 100644
index 0000000000..b8a9b87fe3
Binary files /dev/null and b/resources/bitmaps_png/png/gbr_select_mode2_dark_48.png differ
diff --git a/resources/bitmaps_png/png/general_deletions_48.png b/resources/bitmaps_png/png/general_deletions_48.png
new file mode 100644
index 0000000000..0e591f9935
Binary files /dev/null and b/resources/bitmaps_png/png/general_deletions_48.png differ
diff --git a/resources/bitmaps_png/png/general_deletions_dark_48.png b/resources/bitmaps_png/png/general_deletions_dark_48.png
new file mode 100644
index 0000000000..ebacd62b6d
Binary files /dev/null and b/resources/bitmaps_png/png/general_deletions_dark_48.png differ
diff --git a/resources/bitmaps_png/png/general_ratsnest_48.png b/resources/bitmaps_png/png/general_ratsnest_48.png
new file mode 100644
index 0000000000..ce47a81661
Binary files /dev/null and b/resources/bitmaps_png/png/general_ratsnest_48.png differ
diff --git a/resources/bitmaps_png/png/general_ratsnest_dark_48.png b/resources/bitmaps_png/png/general_ratsnest_dark_48.png
new file mode 100644
index 0000000000..4489a42c8d
Binary files /dev/null and b/resources/bitmaps_png/png/general_ratsnest_dark_48.png differ
diff --git a/resources/bitmaps_png/png/gerbview_show_negative_objects_48.png b/resources/bitmaps_png/png/gerbview_show_negative_objects_48.png
new file mode 100644
index 0000000000..590a5f0084
Binary files /dev/null and b/resources/bitmaps_png/png/gerbview_show_negative_objects_48.png differ
diff --git a/resources/bitmaps_png/png/gerbview_show_negative_objects_dark_48.png b/resources/bitmaps_png/png/gerbview_show_negative_objects_dark_48.png
new file mode 100644
index 0000000000..2207f0a2fa
Binary files /dev/null and b/resources/bitmaps_png/png/gerbview_show_negative_objects_dark_48.png differ
diff --git a/resources/bitmaps_png/png/git_add_32.png b/resources/bitmaps_png/png/git_add_32.png
new file mode 100644
index 0000000000..61e1f3d283
Binary files /dev/null and b/resources/bitmaps_png/png/git_add_32.png differ
diff --git a/resources/bitmaps_png/png/git_add_dark_32.png b/resources/bitmaps_png/png/git_add_dark_32.png
new file mode 100644
index 0000000000..2e12e03ada
Binary files /dev/null and b/resources/bitmaps_png/png/git_add_dark_32.png differ
diff --git a/resources/bitmaps_png/png/git_changed_ahead_32.png b/resources/bitmaps_png/png/git_changed_ahead_32.png
new file mode 100644
index 0000000000..4841755e33
Binary files /dev/null and b/resources/bitmaps_png/png/git_changed_ahead_32.png differ
diff --git a/resources/bitmaps_png/png/git_changed_ahead_dark_32.png b/resources/bitmaps_png/png/git_changed_ahead_dark_32.png
new file mode 100644
index 0000000000..23200a6955
Binary files /dev/null and b/resources/bitmaps_png/png/git_changed_ahead_dark_32.png differ
diff --git a/resources/bitmaps_png/png/git_conflict_32.png b/resources/bitmaps_png/png/git_conflict_32.png
new file mode 100644
index 0000000000..6d21bfcc8c
Binary files /dev/null and b/resources/bitmaps_png/png/git_conflict_32.png differ
diff --git a/resources/bitmaps_png/png/git_conflict_dark_32.png b/resources/bitmaps_png/png/git_conflict_dark_32.png
new file mode 100644
index 0000000000..17be1b58bf
Binary files /dev/null and b/resources/bitmaps_png/png/git_conflict_dark_32.png differ
diff --git a/resources/bitmaps_png/png/git_delete_32.png b/resources/bitmaps_png/png/git_delete_32.png
new file mode 100644
index 0000000000..e60b549eb8
Binary files /dev/null and b/resources/bitmaps_png/png/git_delete_32.png differ
diff --git a/resources/bitmaps_png/png/git_delete_dark_32.png b/resources/bitmaps_png/png/git_delete_dark_32.png
new file mode 100644
index 0000000000..a6510cdc06
Binary files /dev/null and b/resources/bitmaps_png/png/git_delete_dark_32.png differ
diff --git a/resources/bitmaps_png/png/git_good_check_32.png b/resources/bitmaps_png/png/git_good_check_32.png
new file mode 100644
index 0000000000..b25036b16b
Binary files /dev/null and b/resources/bitmaps_png/png/git_good_check_32.png differ
diff --git a/resources/bitmaps_png/png/git_good_check_dark_32.png b/resources/bitmaps_png/png/git_good_check_dark_32.png
new file mode 100644
index 0000000000..b25036b16b
Binary files /dev/null and b/resources/bitmaps_png/png/git_good_check_dark_32.png differ
diff --git a/resources/bitmaps_png/png/git_modified_32.png b/resources/bitmaps_png/png/git_modified_32.png
new file mode 100644
index 0000000000..53b756b38d
Binary files /dev/null and b/resources/bitmaps_png/png/git_modified_32.png differ
diff --git a/resources/bitmaps_png/png/git_modified_dark_32.png b/resources/bitmaps_png/png/git_modified_dark_32.png
new file mode 100644
index 0000000000..d2a8152610
Binary files /dev/null and b/resources/bitmaps_png/png/git_modified_dark_32.png differ
diff --git a/resources/bitmaps_png/png/git_out_of_date_32.png b/resources/bitmaps_png/png/git_out_of_date_32.png
new file mode 100644
index 0000000000..b4af7976f3
Binary files /dev/null and b/resources/bitmaps_png/png/git_out_of_date_32.png differ
diff --git a/resources/bitmaps_png/png/git_out_of_date_dark_32.png b/resources/bitmaps_png/png/git_out_of_date_dark_32.png
new file mode 100644
index 0000000000..b4af7976f3
Binary files /dev/null and b/resources/bitmaps_png/png/git_out_of_date_dark_32.png differ
diff --git a/resources/bitmaps_png/png/grid_48.png b/resources/bitmaps_png/png/grid_48.png
new file mode 100644
index 0000000000..a4b9b031c2
Binary files /dev/null and b/resources/bitmaps_png/png/grid_48.png differ
diff --git a/resources/bitmaps_png/png/grid_dark_48.png b/resources/bitmaps_png/png/grid_dark_48.png
new file mode 100644
index 0000000000..a6e351767c
Binary files /dev/null and b/resources/bitmaps_png/png/grid_dark_48.png differ
diff --git a/resources/bitmaps_png/png/grid_override_48.png b/resources/bitmaps_png/png/grid_override_48.png
new file mode 100644
index 0000000000..abdd8c727e
Binary files /dev/null and b/resources/bitmaps_png/png/grid_override_48.png differ
diff --git a/resources/bitmaps_png/png/grid_override_dark_48.png b/resources/bitmaps_png/png/grid_override_dark_48.png
new file mode 100644
index 0000000000..ec096d5c00
Binary files /dev/null and b/resources/bitmaps_png/png/grid_override_dark_48.png differ
diff --git a/resources/bitmaps_png/png/grid_select_48.png b/resources/bitmaps_png/png/grid_select_48.png
new file mode 100644
index 0000000000..3a5d9c5278
Binary files /dev/null and b/resources/bitmaps_png/png/grid_select_48.png differ
diff --git a/resources/bitmaps_png/png/grid_select_axis_48.png b/resources/bitmaps_png/png/grid_select_axis_48.png
new file mode 100644
index 0000000000..c280b56535
Binary files /dev/null and b/resources/bitmaps_png/png/grid_select_axis_48.png differ
diff --git a/resources/bitmaps_png/png/grid_select_axis_dark_48.png b/resources/bitmaps_png/png/grid_select_axis_dark_48.png
new file mode 100644
index 0000000000..a439b39d8c
Binary files /dev/null and b/resources/bitmaps_png/png/grid_select_axis_dark_48.png differ
diff --git a/resources/bitmaps_png/png/grid_select_dark_48.png b/resources/bitmaps_png/png/grid_select_dark_48.png
new file mode 100644
index 0000000000..2c802098c7
Binary files /dev/null and b/resources/bitmaps_png/png/grid_select_dark_48.png differ
diff --git a/resources/bitmaps_png/png/group_48.png b/resources/bitmaps_png/png/group_48.png
new file mode 100644
index 0000000000..a79b1e90a9
Binary files /dev/null and b/resources/bitmaps_png/png/group_48.png differ
diff --git a/resources/bitmaps_png/png/group_dark_48.png b/resources/bitmaps_png/png/group_dark_48.png
new file mode 100644
index 0000000000..8b6eeed9b2
Binary files /dev/null and b/resources/bitmaps_png/png/group_dark_48.png differ
diff --git a/resources/bitmaps_png/png/group_enter_48.png b/resources/bitmaps_png/png/group_enter_48.png
new file mode 100644
index 0000000000..6cd98f0bc3
Binary files /dev/null and b/resources/bitmaps_png/png/group_enter_48.png differ
diff --git a/resources/bitmaps_png/png/group_enter_dark_48.png b/resources/bitmaps_png/png/group_enter_dark_48.png
new file mode 100644
index 0000000000..a52161e695
Binary files /dev/null and b/resources/bitmaps_png/png/group_enter_dark_48.png differ
diff --git a/resources/bitmaps_png/png/group_leave_48.png b/resources/bitmaps_png/png/group_leave_48.png
new file mode 100644
index 0000000000..a36a423daa
Binary files /dev/null and b/resources/bitmaps_png/png/group_leave_48.png differ
diff --git a/resources/bitmaps_png/png/group_leave_dark_48.png b/resources/bitmaps_png/png/group_leave_dark_48.png
new file mode 100644
index 0000000000..0679c09b4e
Binary files /dev/null and b/resources/bitmaps_png/png/group_leave_dark_48.png differ
diff --git a/resources/bitmaps_png/png/group_remove_48.png b/resources/bitmaps_png/png/group_remove_48.png
new file mode 100644
index 0000000000..617bbdae7c
Binary files /dev/null and b/resources/bitmaps_png/png/group_remove_48.png differ
diff --git a/resources/bitmaps_png/png/group_remove_dark_48.png b/resources/bitmaps_png/png/group_remove_dark_48.png
new file mode 100644
index 0000000000..03a82efde1
Binary files /dev/null and b/resources/bitmaps_png/png/group_remove_dark_48.png differ
diff --git a/resources/bitmaps_png/png/group_ungroup_48.png b/resources/bitmaps_png/png/group_ungroup_48.png
new file mode 100644
index 0000000000..4040031934
Binary files /dev/null and b/resources/bitmaps_png/png/group_ungroup_48.png differ
diff --git a/resources/bitmaps_png/png/group_ungroup_dark_48.png b/resources/bitmaps_png/png/group_ungroup_dark_48.png
new file mode 100644
index 0000000000..5e6d01b116
Binary files /dev/null and b/resources/bitmaps_png/png/group_ungroup_dark_48.png differ
diff --git a/resources/bitmaps_png/png/heal_shapes_48.png b/resources/bitmaps_png/png/heal_shapes_48.png
new file mode 100644
index 0000000000..448a1169a1
Binary files /dev/null and b/resources/bitmaps_png/png/heal_shapes_48.png differ
diff --git a/resources/bitmaps_png/png/heal_shapes_dark_48.png b/resources/bitmaps_png/png/heal_shapes_dark_48.png
new file mode 100644
index 0000000000..4717e497c0
Binary files /dev/null and b/resources/bitmaps_png/png/heal_shapes_dark_48.png differ
diff --git a/resources/bitmaps_png/png/help_48.png b/resources/bitmaps_png/png/help_48.png
new file mode 100644
index 0000000000..484ed5ecdb
Binary files /dev/null and b/resources/bitmaps_png/png/help_48.png differ
diff --git a/resources/bitmaps_png/png/help_dark_48.png b/resources/bitmaps_png/png/help_dark_48.png
new file mode 100644
index 0000000000..321f4da77e
Binary files /dev/null and b/resources/bitmaps_png/png/help_dark_48.png differ
diff --git a/resources/bitmaps_png/png/help_online_48.png b/resources/bitmaps_png/png/help_online_48.png
new file mode 100644
index 0000000000..b6c5759b2f
Binary files /dev/null and b/resources/bitmaps_png/png/help_online_48.png differ
diff --git a/resources/bitmaps_png/png/help_online_dark_48.png b/resources/bitmaps_png/png/help_online_dark_48.png
new file mode 100644
index 0000000000..f9ede82ecb
Binary files /dev/null and b/resources/bitmaps_png/png/help_online_dark_48.png differ
diff --git a/resources/bitmaps_png/png/hidden_pin_48.png b/resources/bitmaps_png/png/hidden_pin_48.png
new file mode 100644
index 0000000000..36b6087c35
Binary files /dev/null and b/resources/bitmaps_png/png/hidden_pin_48.png differ
diff --git a/resources/bitmaps_png/png/hidden_pin_dark_48.png b/resources/bitmaps_png/png/hidden_pin_dark_48.png
new file mode 100644
index 0000000000..57352d52fb
Binary files /dev/null and b/resources/bitmaps_png/png/hidden_pin_dark_48.png differ
diff --git a/resources/bitmaps_png/png/hide_ratsnest_48.png b/resources/bitmaps_png/png/hide_ratsnest_48.png
new file mode 100644
index 0000000000..7a6c7e4615
Binary files /dev/null and b/resources/bitmaps_png/png/hide_ratsnest_48.png differ
diff --git a/resources/bitmaps_png/png/hide_ratsnest_dark_48.png b/resources/bitmaps_png/png/hide_ratsnest_dark_48.png
new file mode 100644
index 0000000000..25498df85e
Binary files /dev/null and b/resources/bitmaps_png/png/hide_ratsnest_dark_48.png differ
diff --git a/resources/bitmaps_png/png/hierarchy_nav_48.png b/resources/bitmaps_png/png/hierarchy_nav_48.png
new file mode 100644
index 0000000000..4de0bf1f66
Binary files /dev/null and b/resources/bitmaps_png/png/hierarchy_nav_48.png differ
diff --git a/resources/bitmaps_png/png/hierarchy_nav_dark_48.png b/resources/bitmaps_png/png/hierarchy_nav_dark_48.png
new file mode 100644
index 0000000000..529d0e4588
Binary files /dev/null and b/resources/bitmaps_png/png/hierarchy_nav_dark_48.png differ
diff --git a/resources/bitmaps_png/png/hole_to_copper_clearance_48.png b/resources/bitmaps_png/png/hole_to_copper_clearance_48.png
new file mode 100644
index 0000000000..4fbceed58f
Binary files /dev/null and b/resources/bitmaps_png/png/hole_to_copper_clearance_48.png differ
diff --git a/resources/bitmaps_png/png/hole_to_copper_clearance_dark_48.png b/resources/bitmaps_png/png/hole_to_copper_clearance_dark_48.png
new file mode 100644
index 0000000000..ea8f336355
Binary files /dev/null and b/resources/bitmaps_png/png/hole_to_copper_clearance_dark_48.png differ
diff --git a/resources/bitmaps_png/png/hole_to_hole_clearance_48.png b/resources/bitmaps_png/png/hole_to_hole_clearance_48.png
new file mode 100644
index 0000000000..cdce4ba296
Binary files /dev/null and b/resources/bitmaps_png/png/hole_to_hole_clearance_48.png differ
diff --git a/resources/bitmaps_png/png/hole_to_hole_clearance_dark_48.png b/resources/bitmaps_png/png/hole_to_hole_clearance_dark_48.png
new file mode 100644
index 0000000000..20f8e3854a
Binary files /dev/null and b/resources/bitmaps_png/png/hole_to_hole_clearance_dark_48.png differ
diff --git a/resources/bitmaps_png/png/hotkeys_48.png b/resources/bitmaps_png/png/hotkeys_48.png
new file mode 100644
index 0000000000..959d12b3d2
Binary files /dev/null and b/resources/bitmaps_png/png/hotkeys_48.png differ
diff --git a/resources/bitmaps_png/png/hotkeys_dark_48.png b/resources/bitmaps_png/png/hotkeys_dark_48.png
new file mode 100644
index 0000000000..6cef620570
Binary files /dev/null and b/resources/bitmaps_png/png/hotkeys_dark_48.png differ
diff --git a/resources/bitmaps_png/png/hv45mode_48.png b/resources/bitmaps_png/png/hv45mode_48.png
new file mode 100644
index 0000000000..00172cee6b
Binary files /dev/null and b/resources/bitmaps_png/png/hv45mode_48.png differ
diff --git a/resources/bitmaps_png/png/hv45mode_dark_48.png b/resources/bitmaps_png/png/hv45mode_dark_48.png
new file mode 100644
index 0000000000..5ce061c718
Binary files /dev/null and b/resources/bitmaps_png/png/hv45mode_dark_48.png differ
diff --git a/resources/bitmaps_png/png/icon_bitmap2component_16_32.png b/resources/bitmaps_png/png/icon_bitmap2component_16_32.png
new file mode 100644
index 0000000000..a54431c593
Binary files /dev/null and b/resources/bitmaps_png/png/icon_bitmap2component_16_32.png differ
diff --git a/resources/bitmaps_png/png/icon_bitmap2component_16_dark_32.png b/resources/bitmaps_png/png/icon_bitmap2component_16_dark_32.png
new file mode 100644
index 0000000000..a54431c593
Binary files /dev/null and b/resources/bitmaps_png/png/icon_bitmap2component_16_dark_32.png differ
diff --git a/resources/bitmaps_png/png/icon_cvpcb_24_48.png b/resources/bitmaps_png/png/icon_cvpcb_24_48.png
new file mode 100644
index 0000000000..b8b380fd42
Binary files /dev/null and b/resources/bitmaps_png/png/icon_cvpcb_24_48.png differ
diff --git a/resources/bitmaps_png/png/icon_cvpcb_24_dark_48.png b/resources/bitmaps_png/png/icon_cvpcb_24_dark_48.png
new file mode 100644
index 0000000000..b9c05ee412
Binary files /dev/null and b/resources/bitmaps_png/png/icon_cvpcb_24_dark_48.png differ
diff --git a/resources/bitmaps_png/png/icon_eeschema_16_32.png b/resources/bitmaps_png/png/icon_eeschema_16_32.png
new file mode 100644
index 0000000000..55e849a5dc
Binary files /dev/null and b/resources/bitmaps_png/png/icon_eeschema_16_32.png differ
diff --git a/resources/bitmaps_png/png/icon_eeschema_16_dark_32.png b/resources/bitmaps_png/png/icon_eeschema_16_dark_32.png
new file mode 100644
index 0000000000..55e849a5dc
Binary files /dev/null and b/resources/bitmaps_png/png/icon_eeschema_16_dark_32.png differ
diff --git a/resources/bitmaps_png/png/icon_footprint_browser_48.png b/resources/bitmaps_png/png/icon_footprint_browser_48.png
new file mode 100644
index 0000000000..4df601ba01
Binary files /dev/null and b/resources/bitmaps_png/png/icon_footprint_browser_48.png differ
diff --git a/resources/bitmaps_png/png/icon_footprint_browser_dark_48.png b/resources/bitmaps_png/png/icon_footprint_browser_dark_48.png
new file mode 100644
index 0000000000..dc153738c6
Binary files /dev/null and b/resources/bitmaps_png/png/icon_footprint_browser_dark_48.png differ
diff --git a/resources/bitmaps_png/png/icon_gerbview_16_32.png b/resources/bitmaps_png/png/icon_gerbview_16_32.png
new file mode 100644
index 0000000000..377a87edbe
Binary files /dev/null and b/resources/bitmaps_png/png/icon_gerbview_16_32.png differ
diff --git a/resources/bitmaps_png/png/icon_gerbview_16_dark_32.png b/resources/bitmaps_png/png/icon_gerbview_16_dark_32.png
new file mode 100644
index 0000000000..377a87edbe
Binary files /dev/null and b/resources/bitmaps_png/png/icon_gerbview_16_dark_32.png differ
diff --git a/resources/bitmaps_png/png/icon_gerbview_24_48.png b/resources/bitmaps_png/png/icon_gerbview_24_48.png
new file mode 100644
index 0000000000..7d06387495
Binary files /dev/null and b/resources/bitmaps_png/png/icon_gerbview_24_48.png differ
diff --git a/resources/bitmaps_png/png/icon_gerbview_24_dark_48.png b/resources/bitmaps_png/png/icon_gerbview_24_dark_48.png
new file mode 100644
index 0000000000..7d06387495
Binary files /dev/null and b/resources/bitmaps_png/png/icon_gerbview_24_dark_48.png differ
diff --git a/resources/bitmaps_png/png/icon_kicad_16_32.png b/resources/bitmaps_png/png/icon_kicad_16_32.png
new file mode 100644
index 0000000000..4ccab44255
Binary files /dev/null and b/resources/bitmaps_png/png/icon_kicad_16_32.png differ
diff --git a/resources/bitmaps_png/png/icon_kicad_16_dark_32.png b/resources/bitmaps_png/png/icon_kicad_16_dark_32.png
new file mode 100644
index 0000000000..4ccab44255
Binary files /dev/null and b/resources/bitmaps_png/png/icon_kicad_16_dark_32.png differ
diff --git a/resources/bitmaps_png/png/icon_kicad_nightly_16_32.png b/resources/bitmaps_png/png/icon_kicad_nightly_16_32.png
new file mode 100644
index 0000000000..6f139f06ea
Binary files /dev/null and b/resources/bitmaps_png/png/icon_kicad_nightly_16_32.png differ
diff --git a/resources/bitmaps_png/png/icon_kicad_nightly_16_dark_32.png b/resources/bitmaps_png/png/icon_kicad_nightly_16_dark_32.png
new file mode 100644
index 0000000000..6f139f06ea
Binary files /dev/null and b/resources/bitmaps_png/png/icon_kicad_nightly_16_dark_32.png differ
diff --git a/resources/bitmaps_png/png/icon_libedit_16_32.png b/resources/bitmaps_png/png/icon_libedit_16_32.png
new file mode 100644
index 0000000000..272bca69c4
Binary files /dev/null and b/resources/bitmaps_png/png/icon_libedit_16_32.png differ
diff --git a/resources/bitmaps_png/png/icon_libedit_16_dark_32.png b/resources/bitmaps_png/png/icon_libedit_16_dark_32.png
new file mode 100644
index 0000000000..54bc6e1b85
Binary files /dev/null and b/resources/bitmaps_png/png/icon_libedit_16_dark_32.png differ
diff --git a/resources/bitmaps_png/png/icon_modedit_16_32.png b/resources/bitmaps_png/png/icon_modedit_16_32.png
new file mode 100644
index 0000000000..67dd3e48d1
Binary files /dev/null and b/resources/bitmaps_png/png/icon_modedit_16_32.png differ
diff --git a/resources/bitmaps_png/png/icon_modedit_16_dark_32.png b/resources/bitmaps_png/png/icon_modedit_16_dark_32.png
new file mode 100644
index 0000000000..bb9cabdfad
Binary files /dev/null and b/resources/bitmaps_png/png/icon_modedit_16_dark_32.png differ
diff --git a/resources/bitmaps_png/png/icon_pagelayout_editor_16_32.png b/resources/bitmaps_png/png/icon_pagelayout_editor_16_32.png
new file mode 100644
index 0000000000..e06317b8bd
Binary files /dev/null and b/resources/bitmaps_png/png/icon_pagelayout_editor_16_32.png differ
diff --git a/resources/bitmaps_png/png/icon_pagelayout_editor_16_dark_32.png b/resources/bitmaps_png/png/icon_pagelayout_editor_16_dark_32.png
new file mode 100644
index 0000000000..e06317b8bd
Binary files /dev/null and b/resources/bitmaps_png/png/icon_pagelayout_editor_16_dark_32.png differ
diff --git a/resources/bitmaps_png/png/icon_pcbcalculator_16_32.png b/resources/bitmaps_png/png/icon_pcbcalculator_16_32.png
new file mode 100644
index 0000000000..9f762e3b44
Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbcalculator_16_32.png differ
diff --git a/resources/bitmaps_png/png/icon_pcbcalculator_16_dark_32.png b/resources/bitmaps_png/png/icon_pcbcalculator_16_dark_32.png
new file mode 100644
index 0000000000..9f762e3b44
Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbcalculator_16_dark_32.png differ
diff --git a/resources/bitmaps_png/png/icon_pcbnew_16_32.png b/resources/bitmaps_png/png/icon_pcbnew_16_32.png
new file mode 100644
index 0000000000..ff0f2faf79
Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbnew_16_32.png differ
diff --git a/resources/bitmaps_png/png/icon_pcbnew_16_dark_32.png b/resources/bitmaps_png/png/icon_pcbnew_16_dark_32.png
new file mode 100644
index 0000000000..ff0f2faf79
Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbnew_16_dark_32.png differ
diff --git a/resources/bitmaps_png/png/icon_pcm_24_48.png b/resources/bitmaps_png/png/icon_pcm_24_48.png
new file mode 100644
index 0000000000..fecc8a5744
Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcm_24_48.png differ
diff --git a/resources/bitmaps_png/png/icon_pcm_24_dark_48.png b/resources/bitmaps_png/png/icon_pcm_24_dark_48.png
new file mode 100644
index 0000000000..fecc8a5744
Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcm_24_dark_48.png differ
diff --git a/resources/bitmaps_png/png/image_48.png b/resources/bitmaps_png/png/image_48.png
new file mode 100644
index 0000000000..2de34342cb
Binary files /dev/null and b/resources/bitmaps_png/png/image_48.png differ
diff --git a/resources/bitmaps_png/png/image_dark_48.png b/resources/bitmaps_png/png/image_dark_48.png
new file mode 100644
index 0000000000..a92f5713df
Binary files /dev/null and b/resources/bitmaps_png/png/image_dark_48.png differ
diff --git a/resources/bitmaps_png/png/import3d_48.png b/resources/bitmaps_png/png/import3d_48.png
new file mode 100644
index 0000000000..7119a334be
Binary files /dev/null and b/resources/bitmaps_png/png/import3d_48.png differ
diff --git a/resources/bitmaps_png/png/import3d_dark_48.png b/resources/bitmaps_png/png/import3d_dark_48.png
new file mode 100644
index 0000000000..bf21b1b63d
Binary files /dev/null and b/resources/bitmaps_png/png/import3d_dark_48.png differ
diff --git a/resources/bitmaps_png/png/import_48.png b/resources/bitmaps_png/png/import_48.png
new file mode 100644
index 0000000000..829d822e6b
Binary files /dev/null and b/resources/bitmaps_png/png/import_48.png differ
diff --git a/resources/bitmaps_png/png/import_brd_file_48.png b/resources/bitmaps_png/png/import_brd_file_48.png
new file mode 100644
index 0000000000..827a7e0f61
Binary files /dev/null and b/resources/bitmaps_png/png/import_brd_file_48.png differ
diff --git a/resources/bitmaps_png/png/import_brd_file_dark_48.png b/resources/bitmaps_png/png/import_brd_file_dark_48.png
new file mode 100644
index 0000000000..6c1d006de0
Binary files /dev/null and b/resources/bitmaps_png/png/import_brd_file_dark_48.png differ
diff --git a/resources/bitmaps_png/png/import_dark_48.png b/resources/bitmaps_png/png/import_dark_48.png
new file mode 100644
index 0000000000..0d963c69fb
Binary files /dev/null and b/resources/bitmaps_png/png/import_dark_48.png differ
diff --git a/resources/bitmaps_png/png/import_document_48.png b/resources/bitmaps_png/png/import_document_48.png
new file mode 100644
index 0000000000..b90cdd016d
Binary files /dev/null and b/resources/bitmaps_png/png/import_document_48.png differ
diff --git a/resources/bitmaps_png/png/import_document_dark_48.png b/resources/bitmaps_png/png/import_document_dark_48.png
new file mode 100644
index 0000000000..b829b874b4
Binary files /dev/null and b/resources/bitmaps_png/png/import_document_dark_48.png differ
diff --git a/resources/bitmaps_png/png/import_footprint_names_48.png b/resources/bitmaps_png/png/import_footprint_names_48.png
new file mode 100644
index 0000000000..17f8263399
Binary files /dev/null and b/resources/bitmaps_png/png/import_footprint_names_48.png differ
diff --git a/resources/bitmaps_png/png/import_footprint_names_dark_48.png b/resources/bitmaps_png/png/import_footprint_names_dark_48.png
new file mode 100644
index 0000000000..144c589bb3
Binary files /dev/null and b/resources/bitmaps_png/png/import_footprint_names_dark_48.png differ
diff --git a/resources/bitmaps_png/png/import_hierarchical_label_48.png b/resources/bitmaps_png/png/import_hierarchical_label_48.png
new file mode 100644
index 0000000000..af70f5e6e6
Binary files /dev/null and b/resources/bitmaps_png/png/import_hierarchical_label_48.png differ
diff --git a/resources/bitmaps_png/png/import_hierarchical_label_dark_48.png b/resources/bitmaps_png/png/import_hierarchical_label_dark_48.png
new file mode 100644
index 0000000000..fe9cfed9ce
Binary files /dev/null and b/resources/bitmaps_png/png/import_hierarchical_label_dark_48.png differ
diff --git a/resources/bitmaps_png/png/import_module_48.png b/resources/bitmaps_png/png/import_module_48.png
new file mode 100644
index 0000000000..f05e07f291
Binary files /dev/null and b/resources/bitmaps_png/png/import_module_48.png differ
diff --git a/resources/bitmaps_png/png/import_module_dark_48.png b/resources/bitmaps_png/png/import_module_dark_48.png
new file mode 100644
index 0000000000..c3264c1126
Binary files /dev/null and b/resources/bitmaps_png/png/import_module_dark_48.png differ
diff --git a/resources/bitmaps_png/png/import_part_48.png b/resources/bitmaps_png/png/import_part_48.png
new file mode 100644
index 0000000000..a77a53479f
Binary files /dev/null and b/resources/bitmaps_png/png/import_part_48.png differ
diff --git a/resources/bitmaps_png/png/import_part_dark_48.png b/resources/bitmaps_png/png/import_part_dark_48.png
new file mode 100644
index 0000000000..c2d583a6ae
Binary files /dev/null and b/resources/bitmaps_png/png/import_part_dark_48.png differ
diff --git a/resources/bitmaps_png/png/import_project_48.png b/resources/bitmaps_png/png/import_project_48.png
new file mode 100644
index 0000000000..3742036a57
Binary files /dev/null and b/resources/bitmaps_png/png/import_project_48.png differ
diff --git a/resources/bitmaps_png/png/import_project_dark_48.png b/resources/bitmaps_png/png/import_project_dark_48.png
new file mode 100644
index 0000000000..424952fc7a
Binary files /dev/null and b/resources/bitmaps_png/png/import_project_dark_48.png differ
diff --git a/resources/bitmaps_png/png/import_vector_48.png b/resources/bitmaps_png/png/import_vector_48.png
new file mode 100644
index 0000000000..24928a65c0
Binary files /dev/null and b/resources/bitmaps_png/png/import_vector_48.png differ
diff --git a/resources/bitmaps_png/png/import_vector_dark_48.png b/resources/bitmaps_png/png/import_vector_dark_48.png
new file mode 100644
index 0000000000..b6e412d4eb
Binary files /dev/null and b/resources/bitmaps_png/png/import_vector_dark_48.png differ
diff --git a/resources/bitmaps_png/png/info_48.png b/resources/bitmaps_png/png/info_48.png
new file mode 100644
index 0000000000..eb36ba93cd
Binary files /dev/null and b/resources/bitmaps_png/png/info_48.png differ
diff --git a/resources/bitmaps_png/png/info_dark_48.png b/resources/bitmaps_png/png/info_dark_48.png
new file mode 100644
index 0000000000..7da0cab58b
Binary files /dev/null and b/resources/bitmaps_png/png/info_dark_48.png differ
diff --git a/resources/bitmaps_png/png/insert_module_board_48.png b/resources/bitmaps_png/png/insert_module_board_48.png
new file mode 100644
index 0000000000..b3e61a75ef
Binary files /dev/null and b/resources/bitmaps_png/png/insert_module_board_48.png differ
diff --git a/resources/bitmaps_png/png/insert_module_board_dark_48.png b/resources/bitmaps_png/png/insert_module_board_dark_48.png
new file mode 100644
index 0000000000..798d211a4d
Binary files /dev/null and b/resources/bitmaps_png/png/insert_module_board_dark_48.png differ
diff --git a/resources/bitmaps_png/png/intersect_polygons_48.png b/resources/bitmaps_png/png/intersect_polygons_48.png
new file mode 100644
index 0000000000..cbfccbc06f
Binary files /dev/null and b/resources/bitmaps_png/png/intersect_polygons_48.png differ
diff --git a/resources/bitmaps_png/png/intersect_polygons_dark_48.png b/resources/bitmaps_png/png/intersect_polygons_dark_48.png
new file mode 100644
index 0000000000..d26f0d85e5
Binary files /dev/null and b/resources/bitmaps_png/png/intersect_polygons_dark_48.png differ
diff --git a/resources/bitmaps_png/png/label_align_bottom_32.png b/resources/bitmaps_png/png/label_align_bottom_32.png
new file mode 100644
index 0000000000..de00a43ad6
Binary files /dev/null and b/resources/bitmaps_png/png/label_align_bottom_32.png differ
diff --git a/resources/bitmaps_png/png/label_align_bottom_dark_32.png b/resources/bitmaps_png/png/label_align_bottom_dark_32.png
new file mode 100644
index 0000000000..cae086ec9d
Binary files /dev/null and b/resources/bitmaps_png/png/label_align_bottom_dark_32.png differ
diff --git a/resources/bitmaps_png/png/label_align_left_32.png b/resources/bitmaps_png/png/label_align_left_32.png
new file mode 100644
index 0000000000..d7e27e9716
Binary files /dev/null and b/resources/bitmaps_png/png/label_align_left_32.png differ
diff --git a/resources/bitmaps_png/png/label_align_left_dark_32.png b/resources/bitmaps_png/png/label_align_left_dark_32.png
new file mode 100644
index 0000000000..53524433bd
Binary files /dev/null and b/resources/bitmaps_png/png/label_align_left_dark_32.png differ
diff --git a/resources/bitmaps_png/png/label_align_right_32.png b/resources/bitmaps_png/png/label_align_right_32.png
new file mode 100644
index 0000000000..4a9e5bd79f
Binary files /dev/null and b/resources/bitmaps_png/png/label_align_right_32.png differ
diff --git a/resources/bitmaps_png/png/label_align_right_dark_32.png b/resources/bitmaps_png/png/label_align_right_dark_32.png
new file mode 100644
index 0000000000..a5c0f8697b
Binary files /dev/null and b/resources/bitmaps_png/png/label_align_right_dark_32.png differ
diff --git a/resources/bitmaps_png/png/label_align_top_32.png b/resources/bitmaps_png/png/label_align_top_32.png
new file mode 100644
index 0000000000..86c3697e89
Binary files /dev/null and b/resources/bitmaps_png/png/label_align_top_32.png differ
diff --git a/resources/bitmaps_png/png/label_align_top_dark_32.png b/resources/bitmaps_png/png/label_align_top_dark_32.png
new file mode 100644
index 0000000000..9d4a9d8358
Binary files /dev/null and b/resources/bitmaps_png/png/label_align_top_dark_32.png differ
diff --git a/resources/bitmaps_png/png/language_48.png b/resources/bitmaps_png/png/language_48.png
new file mode 100644
index 0000000000..a9a29c7c6c
Binary files /dev/null and b/resources/bitmaps_png/png/language_48.png differ
diff --git a/resources/bitmaps_png/png/language_dark_48.png b/resources/bitmaps_png/png/language_dark_48.png
new file mode 100644
index 0000000000..a5e593d6e4
Binary files /dev/null and b/resources/bitmaps_png/png/language_dark_48.png differ
diff --git a/resources/bitmaps_png/png/layers_manager_48.png b/resources/bitmaps_png/png/layers_manager_48.png
new file mode 100644
index 0000000000..45bb00e6e9
Binary files /dev/null and b/resources/bitmaps_png/png/layers_manager_48.png differ
diff --git a/resources/bitmaps_png/png/layers_manager_dark_48.png b/resources/bitmaps_png/png/layers_manager_dark_48.png
new file mode 100644
index 0000000000..086e060056
Binary files /dev/null and b/resources/bitmaps_png/png/layers_manager_dark_48.png differ
diff --git a/resources/bitmaps_png/png/leave_sheet_48.png b/resources/bitmaps_png/png/leave_sheet_48.png
new file mode 100644
index 0000000000..f00504d81a
Binary files /dev/null and b/resources/bitmaps_png/png/leave_sheet_48.png differ
diff --git a/resources/bitmaps_png/png/leave_sheet_dark_48.png b/resources/bitmaps_png/png/leave_sheet_dark_48.png
new file mode 100644
index 0000000000..8b03347e1c
Binary files /dev/null and b/resources/bitmaps_png/png/leave_sheet_dark_48.png differ
diff --git a/resources/bitmaps_png/png/left_48.png b/resources/bitmaps_png/png/left_48.png
new file mode 100644
index 0000000000..f2949fe2cb
Binary files /dev/null and b/resources/bitmaps_png/png/left_48.png differ
diff --git a/resources/bitmaps_png/png/left_dark_48.png b/resources/bitmaps_png/png/left_dark_48.png
new file mode 100644
index 0000000000..3d29533dd2
Binary files /dev/null and b/resources/bitmaps_png/png/left_dark_48.png differ
diff --git a/resources/bitmaps_png/png/lib_next_48.png b/resources/bitmaps_png/png/lib_next_48.png
new file mode 100644
index 0000000000..5a680ad4bf
Binary files /dev/null and b/resources/bitmaps_png/png/lib_next_48.png differ
diff --git a/resources/bitmaps_png/png/lib_next_dark_48.png b/resources/bitmaps_png/png/lib_next_dark_48.png
new file mode 100644
index 0000000000..133a852188
Binary files /dev/null and b/resources/bitmaps_png/png/lib_next_dark_48.png differ
diff --git a/resources/bitmaps_png/png/lib_previous_48.png b/resources/bitmaps_png/png/lib_previous_48.png
new file mode 100644
index 0000000000..1bdd0c2914
Binary files /dev/null and b/resources/bitmaps_png/png/lib_previous_48.png differ
diff --git a/resources/bitmaps_png/png/lib_previous_dark_48.png b/resources/bitmaps_png/png/lib_previous_dark_48.png
new file mode 100644
index 0000000000..ad66aa841c
Binary files /dev/null and b/resources/bitmaps_png/png/lib_previous_dark_48.png differ
diff --git a/resources/bitmaps_png/png/libedit_48.png b/resources/bitmaps_png/png/libedit_48.png
new file mode 100644
index 0000000000..9ef3bfa1b6
Binary files /dev/null and b/resources/bitmaps_png/png/libedit_48.png differ
diff --git a/resources/bitmaps_png/png/libedit_dark_48.png b/resources/bitmaps_png/png/libedit_dark_48.png
new file mode 100644
index 0000000000..7bdff5b8cc
Binary files /dev/null and b/resources/bitmaps_png/png/libedit_dark_48.png differ
diff --git a/resources/bitmaps_png/png/library_48.png b/resources/bitmaps_png/png/library_48.png
new file mode 100644
index 0000000000..8496dc1478
Binary files /dev/null and b/resources/bitmaps_png/png/library_48.png differ
diff --git a/resources/bitmaps_png/png/library_archive_48.png b/resources/bitmaps_png/png/library_archive_48.png
new file mode 100644
index 0000000000..09d7469fcf
Binary files /dev/null and b/resources/bitmaps_png/png/library_archive_48.png differ
diff --git a/resources/bitmaps_png/png/library_archive_as_48.png b/resources/bitmaps_png/png/library_archive_as_48.png
new file mode 100644
index 0000000000..71c7d4e825
Binary files /dev/null and b/resources/bitmaps_png/png/library_archive_as_48.png differ
diff --git a/resources/bitmaps_png/png/library_archive_as_dark_48.png b/resources/bitmaps_png/png/library_archive_as_dark_48.png
new file mode 100644
index 0000000000..199131f2b8
Binary files /dev/null and b/resources/bitmaps_png/png/library_archive_as_dark_48.png differ
diff --git a/resources/bitmaps_png/png/library_archive_dark_48.png b/resources/bitmaps_png/png/library_archive_dark_48.png
new file mode 100644
index 0000000000..cd9f4eb197
Binary files /dev/null and b/resources/bitmaps_png/png/library_archive_dark_48.png differ
diff --git a/resources/bitmaps_png/png/library_browser_48.png b/resources/bitmaps_png/png/library_browser_48.png
new file mode 100644
index 0000000000..a7431a3313
Binary files /dev/null and b/resources/bitmaps_png/png/library_browser_48.png differ
diff --git a/resources/bitmaps_png/png/library_browser_dark_48.png b/resources/bitmaps_png/png/library_browser_dark_48.png
new file mode 100644
index 0000000000..0748659523
Binary files /dev/null and b/resources/bitmaps_png/png/library_browser_dark_48.png differ
diff --git a/resources/bitmaps_png/png/library_dark_48.png b/resources/bitmaps_png/png/library_dark_48.png
new file mode 100644
index 0000000000..7a00647a14
Binary files /dev/null and b/resources/bitmaps_png/png/library_dark_48.png differ
diff --git a/resources/bitmaps_png/png/library_table_48.png b/resources/bitmaps_png/png/library_table_48.png
new file mode 100644
index 0000000000..356a724808
Binary files /dev/null and b/resources/bitmaps_png/png/library_table_48.png differ
diff --git a/resources/bitmaps_png/png/library_table_dark_48.png b/resources/bitmaps_png/png/library_table_dark_48.png
new file mode 100644
index 0000000000..ecb257812e
Binary files /dev/null and b/resources/bitmaps_png/png/library_table_dark_48.png differ
diff --git a/resources/bitmaps_png/png/lines90_48.png b/resources/bitmaps_png/png/lines90_48.png
new file mode 100644
index 0000000000..3b521e576a
Binary files /dev/null and b/resources/bitmaps_png/png/lines90_48.png differ
diff --git a/resources/bitmaps_png/png/lines90_dark_48.png b/resources/bitmaps_png/png/lines90_dark_48.png
new file mode 100644
index 0000000000..ccb908455d
Binary files /dev/null and b/resources/bitmaps_png/png/lines90_dark_48.png differ
diff --git a/resources/bitmaps_png/png/lines_any_48.png b/resources/bitmaps_png/png/lines_any_48.png
new file mode 100644
index 0000000000..a4f1ef405c
Binary files /dev/null and b/resources/bitmaps_png/png/lines_any_48.png differ
diff --git a/resources/bitmaps_png/png/lines_any_dark_48.png b/resources/bitmaps_png/png/lines_any_dark_48.png
new file mode 100644
index 0000000000..5a7feb4c7a
Binary files /dev/null and b/resources/bitmaps_png/png/lines_any_dark_48.png differ
diff --git a/resources/bitmaps_png/png/list_nets_16_32.png b/resources/bitmaps_png/png/list_nets_16_32.png
new file mode 100644
index 0000000000..45df06049b
Binary files /dev/null and b/resources/bitmaps_png/png/list_nets_16_32.png differ
diff --git a/resources/bitmaps_png/png/list_nets_16_dark_32.png b/resources/bitmaps_png/png/list_nets_16_dark_32.png
new file mode 100644
index 0000000000..3337accf1e
Binary files /dev/null and b/resources/bitmaps_png/png/list_nets_16_dark_32.png differ
diff --git a/resources/bitmaps_png/png/list_nets_48.png b/resources/bitmaps_png/png/list_nets_48.png
new file mode 100644
index 0000000000..8e3021de6e
Binary files /dev/null and b/resources/bitmaps_png/png/list_nets_48.png differ
diff --git a/resources/bitmaps_png/png/list_nets_dark_48.png b/resources/bitmaps_png/png/list_nets_dark_48.png
new file mode 100644
index 0000000000..fad13e6029
Binary files /dev/null and b/resources/bitmaps_png/png/list_nets_dark_48.png differ
diff --git a/resources/bitmaps_png/png/load_drill_48.png b/resources/bitmaps_png/png/load_drill_48.png
new file mode 100644
index 0000000000..8b0f743694
Binary files /dev/null and b/resources/bitmaps_png/png/load_drill_48.png differ
diff --git a/resources/bitmaps_png/png/load_drill_dark_48.png b/resources/bitmaps_png/png/load_drill_dark_48.png
new file mode 100644
index 0000000000..15317737a6
Binary files /dev/null and b/resources/bitmaps_png/png/load_drill_dark_48.png differ
diff --git a/resources/bitmaps_png/png/load_gerber_48.png b/resources/bitmaps_png/png/load_gerber_48.png
new file mode 100644
index 0000000000..7d03d76353
Binary files /dev/null and b/resources/bitmaps_png/png/load_gerber_48.png differ
diff --git a/resources/bitmaps_png/png/load_gerber_dark_48.png b/resources/bitmaps_png/png/load_gerber_dark_48.png
new file mode 100644
index 0000000000..07b3de4851
Binary files /dev/null and b/resources/bitmaps_png/png/load_gerber_dark_48.png differ
diff --git a/resources/bitmaps_png/png/load_module_board_48.png b/resources/bitmaps_png/png/load_module_board_48.png
new file mode 100644
index 0000000000..2267c55b63
Binary files /dev/null and b/resources/bitmaps_png/png/load_module_board_48.png differ
diff --git a/resources/bitmaps_png/png/load_module_board_dark_48.png b/resources/bitmaps_png/png/load_module_board_dark_48.png
new file mode 100644
index 0000000000..5155b9ea25
Binary files /dev/null and b/resources/bitmaps_png/png/load_module_board_dark_48.png differ
diff --git a/resources/bitmaps_png/png/lock_unlock_48.png b/resources/bitmaps_png/png/lock_unlock_48.png
new file mode 100644
index 0000000000..9b7cc6643c
Binary files /dev/null and b/resources/bitmaps_png/png/lock_unlock_48.png differ
diff --git a/resources/bitmaps_png/png/lock_unlock_dark_48.png b/resources/bitmaps_png/png/lock_unlock_dark_48.png
new file mode 100644
index 0000000000..3113b2b7f6
Binary files /dev/null and b/resources/bitmaps_png/png/lock_unlock_dark_48.png differ
diff --git a/resources/bitmaps_png/png/locked_48.png b/resources/bitmaps_png/png/locked_48.png
new file mode 100644
index 0000000000..2e06f61c4a
Binary files /dev/null and b/resources/bitmaps_png/png/locked_48.png differ
diff --git a/resources/bitmaps_png/png/locked_dark_48.png b/resources/bitmaps_png/png/locked_dark_48.png
new file mode 100644
index 0000000000..8bd6476ecf
Binary files /dev/null and b/resources/bitmaps_png/png/locked_dark_48.png differ
diff --git a/resources/bitmaps_png/png/marker_exclude_48.png b/resources/bitmaps_png/png/marker_exclude_48.png
new file mode 100644
index 0000000000..2337e650a9
Binary files /dev/null and b/resources/bitmaps_png/png/marker_exclude_48.png differ
diff --git a/resources/bitmaps_png/png/marker_exclude_dark_48.png b/resources/bitmaps_png/png/marker_exclude_dark_48.png
new file mode 100644
index 0000000000..1b80624526
Binary files /dev/null and b/resources/bitmaps_png/png/marker_exclude_dark_48.png differ
diff --git a/resources/bitmaps_png/png/marker_next_48.png b/resources/bitmaps_png/png/marker_next_48.png
new file mode 100644
index 0000000000..dbafc6ab6b
Binary files /dev/null and b/resources/bitmaps_png/png/marker_next_48.png differ
diff --git a/resources/bitmaps_png/png/marker_next_dark_48.png b/resources/bitmaps_png/png/marker_next_dark_48.png
new file mode 100644
index 0000000000..27d8a51715
Binary files /dev/null and b/resources/bitmaps_png/png/marker_next_dark_48.png differ
diff --git a/resources/bitmaps_png/png/marker_previous_48.png b/resources/bitmaps_png/png/marker_previous_48.png
new file mode 100644
index 0000000000..3c4271acf9
Binary files /dev/null and b/resources/bitmaps_png/png/marker_previous_48.png differ
diff --git a/resources/bitmaps_png/png/marker_previous_dark_48.png b/resources/bitmaps_png/png/marker_previous_dark_48.png
new file mode 100644
index 0000000000..7168e1ec64
Binary files /dev/null and b/resources/bitmaps_png/png/marker_previous_dark_48.png differ
diff --git a/resources/bitmaps_png/png/measurement_48.png b/resources/bitmaps_png/png/measurement_48.png
new file mode 100644
index 0000000000..0115b95733
Binary files /dev/null and b/resources/bitmaps_png/png/measurement_48.png differ
diff --git a/resources/bitmaps_png/png/measurement_dark_48.png b/resources/bitmaps_png/png/measurement_dark_48.png
new file mode 100644
index 0000000000..1f14d6d223
Binary files /dev/null and b/resources/bitmaps_png/png/measurement_dark_48.png differ
diff --git a/resources/bitmaps_png/png/merge_polygons_48.png b/resources/bitmaps_png/png/merge_polygons_48.png
new file mode 100644
index 0000000000..93af4bb225
Binary files /dev/null and b/resources/bitmaps_png/png/merge_polygons_48.png differ
diff --git a/resources/bitmaps_png/png/merge_polygons_dark_48.png b/resources/bitmaps_png/png/merge_polygons_dark_48.png
new file mode 100644
index 0000000000..ede02e71af
Binary files /dev/null and b/resources/bitmaps_png/png/merge_polygons_dark_48.png differ
diff --git a/resources/bitmaps_png/png/mirror_h_48.png b/resources/bitmaps_png/png/mirror_h_48.png
new file mode 100644
index 0000000000..a0a6f7a886
Binary files /dev/null and b/resources/bitmaps_png/png/mirror_h_48.png differ
diff --git a/resources/bitmaps_png/png/mirror_h_dark_48.png b/resources/bitmaps_png/png/mirror_h_dark_48.png
new file mode 100644
index 0000000000..b4e02ba5cb
Binary files /dev/null and b/resources/bitmaps_png/png/mirror_h_dark_48.png differ
diff --git a/resources/bitmaps_png/png/mirror_v_48.png b/resources/bitmaps_png/png/mirror_v_48.png
new file mode 100644
index 0000000000..b43b0896c0
Binary files /dev/null and b/resources/bitmaps_png/png/mirror_v_48.png differ
diff --git a/resources/bitmaps_png/png/mirror_v_dark_48.png b/resources/bitmaps_png/png/mirror_v_dark_48.png
new file mode 100644
index 0000000000..22b3380e18
Binary files /dev/null and b/resources/bitmaps_png/png/mirror_v_dark_48.png differ
diff --git a/resources/bitmaps_png/png/mode_module_48.png b/resources/bitmaps_png/png/mode_module_48.png
new file mode 100644
index 0000000000..75b59f6469
Binary files /dev/null and b/resources/bitmaps_png/png/mode_module_48.png differ
diff --git a/resources/bitmaps_png/png/mode_module_dark_48.png b/resources/bitmaps_png/png/mode_module_dark_48.png
new file mode 100644
index 0000000000..2762bb5c95
Binary files /dev/null and b/resources/bitmaps_png/png/mode_module_dark_48.png differ
diff --git a/resources/bitmaps_png/png/module_48.png b/resources/bitmaps_png/png/module_48.png
new file mode 100644
index 0000000000..963e167ae3
Binary files /dev/null and b/resources/bitmaps_png/png/module_48.png differ
diff --git a/resources/bitmaps_png/png/module_dark_48.png b/resources/bitmaps_png/png/module_dark_48.png
new file mode 100644
index 0000000000..ab8bbd76f7
Binary files /dev/null and b/resources/bitmaps_png/png/module_dark_48.png differ
diff --git a/resources/bitmaps_png/png/module_editor_48.png b/resources/bitmaps_png/png/module_editor_48.png
new file mode 100644
index 0000000000..d70de3c5d7
Binary files /dev/null and b/resources/bitmaps_png/png/module_editor_48.png differ
diff --git a/resources/bitmaps_png/png/module_editor_dark_48.png b/resources/bitmaps_png/png/module_editor_dark_48.png
new file mode 100644
index 0000000000..8b320e868e
Binary files /dev/null and b/resources/bitmaps_png/png/module_editor_dark_48.png differ
diff --git a/resources/bitmaps_png/png/module_filtered_list_48.png b/resources/bitmaps_png/png/module_filtered_list_48.png
new file mode 100644
index 0000000000..39b200fb4b
Binary files /dev/null and b/resources/bitmaps_png/png/module_filtered_list_48.png differ
diff --git a/resources/bitmaps_png/png/module_filtered_list_dark_48.png b/resources/bitmaps_png/png/module_filtered_list_dark_48.png
new file mode 100644
index 0000000000..4fa424d9f3
Binary files /dev/null and b/resources/bitmaps_png/png/module_filtered_list_dark_48.png differ
diff --git a/resources/bitmaps_png/png/module_library_list_48.png b/resources/bitmaps_png/png/module_library_list_48.png
new file mode 100644
index 0000000000..a1d536ba35
Binary files /dev/null and b/resources/bitmaps_png/png/module_library_list_48.png differ
diff --git a/resources/bitmaps_png/png/module_library_list_dark_48.png b/resources/bitmaps_png/png/module_library_list_dark_48.png
new file mode 100644
index 0000000000..927baf9daf
Binary files /dev/null and b/resources/bitmaps_png/png/module_library_list_dark_48.png differ
diff --git a/resources/bitmaps_png/png/module_options_48.png b/resources/bitmaps_png/png/module_options_48.png
new file mode 100644
index 0000000000..43c75ce534
Binary files /dev/null and b/resources/bitmaps_png/png/module_options_48.png differ
diff --git a/resources/bitmaps_png/png/module_options_dark_48.png b/resources/bitmaps_png/png/module_options_dark_48.png
new file mode 100644
index 0000000000..18ec85173b
Binary files /dev/null and b/resources/bitmaps_png/png/module_options_dark_48.png differ
diff --git a/resources/bitmaps_png/png/module_pin_filtered_list_48.png b/resources/bitmaps_png/png/module_pin_filtered_list_48.png
new file mode 100644
index 0000000000..09cdf9e0f1
Binary files /dev/null and b/resources/bitmaps_png/png/module_pin_filtered_list_48.png differ
diff --git a/resources/bitmaps_png/png/module_pin_filtered_list_dark_48.png b/resources/bitmaps_png/png/module_pin_filtered_list_dark_48.png
new file mode 100644
index 0000000000..c743514b06
Binary files /dev/null and b/resources/bitmaps_png/png/module_pin_filtered_list_dark_48.png differ
diff --git a/resources/bitmaps_png/png/module_wizard_48.png b/resources/bitmaps_png/png/module_wizard_48.png
new file mode 100644
index 0000000000..b0b4225643
Binary files /dev/null and b/resources/bitmaps_png/png/module_wizard_48.png differ
diff --git a/resources/bitmaps_png/png/module_wizard_dark_48.png b/resources/bitmaps_png/png/module_wizard_dark_48.png
new file mode 100644
index 0000000000..b114f1a07a
Binary files /dev/null and b/resources/bitmaps_png/png/module_wizard_dark_48.png differ
diff --git a/resources/bitmaps_png/png/morgan1_48.png b/resources/bitmaps_png/png/morgan1_48.png
new file mode 100644
index 0000000000..6b5cc6a489
Binary files /dev/null and b/resources/bitmaps_png/png/morgan1_48.png differ
diff --git a/resources/bitmaps_png/png/morgan1_dark_48.png b/resources/bitmaps_png/png/morgan1_dark_48.png
new file mode 100644
index 0000000000..e87cfd0743
Binary files /dev/null and b/resources/bitmaps_png/png/morgan1_dark_48.png differ
diff --git a/resources/bitmaps_png/png/morgan2_48.png b/resources/bitmaps_png/png/morgan2_48.png
new file mode 100644
index 0000000000..775465b641
Binary files /dev/null and b/resources/bitmaps_png/png/morgan2_48.png differ
diff --git a/resources/bitmaps_png/png/morgan2_dark_48.png b/resources/bitmaps_png/png/morgan2_dark_48.png
new file mode 100644
index 0000000000..4ce9b78de6
Binary files /dev/null and b/resources/bitmaps_png/png/morgan2_dark_48.png differ
diff --git a/resources/bitmaps_png/png/move_48.png b/resources/bitmaps_png/png/move_48.png
new file mode 100644
index 0000000000..900fe34cad
Binary files /dev/null and b/resources/bitmaps_png/png/move_48.png differ
diff --git a/resources/bitmaps_png/png/move_dark_48.png b/resources/bitmaps_png/png/move_dark_48.png
new file mode 100644
index 0000000000..0c6241f9df
Binary files /dev/null and b/resources/bitmaps_png/png/move_dark_48.png differ
diff --git a/resources/bitmaps_png/png/move_exactly_48.png b/resources/bitmaps_png/png/move_exactly_48.png
new file mode 100644
index 0000000000..d3e2b10a8a
Binary files /dev/null and b/resources/bitmaps_png/png/move_exactly_48.png differ
diff --git a/resources/bitmaps_png/png/move_exactly_dark_48.png b/resources/bitmaps_png/png/move_exactly_dark_48.png
new file mode 100644
index 0000000000..b975b7569e
Binary files /dev/null and b/resources/bitmaps_png/png/move_exactly_dark_48.png differ
diff --git a/resources/bitmaps_png/png/move_relative_48.png b/resources/bitmaps_png/png/move_relative_48.png
new file mode 100644
index 0000000000..cf3952528e
Binary files /dev/null and b/resources/bitmaps_png/png/move_relative_48.png differ
diff --git a/resources/bitmaps_png/png/move_relative_dark_48.png b/resources/bitmaps_png/png/move_relative_dark_48.png
new file mode 100644
index 0000000000..34152ed791
Binary files /dev/null and b/resources/bitmaps_png/png/move_relative_dark_48.png differ
diff --git a/resources/bitmaps_png/png/mw_add_gap_48.png b/resources/bitmaps_png/png/mw_add_gap_48.png
new file mode 100644
index 0000000000..5b79226b01
Binary files /dev/null and b/resources/bitmaps_png/png/mw_add_gap_48.png differ
diff --git a/resources/bitmaps_png/png/mw_add_gap_dark_48.png b/resources/bitmaps_png/png/mw_add_gap_dark_48.png
new file mode 100644
index 0000000000..f0ceb6d41b
Binary files /dev/null and b/resources/bitmaps_png/png/mw_add_gap_dark_48.png differ
diff --git a/resources/bitmaps_png/png/mw_add_line_48.png b/resources/bitmaps_png/png/mw_add_line_48.png
new file mode 100644
index 0000000000..9e29d5e06f
Binary files /dev/null and b/resources/bitmaps_png/png/mw_add_line_48.png differ
diff --git a/resources/bitmaps_png/png/mw_add_line_dark_48.png b/resources/bitmaps_png/png/mw_add_line_dark_48.png
new file mode 100644
index 0000000000..e751d44ce8
Binary files /dev/null and b/resources/bitmaps_png/png/mw_add_line_dark_48.png differ
diff --git a/resources/bitmaps_png/png/mw_add_shape_48.png b/resources/bitmaps_png/png/mw_add_shape_48.png
new file mode 100644
index 0000000000..ead54fe586
Binary files /dev/null and b/resources/bitmaps_png/png/mw_add_shape_48.png differ
diff --git a/resources/bitmaps_png/png/mw_add_shape_dark_48.png b/resources/bitmaps_png/png/mw_add_shape_dark_48.png
new file mode 100644
index 0000000000..5bb671dc00
Binary files /dev/null and b/resources/bitmaps_png/png/mw_add_shape_dark_48.png differ
diff --git a/resources/bitmaps_png/png/mw_add_stub_48.png b/resources/bitmaps_png/png/mw_add_stub_48.png
new file mode 100644
index 0000000000..5574531148
Binary files /dev/null and b/resources/bitmaps_png/png/mw_add_stub_48.png differ
diff --git a/resources/bitmaps_png/png/mw_add_stub_arc_48.png b/resources/bitmaps_png/png/mw_add_stub_arc_48.png
new file mode 100644
index 0000000000..6865524f17
Binary files /dev/null and b/resources/bitmaps_png/png/mw_add_stub_arc_48.png differ
diff --git a/resources/bitmaps_png/png/mw_add_stub_arc_dark_48.png b/resources/bitmaps_png/png/mw_add_stub_arc_dark_48.png
new file mode 100644
index 0000000000..22597cd990
Binary files /dev/null and b/resources/bitmaps_png/png/mw_add_stub_arc_dark_48.png differ
diff --git a/resources/bitmaps_png/png/mw_add_stub_dark_48.png b/resources/bitmaps_png/png/mw_add_stub_dark_48.png
new file mode 100644
index 0000000000..f8dd697b9a
Binary files /dev/null and b/resources/bitmaps_png/png/mw_add_stub_dark_48.png differ
diff --git a/resources/bitmaps_png/png/net_highlight_48.png b/resources/bitmaps_png/png/net_highlight_48.png
new file mode 100644
index 0000000000..71b1482a39
Binary files /dev/null and b/resources/bitmaps_png/png/net_highlight_48.png differ
diff --git a/resources/bitmaps_png/png/net_highlight_dark_48.png b/resources/bitmaps_png/png/net_highlight_dark_48.png
new file mode 100644
index 0000000000..f0441b1cb8
Binary files /dev/null and b/resources/bitmaps_png/png/net_highlight_dark_48.png differ
diff --git a/resources/bitmaps_png/png/net_highlight_schematic_48.png b/resources/bitmaps_png/png/net_highlight_schematic_48.png
new file mode 100644
index 0000000000..083a122115
Binary files /dev/null and b/resources/bitmaps_png/png/net_highlight_schematic_48.png differ
diff --git a/resources/bitmaps_png/png/net_highlight_schematic_dark_48.png b/resources/bitmaps_png/png/net_highlight_schematic_dark_48.png
new file mode 100644
index 0000000000..c9f40a3b65
Binary files /dev/null and b/resources/bitmaps_png/png/net_highlight_schematic_dark_48.png differ
diff --git a/resources/bitmaps_png/png/netlist_48.png b/resources/bitmaps_png/png/netlist_48.png
new file mode 100644
index 0000000000..b2908375de
Binary files /dev/null and b/resources/bitmaps_png/png/netlist_48.png differ
diff --git a/resources/bitmaps_png/png/netlist_dark_48.png b/resources/bitmaps_png/png/netlist_dark_48.png
new file mode 100644
index 0000000000..fb5b58b910
Binary files /dev/null and b/resources/bitmaps_png/png/netlist_dark_48.png differ
diff --git a/resources/bitmaps_png/png/new_component_48.png b/resources/bitmaps_png/png/new_component_48.png
new file mode 100644
index 0000000000..b28d999ac4
Binary files /dev/null and b/resources/bitmaps_png/png/new_component_48.png differ
diff --git a/resources/bitmaps_png/png/new_component_dark_48.png b/resources/bitmaps_png/png/new_component_dark_48.png
new file mode 100644
index 0000000000..03eff8d632
Binary files /dev/null and b/resources/bitmaps_png/png/new_component_dark_48.png differ
diff --git a/resources/bitmaps_png/png/new_footprint_48.png b/resources/bitmaps_png/png/new_footprint_48.png
new file mode 100644
index 0000000000..b33c03248f
Binary files /dev/null and b/resources/bitmaps_png/png/new_footprint_48.png differ
diff --git a/resources/bitmaps_png/png/new_footprint_dark_48.png b/resources/bitmaps_png/png/new_footprint_dark_48.png
new file mode 100644
index 0000000000..4f744ea5c5
Binary files /dev/null and b/resources/bitmaps_png/png/new_footprint_dark_48.png differ
diff --git a/resources/bitmaps_png/png/new_generic_48.png b/resources/bitmaps_png/png/new_generic_48.png
new file mode 100644
index 0000000000..e493062d51
Binary files /dev/null and b/resources/bitmaps_png/png/new_generic_48.png differ
diff --git a/resources/bitmaps_png/png/new_generic_dark_48.png b/resources/bitmaps_png/png/new_generic_dark_48.png
new file mode 100644
index 0000000000..7c3a9b0364
Binary files /dev/null and b/resources/bitmaps_png/png/new_generic_dark_48.png differ
diff --git a/resources/bitmaps_png/png/new_library_48.png b/resources/bitmaps_png/png/new_library_48.png
new file mode 100644
index 0000000000..aa97f278b2
Binary files /dev/null and b/resources/bitmaps_png/png/new_library_48.png differ
diff --git a/resources/bitmaps_png/png/new_library_dark_48.png b/resources/bitmaps_png/png/new_library_dark_48.png
new file mode 100644
index 0000000000..f4b446d499
Binary files /dev/null and b/resources/bitmaps_png/png/new_library_dark_48.png differ
diff --git a/resources/bitmaps_png/png/new_project_48.png b/resources/bitmaps_png/png/new_project_48.png
new file mode 100644
index 0000000000..8f30205e40
Binary files /dev/null and b/resources/bitmaps_png/png/new_project_48.png differ
diff --git a/resources/bitmaps_png/png/new_project_dark_48.png b/resources/bitmaps_png/png/new_project_dark_48.png
new file mode 100644
index 0000000000..0a721e6292
Binary files /dev/null and b/resources/bitmaps_png/png/new_project_dark_48.png differ
diff --git a/resources/bitmaps_png/png/new_project_from_template_48.png b/resources/bitmaps_png/png/new_project_from_template_48.png
new file mode 100644
index 0000000000..57088f5231
Binary files /dev/null and b/resources/bitmaps_png/png/new_project_from_template_48.png differ
diff --git a/resources/bitmaps_png/png/new_project_from_template_dark_48.png b/resources/bitmaps_png/png/new_project_from_template_dark_48.png
new file mode 100644
index 0000000000..0455bc77a2
Binary files /dev/null and b/resources/bitmaps_png/png/new_project_from_template_dark_48.png differ
diff --git a/resources/bitmaps_png/png/noconn_48.png b/resources/bitmaps_png/png/noconn_48.png
new file mode 100644
index 0000000000..fe03ce136e
Binary files /dev/null and b/resources/bitmaps_png/png/noconn_48.png differ
diff --git a/resources/bitmaps_png/png/noconn_dark_48.png b/resources/bitmaps_png/png/noconn_dark_48.png
new file mode 100644
index 0000000000..af497de1ed
Binary files /dev/null and b/resources/bitmaps_png/png/noconn_dark_48.png differ
diff --git a/resources/bitmaps_png/png/normal_48.png b/resources/bitmaps_png/png/normal_48.png
new file mode 100644
index 0000000000..b39f619676
Binary files /dev/null and b/resources/bitmaps_png/png/normal_48.png differ
diff --git a/resources/bitmaps_png/png/normal_dark_48.png b/resources/bitmaps_png/png/normal_dark_48.png
new file mode 100644
index 0000000000..73001f5bf1
Binary files /dev/null and b/resources/bitmaps_png/png/normal_dark_48.png differ
diff --git a/resources/bitmaps_png/png/notifications_32.png b/resources/bitmaps_png/png/notifications_32.png
new file mode 100644
index 0000000000..9a395daa18
Binary files /dev/null and b/resources/bitmaps_png/png/notifications_32.png differ
diff --git a/resources/bitmaps_png/png/notifications_dark_32.png b/resources/bitmaps_png/png/notifications_dark_32.png
new file mode 100644
index 0000000000..6028452f96
Binary files /dev/null and b/resources/bitmaps_png/png/notifications_dark_32.png differ
diff --git a/resources/bitmaps_png/png/open_project_48.png b/resources/bitmaps_png/png/open_project_48.png
new file mode 100644
index 0000000000..4e70654d7f
Binary files /dev/null and b/resources/bitmaps_png/png/open_project_48.png differ
diff --git a/resources/bitmaps_png/png/open_project_dark_48.png b/resources/bitmaps_png/png/open_project_dark_48.png
new file mode 100644
index 0000000000..327eeebadd
Binary files /dev/null and b/resources/bitmaps_png/png/open_project_dark_48.png differ
diff --git a/resources/bitmaps_png/png/open_project_demo_48.png b/resources/bitmaps_png/png/open_project_demo_48.png
new file mode 100644
index 0000000000..7acd0f943e
Binary files /dev/null and b/resources/bitmaps_png/png/open_project_demo_48.png differ
diff --git a/resources/bitmaps_png/png/open_project_demo_dark_48.png b/resources/bitmaps_png/png/open_project_demo_dark_48.png
new file mode 100644
index 0000000000..395ea6ed18
Binary files /dev/null and b/resources/bitmaps_png/png/open_project_demo_dark_48.png differ
diff --git a/resources/bitmaps_png/png/opt_show_polygon_48.png b/resources/bitmaps_png/png/opt_show_polygon_48.png
new file mode 100644
index 0000000000..9ed2662efb
Binary files /dev/null and b/resources/bitmaps_png/png/opt_show_polygon_48.png differ
diff --git a/resources/bitmaps_png/png/opt_show_polygon_dark_48.png b/resources/bitmaps_png/png/opt_show_polygon_dark_48.png
new file mode 100644
index 0000000000..3332347487
Binary files /dev/null and b/resources/bitmaps_png/png/opt_show_polygon_dark_48.png differ
diff --git a/resources/bitmaps_png/png/options_3drender_48.png b/resources/bitmaps_png/png/options_3drender_48.png
new file mode 100644
index 0000000000..edb972b25b
Binary files /dev/null and b/resources/bitmaps_png/png/options_3drender_48.png differ
diff --git a/resources/bitmaps_png/png/options_3drender_dark_48.png b/resources/bitmaps_png/png/options_3drender_dark_48.png
new file mode 100644
index 0000000000..f4c8cddcca
Binary files /dev/null and b/resources/bitmaps_png/png/options_3drender_dark_48.png differ
diff --git a/resources/bitmaps_png/png/options_board_48.png b/resources/bitmaps_png/png/options_board_48.png
new file mode 100644
index 0000000000..33c5ffe416
Binary files /dev/null and b/resources/bitmaps_png/png/options_board_48.png differ
diff --git a/resources/bitmaps_png/png/options_board_dark_48.png b/resources/bitmaps_png/png/options_board_dark_48.png
new file mode 100644
index 0000000000..9f455a8c00
Binary files /dev/null and b/resources/bitmaps_png/png/options_board_dark_48.png differ
diff --git a/resources/bitmaps_png/png/options_generic_16_32.png b/resources/bitmaps_png/png/options_generic_16_32.png
new file mode 100644
index 0000000000..1c3c72e394
Binary files /dev/null and b/resources/bitmaps_png/png/options_generic_16_32.png differ
diff --git a/resources/bitmaps_png/png/options_generic_16_dark_32.png b/resources/bitmaps_png/png/options_generic_16_dark_32.png
new file mode 100644
index 0000000000..108c2ea656
Binary files /dev/null and b/resources/bitmaps_png/png/options_generic_16_dark_32.png differ
diff --git a/resources/bitmaps_png/png/options_generic_48.png b/resources/bitmaps_png/png/options_generic_48.png
new file mode 100644
index 0000000000..394bd11c01
Binary files /dev/null and b/resources/bitmaps_png/png/options_generic_48.png differ
diff --git a/resources/bitmaps_png/png/options_generic_dark_48.png b/resources/bitmaps_png/png/options_generic_dark_48.png
new file mode 100644
index 0000000000..667ac4aad7
Binary files /dev/null and b/resources/bitmaps_png/png/options_generic_dark_48.png differ
diff --git a/resources/bitmaps_png/png/options_pad_48.png b/resources/bitmaps_png/png/options_pad_48.png
new file mode 100644
index 0000000000..fb28d2aac0
Binary files /dev/null and b/resources/bitmaps_png/png/options_pad_48.png differ
diff --git a/resources/bitmaps_png/png/options_pad_dark_48.png b/resources/bitmaps_png/png/options_pad_dark_48.png
new file mode 100644
index 0000000000..2f1e06a380
Binary files /dev/null and b/resources/bitmaps_png/png/options_pad_dark_48.png differ
diff --git a/resources/bitmaps_png/png/options_schematic_48.png b/resources/bitmaps_png/png/options_schematic_48.png
new file mode 100644
index 0000000000..2b4849c255
Binary files /dev/null and b/resources/bitmaps_png/png/options_schematic_48.png differ
diff --git a/resources/bitmaps_png/png/options_schematic_dark_48.png b/resources/bitmaps_png/png/options_schematic_dark_48.png
new file mode 100644
index 0000000000..8841fc33a9
Binary files /dev/null and b/resources/bitmaps_png/png/options_schematic_dark_48.png differ
diff --git a/resources/bitmaps_png/png/ortho_48.png b/resources/bitmaps_png/png/ortho_48.png
new file mode 100644
index 0000000000..8367cc0aef
Binary files /dev/null and b/resources/bitmaps_png/png/ortho_48.png differ
diff --git a/resources/bitmaps_png/png/ortho_dark_48.png b/resources/bitmaps_png/png/ortho_dark_48.png
new file mode 100644
index 0000000000..855c495c39
Binary files /dev/null and b/resources/bitmaps_png/png/ortho_dark_48.png differ
diff --git a/resources/bitmaps_png/png/pack_footprints_48.png b/resources/bitmaps_png/png/pack_footprints_48.png
new file mode 100644
index 0000000000..98e732549e
Binary files /dev/null and b/resources/bitmaps_png/png/pack_footprints_48.png differ
diff --git a/resources/bitmaps_png/png/pack_footprints_dark_48.png b/resources/bitmaps_png/png/pack_footprints_dark_48.png
new file mode 100644
index 0000000000..8985be7a55
Binary files /dev/null and b/resources/bitmaps_png/png/pack_footprints_dark_48.png differ
diff --git a/resources/bitmaps_png/png/pad_48.png b/resources/bitmaps_png/png/pad_48.png
new file mode 100644
index 0000000000..5ce1ef5c9a
Binary files /dev/null and b/resources/bitmaps_png/png/pad_48.png differ
diff --git a/resources/bitmaps_png/png/pad_dark_48.png b/resources/bitmaps_png/png/pad_dark_48.png
new file mode 100644
index 0000000000..5ce1ef5c9a
Binary files /dev/null and b/resources/bitmaps_png/png/pad_dark_48.png differ
diff --git a/resources/bitmaps_png/png/pad_enumerate_48.png b/resources/bitmaps_png/png/pad_enumerate_48.png
new file mode 100644
index 0000000000..1604d1779a
Binary files /dev/null and b/resources/bitmaps_png/png/pad_enumerate_48.png differ
diff --git a/resources/bitmaps_png/png/pad_enumerate_dark_48.png b/resources/bitmaps_png/png/pad_enumerate_dark_48.png
new file mode 100644
index 0000000000..a73d3a1b7e
Binary files /dev/null and b/resources/bitmaps_png/png/pad_enumerate_dark_48.png differ
diff --git a/resources/bitmaps_png/png/pad_number_48.png b/resources/bitmaps_png/png/pad_number_48.png
new file mode 100644
index 0000000000..00885eb520
Binary files /dev/null and b/resources/bitmaps_png/png/pad_number_48.png differ
diff --git a/resources/bitmaps_png/png/pad_number_dark_48.png b/resources/bitmaps_png/png/pad_number_dark_48.png
new file mode 100644
index 0000000000..207596e89d
Binary files /dev/null and b/resources/bitmaps_png/png/pad_number_dark_48.png differ
diff --git a/resources/bitmaps_png/png/pad_sketch_48.png b/resources/bitmaps_png/png/pad_sketch_48.png
new file mode 100644
index 0000000000..ff6fb2156b
Binary files /dev/null and b/resources/bitmaps_png/png/pad_sketch_48.png differ
diff --git a/resources/bitmaps_png/png/pad_sketch_dark_48.png b/resources/bitmaps_png/png/pad_sketch_dark_48.png
new file mode 100644
index 0000000000..71310259e8
Binary files /dev/null and b/resources/bitmaps_png/png/pad_sketch_dark_48.png differ
diff --git a/resources/bitmaps_png/png/pads_mask_layers_48.png b/resources/bitmaps_png/png/pads_mask_layers_48.png
new file mode 100644
index 0000000000..b17d998820
Binary files /dev/null and b/resources/bitmaps_png/png/pads_mask_layers_48.png differ
diff --git a/resources/bitmaps_png/png/pads_mask_layers_dark_48.png b/resources/bitmaps_png/png/pads_mask_layers_dark_48.png
new file mode 100644
index 0000000000..baede272e4
Binary files /dev/null and b/resources/bitmaps_png/png/pads_mask_layers_dark_48.png differ
diff --git a/resources/bitmaps_png/png/pads_remove_48.png b/resources/bitmaps_png/png/pads_remove_48.png
new file mode 100644
index 0000000000..20c0f81e13
Binary files /dev/null and b/resources/bitmaps_png/png/pads_remove_48.png differ
diff --git a/resources/bitmaps_png/png/pads_remove_dark_48.png b/resources/bitmaps_png/png/pads_remove_dark_48.png
new file mode 100644
index 0000000000..81839418b8
Binary files /dev/null and b/resources/bitmaps_png/png/pads_remove_dark_48.png differ
diff --git a/resources/bitmaps_png/png/pagelayout_normal_view_mode_48.png b/resources/bitmaps_png/png/pagelayout_normal_view_mode_48.png
new file mode 100644
index 0000000000..e8e43c76c6
Binary files /dev/null and b/resources/bitmaps_png/png/pagelayout_normal_view_mode_48.png differ
diff --git a/resources/bitmaps_png/png/pagelayout_normal_view_mode_dark_48.png b/resources/bitmaps_png/png/pagelayout_normal_view_mode_dark_48.png
new file mode 100644
index 0000000000..424cc8f1cf
Binary files /dev/null and b/resources/bitmaps_png/png/pagelayout_normal_view_mode_dark_48.png differ
diff --git a/resources/bitmaps_png/png/pagelayout_special_view_mode_48.png b/resources/bitmaps_png/png/pagelayout_special_view_mode_48.png
new file mode 100644
index 0000000000..967cf6a55e
Binary files /dev/null and b/resources/bitmaps_png/png/pagelayout_special_view_mode_48.png differ
diff --git a/resources/bitmaps_png/png/pagelayout_special_view_mode_dark_48.png b/resources/bitmaps_png/png/pagelayout_special_view_mode_dark_48.png
new file mode 100644
index 0000000000..d38ad080fc
Binary files /dev/null and b/resources/bitmaps_png/png/pagelayout_special_view_mode_dark_48.png differ
diff --git a/resources/bitmaps_png/png/part_properties_48.png b/resources/bitmaps_png/png/part_properties_48.png
new file mode 100644
index 0000000000..df1e5eaabc
Binary files /dev/null and b/resources/bitmaps_png/png/part_properties_48.png differ
diff --git a/resources/bitmaps_png/png/part_properties_dark_48.png b/resources/bitmaps_png/png/part_properties_dark_48.png
new file mode 100644
index 0000000000..7fd99b59b6
Binary files /dev/null and b/resources/bitmaps_png/png/part_properties_dark_48.png differ
diff --git a/resources/bitmaps_png/png/paste_48.png b/resources/bitmaps_png/png/paste_48.png
new file mode 100644
index 0000000000..b167fd1dba
Binary files /dev/null and b/resources/bitmaps_png/png/paste_48.png differ
diff --git a/resources/bitmaps_png/png/paste_dark_48.png b/resources/bitmaps_png/png/paste_dark_48.png
new file mode 100644
index 0000000000..5bf5e1d2bd
Binary files /dev/null and b/resources/bitmaps_png/png/paste_dark_48.png differ
diff --git a/resources/bitmaps_png/png/paste_special_48.png b/resources/bitmaps_png/png/paste_special_48.png
new file mode 100644
index 0000000000..320b024a83
Binary files /dev/null and b/resources/bitmaps_png/png/paste_special_48.png differ
diff --git a/resources/bitmaps_png/png/paste_special_dark_48.png b/resources/bitmaps_png/png/paste_special_dark_48.png
new file mode 100644
index 0000000000..0a33b0da27
Binary files /dev/null and b/resources/bitmaps_png/png/paste_special_dark_48.png differ
diff --git a/resources/bitmaps_png/png/path_48.png b/resources/bitmaps_png/png/path_48.png
new file mode 100644
index 0000000000..1f4d184c7b
Binary files /dev/null and b/resources/bitmaps_png/png/path_48.png differ
diff --git a/resources/bitmaps_png/png/path_dark_48.png b/resources/bitmaps_png/png/path_dark_48.png
new file mode 100644
index 0000000000..1b95a6dc2b
Binary files /dev/null and b/resources/bitmaps_png/png/path_dark_48.png differ
diff --git a/resources/bitmaps_png/png/pcb_target_48.png b/resources/bitmaps_png/png/pcb_target_48.png
new file mode 100644
index 0000000000..bd57a4b332
Binary files /dev/null and b/resources/bitmaps_png/png/pcb_target_48.png differ
diff --git a/resources/bitmaps_png/png/pcb_target_dark_48.png b/resources/bitmaps_png/png/pcb_target_dark_48.png
new file mode 100644
index 0000000000..e65ff3630f
Binary files /dev/null and b/resources/bitmaps_png/png/pcb_target_dark_48.png differ
diff --git a/resources/bitmaps_png/png/pin2pin_48.png b/resources/bitmaps_png/png/pin2pin_48.png
new file mode 100644
index 0000000000..4b53567a85
Binary files /dev/null and b/resources/bitmaps_png/png/pin2pin_48.png differ
diff --git a/resources/bitmaps_png/png/pin2pin_dark_48.png b/resources/bitmaps_png/png/pin2pin_dark_48.png
new file mode 100644
index 0000000000..7c343c8fa4
Binary files /dev/null and b/resources/bitmaps_png/png/pin2pin_dark_48.png differ
diff --git a/resources/bitmaps_png/png/pin_48.png b/resources/bitmaps_png/png/pin_48.png
new file mode 100644
index 0000000000..94e851c192
Binary files /dev/null and b/resources/bitmaps_png/png/pin_48.png differ
diff --git a/resources/bitmaps_png/png/pin_dark_48.png b/resources/bitmaps_png/png/pin_dark_48.png
new file mode 100644
index 0000000000..524ffe5042
Binary files /dev/null and b/resources/bitmaps_png/png/pin_dark_48.png differ
diff --git a/resources/bitmaps_png/png/pin_show_etype_48.png b/resources/bitmaps_png/png/pin_show_etype_48.png
new file mode 100644
index 0000000000..57904617e3
Binary files /dev/null and b/resources/bitmaps_png/png/pin_show_etype_48.png differ
diff --git a/resources/bitmaps_png/png/pin_show_etype_dark_48.png b/resources/bitmaps_png/png/pin_show_etype_dark_48.png
new file mode 100644
index 0000000000..5e2e71b6df
Binary files /dev/null and b/resources/bitmaps_png/png/pin_show_etype_dark_48.png differ
diff --git a/resources/bitmaps_png/png/pin_size_to_48.png b/resources/bitmaps_png/png/pin_size_to_48.png
new file mode 100644
index 0000000000..cb6127847d
Binary files /dev/null and b/resources/bitmaps_png/png/pin_size_to_48.png differ
diff --git a/resources/bitmaps_png/png/pin_size_to_dark_48.png b/resources/bitmaps_png/png/pin_size_to_dark_48.png
new file mode 100644
index 0000000000..7e21735a9c
Binary files /dev/null and b/resources/bitmaps_png/png/pin_size_to_dark_48.png differ
diff --git a/resources/bitmaps_png/png/pin_table_48.png b/resources/bitmaps_png/png/pin_table_48.png
new file mode 100644
index 0000000000..88be6c67d1
Binary files /dev/null and b/resources/bitmaps_png/png/pin_table_48.png differ
diff --git a/resources/bitmaps_png/png/pin_table_dark_48.png b/resources/bitmaps_png/png/pin_table_dark_48.png
new file mode 100644
index 0000000000..818f981fa4
Binary files /dev/null and b/resources/bitmaps_png/png/pin_table_dark_48.png differ
diff --git a/resources/bitmaps_png/png/pinorient_down_32.png b/resources/bitmaps_png/png/pinorient_down_32.png
new file mode 100644
index 0000000000..1ad579ccf2
Binary files /dev/null and b/resources/bitmaps_png/png/pinorient_down_32.png differ
diff --git a/resources/bitmaps_png/png/pinorient_down_dark_32.png b/resources/bitmaps_png/png/pinorient_down_dark_32.png
new file mode 100644
index 0000000000..5fd1b600b5
Binary files /dev/null and b/resources/bitmaps_png/png/pinorient_down_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pinorient_left_32.png b/resources/bitmaps_png/png/pinorient_left_32.png
new file mode 100644
index 0000000000..0d42432d79
Binary files /dev/null and b/resources/bitmaps_png/png/pinorient_left_32.png differ
diff --git a/resources/bitmaps_png/png/pinorient_left_dark_32.png b/resources/bitmaps_png/png/pinorient_left_dark_32.png
new file mode 100644
index 0000000000..715835111e
Binary files /dev/null and b/resources/bitmaps_png/png/pinorient_left_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pinorient_right_32.png b/resources/bitmaps_png/png/pinorient_right_32.png
new file mode 100644
index 0000000000..077b50a74e
Binary files /dev/null and b/resources/bitmaps_png/png/pinorient_right_32.png differ
diff --git a/resources/bitmaps_png/png/pinorient_right_dark_32.png b/resources/bitmaps_png/png/pinorient_right_dark_32.png
new file mode 100644
index 0000000000..f3b910ef59
Binary files /dev/null and b/resources/bitmaps_png/png/pinorient_right_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pinorient_up_32.png b/resources/bitmaps_png/png/pinorient_up_32.png
new file mode 100644
index 0000000000..3ced0ef6ca
Binary files /dev/null and b/resources/bitmaps_png/png/pinorient_up_32.png differ
diff --git a/resources/bitmaps_png/png/pinorient_up_dark_32.png b/resources/bitmaps_png/png/pinorient_up_dark_32.png
new file mode 100644
index 0000000000..a6de8b2858
Binary files /dev/null and b/resources/bitmaps_png/png/pinorient_up_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pinshape_active_low_input_32.png b/resources/bitmaps_png/png/pinshape_active_low_input_32.png
new file mode 100644
index 0000000000..db542db34b
Binary files /dev/null and b/resources/bitmaps_png/png/pinshape_active_low_input_32.png differ
diff --git a/resources/bitmaps_png/png/pinshape_active_low_input_dark_32.png b/resources/bitmaps_png/png/pinshape_active_low_input_dark_32.png
new file mode 100644
index 0000000000..0301b27a72
Binary files /dev/null and b/resources/bitmaps_png/png/pinshape_active_low_input_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pinshape_active_low_output_32.png b/resources/bitmaps_png/png/pinshape_active_low_output_32.png
new file mode 100644
index 0000000000..957a9c74e0
Binary files /dev/null and b/resources/bitmaps_png/png/pinshape_active_low_output_32.png differ
diff --git a/resources/bitmaps_png/png/pinshape_active_low_output_dark_32.png b/resources/bitmaps_png/png/pinshape_active_low_output_dark_32.png
new file mode 100644
index 0000000000..ba7746bc13
Binary files /dev/null and b/resources/bitmaps_png/png/pinshape_active_low_output_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pinshape_clock_active_low_32.png b/resources/bitmaps_png/png/pinshape_clock_active_low_32.png
new file mode 100644
index 0000000000..402831d67f
Binary files /dev/null and b/resources/bitmaps_png/png/pinshape_clock_active_low_32.png differ
diff --git a/resources/bitmaps_png/png/pinshape_clock_active_low_dark_32.png b/resources/bitmaps_png/png/pinshape_clock_active_low_dark_32.png
new file mode 100644
index 0000000000..76992f9b52
Binary files /dev/null and b/resources/bitmaps_png/png/pinshape_clock_active_low_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pinshape_clock_fall_32.png b/resources/bitmaps_png/png/pinshape_clock_fall_32.png
new file mode 100644
index 0000000000..2c655cfde1
Binary files /dev/null and b/resources/bitmaps_png/png/pinshape_clock_fall_32.png differ
diff --git a/resources/bitmaps_png/png/pinshape_clock_fall_dark_32.png b/resources/bitmaps_png/png/pinshape_clock_fall_dark_32.png
new file mode 100644
index 0000000000..6e1337b786
Binary files /dev/null and b/resources/bitmaps_png/png/pinshape_clock_fall_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pinshape_clock_invert_32.png b/resources/bitmaps_png/png/pinshape_clock_invert_32.png
new file mode 100644
index 0000000000..212e2177c0
Binary files /dev/null and b/resources/bitmaps_png/png/pinshape_clock_invert_32.png differ
diff --git a/resources/bitmaps_png/png/pinshape_clock_invert_dark_32.png b/resources/bitmaps_png/png/pinshape_clock_invert_dark_32.png
new file mode 100644
index 0000000000..621931b5a4
Binary files /dev/null and b/resources/bitmaps_png/png/pinshape_clock_invert_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pinshape_clock_normal_32.png b/resources/bitmaps_png/png/pinshape_clock_normal_32.png
new file mode 100644
index 0000000000..19f7423970
Binary files /dev/null and b/resources/bitmaps_png/png/pinshape_clock_normal_32.png differ
diff --git a/resources/bitmaps_png/png/pinshape_clock_normal_dark_32.png b/resources/bitmaps_png/png/pinshape_clock_normal_dark_32.png
new file mode 100644
index 0000000000..e374810bbf
Binary files /dev/null and b/resources/bitmaps_png/png/pinshape_clock_normal_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pinshape_invert_32.png b/resources/bitmaps_png/png/pinshape_invert_32.png
new file mode 100644
index 0000000000..9bf62d52ca
Binary files /dev/null and b/resources/bitmaps_png/png/pinshape_invert_32.png differ
diff --git a/resources/bitmaps_png/png/pinshape_invert_dark_32.png b/resources/bitmaps_png/png/pinshape_invert_dark_32.png
new file mode 100644
index 0000000000..b76feccf58
Binary files /dev/null and b/resources/bitmaps_png/png/pinshape_invert_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pinshape_nonlogic_32.png b/resources/bitmaps_png/png/pinshape_nonlogic_32.png
new file mode 100644
index 0000000000..24b7980dcf
Binary files /dev/null and b/resources/bitmaps_png/png/pinshape_nonlogic_32.png differ
diff --git a/resources/bitmaps_png/png/pinshape_nonlogic_dark_32.png b/resources/bitmaps_png/png/pinshape_nonlogic_dark_32.png
new file mode 100644
index 0000000000..354dfd5df4
Binary files /dev/null and b/resources/bitmaps_png/png/pinshape_nonlogic_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pinshape_normal_32.png b/resources/bitmaps_png/png/pinshape_normal_32.png
new file mode 100644
index 0000000000..505ba64e2d
Binary files /dev/null and b/resources/bitmaps_png/png/pinshape_normal_32.png differ
diff --git a/resources/bitmaps_png/png/pinshape_normal_dark_32.png b/resources/bitmaps_png/png/pinshape_normal_dark_32.png
new file mode 100644
index 0000000000..e86922d2e7
Binary files /dev/null and b/resources/bitmaps_png/png/pinshape_normal_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_3states_32.png b/resources/bitmaps_png/png/pintype_3states_32.png
new file mode 100644
index 0000000000..a2a55b9a1d
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_3states_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_3states_dark_32.png b/resources/bitmaps_png/png/pintype_3states_dark_32.png
new file mode 100644
index 0000000000..aa719b2b1a
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_3states_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_bidi_32.png b/resources/bitmaps_png/png/pintype_bidi_32.png
new file mode 100644
index 0000000000..90d1571851
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_bidi_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_bidi_dark_32.png b/resources/bitmaps_png/png/pintype_bidi_dark_32.png
new file mode 100644
index 0000000000..a63852bb25
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_bidi_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_input_32.png b/resources/bitmaps_png/png/pintype_input_32.png
new file mode 100644
index 0000000000..71855610ad
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_input_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_input_dark_32.png b/resources/bitmaps_png/png/pintype_input_dark_32.png
new file mode 100644
index 0000000000..91095ed972
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_input_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_nic_32.png b/resources/bitmaps_png/png/pintype_nic_32.png
new file mode 100644
index 0000000000..a252025395
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_nic_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_nic_dark_32.png b/resources/bitmaps_png/png/pintype_nic_dark_32.png
new file mode 100644
index 0000000000..a0a26023d0
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_nic_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_noconnect_32.png b/resources/bitmaps_png/png/pintype_noconnect_32.png
new file mode 100644
index 0000000000..005bf9efd9
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_noconnect_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_noconnect_dark_32.png b/resources/bitmaps_png/png/pintype_noconnect_dark_32.png
new file mode 100644
index 0000000000..33e8a7f2a9
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_noconnect_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_notspecif_32.png b/resources/bitmaps_png/png/pintype_notspecif_32.png
new file mode 100644
index 0000000000..d599e66f2e
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_notspecif_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_notspecif_dark_32.png b/resources/bitmaps_png/png/pintype_notspecif_dark_32.png
new file mode 100644
index 0000000000..e81d9ed465
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_notspecif_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_opencoll_32.png b/resources/bitmaps_png/png/pintype_opencoll_32.png
new file mode 100644
index 0000000000..cc8de55ded
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_opencoll_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_opencoll_dark_32.png b/resources/bitmaps_png/png/pintype_opencoll_dark_32.png
new file mode 100644
index 0000000000..f9eda2878b
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_opencoll_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_openemit_32.png b/resources/bitmaps_png/png/pintype_openemit_32.png
new file mode 100644
index 0000000000..15d816f4d6
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_openemit_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_openemit_dark_32.png b/resources/bitmaps_png/png/pintype_openemit_dark_32.png
new file mode 100644
index 0000000000..993ec79b28
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_openemit_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_output_32.png b/resources/bitmaps_png/png/pintype_output_32.png
new file mode 100644
index 0000000000..c33a6f1551
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_output_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_output_dark_32.png b/resources/bitmaps_png/png/pintype_output_dark_32.png
new file mode 100644
index 0000000000..b63e77632f
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_output_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_passive_32.png b/resources/bitmaps_png/png/pintype_passive_32.png
new file mode 100644
index 0000000000..750a01953b
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_passive_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_passive_dark_32.png b/resources/bitmaps_png/png/pintype_passive_dark_32.png
new file mode 100644
index 0000000000..f128b84189
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_passive_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_powerinput_32.png b/resources/bitmaps_png/png/pintype_powerinput_32.png
new file mode 100644
index 0000000000..6625ba9faf
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_powerinput_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_powerinput_dark_32.png b/resources/bitmaps_png/png/pintype_powerinput_dark_32.png
new file mode 100644
index 0000000000..ec40cab4aa
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_powerinput_dark_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_poweroutput_32.png b/resources/bitmaps_png/png/pintype_poweroutput_32.png
new file mode 100644
index 0000000000..8369cb92d5
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_poweroutput_32.png differ
diff --git a/resources/bitmaps_png/png/pintype_poweroutput_dark_32.png b/resources/bitmaps_png/png/pintype_poweroutput_dark_32.png
new file mode 100644
index 0000000000..2c83c20599
Binary files /dev/null and b/resources/bitmaps_png/png/pintype_poweroutput_dark_32.png differ
diff --git a/resources/bitmaps_png/png/plot_48.png b/resources/bitmaps_png/png/plot_48.png
new file mode 100644
index 0000000000..a2f30f4763
Binary files /dev/null and b/resources/bitmaps_png/png/plot_48.png differ
diff --git a/resources/bitmaps_png/png/plot_dark_48.png b/resources/bitmaps_png/png/plot_dark_48.png
new file mode 100644
index 0000000000..c27486c044
Binary files /dev/null and b/resources/bitmaps_png/png/plot_dark_48.png differ
diff --git a/resources/bitmaps_png/png/polar_coord_48.png b/resources/bitmaps_png/png/polar_coord_48.png
new file mode 100644
index 0000000000..ea4f31fd85
Binary files /dev/null and b/resources/bitmaps_png/png/polar_coord_48.png differ
diff --git a/resources/bitmaps_png/png/polar_coord_dark_48.png b/resources/bitmaps_png/png/polar_coord_dark_48.png
new file mode 100644
index 0000000000..39e001df15
Binary files /dev/null and b/resources/bitmaps_png/png/polar_coord_dark_48.png differ
diff --git a/resources/bitmaps_png/png/post_bom_48.png b/resources/bitmaps_png/png/post_bom_48.png
new file mode 100644
index 0000000000..fafa9b2f73
Binary files /dev/null and b/resources/bitmaps_png/png/post_bom_48.png differ
diff --git a/resources/bitmaps_png/png/post_bom_dark_48.png b/resources/bitmaps_png/png/post_bom_dark_48.png
new file mode 100644
index 0000000000..5c65e99ed3
Binary files /dev/null and b/resources/bitmaps_png/png/post_bom_dark_48.png differ
diff --git a/resources/bitmaps_png/png/post_compo_48.png b/resources/bitmaps_png/png/post_compo_48.png
new file mode 100644
index 0000000000..1c64cd3545
Binary files /dev/null and b/resources/bitmaps_png/png/post_compo_48.png differ
diff --git a/resources/bitmaps_png/png/post_compo_dark_48.png b/resources/bitmaps_png/png/post_compo_dark_48.png
new file mode 100644
index 0000000000..5b71d716e9
Binary files /dev/null and b/resources/bitmaps_png/png/post_compo_dark_48.png differ
diff --git a/resources/bitmaps_png/png/post_d356_48.png b/resources/bitmaps_png/png/post_d356_48.png
new file mode 100644
index 0000000000..7b4092eb32
Binary files /dev/null and b/resources/bitmaps_png/png/post_d356_48.png differ
diff --git a/resources/bitmaps_png/png/post_d356_dark_48.png b/resources/bitmaps_png/png/post_d356_dark_48.png
new file mode 100644
index 0000000000..7f5b668bea
Binary files /dev/null and b/resources/bitmaps_png/png/post_d356_dark_48.png differ
diff --git a/resources/bitmaps_png/png/post_drill_48.png b/resources/bitmaps_png/png/post_drill_48.png
new file mode 100644
index 0000000000..69f5ca706d
Binary files /dev/null and b/resources/bitmaps_png/png/post_drill_48.png differ
diff --git a/resources/bitmaps_png/png/post_drill_dark_48.png b/resources/bitmaps_png/png/post_drill_dark_48.png
new file mode 100644
index 0000000000..1cb5d5c582
Binary files /dev/null and b/resources/bitmaps_png/png/post_drill_dark_48.png differ
diff --git a/resources/bitmaps_png/png/post_gencad_48.png b/resources/bitmaps_png/png/post_gencad_48.png
new file mode 100644
index 0000000000..71df388cab
Binary files /dev/null and b/resources/bitmaps_png/png/post_gencad_48.png differ
diff --git a/resources/bitmaps_png/png/post_gencad_dark_48.png b/resources/bitmaps_png/png/post_gencad_dark_48.png
new file mode 100644
index 0000000000..20a2510bb8
Binary files /dev/null and b/resources/bitmaps_png/png/post_gencad_dark_48.png differ
diff --git a/resources/bitmaps_png/png/post_gerber_48.png b/resources/bitmaps_png/png/post_gerber_48.png
new file mode 100644
index 0000000000..6c4985b3be
Binary files /dev/null and b/resources/bitmaps_png/png/post_gerber_48.png differ
diff --git a/resources/bitmaps_png/png/post_gerber_dark_48.png b/resources/bitmaps_png/png/post_gerber_dark_48.png
new file mode 100644
index 0000000000..25a43a596d
Binary files /dev/null and b/resources/bitmaps_png/png/post_gerber_dark_48.png differ
diff --git a/resources/bitmaps_png/png/post_rpt_48.png b/resources/bitmaps_png/png/post_rpt_48.png
new file mode 100644
index 0000000000..dc648b2fc6
Binary files /dev/null and b/resources/bitmaps_png/png/post_rpt_48.png differ
diff --git a/resources/bitmaps_png/png/post_rpt_dark_48.png b/resources/bitmaps_png/png/post_rpt_dark_48.png
new file mode 100644
index 0000000000..ec0605fd82
Binary files /dev/null and b/resources/bitmaps_png/png/post_rpt_dark_48.png differ
diff --git a/resources/bitmaps_png/png/preference_48.png b/resources/bitmaps_png/png/preference_48.png
new file mode 100644
index 0000000000..1f5e49b6f1
Binary files /dev/null and b/resources/bitmaps_png/png/preference_48.png differ
diff --git a/resources/bitmaps_png/png/preference_dark_48.png b/resources/bitmaps_png/png/preference_dark_48.png
new file mode 100644
index 0000000000..8b9d0a27c0
Binary files /dev/null and b/resources/bitmaps_png/png/preference_dark_48.png differ
diff --git a/resources/bitmaps_png/png/print_button_48.png b/resources/bitmaps_png/png/print_button_48.png
new file mode 100644
index 0000000000..bdbcc201b1
Binary files /dev/null and b/resources/bitmaps_png/png/print_button_48.png differ
diff --git a/resources/bitmaps_png/png/print_button_dark_48.png b/resources/bitmaps_png/png/print_button_dark_48.png
new file mode 100644
index 0000000000..e74c06e389
Binary files /dev/null and b/resources/bitmaps_png/png/print_button_dark_48.png differ
diff --git a/resources/bitmaps_png/png/project_48.png b/resources/bitmaps_png/png/project_48.png
new file mode 100644
index 0000000000..da2c3ddae9
Binary files /dev/null and b/resources/bitmaps_png/png/project_48.png differ
diff --git a/resources/bitmaps_png/png/project_close_48.png b/resources/bitmaps_png/png/project_close_48.png
new file mode 100644
index 0000000000..52d42dc7c3
Binary files /dev/null and b/resources/bitmaps_png/png/project_close_48.png differ
diff --git a/resources/bitmaps_png/png/project_close_dark_48.png b/resources/bitmaps_png/png/project_close_dark_48.png
new file mode 100644
index 0000000000..f668b45e3e
Binary files /dev/null and b/resources/bitmaps_png/png/project_close_dark_48.png differ
diff --git a/resources/bitmaps_png/png/project_dark_48.png b/resources/bitmaps_png/png/project_dark_48.png
new file mode 100644
index 0000000000..114bc929da
Binary files /dev/null and b/resources/bitmaps_png/png/project_dark_48.png differ
diff --git a/resources/bitmaps_png/png/project_kicad_48.png b/resources/bitmaps_png/png/project_kicad_48.png
new file mode 100644
index 0000000000..da2c3ddae9
Binary files /dev/null and b/resources/bitmaps_png/png/project_kicad_48.png differ
diff --git a/resources/bitmaps_png/png/project_kicad_dark_48.png b/resources/bitmaps_png/png/project_kicad_dark_48.png
new file mode 100644
index 0000000000..114bc929da
Binary files /dev/null and b/resources/bitmaps_png/png/project_kicad_dark_48.png differ
diff --git a/resources/bitmaps_png/png/ps_diff_pair_48.png b/resources/bitmaps_png/png/ps_diff_pair_48.png
new file mode 100644
index 0000000000..9e6c4b6459
Binary files /dev/null and b/resources/bitmaps_png/png/ps_diff_pair_48.png differ
diff --git a/resources/bitmaps_png/png/ps_diff_pair_dark_48.png b/resources/bitmaps_png/png/ps_diff_pair_dark_48.png
new file mode 100644
index 0000000000..abbe0675f6
Binary files /dev/null and b/resources/bitmaps_png/png/ps_diff_pair_dark_48.png differ
diff --git a/resources/bitmaps_png/png/ps_diff_pair_gap_48.png b/resources/bitmaps_png/png/ps_diff_pair_gap_48.png
new file mode 100644
index 0000000000..cdc3c6ff9d
Binary files /dev/null and b/resources/bitmaps_png/png/ps_diff_pair_gap_48.png differ
diff --git a/resources/bitmaps_png/png/ps_diff_pair_gap_dark_48.png b/resources/bitmaps_png/png/ps_diff_pair_gap_dark_48.png
new file mode 100644
index 0000000000..63f5b5948c
Binary files /dev/null and b/resources/bitmaps_png/png/ps_diff_pair_gap_dark_48.png differ
diff --git a/resources/bitmaps_png/png/ps_diff_pair_tune_length_48.png b/resources/bitmaps_png/png/ps_diff_pair_tune_length_48.png
new file mode 100644
index 0000000000..5eae11c22b
Binary files /dev/null and b/resources/bitmaps_png/png/ps_diff_pair_tune_length_48.png differ
diff --git a/resources/bitmaps_png/png/ps_diff_pair_tune_length_dark_48.png b/resources/bitmaps_png/png/ps_diff_pair_tune_length_dark_48.png
new file mode 100644
index 0000000000..103339dd88
Binary files /dev/null and b/resources/bitmaps_png/png/ps_diff_pair_tune_length_dark_48.png differ
diff --git a/resources/bitmaps_png/png/ps_diff_pair_tune_phase_48.png b/resources/bitmaps_png/png/ps_diff_pair_tune_phase_48.png
new file mode 100644
index 0000000000..ef783c1408
Binary files /dev/null and b/resources/bitmaps_png/png/ps_diff_pair_tune_phase_48.png differ
diff --git a/resources/bitmaps_png/png/ps_diff_pair_tune_phase_dark_48.png b/resources/bitmaps_png/png/ps_diff_pair_tune_phase_dark_48.png
new file mode 100644
index 0000000000..dc23d40bfb
Binary files /dev/null and b/resources/bitmaps_png/png/ps_diff_pair_tune_phase_dark_48.png differ
diff --git a/resources/bitmaps_png/png/ps_tune_length_48.png b/resources/bitmaps_png/png/ps_tune_length_48.png
new file mode 100644
index 0000000000..74b39e8f75
Binary files /dev/null and b/resources/bitmaps_png/png/ps_tune_length_48.png differ
diff --git a/resources/bitmaps_png/png/ps_tune_length_dark_48.png b/resources/bitmaps_png/png/ps_tune_length_dark_48.png
new file mode 100644
index 0000000000..addd718e3e
Binary files /dev/null and b/resources/bitmaps_png/png/ps_tune_length_dark_48.png differ
diff --git a/resources/bitmaps_png/png/push_pad_settings_48.png b/resources/bitmaps_png/png/push_pad_settings_48.png
new file mode 100644
index 0000000000..6dfbfc5dd9
Binary files /dev/null and b/resources/bitmaps_png/png/push_pad_settings_48.png differ
diff --git a/resources/bitmaps_png/png/push_pad_settings_dark_48.png b/resources/bitmaps_png/png/push_pad_settings_dark_48.png
new file mode 100644
index 0000000000..45c31cc9b8
Binary files /dev/null and b/resources/bitmaps_png/png/push_pad_settings_dark_48.png differ
diff --git a/resources/bitmaps_png/png/puzzle_piece_48.png b/resources/bitmaps_png/png/puzzle_piece_48.png
new file mode 100644
index 0000000000..5b3ce143a1
Binary files /dev/null and b/resources/bitmaps_png/png/puzzle_piece_48.png differ
diff --git a/resources/bitmaps_png/png/puzzle_piece_dark_48.png b/resources/bitmaps_png/png/puzzle_piece_dark_48.png
new file mode 100644
index 0000000000..d761150ec0
Binary files /dev/null and b/resources/bitmaps_png/png/puzzle_piece_dark_48.png differ
diff --git a/resources/bitmaps_png/png/py_script_48.png b/resources/bitmaps_png/png/py_script_48.png
new file mode 100644
index 0000000000..c3644073a8
Binary files /dev/null and b/resources/bitmaps_png/png/py_script_48.png differ
diff --git a/resources/bitmaps_png/png/py_script_dark_48.png b/resources/bitmaps_png/png/py_script_dark_48.png
new file mode 100644
index 0000000000..3c5405f7f7
Binary files /dev/null and b/resources/bitmaps_png/png/py_script_dark_48.png differ
diff --git a/resources/bitmaps_png/png/recent_48.png b/resources/bitmaps_png/png/recent_48.png
new file mode 100644
index 0000000000..2cd2bceec1
Binary files /dev/null and b/resources/bitmaps_png/png/recent_48.png differ
diff --git a/resources/bitmaps_png/png/recent_dark_48.png b/resources/bitmaps_png/png/recent_dark_48.png
new file mode 100644
index 0000000000..3834f1c919
Binary files /dev/null and b/resources/bitmaps_png/png/recent_dark_48.png differ
diff --git a/resources/bitmaps_png/png/redo_48.png b/resources/bitmaps_png/png/redo_48.png
new file mode 100644
index 0000000000..b8a4293284
Binary files /dev/null and b/resources/bitmaps_png/png/redo_48.png differ
diff --git a/resources/bitmaps_png/png/redo_dark_48.png b/resources/bitmaps_png/png/redo_dark_48.png
new file mode 100644
index 0000000000..defefbea4e
Binary files /dev/null and b/resources/bitmaps_png/png/redo_dark_48.png differ
diff --git a/resources/bitmaps_png/png/refresh_48.png b/resources/bitmaps_png/png/refresh_48.png
new file mode 100644
index 0000000000..bca3381967
Binary files /dev/null and b/resources/bitmaps_png/png/refresh_48.png differ
diff --git a/resources/bitmaps_png/png/refresh_dark_48.png b/resources/bitmaps_png/png/refresh_dark_48.png
new file mode 100644
index 0000000000..df5b388131
Binary files /dev/null and b/resources/bitmaps_png/png/refresh_dark_48.png differ
diff --git a/resources/bitmaps_png/png/reload_48.png b/resources/bitmaps_png/png/reload_48.png
new file mode 100644
index 0000000000..0682dc589a
Binary files /dev/null and b/resources/bitmaps_png/png/reload_48.png differ
diff --git a/resources/bitmaps_png/png/reload_dark_48.png b/resources/bitmaps_png/png/reload_dark_48.png
new file mode 100644
index 0000000000..0ec9839a3f
Binary files /dev/null and b/resources/bitmaps_png/png/reload_dark_48.png differ
diff --git a/resources/bitmaps_png/png/render_mode_48.png b/resources/bitmaps_png/png/render_mode_48.png
new file mode 100644
index 0000000000..e89ad55836
Binary files /dev/null and b/resources/bitmaps_png/png/render_mode_48.png differ
diff --git a/resources/bitmaps_png/png/render_mode_dark_48.png b/resources/bitmaps_png/png/render_mode_dark_48.png
new file mode 100644
index 0000000000..381376ca2a
Binary files /dev/null and b/resources/bitmaps_png/png/render_mode_dark_48.png differ
diff --git a/resources/bitmaps_png/png/rescue_48.png b/resources/bitmaps_png/png/rescue_48.png
new file mode 100644
index 0000000000..9d1f97ff5a
Binary files /dev/null and b/resources/bitmaps_png/png/rescue_48.png differ
diff --git a/resources/bitmaps_png/png/rescue_dark_48.png b/resources/bitmaps_png/png/rescue_dark_48.png
new file mode 100644
index 0000000000..0b39d910dc
Binary files /dev/null and b/resources/bitmaps_png/png/rescue_dark_48.png differ
diff --git a/resources/bitmaps_png/png/right_48.png b/resources/bitmaps_png/png/right_48.png
new file mode 100644
index 0000000000..63a70df1bb
Binary files /dev/null and b/resources/bitmaps_png/png/right_48.png differ
diff --git a/resources/bitmaps_png/png/right_dark_48.png b/resources/bitmaps_png/png/right_dark_48.png
new file mode 100644
index 0000000000..76b0d129b8
Binary files /dev/null and b/resources/bitmaps_png/png/right_dark_48.png differ
diff --git a/resources/bitmaps_png/png/rotate_ccw_48.png b/resources/bitmaps_png/png/rotate_ccw_48.png
new file mode 100644
index 0000000000..30f5988c4f
Binary files /dev/null and b/resources/bitmaps_png/png/rotate_ccw_48.png differ
diff --git a/resources/bitmaps_png/png/rotate_ccw_dark_48.png b/resources/bitmaps_png/png/rotate_ccw_dark_48.png
new file mode 100644
index 0000000000..aff1833c71
Binary files /dev/null and b/resources/bitmaps_png/png/rotate_ccw_dark_48.png differ
diff --git a/resources/bitmaps_png/png/rotate_ccw_x_48.png b/resources/bitmaps_png/png/rotate_ccw_x_48.png
new file mode 100644
index 0000000000..b3b8c76320
Binary files /dev/null and b/resources/bitmaps_png/png/rotate_ccw_x_48.png differ
diff --git a/resources/bitmaps_png/png/rotate_ccw_x_dark_48.png b/resources/bitmaps_png/png/rotate_ccw_x_dark_48.png
new file mode 100644
index 0000000000..ce2eefc475
Binary files /dev/null and b/resources/bitmaps_png/png/rotate_ccw_x_dark_48.png differ
diff --git a/resources/bitmaps_png/png/rotate_ccw_y_48.png b/resources/bitmaps_png/png/rotate_ccw_y_48.png
new file mode 100644
index 0000000000..f66311e4a3
Binary files /dev/null and b/resources/bitmaps_png/png/rotate_ccw_y_48.png differ
diff --git a/resources/bitmaps_png/png/rotate_ccw_y_dark_48.png b/resources/bitmaps_png/png/rotate_ccw_y_dark_48.png
new file mode 100644
index 0000000000..ab834f8218
Binary files /dev/null and b/resources/bitmaps_png/png/rotate_ccw_y_dark_48.png differ
diff --git a/resources/bitmaps_png/png/rotate_ccw_z_48.png b/resources/bitmaps_png/png/rotate_ccw_z_48.png
new file mode 100644
index 0000000000..4acc6c100a
Binary files /dev/null and b/resources/bitmaps_png/png/rotate_ccw_z_48.png differ
diff --git a/resources/bitmaps_png/png/rotate_ccw_z_dark_48.png b/resources/bitmaps_png/png/rotate_ccw_z_dark_48.png
new file mode 100644
index 0000000000..7fda8f5a08
Binary files /dev/null and b/resources/bitmaps_png/png/rotate_ccw_z_dark_48.png differ
diff --git a/resources/bitmaps_png/png/rotate_cw_48.png b/resources/bitmaps_png/png/rotate_cw_48.png
new file mode 100644
index 0000000000..d0640cb6a2
Binary files /dev/null and b/resources/bitmaps_png/png/rotate_cw_48.png differ
diff --git a/resources/bitmaps_png/png/rotate_cw_dark_48.png b/resources/bitmaps_png/png/rotate_cw_dark_48.png
new file mode 100644
index 0000000000..a8dd9a1c57
Binary files /dev/null and b/resources/bitmaps_png/png/rotate_cw_dark_48.png differ
diff --git a/resources/bitmaps_png/png/rotate_cw_x_48.png b/resources/bitmaps_png/png/rotate_cw_x_48.png
new file mode 100644
index 0000000000..9059ff02c9
Binary files /dev/null and b/resources/bitmaps_png/png/rotate_cw_x_48.png differ
diff --git a/resources/bitmaps_png/png/rotate_cw_x_dark_48.png b/resources/bitmaps_png/png/rotate_cw_x_dark_48.png
new file mode 100644
index 0000000000..d83b691ca0
Binary files /dev/null and b/resources/bitmaps_png/png/rotate_cw_x_dark_48.png differ
diff --git a/resources/bitmaps_png/png/rotate_cw_y_48.png b/resources/bitmaps_png/png/rotate_cw_y_48.png
new file mode 100644
index 0000000000..564d867594
Binary files /dev/null and b/resources/bitmaps_png/png/rotate_cw_y_48.png differ
diff --git a/resources/bitmaps_png/png/rotate_cw_y_dark_48.png b/resources/bitmaps_png/png/rotate_cw_y_dark_48.png
new file mode 100644
index 0000000000..30c1ac9a64
Binary files /dev/null and b/resources/bitmaps_png/png/rotate_cw_y_dark_48.png differ
diff --git a/resources/bitmaps_png/png/rotate_cw_z_48.png b/resources/bitmaps_png/png/rotate_cw_z_48.png
new file mode 100644
index 0000000000..41a42d2673
Binary files /dev/null and b/resources/bitmaps_png/png/rotate_cw_z_48.png differ
diff --git a/resources/bitmaps_png/png/rotate_cw_z_dark_48.png b/resources/bitmaps_png/png/rotate_cw_z_dark_48.png
new file mode 100644
index 0000000000..c7236a9981
Binary files /dev/null and b/resources/bitmaps_png/png/rotate_cw_z_dark_48.png differ
diff --git a/resources/bitmaps_png/png/router_len_tuner_48.png b/resources/bitmaps_png/png/router_len_tuner_48.png
new file mode 100644
index 0000000000..622bc836d7
Binary files /dev/null and b/resources/bitmaps_png/png/router_len_tuner_48.png differ
diff --git a/resources/bitmaps_png/png/router_len_tuner_amplitude_decr_48.png b/resources/bitmaps_png/png/router_len_tuner_amplitude_decr_48.png
new file mode 100644
index 0000000000..2fb58adb32
Binary files /dev/null and b/resources/bitmaps_png/png/router_len_tuner_amplitude_decr_48.png differ
diff --git a/resources/bitmaps_png/png/router_len_tuner_amplitude_decr_dark_48.png b/resources/bitmaps_png/png/router_len_tuner_amplitude_decr_dark_48.png
new file mode 100644
index 0000000000..e248c3d6ea
Binary files /dev/null and b/resources/bitmaps_png/png/router_len_tuner_amplitude_decr_dark_48.png differ
diff --git a/resources/bitmaps_png/png/router_len_tuner_amplitude_incr_48.png b/resources/bitmaps_png/png/router_len_tuner_amplitude_incr_48.png
new file mode 100644
index 0000000000..9fa587c9ad
Binary files /dev/null and b/resources/bitmaps_png/png/router_len_tuner_amplitude_incr_48.png differ
diff --git a/resources/bitmaps_png/png/router_len_tuner_amplitude_incr_dark_48.png b/resources/bitmaps_png/png/router_len_tuner_amplitude_incr_dark_48.png
new file mode 100644
index 0000000000..9d86f630f8
Binary files /dev/null and b/resources/bitmaps_png/png/router_len_tuner_amplitude_incr_dark_48.png differ
diff --git a/resources/bitmaps_png/png/router_len_tuner_dark_48.png b/resources/bitmaps_png/png/router_len_tuner_dark_48.png
new file mode 100644
index 0000000000..c6cba0c75a
Binary files /dev/null and b/resources/bitmaps_png/png/router_len_tuner_dark_48.png differ
diff --git a/resources/bitmaps_png/png/router_len_tuner_dist_decr_48.png b/resources/bitmaps_png/png/router_len_tuner_dist_decr_48.png
new file mode 100644
index 0000000000..3f326b72b2
Binary files /dev/null and b/resources/bitmaps_png/png/router_len_tuner_dist_decr_48.png differ
diff --git a/resources/bitmaps_png/png/router_len_tuner_dist_decr_dark_48.png b/resources/bitmaps_png/png/router_len_tuner_dist_decr_dark_48.png
new file mode 100644
index 0000000000..b5007e20fa
Binary files /dev/null and b/resources/bitmaps_png/png/router_len_tuner_dist_decr_dark_48.png differ
diff --git a/resources/bitmaps_png/png/router_len_tuner_dist_incr_48.png b/resources/bitmaps_png/png/router_len_tuner_dist_incr_48.png
new file mode 100644
index 0000000000..c109baca15
Binary files /dev/null and b/resources/bitmaps_png/png/router_len_tuner_dist_incr_48.png differ
diff --git a/resources/bitmaps_png/png/router_len_tuner_dist_incr_dark_48.png b/resources/bitmaps_png/png/router_len_tuner_dist_incr_dark_48.png
new file mode 100644
index 0000000000..f81c779c18
Binary files /dev/null and b/resources/bitmaps_png/png/router_len_tuner_dist_incr_dark_48.png differ
diff --git a/resources/bitmaps_png/png/router_len_tuner_setup_48.png b/resources/bitmaps_png/png/router_len_tuner_setup_48.png
new file mode 100644
index 0000000000..e75f9370c1
Binary files /dev/null and b/resources/bitmaps_png/png/router_len_tuner_setup_48.png differ
diff --git a/resources/bitmaps_png/png/router_len_tuner_setup_dark_48.png b/resources/bitmaps_png/png/router_len_tuner_setup_dark_48.png
new file mode 100644
index 0000000000..43c42b8d34
Binary files /dev/null and b/resources/bitmaps_png/png/router_len_tuner_setup_dark_48.png differ
diff --git a/resources/bitmaps_png/png/save_48.png b/resources/bitmaps_png/png/save_48.png
new file mode 100644
index 0000000000..38d56348e5
Binary files /dev/null and b/resources/bitmaps_png/png/save_48.png differ
diff --git a/resources/bitmaps_png/png/save_as_48.png b/resources/bitmaps_png/png/save_as_48.png
new file mode 100644
index 0000000000..abf6b4ca3d
Binary files /dev/null and b/resources/bitmaps_png/png/save_as_48.png differ
diff --git a/resources/bitmaps_png/png/save_as_dark_48.png b/resources/bitmaps_png/png/save_as_dark_48.png
new file mode 100644
index 0000000000..18480a4982
Binary files /dev/null and b/resources/bitmaps_png/png/save_as_dark_48.png differ
diff --git a/resources/bitmaps_png/png/save_dark_48.png b/resources/bitmaps_png/png/save_dark_48.png
new file mode 100644
index 0000000000..22871d286f
Binary files /dev/null and b/resources/bitmaps_png/png/save_dark_48.png differ
diff --git a/resources/bitmaps_png/png/search_tree_48.png b/resources/bitmaps_png/png/search_tree_48.png
new file mode 100644
index 0000000000..29006e571e
Binary files /dev/null and b/resources/bitmaps_png/png/search_tree_48.png differ
diff --git a/resources/bitmaps_png/png/search_tree_dark_48.png b/resources/bitmaps_png/png/search_tree_dark_48.png
new file mode 100644
index 0000000000..06965b8af6
Binary files /dev/null and b/resources/bitmaps_png/png/search_tree_dark_48.png differ
diff --git a/resources/bitmaps_png/png/select_layer_pair_48.png b/resources/bitmaps_png/png/select_layer_pair_48.png
new file mode 100644
index 0000000000..54a14e4909
Binary files /dev/null and b/resources/bitmaps_png/png/select_layer_pair_48.png differ
diff --git a/resources/bitmaps_png/png/select_layer_pair_dark_48.png b/resources/bitmaps_png/png/select_layer_pair_dark_48.png
new file mode 100644
index 0000000000..3f43ecfa3c
Binary files /dev/null and b/resources/bitmaps_png/png/select_layer_pair_dark_48.png differ
diff --git a/resources/bitmaps_png/png/select_same_sheet_48.png b/resources/bitmaps_png/png/select_same_sheet_48.png
new file mode 100644
index 0000000000..dd4cca7470
Binary files /dev/null and b/resources/bitmaps_png/png/select_same_sheet_48.png differ
diff --git a/resources/bitmaps_png/png/select_same_sheet_dark_48.png b/resources/bitmaps_png/png/select_same_sheet_dark_48.png
new file mode 100644
index 0000000000..c6d0bd38f6
Binary files /dev/null and b/resources/bitmaps_png/png/select_same_sheet_dark_48.png differ
diff --git a/resources/bitmaps_png/png/select_w_layer_48.png b/resources/bitmaps_png/png/select_w_layer_48.png
new file mode 100644
index 0000000000..4d8bc80c4d
Binary files /dev/null and b/resources/bitmaps_png/png/select_w_layer_48.png differ
diff --git a/resources/bitmaps_png/png/select_w_layer_dark_48.png b/resources/bitmaps_png/png/select_w_layer_dark_48.png
new file mode 100644
index 0000000000..8ee8cb3e15
Binary files /dev/null and b/resources/bitmaps_png/png/select_w_layer_dark_48.png differ
diff --git a/resources/bitmaps_png/png/set_origin_48.png b/resources/bitmaps_png/png/set_origin_48.png
new file mode 100644
index 0000000000..649556c1a0
Binary files /dev/null and b/resources/bitmaps_png/png/set_origin_48.png differ
diff --git a/resources/bitmaps_png/png/set_origin_dark_48.png b/resources/bitmaps_png/png/set_origin_dark_48.png
new file mode 100644
index 0000000000..62c37a1c37
Binary files /dev/null and b/resources/bitmaps_png/png/set_origin_dark_48.png differ
diff --git a/resources/bitmaps_png/png/shape_3d_48.png b/resources/bitmaps_png/png/shape_3d_48.png
new file mode 100644
index 0000000000..d0606877f5
Binary files /dev/null and b/resources/bitmaps_png/png/shape_3d_48.png differ
diff --git a/resources/bitmaps_png/png/shape_3d_back_48.png b/resources/bitmaps_png/png/shape_3d_back_48.png
new file mode 100644
index 0000000000..b43abe38b8
Binary files /dev/null and b/resources/bitmaps_png/png/shape_3d_back_48.png differ
diff --git a/resources/bitmaps_png/png/shape_3d_back_dark_48.png b/resources/bitmaps_png/png/shape_3d_back_dark_48.png
new file mode 100644
index 0000000000..019e4c1a63
Binary files /dev/null and b/resources/bitmaps_png/png/shape_3d_back_dark_48.png differ
diff --git a/resources/bitmaps_png/png/shape_3d_dark_48.png b/resources/bitmaps_png/png/shape_3d_dark_48.png
new file mode 100644
index 0000000000..9faa92d710
Binary files /dev/null and b/resources/bitmaps_png/png/shape_3d_dark_48.png differ
diff --git a/resources/bitmaps_png/png/sheetset_48.png b/resources/bitmaps_png/png/sheetset_48.png
new file mode 100644
index 0000000000..bde6ed5c64
Binary files /dev/null and b/resources/bitmaps_png/png/sheetset_48.png differ
diff --git a/resources/bitmaps_png/png/sheetset_dark_48.png b/resources/bitmaps_png/png/sheetset_dark_48.png
new file mode 100644
index 0000000000..0c7161d49a
Binary files /dev/null and b/resources/bitmaps_png/png/sheetset_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_all_back_layers_48.png b/resources/bitmaps_png/png/show_all_back_layers_48.png
new file mode 100644
index 0000000000..beeaa22014
Binary files /dev/null and b/resources/bitmaps_png/png/show_all_back_layers_48.png differ
diff --git a/resources/bitmaps_png/png/show_all_back_layers_dark_48.png b/resources/bitmaps_png/png/show_all_back_layers_dark_48.png
new file mode 100644
index 0000000000..bf07ed3035
Binary files /dev/null and b/resources/bitmaps_png/png/show_all_back_layers_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_all_copper_layers_48.png b/resources/bitmaps_png/png/show_all_copper_layers_48.png
new file mode 100644
index 0000000000..e42b164ad2
Binary files /dev/null and b/resources/bitmaps_png/png/show_all_copper_layers_48.png differ
diff --git a/resources/bitmaps_png/png/show_all_copper_layers_dark_48.png b/resources/bitmaps_png/png/show_all_copper_layers_dark_48.png
new file mode 100644
index 0000000000..bf6a3a3034
Binary files /dev/null and b/resources/bitmaps_png/png/show_all_copper_layers_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_all_front_layers_48.png b/resources/bitmaps_png/png/show_all_front_layers_48.png
new file mode 100644
index 0000000000..78bbaefbb7
Binary files /dev/null and b/resources/bitmaps_png/png/show_all_front_layers_48.png differ
diff --git a/resources/bitmaps_png/png/show_all_front_layers_dark_48.png b/resources/bitmaps_png/png/show_all_front_layers_dark_48.png
new file mode 100644
index 0000000000..b39dc0fceb
Binary files /dev/null and b/resources/bitmaps_png/png/show_all_front_layers_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_all_layers_48.png b/resources/bitmaps_png/png/show_all_layers_48.png
new file mode 100644
index 0000000000..03eb1942e2
Binary files /dev/null and b/resources/bitmaps_png/png/show_all_layers_48.png differ
diff --git a/resources/bitmaps_png/png/show_all_layers_dark_48.png b/resources/bitmaps_png/png/show_all_layers_dark_48.png
new file mode 100644
index 0000000000..58f8bd31a7
Binary files /dev/null and b/resources/bitmaps_png/png/show_all_layers_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_back_assembly_layers_48.png b/resources/bitmaps_png/png/show_back_assembly_layers_48.png
new file mode 100644
index 0000000000..e53d5b3a0b
Binary files /dev/null and b/resources/bitmaps_png/png/show_back_assembly_layers_48.png differ
diff --git a/resources/bitmaps_png/png/show_back_assembly_layers_dark_48.png b/resources/bitmaps_png/png/show_back_assembly_layers_dark_48.png
new file mode 100644
index 0000000000..2266631073
Binary files /dev/null and b/resources/bitmaps_png/png/show_back_assembly_layers_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_dcodenumber_48.png b/resources/bitmaps_png/png/show_dcodenumber_48.png
new file mode 100644
index 0000000000..d042f42099
Binary files /dev/null and b/resources/bitmaps_png/png/show_dcodenumber_48.png differ
diff --git a/resources/bitmaps_png/png/show_dcodenumber_dark_48.png b/resources/bitmaps_png/png/show_dcodenumber_dark_48.png
new file mode 100644
index 0000000000..7ed5189af5
Binary files /dev/null and b/resources/bitmaps_png/png/show_dcodenumber_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_dnp_48.png b/resources/bitmaps_png/png/show_dnp_48.png
new file mode 100644
index 0000000000..bfffd0d40b
Binary files /dev/null and b/resources/bitmaps_png/png/show_dnp_48.png differ
diff --git a/resources/bitmaps_png/png/show_dnp_dark_48.png b/resources/bitmaps_png/png/show_dnp_dark_48.png
new file mode 100644
index 0000000000..4c4c98d393
Binary files /dev/null and b/resources/bitmaps_png/png/show_dnp_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_footprint_48.png b/resources/bitmaps_png/png/show_footprint_48.png
new file mode 100644
index 0000000000..86b39643bb
Binary files /dev/null and b/resources/bitmaps_png/png/show_footprint_48.png differ
diff --git a/resources/bitmaps_png/png/show_footprint_dark_48.png b/resources/bitmaps_png/png/show_footprint_dark_48.png
new file mode 100644
index 0000000000..b5c926ce7e
Binary files /dev/null and b/resources/bitmaps_png/png/show_footprint_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_front_assembly_layers_48.png b/resources/bitmaps_png/png/show_front_assembly_layers_48.png
new file mode 100644
index 0000000000..03baafff42
Binary files /dev/null and b/resources/bitmaps_png/png/show_front_assembly_layers_48.png differ
diff --git a/resources/bitmaps_png/png/show_front_assembly_layers_dark_48.png b/resources/bitmaps_png/png/show_front_assembly_layers_dark_48.png
new file mode 100644
index 0000000000..7f4721fde2
Binary files /dev/null and b/resources/bitmaps_png/png/show_front_assembly_layers_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_mod_edge_48.png b/resources/bitmaps_png/png/show_mod_edge_48.png
new file mode 100644
index 0000000000..acb6b81ffb
Binary files /dev/null and b/resources/bitmaps_png/png/show_mod_edge_48.png differ
diff --git a/resources/bitmaps_png/png/show_mod_edge_dark_48.png b/resources/bitmaps_png/png/show_mod_edge_dark_48.png
new file mode 100644
index 0000000000..1f377edd8c
Binary files /dev/null and b/resources/bitmaps_png/png/show_mod_edge_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_no_copper_layers_48.png b/resources/bitmaps_png/png/show_no_copper_layers_48.png
new file mode 100644
index 0000000000..addc16cd65
Binary files /dev/null and b/resources/bitmaps_png/png/show_no_copper_layers_48.png differ
diff --git a/resources/bitmaps_png/png/show_no_copper_layers_dark_48.png b/resources/bitmaps_png/png/show_no_copper_layers_dark_48.png
new file mode 100644
index 0000000000..bc1610bc64
Binary files /dev/null and b/resources/bitmaps_png/png/show_no_copper_layers_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_no_layers_48.png b/resources/bitmaps_png/png/show_no_layers_48.png
new file mode 100644
index 0000000000..6454312f68
Binary files /dev/null and b/resources/bitmaps_png/png/show_no_layers_48.png differ
diff --git a/resources/bitmaps_png/png/show_no_layers_dark_48.png b/resources/bitmaps_png/png/show_no_layers_dark_48.png
new file mode 100644
index 0000000000..9695f23a00
Binary files /dev/null and b/resources/bitmaps_png/png/show_no_layers_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_not_in_posfile_48.png b/resources/bitmaps_png/png/show_not_in_posfile_48.png
new file mode 100644
index 0000000000..195f46eac1
Binary files /dev/null and b/resources/bitmaps_png/png/show_not_in_posfile_48.png differ
diff --git a/resources/bitmaps_png/png/show_not_in_posfile_dark_48.png b/resources/bitmaps_png/png/show_not_in_posfile_dark_48.png
new file mode 100644
index 0000000000..dd19981729
Binary files /dev/null and b/resources/bitmaps_png/png/show_not_in_posfile_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_other_48.png b/resources/bitmaps_png/png/show_other_48.png
new file mode 100644
index 0000000000..f39d7ffbfe
Binary files /dev/null and b/resources/bitmaps_png/png/show_other_48.png differ
diff --git a/resources/bitmaps_png/png/show_other_dark_48.png b/resources/bitmaps_png/png/show_other_dark_48.png
new file mode 100644
index 0000000000..5ff15eeb42
Binary files /dev/null and b/resources/bitmaps_png/png/show_other_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_ratsnest_48.png b/resources/bitmaps_png/png/show_ratsnest_48.png
new file mode 100644
index 0000000000..59898bdfd9
Binary files /dev/null and b/resources/bitmaps_png/png/show_ratsnest_48.png differ
diff --git a/resources/bitmaps_png/png/show_ratsnest_dark_48.png b/resources/bitmaps_png/png/show_ratsnest_dark_48.png
new file mode 100644
index 0000000000..c558b687dc
Binary files /dev/null and b/resources/bitmaps_png/png/show_ratsnest_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_smt_48.png b/resources/bitmaps_png/png/show_smt_48.png
new file mode 100644
index 0000000000..bd16d32479
Binary files /dev/null and b/resources/bitmaps_png/png/show_smt_48.png differ
diff --git a/resources/bitmaps_png/png/show_smt_dark_48.png b/resources/bitmaps_png/png/show_smt_dark_48.png
new file mode 100644
index 0000000000..8af3201a09
Binary files /dev/null and b/resources/bitmaps_png/png/show_smt_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_tht_48.png b/resources/bitmaps_png/png/show_tht_48.png
new file mode 100644
index 0000000000..3c5617e07e
Binary files /dev/null and b/resources/bitmaps_png/png/show_tht_48.png differ
diff --git a/resources/bitmaps_png/png/show_tht_dark_48.png b/resources/bitmaps_png/png/show_tht_dark_48.png
new file mode 100644
index 0000000000..7f5ed0fc8c
Binary files /dev/null and b/resources/bitmaps_png/png/show_tht_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_zone_48.png b/resources/bitmaps_png/png/show_zone_48.png
new file mode 100644
index 0000000000..acd63d0032
Binary files /dev/null and b/resources/bitmaps_png/png/show_zone_48.png differ
diff --git a/resources/bitmaps_png/png/show_zone_dark_48.png b/resources/bitmaps_png/png/show_zone_dark_48.png
new file mode 100644
index 0000000000..2c9ba08444
Binary files /dev/null and b/resources/bitmaps_png/png/show_zone_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_zone_disable_48.png b/resources/bitmaps_png/png/show_zone_disable_48.png
new file mode 100644
index 0000000000..84c2a9daf8
Binary files /dev/null and b/resources/bitmaps_png/png/show_zone_disable_48.png differ
diff --git a/resources/bitmaps_png/png/show_zone_disable_dark_48.png b/resources/bitmaps_png/png/show_zone_disable_dark_48.png
new file mode 100644
index 0000000000..f78ad35525
Binary files /dev/null and b/resources/bitmaps_png/png/show_zone_disable_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_zone_outline_only_48.png b/resources/bitmaps_png/png/show_zone_outline_only_48.png
new file mode 100644
index 0000000000..c56c96b6b2
Binary files /dev/null and b/resources/bitmaps_png/png/show_zone_outline_only_48.png differ
diff --git a/resources/bitmaps_png/png/show_zone_outline_only_dark_48.png b/resources/bitmaps_png/png/show_zone_outline_only_dark_48.png
new file mode 100644
index 0000000000..4dca9450ee
Binary files /dev/null and b/resources/bitmaps_png/png/show_zone_outline_only_dark_48.png differ
diff --git a/resources/bitmaps_png/png/show_zone_triangulation_48.png b/resources/bitmaps_png/png/show_zone_triangulation_48.png
new file mode 100644
index 0000000000..afca204c00
Binary files /dev/null and b/resources/bitmaps_png/png/show_zone_triangulation_48.png differ
diff --git a/resources/bitmaps_png/png/show_zone_triangulation_dark_48.png b/resources/bitmaps_png/png/show_zone_triangulation_dark_48.png
new file mode 100644
index 0000000000..2468ad9d2b
Binary files /dev/null and b/resources/bitmaps_png/png/show_zone_triangulation_dark_48.png differ
diff --git a/resources/bitmaps_png/png/showtrack_48.png b/resources/bitmaps_png/png/showtrack_48.png
new file mode 100644
index 0000000000..a74d1a4292
Binary files /dev/null and b/resources/bitmaps_png/png/showtrack_48.png differ
diff --git a/resources/bitmaps_png/png/showtrack_dark_48.png b/resources/bitmaps_png/png/showtrack_dark_48.png
new file mode 100644
index 0000000000..1a7e1b327f
Binary files /dev/null and b/resources/bitmaps_png/png/showtrack_dark_48.png differ
diff --git a/resources/bitmaps_png/png/sim_add_plot_48.png b/resources/bitmaps_png/png/sim_add_plot_48.png
new file mode 100644
index 0000000000..8c18036784
Binary files /dev/null and b/resources/bitmaps_png/png/sim_add_plot_48.png differ
diff --git a/resources/bitmaps_png/png/sim_add_signal_48.png b/resources/bitmaps_png/png/sim_add_signal_48.png
new file mode 100644
index 0000000000..eac609f4dc
Binary files /dev/null and b/resources/bitmaps_png/png/sim_add_signal_48.png differ
diff --git a/resources/bitmaps_png/png/sim_add_signal_dark_48.png b/resources/bitmaps_png/png/sim_add_signal_dark_48.png
new file mode 100644
index 0000000000..8bcab7e82b
Binary files /dev/null and b/resources/bitmaps_png/png/sim_add_signal_dark_48.png differ
diff --git a/resources/bitmaps_png/png/sim_command_48.png b/resources/bitmaps_png/png/sim_command_48.png
new file mode 100644
index 0000000000..838ebd46ce
Binary files /dev/null and b/resources/bitmaps_png/png/sim_command_48.png differ
diff --git a/resources/bitmaps_png/png/sim_probe_48.png b/resources/bitmaps_png/png/sim_probe_48.png
new file mode 100644
index 0000000000..dbe07ba64f
Binary files /dev/null and b/resources/bitmaps_png/png/sim_probe_48.png differ
diff --git a/resources/bitmaps_png/png/sim_probe_dark_48.png b/resources/bitmaps_png/png/sim_probe_dark_48.png
new file mode 100644
index 0000000000..e9b12c1e48
Binary files /dev/null and b/resources/bitmaps_png/png/sim_probe_dark_48.png differ
diff --git a/resources/bitmaps_png/png/sim_run_48.png b/resources/bitmaps_png/png/sim_run_48.png
new file mode 100644
index 0000000000..66da9a5951
Binary files /dev/null and b/resources/bitmaps_png/png/sim_run_48.png differ
diff --git a/resources/bitmaps_png/png/sim_run_dark_48.png b/resources/bitmaps_png/png/sim_run_dark_48.png
new file mode 100644
index 0000000000..cf97a6b2df
Binary files /dev/null and b/resources/bitmaps_png/png/sim_run_dark_48.png differ
diff --git a/resources/bitmaps_png/png/sim_stop_48.png b/resources/bitmaps_png/png/sim_stop_48.png
new file mode 100644
index 0000000000..cd21f2d0de
Binary files /dev/null and b/resources/bitmaps_png/png/sim_stop_48.png differ
diff --git a/resources/bitmaps_png/png/sim_stop_dark_48.png b/resources/bitmaps_png/png/sim_stop_dark_48.png
new file mode 100644
index 0000000000..e1f7f1ed95
Binary files /dev/null and b/resources/bitmaps_png/png/sim_stop_dark_48.png differ
diff --git a/resources/bitmaps_png/png/sim_tune_48.png b/resources/bitmaps_png/png/sim_tune_48.png
new file mode 100644
index 0000000000..f5e9e16b30
Binary files /dev/null and b/resources/bitmaps_png/png/sim_tune_48.png differ
diff --git a/resources/bitmaps_png/png/sim_tune_dark_48.png b/resources/bitmaps_png/png/sim_tune_dark_48.png
new file mode 100644
index 0000000000..2cae813eb5
Binary files /dev/null and b/resources/bitmaps_png/png/sim_tune_dark_48.png differ
diff --git a/resources/bitmaps_png/png/simulator_48.png b/resources/bitmaps_png/png/simulator_48.png
new file mode 100644
index 0000000000..0ad8f6edbc
Binary files /dev/null and b/resources/bitmaps_png/png/simulator_48.png differ
diff --git a/resources/bitmaps_png/png/simulator_dark_48.png b/resources/bitmaps_png/png/simulator_dark_48.png
new file mode 100644
index 0000000000..1e006d7b84
Binary files /dev/null and b/resources/bitmaps_png/png/simulator_dark_48.png differ
diff --git a/resources/bitmaps_png/png/slice_line_48.png b/resources/bitmaps_png/png/slice_line_48.png
new file mode 100644
index 0000000000..1648706a99
Binary files /dev/null and b/resources/bitmaps_png/png/slice_line_48.png differ
diff --git a/resources/bitmaps_png/png/slice_line_dark_48.png b/resources/bitmaps_png/png/slice_line_dark_48.png
new file mode 100644
index 0000000000..7d592a4272
Binary files /dev/null and b/resources/bitmaps_png/png/slice_line_dark_48.png differ
diff --git a/resources/bitmaps_png/png/small_down_32.png b/resources/bitmaps_png/png/small_down_32.png
new file mode 100644
index 0000000000..d3bd909702
Binary files /dev/null and b/resources/bitmaps_png/png/small_down_32.png differ
diff --git a/resources/bitmaps_png/png/small_down_dark_32.png b/resources/bitmaps_png/png/small_down_dark_32.png
new file mode 100644
index 0000000000..8e85cc1ffb
Binary files /dev/null and b/resources/bitmaps_png/png/small_down_dark_32.png differ
diff --git a/resources/bitmaps_png/png/small_edit_32.png b/resources/bitmaps_png/png/small_edit_32.png
new file mode 100644
index 0000000000..8264f5a8a2
Binary files /dev/null and b/resources/bitmaps_png/png/small_edit_32.png differ
diff --git a/resources/bitmaps_png/png/small_edit_dark_32.png b/resources/bitmaps_png/png/small_edit_dark_32.png
new file mode 100644
index 0000000000..ed8e144806
Binary files /dev/null and b/resources/bitmaps_png/png/small_edit_dark_32.png differ
diff --git a/resources/bitmaps_png/png/small_folder_32.png b/resources/bitmaps_png/png/small_folder_32.png
new file mode 100644
index 0000000000..25b55e22c4
Binary files /dev/null and b/resources/bitmaps_png/png/small_folder_32.png differ
diff --git a/resources/bitmaps_png/png/small_folder_dark_32.png b/resources/bitmaps_png/png/small_folder_dark_32.png
new file mode 100644
index 0000000000..8d20112daf
Binary files /dev/null and b/resources/bitmaps_png/png/small_folder_dark_32.png differ
diff --git a/resources/bitmaps_png/png/small_library_32.png b/resources/bitmaps_png/png/small_library_32.png
new file mode 100644
index 0000000000..b24ee54ec7
Binary files /dev/null and b/resources/bitmaps_png/png/small_library_32.png differ
diff --git a/resources/bitmaps_png/png/small_library_dark_32.png b/resources/bitmaps_png/png/small_library_dark_32.png
new file mode 100644
index 0000000000..1d45c36fb2
Binary files /dev/null and b/resources/bitmaps_png/png/small_library_dark_32.png differ
diff --git a/resources/bitmaps_png/png/small_plus_32.png b/resources/bitmaps_png/png/small_plus_32.png
new file mode 100644
index 0000000000..7ff6f4b58b
Binary files /dev/null and b/resources/bitmaps_png/png/small_plus_32.png differ
diff --git a/resources/bitmaps_png/png/small_plus_dark_32.png b/resources/bitmaps_png/png/small_plus_dark_32.png
new file mode 100644
index 0000000000..851df53c50
Binary files /dev/null and b/resources/bitmaps_png/png/small_plus_dark_32.png differ
diff --git a/resources/bitmaps_png/png/small_refresh_32.png b/resources/bitmaps_png/png/small_refresh_32.png
new file mode 100644
index 0000000000..77170c6670
Binary files /dev/null and b/resources/bitmaps_png/png/small_refresh_32.png differ
diff --git a/resources/bitmaps_png/png/small_refresh_dark_32.png b/resources/bitmaps_png/png/small_refresh_dark_32.png
new file mode 100644
index 0000000000..ac883cf919
Binary files /dev/null and b/resources/bitmaps_png/png/small_refresh_dark_32.png differ
diff --git a/resources/bitmaps_png/png/small_sort_desc_32.png b/resources/bitmaps_png/png/small_sort_desc_32.png
new file mode 100644
index 0000000000..25e0fd07bc
Binary files /dev/null and b/resources/bitmaps_png/png/small_sort_desc_32.png differ
diff --git a/resources/bitmaps_png/png/small_sort_desc_dark_32.png b/resources/bitmaps_png/png/small_sort_desc_dark_32.png
new file mode 100644
index 0000000000..2d4a590d1b
Binary files /dev/null and b/resources/bitmaps_png/png/small_sort_desc_dark_32.png differ
diff --git a/resources/bitmaps_png/png/small_trash_32.png b/resources/bitmaps_png/png/small_trash_32.png
new file mode 100644
index 0000000000..04caac7628
Binary files /dev/null and b/resources/bitmaps_png/png/small_trash_32.png differ
diff --git a/resources/bitmaps_png/png/small_trash_dark_32.png b/resources/bitmaps_png/png/small_trash_dark_32.png
new file mode 100644
index 0000000000..4f9059d507
Binary files /dev/null and b/resources/bitmaps_png/png/small_trash_dark_32.png differ
diff --git a/resources/bitmaps_png/png/small_up_32.png b/resources/bitmaps_png/png/small_up_32.png
new file mode 100644
index 0000000000..8845b3ec07
Binary files /dev/null and b/resources/bitmaps_png/png/small_up_32.png differ
diff --git a/resources/bitmaps_png/png/small_up_dark_32.png b/resources/bitmaps_png/png/small_up_dark_32.png
new file mode 100644
index 0000000000..110316c89f
Binary files /dev/null and b/resources/bitmaps_png/png/small_up_dark_32.png differ
diff --git a/resources/bitmaps_png/png/small_warning_32.png b/resources/bitmaps_png/png/small_warning_32.png
new file mode 100644
index 0000000000..e8f357fa2f
Binary files /dev/null and b/resources/bitmaps_png/png/small_warning_32.png differ
diff --git a/resources/bitmaps_png/png/small_warning_dark_32.png b/resources/bitmaps_png/png/small_warning_dark_32.png
new file mode 100644
index 0000000000..e5054751dc
Binary files /dev/null and b/resources/bitmaps_png/png/small_warning_dark_32.png differ
diff --git a/resources/bitmaps_png/png/special_tools_48.png b/resources/bitmaps_png/png/special_tools_48.png
new file mode 100644
index 0000000000..1441ef990a
Binary files /dev/null and b/resources/bitmaps_png/png/special_tools_48.png differ
diff --git a/resources/bitmaps_png/png/special_tools_dark_48.png b/resources/bitmaps_png/png/special_tools_dark_48.png
new file mode 100644
index 0000000000..ca74005d21
Binary files /dev/null and b/resources/bitmaps_png/png/special_tools_dark_48.png differ
diff --git a/resources/bitmaps_png/png/spreadsheet_48.png b/resources/bitmaps_png/png/spreadsheet_48.png
new file mode 100644
index 0000000000..6d3a81ffcc
Binary files /dev/null and b/resources/bitmaps_png/png/spreadsheet_48.png differ
diff --git a/resources/bitmaps_png/png/spreadsheet_dark_48.png b/resources/bitmaps_png/png/spreadsheet_dark_48.png
new file mode 100644
index 0000000000..51780538f6
Binary files /dev/null and b/resources/bitmaps_png/png/spreadsheet_dark_48.png differ
diff --git a/resources/bitmaps_png/png/subtract_polygons_48.png b/resources/bitmaps_png/png/subtract_polygons_48.png
new file mode 100644
index 0000000000..76f691ad69
Binary files /dev/null and b/resources/bitmaps_png/png/subtract_polygons_48.png differ
diff --git a/resources/bitmaps_png/png/subtract_polygons_dark_48.png b/resources/bitmaps_png/png/subtract_polygons_dark_48.png
new file mode 100644
index 0000000000..12ff57b17f
Binary files /dev/null and b/resources/bitmaps_png/png/subtract_polygons_dark_48.png differ
diff --git a/resources/bitmaps_png/png/swap_48.png b/resources/bitmaps_png/png/swap_48.png
new file mode 100644
index 0000000000..62d2789278
Binary files /dev/null and b/resources/bitmaps_png/png/swap_48.png differ
diff --git a/resources/bitmaps_png/png/swap_dark_48.png b/resources/bitmaps_png/png/swap_dark_48.png
new file mode 100644
index 0000000000..8c8cbf9407
Binary files /dev/null and b/resources/bitmaps_png/png/swap_dark_48.png differ
diff --git a/resources/bitmaps_png/png/swap_layer_48.png b/resources/bitmaps_png/png/swap_layer_48.png
new file mode 100644
index 0000000000..f446289b8a
Binary files /dev/null and b/resources/bitmaps_png/png/swap_layer_48.png differ
diff --git a/resources/bitmaps_png/png/swap_layer_dark_48.png b/resources/bitmaps_png/png/swap_layer_dark_48.png
new file mode 100644
index 0000000000..530b3e6d47
Binary files /dev/null and b/resources/bitmaps_png/png/swap_layer_dark_48.png differ
diff --git a/resources/bitmaps_png/png/switch_corner_rounding_shape_48.png b/resources/bitmaps_png/png/switch_corner_rounding_shape_48.png
new file mode 100644
index 0000000000..84e8a85954
Binary files /dev/null and b/resources/bitmaps_png/png/switch_corner_rounding_shape_48.png differ
diff --git a/resources/bitmaps_png/png/switch_corner_rounding_shape_dark_48.png b/resources/bitmaps_png/png/switch_corner_rounding_shape_dark_48.png
new file mode 100644
index 0000000000..0619947ea2
Binary files /dev/null and b/resources/bitmaps_png/png/switch_corner_rounding_shape_dark_48.png differ
diff --git a/resources/bitmaps_png/png/text_48.png b/resources/bitmaps_png/png/text_48.png
new file mode 100644
index 0000000000..f598d406f0
Binary files /dev/null and b/resources/bitmaps_png/png/text_48.png differ
diff --git a/resources/bitmaps_png/png/text_align_bottom_32.png b/resources/bitmaps_png/png/text_align_bottom_32.png
new file mode 100644
index 0000000000..07c18c0d25
Binary files /dev/null and b/resources/bitmaps_png/png/text_align_bottom_32.png differ
diff --git a/resources/bitmaps_png/png/text_align_bottom_dark_32.png b/resources/bitmaps_png/png/text_align_bottom_dark_32.png
new file mode 100644
index 0000000000..3c830f1985
Binary files /dev/null and b/resources/bitmaps_png/png/text_align_bottom_dark_32.png differ
diff --git a/resources/bitmaps_png/png/text_align_center_32.png b/resources/bitmaps_png/png/text_align_center_32.png
new file mode 100644
index 0000000000..5165d599df
Binary files /dev/null and b/resources/bitmaps_png/png/text_align_center_32.png differ
diff --git a/resources/bitmaps_png/png/text_align_center_dark_32.png b/resources/bitmaps_png/png/text_align_center_dark_32.png
new file mode 100644
index 0000000000..c3334e7ab0
Binary files /dev/null and b/resources/bitmaps_png/png/text_align_center_dark_32.png differ
diff --git a/resources/bitmaps_png/png/text_align_left_32.png b/resources/bitmaps_png/png/text_align_left_32.png
new file mode 100644
index 0000000000..bf4f875770
Binary files /dev/null and b/resources/bitmaps_png/png/text_align_left_32.png differ
diff --git a/resources/bitmaps_png/png/text_align_left_dark_32.png b/resources/bitmaps_png/png/text_align_left_dark_32.png
new file mode 100644
index 0000000000..16845cb78f
Binary files /dev/null and b/resources/bitmaps_png/png/text_align_left_dark_32.png differ
diff --git a/resources/bitmaps_png/png/text_align_middle_32.png b/resources/bitmaps_png/png/text_align_middle_32.png
new file mode 100644
index 0000000000..5b9eebd96f
Binary files /dev/null and b/resources/bitmaps_png/png/text_align_middle_32.png differ
diff --git a/resources/bitmaps_png/png/text_align_middle_dark_32.png b/resources/bitmaps_png/png/text_align_middle_dark_32.png
new file mode 100644
index 0000000000..fea8a8feca
Binary files /dev/null and b/resources/bitmaps_png/png/text_align_middle_dark_32.png differ
diff --git a/resources/bitmaps_png/png/text_align_right_32.png b/resources/bitmaps_png/png/text_align_right_32.png
new file mode 100644
index 0000000000..de4f2651f5
Binary files /dev/null and b/resources/bitmaps_png/png/text_align_right_32.png differ
diff --git a/resources/bitmaps_png/png/text_align_right_dark_32.png b/resources/bitmaps_png/png/text_align_right_dark_32.png
new file mode 100644
index 0000000000..8873d61ef4
Binary files /dev/null and b/resources/bitmaps_png/png/text_align_right_dark_32.png differ
diff --git a/resources/bitmaps_png/png/text_align_top_32.png b/resources/bitmaps_png/png/text_align_top_32.png
new file mode 100644
index 0000000000..1641e63460
Binary files /dev/null and b/resources/bitmaps_png/png/text_align_top_32.png differ
diff --git a/resources/bitmaps_png/png/text_align_top_dark_32.png b/resources/bitmaps_png/png/text_align_top_dark_32.png
new file mode 100644
index 0000000000..88bc9d5cf9
Binary files /dev/null and b/resources/bitmaps_png/png/text_align_top_dark_32.png differ
diff --git a/resources/bitmaps_png/png/text_bold_32.png b/resources/bitmaps_png/png/text_bold_32.png
new file mode 100644
index 0000000000..48e020a648
Binary files /dev/null and b/resources/bitmaps_png/png/text_bold_32.png differ
diff --git a/resources/bitmaps_png/png/text_bold_dark_32.png b/resources/bitmaps_png/png/text_bold_dark_32.png
new file mode 100644
index 0000000000..377f054374
Binary files /dev/null and b/resources/bitmaps_png/png/text_bold_dark_32.png differ
diff --git a/resources/bitmaps_png/png/text_dark_48.png b/resources/bitmaps_png/png/text_dark_48.png
new file mode 100644
index 0000000000..f6dece2a48
Binary files /dev/null and b/resources/bitmaps_png/png/text_dark_48.png differ
diff --git a/resources/bitmaps_png/png/text_horizontal_32.png b/resources/bitmaps_png/png/text_horizontal_32.png
new file mode 100644
index 0000000000..55fad55a75
Binary files /dev/null and b/resources/bitmaps_png/png/text_horizontal_32.png differ
diff --git a/resources/bitmaps_png/png/text_horizontal_dark_32.png b/resources/bitmaps_png/png/text_horizontal_dark_32.png
new file mode 100644
index 0000000000..232ea36763
Binary files /dev/null and b/resources/bitmaps_png/png/text_horizontal_dark_32.png differ
diff --git a/resources/bitmaps_png/png/text_italic_32.png b/resources/bitmaps_png/png/text_italic_32.png
new file mode 100644
index 0000000000..6f241a134b
Binary files /dev/null and b/resources/bitmaps_png/png/text_italic_32.png differ
diff --git a/resources/bitmaps_png/png/text_italic_dark_32.png b/resources/bitmaps_png/png/text_italic_dark_32.png
new file mode 100644
index 0000000000..017a4e3ddb
Binary files /dev/null and b/resources/bitmaps_png/png/text_italic_dark_32.png differ
diff --git a/resources/bitmaps_png/png/text_mirrored_32.png b/resources/bitmaps_png/png/text_mirrored_32.png
new file mode 100644
index 0000000000..6cfcca9ee0
Binary files /dev/null and b/resources/bitmaps_png/png/text_mirrored_32.png differ
diff --git a/resources/bitmaps_png/png/text_mirrored_dark_32.png b/resources/bitmaps_png/png/text_mirrored_dark_32.png
new file mode 100644
index 0000000000..56530d251d
Binary files /dev/null and b/resources/bitmaps_png/png/text_mirrored_dark_32.png differ
diff --git a/resources/bitmaps_png/png/text_sketch_48.png b/resources/bitmaps_png/png/text_sketch_48.png
new file mode 100644
index 0000000000..df9f9cdfa1
Binary files /dev/null and b/resources/bitmaps_png/png/text_sketch_48.png differ
diff --git a/resources/bitmaps_png/png/text_sketch_dark_48.png b/resources/bitmaps_png/png/text_sketch_dark_48.png
new file mode 100644
index 0000000000..0ed206d87e
Binary files /dev/null and b/resources/bitmaps_png/png/text_sketch_dark_48.png differ
diff --git a/resources/bitmaps_png/png/text_valign_bottom_32.png b/resources/bitmaps_png/png/text_valign_bottom_32.png
new file mode 100644
index 0000000000..34ddf52630
Binary files /dev/null and b/resources/bitmaps_png/png/text_valign_bottom_32.png differ
diff --git a/resources/bitmaps_png/png/text_valign_bottom_dark_32.png b/resources/bitmaps_png/png/text_valign_bottom_dark_32.png
new file mode 100644
index 0000000000..c1dc39585a
Binary files /dev/null and b/resources/bitmaps_png/png/text_valign_bottom_dark_32.png differ
diff --git a/resources/bitmaps_png/png/text_valign_center_32.png b/resources/bitmaps_png/png/text_valign_center_32.png
new file mode 100644
index 0000000000..9f2490e45f
Binary files /dev/null and b/resources/bitmaps_png/png/text_valign_center_32.png differ
diff --git a/resources/bitmaps_png/png/text_valign_center_dark_32.png b/resources/bitmaps_png/png/text_valign_center_dark_32.png
new file mode 100644
index 0000000000..53d3565624
Binary files /dev/null and b/resources/bitmaps_png/png/text_valign_center_dark_32.png differ
diff --git a/resources/bitmaps_png/png/text_valign_top_32.png b/resources/bitmaps_png/png/text_valign_top_32.png
new file mode 100644
index 0000000000..be666483b5
Binary files /dev/null and b/resources/bitmaps_png/png/text_valign_top_32.png differ
diff --git a/resources/bitmaps_png/png/text_valign_top_dark_32.png b/resources/bitmaps_png/png/text_valign_top_dark_32.png
new file mode 100644
index 0000000000..91892ce6c8
Binary files /dev/null and b/resources/bitmaps_png/png/text_valign_top_dark_32.png differ
diff --git a/resources/bitmaps_png/png/text_vertical_32.png b/resources/bitmaps_png/png/text_vertical_32.png
new file mode 100644
index 0000000000..b7e0669b67
Binary files /dev/null and b/resources/bitmaps_png/png/text_vertical_32.png differ
diff --git a/resources/bitmaps_png/png/text_vertical_dark_32.png b/resources/bitmaps_png/png/text_vertical_dark_32.png
new file mode 100644
index 0000000000..0d459c2944
Binary files /dev/null and b/resources/bitmaps_png/png/text_vertical_dark_32.png differ
diff --git a/resources/bitmaps_png/png/thermal_spokes_48.png b/resources/bitmaps_png/png/thermal_spokes_48.png
new file mode 100644
index 0000000000..453b37b541
Binary files /dev/null and b/resources/bitmaps_png/png/thermal_spokes_48.png differ
diff --git a/resources/bitmaps_png/png/thermal_spokes_dark_48.png b/resources/bitmaps_png/png/thermal_spokes_dark_48.png
new file mode 100644
index 0000000000..a298bef7dd
Binary files /dev/null and b/resources/bitmaps_png/png/thermal_spokes_dark_48.png differ
diff --git a/resources/bitmaps_png/png/three_d_48.png b/resources/bitmaps_png/png/three_d_48.png
new file mode 100644
index 0000000000..d0606877f5
Binary files /dev/null and b/resources/bitmaps_png/png/three_d_48.png differ
diff --git a/resources/bitmaps_png/png/three_d_dark_48.png b/resources/bitmaps_png/png/three_d_dark_48.png
new file mode 100644
index 0000000000..9faa92d710
Binary files /dev/null and b/resources/bitmaps_png/png/three_d_dark_48.png differ
diff --git a/resources/bitmaps_png/png/tool_ratsnest_48.png b/resources/bitmaps_png/png/tool_ratsnest_48.png
new file mode 100644
index 0000000000..c556345674
Binary files /dev/null and b/resources/bitmaps_png/png/tool_ratsnest_48.png differ
diff --git a/resources/bitmaps_png/png/tool_ratsnest_dark_48.png b/resources/bitmaps_png/png/tool_ratsnest_dark_48.png
new file mode 100644
index 0000000000..603aff2de6
Binary files /dev/null and b/resources/bitmaps_png/png/tool_ratsnest_dark_48.png differ
diff --git a/resources/bitmaps_png/png/tools_48.png b/resources/bitmaps_png/png/tools_48.png
new file mode 100644
index 0000000000..9f0c8b8215
Binary files /dev/null and b/resources/bitmaps_png/png/tools_48.png differ
diff --git a/resources/bitmaps_png/png/tools_dark_48.png b/resources/bitmaps_png/png/tools_dark_48.png
new file mode 100644
index 0000000000..a36e1d58e4
Binary files /dev/null and b/resources/bitmaps_png/png/tools_dark_48.png differ
diff --git a/resources/bitmaps_png/png/trash_48.png b/resources/bitmaps_png/png/trash_48.png
new file mode 100644
index 0000000000..32e2048741
Binary files /dev/null and b/resources/bitmaps_png/png/trash_48.png differ
diff --git a/resources/bitmaps_png/png/trash_dark_48.png b/resources/bitmaps_png/png/trash_dark_48.png
new file mode 100644
index 0000000000..7c37729321
Binary files /dev/null and b/resources/bitmaps_png/png/trash_dark_48.png differ
diff --git a/resources/bitmaps_png/png/tree_nosel_32.png b/resources/bitmaps_png/png/tree_nosel_32.png
new file mode 100644
index 0000000000..9309a78c50
Binary files /dev/null and b/resources/bitmaps_png/png/tree_nosel_32.png differ
diff --git a/resources/bitmaps_png/png/tree_nosel_dark_32.png b/resources/bitmaps_png/png/tree_nosel_dark_32.png
new file mode 100644
index 0000000000..783195c02c
Binary files /dev/null and b/resources/bitmaps_png/png/tree_nosel_dark_32.png differ
diff --git a/resources/bitmaps_png/png/tree_sel_32.png b/resources/bitmaps_png/png/tree_sel_32.png
new file mode 100644
index 0000000000..1aa775d124
Binary files /dev/null and b/resources/bitmaps_png/png/tree_sel_32.png differ
diff --git a/resources/bitmaps_png/png/tree_sel_dark_32.png b/resources/bitmaps_png/png/tree_sel_dark_32.png
new file mode 100644
index 0000000000..be3b8a2398
Binary files /dev/null and b/resources/bitmaps_png/png/tree_sel_dark_32.png differ
diff --git a/resources/bitmaps_png/png/undo_48.png b/resources/bitmaps_png/png/undo_48.png
new file mode 100644
index 0000000000..f2f49718fc
Binary files /dev/null and b/resources/bitmaps_png/png/undo_48.png differ
diff --git a/resources/bitmaps_png/png/undo_dark_48.png b/resources/bitmaps_png/png/undo_dark_48.png
new file mode 100644
index 0000000000..7fe8ba865a
Binary files /dev/null and b/resources/bitmaps_png/png/undo_dark_48.png differ
diff --git a/resources/bitmaps_png/png/unit_inch_48.png b/resources/bitmaps_png/png/unit_inch_48.png
new file mode 100644
index 0000000000..7edba000a0
Binary files /dev/null and b/resources/bitmaps_png/png/unit_inch_48.png differ
diff --git a/resources/bitmaps_png/png/unit_inch_dark_48.png b/resources/bitmaps_png/png/unit_inch_dark_48.png
new file mode 100644
index 0000000000..b3588f9ed6
Binary files /dev/null and b/resources/bitmaps_png/png/unit_inch_dark_48.png differ
diff --git a/resources/bitmaps_png/png/unit_mil_48.png b/resources/bitmaps_png/png/unit_mil_48.png
new file mode 100644
index 0000000000..01d9ed5d50
Binary files /dev/null and b/resources/bitmaps_png/png/unit_mil_48.png differ
diff --git a/resources/bitmaps_png/png/unit_mil_dark_48.png b/resources/bitmaps_png/png/unit_mil_dark_48.png
new file mode 100644
index 0000000000..9e01b28d2f
Binary files /dev/null and b/resources/bitmaps_png/png/unit_mil_dark_48.png differ
diff --git a/resources/bitmaps_png/png/unit_mm_48.png b/resources/bitmaps_png/png/unit_mm_48.png
new file mode 100644
index 0000000000..0169995e9d
Binary files /dev/null and b/resources/bitmaps_png/png/unit_mm_48.png differ
diff --git a/resources/bitmaps_png/png/unit_mm_dark_48.png b/resources/bitmaps_png/png/unit_mm_dark_48.png
new file mode 100644
index 0000000000..6cd96a6bf1
Binary files /dev/null and b/resources/bitmaps_png/png/unit_mm_dark_48.png differ
diff --git a/resources/bitmaps_png/png/unknown_48.png b/resources/bitmaps_png/png/unknown_48.png
new file mode 100644
index 0000000000..211252470c
Binary files /dev/null and b/resources/bitmaps_png/png/unknown_48.png differ
diff --git a/resources/bitmaps_png/png/unknown_dark_48.png b/resources/bitmaps_png/png/unknown_dark_48.png
new file mode 100644
index 0000000000..9a3db2772c
Binary files /dev/null and b/resources/bitmaps_png/png/unknown_dark_48.png differ
diff --git a/resources/bitmaps_png/png/unlocked_48.png b/resources/bitmaps_png/png/unlocked_48.png
new file mode 100644
index 0000000000..e4e6c84c1e
Binary files /dev/null and b/resources/bitmaps_png/png/unlocked_48.png differ
diff --git a/resources/bitmaps_png/png/unlocked_dark_48.png b/resources/bitmaps_png/png/unlocked_dark_48.png
new file mode 100644
index 0000000000..9d5c278d0f
Binary files /dev/null and b/resources/bitmaps_png/png/unlocked_dark_48.png differ
diff --git a/resources/bitmaps_png/png/unzip_48.png b/resources/bitmaps_png/png/unzip_48.png
new file mode 100644
index 0000000000..0e584b2ed2
Binary files /dev/null and b/resources/bitmaps_png/png/unzip_48.png differ
diff --git a/resources/bitmaps_png/png/unzip_dark_48.png b/resources/bitmaps_png/png/unzip_dark_48.png
new file mode 100644
index 0000000000..0f6f723489
Binary files /dev/null and b/resources/bitmaps_png/png/unzip_dark_48.png differ
diff --git a/resources/bitmaps_png/png/up_48.png b/resources/bitmaps_png/png/up_48.png
new file mode 100644
index 0000000000..2d46485e97
Binary files /dev/null and b/resources/bitmaps_png/png/up_48.png differ
diff --git a/resources/bitmaps_png/png/up_dark_48.png b/resources/bitmaps_png/png/up_dark_48.png
new file mode 100644
index 0000000000..a150a7414c
Binary files /dev/null and b/resources/bitmaps_png/png/up_dark_48.png differ
diff --git a/resources/bitmaps_png/png/update_pcb_from_sch_48.png b/resources/bitmaps_png/png/update_pcb_from_sch_48.png
new file mode 100644
index 0000000000..b79b3b8a03
Binary files /dev/null and b/resources/bitmaps_png/png/update_pcb_from_sch_48.png differ
diff --git a/resources/bitmaps_png/png/update_pcb_from_sch_dark_48.png b/resources/bitmaps_png/png/update_pcb_from_sch_dark_48.png
new file mode 100644
index 0000000000..a905a4f0a1
Binary files /dev/null and b/resources/bitmaps_png/png/update_pcb_from_sch_dark_48.png differ
diff --git a/resources/bitmaps_png/png/update_sch_from_pcb_48.png b/resources/bitmaps_png/png/update_sch_from_pcb_48.png
new file mode 100644
index 0000000000..58ac0cd9b3
Binary files /dev/null and b/resources/bitmaps_png/png/update_sch_from_pcb_48.png differ
diff --git a/resources/bitmaps_png/png/update_sch_from_pcb_dark_48.png b/resources/bitmaps_png/png/update_sch_from_pcb_dark_48.png
new file mode 100644
index 0000000000..af8a16d4f5
Binary files /dev/null and b/resources/bitmaps_png/png/update_sch_from_pcb_dark_48.png differ
diff --git a/resources/bitmaps_png/png/via_48.png b/resources/bitmaps_png/png/via_48.png
new file mode 100644
index 0000000000..53d844ec74
Binary files /dev/null and b/resources/bitmaps_png/png/via_48.png differ
diff --git a/resources/bitmaps_png/png/via_annulus_48.png b/resources/bitmaps_png/png/via_annulus_48.png
new file mode 100644
index 0000000000..e5cc998106
Binary files /dev/null and b/resources/bitmaps_png/png/via_annulus_48.png differ
diff --git a/resources/bitmaps_png/png/via_annulus_dark_48.png b/resources/bitmaps_png/png/via_annulus_dark_48.png
new file mode 100644
index 0000000000..5b3825ea85
Binary files /dev/null and b/resources/bitmaps_png/png/via_annulus_dark_48.png differ
diff --git a/resources/bitmaps_png/png/via_buried_48.png b/resources/bitmaps_png/png/via_buried_48.png
new file mode 100644
index 0000000000..b2af987fee
Binary files /dev/null and b/resources/bitmaps_png/png/via_buried_48.png differ
diff --git a/resources/bitmaps_png/png/via_buried_dark_48.png b/resources/bitmaps_png/png/via_buried_dark_48.png
new file mode 100644
index 0000000000..3b49ca741d
Binary files /dev/null and b/resources/bitmaps_png/png/via_buried_dark_48.png differ
diff --git a/resources/bitmaps_png/png/via_dark_48.png b/resources/bitmaps_png/png/via_dark_48.png
new file mode 100644
index 0000000000..d4cbf5a89a
Binary files /dev/null and b/resources/bitmaps_png/png/via_dark_48.png differ
diff --git a/resources/bitmaps_png/png/via_diameter_48.png b/resources/bitmaps_png/png/via_diameter_48.png
new file mode 100644
index 0000000000..f413e5457b
Binary files /dev/null and b/resources/bitmaps_png/png/via_diameter_48.png differ
diff --git a/resources/bitmaps_png/png/via_diameter_dark_48.png b/resources/bitmaps_png/png/via_diameter_dark_48.png
new file mode 100644
index 0000000000..7220d63d5a
Binary files /dev/null and b/resources/bitmaps_png/png/via_diameter_dark_48.png differ
diff --git a/resources/bitmaps_png/png/via_hole_diameter_48.png b/resources/bitmaps_png/png/via_hole_diameter_48.png
new file mode 100644
index 0000000000..9ec90ae322
Binary files /dev/null and b/resources/bitmaps_png/png/via_hole_diameter_48.png differ
diff --git a/resources/bitmaps_png/png/via_hole_diameter_dark_48.png b/resources/bitmaps_png/png/via_hole_diameter_dark_48.png
new file mode 100644
index 0000000000..8473f4b8a7
Binary files /dev/null and b/resources/bitmaps_png/png/via_hole_diameter_dark_48.png differ
diff --git a/resources/bitmaps_png/png/via_microvia_48.png b/resources/bitmaps_png/png/via_microvia_48.png
new file mode 100644
index 0000000000..7ee006513c
Binary files /dev/null and b/resources/bitmaps_png/png/via_microvia_48.png differ
diff --git a/resources/bitmaps_png/png/via_microvia_dark_48.png b/resources/bitmaps_png/png/via_microvia_dark_48.png
new file mode 100644
index 0000000000..524c6eb84d
Binary files /dev/null and b/resources/bitmaps_png/png/via_microvia_dark_48.png differ
diff --git a/resources/bitmaps_png/png/via_sketch_48.png b/resources/bitmaps_png/png/via_sketch_48.png
new file mode 100644
index 0000000000..2f5112dcea
Binary files /dev/null and b/resources/bitmaps_png/png/via_sketch_48.png differ
diff --git a/resources/bitmaps_png/png/via_sketch_dark_48.png b/resources/bitmaps_png/png/via_sketch_dark_48.png
new file mode 100644
index 0000000000..2cdf541acb
Binary files /dev/null and b/resources/bitmaps_png/png/via_sketch_dark_48.png differ
diff --git a/resources/bitmaps_png/png/visibility_32.png b/resources/bitmaps_png/png/visibility_32.png
new file mode 100644
index 0000000000..729fa67e82
Binary files /dev/null and b/resources/bitmaps_png/png/visibility_32.png differ
diff --git a/resources/bitmaps_png/png/visibility_dark_32.png b/resources/bitmaps_png/png/visibility_dark_32.png
new file mode 100644
index 0000000000..56af43c59e
Binary files /dev/null and b/resources/bitmaps_png/png/visibility_dark_32.png differ
diff --git a/resources/bitmaps_png/png/visibility_off_32.png b/resources/bitmaps_png/png/visibility_off_32.png
new file mode 100644
index 0000000000..7344c14206
Binary files /dev/null and b/resources/bitmaps_png/png/visibility_off_32.png differ
diff --git a/resources/bitmaps_png/png/visibility_off_dark_32.png b/resources/bitmaps_png/png/visibility_off_dark_32.png
new file mode 100644
index 0000000000..5327a56752
Binary files /dev/null and b/resources/bitmaps_png/png/visibility_off_dark_32.png differ
diff --git a/resources/bitmaps_png/png/width_conn_48.png b/resources/bitmaps_png/png/width_conn_48.png
new file mode 100644
index 0000000000..fe050d0714
Binary files /dev/null and b/resources/bitmaps_png/png/width_conn_48.png differ
diff --git a/resources/bitmaps_png/png/width_conn_dark_48.png b/resources/bitmaps_png/png/width_conn_dark_48.png
new file mode 100644
index 0000000000..a4f1c9e1b1
Binary files /dev/null and b/resources/bitmaps_png/png/width_conn_dark_48.png differ
diff --git a/resources/bitmaps_png/png/width_track_48.png b/resources/bitmaps_png/png/width_track_48.png
new file mode 100644
index 0000000000..612797391f
Binary files /dev/null and b/resources/bitmaps_png/png/width_track_48.png differ
diff --git a/resources/bitmaps_png/png/width_track_dark_48.png b/resources/bitmaps_png/png/width_track_dark_48.png
new file mode 100644
index 0000000000..7c9736196d
Binary files /dev/null and b/resources/bitmaps_png/png/width_track_dark_48.png differ
diff --git a/resources/bitmaps_png/png/width_track_via_48.png b/resources/bitmaps_png/png/width_track_via_48.png
new file mode 100644
index 0000000000..d22a83858e
Binary files /dev/null and b/resources/bitmaps_png/png/width_track_via_48.png differ
diff --git a/resources/bitmaps_png/png/width_track_via_dark_48.png b/resources/bitmaps_png/png/width_track_via_dark_48.png
new file mode 100644
index 0000000000..a19a03eb5a
Binary files /dev/null and b/resources/bitmaps_png/png/width_track_via_dark_48.png differ
diff --git a/resources/bitmaps_png/png/www_32.png b/resources/bitmaps_png/png/www_32.png
new file mode 100644
index 0000000000..df711d2c6d
Binary files /dev/null and b/resources/bitmaps_png/png/www_32.png differ
diff --git a/resources/bitmaps_png/png/www_dark_32.png b/resources/bitmaps_png/png/www_dark_32.png
new file mode 100644
index 0000000000..97b37c4815
Binary files /dev/null and b/resources/bitmaps_png/png/www_dark_32.png differ
diff --git a/resources/bitmaps_png/png/zip_48.png b/resources/bitmaps_png/png/zip_48.png
new file mode 100644
index 0000000000..9ab2f696be
Binary files /dev/null and b/resources/bitmaps_png/png/zip_48.png differ
diff --git a/resources/bitmaps_png/png/zip_dark_48.png b/resources/bitmaps_png/png/zip_dark_48.png
new file mode 100644
index 0000000000..03e3ec0c3c
Binary files /dev/null and b/resources/bitmaps_png/png/zip_dark_48.png differ
diff --git a/resources/bitmaps_png/png/zone_duplicate_48.png b/resources/bitmaps_png/png/zone_duplicate_48.png
new file mode 100644
index 0000000000..0210306849
Binary files /dev/null and b/resources/bitmaps_png/png/zone_duplicate_48.png differ
diff --git a/resources/bitmaps_png/png/zone_duplicate_dark_48.png b/resources/bitmaps_png/png/zone_duplicate_dark_48.png
new file mode 100644
index 0000000000..4352835701
Binary files /dev/null and b/resources/bitmaps_png/png/zone_duplicate_dark_48.png differ
diff --git a/resources/bitmaps_png/png/zone_fillet_48.png b/resources/bitmaps_png/png/zone_fillet_48.png
new file mode 100644
index 0000000000..3962181776
Binary files /dev/null and b/resources/bitmaps_png/png/zone_fillet_48.png differ
diff --git a/resources/bitmaps_png/png/zone_fillet_dark_48.png b/resources/bitmaps_png/png/zone_fillet_dark_48.png
new file mode 100644
index 0000000000..f86b03dc2b
Binary files /dev/null and b/resources/bitmaps_png/png/zone_fillet_dark_48.png differ
diff --git a/resources/bitmaps_png/png/zone_unfill_48.png b/resources/bitmaps_png/png/zone_unfill_48.png
new file mode 100644
index 0000000000..f4f37fa53f
Binary files /dev/null and b/resources/bitmaps_png/png/zone_unfill_48.png differ
diff --git a/resources/bitmaps_png/png/zone_unfill_dark_48.png b/resources/bitmaps_png/png/zone_unfill_dark_48.png
new file mode 100644
index 0000000000..93331da433
Binary files /dev/null and b/resources/bitmaps_png/png/zone_unfill_dark_48.png differ
diff --git a/resources/bitmaps_png/png/zoom_area_48.png b/resources/bitmaps_png/png/zoom_area_48.png
new file mode 100644
index 0000000000..a66a86e8b5
Binary files /dev/null and b/resources/bitmaps_png/png/zoom_area_48.png differ
diff --git a/resources/bitmaps_png/png/zoom_area_dark_48.png b/resources/bitmaps_png/png/zoom_area_dark_48.png
new file mode 100644
index 0000000000..fdc4f1eced
Binary files /dev/null and b/resources/bitmaps_png/png/zoom_area_dark_48.png differ
diff --git a/resources/bitmaps_png/png/zoom_auto_fit_in_page_48.png b/resources/bitmaps_png/png/zoom_auto_fit_in_page_48.png
new file mode 100644
index 0000000000..3ba49100ed
Binary files /dev/null and b/resources/bitmaps_png/png/zoom_auto_fit_in_page_48.png differ
diff --git a/resources/bitmaps_png/png/zoom_auto_fit_in_page_dark_48.png b/resources/bitmaps_png/png/zoom_auto_fit_in_page_dark_48.png
new file mode 100644
index 0000000000..b818693f73
Binary files /dev/null and b/resources/bitmaps_png/png/zoom_auto_fit_in_page_dark_48.png differ
diff --git a/resources/bitmaps_png/png/zoom_center_on_screen_48.png b/resources/bitmaps_png/png/zoom_center_on_screen_48.png
new file mode 100644
index 0000000000..d8d90df6d8
Binary files /dev/null and b/resources/bitmaps_png/png/zoom_center_on_screen_48.png differ
diff --git a/resources/bitmaps_png/png/zoom_center_on_screen_dark_48.png b/resources/bitmaps_png/png/zoom_center_on_screen_dark_48.png
new file mode 100644
index 0000000000..2c69ba0a9e
Binary files /dev/null and b/resources/bitmaps_png/png/zoom_center_on_screen_dark_48.png differ
diff --git a/resources/bitmaps_png/png/zoom_fit_in_page_48.png b/resources/bitmaps_png/png/zoom_fit_in_page_48.png
new file mode 100644
index 0000000000..a4a388ae38
Binary files /dev/null and b/resources/bitmaps_png/png/zoom_fit_in_page_48.png differ
diff --git a/resources/bitmaps_png/png/zoom_fit_in_page_dark_48.png b/resources/bitmaps_png/png/zoom_fit_in_page_dark_48.png
new file mode 100644
index 0000000000..609a91d3fe
Binary files /dev/null and b/resources/bitmaps_png/png/zoom_fit_in_page_dark_48.png differ
diff --git a/resources/bitmaps_png/png/zoom_fit_to_objects_48.png b/resources/bitmaps_png/png/zoom_fit_to_objects_48.png
new file mode 100644
index 0000000000..dd539b7dae
Binary files /dev/null and b/resources/bitmaps_png/png/zoom_fit_to_objects_48.png differ
diff --git a/resources/bitmaps_png/png/zoom_fit_to_objects_dark_48.png b/resources/bitmaps_png/png/zoom_fit_to_objects_dark_48.png
new file mode 100644
index 0000000000..fac7acc595
Binary files /dev/null and b/resources/bitmaps_png/png/zoom_fit_to_objects_dark_48.png differ
diff --git a/resources/bitmaps_png/png/zoom_in_48.png b/resources/bitmaps_png/png/zoom_in_48.png
new file mode 100644
index 0000000000..be7aacb3ac
Binary files /dev/null and b/resources/bitmaps_png/png/zoom_in_48.png differ
diff --git a/resources/bitmaps_png/png/zoom_in_dark_48.png b/resources/bitmaps_png/png/zoom_in_dark_48.png
new file mode 100644
index 0000000000..18106605e2
Binary files /dev/null and b/resources/bitmaps_png/png/zoom_in_dark_48.png differ
diff --git a/resources/bitmaps_png/png/zoom_out_48.png b/resources/bitmaps_png/png/zoom_out_48.png
new file mode 100644
index 0000000000..106243344f
Binary files /dev/null and b/resources/bitmaps_png/png/zoom_out_48.png differ
diff --git a/resources/bitmaps_png/png/zoom_out_dark_48.png b/resources/bitmaps_png/png/zoom_out_dark_48.png
new file mode 100644
index 0000000000..8cfd92ab01
Binary files /dev/null and b/resources/bitmaps_png/png/zoom_out_dark_48.png differ
diff --git a/resources/bitmaps_png/png/zoom_selection_48.png b/resources/bitmaps_png/png/zoom_selection_48.png
new file mode 100644
index 0000000000..6a834cd4dc
Binary files /dev/null and b/resources/bitmaps_png/png/zoom_selection_48.png differ
diff --git a/resources/bitmaps_png/png/zoom_selection_dark_48.png b/resources/bitmaps_png/png/zoom_selection_dark_48.png
new file mode 100644
index 0000000000..0b1c63c39c
Binary files /dev/null and b/resources/bitmaps_png/png/zoom_selection_dark_48.png differ