diff --git a/common/bitmap_info.cpp b/common/bitmap_info.cpp
index b35e7de099..8400fb5d2b 100644
--- a/common/bitmap_info.cpp
+++ b/common/bitmap_info.cpp
@@ -392,6 +392,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::add_via].emplace_back( BITMAPS::add_via, wxT( "add_via_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::add_zone_cutout].emplace_back( BITMAPS::add_zone_cutout, wxT( "add_zone_cutout_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::add_zone].emplace_back( BITMAPS::add_zone, wxT( "add_zone_24.png" ), 24, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::align_elements_to_grid].emplace_back( BITMAPS::align_elements_to_grid, wxT( "align_elements_to_grid_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::align_items].emplace_back( BITMAPS::align_items, wxT( "align_items_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::align_items_left].emplace_back( BITMAPS::align_items_left, wxT( "align_items_left_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::align_items_right].emplace_back( BITMAPS::align_items_right, wxT( "align_items_right_24.png" ), 24, wxT( "light" ) );
@@ -421,18 +422,20 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::cancel].emplace_back( BITMAPS::cancel, wxT( "cancel_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::chamfer].emplace_back( BITMAPS::chamfer, wxT( "chamfer_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::change_entry_orient].emplace_back( BITMAPS::change_entry_orient, wxT( "change_entry_orient_24.png" ), 24, wxT( "light" ) );
-    aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_24.png" ), 24, wxT( "light" ) );
-    aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::checked_ok].emplace_back( BITMAPS::checked_ok, wxT( "checked_ok_24.png" ), 24, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::cleanup_graphics].emplace_back( BITMAPS::cleanup_graphics, wxT( "cleanup_graphics_24.png" ), 24, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::cleanup_tracks_and_vias].emplace_back( BITMAPS::cleanup_tracks_and_vias, wxT( "cleanup_tracks_and_vias_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::color_materials].emplace_back( BITMAPS::color_materials, wxT( "color_materials_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::component_select_unit].emplace_back( BITMAPS::component_select_unit, wxT( "component_select_unit_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::config].emplace_back( BITMAPS::config, wxT( "config_24.png" ), 24, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::convert].emplace_back( BITMAPS::convert, wxT( "convert_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::copy].emplace_back( BITMAPS::copy, wxT( "copy_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::copy_pad_settings].emplace_back( BITMAPS::copy_pad_settings, wxT( "copy_pad_settings_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::cursor_shape].emplace_back( BITMAPS::cursor_shape, wxT( "cursor_shape_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::cursor].emplace_back( BITMAPS::cursor, wxT( "cursor_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::custom_pad_to_primitives].emplace_back( BITMAPS::custom_pad_to_primitives, wxT( "custom_pad_to_primitives_24.png" ), 24, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::cut].emplace_back( BITMAPS::cut, wxT( "cut_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::datasheet].emplace_back( BITMAPS::datasheet, wxT( "datasheet_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::delete_association].emplace_back( BITMAPS::delete_association, wxT( "delete_association_24.png" ), 24, wxT( "light" ) );
@@ -445,6 +448,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_24.png" ), 24, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::drag_segment].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::drag_segment_withslope].emplace_back( BITMAPS::drag_segment_withslope, wxT( "drag_segment_withslope_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::drc].emplace_back( BITMAPS::drc, wxT( "drc_24.png" ), 24, wxT( "light" ) );
@@ -789,6 +793,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::add_via].emplace_back( BITMAPS::add_via, wxT( "add_via_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::add_zone_cutout].emplace_back( BITMAPS::add_zone_cutout, wxT( "add_zone_cutout_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::add_zone].emplace_back( BITMAPS::add_zone, wxT( "add_zone_dark_24.png" ), 24, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::align_elements_to_grid].emplace_back( BITMAPS::align_elements_to_grid, wxT( "align_elements_to_grid_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::align_items].emplace_back( BITMAPS::align_items, wxT( "align_items_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::align_items_left].emplace_back( BITMAPS::align_items_left, wxT( "align_items_left_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::align_items_right].emplace_back( BITMAPS::align_items_right, wxT( "align_items_right_dark_24.png" ), 24, wxT( "dark" ) );
@@ -818,18 +823,20 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::cancel].emplace_back( BITMAPS::cancel, wxT( "cancel_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::chamfer].emplace_back( BITMAPS::chamfer, wxT( "chamfer_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::change_entry_orient].emplace_back( BITMAPS::change_entry_orient, wxT( "change_entry_orient_dark_24.png" ), 24, wxT( "dark" ) );
-    aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_dark_24.png" ), 24, wxT( "dark" ) );
-    aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::checked_ok].emplace_back( BITMAPS::checked_ok, wxT( "checked_ok_dark_24.png" ), 24, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::cleanup_graphics].emplace_back( BITMAPS::cleanup_graphics, wxT( "cleanup_graphics_dark_24.png" ), 24, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::cleanup_tracks_and_vias].emplace_back( BITMAPS::cleanup_tracks_and_vias, wxT( "cleanup_tracks_and_vias_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::color_materials].emplace_back( BITMAPS::color_materials, wxT( "color_materials_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::component_select_unit].emplace_back( BITMAPS::component_select_unit, wxT( "component_select_unit_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::config].emplace_back( BITMAPS::config, wxT( "config_dark_24.png" ), 24, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::convert].emplace_back( BITMAPS::convert, wxT( "convert_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::copy].emplace_back( BITMAPS::copy, wxT( "copy_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::copy_pad_settings].emplace_back( BITMAPS::copy_pad_settings, wxT( "copy_pad_settings_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::cursor_shape].emplace_back( BITMAPS::cursor_shape, wxT( "cursor_shape_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::cursor].emplace_back( BITMAPS::cursor, wxT( "cursor_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::custom_pad_to_primitives].emplace_back( BITMAPS::custom_pad_to_primitives, wxT( "custom_pad_to_primitives_dark_24.png" ), 24, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::cut].emplace_back( BITMAPS::cut, wxT( "cut_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::datasheet].emplace_back( BITMAPS::datasheet, wxT( "datasheet_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::delete_association].emplace_back( BITMAPS::delete_association, wxT( "delete_association_dark_24.png" ), 24, wxT( "dark" ) );
@@ -842,6 +849,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_dark_24.png" ), 24, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::drag_segment].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::drag_segment_withslope].emplace_back( BITMAPS::drag_segment_withslope, wxT( "drag_segment_withslope_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::drc].emplace_back( BITMAPS::drc, wxT( "drc_dark_24.png" ), 24, wxT( "dark" ) );
@@ -1186,6 +1194,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::add_via].emplace_back( BITMAPS::add_via, wxT( "add_via_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::add_zone_cutout].emplace_back( BITMAPS::add_zone_cutout, wxT( "add_zone_cutout_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::add_zone].emplace_back( BITMAPS::add_zone, wxT( "add_zone_16.png" ), 16, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::align_elements_to_grid].emplace_back( BITMAPS::align_elements_to_grid, wxT( "align_elements_to_grid_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::align_items].emplace_back( BITMAPS::align_items, wxT( "align_items_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::align_items_left].emplace_back( BITMAPS::align_items_left, wxT( "align_items_left_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::align_items_right].emplace_back( BITMAPS::align_items_right, wxT( "align_items_right_16.png" ), 16, wxT( "light" ) );
@@ -1215,18 +1224,20 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::cancel].emplace_back( BITMAPS::cancel, wxT( "cancel_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::chamfer].emplace_back( BITMAPS::chamfer, wxT( "chamfer_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::change_entry_orient].emplace_back( BITMAPS::change_entry_orient, wxT( "change_entry_orient_16.png" ), 16, wxT( "light" ) );
-    aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_16.png" ), 16, wxT( "light" ) );
-    aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::checked_ok].emplace_back( BITMAPS::checked_ok, wxT( "checked_ok_16.png" ), 16, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::cleanup_graphics].emplace_back( BITMAPS::cleanup_graphics, wxT( "cleanup_graphics_16.png" ), 16, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::cleanup_tracks_and_vias].emplace_back( BITMAPS::cleanup_tracks_and_vias, wxT( "cleanup_tracks_and_vias_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::color_materials].emplace_back( BITMAPS::color_materials, wxT( "color_materials_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::component_select_unit].emplace_back( BITMAPS::component_select_unit, wxT( "component_select_unit_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::config].emplace_back( BITMAPS::config, wxT( "config_16.png" ), 16, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::convert].emplace_back( BITMAPS::convert, wxT( "convert_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::copy].emplace_back( BITMAPS::copy, wxT( "copy_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::copy_pad_settings].emplace_back( BITMAPS::copy_pad_settings, wxT( "copy_pad_settings_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::cursor_shape].emplace_back( BITMAPS::cursor_shape, wxT( "cursor_shape_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::cursor].emplace_back( BITMAPS::cursor, wxT( "cursor_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::custom_pad_to_primitives].emplace_back( BITMAPS::custom_pad_to_primitives, wxT( "custom_pad_to_primitives_16.png" ), 16, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::cut].emplace_back( BITMAPS::cut, wxT( "cut_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::datasheet].emplace_back( BITMAPS::datasheet, wxT( "datasheet_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::delete_association].emplace_back( BITMAPS::delete_association, wxT( "delete_association_16.png" ), 16, wxT( "light" ) );
@@ -1239,6 +1250,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_16.png" ), 16, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::drag_segment].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::drag_segment_withslope].emplace_back( BITMAPS::drag_segment_withslope, wxT( "drag_segment_withslope_16.png" ), 16, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::drc].emplace_back( BITMAPS::drc, wxT( "drc_16.png" ), 16, wxT( "light" ) );
@@ -1583,6 +1595,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::add_via].emplace_back( BITMAPS::add_via, wxT( "add_via_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::add_zone_cutout].emplace_back( BITMAPS::add_zone_cutout, wxT( "add_zone_cutout_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::add_zone].emplace_back( BITMAPS::add_zone, wxT( "add_zone_dark_16.png" ), 16, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::align_elements_to_grid].emplace_back( BITMAPS::align_elements_to_grid, wxT( "align_elements_to_grid_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::align_items].emplace_back( BITMAPS::align_items, wxT( "align_items_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::align_items_left].emplace_back( BITMAPS::align_items_left, wxT( "align_items_left_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::align_items_right].emplace_back( BITMAPS::align_items_right, wxT( "align_items_right_dark_16.png" ), 16, wxT( "dark" ) );
@@ -1612,18 +1625,20 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::cancel].emplace_back( BITMAPS::cancel, wxT( "cancel_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::chamfer].emplace_back( BITMAPS::chamfer, wxT( "chamfer_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::change_entry_orient].emplace_back( BITMAPS::change_entry_orient, wxT( "change_entry_orient_dark_16.png" ), 16, wxT( "dark" ) );
-    aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_dark_16.png" ), 16, wxT( "dark" ) );
-    aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::checked_ok].emplace_back( BITMAPS::checked_ok, wxT( "checked_ok_dark_16.png" ), 16, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::cleanup_graphics].emplace_back( BITMAPS::cleanup_graphics, wxT( "cleanup_graphics_dark_16.png" ), 16, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::cleanup_tracks_and_vias].emplace_back( BITMAPS::cleanup_tracks_and_vias, wxT( "cleanup_tracks_and_vias_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::color_materials].emplace_back( BITMAPS::color_materials, wxT( "color_materials_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::component_select_unit].emplace_back( BITMAPS::component_select_unit, wxT( "component_select_unit_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::config].emplace_back( BITMAPS::config, wxT( "config_dark_16.png" ), 16, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::convert].emplace_back( BITMAPS::convert, wxT( "convert_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::copy].emplace_back( BITMAPS::copy, wxT( "copy_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::copy_pad_settings].emplace_back( BITMAPS::copy_pad_settings, wxT( "copy_pad_settings_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::cursor_shape].emplace_back( BITMAPS::cursor_shape, wxT( "cursor_shape_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::cursor].emplace_back( BITMAPS::cursor, wxT( "cursor_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::custom_pad_to_primitives].emplace_back( BITMAPS::custom_pad_to_primitives, wxT( "custom_pad_to_primitives_dark_16.png" ), 16, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::cut].emplace_back( BITMAPS::cut, wxT( "cut_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::datasheet].emplace_back( BITMAPS::datasheet, wxT( "datasheet_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::delete_association].emplace_back( BITMAPS::delete_association, wxT( "delete_association_dark_16.png" ), 16, wxT( "dark" ) );
@@ -1636,6 +1651,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_dark_16.png" ), 16, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::drag_segment].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::drag_segment_withslope].emplace_back( BITMAPS::drag_segment_withslope, wxT( "drag_segment_withslope_dark_16.png" ), 16, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::drc].emplace_back( BITMAPS::drc, wxT( "drc_dark_16.png" ), 16, wxT( "dark" ) );
@@ -1980,6 +1996,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::add_via].emplace_back( BITMAPS::add_via, wxT( "add_via_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::add_zone_cutout].emplace_back( BITMAPS::add_zone_cutout, wxT( "add_zone_cutout_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::add_zone].emplace_back( BITMAPS::add_zone, wxT( "add_zone_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::align_elements_to_grid].emplace_back( BITMAPS::align_elements_to_grid, wxT( "align_elements_to_grid_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::align_items].emplace_back( BITMAPS::align_items, wxT( "align_items_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::align_items_left].emplace_back( BITMAPS::align_items_left, wxT( "align_items_left_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::align_items_right].emplace_back( BITMAPS::align_items_right, wxT( "align_items_right_32.png" ), 32, wxT( "light" ) );
@@ -2009,18 +2026,20 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::cancel].emplace_back( BITMAPS::cancel, wxT( "cancel_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::chamfer].emplace_back( BITMAPS::chamfer, wxT( "chamfer_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::change_entry_orient].emplace_back( BITMAPS::change_entry_orient, wxT( "change_entry_orient_32.png" ), 32, wxT( "light" ) );
-    aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_32.png" ), 32, wxT( "light" ) );
-    aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::checked_ok].emplace_back( BITMAPS::checked_ok, wxT( "checked_ok_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::cleanup_graphics].emplace_back( BITMAPS::cleanup_graphics, wxT( "cleanup_graphics_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::cleanup_tracks_and_vias].emplace_back( BITMAPS::cleanup_tracks_and_vias, wxT( "cleanup_tracks_and_vias_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::color_materials].emplace_back( BITMAPS::color_materials, wxT( "color_materials_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::component_select_unit].emplace_back( BITMAPS::component_select_unit, wxT( "component_select_unit_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::config].emplace_back( BITMAPS::config, wxT( "config_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::convert].emplace_back( BITMAPS::convert, wxT( "convert_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::copy].emplace_back( BITMAPS::copy, wxT( "copy_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::copy_pad_settings].emplace_back( BITMAPS::copy_pad_settings, wxT( "copy_pad_settings_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::cursor_shape].emplace_back( BITMAPS::cursor_shape, wxT( "cursor_shape_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::cursor].emplace_back( BITMAPS::cursor, wxT( "cursor_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::custom_pad_to_primitives].emplace_back( BITMAPS::custom_pad_to_primitives, wxT( "custom_pad_to_primitives_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::cut].emplace_back( BITMAPS::cut, wxT( "cut_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::datasheet].emplace_back( BITMAPS::datasheet, wxT( "datasheet_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::delete_association].emplace_back( BITMAPS::delete_association, wxT( "delete_association_32.png" ), 32, wxT( "light" ) );
@@ -2033,6 +2052,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_32.png" ), 32, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::drag_segment].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::drag_segment_withslope].emplace_back( BITMAPS::drag_segment_withslope, wxT( "drag_segment_withslope_32.png" ), 32, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::drc].emplace_back( BITMAPS::drc, wxT( "drc_32.png" ), 32, wxT( "light" ) );
@@ -2377,6 +2397,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::add_via].emplace_back( BITMAPS::add_via, wxT( "add_via_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::add_zone_cutout].emplace_back( BITMAPS::add_zone_cutout, wxT( "add_zone_cutout_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::add_zone].emplace_back( BITMAPS::add_zone, wxT( "add_zone_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::align_elements_to_grid].emplace_back( BITMAPS::align_elements_to_grid, wxT( "align_elements_to_grid_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::align_items].emplace_back( BITMAPS::align_items, wxT( "align_items_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::align_items_left].emplace_back( BITMAPS::align_items_left, wxT( "align_items_left_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::align_items_right].emplace_back( BITMAPS::align_items_right, wxT( "align_items_right_dark_32.png" ), 32, wxT( "dark" ) );
@@ -2406,18 +2427,20 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::cancel].emplace_back( BITMAPS::cancel, wxT( "cancel_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::chamfer].emplace_back( BITMAPS::chamfer, wxT( "chamfer_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::change_entry_orient].emplace_back( BITMAPS::change_entry_orient, wxT( "change_entry_orient_dark_32.png" ), 32, wxT( "dark" ) );
-    aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_dark_32.png" ), 32, wxT( "dark" ) );
-    aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::checked_ok].emplace_back( BITMAPS::checked_ok, wxT( "checked_ok_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::cleanup_graphics].emplace_back( BITMAPS::cleanup_graphics, wxT( "cleanup_graphics_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::cleanup_tracks_and_vias].emplace_back( BITMAPS::cleanup_tracks_and_vias, wxT( "cleanup_tracks_and_vias_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::color_materials].emplace_back( BITMAPS::color_materials, wxT( "color_materials_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::component_select_unit].emplace_back( BITMAPS::component_select_unit, wxT( "component_select_unit_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::config].emplace_back( BITMAPS::config, wxT( "config_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::convert].emplace_back( BITMAPS::convert, wxT( "convert_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::copy].emplace_back( BITMAPS::copy, wxT( "copy_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::copy_pad_settings].emplace_back( BITMAPS::copy_pad_settings, wxT( "copy_pad_settings_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::cursor_shape].emplace_back( BITMAPS::cursor_shape, wxT( "cursor_shape_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::cursor].emplace_back( BITMAPS::cursor, wxT( "cursor_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::custom_pad_to_primitives].emplace_back( BITMAPS::custom_pad_to_primitives, wxT( "custom_pad_to_primitives_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::cut].emplace_back( BITMAPS::cut, wxT( "cut_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::datasheet].emplace_back( BITMAPS::datasheet, wxT( "datasheet_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::delete_association].emplace_back( BITMAPS::delete_association, wxT( "delete_association_dark_32.png" ), 32, wxT( "dark" ) );
@@ -2430,6 +2453,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_dark_32.png" ), 32, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::drag_segment].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::drag_segment_withslope].emplace_back( BITMAPS::drag_segment_withslope, wxT( "drag_segment_withslope_dark_32.png" ), 32, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::drc].emplace_back( BITMAPS::drc, wxT( "drc_dark_32.png" ), 32, wxT( "dark" ) );
@@ -2774,6 +2798,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     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_elements_to_grid].emplace_back( BITMAPS::align_elements_to_grid, wxT( "align_elements_to_grid_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" ) );
@@ -2803,18 +2828,20 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     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::cleanup_graphics].emplace_back( BITMAPS::cleanup_graphics, wxT( "cleanup_graphics_48.png" ), 48, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::cleanup_tracks_and_vias].emplace_back( BITMAPS::cleanup_tracks_and_vias, wxT( "cleanup_tracks_and_vias_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::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_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::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_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" ) );
@@ -2827,6 +2854,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     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].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_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" ) );
@@ -3171,6 +3199,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     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_elements_to_grid].emplace_back( BITMAPS::align_elements_to_grid, wxT( "align_elements_to_grid_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" ) );
@@ -3200,18 +3229,20 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     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::cleanup_graphics].emplace_back( BITMAPS::cleanup_graphics, wxT( "cleanup_graphics_dark_48.png" ), 48, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::cleanup_tracks_and_vias].emplace_back( BITMAPS::cleanup_tracks_and_vias, wxT( "cleanup_tracks_and_vias_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::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_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::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_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" ) );
@@ -3224,6 +3255,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     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].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_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" ) );
@@ -3568,6 +3600,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::add_via].emplace_back( BITMAPS::add_via, wxT( "add_via_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::add_zone_cutout].emplace_back( BITMAPS::add_zone_cutout, wxT( "add_zone_cutout_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::add_zone].emplace_back( BITMAPS::add_zone, wxT( "add_zone_64.png" ), 64, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::align_elements_to_grid].emplace_back( BITMAPS::align_elements_to_grid, wxT( "align_elements_to_grid_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::align_items].emplace_back( BITMAPS::align_items, wxT( "align_items_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::align_items_left].emplace_back( BITMAPS::align_items_left, wxT( "align_items_left_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::align_items_right].emplace_back( BITMAPS::align_items_right, wxT( "align_items_right_64.png" ), 64, wxT( "light" ) );
@@ -3597,18 +3630,20 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::cancel].emplace_back( BITMAPS::cancel, wxT( "cancel_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::chamfer].emplace_back( BITMAPS::chamfer, wxT( "chamfer_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::change_entry_orient].emplace_back( BITMAPS::change_entry_orient, wxT( "change_entry_orient_64.png" ), 64, wxT( "light" ) );
-    aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_64.png" ), 64, wxT( "light" ) );
-    aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::checked_ok].emplace_back( BITMAPS::checked_ok, wxT( "checked_ok_64.png" ), 64, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::cleanup_graphics].emplace_back( BITMAPS::cleanup_graphics, wxT( "cleanup_graphics_64.png" ), 64, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::cleanup_tracks_and_vias].emplace_back( BITMAPS::cleanup_tracks_and_vias, wxT( "cleanup_tracks_and_vias_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::color_materials].emplace_back( BITMAPS::color_materials, wxT( "color_materials_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::component_select_unit].emplace_back( BITMAPS::component_select_unit, wxT( "component_select_unit_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::config].emplace_back( BITMAPS::config, wxT( "config_64.png" ), 64, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::convert].emplace_back( BITMAPS::convert, wxT( "convert_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::copy].emplace_back( BITMAPS::copy, wxT( "copy_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::copy_pad_settings].emplace_back( BITMAPS::copy_pad_settings, wxT( "copy_pad_settings_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::cursor_shape].emplace_back( BITMAPS::cursor_shape, wxT( "cursor_shape_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::cursor].emplace_back( BITMAPS::cursor, wxT( "cursor_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::custom_pad_to_primitives].emplace_back( BITMAPS::custom_pad_to_primitives, wxT( "custom_pad_to_primitives_64.png" ), 64, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::cut].emplace_back( BITMAPS::cut, wxT( "cut_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::datasheet].emplace_back( BITMAPS::datasheet, wxT( "datasheet_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::delete_association].emplace_back( BITMAPS::delete_association, wxT( "delete_association_64.png" ), 64, wxT( "light" ) );
@@ -3621,6 +3656,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_64.png" ), 64, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::drag_segment].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::drag_segment_withslope].emplace_back( BITMAPS::drag_segment_withslope, wxT( "drag_segment_withslope_64.png" ), 64, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::drc].emplace_back( BITMAPS::drc, wxT( "drc_64.png" ), 64, wxT( "light" ) );
@@ -3965,6 +4001,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::add_via].emplace_back( BITMAPS::add_via, wxT( "add_via_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::add_zone_cutout].emplace_back( BITMAPS::add_zone_cutout, wxT( "add_zone_cutout_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::add_zone].emplace_back( BITMAPS::add_zone, wxT( "add_zone_dark_64.png" ), 64, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::align_elements_to_grid].emplace_back( BITMAPS::align_elements_to_grid, wxT( "align_elements_to_grid_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::align_items].emplace_back( BITMAPS::align_items, wxT( "align_items_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::align_items_left].emplace_back( BITMAPS::align_items_left, wxT( "align_items_left_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::align_items_right].emplace_back( BITMAPS::align_items_right, wxT( "align_items_right_dark_64.png" ), 64, wxT( "dark" ) );
@@ -3994,18 +4031,20 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::cancel].emplace_back( BITMAPS::cancel, wxT( "cancel_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::chamfer].emplace_back( BITMAPS::chamfer, wxT( "chamfer_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::change_entry_orient].emplace_back( BITMAPS::change_entry_orient, wxT( "change_entry_orient_dark_64.png" ), 64, wxT( "dark" ) );
-    aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_dark_64.png" ), 64, wxT( "dark" ) );
-    aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::checked_ok].emplace_back( BITMAPS::checked_ok, wxT( "checked_ok_dark_64.png" ), 64, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::cleanup_graphics].emplace_back( BITMAPS::cleanup_graphics, wxT( "cleanup_graphics_dark_64.png" ), 64, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::cleanup_tracks_and_vias].emplace_back( BITMAPS::cleanup_tracks_and_vias, wxT( "cleanup_tracks_and_vias_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::color_materials].emplace_back( BITMAPS::color_materials, wxT( "color_materials_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::component_select_unit].emplace_back( BITMAPS::component_select_unit, wxT( "component_select_unit_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::config].emplace_back( BITMAPS::config, wxT( "config_dark_64.png" ), 64, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::convert].emplace_back( BITMAPS::convert, wxT( "convert_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::copy].emplace_back( BITMAPS::copy, wxT( "copy_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::copy_pad_settings].emplace_back( BITMAPS::copy_pad_settings, wxT( "copy_pad_settings_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::cursor_shape].emplace_back( BITMAPS::cursor_shape, wxT( "cursor_shape_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::cursor].emplace_back( BITMAPS::cursor, wxT( "cursor_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::custom_pad_to_primitives].emplace_back( BITMAPS::custom_pad_to_primitives, wxT( "custom_pad_to_primitives_dark_64.png" ), 64, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::cut].emplace_back( BITMAPS::cut, wxT( "cut_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::datasheet].emplace_back( BITMAPS::datasheet, wxT( "datasheet_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::delete_association].emplace_back( BITMAPS::delete_association, wxT( "delete_association_dark_64.png" ), 64, wxT( "dark" ) );
@@ -4018,6 +4057,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_dark_64.png" ), 64, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::drag_segment].emplace_back( BITMAPS::drag_segment, wxT( "drag_segment_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::drag_segment_withslope].emplace_back( BITMAPS::drag_segment_withslope, wxT( "drag_segment_withslope_dark_64.png" ), 64, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::drc].emplace_back( BITMAPS::drc, wxT( "drc_dark_64.png" ), 64, wxT( "dark" ) );
diff --git a/eeschema/tools/ee_actions.cpp b/eeschema/tools/ee_actions.cpp
index ebb89fd34a..f6d766b9dc 100644
--- a/eeschema/tools/ee_actions.cpp
+++ b/eeschema/tools/ee_actions.cpp
@@ -1342,7 +1342,7 @@ TOOL_ACTION EE_ACTIONS::drag( TOOL_ACTION_ARGS()
         .LegacyHotkeyName( "Drag Item" )
         .FriendlyName( _( "Drag" ) )
         .Tooltip( _( "Drags the selected item(s)" ) )
-        .Icon( BITMAPS::move )
+        .Icon( BITMAPS::drag )
         .Flags( AF_ACTIVATE ) );
 
 TOOL_ACTION EE_ACTIONS::alignToGrid( TOOL_ACTION_ARGS()
diff --git a/include/bitmaps/bitmaps_list.h b/include/bitmaps/bitmaps_list.h
index 244ffb3fc7..b306020a8b 100644
--- a/include/bitmaps/bitmaps_list.h
+++ b/include/bitmaps/bitmaps_list.h
@@ -77,6 +77,7 @@ enum class BITMAPS : unsigned int
     add_via,
     add_zone,
     add_zone_cutout,
+    align_elements_to_grid,
     align_items,
     align_items_bottom,
     align_items_center,
@@ -119,6 +120,8 @@ enum class BITMAPS : unsigned int
     change_label,
     change_text,
     checked_ok,
+    cleanup_graphics,
+    cleanup_tracks_and_vias,
     creepage_clearance,
     coax,
     color_code_multiplier,
@@ -154,6 +157,7 @@ enum class BITMAPS : unsigned int
     distribute_horizontal,
     distribute_vertical,
     down,
+    drag,
     drag_segment,
     drag_segment_withslope,
     drc,
diff --git a/pcbnew/tools/pcb_actions.cpp b/pcbnew/tools/pcb_actions.cpp
index cf556a8e66..175096a05d 100644
--- a/pcbnew/tools/pcb_actions.cpp
+++ b/pcbnew/tools/pcb_actions.cpp
@@ -856,14 +856,14 @@ TOOL_ACTION PCB_ACTIONS::cleanupTracksAndVias( TOOL_ACTION_ARGS()
         .Scope( AS_GLOBAL )
         .FriendlyName( _( "Cleanup Tracks & Vias..." ) )
         .Tooltip( _( "Cleanup redundant items, shorting items, etc." ) )
-        .Icon( BITMAPS::delete_cursor ) );
+        .Icon( BITMAPS::cleanup_tracks_and_vias ) );
 
 TOOL_ACTION PCB_ACTIONS::cleanupGraphics( TOOL_ACTION_ARGS()
         .Name( "pcbnew.GlobalEdit.cleanupGraphics" )
         .Scope( AS_GLOBAL )
         .FriendlyName( _( "Cleanup Graphics..." ) )
         .Tooltip( _( "Cleanup redundant items, etc." ) )
-        .Icon( BITMAPS::delete_cursor ) );
+        .Icon( BITMAPS::cleanup_graphics ) );
 
 // MICROWAVE_TOOL
 //
diff --git a/resources/bitmaps_png/CMakeLists.txt b/resources/bitmaps_png/CMakeLists.txt
index 7d0ca16647..0a95c47283 100644
--- a/resources/bitmaps_png/CMakeLists.txt
+++ b/resources/bitmaps_png/CMakeLists.txt
@@ -193,6 +193,7 @@ set( BMAPS_MID
     add_via
     add_zone_cutout
     add_zone
+    align_elements_to_grid
     align_items
     align_items_left
     align_items_right
@@ -222,18 +223,20 @@ set( BMAPS_MID
     cancel
     chamfer
     change_entry_orient
-    contrast_mode
-    curved_ratsnest
     checked_ok
+    cleanup_graphics
+    cleanup_tracks_and_vias
     color_materials
     component_select_unit
     config
+    contrast_mode
     convert
     copy
     copy_pad_settings
     cursor_shape
     cursor
     custom_pad_to_primitives
+    curved_ratsnest
     cut
     datasheet
     delete_association
@@ -246,6 +249,7 @@ set( BMAPS_MID
     distribute_horizontal
     distribute_vertical
     down
+    drag
     drag_segment
     drag_segment_withslope
     drc
diff --git a/resources/bitmaps_png/png/align_elements_to_grid_16.png b/resources/bitmaps_png/png/align_elements_to_grid_16.png
new file mode 100644
index 0000000000..a0e45a7c48
Binary files /dev/null and b/resources/bitmaps_png/png/align_elements_to_grid_16.png differ
diff --git a/resources/bitmaps_png/png/align_elements_to_grid_24.png b/resources/bitmaps_png/png/align_elements_to_grid_24.png
new file mode 100644
index 0000000000..6e4093e839
Binary files /dev/null and b/resources/bitmaps_png/png/align_elements_to_grid_24.png differ
diff --git a/resources/bitmaps_png/png/align_elements_to_grid_32.png b/resources/bitmaps_png/png/align_elements_to_grid_32.png
new file mode 100644
index 0000000000..17fa259e31
Binary files /dev/null and b/resources/bitmaps_png/png/align_elements_to_grid_32.png differ
diff --git a/resources/bitmaps_png/png/align_elements_to_grid_48.png b/resources/bitmaps_png/png/align_elements_to_grid_48.png
new file mode 100644
index 0000000000..41a53bc0df
Binary files /dev/null and b/resources/bitmaps_png/png/align_elements_to_grid_48.png differ
diff --git a/resources/bitmaps_png/png/align_elements_to_grid_64.png b/resources/bitmaps_png/png/align_elements_to_grid_64.png
new file mode 100644
index 0000000000..cc74c7a98a
Binary files /dev/null and b/resources/bitmaps_png/png/align_elements_to_grid_64.png differ
diff --git a/resources/bitmaps_png/png/align_elements_to_grid_dark_16.png b/resources/bitmaps_png/png/align_elements_to_grid_dark_16.png
new file mode 100644
index 0000000000..1d3b3391e8
Binary files /dev/null and b/resources/bitmaps_png/png/align_elements_to_grid_dark_16.png differ
diff --git a/resources/bitmaps_png/png/align_elements_to_grid_dark_24.png b/resources/bitmaps_png/png/align_elements_to_grid_dark_24.png
new file mode 100644
index 0000000000..c636f370d4
Binary files /dev/null and b/resources/bitmaps_png/png/align_elements_to_grid_dark_24.png differ
diff --git a/resources/bitmaps_png/png/align_elements_to_grid_dark_32.png b/resources/bitmaps_png/png/align_elements_to_grid_dark_32.png
new file mode 100644
index 0000000000..cfabdb45dd
Binary files /dev/null and b/resources/bitmaps_png/png/align_elements_to_grid_dark_32.png differ
diff --git a/resources/bitmaps_png/png/align_elements_to_grid_dark_48.png b/resources/bitmaps_png/png/align_elements_to_grid_dark_48.png
new file mode 100644
index 0000000000..885b47b9fb
Binary files /dev/null and b/resources/bitmaps_png/png/align_elements_to_grid_dark_48.png differ
diff --git a/resources/bitmaps_png/png/align_elements_to_grid_dark_64.png b/resources/bitmaps_png/png/align_elements_to_grid_dark_64.png
new file mode 100644
index 0000000000..a1e9cd53d1
Binary files /dev/null and b/resources/bitmaps_png/png/align_elements_to_grid_dark_64.png differ
diff --git a/resources/bitmaps_png/png/cleanup_graphics_16.png b/resources/bitmaps_png/png/cleanup_graphics_16.png
new file mode 100644
index 0000000000..f128f7305a
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_graphics_16.png differ
diff --git a/resources/bitmaps_png/png/cleanup_graphics_24.png b/resources/bitmaps_png/png/cleanup_graphics_24.png
new file mode 100644
index 0000000000..9d44a494b5
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_graphics_24.png differ
diff --git a/resources/bitmaps_png/png/cleanup_graphics_32.png b/resources/bitmaps_png/png/cleanup_graphics_32.png
new file mode 100644
index 0000000000..0fb0af441b
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_graphics_32.png differ
diff --git a/resources/bitmaps_png/png/cleanup_graphics_48.png b/resources/bitmaps_png/png/cleanup_graphics_48.png
new file mode 100644
index 0000000000..b30dc91993
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_graphics_48.png differ
diff --git a/resources/bitmaps_png/png/cleanup_graphics_64.png b/resources/bitmaps_png/png/cleanup_graphics_64.png
new file mode 100644
index 0000000000..74449563ec
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_graphics_64.png differ
diff --git a/resources/bitmaps_png/png/cleanup_graphics_dark_16.png b/resources/bitmaps_png/png/cleanup_graphics_dark_16.png
new file mode 100644
index 0000000000..9a642544fa
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_graphics_dark_16.png differ
diff --git a/resources/bitmaps_png/png/cleanup_graphics_dark_24.png b/resources/bitmaps_png/png/cleanup_graphics_dark_24.png
new file mode 100644
index 0000000000..28015b223c
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_graphics_dark_24.png differ
diff --git a/resources/bitmaps_png/png/cleanup_graphics_dark_32.png b/resources/bitmaps_png/png/cleanup_graphics_dark_32.png
new file mode 100644
index 0000000000..2b371e427b
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_graphics_dark_32.png differ
diff --git a/resources/bitmaps_png/png/cleanup_graphics_dark_48.png b/resources/bitmaps_png/png/cleanup_graphics_dark_48.png
new file mode 100644
index 0000000000..9fcd7bb226
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_graphics_dark_48.png differ
diff --git a/resources/bitmaps_png/png/cleanup_graphics_dark_64.png b/resources/bitmaps_png/png/cleanup_graphics_dark_64.png
new file mode 100644
index 0000000000..7a9a07b74f
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_graphics_dark_64.png differ
diff --git a/resources/bitmaps_png/png/cleanup_tracks_and_vias_16.png b/resources/bitmaps_png/png/cleanup_tracks_and_vias_16.png
new file mode 100644
index 0000000000..a586a01950
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_tracks_and_vias_16.png differ
diff --git a/resources/bitmaps_png/png/cleanup_tracks_and_vias_24.png b/resources/bitmaps_png/png/cleanup_tracks_and_vias_24.png
new file mode 100644
index 0000000000..3bf43739f1
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_tracks_and_vias_24.png differ
diff --git a/resources/bitmaps_png/png/cleanup_tracks_and_vias_32.png b/resources/bitmaps_png/png/cleanup_tracks_and_vias_32.png
new file mode 100644
index 0000000000..749a453d54
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_tracks_and_vias_32.png differ
diff --git a/resources/bitmaps_png/png/cleanup_tracks_and_vias_48.png b/resources/bitmaps_png/png/cleanup_tracks_and_vias_48.png
new file mode 100644
index 0000000000..17659e42ba
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_tracks_and_vias_48.png differ
diff --git a/resources/bitmaps_png/png/cleanup_tracks_and_vias_64.png b/resources/bitmaps_png/png/cleanup_tracks_and_vias_64.png
new file mode 100644
index 0000000000..6c002e2080
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_tracks_and_vias_64.png differ
diff --git a/resources/bitmaps_png/png/cleanup_tracks_and_vias_dark_16.png b/resources/bitmaps_png/png/cleanup_tracks_and_vias_dark_16.png
new file mode 100644
index 0000000000..eb99de4d24
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_tracks_and_vias_dark_16.png differ
diff --git a/resources/bitmaps_png/png/cleanup_tracks_and_vias_dark_24.png b/resources/bitmaps_png/png/cleanup_tracks_and_vias_dark_24.png
new file mode 100644
index 0000000000..1d8b34a182
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_tracks_and_vias_dark_24.png differ
diff --git a/resources/bitmaps_png/png/cleanup_tracks_and_vias_dark_32.png b/resources/bitmaps_png/png/cleanup_tracks_and_vias_dark_32.png
new file mode 100644
index 0000000000..ad509ae241
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_tracks_and_vias_dark_32.png differ
diff --git a/resources/bitmaps_png/png/cleanup_tracks_and_vias_dark_48.png b/resources/bitmaps_png/png/cleanup_tracks_and_vias_dark_48.png
new file mode 100644
index 0000000000..4a349e781c
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_tracks_and_vias_dark_48.png differ
diff --git a/resources/bitmaps_png/png/cleanup_tracks_and_vias_dark_64.png b/resources/bitmaps_png/png/cleanup_tracks_and_vias_dark_64.png
new file mode 100644
index 0000000000..2ef9a9a864
Binary files /dev/null and b/resources/bitmaps_png/png/cleanup_tracks_and_vias_dark_64.png differ
diff --git a/resources/bitmaps_png/png/drag_16.png b/resources/bitmaps_png/png/drag_16.png
index 976dc8f2f7..8ce6856990 100644
Binary files a/resources/bitmaps_png/png/drag_16.png and b/resources/bitmaps_png/png/drag_16.png differ
diff --git a/resources/bitmaps_png/png/drag_24.png b/resources/bitmaps_png/png/drag_24.png
index 853ccc5e0c..da0f83ac92 100644
Binary files a/resources/bitmaps_png/png/drag_24.png and b/resources/bitmaps_png/png/drag_24.png differ
diff --git a/resources/bitmaps_png/png/drag_32.png b/resources/bitmaps_png/png/drag_32.png
index 802d19bac4..7efa9bc309 100644
Binary files a/resources/bitmaps_png/png/drag_32.png and b/resources/bitmaps_png/png/drag_32.png differ
diff --git a/resources/bitmaps_png/png/drag_48.png b/resources/bitmaps_png/png/drag_48.png
index d0e9cdd04d..3749e544f9 100644
Binary files a/resources/bitmaps_png/png/drag_48.png and b/resources/bitmaps_png/png/drag_48.png differ
diff --git a/resources/bitmaps_png/png/drag_64.png b/resources/bitmaps_png/png/drag_64.png
index 123c521b98..5741d60f5a 100644
Binary files a/resources/bitmaps_png/png/drag_64.png and b/resources/bitmaps_png/png/drag_64.png differ
diff --git a/resources/bitmaps_png/png/drag_dark_16.png b/resources/bitmaps_png/png/drag_dark_16.png
index 26d55bf9ca..2a1cb7eb7c 100644
Binary files a/resources/bitmaps_png/png/drag_dark_16.png and b/resources/bitmaps_png/png/drag_dark_16.png differ
diff --git a/resources/bitmaps_png/png/drag_dark_24.png b/resources/bitmaps_png/png/drag_dark_24.png
index 66305755a3..6add8bcf87 100644
Binary files a/resources/bitmaps_png/png/drag_dark_24.png and b/resources/bitmaps_png/png/drag_dark_24.png differ
diff --git a/resources/bitmaps_png/png/drag_dark_32.png b/resources/bitmaps_png/png/drag_dark_32.png
index 11d463222e..7009e14337 100644
Binary files a/resources/bitmaps_png/png/drag_dark_32.png and b/resources/bitmaps_png/png/drag_dark_32.png differ
diff --git a/resources/bitmaps_png/png/drag_dark_48.png b/resources/bitmaps_png/png/drag_dark_48.png
index 7d26925725..4bbacaf707 100644
Binary files a/resources/bitmaps_png/png/drag_dark_48.png and b/resources/bitmaps_png/png/drag_dark_48.png differ
diff --git a/resources/bitmaps_png/png/drag_dark_64.png b/resources/bitmaps_png/png/drag_dark_64.png
index 8b89dd08af..ba8d55e030 100644
Binary files a/resources/bitmaps_png/png/drag_dark_64.png and b/resources/bitmaps_png/png/drag_dark_64.png differ
diff --git a/resources/bitmaps_png/png/drag_segment_16.png b/resources/bitmaps_png/png/drag_segment_16.png
new file mode 100644
index 0000000000..1756cbffda
Binary files /dev/null and b/resources/bitmaps_png/png/drag_segment_16.png differ
diff --git a/resources/bitmaps_png/png/drag_segment_24.png b/resources/bitmaps_png/png/drag_segment_24.png
new file mode 100644
index 0000000000..94372878b0
Binary files /dev/null and b/resources/bitmaps_png/png/drag_segment_24.png differ
diff --git a/resources/bitmaps_png/png/drag_segment_32.png b/resources/bitmaps_png/png/drag_segment_32.png
new file mode 100644
index 0000000000..776f34a447
Binary files /dev/null and b/resources/bitmaps_png/png/drag_segment_32.png differ
diff --git a/resources/bitmaps_png/png/drag_segment_48.png b/resources/bitmaps_png/png/drag_segment_48.png
new file mode 100644
index 0000000000..07b3bcaf32
Binary files /dev/null and b/resources/bitmaps_png/png/drag_segment_48.png differ
diff --git a/resources/bitmaps_png/png/drag_segment_64.png b/resources/bitmaps_png/png/drag_segment_64.png
new file mode 100644
index 0000000000..617796846c
Binary files /dev/null and b/resources/bitmaps_png/png/drag_segment_64.png differ
diff --git a/resources/bitmaps_png/png/drag_segment_dark_16.png b/resources/bitmaps_png/png/drag_segment_dark_16.png
new file mode 100644
index 0000000000..f3770f22c9
Binary files /dev/null and b/resources/bitmaps_png/png/drag_segment_dark_16.png differ
diff --git a/resources/bitmaps_png/png/drag_segment_dark_24.png b/resources/bitmaps_png/png/drag_segment_dark_24.png
new file mode 100644
index 0000000000..3714cdc60f
Binary files /dev/null and b/resources/bitmaps_png/png/drag_segment_dark_24.png differ
diff --git a/resources/bitmaps_png/png/drag_segment_dark_32.png b/resources/bitmaps_png/png/drag_segment_dark_32.png
new file mode 100644
index 0000000000..1133136bb5
Binary files /dev/null and b/resources/bitmaps_png/png/drag_segment_dark_32.png differ
diff --git a/resources/bitmaps_png/png/drag_segment_dark_48.png b/resources/bitmaps_png/png/drag_segment_dark_48.png
new file mode 100644
index 0000000000..81ae101ba2
Binary files /dev/null and b/resources/bitmaps_png/png/drag_segment_dark_48.png differ
diff --git a/resources/bitmaps_png/png/drag_segment_dark_64.png b/resources/bitmaps_png/png/drag_segment_dark_64.png
new file mode 100644
index 0000000000..61a1e86c81
Binary files /dev/null and b/resources/bitmaps_png/png/drag_segment_dark_64.png differ
diff --git a/resources/bitmaps_png/sources/dark/align_elements_to_grid.svg b/resources/bitmaps_png/sources/dark/align_elements_to_grid.svg
new file mode 100644
index 0000000000..52719d141b
--- /dev/null
+++ b/resources/bitmaps_png/sources/dark/align_elements_to_grid.svg
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 24 24"
+   version="1.1"
+   sodipodi:docname="align_elements_to_grid.svg"
+   inkscape:version="1.0.2 (1.0.2+r75+1)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1315"
+     inkscape:window-height="704"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="11.313709"
+     inkscape:cx="8.9455919"
+     inkscape:cy="12.113393"
+     inkscape:window-x="51"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="Слой_1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_kicad"
+       spacingx="0.5"
+       spacingy="0.5"
+       color="#9999ff"
+       opacity="0.13"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata43">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>ps_diff_pair_tune_phase</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs159429">
+    <style
+       id="style159427">.cls-1{fill:#1a81c4;}</style>
+  </defs>
+  <title
+     id="title159431">ps_diff_pair_tune_phase</title>
+  <rect
+     style="fill:none;fill-opacity:1;stroke:#42b8eb;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 4;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
+     id="rect947"
+     width="10.99999"
+     height="11"
+     x="12.00001"
+     y="12"
+     ry="0" />
+  <rect
+     style="fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+     id="rect8491"
+     width="24"
+     height="24"
+     x="0"
+     y="0"
+     ry="0" />
+  <rect
+     style="fill:#42b8eb;fill-opacity:1;stroke:none;stroke-width:1.14582;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.14582, 2.29165999999999981;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
+     id="rect1414"
+     width="10.99999"
+     height="11"
+     x="8.0000105"
+     y="8"
+     ry="1" />
+  <rect
+     style="fill:none;fill-opacity:1;stroke:none;stroke-width:1.263;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
+     id="rect5474"
+     width="23.999893"
+     height="23.999893"
+     x="0.00013662732"
+     y="3.6141693e-05" />
+  <path
+     style="fill:none;stroke:#ded3dd;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;paint-order:fill markers stroke;fill-opacity:1;stroke-opacity:1"
+     d="M 6,1 V 23"
+     id="path923"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:none;stroke:#ded3dd;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;paint-order:fill markers stroke;fill-opacity:1;stroke-opacity:1"
+     d="M 1,6 H 6"
+     id="path925"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:none;stroke:#ded3dd;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;paint-order:fill markers stroke;fill-opacity:1;stroke-opacity:1"
+     d="M 1,13 H 6"
+     id="path927"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:none;stroke:#ded3dd;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;paint-order:fill markers stroke;fill-opacity:1;stroke-opacity:1"
+     d="M 1,20 H 6"
+     id="path929"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:none;stroke:#ded3dd;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;paint-order:fill markers stroke;fill-opacity:1;stroke-opacity:1"
+     d="M 23,6 H 1"
+     id="path939"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:none;stroke:#ded3dd;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;paint-order:fill markers stroke;fill-opacity:1;stroke-opacity:1"
+     d="M 20,1 V 6"
+     id="path941"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:none;stroke:#ded3dd;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;paint-order:fill markers stroke;fill-opacity:1;stroke-opacity:1"
+     d="M 13,1 V 6"
+     id="path943"
+     sodipodi:nodetypes="cc" />
+</svg>
diff --git a/resources/bitmaps_png/sources/dark/cleanup_graphics.svg b/resources/bitmaps_png/sources/dark/cleanup_graphics.svg
new file mode 100644
index 0000000000..7624855c9a
--- /dev/null
+++ b/resources/bitmaps_png/sources/dark/cleanup_graphics.svg
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 24 24"
+   version="1.1"
+   sodipodi:docname="cleanup_graphics.svg"
+   inkscape:version="1.0.2 (1.0.2+r75+1)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1315"
+     inkscape:window-height="704"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="11.048543"
+     inkscape:cx="12"
+     inkscape:cy="12.753374"
+     inkscape:window-x="51"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="Слой_1"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:object-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:bbox-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_kicad"
+       spacingx="0.5"
+       spacingy="0.5"
+       color="#9999ff"
+       opacity="0.13"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata43">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>ps_diff_pair_tune_phase</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs159429">
+    <style
+       id="style159427">.cls-1{fill:#1a81c4;}</style>
+  </defs>
+  <title
+     id="title159431">ps_diff_pair_tune_phase</title>
+  <g
+     id="g887">
+    <g
+       id="g2350-7"
+       transform="matrix(0.70989371,0,0,0.73947276,-569.02274,-31.695648)"
+       style="fill:#d0c5ac;fill-opacity:1">
+      <path
+         id="rect2332-9"
+         style="fill:#f3f3f3;fill-opacity:1;stroke:none;stroke-width:0.981927;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 802.9128,42.862495 h 22.65126 c 0.74918,0 1.35231,0.603133 1.35231,1.352316 v 21.637035 c 0,0.749182 -0.60313,1.352315 -1.35231,1.352315 H 802.9128 c -0.74918,0 -1.35231,-0.603133 -1.35231,-1.352315 V 44.214811 c 0,-0.749183 0.60313,-1.352316 1.35231,-1.352316 z" />
+    </g>
+    <g
+       id="path1003"
+       style="fill:#606060;fill-opacity:1">
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#606060;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 1.5,13.5 5,-11 4.5,11 z"
+         id="path1007" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#606060;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="M 6.4960938,2 A 0.50005,0.50005 0 0 0 6.0449219,2.2929688 l -5,11.0000002 A 0.50005,0.50005 0 0 0 1.5,14 H 11 a 0.50005,0.50005 0 0 0 0.462891,-0.689453 L 6.9628906,2.3105469 A 0.50005,0.50005 0 0 0 6.4960938,2 Z M 6.4765625,3.7617188 10.255859,13 H 2.2773438 Z"
+         id="path1009" />
+    </g>
+    <rect
+       style="fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       id="rect1001"
+       width="6"
+       height="6"
+       x="10"
+       y="6"
+       ry="1" />
+    <path
+       id="circle1227"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#39b4ea;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.636309;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+       d="M 9.9999996,8.0000002 C 7.7825802,8.0000006 6,9.7825806 6,12 c -1e-7,2.217419 1.7825801,4 3.9999996,4 C 12.217421,16 14,14.217421 14,12 14,9.7825806 12.217421,8.0000002 9.9999996,8.0000002 Z" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       id="rect999"
+       width="6"
+       height="6"
+       x="10"
+       y="6"
+       ry="1.25073" />
+    <g
+       id="g858"
+       style="fill:#606060;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       transform="translate(-1.0395955,-0.5003771)">
+      <path
+         style="fill:#ded3dd;fill-opacity:1;stroke:#606060;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 22.584191,9.7486196 -6.877637,6.9178684 1.333439,1.33351 6.877354,-6.917656 c 0.177903,-0.178469 0.276243,-0.41493 0.276243,-0.666844 0,-0.251949 -0.09834,-0.4884099 -0.276243,-0.6668784 -0.177903,-0.1779027 -0.414929,-0.2762425 -0.666879,-0.2762425 -0.251383,0 -0.488375,0.09834 -0.666277,0.2762425 z"
+         id="path1116"
+         sodipodi:nodetypes="ccccscsc" />
+      <path
+         id="path1118"
+         style="fill:#ded3dd;fill-opacity:1;stroke:#606060;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 14.162109,15.240234 c -0.02376,0.01881 -1.946362,1.241739 -4.020727,2.27878 -0.108276,0.05414 -0.1837818,0.157999 -0.2031248,0.277343 -0.019342,0.11991 0.019824,0.240532 0.1054688,0.326172 l 5.333984,5.333985 c 0.08565,0.08621 0.20651,0.124778 0.326172,0.105468 0.119592,-0.01934 0.223204,-0.09485 0.277344,-0.203125 1.212364,-2.176243 1.593467,-2.676243 2.442602,-3.854951 -1.730238,-1.821292 -2.730238,-2.821292 -4.261719,-4.263672 z"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="fill:#ded3dd;fill-opacity:1;stroke:#606060;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 18.927289,19.00532 c 0.08094,-0.08122 0.120723,-0.194452 0.108028,-0.30828 l -0.266589,-2.400042 c -0.0094,-0.08508 -0.04753,-0.164643 -0.108276,-0.224863 l -1.066603,-1.067169 c -0.0605,-0.06079 -0.139783,-0.09891 -0.225145,-0.108276 l -2.399795,-0.266306 c -0.11411,-0.01269 -0.227373,0.02709 -0.308279,0.107746 l -0.839831,0.760798 4.345974,4.346258 z"
+         id="path1126" />
+    </g>
+  </g>
+</svg>
diff --git a/resources/bitmaps_png/sources/dark/cleanup_tracks_and_vias.svg b/resources/bitmaps_png/sources/dark/cleanup_tracks_and_vias.svg
new file mode 100644
index 0000000000..fbd90c8d3f
--- /dev/null
+++ b/resources/bitmaps_png/sources/dark/cleanup_tracks_and_vias.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 24 24"
+   version="1.1"
+   sodipodi:docname="cleanup_tracks_and_vias.svg"
+   inkscape:version="1.0.2 (1.0.2+r75+1)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1315"
+     inkscape:window-height="704"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="11.313709"
+     inkscape:cx="12.124039"
+     inkscape:cy="11.462026"
+     inkscape:window-x="51"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="g854"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:bbox-nodes="true"
+     inkscape:object-paths="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_kicad"
+       spacingx="0.5"
+       spacingy="0.5"
+       color="#9999ff"
+       opacity="0.13"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata43">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>ps_diff_pair_tune_phase</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs159429">
+    <style
+       id="style159427">.cls-1{fill:#1a81c4;}</style>
+  </defs>
+  <title
+     id="title159431">ps_diff_pair_tune_phase</title>
+  <g
+     id="g854">
+    <g
+       id="g1422-3"
+       transform="matrix(0.86663868,0,0,0.90275191,-698.63772,-42.687916)" />
+    <rect
+       style="fill:#489648;fill-opacity:1;stroke:none;stroke-width:0.711435;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect1228-7"
+       width="17.999893"
+       height="17.999968"
+       x="0.00011089625"
+       y="-6.7643305e-07"
+       ry="1.1787888" />
+    <path
+       style="fill:#f29100;stroke:#f29100;stroke-linecap:square;stroke-linejoin:round;paint-order:fill markers stroke;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 1,10 H 3"
+       id="path31"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g858"
+       style="fill:#606060;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       transform="translate(-1.039993,-0.499998)">
+      <path
+         style="fill:#ded3dd;fill-opacity:1;stroke:#606060;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 22.584191,9.7486196 -6.877637,6.9178684 1.333439,1.33351 6.877354,-6.917656 c 0.177903,-0.178469 0.276243,-0.41493 0.276243,-0.666844 0,-0.251949 -0.09834,-0.4884099 -0.276243,-0.6668784 -0.177903,-0.1779027 -0.414929,-0.2762425 -0.666879,-0.2762425 -0.251383,0 -0.488375,0.09834 -0.666277,0.2762425 z"
+         id="path1116"
+         sodipodi:nodetypes="ccccscsc" />
+      <path
+         id="path1118"
+         style="fill:#ded3dd;fill-opacity:1;stroke:#606060;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 14.162109,15.240234 c -0.02376,0.01881 -1.946362,1.241739 -4.020727,2.27878 -0.108276,0.05414 -0.1837818,0.157999 -0.2031248,0.277343 -0.019342,0.11991 0.019824,0.240532 0.1054688,0.326172 l 5.333984,5.333985 c 0.08565,0.08621 0.20651,0.124778 0.326172,0.105468 0.119592,-0.01934 0.223204,-0.09485 0.277344,-0.203125 1.212364,-2.176243 1.593467,-2.676243 2.442602,-3.854951 -1.730238,-1.821292 -2.730238,-2.821292 -4.261719,-4.263672 z"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="fill:#ded3dd;fill-opacity:1;stroke:#606060;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 18.927289,19.00532 c 0.08094,-0.08122 0.120723,-0.194452 0.108028,-0.30828 l -0.266589,-2.400042 c -0.0094,-0.08508 -0.04753,-0.164643 -0.108276,-0.224863 l -1.066603,-1.067169 c -0.0605,-0.06079 -0.139783,-0.09891 -0.225145,-0.108276 l -2.399795,-0.266306 c -0.11411,-0.01269 -0.227373,0.02709 -0.308279,0.107746 l -0.839831,0.760798 4.345974,4.346258 z"
+         id="path1126" />
+    </g>
+    <circle
+       style="fill:#ffffff;stroke:#f29100;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;fill-opacity:1"
+       id="path856"
+       cx="5"
+       cy="10"
+       r="1.5" />
+    <path
+       id="path858"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#f29100;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1"
+       d="M 5 0 L 5 1 L 5 4.5 A 1.0001 1.0001 0 0 0 5.2929688 5.2070312 L 8 7.9140625 L 8 14.085938 L 4.7929688 17.292969 L 4.0859375 18 L 6.9140625 18 L 9.7070312 15.207031 A 1.0001 1.0001 0 0 0 10 14.5 L 10 7.5 A 1.0001 1.0001 0 0 0 9.7070312 6.7929688 L 7 4.0859375 L 7 1 L 7 0 L 5 0 z " />
+    <circle
+       style="fill:#ffffff;fill-opacity:1;stroke:#f29100;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       id="path856-3"
+       cx="15"
+       cy="6"
+       r="1.5" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#f29100;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       d="m 9,1 v 2 l 3,3 h 1"
+       id="path897" />
+  </g>
+</svg>
diff --git a/resources/bitmaps_png/sources/dark/drag.svg b/resources/bitmaps_png/sources/dark/drag.svg
new file mode 100644
index 0000000000..5beda17635
--- /dev/null
+++ b/resources/bitmaps_png/sources/dark/drag.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 24 24"
+   version="1.1"
+   sodipodi:docname="drag.svg"
+   inkscape:version="1.0.2 (1.0.2+r75+1)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1315"
+     inkscape:window-height="704"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="11.313709"
+     inkscape:cx="9.4295406"
+     inkscape:cy="8.4866927"
+     inkscape:window-x="51"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="Слой_1"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_kicad"
+       spacingx="0.5"
+       spacingy="0.5"
+       color="#9999ff"
+       opacity="0.13"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata43">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>ps_diff_pair_tune_phase</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs159429">
+    <style
+       id="style159427">.cls-1{fill:#1a81c4;}</style>
+  </defs>
+  <title
+     id="title159431">ps_diff_pair_tune_phase</title>
+  <g
+     id="g845">
+    <g
+       id="g874">
+      <path
+         id="rect25847"
+         style="fill:#ded3dd;stroke-width:1.00025;fill-opacity:1"
+         d="M 5.0011973,0 0,5 5,10 5.0012,7 H 9.0020796 V 2.9989931 H 5.0011973 Z"
+         sodipodi:nodetypes="cccccccc" />
+      <path
+         id="path870"
+         style="fill:#ded3dd;stroke-width:1.00025;fill-opacity:1"
+         d="M 18.998803,0 24,5 19,10 18.9988,7 H 14.997921 V 2.9989931 h 4.000882 z"
+         sodipodi:nodetypes="cccccccc" />
+    </g>
+    <path
+       style="fill:none;fill-opacity:1;stroke:#ded3dd;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       d="m 7,13.491423 v 1.5 -4.5 c 0,-1.5 1.5,-1.5 1.5,-1.5 0,0 1.5,0 1.5,1.5 v 2 -2.5 c 0,-1.5 1.5,-1.5 1.5,-1.5 0,0 1.5,0 1.5,1.5 v 2.5 -2 c 0,-1.5 1.5,-1.5 1.5,-1.5 0,0 1.5,0 1.5,1.5 v 1.5 0.5 c 0,-1.5 1.5,-1.5 1.5,-1.5 0,0 1.5,0 1.5,1.5 v 4.5 c 0,6 -4.5,6 -4.5,6 h -5 c 0,0 -3,0.5 -5.5,-5 -1.2194793,-3.038326 0.766361,-4.967938 2.5,-5 0.1666667,0 0.5,0.5 0.5,0.5 z"
+       id="path899"
+       sodipodi:nodetypes="csccsscccscscscscscsccc" />
+  </g>
+</svg>
diff --git a/resources/bitmaps_png/sources/light/align_elements_to_grid.svg b/resources/bitmaps_png/sources/light/align_elements_to_grid.svg
new file mode 100644
index 0000000000..f2031e8fa3
--- /dev/null
+++ b/resources/bitmaps_png/sources/light/align_elements_to_grid.svg
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 24 24"
+   version="1.1"
+   sodipodi:docname="align_elements_to_grid.svg"
+   inkscape:version="1.0.2 (1.0.2+r75+1)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1315"
+     inkscape:window-height="704"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="11.313709"
+     inkscape:cx="8.9455919"
+     inkscape:cy="12.113393"
+     inkscape:window-x="51"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="Слой_1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_kicad"
+       spacingx="0.5"
+       spacingy="0.5"
+       color="#9999ff"
+       opacity="0.13"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata43">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>ps_diff_pair_tune_phase</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs159429">
+    <style
+       id="style159427">.cls-1{fill:#1a81c4;}</style>
+  </defs>
+  <title
+     id="title159431">ps_diff_pair_tune_phase</title>
+  <rect
+     style="fill:none;fill-opacity:1;stroke:#1a81c4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 4;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
+     id="rect947"
+     width="10.99999"
+     height="11"
+     x="12.00001"
+     y="12"
+     ry="0" />
+  <rect
+     style="fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+     id="rect8491"
+     width="24"
+     height="24"
+     x="0"
+     y="0"
+     ry="0" />
+  <rect
+     style="fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:1.14582;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.14582, 2.29166;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
+     id="rect1414"
+     width="10.99999"
+     height="11"
+     x="8.0000105"
+     y="8"
+     ry="1" />
+  <rect
+     style="fill:none;fill-opacity:1;stroke:none;stroke-width:1.263;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
+     id="rect5474"
+     width="23.999893"
+     height="23.999893"
+     x="0.00013662732"
+     y="3.6141693e-05" />
+  <path
+     style="fill:#1a1a1a;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;paint-order:fill markers stroke"
+     d="M 6,1 V 23"
+     id="path923"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:#1a1a1a;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;paint-order:fill markers stroke"
+     d="M 1,6 H 6"
+     id="path925"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:#1a1a1a;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;paint-order:fill markers stroke"
+     d="M 1,13 H 6"
+     id="path927"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:#1a1a1a;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;paint-order:fill markers stroke"
+     d="M 1,20 H 6"
+     id="path929"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:#1a1a1a;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;paint-order:fill markers stroke"
+     d="M 23,6 H 1"
+     id="path939"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:#1a1a1a;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;paint-order:fill markers stroke"
+     d="M 20,1 V 6"
+     id="path941"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:#1a1a1a;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;paint-order:fill markers stroke"
+     d="M 13,1 V 6"
+     id="path943"
+     sodipodi:nodetypes="cc" />
+</svg>
diff --git a/resources/bitmaps_png/sources/light/cleanup_graphics.svg b/resources/bitmaps_png/sources/light/cleanup_graphics.svg
new file mode 100644
index 0000000000..94cae36267
--- /dev/null
+++ b/resources/bitmaps_png/sources/light/cleanup_graphics.svg
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 24 24"
+   version="1.1"
+   sodipodi:docname="cleanup_graphics.svg"
+   inkscape:version="1.0.2 (1.0.2+r75+1)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1315"
+     inkscape:window-height="704"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="16.000001"
+     inkscape:cx="14.353476"
+     inkscape:cy="12.753374"
+     inkscape:window-x="51"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="Слой_1"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:object-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:bbox-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_kicad"
+       spacingx="0.5"
+       spacingy="0.5"
+       color="#9999ff"
+       opacity="0.13"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata43">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>ps_diff_pair_tune_phase</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs159429">
+    <style
+       id="style159427">.cls-1{fill:#1a81c4;}</style>
+  </defs>
+  <title
+     id="title159431">ps_diff_pair_tune_phase</title>
+  <g
+     id="g887">
+    <g
+       id="g2350-7"
+       transform="matrix(0.70989371,0,0,0.73947276,-569.02274,-31.695648)"
+       style="fill:#d0c5ac;fill-opacity:1">
+      <path
+         id="rect2332-9"
+         style="fill:#d0c5ac;fill-opacity:1;stroke:none;stroke-width:0.981927;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 802.9128,42.862495 h 22.65126 c 0.74918,0 1.35231,0.603133 1.35231,1.352316 v 21.637035 c 0,0.749182 -0.60313,1.352315 -1.35231,1.352315 H 802.9128 c -0.74918,0 -1.35231,-0.603133 -1.35231,-1.352315 V 44.214811 c 0,-0.749183 0.60313,-1.352316 1.35231,-1.352316 z" />
+    </g>
+    <g
+       id="path1003"
+       style="fill:#606060;fill-opacity:1">
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#606060;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 1.5,13.5 5,-11 4.5,11 z"
+         id="path1007" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#606060;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="M 6.4960938,2 A 0.50005,0.50005 0 0 0 6.0449219,2.2929688 l -5,11.0000002 A 0.50005,0.50005 0 0 0 1.5,14 H 11 a 0.50005,0.50005 0 0 0 0.462891,-0.689453 L 6.9628906,2.3105469 A 0.50005,0.50005 0 0 0 6.4960938,2 Z M 6.4765625,3.7617188 10.255859,13 H 2.2773438 Z"
+         id="path1009" />
+    </g>
+    <rect
+       style="fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       id="rect1001"
+       width="6"
+       height="6"
+       x="10"
+       y="6"
+       ry="1" />
+    <path
+       id="circle1227"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#39b4ea;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.636309;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+       d="M 9.9999996,8.0000002 C 7.7825802,8.0000006 6,9.7825806 6,12 c -1e-7,2.217419 1.7825801,4 3.9999996,4 C 12.217421,16 14,14.217421 14,12 14,9.7825806 12.217421,8.0000002 9.9999996,8.0000002 Z" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       id="rect999"
+       width="6"
+       height="6"
+       x="10"
+       y="6"
+       ry="1.25073" />
+    <g
+       id="g858"
+       style="fill:#606060;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       transform="translate(-1.0395955,-0.5003771)">
+      <path
+         style="fill:#606060;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 22.584191,9.7486196 -6.877637,6.9178684 1.333439,1.33351 6.877354,-6.917656 c 0.177903,-0.178469 0.276243,-0.41493 0.276243,-0.666844 0,-0.251949 -0.09834,-0.4884099 -0.276243,-0.6668784 -0.177903,-0.1779027 -0.414929,-0.2762425 -0.666879,-0.2762425 -0.251383,0 -0.488375,0.09834 -0.666277,0.2762425 z"
+         id="path1116"
+         sodipodi:nodetypes="ccccscsc" />
+      <path
+         id="path1118"
+         style="fill:#606060;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 14.162109,15.240234 c -0.02376,0.01881 -1.946362,1.241739 -4.020727,2.27878 -0.108276,0.05414 -0.1837818,0.157999 -0.2031248,0.277343 -0.019342,0.11991 0.019824,0.240532 0.1054688,0.326172 l 5.333984,5.333985 c 0.08565,0.08621 0.20651,0.124778 0.326172,0.105468 0.119592,-0.01934 0.223204,-0.09485 0.277344,-0.203125 1.212364,-2.176243 1.593467,-2.676243 2.442602,-3.854951 -1.730238,-1.821292 -2.730238,-2.821292 -4.261719,-4.263672 z"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="fill:#606060;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 18.927289,19.00532 c 0.08094,-0.08122 0.120723,-0.194452 0.108028,-0.30828 l -0.266589,-2.400042 c -0.0094,-0.08508 -0.04753,-0.164643 -0.108276,-0.224863 l -1.066603,-1.067169 c -0.0605,-0.06079 -0.139783,-0.09891 -0.225145,-0.108276 l -2.399795,-0.266306 c -0.11411,-0.01269 -0.227373,0.02709 -0.308279,0.107746 l -0.839831,0.760798 4.345974,4.346258 z"
+         id="path1126" />
+    </g>
+  </g>
+</svg>
diff --git a/resources/bitmaps_png/sources/light/cleanup_tracks_and_vias.svg b/resources/bitmaps_png/sources/light/cleanup_tracks_and_vias.svg
new file mode 100644
index 0000000000..21bb7e8346
--- /dev/null
+++ b/resources/bitmaps_png/sources/light/cleanup_tracks_and_vias.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 24 24"
+   version="1.1"
+   sodipodi:docname="cleanup_tracks_and_vias.svg"
+   inkscape:version="1.0.2 (1.0.2+r75+1)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1315"
+     inkscape:window-height="704"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="11.313709"
+     inkscape:cx="12.124039"
+     inkscape:cy="11.462026"
+     inkscape:window-x="51"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="g854"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:bbox-nodes="true"
+     inkscape:object-paths="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_kicad"
+       spacingx="0.5"
+       spacingy="0.5"
+       color="#9999ff"
+       opacity="0.13"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata43">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>ps_diff_pair_tune_phase</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs159429">
+    <style
+       id="style159427">.cls-1{fill:#1a81c4;}</style>
+  </defs>
+  <title
+     id="title159431">ps_diff_pair_tune_phase</title>
+  <g
+     id="g854">
+    <g
+       id="g1422-3"
+       transform="matrix(0.86663868,0,0,0.90275191,-698.63772,-42.687916)" />
+    <rect
+       style="fill:#489648;fill-opacity:1;stroke:none;stroke-width:0.711435;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect1228-7"
+       width="17.999893"
+       height="17.999968"
+       x="0.00011089625"
+       y="-6.7643305e-07"
+       ry="1.1787888" />
+    <path
+       style="fill:#f29100;stroke:#f29100;stroke-linecap:square;stroke-linejoin:round;paint-order:fill markers stroke;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 1,10 H 3"
+       id="path31"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g858"
+       style="fill:#606060;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       transform="translate(-1.039993,-0.499998)">
+      <path
+         style="fill:#606060;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 22.584191,9.7486196 -6.877637,6.9178684 1.333439,1.33351 6.877354,-6.917656 c 0.177903,-0.178469 0.276243,-0.41493 0.276243,-0.666844 0,-0.251949 -0.09834,-0.4884099 -0.276243,-0.6668784 -0.177903,-0.1779027 -0.414929,-0.2762425 -0.666879,-0.2762425 -0.251383,0 -0.488375,0.09834 -0.666277,0.2762425 z"
+         id="path1116"
+         sodipodi:nodetypes="ccccscsc" />
+      <path
+         id="path1118"
+         style="fill:#606060;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 14.162109,15.240234 c -0.02376,0.01881 -1.946362,1.241739 -4.020727,2.27878 -0.108276,0.05414 -0.1837818,0.157999 -0.2031248,0.277343 -0.019342,0.11991 0.019824,0.240532 0.1054688,0.326172 l 5.333984,5.333985 c 0.08565,0.08621 0.20651,0.124778 0.326172,0.105468 0.119592,-0.01934 0.223204,-0.09485 0.277344,-0.203125 1.212364,-2.176243 1.593467,-2.676243 2.442602,-3.854951 -1.730238,-1.821292 -2.730238,-2.821292 -4.261719,-4.263672 z"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="fill:#606060;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 18.927289,19.00532 c 0.08094,-0.08122 0.120723,-0.194452 0.108028,-0.30828 l -0.266589,-2.400042 c -0.0094,-0.08508 -0.04753,-0.164643 -0.108276,-0.224863 l -1.066603,-1.067169 c -0.0605,-0.06079 -0.139783,-0.09891 -0.225145,-0.108276 l -2.399795,-0.266306 c -0.11411,-0.01269 -0.227373,0.02709 -0.308279,0.107746 l -0.839831,0.760798 4.345974,4.346258 z"
+         id="path1126" />
+    </g>
+    <circle
+       style="fill:#ffffff;stroke:#f29100;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;fill-opacity:1"
+       id="path856"
+       cx="5"
+       cy="10"
+       r="1.5" />
+    <path
+       id="path858"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#f29100;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1"
+       d="M 5 0 L 5 1 L 5 4.5 A 1.0001 1.0001 0 0 0 5.2929688 5.2070312 L 8 7.9140625 L 8 14.085938 L 4.7929688 17.292969 L 4.0859375 18 L 6.9140625 18 L 9.7070312 15.207031 A 1.0001 1.0001 0 0 0 10 14.5 L 10 7.5 A 1.0001 1.0001 0 0 0 9.7070312 6.7929688 L 7 4.0859375 L 7 1 L 7 0 L 5 0 z " />
+    <circle
+       style="fill:#ffffff;fill-opacity:1;stroke:#f29100;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       id="path856-3"
+       cx="15"
+       cy="6"
+       r="1.5" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#f29100;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       d="m 9,1 v 2 l 3,3 h 1"
+       id="path897" />
+  </g>
+</svg>
diff --git a/resources/bitmaps_png/sources/light/drag.svg b/resources/bitmaps_png/sources/light/drag.svg
new file mode 100644
index 0000000000..b0bb29bac7
--- /dev/null
+++ b/resources/bitmaps_png/sources/light/drag.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 24 24"
+   version="1.1"
+   sodipodi:docname="drag.svg"
+   inkscape:version="1.0.2 (1.0.2+r75+1)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1315"
+     inkscape:window-height="704"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="22.627418"
+     inkscape:cx="9.4295406"
+     inkscape:cy="8.4866927"
+     inkscape:window-x="51"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="Слой_1"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_kicad"
+       spacingx="0.5"
+       spacingy="0.5"
+       color="#9999ff"
+       opacity="0.13"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata43">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>ps_diff_pair_tune_phase</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs159429">
+    <style
+       id="style159427">.cls-1{fill:#1a81c4;}</style>
+  </defs>
+  <title
+     id="title159431">ps_diff_pair_tune_phase</title>
+  <g
+     id="g845">
+    <g
+       id="g874">
+      <path
+         id="rect25847"
+         style="fill:#545454;stroke-width:1.00025"
+         d="M 5.0011973,0 0,5 5,10 5.0012,7 H 9.0020796 V 2.9989931 H 5.0011973 Z"
+         sodipodi:nodetypes="cccccccc" />
+      <path
+         id="path870"
+         style="fill:#545454;stroke-width:1.00025"
+         d="M 18.998803,0 24,5 19,10 18.9988,7 H 14.997921 V 2.9989931 h 4.000882 z"
+         sodipodi:nodetypes="cccccccc" />
+    </g>
+    <path
+       style="fill:none;fill-opacity:1;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       d="m 7,13.491423 v 1.5 -4.5 c 0,-1.5 1.5,-1.5 1.5,-1.5 0,0 1.5,0 1.5,1.5 v 2 -2.5 c 0,-1.5 1.5,-1.5 1.5,-1.5 0,0 1.5,0 1.5,1.5 v 2.5 -2 c 0,-1.5 1.5,-1.5 1.5,-1.5 0,0 1.5,0 1.5,1.5 v 1.5 0.5 c 0,-1.5 1.5,-1.5 1.5,-1.5 0,0 1.5,0 1.5,1.5 v 4.5 c 0,6 -4.5,6 -4.5,6 h -5 c 0,0 -3,0.5 -5.5,-5 -1.2194793,-3.038326 0.766361,-4.967938 2.5,-5 0.1666667,0 0.5,0.5 0.5,0.5 z"
+       id="path899"
+       sodipodi:nodetypes="csccsscccscscscscscsccc" />
+  </g>
+</svg>