diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt
index 5d4386e1cd..14649cf318 100644
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@@ -658,7 +658,7 @@ endfunction()
 # Function bitmap_dir
 # converts all the basenames in bmapList found in hardcoded 'sources' dir
 # and and puts them into cpp_${pngHeight} and png_${pngHeight} directories.
-function( bitmap_dir pngWidth pngHeight bmapList )
+function( bitmap_dir pngWidth pngHeight bmapList theme )
 
     set( cppDir "${CMAKE_CURRENT_SOURCE_DIR}/cpp_${pngHeight}" )
     set( pngDir "${CMAKE_CURRENT_SOURCE_DIR}/png_${pngHeight}" )
@@ -671,12 +671,13 @@ function( bitmap_dir pngWidth pngHeight bmapList )
     #svg2png( inputFile outFile pngWidth pngHeight )
 
     foreach( bmn ${bmapList} )
+        set( svgFile "${CMAKE_CURRENT_SOURCE_DIR}/sources/${theme}/${bmn}.svg" )
         set( pngFile "${pngDir}/${bmn}.png" )
         set( cppFile "${cppDir}/${bmn}.cpp" )
         set( tmpFile "${TMP_DIR}/${bmn}_${pngHeight}.png" )
 
         #svg2png( inputFile outFile pngWidth pngHeight )
-        svg2png( ${CMAKE_CURRENT_SOURCE_DIR}/sources/${bmn}.svg ${tmpFile} ${pngWidth} ${pngHeight} )
+        svg2png( ${svgFile} ${tmpFile} ${pngWidth} ${pngHeight} )
 
         #png2png( inputFile outFile )
         png2png( ${tmpFile} ${pngFile} )
@@ -724,23 +725,28 @@ if( MAINTAIN_PNGS )
         endif( NOT pngcrush_EXECUTABLE )
     endif( NOT pngcrush_FOUND )
 
+    if( NOT KICAD_ICON_THEME )
+        set( KICAD_ICON_THEME "light" CACHE STRING "Name of the theme directory for icon sources" )
+    endif()
+
+    message( STATUS "Creating icons for ${KICAD_ICON_THEME} theme" )
 
     # these 3 cmake commands for each desired bitmap size set, repeat as needed:
-    bitmap_dir( 16 16 "${BMAPS_SMALL}" )
+    bitmap_dir( 16 16 "${BMAPS_SMALL}" ${KICAD_ICON_THEME} )
 
-    bitmap_dir( 24 24 "${BMAPS_MID}" )
+    bitmap_dir( 24 24 "${BMAPS_MID}" ${KICAD_ICON_THEME} )
 
-    bitmap_dir( 32 32 "${BMAPS_32}" )
+    bitmap_dir( 32 32 "${BMAPS_32}" ${KICAD_ICON_THEME} )
 
-    bitmap_dir( 22 22 "${BMAPS_22}" )
+    bitmap_dir( 22 22 "${BMAPS_22}" ${KICAD_ICON_THEME} )
 
-    bitmap_dir( 24 24 "${BMAPS_24}" )
+    bitmap_dir( 24 24 "${BMAPS_24}" ${KICAD_ICON_THEME} )
 
-    bitmap_dir( 64 64 "${BMAPS_64}" )
+    bitmap_dir( 64 64 "${BMAPS_64}" ${KICAD_ICON_THEME} )
 
-    bitmap_dir( 128 128 "${BMAPS_128}" )
+    bitmap_dir( 128 128 "${BMAPS_128}" ${KICAD_ICON_THEME} )
 
-    bitmap_dir( 48 48 "${BMAPS_BIG}" )
+    bitmap_dir( 48 48 "${BMAPS_BIG}" ${KICAD_ICON_THEME} )
 
 endif( MAINTAIN_PNGS )
 
diff --git a/bitmaps_png/cpp_24/add_line_label.cpp b/bitmaps_png/cpp_24/add_line_label.cpp
index c1d20e9218..c3d368b082 100644
--- a/bitmaps_png/cpp_24/add_line_label.cpp
+++ b/bitmaps_png/cpp_24/add_line_label.cpp
@@ -8,29 +8,29 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
- 0xf8, 0x00, 0x00, 0x01, 0x4c, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x18, 0x0c, 0x20,
+ 0xf8, 0x00, 0x00, 0x01, 0x4d, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x18, 0x0c, 0x20,
  0x24, 0x24, 0x24, 0x1a, 0x88, 0xff, 0x23, 0xe1, 0x1b, 0xd4, 0xb6, 0x60, 0x0f, 0x9a, 0x05, 0xff,
  0x43, 0x43, 0x43, 0xcd, 0xa8, 0x62, 0x78, 0x50, 0x50, 0x90, 0x3c, 0xd0, 0xc0, 0xbf, 0x50, 0x83,
- 0xbf, 0x20, 0x59, 0x32, 0x83, 0x2a, 0x16, 0x00, 0x5d, 0x5a, 0x87, 0x64, 0x68, 0x1b, 0x10, 0xff,
- 0x80, 0xb2, 0x3f, 0x00, 0xe5, 0x38, 0x29, 0x35, 0x9f, 0x11, 0x68, 0xd0, 0x3d, 0x98, 0x05, 0xc1,
- 0xc1, 0xc1, 0x7a, 0x40, 0x43, 0x37, 0x21, 0x05, 0x53, 0x14, 0xa5, 0xc1, 0xe3, 0x88, 0xe4, 0xfa,
- 0x87, 0x50, 0x1f, 0xc5, 0x22, 0x59, 0xb0, 0x9b, 0x22, 0x0b, 0x80, 0x2e, 0x5e, 0x84, 0x64, 0x41,
- 0x0f, 0x48, 0xcc, 0xcf, 0xcf, 0x8f, 0x17, 0xc8, 0xfe, 0x06, 0x15, 0xfb, 0x07, 0xb4, 0x44, 0x91,
- 0x2c, 0xc3, 0xa3, 0xa3, 0xa3, 0xf9, 0x80, 0x06, 0x7c, 0x45, 0x0a, 0x1e, 0x43, 0xa4, 0x54, 0xb5,
- 0x1a, 0xc9, 0xe2, 0x5a, 0x72, 0x5d, 0x9f, 0x8a, 0x64, 0xc8, 0x75, 0xb4, 0x64, 0x1b, 0x84, 0x24,
- 0x77, 0xaf, 0xa1, 0xa1, 0x81, 0x89, 0x9c, 0xb4, 0x7f, 0x0c, 0x29, 0xac, 0xab, 0x91, 0xe5, 0x12,
- 0x12, 0x12, 0x38, 0x80, 0xe2, 0xef, 0x91, 0x2c, 0x71, 0x20, 0x35, 0x69, 0xaa, 0xa3, 0x65, 0xac,
- 0xc5, 0x40, 0xdc, 0x81, 0x86, 0xef, 0x22, 0xc9, 0x2f, 0x24, 0xd5, 0xf5, 0x1d, 0xe8, 0x39, 0x97,
- 0x00, 0xfe, 0x02, 0x8a, 0x33, 0x62, 0x5d, 0xcf, 0x0c, 0xd4, 0xf0, 0x94, 0x44, 0x0b, 0x40, 0xc1,
- 0x98, 0x4c, 0x6c, 0xe4, 0x7a, 0x21, 0x69, 0xfc, 0x07, 0xc4, 0xa1, 0x40, 0x31, 0x17, 0x6c, 0x18,
- 0x28, 0xb7, 0x0b, 0x49, 0xed, 0x51, 0x62, 0x7d, 0xb0, 0x06, 0x49, 0xd3, 0x31, 0x02, 0x41, 0x89,
- 0x9c, 0x9a, 0x40, 0x49, 0x59, 0x03, 0xaf, 0xe1, 0x81, 0x81, 0x81, 0xc2, 0x48, 0x65, 0x0d, 0x08,
- 0xe7, 0x12, 0x70, 0x0c, 0x1b, 0x50, 0xcd, 0x5b, 0x24, 0x0b, 0xda, 0x09, 0x05, 0x4f, 0x1e, 0x92,
- 0xe1, 0x7f, 0x22, 0x23, 0x23, 0xc5, 0x89, 0x48, 0x10, 0xb3, 0x91, 0xf4, 0x3c, 0x05, 0xc5, 0x21,
- 0x3e, 0xc5, 0xe7, 0x91, 0x22, 0x6d, 0x07, 0x91, 0x29, 0xce, 0x01, 0x2d, 0x98, 0xbc, 0xe8, 0x5f,
- 0x25, 0x4a, 0x35, 0x1e, 0x39, 0x0c, 0xc4, 0xff, 0xa9, 0x8c, 0x0f, 0xd3, 0xcf, 0x82, 0x21, 0x0d,
- 0x00, 0x6a, 0x8b, 0x94, 0x86, 0x00, 0x63, 0xdd, 0x3d, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
- 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0xbf, 0x20, 0x59, 0x32, 0x83, 0x2a, 0x16, 0x00, 0x5d, 0x5a, 0x07, 0x33, 0x34, 0x38, 0x38, 0xb8,
+ 0x05, 0x48, 0x7f, 0x83, 0xf2, 0x3f, 0x00, 0xe5, 0x38, 0x29, 0x35, 0x9f, 0x11, 0x68, 0xd0, 0x3d,
+ 0xa4, 0x60, 0x31, 0x00, 0xd2, 0x1b, 0x91, 0xf8, 0x51, 0x94, 0x06, 0x8f, 0x23, 0x52, 0x90, 0x3c,
+ 0x04, 0x59, 0x08, 0x34, 0x34, 0x16, 0xc9, 0x82, 0xdd, 0x14, 0x59, 0x00, 0x0c, 0x92, 0x45, 0x48,
+ 0x16, 0xf4, 0x80, 0xc4, 0xfc, 0xfc, 0xfc, 0x78, 0x91, 0x82, 0xe9, 0x1f, 0xd0, 0x12, 0x45, 0xb2,
+ 0x0c, 0x8f, 0x8e, 0x8e, 0xe6, 0x03, 0x1a, 0xf0, 0x15, 0x29, 0xfc, 0x0d, 0x91, 0x52, 0xd5, 0x6a,
+ 0x24, 0x8b, 0x6b, 0xc9, 0x75, 0x7d, 0x2a, 0x92, 0x21, 0xd7, 0xd1, 0x92, 0x6d, 0x10, 0x92, 0xdc,
+ 0xbd, 0x86, 0x86, 0x06, 0x26, 0x72, 0xd2, 0xfe, 0x31, 0xa4, 0xb0, 0xae, 0x46, 0x96, 0x4b, 0x48,
+ 0x48, 0xe0, 0x00, 0x8a, 0xbf, 0x47, 0xb2, 0xc4, 0x81, 0xd4, 0xa4, 0xa9, 0x8e, 0x96, 0xb1, 0x16,
+ 0x03, 0x71, 0x07, 0x1a, 0xbe, 0x8b, 0x24, 0xbf, 0x90, 0x54, 0xd7, 0x77, 0xa0, 0xe7, 0x5c, 0x02,
+ 0xf8, 0x0b, 0x28, 0xce, 0x88, 0x75, 0x3d, 0x33, 0x50, 0xc3, 0x53, 0x12, 0x2d, 0x00, 0x05, 0x63,
+ 0x32, 0xb1, 0x91, 0xeb, 0x85, 0xa4, 0xf1, 0x1f, 0x10, 0x87, 0x02, 0xc5, 0x5c, 0xb0, 0x61, 0xa0,
+ 0xdc, 0x2e, 0x24, 0xb5, 0x47, 0x89, 0xf5, 0xc1, 0x1a, 0x24, 0x4d, 0xc7, 0x08, 0x04, 0x25, 0x72,
+ 0x6a, 0x02, 0x25, 0x65, 0x0d, 0xbc, 0x86, 0x07, 0x06, 0x06, 0x0a, 0x03, 0x15, 0xfe, 0x40, 0xd2,
+ 0x94, 0x4b, 0xc0, 0x31, 0x6c, 0x40, 0x35, 0x6f, 0x91, 0x2c, 0x68, 0x27, 0x14, 0x3c, 0x79, 0x48,
+ 0x86, 0xff, 0x89, 0x8c, 0x8c, 0x14, 0x27, 0x22, 0x41, 0xcc, 0x46, 0xd2, 0xf3, 0x14, 0x14, 0x87,
+ 0xf8, 0x14, 0x9f, 0x47, 0x8a, 0xb4, 0x1d, 0x44, 0xa6, 0x38, 0x07, 0xb4, 0x60, 0xf2, 0xa2, 0x7f,
+ 0x95, 0x28, 0xd5, 0x78, 0xe4, 0x30, 0x10, 0xff, 0xa7, 0x32, 0x3e, 0x4c, 0x3f, 0x0b, 0x86, 0x34,
+ 0x00, 0x00, 0x59, 0x95, 0x94, 0x84, 0x45, 0x27, 0x24, 0x7a, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
+ 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE add_line_label_xpm[1] = {{ png, sizeof( png ), "add_line_label_xpm" }};
diff --git a/bitmaps_png/cpp_24/annotate.cpp b/bitmaps_png/cpp_24/annotate.cpp
index a92e27a963..093eb0e66b 100644
--- a/bitmaps_png/cpp_24/annotate.cpp
+++ b/bitmaps_png/cpp_24/annotate.cpp
@@ -8,59 +8,60 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
- 0xf8, 0x00, 0x00, 0x03, 0x33, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0x55, 0xeb, 0x4b, 0x53,
- 0x61, 0x1c, 0x5e, 0xff, 0x44, 0x1f, 0xaa, 0x0f, 0x65, 0xe6, 0x02, 0xa3, 0x82, 0xa0, 0x22, 0x8a,
- 0x9a, 0x85, 0x14, 0x09, 0x06, 0x4d, 0xfd, 0xa2, 0xa6, 0x33, 0xf5, 0x43, 0x48, 0x24, 0x46, 0x2e,
- 0x45, 0x5c, 0xd6, 0xb0, 0x24, 0x98, 0x3a, 0xc1, 0x6c, 0x76, 0x9b, 0xd9, 0x48, 0x02, 0x65, 0x91,
- 0xe8, 0x6c, 0x4e, 0x8a, 0xa9, 0xcd, 0xe5, 0x65, 0x78, 0xd9, 0x4c, 0x52, 0x5b, 0xa9, 0xb3, 0xa1,
- 0xec, 0xe6, 0x9c, 0x73, 0x4f, 0xe7, 0x7d, 0x65, 0x87, 0xd9, 0xd4, 0x9d, 0xc8, 0x1f, 0xfc, 0xd8,
- 0xf9, 0x5d, 0x9f, 0xf7, 0x3c, 0xcf, 0x7b, 0x18, 0x8f, 0xc7, 0x98, 0x50, 0x28, 0x04, 0x17, 0x4f,
- 0x4a, 0x4a, 0x42, 0x66, 0x66, 0x26, 0xfd, 0x0d, 0xcd, 0x93, 0x5c, 0x4a, 0x4a, 0x4a, 0x58, 0x3f,
- 0x2f, 0x68, 0xc1, 0x44, 0x51, 0x51, 0x11, 0x82, 0xe6, 0xf5, 0x7a, 0x61, 0xb1, 0x58, 0x50, 0x5a,
- 0x5a, 0x4a, 0x6b, 0x1a, 0x8d, 0x06, 0x3e, 0x9f, 0x8f, 0xd6, 0x16, 0x17, 0x17, 0x69, 0x5e, 0xa9,
- 0x54, 0xc2, 0xe3, 0xf1, 0xb0, 0xfd, 0x72, 0xb9, 0x9c, 0x1b, 0x40, 0x55, 0x55, 0x15, 0x5d, 0x60,
- 0x32, 0x99, 0xe0, 0x72, 0xb9, 0xe8, 0xe9, 0xa4, 0x52, 0x29, 0xc4, 0x62, 0x31, 0x72, 0x73, 0x73,
- 0xd1, 0xdb, 0xdb, 0x8b, 0xb1, 0xb1, 0x31, 0xda, 0x4f, 0xfa, 0x72, 0x72, 0x72, 0xa0, 0x56, 0xab,
- 0x69, 0x2f, 0x27, 0x80, 0xc2, 0xc2, 0x42, 0x1a, 0x57, 0x57, 0x57, 0xd3, 0x58, 0x24, 0x12, 0xad,
- 0xa3, 0xc9, 0x60, 0x30, 0xc0, 0x68, 0x34, 0xae, 0x5b, 0xd6, 0xdc, 0xdc, 0x8c, 0xd9, 0xd9, 0x59,
- 0x6e, 0x00, 0x0d, 0x0d, 0x0d, 0xa8, 0xad, 0xad, 0x85, 0xd5, 0x6a, 0xc5, 0xf0, 0xf0, 0x30, 0x3b,
- 0x90, 0x9c, 0x9c, 0x8c, 0xae, 0xae, 0x2e, 0xd8, 0x6c, 0x36, 0xe4, 0xe5, 0xe5, 0xb1, 0x79, 0x95,
- 0x4a, 0x45, 0x4f, 0x5f, 0x52, 0x52, 0xc2, 0x0d, 0xc0, 0x6e, 0xb7, 0xc3, 0xed, 0x76, 0x53, 0x80,
- 0xb4, 0xb4, 0x34, 0x76, 0x40, 0x26, 0x93, 0xd1, 0x5a, 0x56, 0x56, 0x16, 0x9b, 0x2b, 0x28, 0x28,
- 0xa0, 0xda, 0xe4, 0xe7, 0xe7, 0x73, 0x17, 0x99, 0x50, 0x54, 0x5c, 0x5c, 0x8c, 0x40, 0x20, 0x80,
- 0xb2, 0xb2, 0x32, 0x76, 0x40, 0x22, 0x91, 0x84, 0x09, 0x49, 0x16, 0x13, 0xb1, 0x37, 0xba, 0x75,
- 0x11, 0x35, 0xd0, 0x6a, 0xb5, 0x94, 0x8e, 0xd4, 0xd4, 0x54, 0x1a, 0x13, 0x41, 0x15, 0x0a, 0x45,
- 0x18, 0x40, 0x63, 0x63, 0xe3, 0xbf, 0x5d, 0xd3, 0x20, 0x00, 0x11, 0xd7, 0xe9, 0x74, 0xa2, 0xb5,
- 0xb5, 0x95, 0xc6, 0x3a, 0x9d, 0x0e, 0x0e, 0x87, 0x63, 0xdd, 0x12, 0xa2, 0x97, 0xdf, 0xef, 0x47,
- 0x76, 0x76, 0x76, 0x64, 0x80, 0x48, 0x4e, 0x44, 0x0e, 0xd5, 0x24, 0xe8, 0xe9, 0xe9, 0xe9, 0x5b,
- 0x53, 0xb4, 0x95, 0xb5, 0xed, 0x8f, 0xdf, 0xd9, 0x11, 0x73, 0x21, 0x4a, 0x7b, 0xe0, 0x7c, 0x65,
- 0x67, 0x8c, 0x00, 0xc4, 0xc9, 0x33, 0xc9, 0x91, 0x1a, 0xef, 0x7f, 0xad, 0x93, 0x7f, 0x4e, 0xa8,
- 0x8b, 0x11, 0x2c, 0x69, 0x63, 0x04, 0x2e, 0x16, 0x80, 0x79, 0x26, 0x39, 0x52, 0xe3, 0x6d, 0x87,
- 0x31, 0x4b, 0xfb, 0x83, 0xcb, 0x59, 0xe7, 0x0b, 0x4c, 0x0c, 0x07, 0x3b, 0xb6, 0x05, 0x40, 0x1b,
- 0x2d, 0x88, 0x65, 0x4e, 0xec, 0x09, 0x2e, 0xd7, 0xf1, 0xe3, 0xdc, 0xcc, 0x5b, 0x1c, 0xe1, 0xbc,
- 0x60, 0x97, 0xe4, 0x33, 0x22, 0x79, 0xcd, 0x19, 0x11, 0xb4, 0x7c, 0x86, 0x1e, 0x7e, 0x1c, 0x7d,
- 0x0e, 0xad, 0xed, 0xbd, 0xaf, 0x47, 0xd4, 0x03, 0x7d, 0xd8, 0x4c, 0x18, 0x40, 0x4e, 0xd3, 0x18,
- 0xbd, 0xa6, 0x7e, 0xe6, 0x03, 0x9b, 0x71, 0x2c, 0xe3, 0xa5, 0x61, 0x86, 0x0e, 0x93, 0xda, 0x41,
- 0x71, 0x1b, 0x5a, 0x0e, 0x27, 0x40, 0x73, 0x2c, 0x11, 0x3e, 0xfb, 0x02, 0x4e, 0x56, 0xf6, 0x21,
- 0x5a, 0xda, 0x8d, 0xd7, 0x5f, 0x67, 0xb1, 0xb2, 0x1a, 0x40, 0x80, 0x99, 0x6b, 0x37, 0xdb, 0xb1,
- 0x2f, 0x04, 0x68, 0x53, 0x80, 0xab, 0x2f, 0x4c, 0xb8, 0xd9, 0x6c, 0xc1, 0xb2, 0x7f, 0x15, 0x92,
- 0xf6, 0xef, 0xec, 0x40, 0x51, 0x46, 0x05, 0xcc, 0x72, 0x25, 0xed, 0x21, 0x00, 0x64, 0x19, 0x01,
- 0xb8, 0xf2, 0x7c, 0x08, 0x89, 0xcf, 0x86, 0x28, 0xd0, 0xad, 0x16, 0x4b, 0x64, 0x00, 0x7e, 0x79,
- 0x37, 0x8d, 0xcd, 0x36, 0x37, 0x5e, 0xf5, 0xcd, 0xb0, 0x03, 0x9f, 0xc6, 0xe7, 0x51, 0xaf, 0x9f,
- 0x66, 0x01, 0x42, 0xe9, 0xd8, 0xcd, 0xb8, 0x73, 0xd9, 0x8f, 0x3b, 0xef, 0xbf, 0x45, 0x06, 0xb8,
- 0xfe, 0x76, 0x14, 0xd2, 0x8e, 0x49, 0x4a, 0x55, 0x86, 0x6a, 0x84, 0xd6, 0x6e, 0xbc, 0x33, 0xa3,
- 0xef, 0x87, 0x03, 0x09, 0xf5, 0x83, 0x1b, 0x02, 0x90, 0xfa, 0xd2, 0xca, 0x2a, 0x8e, 0xcb, 0x0c,
- 0x91, 0x01, 0xa6, 0x17, 0xbc, 0x60, 0xde, 0x16, 0x15, 0x9d, 0x53, 0x6b, 0xfc, 0x3f, 0xec, 0xa1,
- 0x9a, 0xc4, 0x3f, 0xe9, 0xc7, 0x65, 0x45, 0x38, 0xc0, 0xd9, 0x1a, 0x23, 0x1c, 0x5e, 0x3f, 0xee,
- 0x7e, 0x98, 0xe0, 0x26, 0x32, 0xa1, 0xa8, 0x69, 0x70, 0x0e, 0x43, 0xbf, 0x9c, 0xd8, 0x73, 0xef,
- 0x33, 0x8a, 0x5b, 0x27, 0xe8, 0xe9, 0x06, 0x99, 0x78, 0x7c, 0x7e, 0xed, 0x2f, 0x72, 0x74, 0xce,
- 0x8d, 0xd8, 0x47, 0x3d, 0x38, 0xfa, 0xf8, 0x0b, 0xa6, 0x16, 0x96, 0x50, 0xab, 0xb7, 0x72, 0xbf,
- 0x45, 0x04, 0xe0, 0x44, 0xa5, 0x81, 0x8a, 0x7c, 0x5b, 0x3d, 0x8e, 0xd3, 0x72, 0x23, 0xad, 0x11,
- 0x2f, 0xff, 0x38, 0x49, 0x7b, 0xc8, 0x69, 0x0f, 0x55, 0xf4, 0x52, 0x50, 0x23, 0x43, 0xdd, 0xa5,
- 0xa7, 0x03, 0xb8, 0x58, 0x37, 0x80, 0x53, 0xd5, 0x7d, 0xdc, 0x45, 0xae, 0xeb, 0xfe, 0x89, 0xdf,
- 0x6e, 0x1f, 0xa5, 0x28, 0xd8, 0x13, 0x4a, 0xd1, 0xb5, 0x37, 0x23, 0xf8, 0xdb, 0x34, 0xcc, 0x55,
- 0xdd, 0x14, 0x60, 0xbb, 0x9d, 0xec, 0xfe, 0x03, 0x5b, 0x67, 0xc3, 0x6c, 0x0e, 0xcb, 0xa9, 0x75,
- 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0xf8, 0x00, 0x00, 0x03, 0x41, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x54, 0xeb, 0x4b, 0x93,
+ 0x51, 0x18, 0x5f, 0xff, 0x44, 0x1f, 0xba, 0x42, 0xa5, 0x13, 0x84, 0x84, 0xfa, 0x52, 0x84, 0xd4,
+ 0x2c, 0xaa, 0x0f, 0xd5, 0x97, 0xbc, 0x7c, 0x71, 0x82, 0xe2, 0x85, 0x48, 0x82, 0xd4, 0x42, 0x53,
+ 0x41, 0x5d, 0x59, 0x46, 0xe1, 0x6d, 0x2e, 0x11, 0x83, 0x44, 0x59, 0x46, 0x85, 0x88, 0x99, 0x89,
+ 0xf2, 0xba, 0x44, 0x51, 0xcb, 0x39, 0x63, 0x68, 0x3a, 0x0a, 0xcd, 0x69, 0xcc, 0xd5, 0x66, 0xba,
+ 0xcd, 0xad, 0x4d, 0xfd, 0x75, 0xce, 0x23, 0xef, 0x8b, 0xf3, 0xb6, 0x45, 0xf6, 0xc0, 0xc3, 0x7b,
+ 0xce, 0x73, 0xf9, 0xfd, 0xce, 0xf9, 0x3d, 0x87, 0x57, 0x26, 0x63, 0x16, 0x1d, 0x1d, 0x8d, 0x60,
+ 0x3c, 0x26, 0x26, 0x06, 0x89, 0x89, 0x89, 0xf4, 0x5d, 0x1b, 0xe7, 0xb1, 0xb8, 0xb8, 0xb8, 0x0d,
+ 0xf5, 0x32, 0xd1, 0xc4, 0x40, 0x6e, 0x6e, 0x2e, 0x44, 0xf3, 0x78, 0x3c, 0x30, 0x99, 0x4c, 0x28,
+ 0x28, 0x28, 0xa0, 0x5c, 0x47, 0x47, 0x07, 0xbc, 0x5e, 0x2f, 0xe5, 0xe6, 0xe7, 0xe7, 0x51, 0x58,
+ 0x58, 0x88, 0xfa, 0xfa, 0x7a, 0xb8, 0x5c, 0x2e, 0xa9, 0x5e, 0xa3, 0xd1, 0x04, 0x47, 0x50, 0x51,
+ 0x51, 0x41, 0xc0, 0x46, 0xa3, 0x11, 0x4e, 0xa7, 0x93, 0x4e, 0x57, 0x5c, 0x5c, 0x8c, 0x9c, 0x9c,
+ 0x1c, 0xa4, 0xa5, 0xa5, 0x61, 0x60, 0x60, 0x00, 0xe3, 0xe3, 0xe3, 0x54, 0xcf, 0xeb, 0x52, 0x53,
+ 0x53, 0xd1, 0xd2, 0xd2, 0x42, 0xb5, 0x41, 0x11, 0x64, 0x67, 0x67, 0xd3, 0xbe, 0xb2, 0xb2, 0x92,
+ 0xf6, 0x49, 0x49, 0x49, 0x7e, 0x32, 0x19, 0x0c, 0x06, 0xe8, 0xf5, 0x7a, 0x3f, 0xb0, 0xd6, 0xd6,
+ 0x56, 0x58, 0x2c, 0x96, 0xe0, 0x08, 0x1a, 0x1a, 0x1a, 0x50, 0x5d, 0x5d, 0x0d, 0xb3, 0xd9, 0x8c,
+ 0x91, 0x91, 0x11, 0xa9, 0x21, 0x36, 0x36, 0x16, 0xdd, 0xdd, 0xdd, 0xb0, 0x5a, 0xad, 0x48, 0x4f,
+ 0x4f, 0x97, 0xe2, 0x8d, 0x8d, 0x8d, 0x24, 0x55, 0x7e, 0x7e, 0x7e, 0x70, 0x04, 0x36, 0x9b, 0x8d,
+ 0x1a, 0x38, 0x81, 0x52, 0xa9, 0x94, 0x1a, 0xca, 0xca, 0xca, 0x60, 0xb7, 0xdb, 0x91, 0x9c, 0x9c,
+ 0x2c, 0xc5, 0xb2, 0xb2, 0xb2, 0xe0, 0xf3, 0xf9, 0x90, 0x99, 0x99, 0x19, 0xfc, 0x90, 0xb9, 0x44,
+ 0x79, 0x79, 0x79, 0x58, 0x59, 0x59, 0x81, 0x4a, 0xa5, 0x92, 0x1a, 0xf8, 0x60, 0xd5, 0x6a, 0xb5,
+ 0x1f, 0x48, 0x46, 0x46, 0x06, 0x0d, 0x7b, 0xb3, 0x57, 0x17, 0x70, 0x06, 0x82, 0x20, 0x90, 0x1c,
+ 0xf1, 0xf1, 0xf1, 0xb4, 0xe7, 0x03, 0xad, 0xad, 0xad, 0xdd, 0x40, 0xa0, 0xd5, 0x6a, 0xff, 0xee,
+ 0x99, 0x8a, 0x04, 0x7c, 0xb8, 0x0e, 0x87, 0x03, 0x6d, 0x6d, 0x6d, 0xb4, 0xd7, 0xe9, 0x74, 0x58,
+ 0x58, 0x58, 0xf0, 0x03, 0xe1, 0xf3, 0x5a, 0x5a, 0x5a, 0x42, 0x4a, 0x4a, 0x4a, 0x60, 0x82, 0x40,
+ 0xce, 0x87, 0xbc, 0x76, 0x26, 0xa2, 0x27, 0x24, 0x24, 0x6c, 0x2f, 0xd1, 0x76, 0xd6, 0x7e, 0xf8,
+ 0xfc, 0xee, 0xce, 0xd0, 0x73, 0x87, 0x84, 0x90, 0xb3, 0xe5, 0x5d, 0xa1, 0x0a, 0x70, 0xe7, 0x6b,
+ 0x1e, 0xe3, 0x39, 0xd9, 0xbf, 0x5a, 0x97, 0xfc, 0x4c, 0xb4, 0x2e, 0x54, 0xe1, 0x16, 0x42, 0x15,
+ 0x4e, 0x89, 0x80, 0xad, 0x79, 0x8c, 0xe7, 0x64, 0x3b, 0x61, 0x0c, 0xd4, 0x20, 0x82, 0x4b, 0x2e,
+ 0x57, 0x18, 0x99, 0x06, 0xbb, 0x76, 0x84, 0x40, 0x38, 0xa2, 0x08, 0x67, 0x27, 0x5e, 0x14, 0xc1,
+ 0x75, 0xf2, 0x28, 0x17, 0xbb, 0x45, 0x44, 0xd0, 0x00, 0x7b, 0x0a, 0x7b, 0x10, 0xc8, 0xab, 0x22,
+ 0x93, 0x20, 0xc8, 0x99, 0x3c, 0xf2, 0x28, 0x5a, 0xaf, 0xcf, 0xcb, 0x1f, 0xf4, 0xe1, 0xe0, 0xdd,
+ 0x5e, 0xbf, 0x98, 0x1f, 0xc1, 0x01, 0x55, 0xaf, 0xf4, 0x27, 0x75, 0xfe, 0x5e, 0xc2, 0xa8, 0xc5,
+ 0x89, 0x1b, 0x4d, 0x26, 0xa9, 0x38, 0x2c, 0xa7, 0x1d, 0xcd, 0x47, 0x2f, 0xe1, 0xdd, 0xb1, 0x2b,
+ 0xf0, 0xda, 0xe6, 0x70, 0xed, 0xd5, 0x18, 0xc5, 0x13, 0x9e, 0x8f, 0x62, 0xc2, 0xe6, 0xa6, 0x3e,
+ 0xb7, 0x6f, 0x19, 0xa5, 0xef, 0xa7, 0xb6, 0x27, 0x50, 0xf7, 0x98, 0x71, 0xb5, 0xce, 0x88, 0x17,
+ 0xc3, 0xb3, 0x58, 0x5e, 0x01, 0x4e, 0x57, 0xe9, 0xa5, 0x86, 0x5b, 0xca, 0x12, 0x18, 0xcb, 0xeb,
+ 0xc0, 0xc2, 0x12, 0x81, 0xaa, 0x63, 0x82, 0x40, 0xa3, 0x9e, 0x0c, 0xa1, 0x44, 0xf8, 0x46, 0x18,
+ 0x0a, 0xcd, 0xd0, 0xd6, 0x04, 0x77, 0xde, 0x7e, 0xa5, 0x64, 0xa4, 0x5a, 0x4f, 0x7b, 0xa5, 0x76,
+ 0x84, 0xf6, 0x7b, 0x99, 0x0b, 0x63, 0x56, 0x94, 0x0a, 0x13, 0x14, 0x17, 0x09, 0xd6, 0xfa, 0xe5,
+ 0xa7, 0x9f, 0x28, 0x77, 0xae, 0xda, 0xb0, 0x35, 0x81, 0x76, 0xc8, 0x82, 0xeb, 0xaf, 0xc7, 0xd1,
+ 0x69, 0xb2, 0xc3, 0xea, 0xf4, 0x22, 0xfc, 0x61, 0x3f, 0x15, 0xdf, 0x7e, 0xf3, 0x05, 0x86, 0x19,
+ 0x07, 0xc2, 0x4a, 0xfa, 0xb7, 0x24, 0x68, 0x32, 0x5a, 0xf1, 0x79, 0xd6, 0x85, 0xfd, 0x45, 0xbd,
+ 0x5b, 0x13, 0xd8, 0x5c, 0x5e, 0xfc, 0x64, 0xce, 0xf5, 0x3c, 0x55, 0xb9, 0x2a, 0xcf, 0xc9, 0x8a,
+ 0x41, 0x8a, 0x71, 0xb9, 0x42, 0xee, 0xf7, 0x6d, 0x4a, 0xf0, 0x58, 0x37, 0x85, 0xb9, 0x45, 0x1f,
+ 0x49, 0xb5, 0xed, 0x0c, 0xb8, 0x44, 0x11, 0x8f, 0x06, 0x30, 0xef, 0xf6, 0xe1, 0x5e, 0xe7, 0x24,
+ 0x15, 0x3e, 0xfb, 0xf8, 0x9d, 0x08, 0x27, 0xed, 0x6e, 0x4c, 0xcd, 0x79, 0xa8, 0xee, 0x07, 0xbb,
+ 0x5d, 0xea, 0xcb, 0x55, 0x12, 0x5e, 0x67, 0x67, 0xe0, 0x17, 0x6a, 0x86, 0x03, 0xbf, 0x22, 0x71,
+ 0x06, 0xb9, 0xec, 0xeb, 0x61, 0xa0, 0x7c, 0x16, 0x17, 0x59, 0x23, 0x07, 0xe3, 0xce, 0x5f, 0x16,
+ 0xb7, 0x9a, 0xfe, 0x19, 0x9c, 0x28, 0x1f, 0xa4, 0x21, 0xfb, 0xd8, 0x6b, 0xb8, 0xd9, 0x6c, 0xa2,
+ 0x3a, 0xee, 0xc7, 0x4b, 0x3f, 0x04, 0x26, 0xd8, 0x57, 0xd4, 0x03, 0xc3, 0xb4, 0x03, 0x83, 0xe6,
+ 0x05, 0x5a, 0x8b, 0xa7, 0x5a, 0x2f, 0xd1, 0x2f, 0x76, 0xd3, 0xf5, 0xa6, 0xe9, 0x9d, 0xde, 0x48,
+ 0xf0, 0x3f, 0x9c, 0x63, 0xff, 0x01, 0x91, 0xce, 0xca, 0xca, 0x64, 0x04, 0xea, 0xfa, 0x00, 0x00,
+ 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE annotate_xpm[1] = {{ png, sizeof( png ), "annotate_xpm" }};
diff --git a/bitmaps_png/cpp_24/rotate_ccw.cpp b/bitmaps_png/cpp_24/rotate_ccw.cpp
index d17cc922d8..10c3fac199 100644
--- a/bitmaps_png/cpp_24/rotate_ccw.cpp
+++ b/bitmaps_png/cpp_24/rotate_ccw.cpp
@@ -8,50 +8,31 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
- 0xf8, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e,
- 0xc3, 0x01, 0xc7, 0x6f, 0xa8, 0x64, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f,
- 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63,
- 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x00, 0x0e, 0x74,
- 0x45, 0x58, 0x74, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x00, 0x6d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x5f,
- 0x68, 0x1c, 0x96, 0x58, 0x4c, 0x00, 0x00, 0x00, 0x52, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, 0x70,
- 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x00, 0x43, 0x43, 0x20, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62,
- 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x53, 0x68, 0x61, 0x72, 0x65, 0x41, 0x6c, 0x69, 0x6b, 0x65,
- 0x20, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x76, 0x65,
- 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x73, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6c, 0x69, 0x63, 0x65,
- 0x6e, 0x73, 0x65, 0x73, 0x2f, 0x62, 0x79, 0x2d, 0x73, 0x61, 0x2f, 0x34, 0x2e, 0x30, 0x2f, 0xc3,
- 0x54, 0x62, 0x05, 0x00, 0x00, 0x01, 0xee, 0x49, 0x44, 0x41, 0x54, 0x48, 0x89, 0xed, 0x93, 0xcf,
- 0x6b, 0x53, 0x41, 0x10, 0x80, 0xbf, 0x79, 0x2f, 0x29, 0xa1, 0xb5, 0x20, 0x12, 0xc5, 0x5a, 0xf1,
- 0xe7, 0x45, 0x28, 0xde, 0x04, 0xa5, 0xa9, 0x20, 0x5e, 0x44, 0xb0, 0xf8, 0x17, 0x08, 0xa2, 0x60,
- 0x4f, 0x5e, 0x84, 0x60, 0x48, 0x02, 0x7d, 0x49, 0xd6, 0x98, 0x2a, 0x22, 0x28, 0x1e, 0x44, 0xbd,
- 0x78, 0x51, 0xaa, 0x78, 0x11, 0x15, 0x4f, 0x15, 0x79, 0xda, 0x83, 0xa8, 0x48, 0xe3, 0x49, 0x41,
- 0x14, 0x5b, 0x10, 0x5a, 0x45, 0x25, 0x6a, 0x49, 0xb2, 0xe3, 0xa1, 0xbc, 0x62, 0x21, 0xbc, 0x34,
- 0xc1, 0x9c, 0xf4, 0x3b, 0xcd, 0xee, 0xce, 0xce, 0x37, 0xb3, 0xb0, 0xf0, 0x9f, 0x26, 0xc8, 0x72,
- 0x92, 0xd6, 0x7b, 0x4f, 0x57, 0x59, 0xb1, 0x0f, 0x05, 0xa9, 0x4c, 0x8f, 0x26, 0xf6, 0xb4, 0x22,
- 0x70, 0x9a, 0x25, 0xac, 0xf6, 0x26, 0x56, 0x58, 0xb1, 0xf7, 0x81, 0x1d, 0xa0, 0xdd, 0xad, 0x14,
- 0x6f, 0x2a, 0x18, 0xf0, 0x5e, 0x77, 0x45, 0x25, 0x72, 0x1b, 0xd8, 0x29, 0x30, 0x53, 0xc7, 0xe6,
- 0x36, 0x9e, 0x7a, 0xdc, 0xd7, 0x8a, 0x20, 0xf4, 0x89, 0xfa, 0xbd, 0x27, 0x97, 0x55, 0xf4, 0x18,
- 0x22, 0x8a, 0xea, 0x9f, 0xb9, 0xef, 0x14, 0xae, 0xd8, 0xee, 0xca, 0x85, 0x4f, 0xc9, 0x7d, 0x95,
- 0xb0, 0x1a, 0xa1, 0x13, 0xa8, 0xa8, 0xbb, 0x10, 0xa8, 0x15, 0xf4, 0x0d, 0xc8, 0x0b, 0x60, 0x0e,
- 0xd8, 0x2c, 0x50, 0x74, 0x7f, 0xf4, 0x4c, 0xae, 0xf5, 0x26, 0x37, 0xb5, 0x2d, 0x70, 0x7a, 0x9d,
- 0xe3, 0x2a, 0x3c, 0x02, 0x5c, 0x45, 0x1c, 0x57, 0x75, 0x78, 0x46, 0x13, 0x6b, 0x04, 0xf6, 0x0a,
- 0x94, 0x81, 0xed, 0x8e, 0xd4, 0x1f, 0xc4, 0xc7, 0xfc, 0xde, 0xb6, 0x04, 0x1f, 0x4f, 0x0c, 0xfe,
- 0x9c, 0xb7, 0x91, 0x83, 0x02, 0xcf, 0x80, 0xad, 0x75, 0xe1, 0x0e, 0x9e, 0xd8, 0xe9, 0xd1, 0xa1,
- 0x89, 0xf9, 0x18, 0x83, 0xc0, 0x2b, 0x60, 0x5b, 0xd7, 0x2f, 0xc9, 0xb4, 0x25, 0x00, 0xf8, 0xec,
- 0xed, 0xfa, 0x46, 0x34, 0xba, 0x1f, 0x78, 0x09, 0x54, 0x83, 0xfd, 0xd9, 0x93, 0x43, 0xdf, 0x55,
- 0xf4, 0xe8, 0xc2, 0x4a, 0x8f, 0x30, 0x3e, 0xee, 0x86, 0x16, 0x2a, 0x95, 0x4a, 0x1b, 0x9a, 0xc9,
- 0x1a, 0xd1, 0x9f, 0xf3, 0xa7, 0xd6, 0xe5, 0x7c, 0xed, 0xcb, 0xfb, 0xbb, 0x1b, 0x9d, 0x2f, 0x4e,
- 0x50, 0xab, 0xd5, 0xde, 0x1a, 0x63, 0xae, 0xe7, 0xf3, 0xf9, 0x81, 0x56, 0x04, 0x0a, 0xcf, 0x01,
- 0x1c, 0x65, 0x4b, 0xa8, 0x00, 0x88, 0x02, 0x87, 0x1c, 0xc7, 0x99, 0x32, 0xc6, 0xdc, 0x2d, 0x16,
- 0x8b, 0x89, 0xe5, 0x08, 0x44, 0xf9, 0x02, 0x60, 0x45, 0xea, 0xcd, 0x04, 0x8b, 0x77, 0x80, 0x03,
- 0xd6, 0x5a, 0xbf, 0x50, 0x28, 0xf8, 0xc6, 0x98, 0x61, 0x5d, 0xfa, 0x07, 0x96, 0x50, 0x43, 0x4e,
- 0x0b, 0x1c, 0xee, 0x59, 0xf9, 0xf5, 0x56, 0xc3, 0x06, 0x82, 0xc0, 0x18, 0xa3, 0x21, 0x8d, 0x96,
- 0x45, 0xe4, 0x6c, 0x3c, 0x1e, 0xbf, 0x31, 0x32, 0x32, 0x52, 0x0d, 0xc9, 0x6b, 0x5b, 0x10, 0xf0,
- 0x5e, 0x55, 0xcf, 0xc7, 0x62, 0xb1, 0xab, 0xc9, 0x64, 0x32, 0xf4, 0x07, 0xb7, 0x2b, 0x08, 0x98,
- 0x55, 0xd5, 0x4b, 0xae, 0xeb, 0x5e, 0x4c, 0xa7, 0xd3, 0x73, 0x9d, 0x10, 0x04, 0x54, 0x80, 0x6b,
- 0x91, 0x48, 0xe4, 0x5c, 0x2a, 0x95, 0xfa, 0xd0, 0x09, 0x41, 0x40, 0x15, 0xb8, 0x29, 0x22, 0x67,
- 0x32, 0x99, 0x4c, 0xb9, 0x13, 0x82, 0x00, 0x05, 0xee, 0x01, 0x63, 0xd9, 0x6c, 0xd6, 0xff, 0x0b,
- 0xf5, 0xfe, 0x05, 0x7e, 0x03, 0xee, 0x44, 0xb1, 0x50, 0xc3, 0xe5, 0x10, 0x4d, 0x00, 0x00, 0x00,
- 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0xf8, 0x00, 0x00, 0x01, 0x69, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x18, 0x05, 0xd4,
+ 0x00, 0x32, 0x0d, 0xc7, 0x84, 0xa4, 0x1a, 0x8f, 0x9c, 0x96, 0x6e, 0x3c, 0x7a, 0x80, 0xea, 0x86,
+ 0x8b, 0x36, 0xec, 0xe7, 0x01, 0x1a, 0x7e, 0x02, 0x88, 0xff, 0x4b, 0x37, 0x1e, 0x39, 0x45, 0x55,
+ 0xc3, 0xb5, 0x1b, 0xae, 0xb2, 0x49, 0x35, 0x1e, 0xde, 0x01, 0x35, 0xfc, 0xa9, 0x44, 0xe3, 0x21,
+ 0x6f, 0xf9, 0xd6, 0x43, 0x92, 0x54, 0xb3, 0x40, 0xba, 0xe1, 0xe8, 0x4c, 0x90, 0xe1, 0x52, 0x4d,
+ 0x47, 0xff, 0x81, 0x69, 0x04, 0xbe, 0x27, 0xd9, 0x78, 0xa4, 0x52, 0xbc, 0x7b, 0x27, 0x37, 0x45,
+ 0x16, 0x00, 0x0d, 0x9a, 0x03, 0x35, 0xf0, 0x8f, 0x74, 0xe3, 0xe1, 0x5b, 0x52, 0x8d, 0x47, 0xcf,
+ 0x02, 0xd9, 0x6f, 0x90, 0x2c, 0xba, 0x24, 0xd1, 0x70, 0x5c, 0x81, 0xfc, 0xc8, 0xed, 0x3b, 0xc6,
+ 0x29, 0xd9, 0x74, 0x64, 0x3f, 0xd4, 0xb0, 0x3b, 0xb2, 0x0d, 0x47, 0xa4, 0x18, 0x1a, 0xfe, 0x33,
+ 0x01, 0x83, 0xcb, 0x11, 0x88, 0x2f, 0x43, 0xc5, 0xaf, 0x8b, 0x74, 0x1e, 0xe1, 0x25, 0xdb, 0x12,
+ 0xa1, 0x86, 0x13, 0x7c, 0xa0, 0xc8, 0x85, 0x1a, 0x76, 0x02, 0x26, 0x0e, 0x32, 0x14, 0xc8, 0xbf,
+ 0x00, 0x11, 0x3f, 0xda, 0x41, 0x59, 0x5c, 0xb4, 0x9d, 0x14, 0x06, 0x1a, 0x74, 0x0e, 0x88, 0x0f,
+ 0x23, 0x8b, 0x4b, 0x36, 0x1d, 0x36, 0x86, 0x5a, 0xfc, 0x8a, 0x61, 0xd5, 0x2a, 0x66, 0xbc, 0x86,
+ 0x74, 0x74, 0x74, 0xc8, 0x91, 0x65, 0x39, 0x34, 0xa8, 0x80, 0x41, 0x69, 0x8b, 0x57, 0x61, 0x4b,
+ 0x4b, 0xcb, 0x2f, 0x20, 0x5e, 0xd4, 0xd4, 0xd4, 0xa4, 0x4d, 0x62, 0x42, 0x58, 0x00, 0x4d, 0xc6,
+ 0xf1, 0x84, 0x2c, 0xf8, 0x0f, 0xc5, 0xff, 0x80, 0x78, 0x73, 0x5b, 0x5b, 0x9b, 0x35, 0x71, 0x49,
+ 0xf9, 0x48, 0x3f, 0xc4, 0x07, 0x47, 0x63, 0x88, 0xb5, 0x00, 0x8e, 0x9b, 0x9b, 0x9b, 0x8f, 0x00,
+ 0x69, 0xdf, 0xff, 0xff, 0xff, 0x33, 0xe2, 0xd2, 0x27, 0xde, 0x70, 0x54, 0x0c, 0xe4, 0x7a, 0x95,
+ 0x49, 0xdb, 0xd8, 0x49, 0xb6, 0x00, 0x09, 0x5f, 0x6e, 0x6d, 0x6d, 0x8d, 0x9b, 0x39, 0x73, 0x26,
+ 0x2b, 0xd9, 0x29, 0x85, 0x80, 0x05, 0x30, 0xfc, 0x00, 0xe8, 0xab, 0xfc, 0xee, 0xee, 0x6e, 0x6e,
+ 0x5a, 0x59, 0x00, 0xc3, 0xaf, 0x81, 0x16, 0x35, 0x00, 0xe3, 0x49, 0x98, 0x56, 0x16, 0xc0, 0xf0,
+ 0x17, 0x20, 0x9e, 0x48, 0x54, 0x12, 0x27, 0xd3, 0x02, 0x18, 0x06, 0x27, 0x71, 0x60, 0x3c, 0xe9,
+ 0xd0, 0xca, 0x02, 0x94, 0x24, 0x0e, 0xc4, 0x36, 0xa3, 0xd5, 0x34, 0xd1, 0x00, 0x00, 0x14, 0x72,
+ 0x90, 0x07, 0xc7, 0xc2, 0x66, 0xc2, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
+ 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE rotate_ccw_xpm[1] = {{ png, sizeof( png ), "rotate_ccw_xpm" }};
diff --git a/bitmaps_png/cpp_24/rotate_cw.cpp b/bitmaps_png/cpp_24/rotate_cw.cpp
index a58b9cf23c..d8af5aff9b 100644
--- a/bitmaps_png/cpp_24/rotate_cw.cpp
+++ b/bitmaps_png/cpp_24/rotate_cw.cpp
@@ -7,49 +7,32 @@
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
- 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x12, 0x08, 0x06, 0x00, 0x00, 0x00, 0x5b, 0xd0, 0xfe,
- 0x10, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e,
- 0xc3, 0x01, 0xc7, 0x6f, 0xa8, 0x64, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f,
- 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63,
- 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x00, 0x0e, 0x74,
- 0x45, 0x58, 0x74, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x00, 0x6d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x5f,
- 0x68, 0x1c, 0x96, 0x58, 0x4c, 0x00, 0x00, 0x00, 0x52, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, 0x70,
- 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x00, 0x43, 0x43, 0x20, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62,
- 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x53, 0x68, 0x61, 0x72, 0x65, 0x41, 0x6c, 0x69, 0x6b, 0x65,
- 0x20, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x76, 0x65,
- 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x73, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6c, 0x69, 0x63, 0x65,
- 0x6e, 0x73, 0x65, 0x73, 0x2f, 0x62, 0x79, 0x2d, 0x73, 0x61, 0x2f, 0x34, 0x2e, 0x30, 0x2f, 0xc3,
- 0x54, 0x62, 0x05, 0x00, 0x00, 0x01, 0xd6, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xa5, 0xd3, 0xbd,
- 0x6b, 0x53, 0x51, 0x18, 0xc7, 0xf1, 0xef, 0x73, 0x4e, 0xae, 0xb4, 0x96, 0x8a, 0xad, 0x2f, 0xc8,
- 0xad, 0x45, 0x31, 0xe0, 0x20, 0x15, 0x04, 0x37, 0x29, 0xd4, 0x06, 0xa3, 0x05, 0x71, 0x14, 0xac,
- 0x83, 0x0e, 0x8a, 0x53, 0x5d, 0x2c, 0xda, 0x29, 0x78, 0x0d, 0x37, 0x66, 0x88, 0xb3, 0x90, 0xa1,
- 0x64, 0x6e, 0xfe, 0x03, 0x11, 0x8c, 0x48, 0x10, 0x1d, 0x75, 0xd1, 0x45, 0xac, 0x68, 0x43, 0x83,
- 0x99, 0x6c, 0x91, 0xd0, 0xf4, 0xde, 0xc7, 0xc1, 0x28, 0x09, 0xb9, 0x97, 0xde, 0xd2, 0x67, 0x3b,
- 0x87, 0xdf, 0xf9, 0x70, 0x9e, 0xf3, 0x22, 0x24, 0x2c, 0xf7, 0x49, 0xfd, 0x39, 0x70, 0x39, 0x30,
- 0x41, 0xb6, 0x99, 0x9b, 0xf9, 0x1a, 0x97, 0x33, 0x49, 0x41, 0x54, 0xc7, 0x80, 0xb4, 0x0d, 0xed,
- 0xcb, 0x49, 0xaf, 0xee, 0xee, 0x09, 0x3c, 0xe9, 0xd5, 0x0e, 0xaa, 0xe1, 0x19, 0xaa, 0x1f, 0x81,
- 0x74, 0x28, 0xbc, 0x98, 0x78, 0xfa, 0xfe, 0x50, 0x54, 0x36, 0x15, 0xab, 0x54, 0xab, 0xd6, 0xfd,
- 0x34, 0x71, 0x0b, 0xf4, 0xfe, 0x16, 0x9c, 0x13, 0x45, 0x10, 0x40, 0x44, 0x55, 0x75, 0x8a, 0xce,
- 0xd6, 0x0a, 0x70, 0x29, 0x11, 0x38, 0xee, 0xbd, 0x3b, 0x30, 0xf4, 0x79, 0x7b, 0x05, 0x74, 0xae,
- 0x3b, 0xf5, 0x1b, 0xf4, 0x1b, 0xc8, 0x30, 0xa1, 0x1e, 0x47, 0x48, 0x01, 0xc3, 0x51, 0x6b, 0x07,
- 0x5b, 0xf6, 0xd4, 0x0c, 0x49, 0xa7, 0x8a, 0x32, 0x07, 0xac, 0x83, 0xde, 0xdc, 0x3f, 0xf6, 0x6b,
- 0xdc, 0x8c, 0xda, 0xf3, 0x2a, 0xac, 0x76, 0xb1, 0x2f, 0x56, 0xe5, 0x7a, 0xa2, 0x96, 0x5d, 0x79,
- 0x7b, 0x1b, 0xe4, 0x0a, 0xd0, 0x0c, 0x4c, 0x70, 0xe1, 0xdf, 0x8d, 0xba, 0x5e, 0xbd, 0x22, 0xc2,
- 0x45, 0x60, 0x2d, 0x30, 0x41, 0xb6, 0x91, 0x9b, 0x69, 0x24, 0x02, 0x41, 0xef, 0x01, 0x28, 0x2c,
- 0xf6, 0x3e, 0x0f, 0x81, 0x94, 0xc2, 0xba, 0x1a, 0x9b, 0x6d, 0xe6, 0xa6, 0x63, 0x9f, 0x8d, 0xf4,
- 0x0e, 0x8e, 0x78, 0xb5, 0x63, 0x8e, 0x38, 0x0d, 0x60, 0x73, 0x9f, 0x76, 0x8e, 0xae, 0x7a, 0xb3,
- 0xed, 0xfe, 0xe3, 0xa8, 0xa5, 0xf0, 0x66, 0xb7, 0xe3, 0xb0, 0x62, 0xb1, 0x78, 0xaa, 0x6f, 0x87,
- 0x8e, 0xb1, 0x69, 0x14, 0x01, 0x3e, 0x0c, 0x60, 0x40, 0x1c, 0x96, 0xcf, 0xe7, 0xcf, 0x1a, 0x63,
- 0x1e, 0x06, 0x41, 0x30, 0xdf, 0x07, 0x0a, 0x36, 0xd4, 0xbf, 0xe2, 0x46, 0xdc, 0x2e, 0x7a, 0xcb,
- 0xf7, 0xfd, 0x69, 0x60, 0x09, 0xb8, 0x4a, 0xb7, 0x5b, 0xdb, 0x1b, 0xd8, 0x78, 0xb5, 0xbc, 0x36,
- 0xfa, 0xe6, 0xfb, 0x8f, 0x50, 0xc3, 0xe5, 0xcd, 0xd7, 0x95, 0x9f, 0x51, 0x88, 0xaa, 0x8a, 0xe3,
- 0x38, 0xd7, 0x32, 0x99, 0x4c, 0x05, 0x78, 0x0c, 0x9c, 0xa6, 0xe7, 0xe8, 0x24, 0x6a, 0x51, 0x54,
- 0x95, 0xcb, 0x65, 0xa7, 0xd5, 0x6a, 0xcd, 0xab, 0xea, 0x12, 0x70, 0x26, 0x2e, 0xb7, 0x23, 0x58,
- 0x2a, 0x95, 0x46, 0xda, 0xed, 0xf6, 0x5d, 0x11, 0x59, 0x04, 0x26, 0x77, 0xca, 0xc7, 0x82, 0x9e,
- 0xe7, 0x1d, 0xb6, 0xd6, 0x2e, 0x88, 0xc8, 0x02, 0x10, 0xf9, 0x6f, 0x13, 0x81, 0xbe, 0xef, 0x9f,
- 0x00, 0x1e, 0x00, 0x77, 0x80, 0x91, 0xa4, 0xd0, 0x00, 0x58, 0x28, 0x14, 0xa6, 0x54, 0xf5, 0x11,
- 0x70, 0x03, 0x70, 0x76, 0x0b, 0xfd, 0x07, 0xa3, 0xae, 0x7e, 0x2f, 0xf5, 0x07, 0xb7, 0xc1, 0xa0,
- 0x06, 0xf7, 0x5c, 0xf7, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
+ 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
+ 0xf8, 0x00, 0x00, 0x01, 0x78, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x18, 0x05, 0xd4,
+ 0x06, 0xd2, 0x0d, 0x47, 0xfa, 0xa5, 0x1a, 0x8f, 0x5c, 0x94, 0x6a, 0x39, 0x28, 0x4b, 0x13, 0x0b,
+ 0x24, 0x9b, 0x0e, 0xaf, 0x06, 0x5a, 0xf0, 0x1f, 0x88, 0x6f, 0x88, 0x37, 0x1c, 0x15, 0xa3, 0xaa,
+ 0xe1, 0x32, 0x7d, 0xc7, 0x38, 0xa5, 0x9b, 0x0e, 0xeb, 0x4b, 0x36, 0x1f, 0xbd, 0x0c, 0xb5, 0xe4,
+ 0xa2, 0x4c, 0xc3, 0x31, 0x21, 0xca, 0x4c, 0x6d, 0xf8, 0xcf, 0x24, 0xd9, 0x78, 0x24, 0x1a, 0x68,
+ 0xd8, 0x31, 0x20, 0xfe, 0x0b, 0x35, 0xf8, 0xbf, 0x54, 0xd3, 0x91, 0x7f, 0x10, 0xf6, 0xe1, 0x1d,
+ 0x64, 0x9b, 0x2d, 0xda, 0xb0, 0x9f, 0x07, 0x68, 0xc8, 0x26, 0xb8, 0xa1, 0x8d, 0x47, 0x7e, 0x02,
+ 0xf1, 0x3d, 0xa0, 0xa1, 0x0f, 0xa5, 0x1a, 0x8e, 0xc2, 0x2c, 0x3b, 0x41, 0xb6, 0xcb, 0x81, 0x9a,
+ 0xb7, 0x40, 0x0d, 0x79, 0x2d, 0xdd, 0x78, 0x24, 0x5e, 0xaa, 0xe1, 0x0c, 0x97, 0x76, 0xc3, 0x55,
+ 0x36, 0xa0, 0xeb, 0xb7, 0x43, 0xc5, 0x1f, 0x49, 0xb6, 0x1c, 0x95, 0x27, 0x2f, 0xb5, 0x34, 0x1d,
+ 0x8e, 0x83, 0x1a, 0xf2, 0x0a, 0x18, 0xce, 0x2a, 0x30, 0x71, 0xa9, 0x86, 0x23, 0xb3, 0xa1, 0xe2,
+ 0xcf, 0x90, 0xc5, 0x49, 0x06, 0xd0, 0x30, 0xff, 0x2f, 0xd9, 0x78, 0x38, 0x16, 0x55, 0xfc, 0xe8,
+ 0x32, 0xa0, 0xf8, 0x4b, 0x60, 0x0a, 0xd2, 0x21, 0xdb, 0x70, 0xb1, 0xd6, 0x13, 0xe2, 0xd0, 0x08,
+ 0xfd, 0xac, 0xd0, 0xb0, 0x9f, 0x03, 0x45, 0xf2, 0xff, 0x7f, 0x46, 0x50, 0x30, 0xe1, 0xd3, 0xdf,
+ 0xd1, 0xd1, 0x21, 0x87, 0xdf, 0xf5, 0x4d, 0x87, 0xac, 0xa1, 0xc1, 0x70, 0x84, 0x14, 0x87, 0xb5,
+ 0xb7, 0xb7, 0xab, 0xb4, 0xb4, 0xb4, 0x4c, 0x04, 0xe2, 0x1f, 0xf8, 0x2d, 0x68, 0x38, 0x66, 0x05,
+ 0x4d, 0x8a, 0xdb, 0x89, 0x31, 0xb8, 0xa9, 0xa9, 0xc9, 0x18, 0x68, 0xe8, 0x22, 0x20, 0xfe, 0x0b,
+ 0xc4, 0xff, 0x41, 0x18, 0xbf, 0x0e, 0x60, 0x30, 0x48, 0x36, 0x1e, 0x4d, 0x25, 0x14, 0xce, 0x40,
+ 0x83, 0x6c, 0x80, 0x78, 0x33, 0xcc, 0x50, 0x64, 0x4c, 0x7e, 0xbe, 0x6b, 0x68, 0x60, 0x02, 0x1a,
+ 0xe0, 0xdb, 0xda, 0xda, 0x7a, 0x06, 0x9b, 0xc1, 0x64, 0x5b, 0x30, 0x69, 0xd2, 0x24, 0x76, 0xa0,
+ 0xa1, 0x71, 0x40, 0xcd, 0xb7, 0xf1, 0x19, 0x4c, 0xb2, 0x05, 0xc0, 0x14, 0xc1, 0xdf, 0xdc, 0xdc,
+ 0x9c, 0x0f, 0xd4, 0xf4, 0x9c, 0x18, 0x83, 0x89, 0xb6, 0x00, 0x18, 0x14, 0x12, 0x40, 0x83, 0x1b,
+ 0x80, 0x8a, 0x3f, 0x92, 0x62, 0x30, 0x41, 0x0b, 0x80, 0x86, 0xaa, 0xc2, 0x92, 0x1a, 0x39, 0x06,
+ 0xe3, 0xb4, 0x00, 0x5b, 0x52, 0xa3, 0xaa, 0x05, 0xa3, 0x00, 0x17, 0x00, 0x00, 0x63, 0xe4, 0x90,
+ 0x15, 0x86, 0x8d, 0x76, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
  0x82,
 };
 
diff --git a/bitmaps_png/cpp_24/unit_inch.cpp b/bitmaps_png/cpp_24/unit_inch.cpp
index a468cc725d..785cc0916b 100644
--- a/bitmaps_png/cpp_24/unit_inch.cpp
+++ b/bitmaps_png/cpp_24/unit_inch.cpp
@@ -12,14 +12,14 @@ static const unsigned char png[] = {
  0xa4, 0x24, 0xe4, 0x52, 0x03, 0x13, 0x09, 0x1a, 0x82, 0x1c, 0x43, 0x1a, 0x48, 0xb3, 0xc1, 0x21,
  0xb4, 0x88, 0x81, 0x21, 0x40, 0x20, 0xa4, 0x3c, 0x52, 0x3c, 0x24, 0x2b, 0xb8, 0x2b, 0xc4, 0x87,
  0x90, 0x86, 0xce, 0x90, 0x2f, 0x0c, 0x0c, 0xc1, 0x4a, 0x21, 0xff, 0x83, 0x1f, 0x85, 0x6c, 0x0b,
- 0x39, 0x13, 0xf2, 0x3f, 0xd4, 0x8f, 0x58, 0x0d, 0x33, 0x19, 0x18, 0x12, 0x38, 0x42, 0xbe, 0x04,
+ 0x39, 0x1d, 0xf2, 0x3f, 0xd4, 0x8f, 0x58, 0x0d, 0x33, 0x19, 0x18, 0x3c, 0xd9, 0x43, 0xbe, 0x04,
  0x4f, 0x20, 0x52, 0x43, 0x48, 0x0a, 0x98, 0xff, 0x30, 0x64, 0x36, 0x91, 0x1a, 0x42, 0x63, 0x69,
  0xa4, 0xa1, 0x21, 0xe4, 0x09, 0x03, 0x43, 0x84, 0x42, 0xc8, 0xbb, 0xe0, 0x30, 0x30, 0xff, 0x52,
  0xc8, 0x44, 0xea, 0xc5, 0x72, 0x03, 0x53, 0xb0, 0x17, 0x36, 0xf1, 0x60, 0x2f, 0x2c, 0x71, 0x1f,
  0xca, 0x1f, 0x9a, 0x1f, 0x72, 0x37, 0xe4, 0x3f, 0x56, 0x67, 0xfe, 0x07, 0xca, 0x94, 0x47, 0x8a,
  0x20, 0x14, 0x1b, 0x07, 0xcf, 0x0c, 0xf9, 0x0a, 0x14, 0xc6, 0x0f, 0x7f, 0x84, 0xac, 0x0a, 0xb5,
- 0x21, 0x4f, 0x03, 0xc9, 0x4e, 0x22, 0xcb, 0xd3, 0x43, 0x1a, 0x00, 0x00, 0x28, 0xc7, 0x7d, 0x5c,
- 0x02, 0x62, 0x5f, 0x8e, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0x21, 0x4f, 0x03, 0xc9, 0x4e, 0x22, 0xcb, 0xd3, 0x43, 0x1a, 0x00, 0x00, 0xde, 0xce, 0x7d, 0x43,
+ 0x2b, 0x9a, 0xd9, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE unit_inch_xpm[1] = {{ png, sizeof( png ), "unit_inch_xpm" }};
diff --git a/bitmaps_png/cpp_24/unit_mil.cpp b/bitmaps_png/cpp_24/unit_mil.cpp
index c852a77897..5fc00cfa3a 100644
--- a/bitmaps_png/cpp_24/unit_mil.cpp
+++ b/bitmaps_png/cpp_24/unit_mil.cpp
@@ -10,8 +10,8 @@ static const unsigned char png[] = {
  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x04, 0x00, 0x00, 0x00, 0x4a, 0x7e, 0xf5,
  0x73, 0x00, 0x00, 0x00, 0xe0, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x18, 0x9a, 0x20,
  0x94, 0x33, 0x4a, 0x90, 0x48, 0xa5, 0x21, 0xe7, 0x43, 0x2a, 0x19, 0x18, 0x82, 0x5b, 0x42, 0x7e,
- 0x10, 0xab, 0xa1, 0x36, 0xd4, 0x15, 0xab, 0x86, 0x40, 0x9d, 0xe0, 0xd4, 0x70, 0xe5, 0x90, 0x9a,
- 0x90, 0xca, 0x70, 0xe5, 0x70, 0xe5, 0xd0, 0xea, 0x90, 0xe6, 0x60, 0x55, 0x90, 0x78, 0x70, 0x5e,
+ 0x10, 0xab, 0xa1, 0x36, 0xd4, 0x15, 0xab, 0x86, 0x40, 0x9d, 0xe0, 0xd4, 0x60, 0xa5, 0x90, 0x9a,
+ 0x90, 0xaa, 0x60, 0xd5, 0x70, 0xe5, 0xd0, 0xea, 0x90, 0xe6, 0x60, 0x55, 0x90, 0x78, 0x70, 0x5e,
  0x88, 0x33, 0x56, 0x0d, 0x21, 0x71, 0x21, 0xbf, 0x82, 0x6f, 0x86, 0xae, 0x09, 0x79, 0x17, 0xf2,
  0x22, 0xf8, 0x0e, 0x90, 0x7e, 0x1d, 0xf2, 0xd4, 0x93, 0x1d, 0x28, 0xfe, 0x26, 0x78, 0x02, 0x2e,
  0x0d, 0xff, 0x43, 0x22, 0x80, 0x74, 0x6e, 0xc8, 0xff, 0xd0, 0x58, 0x20, 0x9d, 0x12, 0xf2, 0x3f,
@@ -22,7 +22,7 @@ static const unsigned char png[] = {
  0x0b, 0x9b, 0x78, 0xb0, 0x57, 0x03, 0x13, 0x66, 0x6a, 0xe1, 0x0f, 0xcd, 0x0f, 0xb9, 0x1b, 0xf2,
  0x1f, 0x6b, 0x6c, 0xff, 0x07, 0xca, 0x94, 0x47, 0x8a, 0x20, 0x14, 0x1b, 0x07, 0xcf, 0x0c, 0xf9,
  0x0a, 0x14, 0xc6, 0x0f, 0x7f, 0x84, 0xac, 0x0a, 0xb5, 0x21, 0x4f, 0x03, 0xc9, 0x4e, 0x22, 0xcb,
- 0xd3, 0x43, 0x1a, 0x00, 0x00, 0x9a, 0xf1, 0xa5, 0xae, 0x8f, 0x94, 0xaf, 0x36, 0x00, 0x00, 0x00,
+ 0xd3, 0x43, 0x1a, 0x00, 0x00, 0x86, 0x8d, 0xa5, 0xa8, 0x22, 0xdc, 0xb4, 0x7b, 0x00, 0x00, 0x00,
  0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
diff --git a/bitmaps_png/cpp_24/unit_mm.cpp b/bitmaps_png/cpp_24/unit_mm.cpp
index 996a53b34c..3b38daf37b 100644
--- a/bitmaps_png/cpp_24/unit_mm.cpp
+++ b/bitmaps_png/cpp_24/unit_mm.cpp
@@ -8,25 +8,25 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x04, 0x00, 0x00, 0x00, 0x4a, 0x7e, 0xf5,
- 0x73, 0x00, 0x00, 0x01, 0x08, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x18, 0x05, 0x44,
- 0x81, 0x60, 0xf3, 0x90, 0x88, 0x50, 0xdd, 0x90, 0x86, 0x90, 0xe2, 0x08, 0x29, 0x10, 0x1d, 0x5a,
- 0x17, 0x2a, 0xcd, 0xc0, 0x10, 0xca, 0x1c, 0x52, 0x1e, 0x24, 0x1f, 0x9a, 0x16, 0xd2, 0x16, 0xec,
- 0x1e, 0xca, 0x19, 0x9c, 0x1a, 0xd2, 0x1d, 0xec, 0x0b, 0xd5, 0x10, 0x52, 0x1e, 0xf2, 0x21, 0xf8,
- 0x4e, 0xe8, 0x9a, 0x90, 0xaf, 0x21, 0xf7, 0x82, 0xef, 0x87, 0xac, 0x0e, 0xf9, 0x1c, 0x72, 0x89,
- 0x81, 0xc1, 0x93, 0x3d, 0xe4, 0x7f, 0xc8, 0x93, 0x90, 0x9d, 0x21, 0x97, 0x42, 0xfe, 0x87, 0x5e,
- 0x0e, 0xdd, 0x1d, 0x72, 0x0e, 0xc8, 0x77, 0x86, 0x69, 0xf8, 0x1f, 0x6a, 0x0f, 0xa4, 0xdb, 0x20,
- 0x42, 0xa1, 0x75, 0x40, 0x3e, 0x3f, 0x48, 0x43, 0xe8, 0x7a, 0x06, 0x86, 0x40, 0x31, 0xa0, 0xe8,
- 0x16, 0xa0, 0x28, 0x7f, 0xc8, 0xdf, 0x90, 0x06, 0x84, 0x06, 0x7e, 0xa0, 0xd3, 0xf2, 0x80, 0xb4,
- 0x28, 0x50, 0x2a, 0x2d, 0xe4, 0x7f, 0x90, 0x24, 0x58, 0x43, 0x1d, 0x58, 0xfe, 0x6f, 0x48, 0x2b,
- 0x98, 0xfe, 0x12, 0xd2, 0x09, 0xd7, 0x90, 0xc0, 0x01, 0xd1, 0x10, 0x20, 0x80, 0xa2, 0xa1, 0x02,
- 0xaa, 0xa1, 0x81, 0x32, 0x0d, 0xa1, 0xf9, 0x21, 0xef, 0x3c, 0xd9, 0xc1, 0x0a, 0xdf, 0x81, 0x9d,
- 0x16, 0x1f, 0xf2, 0x2e, 0x52, 0x1c, 0xa8, 0xe1, 0x5d, 0x48, 0x01, 0x58, 0xe1, 0x1b, 0xa8, 0xc6,
- 0x27, 0x50, 0x3f, 0x90, 0x0d, 0x1a, 0x98, 0x82, 0xbd, 0xb0, 0xc6, 0x93, 0x57, 0x03, 0x13, 0x86,
- 0x60, 0x28, 0x3f, 0xd0, 0x61, 0x77, 0x43, 0xfe, 0x63, 0xd3, 0x00, 0x0c, 0xd6, 0xbb, 0x21, 0xe5,
- 0x91, 0x22, 0x08, 0xc5, 0xc6, 0xc1, 0x33, 0x81, 0x91, 0xf6, 0x9f, 0x00, 0xfc, 0x11, 0xb2, 0x2a,
- 0xd4, 0x86, 0x3c, 0x0d, 0x24, 0x3b, 0x89, 0x2c, 0x4f, 0x0f, 0x69, 0x00, 0x00, 0x23, 0x4a, 0xb4,
- 0xa4, 0xde, 0x2e, 0x87, 0x90, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
- 0x82,
+ 0x73, 0x00, 0x00, 0x01, 0x09, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x18, 0x05, 0x44,
+ 0x81, 0x60, 0xf3, 0x90, 0x88, 0x40, 0x9d, 0x90, 0x86, 0xd0, 0xd2, 0x50, 0xe9, 0x50, 0x5d, 0x20,
+ 0x5d, 0x17, 0x2a, 0xcd, 0xc0, 0x10, 0xca, 0x1c, 0x52, 0x1e, 0x2a, 0x17, 0x9c, 0x1a, 0xdc, 0x1e,
+ 0xe2, 0x19, 0xca, 0x19, 0x9c, 0x1a, 0xd2, 0x1d, 0xec, 0x0b, 0xd5, 0x10, 0x52, 0x1e, 0xf2, 0x21,
+ 0xf8, 0x4e, 0xe8, 0x9a, 0x90, 0xaf, 0x21, 0xf7, 0x82, 0xef, 0x87, 0xac, 0x0e, 0xf9, 0x1c, 0x72,
+ 0x89, 0x81, 0xc1, 0x93, 0x3d, 0xe4, 0x7f, 0xc8, 0x93, 0x90, 0x9d, 0x21, 0x97, 0x42, 0xfe, 0x87,
+ 0x5e, 0x0e, 0xdd, 0x1d, 0x72, 0x0e, 0xc8, 0x77, 0x86, 0x69, 0xf8, 0x1f, 0x6a, 0x0f, 0xa4, 0xdb,
+ 0x20, 0x42, 0xa1, 0x75, 0x40, 0x3e, 0x3f, 0x48, 0x43, 0xe8, 0x7a, 0x06, 0x86, 0x40, 0x31, 0xa0,
+ 0xe8, 0x16, 0xa0, 0x28, 0x7f, 0xc8, 0xdf, 0x90, 0x06, 0x84, 0x06, 0x7e, 0xa0, 0xd3, 0xf2, 0x80,
+ 0xb4, 0x28, 0x50, 0x2a, 0x2d, 0xe4, 0x7f, 0x90, 0x24, 0x58, 0x43, 0x1d, 0x58, 0xfe, 0x6f, 0x48,
+ 0x2b, 0x98, 0xfe, 0x12, 0xd2, 0x09, 0xd7, 0x90, 0xc0, 0x01, 0xd1, 0x10, 0x20, 0x80, 0xa2, 0xa1,
+ 0x02, 0xaa, 0xa1, 0x81, 0x32, 0x0d, 0xa1, 0xf9, 0x21, 0xef, 0x3c, 0xd9, 0xc1, 0x0a, 0xdf, 0x81,
+ 0x9d, 0x16, 0x1f, 0xf2, 0x2e, 0x52, 0x1c, 0xa8, 0xe1, 0x5d, 0x48, 0x01, 0x58, 0xe1, 0x1b, 0xa8,
+ 0xc6, 0x27, 0x50, 0x3f, 0x90, 0x0d, 0x1a, 0x98, 0x82, 0xbd, 0xb0, 0xc6, 0x93, 0x57, 0x03, 0x13,
+ 0x86, 0x60, 0x28, 0x3f, 0xd0, 0x61, 0x77, 0x43, 0xfe, 0x63, 0xd3, 0x00, 0x0c, 0xd6, 0xbb, 0x21,
+ 0xe5, 0x91, 0x22, 0x08, 0xc5, 0xc6, 0xc1, 0x33, 0x81, 0x91, 0xf6, 0x9f, 0x00, 0xfc, 0x11, 0xb2,
+ 0x2a, 0xd4, 0x86, 0x3c, 0x0d, 0x24, 0x3b, 0x89, 0x2c, 0x4f, 0x0f, 0x69, 0x00, 0x00, 0x1c, 0x39,
+ 0xb4, 0xa2, 0x2a, 0x7f, 0x03, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
+ 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE unit_mm_xpm[1] = {{ png, sizeof( png ), "unit_mm_xpm" }};
diff --git a/bitmaps_png/cpp_24/zoom_area.cpp b/bitmaps_png/cpp_24/zoom_area.cpp
index f7dc76b073..2ba032b819 100644
--- a/bitmaps_png/cpp_24/zoom_area.cpp
+++ b/bitmaps_png/cpp_24/zoom_area.cpp
@@ -8,35 +8,35 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x04, 0x00, 0x00, 0x00, 0x4a, 0x7e, 0xf5,
- 0x73, 0x00, 0x00, 0x01, 0xb5, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0xa5, 0x94, 0xcb, 0x2f, 0x03,
- 0x41, 0x1c, 0xc7, 0x37, 0x22, 0x12, 0x1c, 0xb8, 0x49, 0x24, 0x1e, 0xf5, 0x48, 0xdd, 0x3c, 0x12,
- 0x07, 0x4d, 0x9a, 0x88, 0x72, 0xf6, 0x98, 0xef, 0xa4, 0x4e, 0xe2, 0x9f, 0x70, 0xef, 0x85, 0xdd,
- 0x25, 0x21, 0x12, 0x0e, 0x22, 0x48, 0x68, 0xfb, 0x07, 0x38, 0x48, 0x09, 0x41, 0xeb, 0x2c, 0xc2,
- 0xa1, 0x1a, 0x21, 0x41, 0xda, 0x26, 0x9a, 0x46, 0x11, 0x9c, 0x74, 0xfc, 0x76, 0xdb, 0xb2, 0xbb,
- 0x56, 0x93, 0x32, 0x93, 0x6c, 0x7e, 0xb3, 0xf3, 0xfb, 0xcc, 0xef, 0x39, 0x23, 0x49, 0xff, 0x19,
- 0xe8, 0xc7, 0x32, 0xa2, 0x48, 0xe1, 0x1d, 0xa7, 0x58, 0xe3, 0x7d, 0x45, 0x95, 0x59, 0x0b, 0xf6,
- 0x20, 0x68, 0xde, 0x23, 0xc2, 0x4f, 0x10, 0xd7, 0xe5, 0xa3, 0xf1, 0x86, 0x5f, 0xd4, 0xc7, 0x7a,
- 0xf1, 0x84, 0x2c, 0xb6, 0x46, 0x3b, 0xbf, 0x0e, 0xe8, 0x46, 0x90, 0xfe, 0xa4, 0xe0, 0xb6, 0x51,
- 0xe7, 0x4e, 0xa4, 0xf1, 0xc6, 0x46, 0x7c, 0x55, 0xf2, 0xa2, 0xaf, 0xcc, 0x60, 0x95, 0xe1, 0x15,
- 0x19, 0xee, 0xfc, 0x09, 0x84, 0xe8, 0xac, 0x61, 0x49, 0xf2, 0x55, 0x29, 0x42, 0xde, 0xf4, 0x95,
- 0x1b, 0x90, 0x11, 0xda, 0x89, 0x58, 0xd5, 0x07, 0xc8, 0x5b, 0xbf, 0x26, 0x69, 0x00, 0xcd, 0xed,
- 0xf9, 0x4a, 0x03, 0x12, 0xa0, 0x5d, 0x8f, 0x39, 0x37, 0x4b, 0x10, 0xbc, 0xcb, 0x00, 0x08, 0xf9,
- 0x48, 0xa9, 0x31, 0xc4, 0x22, 0xb0, 0x6e, 0x06, 0xa2, 0x48, 0xe4, 0xa4, 0x02, 0xa0, 0x08, 0xf5,
- 0x42, 0xad, 0xff, 0xda, 0x4f, 0xb0, 0x98, 0x19, 0x48, 0x23, 0x6c, 0x05, 0x68, 0x5e, 0xcb, 0x6d,
- 0x79, 0x97, 0x8f, 0xf1, 0x6a, 0x06, 0x9e, 0x0b, 0xc0, 0x5c, 0xb5, 0x01, 0x10, 0x4a, 0x52, 0xd1,
- 0x93, 0x8c, 0xb0, 0x15, 0x38, 0x47, 0xdc, 0x6a, 0x41, 0x0e, 0xab, 0x9e, 0xd9, 0x9e, 0xe9, 0xba,
- 0x9c, 0x4b, 0xb8, 0x34, 0xd7, 0x78, 0x05, 0x22, 0x57, 0x30, 0xdd, 0x42, 0x52, 0xd9, 0xa1, 0xef,
- 0xcb, 0x42, 0xed, 0x77, 0xd0, 0x6c, 0xc3, 0x6c, 0xc1, 0x5d, 0x48, 0x2b, 0x01, 0xb7, 0xb3, 0xed,
- 0xaa, 0x53, 0xc9, 0x92, 0x8d, 0xa9, 0xef, 0xb4, 0xf2, 0x21, 0x6b, 0xd3, 0xed, 0xe7, 0x0b, 0x57,
- 0x21, 0x37, 0x6b, 0x6b, 0x25, 0x44, 0x36, 0x0e, 0xf4, 0x80, 0x27, 0x6d, 0x0a, 0x27, 0x49, 0xde,
- 0x56, 0x3c, 0x68, 0xad, 0x51, 0x58, 0xcf, 0x74, 0xa8, 0x41, 0x95, 0x8a, 0x85, 0x09, 0x26, 0xf0,
- 0x61, 0x29, 0x5b, 0xde, 0x86, 0x0b, 0x19, 0x64, 0x59, 0x20, 0x57, 0x40, 0x6d, 0x8c, 0x76, 0xc2,
- 0x4f, 0xa7, 0x7f, 0x50, 0x04, 0x77, 0xde, 0x56, 0xbb, 0x06, 0x6c, 0xc4, 0xa1, 0xde, 0xd2, 0x71,
- 0x7e, 0x4c, 0x99, 0x4f, 0xe8, 0x72, 0x84, 0x6e, 0xc8, 0x8d, 0xd6, 0xf2, 0xbc, 0xcd, 0xfe, 0x02,
- 0xb9, 0xb0, 0xca, 0xcf, 0xf0, 0x48, 0x3d, 0x7a, 0xc5, 0x36, 0xd8, 0xa0, 0xde, 0xf8, 0x4d, 0x45,
- 0x11, 0xdb, 0xbb, 0x52, 0x3a, 0x42, 0xee, 0x96, 0x8c, 0x38, 0x70, 0x4b, 0x48, 0xb4, 0x84, 0x07,
- 0x82, 0x3b, 0x58, 0x0c, 0xbb, 0x7f, 0x78, 0x59, 0x3e, 0x01, 0xed, 0xf4, 0xef, 0x4b, 0x8a, 0x54,
- 0x57, 0x25, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0x73, 0x00, 0x00, 0x01, 0xb2, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0xa5, 0x94, 0xcb, 0x2f, 0x03,
+ 0x41, 0x1c, 0xc7, 0x37, 0x22, 0x12, 0x1c, 0xb8, 0x49, 0x24, 0x1e, 0xf5, 0x48, 0xdd, 0x8a, 0xc4,
+ 0x41, 0x93, 0x26, 0xe2, 0x71, 0xa6, 0xe6, 0x3b, 0xe1, 0x24, 0xfe, 0x09, 0xf7, 0x1e, 0x25, 0x12,
+ 0x9d, 0x55, 0x0e, 0x22, 0x34, 0xa1, 0xfc, 0x01, 0x0e, 0x82, 0x10, 0xd5, 0x3a, 0x8b, 0x70, 0x28,
+ 0x11, 0x92, 0x92, 0x56, 0x42, 0x1a, 0xaf, 0xe0, 0xa4, 0xe3, 0xb7, 0xbb, 0xad, 0xee, 0x6e, 0x97,
+ 0xa4, 0xcc, 0x24, 0x9b, 0xdf, 0xec, 0xfc, 0x3e, 0xf3, 0x7b, 0xce, 0x28, 0xca, 0x7f, 0x06, 0xfa,
+ 0xb0, 0x80, 0x04, 0x1e, 0xf0, 0x81, 0x63, 0x2c, 0xf3, 0xde, 0x5f, 0x95, 0x59, 0x0b, 0x76, 0x21,
+ 0x69, 0xde, 0x22, 0xce, 0x8f, 0x90, 0xd2, 0xe5, 0xe8, 0x78, 0xc3, 0x0f, 0xea, 0xa3, 0x3d, 0x78,
+ 0x46, 0x16, 0x6b, 0x7e, 0xcf, 0xf7, 0x01, 0x5d, 0xd8, 0xa0, 0x3f, 0x0f, 0xf0, 0x39, 0xa8, 0x73,
+ 0x37, 0x32, 0x78, 0x67, 0x23, 0x8b, 0x55, 0x42, 0x0d, 0x94, 0x99, 0xac, 0x32, 0xbc, 0xe1, 0x89,
+ 0xbb, 0x8b, 0x81, 0x6d, 0x3a, 0x6b, 0x58, 0x51, 0x08, 0x90, 0xc1, 0xd5, 0x40, 0xb9, 0x09, 0x19,
+ 0xa1, 0x9d, 0xb8, 0x5d, 0xbd, 0x9f, 0xbc, 0x8d, 0x68, 0x92, 0x06, 0x08, 0xa9, 0x6e, 0xce, 0x56,
+ 0x9a, 0x90, 0x75, 0xda, 0x1d, 0xb0, 0xe6, 0x66, 0x1e, 0x92, 0x77, 0x16, 0x00, 0xb2, 0x12, 0x9d,
+ 0xae, 0x31, 0xc5, 0x22, 0xb1, 0x62, 0x05, 0x12, 0x48, 0x1b, 0x52, 0x1e, 0xa0, 0x79, 0x16, 0xaa,
+ 0xff, 0xde, 0x4f, 0xb3, 0x0b, 0x2b, 0x90, 0x41, 0xac, 0x08, 0x90, 0xe2, 0x6a, 0xb6, 0x2d, 0xe7,
+ 0xf2, 0x21, 0xde, 0xac, 0xc0, 0x4b, 0x1e, 0x98, 0xa9, 0x36, 0x01, 0x52, 0xdc, 0xcd, 0xe9, 0x49,
+ 0x46, 0xcc, 0x0e, 0x9c, 0x22, 0x65, 0xb7, 0xa0, 0xc6, 0xd4, 0x81, 0x60, 0xb7, 0xa8, 0x33, 0x5c,
+ 0xc2, 0xb9, 0xb5, 0xc6, 0x8b, 0x90, 0x46, 0xc1, 0x74, 0x0b, 0x77, 0x62, 0x8b, 0xbe, 0xaf, 0xc1,
+ 0xda, 0x42, 0xd0, 0x2c, 0x6c, 0xb5, 0xe0, 0xcb, 0xa7, 0x95, 0x80, 0xa4, 0xda, 0x2e, 0xdc, 0x22,
+ 0x4b, 0xc8, 0x54, 0x21, 0xad, 0x7c, 0xc8, 0xde, 0x74, 0x7b, 0x46, 0xe1, 0x02, 0x15, 0xc1, 0x66,
+ 0x6d, 0x2d, 0xb6, 0x09, 0xd8, 0xd7, 0x03, 0x9e, 0x74, 0x28, 0x9c, 0xa2, 0x8c, 0xb5, 0xe2, 0x5e,
+ 0x6b, 0x8d, 0xfc, 0x3a, 0xd4, 0x21, 0x36, 0x54, 0x2a, 0x16, 0x26, 0x98, 0xc4, 0xa7, 0xad, 0x6c,
+ 0x39, 0x1b, 0x5e, 0x3c, 0x21, 0xcb, 0xd6, 0x8d, 0x02, 0x6a, 0xc3, 0xef, 0x41, 0x84, 0x4e, 0xff,
+ 0xa4, 0x08, 0x6e, 0xc6, 0x5a, 0x9d, 0x1a, 0xb0, 0x11, 0x07, 0x7a, 0x4b, 0xa7, 0xf8, 0x21, 0x65,
+ 0x3e, 0xad, 0xcb, 0x71, 0xba, 0x21, 0xd7, 0x5a, 0xcb, 0xf3, 0x36, 0xe7, 0x0b, 0xe4, 0xc5, 0x12,
+ 0x3f, 0xc1, 0x23, 0xf5, 0xe8, 0x25, 0x0b, 0xb3, 0x41, 0xbd, 0xf1, 0x9b, 0x7e, 0x45, 0x1c, 0xef,
+ 0x4a, 0xe9, 0x08, 0xb9, 0x5b, 0x32, 0xe2, 0x42, 0x92, 0x90, 0x44, 0x09, 0x0f, 0x04, 0x77, 0xb1,
+ 0x0b, 0xec, 0xfc, 0xe1, 0x65, 0xf9, 0x02, 0xc5, 0x67, 0xf1, 0xcb, 0xba, 0xe8, 0x83, 0x78, 0x00,
+ 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE zoom_area_xpm[1] = {{ png, sizeof( png ), "zoom_area_xpm" }};
diff --git a/bitmaps_png/sources/about.svg b/bitmaps_png/sources/light/about.svg
similarity index 100%
rename from bitmaps_png/sources/about.svg
rename to bitmaps_png/sources/light/about.svg
diff --git a/bitmaps_png/sources/add_aligned_dimension.svg b/bitmaps_png/sources/light/add_aligned_dimension.svg
similarity index 100%
rename from bitmaps_png/sources/add_aligned_dimension.svg
rename to bitmaps_png/sources/light/add_aligned_dimension.svg
diff --git a/bitmaps_png/sources/add_arc.svg b/bitmaps_png/sources/light/add_arc.svg
similarity index 100%
rename from bitmaps_png/sources/add_arc.svg
rename to bitmaps_png/sources/light/add_arc.svg
diff --git a/bitmaps_png/sources/add_board.svg b/bitmaps_png/sources/light/add_board.svg
similarity index 100%
rename from bitmaps_png/sources/add_board.svg
rename to bitmaps_png/sources/light/add_board.svg
diff --git a/bitmaps_png/sources/add_bus.svg b/bitmaps_png/sources/light/add_bus.svg
similarity index 100%
rename from bitmaps_png/sources/add_bus.svg
rename to bitmaps_png/sources/light/add_bus.svg
diff --git a/bitmaps_png/sources/add_bus2bus.svg b/bitmaps_png/sources/light/add_bus2bus.svg
similarity index 100%
rename from bitmaps_png/sources/add_bus2bus.svg
rename to bitmaps_png/sources/light/add_bus2bus.svg
diff --git a/bitmaps_png/sources/add_center_dimension.svg b/bitmaps_png/sources/light/add_center_dimension.svg
similarity index 100%
rename from bitmaps_png/sources/add_center_dimension.svg
rename to bitmaps_png/sources/light/add_center_dimension.svg
diff --git a/bitmaps_png/sources/add_circle.svg b/bitmaps_png/sources/light/add_circle.svg
similarity index 100%
rename from bitmaps_png/sources/add_circle.svg
rename to bitmaps_png/sources/light/add_circle.svg
diff --git a/bitmaps_png/sources/add_component.svg b/bitmaps_png/sources/light/add_component.svg
similarity index 100%
rename from bitmaps_png/sources/add_component.svg
rename to bitmaps_png/sources/light/add_component.svg
diff --git a/bitmaps_png/sources/add_corner.svg b/bitmaps_png/sources/light/add_corner.svg
similarity index 100%
rename from bitmaps_png/sources/add_corner.svg
rename to bitmaps_png/sources/light/add_corner.svg
diff --git a/bitmaps_png/sources/add_dashed_line.svg b/bitmaps_png/sources/light/add_dashed_line.svg
similarity index 100%
rename from bitmaps_png/sources/add_dashed_line.svg
rename to bitmaps_png/sources/light/add_dashed_line.svg
diff --git a/bitmaps_png/sources/add_document.svg b/bitmaps_png/sources/light/add_document.svg
similarity index 100%
rename from bitmaps_png/sources/add_document.svg
rename to bitmaps_png/sources/light/add_document.svg
diff --git a/bitmaps_png/sources/add_glabel.svg b/bitmaps_png/sources/light/add_glabel.svg
similarity index 100%
rename from bitmaps_png/sources/add_glabel.svg
rename to bitmaps_png/sources/light/add_glabel.svg
diff --git a/bitmaps_png/sources/add_graphical_polygon.svg b/bitmaps_png/sources/light/add_graphical_polygon.svg
similarity index 100%
rename from bitmaps_png/sources/add_graphical_polygon.svg
rename to bitmaps_png/sources/light/add_graphical_polygon.svg
diff --git a/bitmaps_png/sources/add_graphical_segments.svg b/bitmaps_png/sources/light/add_graphical_segments.svg
similarity index 100%
rename from bitmaps_png/sources/add_graphical_segments.svg
rename to bitmaps_png/sources/light/add_graphical_segments.svg
diff --git a/bitmaps_png/sources/add_hierar_pin.svg b/bitmaps_png/sources/light/add_hierar_pin.svg
similarity index 100%
rename from bitmaps_png/sources/add_hierar_pin.svg
rename to bitmaps_png/sources/light/add_hierar_pin.svg
diff --git a/bitmaps_png/sources/add_hierarchical_label.svg b/bitmaps_png/sources/light/add_hierarchical_label.svg
similarity index 100%
rename from bitmaps_png/sources/add_hierarchical_label.svg
rename to bitmaps_png/sources/light/add_hierarchical_label.svg
diff --git a/bitmaps_png/sources/add_hierarchical_subsheet.svg b/bitmaps_png/sources/light/add_hierarchical_subsheet.svg
similarity index 100%
rename from bitmaps_png/sources/add_hierarchical_subsheet.svg
rename to bitmaps_png/sources/light/add_hierarchical_subsheet.svg
diff --git a/bitmaps_png/sources/add_junction.svg b/bitmaps_png/sources/light/add_junction.svg
similarity index 100%
rename from bitmaps_png/sources/add_junction.svg
rename to bitmaps_png/sources/light/add_junction.svg
diff --git a/bitmaps_png/sources/add_keepout_area.svg b/bitmaps_png/sources/light/add_keepout_area.svg
similarity index 100%
rename from bitmaps_png/sources/add_keepout_area.svg
rename to bitmaps_png/sources/light/add_keepout_area.svg
diff --git a/bitmaps_png/sources/add_label.svg b/bitmaps_png/sources/light/add_label.svg
similarity index 100%
rename from bitmaps_png/sources/add_label.svg
rename to bitmaps_png/sources/light/add_label.svg
diff --git a/bitmaps_png/sources/add_leader.svg b/bitmaps_png/sources/light/add_leader.svg
similarity index 100%
rename from bitmaps_png/sources/add_leader.svg
rename to bitmaps_png/sources/light/add_leader.svg
diff --git a/bitmaps_png/sources/add_library.svg b/bitmaps_png/sources/light/add_library.svg
similarity index 100%
rename from bitmaps_png/sources/add_library.svg
rename to bitmaps_png/sources/light/add_library.svg
diff --git a/bitmaps_png/sources/add_line.svg b/bitmaps_png/sources/light/add_line.svg
similarity index 100%
rename from bitmaps_png/sources/add_line.svg
rename to bitmaps_png/sources/light/add_line.svg
diff --git a/bitmaps_png/sources/add_line2bus.svg b/bitmaps_png/sources/light/add_line2bus.svg
similarity index 100%
rename from bitmaps_png/sources/add_line2bus.svg
rename to bitmaps_png/sources/light/add_line2bus.svg
diff --git a/bitmaps_png/sources/add_line_label.svg b/bitmaps_png/sources/light/add_line_label.svg
similarity index 100%
rename from bitmaps_png/sources/add_line_label.svg
rename to bitmaps_png/sources/light/add_line_label.svg
diff --git a/bitmaps_png/sources/add_orthogonal_dimension.svg b/bitmaps_png/sources/light/add_orthogonal_dimension.svg
similarity index 100%
rename from bitmaps_png/sources/add_orthogonal_dimension.svg
rename to bitmaps_png/sources/light/add_orthogonal_dimension.svg
diff --git a/bitmaps_png/sources/add_pcb_target.svg b/bitmaps_png/sources/light/add_pcb_target.svg
similarity index 100%
rename from bitmaps_png/sources/add_pcb_target.svg
rename to bitmaps_png/sources/light/add_pcb_target.svg
diff --git a/bitmaps_png/sources/add_power.svg b/bitmaps_png/sources/light/add_power.svg
similarity index 100%
rename from bitmaps_png/sources/add_power.svg
rename to bitmaps_png/sources/light/add_power.svg
diff --git a/bitmaps_png/sources/add_rectangle.svg b/bitmaps_png/sources/light/add_rectangle.svg
similarity index 100%
rename from bitmaps_png/sources/add_rectangle.svg
rename to bitmaps_png/sources/light/add_rectangle.svg
diff --git a/bitmaps_png/sources/add_symbol_to_schematic.svg b/bitmaps_png/sources/light/add_symbol_to_schematic.svg
similarity index 100%
rename from bitmaps_png/sources/add_symbol_to_schematic.svg
rename to bitmaps_png/sources/light/add_symbol_to_schematic.svg
diff --git a/bitmaps_png/sources/add_tracks.svg b/bitmaps_png/sources/light/add_tracks.svg
similarity index 100%
rename from bitmaps_png/sources/add_tracks.svg
rename to bitmaps_png/sources/light/add_tracks.svg
diff --git a/bitmaps_png/sources/add_via.svg b/bitmaps_png/sources/light/add_via.svg
similarity index 100%
rename from bitmaps_png/sources/add_via.svg
rename to bitmaps_png/sources/light/add_via.svg
diff --git a/bitmaps_png/sources/add_zone.svg b/bitmaps_png/sources/light/add_zone.svg
similarity index 100%
rename from bitmaps_png/sources/add_zone.svg
rename to bitmaps_png/sources/light/add_zone.svg
diff --git a/bitmaps_png/sources/add_zone_cutout.svg b/bitmaps_png/sources/light/add_zone_cutout.svg
similarity index 100%
rename from bitmaps_png/sources/add_zone_cutout.svg
rename to bitmaps_png/sources/light/add_zone_cutout.svg
diff --git a/bitmaps_png/sources/align_items.svg b/bitmaps_png/sources/light/align_items.svg
similarity index 100%
rename from bitmaps_png/sources/align_items.svg
rename to bitmaps_png/sources/light/align_items.svg
diff --git a/bitmaps_png/sources/align_items_bottom.svg b/bitmaps_png/sources/light/align_items_bottom.svg
similarity index 100%
rename from bitmaps_png/sources/align_items_bottom.svg
rename to bitmaps_png/sources/light/align_items_bottom.svg
diff --git a/bitmaps_png/sources/align_items_center.svg b/bitmaps_png/sources/light/align_items_center.svg
similarity index 100%
rename from bitmaps_png/sources/align_items_center.svg
rename to bitmaps_png/sources/light/align_items_center.svg
diff --git a/bitmaps_png/sources/align_items_left.svg b/bitmaps_png/sources/light/align_items_left.svg
similarity index 100%
rename from bitmaps_png/sources/align_items_left.svg
rename to bitmaps_png/sources/light/align_items_left.svg
diff --git a/bitmaps_png/sources/align_items_middle.svg b/bitmaps_png/sources/light/align_items_middle.svg
similarity index 100%
rename from bitmaps_png/sources/align_items_middle.svg
rename to bitmaps_png/sources/light/align_items_middle.svg
diff --git a/bitmaps_png/sources/align_items_right.svg b/bitmaps_png/sources/light/align_items_right.svg
similarity index 100%
rename from bitmaps_png/sources/align_items_right.svg
rename to bitmaps_png/sources/light/align_items_right.svg
diff --git a/bitmaps_png/sources/align_items_top.svg b/bitmaps_png/sources/light/align_items_top.svg
similarity index 100%
rename from bitmaps_png/sources/align_items_top.svg
rename to bitmaps_png/sources/light/align_items_top.svg
diff --git a/bitmaps_png/sources/anchor.svg b/bitmaps_png/sources/light/anchor.svg
similarity index 100%
rename from bitmaps_png/sources/anchor.svg
rename to bitmaps_png/sources/light/anchor.svg
diff --git a/bitmaps_png/sources/annotate.svg b/bitmaps_png/sources/light/annotate.svg
similarity index 100%
rename from bitmaps_png/sources/annotate.svg
rename to bitmaps_png/sources/light/annotate.svg
diff --git a/bitmaps_png/sources/annotate_down_right.svg b/bitmaps_png/sources/light/annotate_down_right.svg
similarity index 100%
rename from bitmaps_png/sources/annotate_down_right.svg
rename to bitmaps_png/sources/light/annotate_down_right.svg
diff --git a/bitmaps_png/sources/annotate_right_down.svg b/bitmaps_png/sources/light/annotate_right_down.svg
similarity index 100%
rename from bitmaps_png/sources/annotate_right_down.svg
rename to bitmaps_png/sources/light/annotate_right_down.svg
diff --git a/bitmaps_png/sources/apply_pad_settings.svg b/bitmaps_png/sources/light/apply_pad_settings.svg
similarity index 100%
rename from bitmaps_png/sources/apply_pad_settings.svg
rename to bitmaps_png/sources/light/apply_pad_settings.svg
diff --git a/bitmaps_png/sources/array.svg b/bitmaps_png/sources/light/array.svg
similarity index 100%
rename from bitmaps_png/sources/array.svg
rename to bitmaps_png/sources/light/array.svg
diff --git a/bitmaps_png/sources/auto_associate.svg b/bitmaps_png/sources/light/auto_associate.svg
similarity index 100%
rename from bitmaps_png/sources/auto_associate.svg
rename to bitmaps_png/sources/light/auto_associate.svg
diff --git a/bitmaps_png/sources/auto_track_width.svg b/bitmaps_png/sources/light/auto_track_width.svg
similarity index 100%
rename from bitmaps_png/sources/auto_track_width.svg
rename to bitmaps_png/sources/light/auto_track_width.svg
diff --git a/bitmaps_png/sources/autoplace_fields.svg b/bitmaps_png/sources/light/autoplace_fields.svg
similarity index 100%
rename from bitmaps_png/sources/autoplace_fields.svg
rename to bitmaps_png/sources/light/autoplace_fields.svg
diff --git a/bitmaps_png/sources/axis3d.svg b/bitmaps_png/sources/light/axis3d.svg
similarity index 100%
rename from bitmaps_png/sources/axis3d.svg
rename to bitmaps_png/sources/light/axis3d.svg
diff --git a/bitmaps_png/sources/axis3d_back.svg b/bitmaps_png/sources/light/axis3d_back.svg
similarity index 100%
rename from bitmaps_png/sources/axis3d_back.svg
rename to bitmaps_png/sources/light/axis3d_back.svg
diff --git a/bitmaps_png/sources/axis3d_bottom.svg b/bitmaps_png/sources/light/axis3d_bottom.svg
similarity index 100%
rename from bitmaps_png/sources/axis3d_bottom.svg
rename to bitmaps_png/sources/light/axis3d_bottom.svg
diff --git a/bitmaps_png/sources/axis3d_front.svg b/bitmaps_png/sources/light/axis3d_front.svg
similarity index 100%
rename from bitmaps_png/sources/axis3d_front.svg
rename to bitmaps_png/sources/light/axis3d_front.svg
diff --git a/bitmaps_png/sources/axis3d_left.svg b/bitmaps_png/sources/light/axis3d_left.svg
similarity index 100%
rename from bitmaps_png/sources/axis3d_left.svg
rename to bitmaps_png/sources/light/axis3d_left.svg
diff --git a/bitmaps_png/sources/axis3d_right.svg b/bitmaps_png/sources/light/axis3d_right.svg
similarity index 100%
rename from bitmaps_png/sources/axis3d_right.svg
rename to bitmaps_png/sources/light/axis3d_right.svg
diff --git a/bitmaps_png/sources/axis3d_top.svg b/bitmaps_png/sources/light/axis3d_top.svg
similarity index 100%
rename from bitmaps_png/sources/axis3d_top.svg
rename to bitmaps_png/sources/light/axis3d_top.svg
diff --git a/bitmaps_png/sources/badges.svg b/bitmaps_png/sources/light/badges.svg
similarity index 100%
rename from bitmaps_png/sources/badges.svg
rename to bitmaps_png/sources/light/badges.svg
diff --git a/bitmaps_png/sources/break_line.svg b/bitmaps_png/sources/light/break_line.svg
similarity index 100%
rename from bitmaps_png/sources/break_line.svg
rename to bitmaps_png/sources/light/break_line.svg
diff --git a/bitmaps_png/sources/bug.svg b/bitmaps_png/sources/light/bug.svg
similarity index 100%
rename from bitmaps_png/sources/bug.svg
rename to bitmaps_png/sources/light/bug.svg
diff --git a/bitmaps_png/sources/bus_definition_tool.svg b/bitmaps_png/sources/light/bus_definition_tool.svg
similarity index 100%
rename from bitmaps_png/sources/bus_definition_tool.svg
rename to bitmaps_png/sources/light/bus_definition_tool.svg
diff --git a/bitmaps_png/sources/cancel.svg b/bitmaps_png/sources/light/cancel.svg
similarity index 100%
rename from bitmaps_png/sources/cancel.svg
rename to bitmaps_png/sources/light/cancel.svg
diff --git a/bitmaps_png/sources/change_entry_orient.svg b/bitmaps_png/sources/light/change_entry_orient.svg
similarity index 100%
rename from bitmaps_png/sources/change_entry_orient.svg
rename to bitmaps_png/sources/light/change_entry_orient.svg
diff --git a/bitmaps_png/sources/checked_ok.svg b/bitmaps_png/sources/light/checked_ok.svg
similarity index 100%
rename from bitmaps_png/sources/checked_ok.svg
rename to bitmaps_png/sources/light/checked_ok.svg
diff --git a/bitmaps_png/sources/color_materials.svg b/bitmaps_png/sources/light/color_materials.svg
similarity index 100%
rename from bitmaps_png/sources/color_materials.svg
rename to bitmaps_png/sources/light/color_materials.svg
diff --git a/bitmaps_png/sources/component_select_unit.svg b/bitmaps_png/sources/light/component_select_unit.svg
similarity index 100%
rename from bitmaps_png/sources/component_select_unit.svg
rename to bitmaps_png/sources/light/component_select_unit.svg
diff --git a/bitmaps_png/sources/config.svg b/bitmaps_png/sources/light/config.svg
similarity index 100%
rename from bitmaps_png/sources/config.svg
rename to bitmaps_png/sources/light/config.svg
diff --git a/bitmaps_png/sources/contrast_mode.svg b/bitmaps_png/sources/light/contrast_mode.svg
similarity index 100%
rename from bitmaps_png/sources/contrast_mode.svg
rename to bitmaps_png/sources/light/contrast_mode.svg
diff --git a/bitmaps_png/sources/convert.svg b/bitmaps_png/sources/light/convert.svg
similarity index 100%
rename from bitmaps_png/sources/convert.svg
rename to bitmaps_png/sources/light/convert.svg
diff --git a/bitmaps_png/sources/copy.svg b/bitmaps_png/sources/light/copy.svg
similarity index 100%
rename from bitmaps_png/sources/copy.svg
rename to bitmaps_png/sources/light/copy.svg
diff --git a/bitmaps_png/sources/copy_pad_settings.svg b/bitmaps_png/sources/light/copy_pad_settings.svg
similarity index 100%
rename from bitmaps_png/sources/copy_pad_settings.svg
rename to bitmaps_png/sources/light/copy_pad_settings.svg
diff --git a/bitmaps_png/sources/cursor.svg b/bitmaps_png/sources/light/cursor.svg
similarity index 100%
rename from bitmaps_png/sources/cursor.svg
rename to bitmaps_png/sources/light/cursor.svg
diff --git a/bitmaps_png/sources/cursor_shape.svg b/bitmaps_png/sources/light/cursor_shape.svg
similarity index 100%
rename from bitmaps_png/sources/cursor_shape.svg
rename to bitmaps_png/sources/light/cursor_shape.svg
diff --git a/bitmaps_png/sources/curved_ratsnest.svg b/bitmaps_png/sources/light/curved_ratsnest.svg
similarity index 100%
rename from bitmaps_png/sources/curved_ratsnest.svg
rename to bitmaps_png/sources/light/curved_ratsnest.svg
diff --git a/bitmaps_png/sources/custom_pad_to_primitives.svg b/bitmaps_png/sources/light/custom_pad_to_primitives.svg
similarity index 100%
rename from bitmaps_png/sources/custom_pad_to_primitives.svg
rename to bitmaps_png/sources/light/custom_pad_to_primitives.svg
diff --git a/bitmaps_png/sources/cut.svg b/bitmaps_png/sources/light/cut.svg
similarity index 100%
rename from bitmaps_png/sources/cut.svg
rename to bitmaps_png/sources/light/cut.svg
diff --git a/bitmaps_png/sources/datasheet.svg b/bitmaps_png/sources/light/datasheet.svg
similarity index 100%
rename from bitmaps_png/sources/datasheet.svg
rename to bitmaps_png/sources/light/datasheet.svg
diff --git a/bitmaps_png/sources/delete.svg b/bitmaps_png/sources/light/delete.svg
similarity index 100%
rename from bitmaps_png/sources/delete.svg
rename to bitmaps_png/sources/light/delete.svg
diff --git a/bitmaps_png/sources/delete_association.svg b/bitmaps_png/sources/light/delete_association.svg
similarity index 100%
rename from bitmaps_png/sources/delete_association.svg
rename to bitmaps_png/sources/light/delete_association.svg
diff --git a/bitmaps_png/sources/delete_gerber.svg b/bitmaps_png/sources/light/delete_gerber.svg
similarity index 100%
rename from bitmaps_png/sources/delete_gerber.svg
rename to bitmaps_png/sources/light/delete_gerber.svg
diff --git a/bitmaps_png/sources/delete_sheet.svg b/bitmaps_png/sources/light/delete_sheet.svg
similarity index 100%
rename from bitmaps_png/sources/delete_sheet.svg
rename to bitmaps_png/sources/light/delete_sheet.svg
diff --git a/bitmaps_png/sources/dialog_warning.svg b/bitmaps_png/sources/light/dialog_warning.svg
similarity index 100%
rename from bitmaps_png/sources/dialog_warning.svg
rename to bitmaps_png/sources/light/dialog_warning.svg
diff --git a/bitmaps_png/sources/directory.svg b/bitmaps_png/sources/light/directory.svg
similarity index 100%
rename from bitmaps_png/sources/directory.svg
rename to bitmaps_png/sources/light/directory.svg
diff --git a/bitmaps_png/sources/directory_browser.svg b/bitmaps_png/sources/light/directory_browser.svg
similarity index 100%
rename from bitmaps_png/sources/directory_browser.svg
rename to bitmaps_png/sources/light/directory_browser.svg
diff --git a/bitmaps_png/sources/directory_open.svg b/bitmaps_png/sources/light/directory_open.svg
similarity index 100%
rename from bitmaps_png/sources/directory_open.svg
rename to bitmaps_png/sources/light/directory_open.svg
diff --git a/bitmaps_png/sources/distribute_horizontal.svg b/bitmaps_png/sources/light/distribute_horizontal.svg
similarity index 100%
rename from bitmaps_png/sources/distribute_horizontal.svg
rename to bitmaps_png/sources/light/distribute_horizontal.svg
diff --git a/bitmaps_png/sources/distribute_vertical.svg b/bitmaps_png/sources/light/distribute_vertical.svg
similarity index 100%
rename from bitmaps_png/sources/distribute_vertical.svg
rename to bitmaps_png/sources/light/distribute_vertical.svg
diff --git a/bitmaps_png/sources/down.svg b/bitmaps_png/sources/light/down.svg
similarity index 100%
rename from bitmaps_png/sources/down.svg
rename to bitmaps_png/sources/light/down.svg
diff --git a/bitmaps_png/sources/drag.svg b/bitmaps_png/sources/light/drag.svg
similarity index 100%
rename from bitmaps_png/sources/drag.svg
rename to bitmaps_png/sources/light/drag.svg
diff --git a/bitmaps_png/sources/drag_segment_withslope.svg b/bitmaps_png/sources/light/drag_segment_withslope.svg
similarity index 100%
rename from bitmaps_png/sources/drag_segment_withslope.svg
rename to bitmaps_png/sources/light/drag_segment_withslope.svg
diff --git a/bitmaps_png/sources/drc.svg b/bitmaps_png/sources/light/drc.svg
similarity index 100%
rename from bitmaps_png/sources/drc.svg
rename to bitmaps_png/sources/light/drc.svg
diff --git a/bitmaps_png/sources/duplicate.svg b/bitmaps_png/sources/light/duplicate.svg
similarity index 100%
rename from bitmaps_png/sources/duplicate.svg
rename to bitmaps_png/sources/light/duplicate.svg
diff --git a/bitmaps_png/sources/edge_to_copper_clearance.svg b/bitmaps_png/sources/light/edge_to_copper_clearance.svg
similarity index 100%
rename from bitmaps_png/sources/edge_to_copper_clearance.svg
rename to bitmaps_png/sources/light/edge_to_copper_clearance.svg
diff --git a/bitmaps_png/sources/edit.svg b/bitmaps_png/sources/light/edit.svg
similarity index 100%
rename from bitmaps_png/sources/edit.svg
rename to bitmaps_png/sources/light/edit.svg
diff --git a/bitmaps_png/sources/edit_cmp_symb_links.svg b/bitmaps_png/sources/light/edit_cmp_symb_links.svg
similarity index 100%
rename from bitmaps_png/sources/edit_cmp_symb_links.svg
rename to bitmaps_png/sources/light/edit_cmp_symb_links.svg
diff --git a/bitmaps_png/sources/edit_comp_footprint.svg b/bitmaps_png/sources/light/edit_comp_footprint.svg
similarity index 100%
rename from bitmaps_png/sources/edit_comp_footprint.svg
rename to bitmaps_png/sources/light/edit_comp_footprint.svg
diff --git a/bitmaps_png/sources/edit_comp_ref.svg b/bitmaps_png/sources/light/edit_comp_ref.svg
similarity index 100%
rename from bitmaps_png/sources/edit_comp_ref.svg
rename to bitmaps_png/sources/light/edit_comp_ref.svg
diff --git a/bitmaps_png/sources/edit_comp_value.svg b/bitmaps_png/sources/light/edit_comp_value.svg
similarity index 100%
rename from bitmaps_png/sources/edit_comp_value.svg
rename to bitmaps_png/sources/light/edit_comp_value.svg
diff --git a/bitmaps_png/sources/editor.svg b/bitmaps_png/sources/light/editor.svg
similarity index 100%
rename from bitmaps_png/sources/editor.svg
rename to bitmaps_png/sources/light/editor.svg
diff --git a/bitmaps_png/sources/enter_sheet.svg b/bitmaps_png/sources/light/enter_sheet.svg
similarity index 100%
rename from bitmaps_png/sources/enter_sheet.svg
rename to bitmaps_png/sources/light/enter_sheet.svg
diff --git a/bitmaps_png/sources/erc.svg b/bitmaps_png/sources/light/erc.svg
similarity index 100%
rename from bitmaps_png/sources/erc.svg
rename to bitmaps_png/sources/light/erc.svg
diff --git a/bitmaps_png/sources/erc_green.svg b/bitmaps_png/sources/light/erc_green.svg
similarity index 100%
rename from bitmaps_png/sources/erc_green.svg
rename to bitmaps_png/sources/light/erc_green.svg
diff --git a/bitmaps_png/sources/ercerr.svg b/bitmaps_png/sources/light/ercerr.svg
similarity index 100%
rename from bitmaps_png/sources/ercerr.svg
rename to bitmaps_png/sources/light/ercerr.svg
diff --git a/bitmaps_png/sources/ercwarn.svg b/bitmaps_png/sources/light/ercwarn.svg
similarity index 100%
rename from bitmaps_png/sources/ercwarn.svg
rename to bitmaps_png/sources/light/ercwarn.svg
diff --git a/bitmaps_png/sources/exchange.svg b/bitmaps_png/sources/light/exchange.svg
similarity index 100%
rename from bitmaps_png/sources/exchange.svg
rename to bitmaps_png/sources/light/exchange.svg
diff --git a/bitmaps_png/sources/exit.svg b/bitmaps_png/sources/light/exit.svg
similarity index 100%
rename from bitmaps_png/sources/exit.svg
rename to bitmaps_png/sources/light/exit.svg
diff --git a/bitmaps_png/sources/export.svg b/bitmaps_png/sources/light/export.svg
similarity index 100%
rename from bitmaps_png/sources/export.svg
rename to bitmaps_png/sources/light/export.svg
diff --git a/bitmaps_png/sources/export3d.svg b/bitmaps_png/sources/light/export3d.svg
similarity index 100%
rename from bitmaps_png/sources/export3d.svg
rename to bitmaps_png/sources/light/export3d.svg
diff --git a/bitmaps_png/sources/export_cmp.svg b/bitmaps_png/sources/light/export_cmp.svg
similarity index 100%
rename from bitmaps_png/sources/export_cmp.svg
rename to bitmaps_png/sources/light/export_cmp.svg
diff --git a/bitmaps_png/sources/export_dsn.svg b/bitmaps_png/sources/light/export_dsn.svg
similarity index 100%
rename from bitmaps_png/sources/export_dsn.svg
rename to bitmaps_png/sources/light/export_dsn.svg
diff --git a/bitmaps_png/sources/export_footprint_names.svg b/bitmaps_png/sources/light/export_footprint_names.svg
similarity index 100%
rename from bitmaps_png/sources/export_footprint_names.svg
rename to bitmaps_png/sources/light/export_footprint_names.svg
diff --git a/bitmaps_png/sources/export_idf.svg b/bitmaps_png/sources/light/export_idf.svg
similarity index 100%
rename from bitmaps_png/sources/export_idf.svg
rename to bitmaps_png/sources/light/export_idf.svg
diff --git a/bitmaps_png/sources/export_module копия.svg b/bitmaps_png/sources/light/export_module копия.svg
similarity index 100%
rename from bitmaps_png/sources/export_module копия.svg
rename to bitmaps_png/sources/light/export_module копия.svg
diff --git a/bitmaps_png/sources/export_module.svg b/bitmaps_png/sources/light/export_module.svg
similarity index 100%
rename from bitmaps_png/sources/export_module.svg
rename to bitmaps_png/sources/light/export_module.svg
diff --git a/bitmaps_png/sources/export_part.svg b/bitmaps_png/sources/light/export_part.svg
similarity index 100%
rename from bitmaps_png/sources/export_part.svg
rename to bitmaps_png/sources/light/export_part.svg
diff --git a/bitmaps_png/sources/export_png.svg b/bitmaps_png/sources/light/export_png.svg
similarity index 100%
rename from bitmaps_png/sources/export_png.svg
rename to bitmaps_png/sources/light/export_png.svg
diff --git a/bitmaps_png/sources/export_step.svg b/bitmaps_png/sources/light/export_step.svg
similarity index 100%
rename from bitmaps_png/sources/export_step.svg
rename to bitmaps_png/sources/light/export_step.svg
diff --git a/bitmaps_png/sources/export_svg.svg b/bitmaps_png/sources/light/export_svg.svg
similarity index 100%
rename from bitmaps_png/sources/export_svg.svg
rename to bitmaps_png/sources/light/export_svg.svg
diff --git a/bitmaps_png/sources/export_to_pcbnew.svg b/bitmaps_png/sources/light/export_to_pcbnew.svg
similarity index 100%
rename from bitmaps_png/sources/export_to_pcbnew.svg
rename to bitmaps_png/sources/light/export_to_pcbnew.svg
diff --git a/bitmaps_png/sources/fabrication.svg b/bitmaps_png/sources/light/fabrication.svg
similarity index 100%
rename from bitmaps_png/sources/fabrication.svg
rename to bitmaps_png/sources/light/fabrication.svg
diff --git a/bitmaps_png/sources/file_bom.svg b/bitmaps_png/sources/light/file_bom.svg
similarity index 100%
rename from bitmaps_png/sources/file_bom.svg
rename to bitmaps_png/sources/light/file_bom.svg
diff --git a/bitmaps_png/sources/file_drl.svg b/bitmaps_png/sources/light/file_drl.svg
similarity index 100%
rename from bitmaps_png/sources/file_drl.svg
rename to bitmaps_png/sources/light/file_drl.svg
diff --git a/bitmaps_png/sources/file_dsn.svg b/bitmaps_png/sources/light/file_dsn.svg
similarity index 100%
rename from bitmaps_png/sources/file_dsn.svg
rename to bitmaps_png/sources/light/file_dsn.svg
diff --git a/bitmaps_png/sources/file_gbr.svg b/bitmaps_png/sources/light/file_gbr.svg
similarity index 100%
rename from bitmaps_png/sources/file_gbr.svg
rename to bitmaps_png/sources/light/file_gbr.svg
diff --git a/bitmaps_png/sources/file_gerber_job.svg b/bitmaps_png/sources/light/file_gerber_job.svg
similarity index 100%
rename from bitmaps_png/sources/file_gerber_job.svg
rename to bitmaps_png/sources/light/file_gerber_job.svg
diff --git a/bitmaps_png/sources/file_html.svg b/bitmaps_png/sources/light/file_html.svg
similarity index 100%
rename from bitmaps_png/sources/file_html.svg
rename to bitmaps_png/sources/light/file_html.svg
diff --git a/bitmaps_png/sources/file_idf.svg b/bitmaps_png/sources/light/file_idf.svg
similarity index 100%
rename from bitmaps_png/sources/file_idf.svg
rename to bitmaps_png/sources/light/file_idf.svg
diff --git a/bitmaps_png/sources/file_pdf.svg b/bitmaps_png/sources/light/file_pdf.svg
similarity index 100%
rename from bitmaps_png/sources/file_pdf.svg
rename to bitmaps_png/sources/light/file_pdf.svg
diff --git a/bitmaps_png/sources/file_pos.svg b/bitmaps_png/sources/light/file_pos.svg
similarity index 100%
rename from bitmaps_png/sources/file_pos.svg
rename to bitmaps_png/sources/light/file_pos.svg
diff --git a/bitmaps_png/sources/file_svg.svg b/bitmaps_png/sources/light/file_svg.svg
similarity index 100%
rename from bitmaps_png/sources/file_svg.svg
rename to bitmaps_png/sources/light/file_svg.svg
diff --git a/bitmaps_png/sources/fill_zone.svg b/bitmaps_png/sources/light/fill_zone.svg
similarity index 100%
rename from bitmaps_png/sources/fill_zone.svg
rename to bitmaps_png/sources/light/fill_zone.svg
diff --git a/bitmaps_png/sources/filter.svg b/bitmaps_png/sources/light/filter.svg
similarity index 100%
rename from bitmaps_png/sources/filter.svg
rename to bitmaps_png/sources/light/filter.svg
diff --git a/bitmaps_png/sources/find.svg b/bitmaps_png/sources/light/find.svg
similarity index 100%
rename from bitmaps_png/sources/find.svg
rename to bitmaps_png/sources/light/find.svg
diff --git a/bitmaps_png/sources/find_replace.svg b/bitmaps_png/sources/light/find_replace.svg
similarity index 100%
rename from bitmaps_png/sources/find_replace.svg
rename to bitmaps_png/sources/light/find_replace.svg
diff --git a/bitmaps_png/sources/flag.svg b/bitmaps_png/sources/light/flag.svg
similarity index 100%
rename from bitmaps_png/sources/flag.svg
rename to bitmaps_png/sources/light/flag.svg
diff --git a/bitmaps_png/sources/flip_board.svg b/bitmaps_png/sources/light/flip_board.svg
similarity index 100%
rename from bitmaps_png/sources/flip_board.svg
rename to bitmaps_png/sources/light/flip_board.svg
diff --git a/bitmaps_png/sources/gbr_select_mode2.svg b/bitmaps_png/sources/light/gbr_select_mode2.svg
similarity index 100%
rename from bitmaps_png/sources/gbr_select_mode2.svg
rename to bitmaps_png/sources/light/gbr_select_mode2.svg
diff --git a/bitmaps_png/sources/general_deletions.svg b/bitmaps_png/sources/light/general_deletions.svg
similarity index 100%
rename from bitmaps_png/sources/general_deletions.svg
rename to bitmaps_png/sources/light/general_deletions.svg
diff --git a/bitmaps_png/sources/general_ratsnest.svg b/bitmaps_png/sources/light/general_ratsnest.svg
similarity index 100%
rename from bitmaps_png/sources/general_ratsnest.svg
rename to bitmaps_png/sources/light/general_ratsnest.svg
diff --git a/bitmaps_png/sources/gerbview_show_negative_objects.svg b/bitmaps_png/sources/light/gerbview_show_negative_objects.svg
similarity index 100%
rename from bitmaps_png/sources/gerbview_show_negative_objects.svg
rename to bitmaps_png/sources/light/gerbview_show_negative_objects.svg
diff --git a/bitmaps_png/sources/grid.svg b/bitmaps_png/sources/light/grid.svg
similarity index 100%
rename from bitmaps_png/sources/grid.svg
rename to bitmaps_png/sources/light/grid.svg
diff --git a/bitmaps_png/sources/grid_select.svg b/bitmaps_png/sources/light/grid_select.svg
similarity index 100%
rename from bitmaps_png/sources/grid_select.svg
rename to bitmaps_png/sources/light/grid_select.svg
diff --git a/bitmaps_png/sources/grid_select_axis.svg b/bitmaps_png/sources/light/grid_select_axis.svg
similarity index 100%
rename from bitmaps_png/sources/grid_select_axis.svg
rename to bitmaps_png/sources/light/grid_select_axis.svg
diff --git a/bitmaps_png/sources/group.svg b/bitmaps_png/sources/light/group.svg
similarity index 100%
rename from bitmaps_png/sources/group.svg
rename to bitmaps_png/sources/light/group.svg
diff --git a/bitmaps_png/sources/group_enter.svg b/bitmaps_png/sources/light/group_enter.svg
similarity index 100%
rename from bitmaps_png/sources/group_enter.svg
rename to bitmaps_png/sources/light/group_enter.svg
diff --git a/bitmaps_png/sources/group_leave.svg b/bitmaps_png/sources/light/group_leave.svg
similarity index 100%
rename from bitmaps_png/sources/group_leave.svg
rename to bitmaps_png/sources/light/group_leave.svg
diff --git a/bitmaps_png/sources/group_remove.svg b/bitmaps_png/sources/light/group_remove.svg
similarity index 100%
rename from bitmaps_png/sources/group_remove.svg
rename to bitmaps_png/sources/light/group_remove.svg
diff --git a/bitmaps_png/sources/group_ungroup.svg b/bitmaps_png/sources/light/group_ungroup.svg
similarity index 100%
rename from bitmaps_png/sources/group_ungroup.svg
rename to bitmaps_png/sources/light/group_ungroup.svg
diff --git a/bitmaps_png/sources/help.svg b/bitmaps_png/sources/light/help.svg
similarity index 100%
rename from bitmaps_png/sources/help.svg
rename to bitmaps_png/sources/light/help.svg
diff --git a/bitmaps_png/sources/help_online.svg b/bitmaps_png/sources/light/help_online.svg
similarity index 100%
rename from bitmaps_png/sources/help_online.svg
rename to bitmaps_png/sources/light/help_online.svg
diff --git a/bitmaps_png/sources/hidden_pin.svg b/bitmaps_png/sources/light/hidden_pin.svg
similarity index 100%
rename from bitmaps_png/sources/hidden_pin.svg
rename to bitmaps_png/sources/light/hidden_pin.svg
diff --git a/bitmaps_png/sources/hide_ratsnest.svg b/bitmaps_png/sources/light/hide_ratsnest.svg
similarity index 100%
rename from bitmaps_png/sources/hide_ratsnest.svg
rename to bitmaps_png/sources/light/hide_ratsnest.svg
diff --git a/bitmaps_png/sources/hierarchy_nav.svg b/bitmaps_png/sources/light/hierarchy_nav.svg
similarity index 100%
rename from bitmaps_png/sources/hierarchy_nav.svg
rename to bitmaps_png/sources/light/hierarchy_nav.svg
diff --git a/bitmaps_png/sources/hole_to_copper_clearance.svg b/bitmaps_png/sources/light/hole_to_copper_clearance.svg
similarity index 100%
rename from bitmaps_png/sources/hole_to_copper_clearance.svg
rename to bitmaps_png/sources/light/hole_to_copper_clearance.svg
diff --git a/bitmaps_png/sources/hole_to_hole_clearance.svg b/bitmaps_png/sources/light/hole_to_hole_clearance.svg
similarity index 100%
rename from bitmaps_png/sources/hole_to_hole_clearance.svg
rename to bitmaps_png/sources/light/hole_to_hole_clearance.svg
diff --git a/bitmaps_png/sources/hotkeys.svg b/bitmaps_png/sources/light/hotkeys.svg
similarity index 100%
rename from bitmaps_png/sources/hotkeys.svg
rename to bitmaps_png/sources/light/hotkeys.svg
diff --git a/bitmaps_png/sources/icon_3d.svg b/bitmaps_png/sources/light/icon_3d.svg
similarity index 100%
rename from bitmaps_png/sources/icon_3d.svg
rename to bitmaps_png/sources/light/icon_3d.svg
diff --git a/bitmaps_png/sources/icon_bitmap2component.svg b/bitmaps_png/sources/light/icon_bitmap2component.svg
similarity index 100%
rename from bitmaps_png/sources/icon_bitmap2component.svg
rename to bitmaps_png/sources/light/icon_bitmap2component.svg
diff --git a/bitmaps_png/sources/icon_bitmap2component_16.svg b/bitmaps_png/sources/light/icon_bitmap2component_16.svg
similarity index 100%
rename from bitmaps_png/sources/icon_bitmap2component_16.svg
rename to bitmaps_png/sources/light/icon_bitmap2component_16.svg
diff --git a/bitmaps_png/sources/icon_bitmap2component_24.svg b/bitmaps_png/sources/light/icon_bitmap2component_24.svg
similarity index 100%
rename from bitmaps_png/sources/icon_bitmap2component_24.svg
rename to bitmaps_png/sources/light/icon_bitmap2component_24.svg
diff --git a/bitmaps_png/sources/icon_bitmap2component_32.svg b/bitmaps_png/sources/light/icon_bitmap2component_32.svg
similarity index 100%
rename from bitmaps_png/sources/icon_bitmap2component_32.svg
rename to bitmaps_png/sources/light/icon_bitmap2component_32.svg
diff --git a/bitmaps_png/sources/icon_cvpcb.svg b/bitmaps_png/sources/light/icon_cvpcb.svg
similarity index 100%
rename from bitmaps_png/sources/icon_cvpcb.svg
rename to bitmaps_png/sources/light/icon_cvpcb.svg
diff --git a/bitmaps_png/sources/icon_cvpcb_24.svg b/bitmaps_png/sources/light/icon_cvpcb_24.svg
similarity index 100%
rename from bitmaps_png/sources/icon_cvpcb_24.svg
rename to bitmaps_png/sources/light/icon_cvpcb_24.svg
diff --git a/bitmaps_png/sources/icon_eeschema.svg b/bitmaps_png/sources/light/icon_eeschema.svg
similarity index 100%
rename from bitmaps_png/sources/icon_eeschema.svg
rename to bitmaps_png/sources/light/icon_eeschema.svg
diff --git a/bitmaps_png/sources/icon_eeschema_16.svg b/bitmaps_png/sources/light/icon_eeschema_16.svg
similarity index 100%
rename from bitmaps_png/sources/icon_eeschema_16.svg
rename to bitmaps_png/sources/light/icon_eeschema_16.svg
diff --git a/bitmaps_png/sources/icon_eeschema_24.svg b/bitmaps_png/sources/light/icon_eeschema_24.svg
similarity index 100%
rename from bitmaps_png/sources/icon_eeschema_24.svg
rename to bitmaps_png/sources/light/icon_eeschema_24.svg
diff --git a/bitmaps_png/sources/icon_eeschema_32.svg b/bitmaps_png/sources/light/icon_eeschema_32.svg
similarity index 100%
rename from bitmaps_png/sources/icon_eeschema_32.svg
rename to bitmaps_png/sources/light/icon_eeschema_32.svg
diff --git a/bitmaps_png/sources/icon_footprint_browser.svg b/bitmaps_png/sources/light/icon_footprint_browser.svg
similarity index 100%
rename from bitmaps_png/sources/icon_footprint_browser.svg
rename to bitmaps_png/sources/light/icon_footprint_browser.svg
diff --git a/bitmaps_png/sources/icon_gerbview.svg b/bitmaps_png/sources/light/icon_gerbview.svg
similarity index 100%
rename from bitmaps_png/sources/icon_gerbview.svg
rename to bitmaps_png/sources/light/icon_gerbview.svg
diff --git a/bitmaps_png/sources/icon_gerbview_16.svg b/bitmaps_png/sources/light/icon_gerbview_16.svg
similarity index 100%
rename from bitmaps_png/sources/icon_gerbview_16.svg
rename to bitmaps_png/sources/light/icon_gerbview_16.svg
diff --git a/bitmaps_png/sources/icon_gerbview_24.svg b/bitmaps_png/sources/light/icon_gerbview_24.svg
similarity index 100%
rename from bitmaps_png/sources/icon_gerbview_24.svg
rename to bitmaps_png/sources/light/icon_gerbview_24.svg
diff --git a/bitmaps_png/sources/icon_gerbview_32.svg b/bitmaps_png/sources/light/icon_gerbview_32.svg
similarity index 100%
rename from bitmaps_png/sources/icon_gerbview_32.svg
rename to bitmaps_png/sources/light/icon_gerbview_32.svg
diff --git a/bitmaps_png/sources/icon_kicad.svg b/bitmaps_png/sources/light/icon_kicad.svg
similarity index 100%
rename from bitmaps_png/sources/icon_kicad.svg
rename to bitmaps_png/sources/light/icon_kicad.svg
diff --git a/bitmaps_png/sources/icon_kicad_16.svg b/bitmaps_png/sources/light/icon_kicad_16.svg
similarity index 100%
rename from bitmaps_png/sources/icon_kicad_16.svg
rename to bitmaps_png/sources/light/icon_kicad_16.svg
diff --git a/bitmaps_png/sources/icon_kicad_32.svg b/bitmaps_png/sources/light/icon_kicad_32.svg
similarity index 100%
rename from bitmaps_png/sources/icon_kicad_32.svg
rename to bitmaps_png/sources/light/icon_kicad_32.svg
diff --git a/bitmaps_png/sources/icon_libedit.svg b/bitmaps_png/sources/light/icon_libedit.svg
similarity index 100%
rename from bitmaps_png/sources/icon_libedit.svg
rename to bitmaps_png/sources/light/icon_libedit.svg
diff --git a/bitmaps_png/sources/icon_libedit_16.svg b/bitmaps_png/sources/light/icon_libedit_16.svg
similarity index 100%
rename from bitmaps_png/sources/icon_libedit_16.svg
rename to bitmaps_png/sources/light/icon_libedit_16.svg
diff --git a/bitmaps_png/sources/icon_libedit_24.svg b/bitmaps_png/sources/light/icon_libedit_24.svg
similarity index 100%
rename from bitmaps_png/sources/icon_libedit_24.svg
rename to bitmaps_png/sources/light/icon_libedit_24.svg
diff --git a/bitmaps_png/sources/icon_libedit_32.svg b/bitmaps_png/sources/light/icon_libedit_32.svg
similarity index 100%
rename from bitmaps_png/sources/icon_libedit_32.svg
rename to bitmaps_png/sources/light/icon_libedit_32.svg
diff --git a/bitmaps_png/sources/icon_modedit.svg b/bitmaps_png/sources/light/icon_modedit.svg
similarity index 100%
rename from bitmaps_png/sources/icon_modedit.svg
rename to bitmaps_png/sources/light/icon_modedit.svg
diff --git a/bitmaps_png/sources/icon_modedit_16.svg b/bitmaps_png/sources/light/icon_modedit_16.svg
similarity index 100%
rename from bitmaps_png/sources/icon_modedit_16.svg
rename to bitmaps_png/sources/light/icon_modedit_16.svg
diff --git a/bitmaps_png/sources/icon_modedit_24.svg b/bitmaps_png/sources/light/icon_modedit_24.svg
similarity index 100%
rename from bitmaps_png/sources/icon_modedit_24.svg
rename to bitmaps_png/sources/light/icon_modedit_24.svg
diff --git a/bitmaps_png/sources/icon_modedit_32.svg b/bitmaps_png/sources/light/icon_modedit_32.svg
similarity index 100%
rename from bitmaps_png/sources/icon_modedit_32.svg
rename to bitmaps_png/sources/light/icon_modedit_32.svg
diff --git a/bitmaps_png/sources/icon_pagelayout_editor.svg b/bitmaps_png/sources/light/icon_pagelayout_editor.svg
similarity index 100%
rename from bitmaps_png/sources/icon_pagelayout_editor.svg
rename to bitmaps_png/sources/light/icon_pagelayout_editor.svg
diff --git a/bitmaps_png/sources/icon_pagelayout_editor_16.svg b/bitmaps_png/sources/light/icon_pagelayout_editor_16.svg
similarity index 100%
rename from bitmaps_png/sources/icon_pagelayout_editor_16.svg
rename to bitmaps_png/sources/light/icon_pagelayout_editor_16.svg
diff --git a/bitmaps_png/sources/icon_pagelayout_editor_24.svg b/bitmaps_png/sources/light/icon_pagelayout_editor_24.svg
similarity index 100%
rename from bitmaps_png/sources/icon_pagelayout_editor_24.svg
rename to bitmaps_png/sources/light/icon_pagelayout_editor_24.svg
diff --git a/bitmaps_png/sources/icon_pagelayout_editor_32.svg b/bitmaps_png/sources/light/icon_pagelayout_editor_32.svg
similarity index 100%
rename from bitmaps_png/sources/icon_pagelayout_editor_32.svg
rename to bitmaps_png/sources/light/icon_pagelayout_editor_32.svg
diff --git a/bitmaps_png/sources/icon_pcbcalculator.svg b/bitmaps_png/sources/light/icon_pcbcalculator.svg
similarity index 100%
rename from bitmaps_png/sources/icon_pcbcalculator.svg
rename to bitmaps_png/sources/light/icon_pcbcalculator.svg
diff --git a/bitmaps_png/sources/icon_pcbcalculator_16.svg b/bitmaps_png/sources/light/icon_pcbcalculator_16.svg
similarity index 100%
rename from bitmaps_png/sources/icon_pcbcalculator_16.svg
rename to bitmaps_png/sources/light/icon_pcbcalculator_16.svg
diff --git a/bitmaps_png/sources/icon_pcbcalculator_24.svg b/bitmaps_png/sources/light/icon_pcbcalculator_24.svg
similarity index 100%
rename from bitmaps_png/sources/icon_pcbcalculator_24.svg
rename to bitmaps_png/sources/light/icon_pcbcalculator_24.svg
diff --git a/bitmaps_png/sources/icon_pcbcalculator_32.svg b/bitmaps_png/sources/light/icon_pcbcalculator_32.svg
similarity index 100%
rename from bitmaps_png/sources/icon_pcbcalculator_32.svg
rename to bitmaps_png/sources/light/icon_pcbcalculator_32.svg
diff --git a/bitmaps_png/sources/icon_pcbnew.svg b/bitmaps_png/sources/light/icon_pcbnew.svg
similarity index 100%
rename from bitmaps_png/sources/icon_pcbnew.svg
rename to bitmaps_png/sources/light/icon_pcbnew.svg
diff --git a/bitmaps_png/sources/icon_pcbnew_16.svg b/bitmaps_png/sources/light/icon_pcbnew_16.svg
similarity index 100%
rename from bitmaps_png/sources/icon_pcbnew_16.svg
rename to bitmaps_png/sources/light/icon_pcbnew_16.svg
diff --git a/bitmaps_png/sources/icon_pcbnew_24.svg b/bitmaps_png/sources/light/icon_pcbnew_24.svg
similarity index 100%
rename from bitmaps_png/sources/icon_pcbnew_24.svg
rename to bitmaps_png/sources/light/icon_pcbnew_24.svg
diff --git a/bitmaps_png/sources/icon_pcbnew_32.svg b/bitmaps_png/sources/light/icon_pcbnew_32.svg
similarity index 100%
rename from bitmaps_png/sources/icon_pcbnew_32.svg
rename to bitmaps_png/sources/light/icon_pcbnew_32.svg
diff --git a/bitmaps_png/sources/image.svg b/bitmaps_png/sources/light/image.svg
similarity index 100%
rename from bitmaps_png/sources/image.svg
rename to bitmaps_png/sources/light/image.svg
diff --git a/bitmaps_png/sources/import.svg b/bitmaps_png/sources/light/import.svg
similarity index 100%
rename from bitmaps_png/sources/import.svg
rename to bitmaps_png/sources/light/import.svg
diff --git a/bitmaps_png/sources/import3d.svg b/bitmaps_png/sources/light/import3d.svg
similarity index 100%
rename from bitmaps_png/sources/import3d.svg
rename to bitmaps_png/sources/light/import3d.svg
diff --git a/bitmaps_png/sources/import_brd_file.svg b/bitmaps_png/sources/light/import_brd_file.svg
similarity index 100%
rename from bitmaps_png/sources/import_brd_file.svg
rename to bitmaps_png/sources/light/import_brd_file.svg
diff --git a/bitmaps_png/sources/import_document.svg b/bitmaps_png/sources/light/import_document.svg
similarity index 100%
rename from bitmaps_png/sources/import_document.svg
rename to bitmaps_png/sources/light/import_document.svg
diff --git a/bitmaps_png/sources/import_footprint_names.svg b/bitmaps_png/sources/light/import_footprint_names.svg
similarity index 100%
rename from bitmaps_png/sources/import_footprint_names.svg
rename to bitmaps_png/sources/light/import_footprint_names.svg
diff --git a/bitmaps_png/sources/import_hierarchical_label.svg b/bitmaps_png/sources/light/import_hierarchical_label.svg
similarity index 100%
rename from bitmaps_png/sources/import_hierarchical_label.svg
rename to bitmaps_png/sources/light/import_hierarchical_label.svg
diff --git a/bitmaps_png/sources/import_module.svg b/bitmaps_png/sources/light/import_module.svg
similarity index 100%
rename from bitmaps_png/sources/import_module.svg
rename to bitmaps_png/sources/light/import_module.svg
diff --git a/bitmaps_png/sources/import_part.svg b/bitmaps_png/sources/light/import_part.svg
similarity index 100%
rename from bitmaps_png/sources/import_part.svg
rename to bitmaps_png/sources/light/import_part.svg
diff --git a/bitmaps_png/sources/import_project.svg b/bitmaps_png/sources/light/import_project.svg
similarity index 100%
rename from bitmaps_png/sources/import_project.svg
rename to bitmaps_png/sources/light/import_project.svg
diff --git a/bitmaps_png/sources/import_vector.svg b/bitmaps_png/sources/light/import_vector.svg
similarity index 100%
rename from bitmaps_png/sources/import_vector.svg
rename to bitmaps_png/sources/light/import_vector.svg
diff --git a/bitmaps_png/sources/info.svg b/bitmaps_png/sources/light/info.svg
similarity index 100%
rename from bitmaps_png/sources/info.svg
rename to bitmaps_png/sources/light/info.svg
diff --git a/bitmaps_png/sources/insert_module_board.svg b/bitmaps_png/sources/light/insert_module_board.svg
similarity index 100%
rename from bitmaps_png/sources/insert_module_board.svg
rename to bitmaps_png/sources/light/insert_module_board.svg
diff --git a/bitmaps_png/sources/kicad_logo.svg b/bitmaps_png/sources/light/kicad_logo.svg
similarity index 100%
rename from bitmaps_png/sources/kicad_logo.svg
rename to bitmaps_png/sources/light/kicad_logo.svg
diff --git a/bitmaps_png/sources/kicad_logo_small.svg b/bitmaps_png/sources/light/kicad_logo_small.svg
similarity index 100%
rename from bitmaps_png/sources/kicad_logo_small.svg
rename to bitmaps_png/sources/light/kicad_logo_small.svg
diff --git a/bitmaps_png/sources/language.svg b/bitmaps_png/sources/light/language.svg
similarity index 100%
rename from bitmaps_png/sources/language.svg
rename to bitmaps_png/sources/light/language.svg
diff --git a/bitmaps_png/sources/layers_manager.svg b/bitmaps_png/sources/light/layers_manager.svg
similarity index 100%
rename from bitmaps_png/sources/layers_manager.svg
rename to bitmaps_png/sources/light/layers_manager.svg
diff --git a/bitmaps_png/sources/leave_sheet.svg b/bitmaps_png/sources/light/leave_sheet.svg
similarity index 100%
rename from bitmaps_png/sources/leave_sheet.svg
rename to bitmaps_png/sources/light/leave_sheet.svg
diff --git a/bitmaps_png/sources/left.svg b/bitmaps_png/sources/light/left.svg
similarity index 100%
rename from bitmaps_png/sources/left.svg
rename to bitmaps_png/sources/light/left.svg
diff --git a/bitmaps_png/sources/lib_next.svg b/bitmaps_png/sources/light/lib_next.svg
similarity index 100%
rename from bitmaps_png/sources/lib_next.svg
rename to bitmaps_png/sources/light/lib_next.svg
diff --git a/bitmaps_png/sources/lib_previous.svg b/bitmaps_png/sources/light/lib_previous.svg
similarity index 100%
rename from bitmaps_png/sources/lib_previous.svg
rename to bitmaps_png/sources/light/lib_previous.svg
diff --git a/bitmaps_png/sources/libedit.svg b/bitmaps_png/sources/light/libedit.svg
similarity index 100%
rename from bitmaps_png/sources/libedit.svg
rename to bitmaps_png/sources/light/libedit.svg
diff --git a/bitmaps_png/sources/library.svg b/bitmaps_png/sources/light/library.svg
similarity index 100%
rename from bitmaps_png/sources/library.svg
rename to bitmaps_png/sources/light/library.svg
diff --git a/bitmaps_png/sources/library_archive.svg b/bitmaps_png/sources/light/library_archive.svg
similarity index 100%
rename from bitmaps_png/sources/library_archive.svg
rename to bitmaps_png/sources/light/library_archive.svg
diff --git a/bitmaps_png/sources/library_archive_as.svg b/bitmaps_png/sources/light/library_archive_as.svg
similarity index 100%
rename from bitmaps_png/sources/library_archive_as.svg
rename to bitmaps_png/sources/light/library_archive_as.svg
diff --git a/bitmaps_png/sources/library_browser.svg b/bitmaps_png/sources/light/library_browser.svg
similarity index 100%
rename from bitmaps_png/sources/library_browser.svg
rename to bitmaps_png/sources/light/library_browser.svg
diff --git a/bitmaps_png/sources/library_table.svg b/bitmaps_png/sources/light/library_table.svg
similarity index 100%
rename from bitmaps_png/sources/library_table.svg
rename to bitmaps_png/sources/light/library_table.svg
diff --git a/bitmaps_png/sources/lines90.svg b/bitmaps_png/sources/light/lines90.svg
similarity index 100%
rename from bitmaps_png/sources/lines90.svg
rename to bitmaps_png/sources/light/lines90.svg
diff --git a/bitmaps_png/sources/list_nets.svg b/bitmaps_png/sources/light/list_nets.svg
similarity index 100%
rename from bitmaps_png/sources/list_nets.svg
rename to bitmaps_png/sources/light/list_nets.svg
diff --git a/bitmaps_png/sources/list_nets_16.svg b/bitmaps_png/sources/light/list_nets_16.svg
similarity index 100%
rename from bitmaps_png/sources/list_nets_16.svg
rename to bitmaps_png/sources/light/list_nets_16.svg
diff --git a/bitmaps_png/sources/load_drill.svg b/bitmaps_png/sources/light/load_drill.svg
similarity index 100%
rename from bitmaps_png/sources/load_drill.svg
rename to bitmaps_png/sources/light/load_drill.svg
diff --git a/bitmaps_png/sources/load_gerber.svg b/bitmaps_png/sources/light/load_gerber.svg
similarity index 100%
rename from bitmaps_png/sources/load_gerber.svg
rename to bitmaps_png/sources/light/load_gerber.svg
diff --git a/bitmaps_png/sources/load_module_board.svg b/bitmaps_png/sources/light/load_module_board.svg
similarity index 100%
rename from bitmaps_png/sources/load_module_board.svg
rename to bitmaps_png/sources/light/load_module_board.svg
diff --git a/bitmaps_png/sources/lock_unlock.svg b/bitmaps_png/sources/light/lock_unlock.svg
similarity index 100%
rename from bitmaps_png/sources/lock_unlock.svg
rename to bitmaps_png/sources/light/lock_unlock.svg
diff --git a/bitmaps_png/sources/locked.svg b/bitmaps_png/sources/light/locked.svg
similarity index 100%
rename from bitmaps_png/sources/locked.svg
rename to bitmaps_png/sources/light/locked.svg
diff --git a/bitmaps_png/sources/measurement.svg b/bitmaps_png/sources/light/measurement.svg
similarity index 100%
rename from bitmaps_png/sources/measurement.svg
rename to bitmaps_png/sources/light/measurement.svg
diff --git a/bitmaps_png/sources/mirror_h.svg b/bitmaps_png/sources/light/mirror_h.svg
similarity index 100%
rename from bitmaps_png/sources/mirror_h.svg
rename to bitmaps_png/sources/light/mirror_h.svg
diff --git a/bitmaps_png/sources/mirror_v.svg b/bitmaps_png/sources/light/mirror_v.svg
similarity index 100%
rename from bitmaps_png/sources/mirror_v.svg
rename to bitmaps_png/sources/light/mirror_v.svg
diff --git a/bitmaps_png/sources/mode_module.svg b/bitmaps_png/sources/light/mode_module.svg
similarity index 100%
rename from bitmaps_png/sources/mode_module.svg
rename to bitmaps_png/sources/light/mode_module.svg
diff --git a/bitmaps_png/sources/module.svg b/bitmaps_png/sources/light/module.svg
similarity index 100%
rename from bitmaps_png/sources/module.svg
rename to bitmaps_png/sources/light/module.svg
diff --git a/bitmaps_png/sources/module_editor.svg b/bitmaps_png/sources/light/module_editor.svg
similarity index 100%
rename from bitmaps_png/sources/module_editor.svg
rename to bitmaps_png/sources/light/module_editor.svg
diff --git a/bitmaps_png/sources/module_filtered_list.svg b/bitmaps_png/sources/light/module_filtered_list.svg
similarity index 100%
rename from bitmaps_png/sources/module_filtered_list.svg
rename to bitmaps_png/sources/light/module_filtered_list.svg
diff --git a/bitmaps_png/sources/module_library_list.svg b/bitmaps_png/sources/light/module_library_list.svg
similarity index 100%
rename from bitmaps_png/sources/module_library_list.svg
rename to bitmaps_png/sources/light/module_library_list.svg
diff --git a/bitmaps_png/sources/module_options.svg b/bitmaps_png/sources/light/module_options.svg
similarity index 100%
rename from bitmaps_png/sources/module_options.svg
rename to bitmaps_png/sources/light/module_options.svg
diff --git a/bitmaps_png/sources/module_pin_filtered_list.svg b/bitmaps_png/sources/light/module_pin_filtered_list.svg
similarity index 100%
rename from bitmaps_png/sources/module_pin_filtered_list.svg
rename to bitmaps_png/sources/light/module_pin_filtered_list.svg
diff --git a/bitmaps_png/sources/module_wizard.svg b/bitmaps_png/sources/light/module_wizard.svg
similarity index 100%
rename from bitmaps_png/sources/module_wizard.svg
rename to bitmaps_png/sources/light/module_wizard.svg
diff --git a/bitmaps_png/sources/morgan1.svg b/bitmaps_png/sources/light/morgan1.svg
similarity index 100%
rename from bitmaps_png/sources/morgan1.svg
rename to bitmaps_png/sources/light/morgan1.svg
diff --git a/bitmaps_png/sources/morgan2.svg b/bitmaps_png/sources/light/morgan2.svg
similarity index 100%
rename from bitmaps_png/sources/morgan2.svg
rename to bitmaps_png/sources/light/morgan2.svg
diff --git a/bitmaps_png/sources/move.svg b/bitmaps_png/sources/light/move.svg
similarity index 100%
rename from bitmaps_png/sources/move.svg
rename to bitmaps_png/sources/light/move.svg
diff --git a/bitmaps_png/sources/move_exactly.svg b/bitmaps_png/sources/light/move_exactly.svg
similarity index 100%
rename from bitmaps_png/sources/move_exactly.svg
rename to bitmaps_png/sources/light/move_exactly.svg
diff --git a/bitmaps_png/sources/move_relative.svg b/bitmaps_png/sources/light/move_relative.svg
similarity index 100%
rename from bitmaps_png/sources/move_relative.svg
rename to bitmaps_png/sources/light/move_relative.svg
diff --git a/bitmaps_png/sources/mw_add_gap.svg b/bitmaps_png/sources/light/mw_add_gap.svg
similarity index 100%
rename from bitmaps_png/sources/mw_add_gap.svg
rename to bitmaps_png/sources/light/mw_add_gap.svg
diff --git a/bitmaps_png/sources/mw_add_line.svg b/bitmaps_png/sources/light/mw_add_line.svg
similarity index 100%
rename from bitmaps_png/sources/mw_add_line.svg
rename to bitmaps_png/sources/light/mw_add_line.svg
diff --git a/bitmaps_png/sources/mw_add_shape.svg b/bitmaps_png/sources/light/mw_add_shape.svg
similarity index 100%
rename from bitmaps_png/sources/mw_add_shape.svg
rename to bitmaps_png/sources/light/mw_add_shape.svg
diff --git a/bitmaps_png/sources/mw_add_stub.svg b/bitmaps_png/sources/light/mw_add_stub.svg
similarity index 100%
rename from bitmaps_png/sources/mw_add_stub.svg
rename to bitmaps_png/sources/light/mw_add_stub.svg
diff --git a/bitmaps_png/sources/mw_add_stub_arc.svg b/bitmaps_png/sources/light/mw_add_stub_arc.svg
similarity index 100%
rename from bitmaps_png/sources/mw_add_stub_arc.svg
rename to bitmaps_png/sources/light/mw_add_stub_arc.svg
diff --git a/bitmaps_png/sources/net_highlight.svg b/bitmaps_png/sources/light/net_highlight.svg
similarity index 100%
rename from bitmaps_png/sources/net_highlight.svg
rename to bitmaps_png/sources/light/net_highlight.svg
diff --git a/bitmaps_png/sources/net_highlight_schematic.svg b/bitmaps_png/sources/light/net_highlight_schematic.svg
similarity index 100%
rename from bitmaps_png/sources/net_highlight_schematic.svg
rename to bitmaps_png/sources/light/net_highlight_schematic.svg
diff --git a/bitmaps_png/sources/netlist.svg b/bitmaps_png/sources/light/netlist.svg
similarity index 100%
rename from bitmaps_png/sources/netlist.svg
rename to bitmaps_png/sources/light/netlist.svg
diff --git a/bitmaps_png/sources/new_component.svg b/bitmaps_png/sources/light/new_component.svg
similarity index 100%
rename from bitmaps_png/sources/new_component.svg
rename to bitmaps_png/sources/light/new_component.svg
diff --git a/bitmaps_png/sources/new_footprint.svg b/bitmaps_png/sources/light/new_footprint.svg
similarity index 100%
rename from bitmaps_png/sources/new_footprint.svg
rename to bitmaps_png/sources/light/new_footprint.svg
diff --git a/bitmaps_png/sources/new_generic.svg b/bitmaps_png/sources/light/new_generic.svg
similarity index 100%
rename from bitmaps_png/sources/new_generic.svg
rename to bitmaps_png/sources/light/new_generic.svg
diff --git a/bitmaps_png/sources/new_library.svg b/bitmaps_png/sources/light/new_library.svg
similarity index 100%
rename from bitmaps_png/sources/new_library.svg
rename to bitmaps_png/sources/light/new_library.svg
diff --git a/bitmaps_png/sources/new_project.svg b/bitmaps_png/sources/light/new_project.svg
similarity index 100%
rename from bitmaps_png/sources/new_project.svg
rename to bitmaps_png/sources/light/new_project.svg
diff --git a/bitmaps_png/sources/noconn.svg b/bitmaps_png/sources/light/noconn.svg
similarity index 100%
rename from bitmaps_png/sources/noconn.svg
rename to bitmaps_png/sources/light/noconn.svg
diff --git a/bitmaps_png/sources/normal.svg b/bitmaps_png/sources/light/normal.svg
similarity index 100%
rename from bitmaps_png/sources/normal.svg
rename to bitmaps_png/sources/light/normal.svg
diff --git a/bitmaps_png/sources/open_project.svg b/bitmaps_png/sources/light/open_project.svg
similarity index 100%
rename from bitmaps_png/sources/open_project.svg
rename to bitmaps_png/sources/light/open_project.svg
diff --git a/bitmaps_png/sources/opt_show_polygon.svg b/bitmaps_png/sources/light/opt_show_polygon.svg
similarity index 100%
rename from bitmaps_png/sources/opt_show_polygon.svg
rename to bitmaps_png/sources/light/opt_show_polygon.svg
diff --git a/bitmaps_png/sources/options_3drender.svg b/bitmaps_png/sources/light/options_3drender.svg
similarity index 100%
rename from bitmaps_png/sources/options_3drender.svg
rename to bitmaps_png/sources/light/options_3drender.svg
diff --git a/bitmaps_png/sources/options_board.svg b/bitmaps_png/sources/light/options_board.svg
similarity index 100%
rename from bitmaps_png/sources/options_board.svg
rename to bitmaps_png/sources/light/options_board.svg
diff --git a/bitmaps_png/sources/options_generic.svg b/bitmaps_png/sources/light/options_generic.svg
similarity index 100%
rename from bitmaps_png/sources/options_generic.svg
rename to bitmaps_png/sources/light/options_generic.svg
diff --git a/bitmaps_png/sources/options_generic_16.svg b/bitmaps_png/sources/light/options_generic_16.svg
similarity index 100%
rename from bitmaps_png/sources/options_generic_16.svg
rename to bitmaps_png/sources/light/options_generic_16.svg
diff --git a/bitmaps_png/sources/options_pad.svg b/bitmaps_png/sources/light/options_pad.svg
similarity index 100%
rename from bitmaps_png/sources/options_pad.svg
rename to bitmaps_png/sources/light/options_pad.svg
diff --git a/bitmaps_png/sources/options_schematic.svg b/bitmaps_png/sources/light/options_schematic.svg
similarity index 100%
rename from bitmaps_png/sources/options_schematic.svg
rename to bitmaps_png/sources/light/options_schematic.svg
diff --git a/bitmaps_png/sources/ortho.svg b/bitmaps_png/sources/light/ortho.svg
similarity index 100%
rename from bitmaps_png/sources/ortho.svg
rename to bitmaps_png/sources/light/ortho.svg
diff --git a/bitmaps_png/sources/pad.svg b/bitmaps_png/sources/light/pad.svg
similarity index 100%
rename from bitmaps_png/sources/pad.svg
rename to bitmaps_png/sources/light/pad.svg
diff --git a/bitmaps_png/sources/pad_enumerate.svg b/bitmaps_png/sources/light/pad_enumerate.svg
similarity index 100%
rename from bitmaps_png/sources/pad_enumerate.svg
rename to bitmaps_png/sources/light/pad_enumerate.svg
diff --git a/bitmaps_png/sources/pad_number.svg b/bitmaps_png/sources/light/pad_number.svg
similarity index 100%
rename from bitmaps_png/sources/pad_number.svg
rename to bitmaps_png/sources/light/pad_number.svg
diff --git a/bitmaps_png/sources/pad_sketch.svg b/bitmaps_png/sources/light/pad_sketch.svg
similarity index 100%
rename from bitmaps_png/sources/pad_sketch.svg
rename to bitmaps_png/sources/light/pad_sketch.svg
diff --git a/bitmaps_png/sources/pads_mask_layers.svg b/bitmaps_png/sources/light/pads_mask_layers.svg
similarity index 100%
rename from bitmaps_png/sources/pads_mask_layers.svg
rename to bitmaps_png/sources/light/pads_mask_layers.svg
diff --git a/bitmaps_png/sources/pads_npth.svg b/bitmaps_png/sources/light/pads_npth.svg
similarity index 100%
rename from bitmaps_png/sources/pads_npth.svg
rename to bitmaps_png/sources/light/pads_npth.svg
diff --git a/bitmaps_png/sources/pads_npth_bottom.svg b/bitmaps_png/sources/light/pads_npth_bottom.svg
similarity index 100%
rename from bitmaps_png/sources/pads_npth_bottom.svg
rename to bitmaps_png/sources/light/pads_npth_bottom.svg
diff --git a/bitmaps_png/sources/pads_npth_top.svg b/bitmaps_png/sources/light/pads_npth_top.svg
similarity index 100%
rename from bitmaps_png/sources/pads_npth_top.svg
rename to bitmaps_png/sources/light/pads_npth_top.svg
diff --git a/bitmaps_png/sources/pads_npth_top_bottom.svg b/bitmaps_png/sources/light/pads_npth_top_bottom.svg
similarity index 100%
rename from bitmaps_png/sources/pads_npth_top_bottom.svg
rename to bitmaps_png/sources/light/pads_npth_top_bottom.svg
diff --git a/bitmaps_png/sources/pads_remove.svg b/bitmaps_png/sources/light/pads_remove.svg
similarity index 100%
rename from bitmaps_png/sources/pads_remove.svg
rename to bitmaps_png/sources/light/pads_remove.svg
diff --git a/bitmaps_png/sources/pads_remove_unused.svg b/bitmaps_png/sources/light/pads_remove_unused.svg
similarity index 100%
rename from bitmaps_png/sources/pads_remove_unused.svg
rename to bitmaps_png/sources/light/pads_remove_unused.svg
diff --git a/bitmaps_png/sources/pads_remove_unused_keep_bottom.svg b/bitmaps_png/sources/light/pads_remove_unused_keep_bottom.svg
similarity index 100%
rename from bitmaps_png/sources/pads_remove_unused_keep_bottom.svg
rename to bitmaps_png/sources/light/pads_remove_unused_keep_bottom.svg
diff --git a/bitmaps_png/sources/pads_reset_unused.svg b/bitmaps_png/sources/light/pads_reset_unused.svg
similarity index 100%
rename from bitmaps_png/sources/pads_reset_unused.svg
rename to bitmaps_png/sources/light/pads_reset_unused.svg
diff --git a/bitmaps_png/sources/pagelayout_normal_view_mode.svg b/bitmaps_png/sources/light/pagelayout_normal_view_mode.svg
similarity index 100%
rename from bitmaps_png/sources/pagelayout_normal_view_mode.svg
rename to bitmaps_png/sources/light/pagelayout_normal_view_mode.svg
diff --git a/bitmaps_png/sources/pagelayout_special_view_mode.svg b/bitmaps_png/sources/light/pagelayout_special_view_mode.svg
similarity index 100%
rename from bitmaps_png/sources/pagelayout_special_view_mode.svg
rename to bitmaps_png/sources/light/pagelayout_special_view_mode.svg
diff --git a/bitmaps_png/sources/part_properties.svg b/bitmaps_png/sources/light/part_properties.svg
similarity index 100%
rename from bitmaps_png/sources/part_properties.svg
rename to bitmaps_png/sources/light/part_properties.svg
diff --git a/bitmaps_png/sources/paste.svg b/bitmaps_png/sources/light/paste.svg
similarity index 100%
rename from bitmaps_png/sources/paste.svg
rename to bitmaps_png/sources/light/paste.svg
diff --git a/bitmaps_png/sources/path.svg b/bitmaps_png/sources/light/path.svg
similarity index 100%
rename from bitmaps_png/sources/path.svg
rename to bitmaps_png/sources/light/path.svg
diff --git a/bitmaps_png/sources/pcb_target.svg b/bitmaps_png/sources/light/pcb_target.svg
similarity index 100%
rename from bitmaps_png/sources/pcb_target.svg
rename to bitmaps_png/sources/light/pcb_target.svg
diff --git a/bitmaps_png/sources/pin.svg b/bitmaps_png/sources/light/pin.svg
similarity index 100%
rename from bitmaps_png/sources/pin.svg
rename to bitmaps_png/sources/light/pin.svg
diff --git a/bitmaps_png/sources/pin2pin.svg b/bitmaps_png/sources/light/pin2pin.svg
similarity index 100%
rename from bitmaps_png/sources/pin2pin.svg
rename to bitmaps_png/sources/light/pin2pin.svg
diff --git a/bitmaps_png/sources/pin_show_etype.svg b/bitmaps_png/sources/light/pin_show_etype.svg
similarity index 100%
rename from bitmaps_png/sources/pin_show_etype.svg
rename to bitmaps_png/sources/light/pin_show_etype.svg
diff --git a/bitmaps_png/sources/pin_size_to.svg b/bitmaps_png/sources/light/pin_size_to.svg
similarity index 100%
rename from bitmaps_png/sources/pin_size_to.svg
rename to bitmaps_png/sources/light/pin_size_to.svg
diff --git a/bitmaps_png/sources/pin_table.svg b/bitmaps_png/sources/light/pin_table.svg
similarity index 100%
rename from bitmaps_png/sources/pin_table.svg
rename to bitmaps_png/sources/light/pin_table.svg
diff --git a/bitmaps_png/sources/pinorient_down.svg b/bitmaps_png/sources/light/pinorient_down.svg
similarity index 100%
rename from bitmaps_png/sources/pinorient_down.svg
rename to bitmaps_png/sources/light/pinorient_down.svg
diff --git a/bitmaps_png/sources/pinorient_left.svg b/bitmaps_png/sources/light/pinorient_left.svg
similarity index 100%
rename from bitmaps_png/sources/pinorient_left.svg
rename to bitmaps_png/sources/light/pinorient_left.svg
diff --git a/bitmaps_png/sources/pinorient_right.svg b/bitmaps_png/sources/light/pinorient_right.svg
similarity index 100%
rename from bitmaps_png/sources/pinorient_right.svg
rename to bitmaps_png/sources/light/pinorient_right.svg
diff --git a/bitmaps_png/sources/pinorient_up.svg b/bitmaps_png/sources/light/pinorient_up.svg
similarity index 100%
rename from bitmaps_png/sources/pinorient_up.svg
rename to bitmaps_png/sources/light/pinorient_up.svg
diff --git a/bitmaps_png/sources/pinshape_active_low_input.svg b/bitmaps_png/sources/light/pinshape_active_low_input.svg
similarity index 100%
rename from bitmaps_png/sources/pinshape_active_low_input.svg
rename to bitmaps_png/sources/light/pinshape_active_low_input.svg
diff --git a/bitmaps_png/sources/pinshape_active_low_output.svg b/bitmaps_png/sources/light/pinshape_active_low_output.svg
similarity index 100%
rename from bitmaps_png/sources/pinshape_active_low_output.svg
rename to bitmaps_png/sources/light/pinshape_active_low_output.svg
diff --git a/bitmaps_png/sources/pinshape_clock_active_low.svg b/bitmaps_png/sources/light/pinshape_clock_active_low.svg
similarity index 100%
rename from bitmaps_png/sources/pinshape_clock_active_low.svg
rename to bitmaps_png/sources/light/pinshape_clock_active_low.svg
diff --git a/bitmaps_png/sources/pinshape_clock_fall.svg b/bitmaps_png/sources/light/pinshape_clock_fall.svg
similarity index 100%
rename from bitmaps_png/sources/pinshape_clock_fall.svg
rename to bitmaps_png/sources/light/pinshape_clock_fall.svg
diff --git a/bitmaps_png/sources/pinshape_clock_invert.svg b/bitmaps_png/sources/light/pinshape_clock_invert.svg
similarity index 100%
rename from bitmaps_png/sources/pinshape_clock_invert.svg
rename to bitmaps_png/sources/light/pinshape_clock_invert.svg
diff --git a/bitmaps_png/sources/pinshape_clock_normal.svg b/bitmaps_png/sources/light/pinshape_clock_normal.svg
similarity index 100%
rename from bitmaps_png/sources/pinshape_clock_normal.svg
rename to bitmaps_png/sources/light/pinshape_clock_normal.svg
diff --git a/bitmaps_png/sources/pinshape_invert.svg b/bitmaps_png/sources/light/pinshape_invert.svg
similarity index 100%
rename from bitmaps_png/sources/pinshape_invert.svg
rename to bitmaps_png/sources/light/pinshape_invert.svg
diff --git a/bitmaps_png/sources/pinshape_nonlogic.svg b/bitmaps_png/sources/light/pinshape_nonlogic.svg
similarity index 100%
rename from bitmaps_png/sources/pinshape_nonlogic.svg
rename to bitmaps_png/sources/light/pinshape_nonlogic.svg
diff --git a/bitmaps_png/sources/pinshape_normal.svg b/bitmaps_png/sources/light/pinshape_normal.svg
similarity index 100%
rename from bitmaps_png/sources/pinshape_normal.svg
rename to bitmaps_png/sources/light/pinshape_normal.svg
diff --git a/bitmaps_png/sources/pintype_3states.svg b/bitmaps_png/sources/light/pintype_3states.svg
similarity index 100%
rename from bitmaps_png/sources/pintype_3states.svg
rename to bitmaps_png/sources/light/pintype_3states.svg
diff --git a/bitmaps_png/sources/pintype_bidi.svg b/bitmaps_png/sources/light/pintype_bidi.svg
similarity index 100%
rename from bitmaps_png/sources/pintype_bidi.svg
rename to bitmaps_png/sources/light/pintype_bidi.svg
diff --git a/bitmaps_png/sources/pintype_input.svg b/bitmaps_png/sources/light/pintype_input.svg
similarity index 100%
rename from bitmaps_png/sources/pintype_input.svg
rename to bitmaps_png/sources/light/pintype_input.svg
diff --git a/bitmaps_png/sources/pintype_nic.svg b/bitmaps_png/sources/light/pintype_nic.svg
similarity index 100%
rename from bitmaps_png/sources/pintype_nic.svg
rename to bitmaps_png/sources/light/pintype_nic.svg
diff --git a/bitmaps_png/sources/pintype_noconnect.svg b/bitmaps_png/sources/light/pintype_noconnect.svg
similarity index 100%
rename from bitmaps_png/sources/pintype_noconnect.svg
rename to bitmaps_png/sources/light/pintype_noconnect.svg
diff --git a/bitmaps_png/sources/pintype_notspecif.svg b/bitmaps_png/sources/light/pintype_notspecif.svg
similarity index 100%
rename from bitmaps_png/sources/pintype_notspecif.svg
rename to bitmaps_png/sources/light/pintype_notspecif.svg
diff --git a/bitmaps_png/sources/pintype_opencoll.svg b/bitmaps_png/sources/light/pintype_opencoll.svg
similarity index 100%
rename from bitmaps_png/sources/pintype_opencoll.svg
rename to bitmaps_png/sources/light/pintype_opencoll.svg
diff --git a/bitmaps_png/sources/pintype_openemit.svg b/bitmaps_png/sources/light/pintype_openemit.svg
similarity index 100%
rename from bitmaps_png/sources/pintype_openemit.svg
rename to bitmaps_png/sources/light/pintype_openemit.svg
diff --git a/bitmaps_png/sources/pintype_output.svg b/bitmaps_png/sources/light/pintype_output.svg
similarity index 100%
rename from bitmaps_png/sources/pintype_output.svg
rename to bitmaps_png/sources/light/pintype_output.svg
diff --git a/bitmaps_png/sources/pintype_passive.svg b/bitmaps_png/sources/light/pintype_passive.svg
similarity index 100%
rename from bitmaps_png/sources/pintype_passive.svg
rename to bitmaps_png/sources/light/pintype_passive.svg
diff --git a/bitmaps_png/sources/pintype_powerinput.svg b/bitmaps_png/sources/light/pintype_powerinput.svg
similarity index 100%
rename from bitmaps_png/sources/pintype_powerinput.svg
rename to bitmaps_png/sources/light/pintype_powerinput.svg
diff --git a/bitmaps_png/sources/pintype_poweroutput.svg b/bitmaps_png/sources/light/pintype_poweroutput.svg
similarity index 100%
rename from bitmaps_png/sources/pintype_poweroutput.svg
rename to bitmaps_png/sources/light/pintype_poweroutput.svg
diff --git a/bitmaps_png/sources/plot.svg b/bitmaps_png/sources/light/plot.svg
similarity index 100%
rename from bitmaps_png/sources/plot.svg
rename to bitmaps_png/sources/light/plot.svg
diff --git a/bitmaps_png/sources/polar_coord.svg b/bitmaps_png/sources/light/polar_coord.svg
similarity index 100%
rename from bitmaps_png/sources/polar_coord.svg
rename to bitmaps_png/sources/light/polar_coord.svg
diff --git a/bitmaps_png/sources/post_bom.svg b/bitmaps_png/sources/light/post_bom.svg
similarity index 100%
rename from bitmaps_png/sources/post_bom.svg
rename to bitmaps_png/sources/light/post_bom.svg
diff --git a/bitmaps_png/sources/post_compo.svg b/bitmaps_png/sources/light/post_compo.svg
similarity index 100%
rename from bitmaps_png/sources/post_compo.svg
rename to bitmaps_png/sources/light/post_compo.svg
diff --git a/bitmaps_png/sources/post_d356.svg b/bitmaps_png/sources/light/post_d356.svg
similarity index 100%
rename from bitmaps_png/sources/post_d356.svg
rename to bitmaps_png/sources/light/post_d356.svg
diff --git a/bitmaps_png/sources/post_drill.svg b/bitmaps_png/sources/light/post_drill.svg
similarity index 100%
rename from bitmaps_png/sources/post_drill.svg
rename to bitmaps_png/sources/light/post_drill.svg
diff --git a/bitmaps_png/sources/post_gencad.svg b/bitmaps_png/sources/light/post_gencad.svg
similarity index 100%
rename from bitmaps_png/sources/post_gencad.svg
rename to bitmaps_png/sources/light/post_gencad.svg
diff --git a/bitmaps_png/sources/post_gerber.svg b/bitmaps_png/sources/light/post_gerber.svg
similarity index 100%
rename from bitmaps_png/sources/post_gerber.svg
rename to bitmaps_png/sources/light/post_gerber.svg
diff --git a/bitmaps_png/sources/post_rpt.svg b/bitmaps_png/sources/light/post_rpt.svg
similarity index 100%
rename from bitmaps_png/sources/post_rpt.svg
rename to bitmaps_png/sources/light/post_rpt.svg
diff --git a/bitmaps_png/sources/preference.svg b/bitmaps_png/sources/light/preference.svg
similarity index 100%
rename from bitmaps_png/sources/preference.svg
rename to bitmaps_png/sources/light/preference.svg
diff --git a/bitmaps_png/sources/print_button.svg b/bitmaps_png/sources/light/print_button.svg
similarity index 100%
rename from bitmaps_png/sources/print_button.svg
rename to bitmaps_png/sources/light/print_button.svg
diff --git a/bitmaps_png/sources/project.svg b/bitmaps_png/sources/light/project.svg
similarity index 100%
rename from bitmaps_png/sources/project.svg
rename to bitmaps_png/sources/light/project.svg
diff --git a/bitmaps_png/sources/project_close.svg b/bitmaps_png/sources/light/project_close.svg
similarity index 100%
rename from bitmaps_png/sources/project_close.svg
rename to bitmaps_png/sources/light/project_close.svg
diff --git a/bitmaps_png/sources/project_kicad.svg b/bitmaps_png/sources/light/project_kicad.svg
similarity index 100%
rename from bitmaps_png/sources/project_kicad.svg
rename to bitmaps_png/sources/light/project_kicad.svg
diff --git a/bitmaps_png/sources/ps_diff_pair.svg b/bitmaps_png/sources/light/ps_diff_pair.svg
similarity index 100%
rename from bitmaps_png/sources/ps_diff_pair.svg
rename to bitmaps_png/sources/light/ps_diff_pair.svg
diff --git a/bitmaps_png/sources/ps_diff_pair_gap.svg b/bitmaps_png/sources/light/ps_diff_pair_gap.svg
similarity index 100%
rename from bitmaps_png/sources/ps_diff_pair_gap.svg
rename to bitmaps_png/sources/light/ps_diff_pair_gap.svg
diff --git a/bitmaps_png/sources/ps_diff_pair_tune_length.svg b/bitmaps_png/sources/light/ps_diff_pair_tune_length.svg
similarity index 100%
rename from bitmaps_png/sources/ps_diff_pair_tune_length.svg
rename to bitmaps_png/sources/light/ps_diff_pair_tune_length.svg
diff --git a/bitmaps_png/sources/ps_diff_pair_tune_phase.svg b/bitmaps_png/sources/light/ps_diff_pair_tune_phase.svg
similarity index 100%
rename from bitmaps_png/sources/ps_diff_pair_tune_phase.svg
rename to bitmaps_png/sources/light/ps_diff_pair_tune_phase.svg
diff --git a/bitmaps_png/sources/ps_tune_length.svg b/bitmaps_png/sources/light/ps_tune_length.svg
similarity index 100%
rename from bitmaps_png/sources/ps_tune_length.svg
rename to bitmaps_png/sources/light/ps_tune_length.svg
diff --git a/bitmaps_png/sources/push_pad_settings.svg b/bitmaps_png/sources/light/push_pad_settings.svg
similarity index 100%
rename from bitmaps_png/sources/push_pad_settings.svg
rename to bitmaps_png/sources/light/push_pad_settings.svg
diff --git a/bitmaps_png/sources/puzzle_piece.svg b/bitmaps_png/sources/light/puzzle_piece.svg
similarity index 100%
rename from bitmaps_png/sources/puzzle_piece.svg
rename to bitmaps_png/sources/light/puzzle_piece.svg
diff --git a/bitmaps_png/sources/py_script.svg b/bitmaps_png/sources/light/py_script.svg
similarity index 100%
rename from bitmaps_png/sources/py_script.svg
rename to bitmaps_png/sources/light/py_script.svg
diff --git a/bitmaps_png/sources/reannotate_down_left.svg b/bitmaps_png/sources/light/reannotate_down_left.svg
similarity index 100%
rename from bitmaps_png/sources/reannotate_down_left.svg
rename to bitmaps_png/sources/light/reannotate_down_left.svg
diff --git a/bitmaps_png/sources/reannotate_down_right.svg b/bitmaps_png/sources/light/reannotate_down_right.svg
similarity index 100%
rename from bitmaps_png/sources/reannotate_down_right.svg
rename to bitmaps_png/sources/light/reannotate_down_right.svg
diff --git a/bitmaps_png/sources/reannotate_left_down.svg b/bitmaps_png/sources/light/reannotate_left_down.svg
similarity index 100%
rename from bitmaps_png/sources/reannotate_left_down.svg
rename to bitmaps_png/sources/light/reannotate_left_down.svg
diff --git a/bitmaps_png/sources/reannotate_left_up.svg b/bitmaps_png/sources/light/reannotate_left_up.svg
similarity index 100%
rename from bitmaps_png/sources/reannotate_left_up.svg
rename to bitmaps_png/sources/light/reannotate_left_up.svg
diff --git a/bitmaps_png/sources/reannotate_right_down.svg b/bitmaps_png/sources/light/reannotate_right_down.svg
similarity index 100%
rename from bitmaps_png/sources/reannotate_right_down.svg
rename to bitmaps_png/sources/light/reannotate_right_down.svg
diff --git a/bitmaps_png/sources/reannotate_right_up.svg b/bitmaps_png/sources/light/reannotate_right_up.svg
similarity index 100%
rename from bitmaps_png/sources/reannotate_right_up.svg
rename to bitmaps_png/sources/light/reannotate_right_up.svg
diff --git a/bitmaps_png/sources/reannotate_up_left.svg b/bitmaps_png/sources/light/reannotate_up_left.svg
similarity index 100%
rename from bitmaps_png/sources/reannotate_up_left.svg
rename to bitmaps_png/sources/light/reannotate_up_left.svg
diff --git a/bitmaps_png/sources/reannotate_up_right.svg b/bitmaps_png/sources/light/reannotate_up_right.svg
similarity index 100%
rename from bitmaps_png/sources/reannotate_up_right.svg
rename to bitmaps_png/sources/light/reannotate_up_right.svg
diff --git a/bitmaps_png/sources/recent.svg b/bitmaps_png/sources/light/recent.svg
similarity index 100%
rename from bitmaps_png/sources/recent.svg
rename to bitmaps_png/sources/light/recent.svg
diff --git a/bitmaps_png/sources/redo.svg b/bitmaps_png/sources/light/redo.svg
similarity index 100%
rename from bitmaps_png/sources/redo.svg
rename to bitmaps_png/sources/light/redo.svg
diff --git a/bitmaps_png/sources/refresh.svg b/bitmaps_png/sources/light/refresh.svg
similarity index 100%
rename from bitmaps_png/sources/refresh.svg
rename to bitmaps_png/sources/light/refresh.svg
diff --git a/bitmaps_png/sources/reload.svg b/bitmaps_png/sources/light/reload.svg
similarity index 100%
rename from bitmaps_png/sources/reload.svg
rename to bitmaps_png/sources/light/reload.svg
diff --git a/bitmaps_png/sources/render_mode.svg b/bitmaps_png/sources/light/render_mode.svg
similarity index 100%
rename from bitmaps_png/sources/render_mode.svg
rename to bitmaps_png/sources/light/render_mode.svg
diff --git a/bitmaps_png/sources/rescue.svg b/bitmaps_png/sources/light/rescue.svg
similarity index 100%
rename from bitmaps_png/sources/rescue.svg
rename to bitmaps_png/sources/light/rescue.svg
diff --git a/bitmaps_png/sources/right.svg b/bitmaps_png/sources/light/right.svg
similarity index 100%
rename from bitmaps_png/sources/right.svg
rename to bitmaps_png/sources/light/right.svg
diff --git a/bitmaps_png/sources/rotate_ccw.svg b/bitmaps_png/sources/light/rotate_ccw.svg
similarity index 100%
rename from bitmaps_png/sources/rotate_ccw.svg
rename to bitmaps_png/sources/light/rotate_ccw.svg
diff --git a/bitmaps_png/sources/rotate_ccw_x.svg b/bitmaps_png/sources/light/rotate_ccw_x.svg
similarity index 100%
rename from bitmaps_png/sources/rotate_ccw_x.svg
rename to bitmaps_png/sources/light/rotate_ccw_x.svg
diff --git a/bitmaps_png/sources/rotate_ccw_y.svg b/bitmaps_png/sources/light/rotate_ccw_y.svg
similarity index 100%
rename from bitmaps_png/sources/rotate_ccw_y.svg
rename to bitmaps_png/sources/light/rotate_ccw_y.svg
diff --git a/bitmaps_png/sources/rotate_ccw_z.svg b/bitmaps_png/sources/light/rotate_ccw_z.svg
similarity index 100%
rename from bitmaps_png/sources/rotate_ccw_z.svg
rename to bitmaps_png/sources/light/rotate_ccw_z.svg
diff --git a/bitmaps_png/sources/rotate_cw.svg b/bitmaps_png/sources/light/rotate_cw.svg
similarity index 100%
rename from bitmaps_png/sources/rotate_cw.svg
rename to bitmaps_png/sources/light/rotate_cw.svg
diff --git a/bitmaps_png/sources/rotate_cw_x.svg b/bitmaps_png/sources/light/rotate_cw_x.svg
similarity index 100%
rename from bitmaps_png/sources/rotate_cw_x.svg
rename to bitmaps_png/sources/light/rotate_cw_x.svg
diff --git a/bitmaps_png/sources/rotate_cw_y.svg b/bitmaps_png/sources/light/rotate_cw_y.svg
similarity index 100%
rename from bitmaps_png/sources/rotate_cw_y.svg
rename to bitmaps_png/sources/light/rotate_cw_y.svg
diff --git a/bitmaps_png/sources/rotate_cw_z.svg b/bitmaps_png/sources/light/rotate_cw_z.svg
similarity index 100%
rename from bitmaps_png/sources/rotate_cw_z.svg
rename to bitmaps_png/sources/light/rotate_cw_z.svg
diff --git a/bitmaps_png/sources/router_len_tuner.svg b/bitmaps_png/sources/light/router_len_tuner.svg
similarity index 100%
rename from bitmaps_png/sources/router_len_tuner.svg
rename to bitmaps_png/sources/light/router_len_tuner.svg
diff --git a/bitmaps_png/sources/router_len_tuner_amplitude_decr.svg b/bitmaps_png/sources/light/router_len_tuner_amplitude_decr.svg
similarity index 100%
rename from bitmaps_png/sources/router_len_tuner_amplitude_decr.svg
rename to bitmaps_png/sources/light/router_len_tuner_amplitude_decr.svg
diff --git a/bitmaps_png/sources/router_len_tuner_amplitude_incr.svg b/bitmaps_png/sources/light/router_len_tuner_amplitude_incr.svg
similarity index 100%
rename from bitmaps_png/sources/router_len_tuner_amplitude_incr.svg
rename to bitmaps_png/sources/light/router_len_tuner_amplitude_incr.svg
diff --git a/bitmaps_png/sources/router_len_tuner_dist_decr.svg b/bitmaps_png/sources/light/router_len_tuner_dist_decr.svg
similarity index 100%
rename from bitmaps_png/sources/router_len_tuner_dist_decr.svg
rename to bitmaps_png/sources/light/router_len_tuner_dist_decr.svg
diff --git a/bitmaps_png/sources/router_len_tuner_dist_incr.svg b/bitmaps_png/sources/light/router_len_tuner_dist_incr.svg
similarity index 100%
rename from bitmaps_png/sources/router_len_tuner_dist_incr.svg
rename to bitmaps_png/sources/light/router_len_tuner_dist_incr.svg
diff --git a/bitmaps_png/sources/router_len_tuner_setup.svg b/bitmaps_png/sources/light/router_len_tuner_setup.svg
similarity index 100%
rename from bitmaps_png/sources/router_len_tuner_setup.svg
rename to bitmaps_png/sources/light/router_len_tuner_setup.svg
diff --git a/bitmaps_png/sources/save.svg b/bitmaps_png/sources/light/save.svg
similarity index 100%
rename from bitmaps_png/sources/save.svg
rename to bitmaps_png/sources/light/save.svg
diff --git a/bitmaps_png/sources/save_as.svg b/bitmaps_png/sources/light/save_as.svg
similarity index 100%
rename from bitmaps_png/sources/save_as.svg
rename to bitmaps_png/sources/light/save_as.svg
diff --git a/bitmaps_png/sources/search_tree.svg b/bitmaps_png/sources/light/search_tree.svg
similarity index 100%
rename from bitmaps_png/sources/search_tree.svg
rename to bitmaps_png/sources/light/search_tree.svg
diff --git a/bitmaps_png/sources/select_layer_add_via.svg b/bitmaps_png/sources/light/select_layer_add_via.svg
similarity index 100%
rename from bitmaps_png/sources/select_layer_add_via.svg
rename to bitmaps_png/sources/light/select_layer_add_via.svg
diff --git a/bitmaps_png/sources/select_layer_pair.svg b/bitmaps_png/sources/light/select_layer_pair.svg
similarity index 100%
rename from bitmaps_png/sources/select_layer_pair.svg
rename to bitmaps_png/sources/light/select_layer_pair.svg
diff --git a/bitmaps_png/sources/select_same_sheet.svg b/bitmaps_png/sources/light/select_same_sheet.svg
similarity index 100%
rename from bitmaps_png/sources/select_same_sheet.svg
rename to bitmaps_png/sources/light/select_same_sheet.svg
diff --git a/bitmaps_png/sources/select_w_layer.svg b/bitmaps_png/sources/light/select_w_layer.svg
similarity index 100%
rename from bitmaps_png/sources/select_w_layer.svg
rename to bitmaps_png/sources/light/select_w_layer.svg
diff --git a/bitmaps_png/sources/set_origin.svg b/bitmaps_png/sources/light/set_origin.svg
similarity index 100%
rename from bitmaps_png/sources/set_origin.svg
rename to bitmaps_png/sources/light/set_origin.svg
diff --git a/bitmaps_png/sources/shape_3d.svg b/bitmaps_png/sources/light/shape_3d.svg
similarity index 100%
rename from bitmaps_png/sources/shape_3d.svg
rename to bitmaps_png/sources/light/shape_3d.svg
diff --git a/bitmaps_png/sources/shape_3d_back.svg b/bitmaps_png/sources/light/shape_3d_back.svg
similarity index 100%
rename from bitmaps_png/sources/shape_3d_back.svg
rename to bitmaps_png/sources/light/shape_3d_back.svg
diff --git a/bitmaps_png/sources/sheetset.svg b/bitmaps_png/sources/light/sheetset.svg
similarity index 100%
rename from bitmaps_png/sources/sheetset.svg
rename to bitmaps_png/sources/light/sheetset.svg
diff --git a/bitmaps_png/sources/show_all_back_layers.svg b/bitmaps_png/sources/light/show_all_back_layers.svg
similarity index 100%
rename from bitmaps_png/sources/show_all_back_layers.svg
rename to bitmaps_png/sources/light/show_all_back_layers.svg
diff --git a/bitmaps_png/sources/show_all_copper_layers.svg b/bitmaps_png/sources/light/show_all_copper_layers.svg
similarity index 100%
rename from bitmaps_png/sources/show_all_copper_layers.svg
rename to bitmaps_png/sources/light/show_all_copper_layers.svg
diff --git a/bitmaps_png/sources/show_all_front_layers.svg b/bitmaps_png/sources/light/show_all_front_layers.svg
similarity index 100%
rename from bitmaps_png/sources/show_all_front_layers.svg
rename to bitmaps_png/sources/light/show_all_front_layers.svg
diff --git a/bitmaps_png/sources/show_all_layers.svg b/bitmaps_png/sources/light/show_all_layers.svg
similarity index 100%
rename from bitmaps_png/sources/show_all_layers.svg
rename to bitmaps_png/sources/light/show_all_layers.svg
diff --git a/bitmaps_png/sources/show_back_assembly_layers.svg b/bitmaps_png/sources/light/show_back_assembly_layers.svg
similarity index 100%
rename from bitmaps_png/sources/show_back_assembly_layers.svg
rename to bitmaps_png/sources/light/show_back_assembly_layers.svg
diff --git a/bitmaps_png/sources/show_dcodenumber.svg b/bitmaps_png/sources/light/show_dcodenumber.svg
similarity index 100%
rename from bitmaps_png/sources/show_dcodenumber.svg
rename to bitmaps_png/sources/light/show_dcodenumber.svg
diff --git a/bitmaps_png/sources/show_footprint.svg b/bitmaps_png/sources/light/show_footprint.svg
similarity index 100%
rename from bitmaps_png/sources/show_footprint.svg
rename to bitmaps_png/sources/light/show_footprint.svg
diff --git a/bitmaps_png/sources/show_front_assembly_layers.svg b/bitmaps_png/sources/light/show_front_assembly_layers.svg
similarity index 100%
rename from bitmaps_png/sources/show_front_assembly_layers.svg
rename to bitmaps_png/sources/light/show_front_assembly_layers.svg
diff --git a/bitmaps_png/sources/show_mod_edge.svg b/bitmaps_png/sources/light/show_mod_edge.svg
similarity index 100%
rename from bitmaps_png/sources/show_mod_edge.svg
rename to bitmaps_png/sources/light/show_mod_edge.svg
diff --git a/bitmaps_png/sources/show_no_copper_layers.svg b/bitmaps_png/sources/light/show_no_copper_layers.svg
similarity index 100%
rename from bitmaps_png/sources/show_no_copper_layers.svg
rename to bitmaps_png/sources/light/show_no_copper_layers.svg
diff --git a/bitmaps_png/sources/show_no_layers.svg b/bitmaps_png/sources/light/show_no_layers.svg
similarity index 100%
rename from bitmaps_png/sources/show_no_layers.svg
rename to bitmaps_png/sources/light/show_no_layers.svg
diff --git a/bitmaps_png/sources/show_ratsnest.svg b/bitmaps_png/sources/light/show_ratsnest.svg
similarity index 100%
rename from bitmaps_png/sources/show_ratsnest.svg
rename to bitmaps_png/sources/light/show_ratsnest.svg
diff --git a/bitmaps_png/sources/show_zone.svg b/bitmaps_png/sources/light/show_zone.svg
similarity index 100%
rename from bitmaps_png/sources/show_zone.svg
rename to bitmaps_png/sources/light/show_zone.svg
diff --git a/bitmaps_png/sources/show_zone_disable.svg b/bitmaps_png/sources/light/show_zone_disable.svg
similarity index 100%
rename from bitmaps_png/sources/show_zone_disable.svg
rename to bitmaps_png/sources/light/show_zone_disable.svg
diff --git a/bitmaps_png/sources/show_zone_outline_only.svg b/bitmaps_png/sources/light/show_zone_outline_only.svg
similarity index 100%
rename from bitmaps_png/sources/show_zone_outline_only.svg
rename to bitmaps_png/sources/light/show_zone_outline_only.svg
diff --git a/bitmaps_png/sources/showtrack.svg b/bitmaps_png/sources/light/showtrack.svg
similarity index 100%
rename from bitmaps_png/sources/showtrack.svg
rename to bitmaps_png/sources/light/showtrack.svg
diff --git a/bitmaps_png/sources/sim_add_signal.svg b/bitmaps_png/sources/light/sim_add_signal.svg
similarity index 100%
rename from bitmaps_png/sources/sim_add_signal.svg
rename to bitmaps_png/sources/light/sim_add_signal.svg
diff --git a/bitmaps_png/sources/sim_probe.svg b/bitmaps_png/sources/light/sim_probe.svg
similarity index 100%
rename from bitmaps_png/sources/sim_probe.svg
rename to bitmaps_png/sources/light/sim_probe.svg
diff --git a/bitmaps_png/sources/sim_run.svg b/bitmaps_png/sources/light/sim_run.svg
similarity index 100%
rename from bitmaps_png/sources/sim_run.svg
rename to bitmaps_png/sources/light/sim_run.svg
diff --git a/bitmaps_png/sources/sim_stop.svg b/bitmaps_png/sources/light/sim_stop.svg
similarity index 100%
rename from bitmaps_png/sources/sim_stop.svg
rename to bitmaps_png/sources/light/sim_stop.svg
diff --git a/bitmaps_png/sources/sim_tune.svg b/bitmaps_png/sources/light/sim_tune.svg
similarity index 100%
rename from bitmaps_png/sources/sim_tune.svg
rename to bitmaps_png/sources/light/sim_tune.svg
diff --git a/bitmaps_png/sources/simulator.svg b/bitmaps_png/sources/light/simulator.svg
similarity index 100%
rename from bitmaps_png/sources/simulator.svg
rename to bitmaps_png/sources/light/simulator.svg
diff --git a/bitmaps_png/sources/small_down.svg b/bitmaps_png/sources/light/small_down.svg
similarity index 100%
rename from bitmaps_png/sources/small_down.svg
rename to bitmaps_png/sources/light/small_down.svg
diff --git a/bitmaps_png/sources/small_edit.svg b/bitmaps_png/sources/light/small_edit.svg
similarity index 100%
rename from bitmaps_png/sources/small_edit.svg
rename to bitmaps_png/sources/light/small_edit.svg
diff --git a/bitmaps_png/sources/small_folder.svg b/bitmaps_png/sources/light/small_folder.svg
similarity index 100%
rename from bitmaps_png/sources/small_folder.svg
rename to bitmaps_png/sources/light/small_folder.svg
diff --git a/bitmaps_png/sources/small_library.svg b/bitmaps_png/sources/light/small_library.svg
similarity index 100%
rename from bitmaps_png/sources/small_library.svg
rename to bitmaps_png/sources/light/small_library.svg
diff --git a/bitmaps_png/sources/small_plus.svg b/bitmaps_png/sources/light/small_plus.svg
similarity index 100%
rename from bitmaps_png/sources/small_plus.svg
rename to bitmaps_png/sources/light/small_plus.svg
diff --git a/bitmaps_png/sources/small_refresh.svg b/bitmaps_png/sources/light/small_refresh.svg
similarity index 100%
rename from bitmaps_png/sources/small_refresh.svg
rename to bitmaps_png/sources/light/small_refresh.svg
diff --git a/bitmaps_png/sources/small_trash.svg b/bitmaps_png/sources/light/small_trash.svg
similarity index 100%
rename from bitmaps_png/sources/small_trash.svg
rename to bitmaps_png/sources/light/small_trash.svg
diff --git a/bitmaps_png/sources/small_up.svg b/bitmaps_png/sources/light/small_up.svg
similarity index 100%
rename from bitmaps_png/sources/small_up.svg
rename to bitmaps_png/sources/light/small_up.svg
diff --git a/bitmaps_png/sources/small_warning.svg b/bitmaps_png/sources/light/small_warning.svg
similarity index 100%
rename from bitmaps_png/sources/small_warning.svg
rename to bitmaps_png/sources/light/small_warning.svg
diff --git a/bitmaps_png/sources/special_tools.svg b/bitmaps_png/sources/light/special_tools.svg
similarity index 100%
rename from bitmaps_png/sources/special_tools.svg
rename to bitmaps_png/sources/light/special_tools.svg
diff --git a/bitmaps_png/sources/spreadsheet.svg b/bitmaps_png/sources/light/spreadsheet.svg
similarity index 100%
rename from bitmaps_png/sources/spreadsheet.svg
rename to bitmaps_png/sources/light/spreadsheet.svg
diff --git a/bitmaps_png/sources/stroke_dash.svg b/bitmaps_png/sources/light/stroke_dash.svg
similarity index 100%
rename from bitmaps_png/sources/stroke_dash.svg
rename to bitmaps_png/sources/light/stroke_dash.svg
diff --git a/bitmaps_png/sources/stroke_dashdot.svg b/bitmaps_png/sources/light/stroke_dashdot.svg
similarity index 100%
rename from bitmaps_png/sources/stroke_dashdot.svg
rename to bitmaps_png/sources/light/stroke_dashdot.svg
diff --git a/bitmaps_png/sources/stroke_dot.svg b/bitmaps_png/sources/light/stroke_dot.svg
similarity index 100%
rename from bitmaps_png/sources/stroke_dot.svg
rename to bitmaps_png/sources/light/stroke_dot.svg
diff --git a/bitmaps_png/sources/stroke_solid.svg b/bitmaps_png/sources/light/stroke_solid.svg
similarity index 100%
rename from bitmaps_png/sources/stroke_solid.svg
rename to bitmaps_png/sources/light/stroke_solid.svg
diff --git a/bitmaps_png/sources/swap_layer.svg b/bitmaps_png/sources/light/swap_layer.svg
similarity index 100%
rename from bitmaps_png/sources/swap_layer.svg
rename to bitmaps_png/sources/light/swap_layer.svg
diff --git a/bitmaps_png/sources/switch_corner_rounding_shape.svg b/bitmaps_png/sources/light/switch_corner_rounding_shape.svg
similarity index 100%
rename from bitmaps_png/sources/switch_corner_rounding_shape.svg
rename to bitmaps_png/sources/light/switch_corner_rounding_shape.svg
diff --git a/bitmaps_png/sources/text.svg b/bitmaps_png/sources/light/text.svg
similarity index 100%
rename from bitmaps_png/sources/text.svg
rename to bitmaps_png/sources/light/text.svg
diff --git a/bitmaps_png/sources/text_sketch.svg b/bitmaps_png/sources/light/text_sketch.svg
similarity index 100%
rename from bitmaps_png/sources/text_sketch.svg
rename to bitmaps_png/sources/light/text_sketch.svg
diff --git a/bitmaps_png/sources/three_d.svg b/bitmaps_png/sources/light/three_d.svg
similarity index 100%
rename from bitmaps_png/sources/three_d.svg
rename to bitmaps_png/sources/light/three_d.svg
diff --git a/bitmaps_png/sources/tool_ratsnest.svg b/bitmaps_png/sources/light/tool_ratsnest.svg
similarity index 100%
rename from bitmaps_png/sources/tool_ratsnest.svg
rename to bitmaps_png/sources/light/tool_ratsnest.svg
diff --git a/bitmaps_png/sources/tools.svg b/bitmaps_png/sources/light/tools.svg
similarity index 100%
rename from bitmaps_png/sources/tools.svg
rename to bitmaps_png/sources/light/tools.svg
diff --git a/bitmaps_png/sources/trash.svg b/bitmaps_png/sources/light/trash.svg
similarity index 100%
rename from bitmaps_png/sources/trash.svg
rename to bitmaps_png/sources/light/trash.svg
diff --git a/bitmaps_png/sources/tree_nosel.svg b/bitmaps_png/sources/light/tree_nosel.svg
similarity index 100%
rename from bitmaps_png/sources/tree_nosel.svg
rename to bitmaps_png/sources/light/tree_nosel.svg
diff --git a/bitmaps_png/sources/tree_sel.svg b/bitmaps_png/sources/light/tree_sel.svg
similarity index 100%
rename from bitmaps_png/sources/tree_sel.svg
rename to bitmaps_png/sources/light/tree_sel.svg
diff --git a/bitmaps_png/sources/triangle_down.svg b/bitmaps_png/sources/light/triangle_down.svg
similarity index 100%
rename from bitmaps_png/sources/triangle_down.svg
rename to bitmaps_png/sources/light/triangle_down.svg
diff --git a/bitmaps_png/sources/triangle_right.svg b/bitmaps_png/sources/light/triangle_right.svg
similarity index 100%
rename from bitmaps_png/sources/triangle_right.svg
rename to bitmaps_png/sources/light/triangle_right.svg
diff --git a/bitmaps_png/sources/tune_diff_pair_length_legend.png b/bitmaps_png/sources/light/tune_diff_pair_length_legend.png
similarity index 100%
rename from bitmaps_png/sources/tune_diff_pair_length_legend.png
rename to bitmaps_png/sources/light/tune_diff_pair_length_legend.png
diff --git a/bitmaps_png/sources/tune_diff_pair_length_legend.svg b/bitmaps_png/sources/light/tune_diff_pair_length_legend.svg
similarity index 100%
rename from bitmaps_png/sources/tune_diff_pair_length_legend.svg
rename to bitmaps_png/sources/light/tune_diff_pair_length_legend.svg
diff --git a/bitmaps_png/sources/tune_diff_pair_skew_legend.png b/bitmaps_png/sources/light/tune_diff_pair_skew_legend.png
similarity index 100%
rename from bitmaps_png/sources/tune_diff_pair_skew_legend.png
rename to bitmaps_png/sources/light/tune_diff_pair_skew_legend.png
diff --git a/bitmaps_png/sources/tune_single_track_length_legend.png b/bitmaps_png/sources/light/tune_single_track_length_legend.png
similarity index 100%
rename from bitmaps_png/sources/tune_single_track_length_legend.png
rename to bitmaps_png/sources/light/tune_single_track_length_legend.png
diff --git a/bitmaps_png/sources/undo.svg b/bitmaps_png/sources/light/undo.svg
similarity index 100%
rename from bitmaps_png/sources/undo.svg
rename to bitmaps_png/sources/light/undo.svg
diff --git a/bitmaps_png/sources/unit_inch.svg b/bitmaps_png/sources/light/unit_inch.svg
similarity index 100%
rename from bitmaps_png/sources/unit_inch.svg
rename to bitmaps_png/sources/light/unit_inch.svg
diff --git a/bitmaps_png/sources/unit_mil.svg b/bitmaps_png/sources/light/unit_mil.svg
similarity index 100%
rename from bitmaps_png/sources/unit_mil.svg
rename to bitmaps_png/sources/light/unit_mil.svg
diff --git a/bitmaps_png/sources/unit_mm.svg b/bitmaps_png/sources/light/unit_mm.svg
similarity index 100%
rename from bitmaps_png/sources/unit_mm.svg
rename to bitmaps_png/sources/light/unit_mm.svg
diff --git a/bitmaps_png/sources/unknown.svg b/bitmaps_png/sources/light/unknown.svg
similarity index 100%
rename from bitmaps_png/sources/unknown.svg
rename to bitmaps_png/sources/light/unknown.svg
diff --git a/bitmaps_png/sources/unlocked.svg b/bitmaps_png/sources/light/unlocked.svg
similarity index 100%
rename from bitmaps_png/sources/unlocked.svg
rename to bitmaps_png/sources/light/unlocked.svg
diff --git a/bitmaps_png/sources/unzip.svg b/bitmaps_png/sources/light/unzip.svg
similarity index 100%
rename from bitmaps_png/sources/unzip.svg
rename to bitmaps_png/sources/light/unzip.svg
diff --git a/bitmaps_png/sources/up.svg b/bitmaps_png/sources/light/up.svg
similarity index 100%
rename from bitmaps_png/sources/up.svg
rename to bitmaps_png/sources/light/up.svg
diff --git a/bitmaps_png/sources/update_pcb_from_sch.svg b/bitmaps_png/sources/light/update_pcb_from_sch.svg
similarity index 100%
rename from bitmaps_png/sources/update_pcb_from_sch.svg
rename to bitmaps_png/sources/light/update_pcb_from_sch.svg
diff --git a/bitmaps_png/sources/update_sch_from_pcb.svg b/bitmaps_png/sources/light/update_sch_from_pcb.svg
similarity index 100%
rename from bitmaps_png/sources/update_sch_from_pcb.svg
rename to bitmaps_png/sources/light/update_sch_from_pcb.svg
diff --git a/bitmaps_png/sources/uploading.svg b/bitmaps_png/sources/light/uploading.svg
similarity index 100%
rename from bitmaps_png/sources/uploading.svg
rename to bitmaps_png/sources/light/uploading.svg
diff --git a/bitmaps_png/sources/via.svg b/bitmaps_png/sources/light/via.svg
similarity index 100%
rename from bitmaps_png/sources/via.svg
rename to bitmaps_png/sources/light/via.svg
diff --git a/bitmaps_png/sources/via_annulus.svg b/bitmaps_png/sources/light/via_annulus.svg
similarity index 100%
rename from bitmaps_png/sources/via_annulus.svg
rename to bitmaps_png/sources/light/via_annulus.svg
diff --git a/bitmaps_png/sources/via_buried.svg b/bitmaps_png/sources/light/via_buried.svg
similarity index 100%
rename from bitmaps_png/sources/via_buried.svg
rename to bitmaps_png/sources/light/via_buried.svg
diff --git a/bitmaps_png/sources/via_diameter.svg b/bitmaps_png/sources/light/via_diameter.svg
similarity index 100%
rename from bitmaps_png/sources/via_diameter.svg
rename to bitmaps_png/sources/light/via_diameter.svg
diff --git a/bitmaps_png/sources/via_hole_diameter.svg b/bitmaps_png/sources/light/via_hole_diameter.svg
similarity index 100%
rename from bitmaps_png/sources/via_hole_diameter.svg
rename to bitmaps_png/sources/light/via_hole_diameter.svg
diff --git a/bitmaps_png/sources/via_microvia.svg b/bitmaps_png/sources/light/via_microvia.svg
similarity index 100%
rename from bitmaps_png/sources/via_microvia.svg
rename to bitmaps_png/sources/light/via_microvia.svg
diff --git a/bitmaps_png/sources/via_sketch.svg b/bitmaps_png/sources/light/via_sketch.svg
similarity index 100%
rename from bitmaps_png/sources/via_sketch.svg
rename to bitmaps_png/sources/light/via_sketch.svg
diff --git a/bitmaps_png/sources/visibility.svg b/bitmaps_png/sources/light/visibility.svg
similarity index 100%
rename from bitmaps_png/sources/visibility.svg
rename to bitmaps_png/sources/light/visibility.svg
diff --git a/bitmaps_png/sources/visibility_off.svg b/bitmaps_png/sources/light/visibility_off.svg
similarity index 100%
rename from bitmaps_png/sources/visibility_off.svg
rename to bitmaps_png/sources/light/visibility_off.svg
diff --git a/bitmaps_png/sources/width_track.svg b/bitmaps_png/sources/light/width_track.svg
similarity index 100%
rename from bitmaps_png/sources/width_track.svg
rename to bitmaps_png/sources/light/width_track.svg
diff --git a/bitmaps_png/sources/width_track_via.svg b/bitmaps_png/sources/light/width_track_via.svg
similarity index 100%
rename from bitmaps_png/sources/width_track_via.svg
rename to bitmaps_png/sources/light/width_track_via.svg
diff --git a/bitmaps_png/sources/wizard_add_fplib_icon.svg b/bitmaps_png/sources/light/wizard_add_fplib_icon.svg
similarity index 100%
rename from bitmaps_png/sources/wizard_add_fplib_icon.svg
rename to bitmaps_png/sources/light/wizard_add_fplib_icon.svg
diff --git a/bitmaps_png/sources/www.svg b/bitmaps_png/sources/light/www.svg
similarity index 100%
rename from bitmaps_png/sources/www.svg
rename to bitmaps_png/sources/light/www.svg
diff --git a/bitmaps_png/sources/zip.svg b/bitmaps_png/sources/light/zip.svg
similarity index 100%
rename from bitmaps_png/sources/zip.svg
rename to bitmaps_png/sources/light/zip.svg
diff --git a/bitmaps_png/sources/zone_duplicate.svg b/bitmaps_png/sources/light/zone_duplicate.svg
similarity index 100%
rename from bitmaps_png/sources/zone_duplicate.svg
rename to bitmaps_png/sources/light/zone_duplicate.svg
diff --git a/bitmaps_png/sources/zone_fillet.svg b/bitmaps_png/sources/light/zone_fillet.svg
similarity index 100%
rename from bitmaps_png/sources/zone_fillet.svg
rename to bitmaps_png/sources/light/zone_fillet.svg
diff --git a/bitmaps_png/sources/zone_unfill.svg b/bitmaps_png/sources/light/zone_unfill.svg
similarity index 100%
rename from bitmaps_png/sources/zone_unfill.svg
rename to bitmaps_png/sources/light/zone_unfill.svg
diff --git a/bitmaps_png/sources/zoom_area.svg b/bitmaps_png/sources/light/zoom_area.svg
similarity index 92%
rename from bitmaps_png/sources/zoom_area.svg
rename to bitmaps_png/sources/light/zoom_area.svg
index 73f3787dc7..d9a6204624 100755
--- a/bitmaps_png/sources/zoom_area.svg
+++ b/bitmaps_png/sources/light/zoom_area.svg
@@ -12,7 +12,7 @@
    viewBox="0 0 24 24"
    version="1.1"
    sodipodi:docname="zoom_area.svg"
-   inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
+   inkscape:version="1.0.2 (1.0.2+r75+1)"
    inkscape:export-filename="/Users/jeff/kicad_dev/kicad/bitmaps_png/png_26/zoom_area.png"
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96">
@@ -25,16 +25,16 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1251"
-     inkscape:window-height="755"
+     inkscape:window-width="2560"
+     inkscape:window-height="1371"
      id="namedview30"
      showgrid="true"
      inkscape:zoom="15.925183"
-     inkscape:cx="8.288533"
+     inkscape:cx="-5.6202554"
      inkscape:cy="10.891747"
      inkscape:window-x="0"
-     inkscape:window-y="303"
-     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
      inkscape:document-rotation="0"
      inkscape:current-layer="Слой_1">
     <inkscape:grid
@@ -86,7 +86,7 @@
      class="cls-3"
      d="M 6.966314,3.9662778 14.738805,11.118183 11.5,11.322977 c 0.315389,0.71982 0.783472,1.780474 1.191472,2.706961 a 1.1975088,1.1975088 0 0 1 -0.616525,1.579702 v 0 A 1.1974385,1.1974385 0 0 1 10.497303,14.996234 C 10.089037,14.069866 9.6203702,13.007786 9.3037921,12.285556 l -2.3460158,2.243121 z"
      id="path15"
-     style="fill:#888888;stroke:none;stroke-width:0.703755;stroke-opacity:1;fill-opacity:1" />
+     style="fill:#909090;stroke:none;stroke-width:0.703755;stroke-opacity:1;fill-opacity:1" />
   <path
      class="cls-1"
      d="M 9.9976483,18.999997 A 8.998129,8.9999987 0 1 1 16.362105,3.6373769 v 0 A 8.9954858,8.9973549 0 0 1 9.9976483,18.999997 Z m 0,-16.2787299 A 7.2800339,7.2815466 0 1 0 15.148695,4.8510391 7.2612755,7.2627843 0 0 0 9.9976483,2.7216082 Z"
diff --git a/bitmaps_png/sources/zoom_auto_fit_in_page.svg b/bitmaps_png/sources/light/zoom_auto_fit_in_page.svg
similarity index 100%
rename from bitmaps_png/sources/zoom_auto_fit_in_page.svg
rename to bitmaps_png/sources/light/zoom_auto_fit_in_page.svg
diff --git a/bitmaps_png/sources/zoom_center_on_screen.svg b/bitmaps_png/sources/light/zoom_center_on_screen.svg
similarity index 100%
rename from bitmaps_png/sources/zoom_center_on_screen.svg
rename to bitmaps_png/sources/light/zoom_center_on_screen.svg
diff --git a/bitmaps_png/sources/zoom_fit_in_page.svg b/bitmaps_png/sources/light/zoom_fit_in_page.svg
similarity index 100%
rename from bitmaps_png/sources/zoom_fit_in_page.svg
rename to bitmaps_png/sources/light/zoom_fit_in_page.svg
diff --git a/bitmaps_png/sources/zoom_fit_to_objects.svg b/bitmaps_png/sources/light/zoom_fit_to_objects.svg
similarity index 100%
rename from bitmaps_png/sources/zoom_fit_to_objects.svg
rename to bitmaps_png/sources/light/zoom_fit_to_objects.svg
diff --git a/bitmaps_png/sources/zoom_in.svg b/bitmaps_png/sources/light/zoom_in.svg
similarity index 100%
rename from bitmaps_png/sources/zoom_in.svg
rename to bitmaps_png/sources/light/zoom_in.svg
diff --git a/bitmaps_png/sources/zoom_out.svg b/bitmaps_png/sources/light/zoom_out.svg
similarity index 100%
rename from bitmaps_png/sources/zoom_out.svg
rename to bitmaps_png/sources/light/zoom_out.svg
diff --git a/bitmaps_png/sources/zoom_selection.svg b/bitmaps_png/sources/light/zoom_selection.svg
similarity index 100%
rename from bitmaps_png/sources/zoom_selection.svg
rename to bitmaps_png/sources/light/zoom_selection.svg