Icons: use common prefix for small 16x16

5 years ago · 154e19b6e7
52 changed files with 732 additions and 732 deletions
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@ -65,7 +65,6 @@ option( MAINTAIN_PNGS

 # small icons (16x16) needed in listboxes and dialog buttons
 set( BMAPS_SMALL
-    folder
    icon_bitmap2component_16
    icon_eeschema_16
    icon_gerbview_16
@ -99,13 +98,14 @@ set( BMAPS_SMALL
    pintype_opencoll
    pintype_openemit
    pintype_noconnect
-    refresh
    small_down
    small_edit
+    small_folder
    small_library
    small_plus
+    small_refresh
+    small_trash
    small_up
-    trash
    tree_nosel
    tree_sel
    triangle_down
@ -396,7 +396,7 @@ set( BMAPS_MID
    py_script
    recent
    redo
-    refresh24
+    refresh
    reload2
    reload
    render_mode
@ -464,7 +464,7 @@ set( BMAPS_MID
    three_d
    tool_ratsnest
    tools
-    trash24
+    trash
    undo
    unit_inch
    unit_mil
--- a/bitmaps_png/cpp_16/small_folder.cpp
+++ b/bitmaps_png/cpp_16/small_folder.cpp
@ -16,6 +16,6 @@ static const unsigned char png[] = {
 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };

-const BITMAP_OPAQUE folder_xpm[1] = {{ png, sizeof( png ), "folder_xpm" }};
+const BITMAP_OPAQUE small_folder_xpm[1] = {{ png, sizeof( png ), "small_folder_xpm" }};

 //EOF
--- a/bitmaps_png/cpp_16/small_refresh.cpp
+++ b/bitmaps_png/cpp_16/small_refresh.cpp
@ -28,6 +28,6 @@ static const unsigned char png[] = {
 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };

-const BITMAP_OPAQUE refresh_xpm[1] = {{ png, sizeof( png ), "refresh_xpm" }};
+const BITMAP_OPAQUE small_refresh_xpm[1] = {{ png, sizeof( png ), "small_refresh_xpm" }};

 //EOF
--- a/bitmaps_png/cpp_16/small_trash.cpp
+++ b/bitmaps_png/cpp_16/small_trash.cpp
@ -34,6 +34,6 @@ static const unsigned char png[] = {
 0x82,
 };

-const BITMAP_OPAQUE trash_xpm[1] = {{ png, sizeof( png ), "trash_xpm" }};
+const BITMAP_OPAQUE small_trash_xpm[1] = {{ png, sizeof( png ), "small_trash_xpm" }};

 //EOF
--- a/bitmaps_png/cpp_24/refresh24.cpp
+++ b/bitmaps_png/cpp_24/refresh24.cpp
@ -38,6 +38,6 @@ static const unsigned char png[] = {
 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };

-const BITMAP_OPAQUE refresh24_xpm[1] = {{ png, sizeof( png ), "refresh24_xpm" }};
+const BITMAP_OPAQUE refresh_xpm[1] = {{ png, sizeof( png ), "refresh_xpm" }};

 //EOF
--- a/bitmaps_png/cpp_24/trash24.cpp
+++ b/bitmaps_png/cpp_24/trash24.cpp
@ -46,6 +46,6 @@ static const unsigned char png[] = {
 0xe3, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };

-const BITMAP_OPAQUE trash24_xpm[1] = {{ png, sizeof( png ), "trash24_xpm" }};
+const BITMAP_OPAQUE trash_xpm[1] = {{ png, sizeof( png ), "trash_xpm" }};

 //EOF
--- a/bitmaps_png/include/bitmaps_png/bitmaps_list.h
+++ b/bitmaps_png/include/bitmaps_png/bitmaps_list.h
@ -178,7 +178,6 @@ EXTERN_BITMAP( find_replace_xpm )
 EXTERN_BITMAP( flag_xpm )
 EXTERN_BITMAP( flag_remove_xpm )
 EXTERN_BITMAP( flip_board_xpm )
-EXTERN_BITMAP( folder_xpm )
 EXTERN_BITMAP( fonts_xpm )
 EXTERN_BITMAP( footprint_browser_xpm )
 EXTERN_BITMAP( footprint_text_xpm )
@ -430,7 +429,6 @@ EXTERN_BITMAP( recent_xpm )
 EXTERN_BITMAP( redo_xpm )
 EXTERN_BITMAP( red_xpm )
 EXTERN_BITMAP( refresh_xpm )
-EXTERN_BITMAP( refresh24_xpm )
 EXTERN_BITMAP( render_mode_xpm )
 EXTERN_BITMAP( reload2_xpm )
 EXTERN_BITMAP( reload_xpm )
@ -487,8 +485,11 @@ EXTERN_BITMAP( show_zone_disable_xpm )
 EXTERN_BITMAP( show_zone_outline_only_xpm )
 EXTERN_BITMAP( small_down_xpm )
 EXTERN_BITMAP( small_edit_xpm )
+EXTERN_BITMAP( small_folder_xpm )
 EXTERN_BITMAP( small_library_xpm )
 EXTERN_BITMAP( small_plus_xpm )
+EXTERN_BITMAP( small_refresh_xpm )
+EXTERN_BITMAP( small_trash_xpm )
 EXTERN_BITMAP( small_up_xpm )
 EXTERN_BITMAP( special_tools_xpm )
 EXTERN_BITMAP( spreadsheet_xpm )
@ -508,7 +509,6 @@ EXTERN_BITMAP( track_locked_xpm )
 EXTERN_BITMAP( track_sketch_xpm )
 EXTERN_BITMAP( track_unlocked_xpm )
 EXTERN_BITMAP( trash_xpm )
-EXTERN_BITMAP( trash24_xpm )
 EXTERN_BITMAP( tree_nosel_xpm )
 EXTERN_BITMAP( tree_sel_xpm )
 EXTERN_BITMAP( triangle_right_xpm )
--- a/bitmaps_png/sources/refresh.svg
+++ b/bitmaps_png/sources/refresh.svg
@ -9,12 +9,10 @@
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   id="Слой_1"
   data-name="Слой 1"
-   viewBox="0 0 16 16"
+   viewBox="0 0 24 24"
   version="1.1"
   sodipodi:docname="refresh.svg"
-   inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
-   width="16"
-   height="16">
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
  <sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
@ -25,14 +23,14 @@
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="1609"
-     inkscape:window-height="1035"
+     inkscape:window-height="1286"
     id="namedview30"
     showgrid="true"
-     inkscape:zoom="37.437403"
-     inkscape:cx="7.2655863"
-     inkscape:cy="9.2451712"
+     inkscape:zoom="27.961538"
+     inkscape:cx="3.3259971"
+     inkscape:cy="13"
     inkscape:window-x="0"
-     inkscape:window-y="23"
+     inkscape:window-y="37"
     inkscape:window-maximized="0"
     inkscape:document-rotation="0"
     inkscape:current-layer="Слой_1">
@ -55,7 +53,7 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>refresh</dc:title>
+        <dc:title>add_arc</dc:title>
      </cc:Work>
      <cc:License
         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
@ -83,24 +81,20 @@
     id="title26817">refresh</title>
  <path
     class="cls-1"
-     d="M 2.5984,5.3419694 A 6.12144,6.1212522 0 0 1 13.7689,5.9320513"
-     id="path26819"
-     style="stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" />
+     d="M 2.95,7.57 A 10.2024,10.2024 0 0 1 21.5675,8.5535"
+     id="path26819" />
  <path
     class="cls-1"
-     d="M 13.45006,10.609808 A 6.11622,6.1160323 0 0 1 2.07694,9.5023617"
-     id="path26821"
-     style="stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" />
+     d="M 21.0361,16.35 A 10.1937,10.1937 0 0 1 2.0809,14.5042"
+     id="path26821" />
  <polyline
     class="cls-1"
     points="17.701 17.481 22.198 17.078 23.071 21.738"
     id="polyline26823"
-     transform="matrix(0.6,0,0,0.59998159,0.2284,0.20012715)"
-     style="stroke-width:3.33338447;stroke-miterlimit:4;stroke-dasharray:none" />
+     transform="translate(-1,-1)" />
  <polyline
     class="cls-1"
     points="8.441 8.231 3.945 8.634 3.071 3.974"
     id="polyline26825"
-     transform="matrix(0.6,0,0,0.59998159,0.2284,0.20012715)"
-     style="stroke-width:3.33338447;stroke-miterlimit:4;stroke-dasharray:none" />
+     transform="translate(-1,-1)" />
 </svg>
--- a/bitmaps_png/sources/small_folder.svg
+++ b/bitmaps_png/sources/small_folder.svg
--- a/bitmaps_png/sources/small_refresh.svg
+++ b/bitmaps_png/sources/small_refresh.svg
@ -9,10 +9,12 @@
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   id="Слой_1"
   data-name="Слой 1"
-   viewBox="0 0 24 24"
+   viewBox="0 0 16 16"
   version="1.1"
   sodipodi:docname="refresh.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
+   width="16"
+   height="16">
  <sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
@ -23,14 +25,14 @@
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="1609"
-     inkscape:window-height="1286"
+     inkscape:window-height="1035"
     id="namedview30"
     showgrid="true"
-     inkscape:zoom="27.961538"
-     inkscape:cx="3.3259971"
-     inkscape:cy="13"
+     inkscape:zoom="37.437403"
+     inkscape:cx="7.2655863"
+     inkscape:cy="9.2451712"
     inkscape:window-x="0"
-     inkscape:window-y="37"
+     inkscape:window-y="23"
     inkscape:window-maximized="0"
     inkscape:document-rotation="0"
     inkscape:current-layer="Слой_1">
@ -53,7 +55,7 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>add_arc</dc:title>
+        <dc:title>refresh</dc:title>
      </cc:Work>
      <cc:License
         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
@ -81,20 +83,24 @@
     id="title26817">refresh</title>
  <path
     class="cls-1"
-     d="M 2.95,7.57 A 10.2024,10.2024 0 0 1 21.5675,8.5535"
-     id="path26819" />
+     d="M 2.5984,5.3419694 A 6.12144,6.1212522 0 0 1 13.7689,5.9320513"
+     id="path26819"
+     style="stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" />
  <path
     class="cls-1"
-     d="M 21.0361,16.35 A 10.1937,10.1937 0 0 1 2.0809,14.5042"
-     id="path26821" />
+     d="M 13.45006,10.609808 A 6.11622,6.1160323 0 0 1 2.07694,9.5023617"
+     id="path26821"
+     style="stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" />
  <polyline
     class="cls-1"
     points="17.701 17.481 22.198 17.078 23.071 21.738"
     id="polyline26823"
-     transform="translate(-1,-1)" />
+     transform="matrix(0.6,0,0,0.59998159,0.2284,0.20012715)"
+     style="stroke-width:3.33338447;stroke-miterlimit:4;stroke-dasharray:none" />
  <polyline
     class="cls-1"
     points="8.441 8.231 3.945 8.634 3.071 3.974"
     id="polyline26825"
-     transform="translate(-1,-1)" />
+     transform="matrix(0.6,0,0,0.59998159,0.2284,0.20012715)"
+     style="stroke-width:3.33338447;stroke-miterlimit:4;stroke-dasharray:none" />
 </svg>
--- a/bitmaps_png/sources/small_trash.svg
+++ b/bitmaps_png/sources/small_trash.svg
@ -0,0 +1,573 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   width="16"
+   version="1.0"
+   id="svg2"
+   inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
+   sodipodi:docname="trash.svg"
+   inkscape:export-filename="/Users/jeff/kicad_dev/kicad/bitmaps_png/png_16/trash2.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <metadata
+     id="metadata175">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1035"
+     id="namedview173"
+     showgrid="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:zoom="45.202419"
+     inkscape:cx="4.9942591"
+     inkscape:cy="7.1101731"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:document-rotation="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3162"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5"
+       spacingy="0.5"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3884">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3886" />
+      <stop
+         id="stop3896"
+         offset="0.2"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#f6f6f6;stop-opacity:1;"
+         offset="0.41666666"
+         id="stop3898" />
+      <stop
+         id="stop3894"
+         offset="0.5714286"
+         style="stop-color:#ededed;stop-opacity:1;" />
+      <stop
+         id="stop3892"
+         offset="0.76190478"
+         style="stop-color:#e6e6e6;stop-opacity:1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3888" />
+    </linearGradient>
+    <linearGradient
+       id="a">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <linearGradient
+       id="b">
+      <stop
+         offset="0"
+         id="stop12" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop14" />
+    </linearGradient>
+    <radialGradient
+       id="al"
+       gradientUnits="userSpaceOnUse"
+       cy="12.219"
+       cx="23.969"
+       gradientTransform="matrix(0.94564,0,0,0.32574,1.3029,8.2386)"
+       r="14.969">
+      <stop
+         offset="0"
+         id="stop17" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop19" />
+    </radialGradient>
+    <linearGradient
+       id="ar"
+       y2="17.860001"
+       gradientUnits="userSpaceOnUse"
+       x2="6.1231999"
+       y1="17.860001"
+       x1="45.631001">
+      <stop
+         stop-color="#555753"
+         offset="0"
+         id="stop22" />
+      <stop
+         stop-color="#d5d9d2"
+         offset=".61818"
+         id="stop24" />
+      <stop
+         stop-color="#888a85"
+         offset="1"
+         id="stop26" />
+    </linearGradient>
+    <linearGradient
+       id="as"
+       y2="39.25"
+       gradientUnits="userSpaceOnUse"
+       x2="42.269001"
+       y1="39.25"
+       x1="18.871">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop29" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop31" />
+    </linearGradient>
+    <linearGradient
+       id="at"
+       y2="26.125"
+       xlink:href="#b"
+       gradientUnits="userSpaceOnUse"
+       x2="25.976999"
+       gradientTransform="matrix(0.83333,0,0,1,3.6667,1)"
+       y1="26.125"
+       x1="21.096001" />
+    <linearGradient
+       id="au"
+       y2="25.275999"
+       xlink:href="#b"
+       gradientUnits="userSpaceOnUse"
+       x2="31.362"
+       gradientTransform="matrix(1.1429,0,0,1,-3.8571,1)"
+       y1="25.188"
+       x1="26.997" />
+    <linearGradient
+       id="av"
+       y2="24.5"
+       xlink:href="#b"
+       gradientUnits="userSpaceOnUse"
+       x2="37.535"
+       gradientTransform="matrix(1.25,0,0,1,-8.875,1)"
+       y1="24.5"
+       x1="32.699001" />
+    <linearGradient
+       id="aw"
+       y2="25"
+       xlink:href="#b"
+       gradientUnits="userSpaceOnUse"
+       x2="15.672"
+       gradientTransform="matrix(0.83333,0,0,1,2.25,1)"
+       y1="24.827"
+       x1="6.8744998" />
+    <linearGradient
+       id="ax"
+       y2="25.562"
+       xlink:href="#b"
+       gradientUnits="userSpaceOnUse"
+       x2="20.114"
+       gradientTransform="matrix(1.1429,0,0,1,-3,1)"
+       y1="25.620001"
+       x1="12.02" />
+    <linearGradient
+       id="ay"
+       y2="39.022999"
+       gradientUnits="userSpaceOnUse"
+       x2="21.969999"
+       gradientTransform="matrix(0.61028,0,0,1,9.3454,0)"
+       y1="41"
+       x1="27.006001">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop39" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop41" />
+    </linearGradient>
+    <linearGradient
+       id="az"
+       y2="37.973"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       x2="30"
+       gradientTransform="translate(-0.99704,5.0008e-4)"
+       y1="41.207001"
+       x1="33.398998" />
+    <linearGradient
+       id="ba"
+       y2="38.460999"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       x2="16.620001"
+       gradientTransform="translate(1.0052,-5.6326e-6)"
+       y1="39.688"
+       x1="20.002001" />
+    <linearGradient
+       id="bb"
+       y2="32.848"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       x2="36.562"
+       y1="40.759998"
+       x1="36.562" />
+    <linearGradient
+       id="bc"
+       y2="29.922001"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       x2="11.5"
+       y1="38.062"
+       x1="11.5" />
+    <linearGradient
+       id="ad"
+       y2="38.210999"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       x2="17.216"
+       gradientTransform="matrix(0.69296,0,0,1,2.0699,-0.97775)"
+       y1="38.813"
+       x1="21.445" />
+    <linearGradient
+       id="ae"
+       y2="37.973"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       x2="30"
+       gradientTransform="matrix(0.64642,0,0,1,14.071,-0.9995)"
+       y1="41.207001"
+       x1="33.398998" />
+    <radialGradient
+       id="am"
+       gradientUnits="userSpaceOnUse"
+       cy="18.468"
+       cx="24"
+       gradientTransform="matrix(1,0,0,0.30363,0,14.142)"
+       r="14">
+      <stop
+         offset="0"
+         id="stop50" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop52" />
+    </radialGradient>
+    <linearGradient
+       id="af"
+       y2="11.686"
+       gradientUnits="userSpaceOnUse"
+       x2="5.2537999"
+       y1="11.686"
+       x1="43.299999">
+      <stop
+         stop-color="#6d6f6a"
+         offset="0"
+         id="stop55" />
+      <stop
+         stop-color="#e7e8e5"
+         offset=".61818"
+         id="stop57" />
+      <stop
+         stop-color="#999b96"
+         offset="1"
+         id="stop59" />
+    </linearGradient>
+    <linearGradient
+       id="c"
+       y2="7.75"
+       gradientUnits="userSpaceOnUse"
+       x2="19"
+       y1="7.75"
+       x1="29">
+      <stop
+         stop-color="#95998e"
+         offset="0"
+         id="stop62" />
+      <stop
+         stop-color="#fff"
+         offset=".59524"
+         id="stop64" />
+      <stop
+         stop-color="#dfdfdb"
+         offset="1"
+         id="stop66" />
+    </linearGradient>
+    <linearGradient
+       id="ag"
+       y2="20.608999"
+       gradientUnits="userSpaceOnUse"
+       x2="15.96"
+       y1="10.081"
+       x1="26.965">
+      <stop
+         stop-color="#babdb6"
+         offset="0"
+         id="stop69" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop71" />
+    </linearGradient>
+    <radialGradient
+       id="an"
+       gradientUnits="userSpaceOnUse"
+       cy="12.5"
+       cx="24"
+       gradientTransform="matrix(1,0,0,0.3871,0,7.6613)"
+       r="15.5">
+      <stop
+         offset="0"
+         id="stop74" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop76" />
+    </radialGradient>
+    <linearGradient
+       id="ah"
+       y2="16.375"
+       gradientUnits="userSpaceOnUse"
+       x2="46.327999"
+       y1="16.375"
+       x1="18.247">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop79" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop81" />
+    </linearGradient>
+    <radialGradient
+       id="ao"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       cy="27.858"
+       cx="18.034"
+       gradientTransform="matrix(1.2188,-0.17313,0.053174,0.2095,-4.4516,12.172)"
+       r="15.447" />
+    <radialGradient
+       id="ap"
+       gradientUnits="userSpaceOnUse"
+       cy="10.75"
+       cx="18.75"
+       gradientTransform="matrix(1,0,0,0.63636,0,3.9091)"
+       r="2.75">
+      <stop
+         offset="0"
+         id="stop85" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop87" />
+    </radialGradient>
+    <linearGradient
+       id="ai"
+       y2="10.809"
+       gradientUnits="userSpaceOnUse"
+       x2="26.127001"
+       y1="9.5279999"
+       x1="26.464001">
+      <stop
+         stop-color="#888a85"
+         offset="0"
+         id="stop90" />
+      <stop
+         stop-color="#d3d7cf"
+         offset="1"
+         id="stop92" />
+    </linearGradient>
+    <linearGradient
+       id="aj"
+       y2="-10.483"
+       gradientUnits="userSpaceOnUse"
+       x2="21.674"
+       y1="-8.5719004"
+       x1="21.084">
+      <stop
+         stop-color="#d3d7cf"
+         offset="0"
+         id="stop95" />
+      <stop
+         stop-color="#eeeeec"
+         offset="1"
+         id="stop97" />
+    </linearGradient>
+    <linearGradient
+       id="ak"
+       y2="10.94"
+       gradientUnits="userSpaceOnUse"
+       x2="6.25"
+       gradientTransform="translate(18)"
+       y1="8.2417002"
+       x1="6.25">
+      <stop
+         stop-opacity=".32317"
+         offset="0"
+         id="stop100" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop102" />
+    </linearGradient>
+    <radialGradient
+       id="aq"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       cy="17.987"
+       cx="12.143"
+       gradientTransform="matrix(1.6798,-0.03179,0.0072084,0.21318,-9.2227,10.39)"
+       r="15.447" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#c"
+       id="linearGradient3152"
+       gradientUnits="userSpaceOnUse"
+       x1="29"
+       y1="7.75"
+       x2="19"
+       y2="7.75" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#ap"
+       id="radialGradient3154"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.63636,0,3.9091)"
+       cx="18.75"
+       cy="10.75"
+       r="2.75" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#ap"
+       id="radialGradient3156"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.63636,0,3.9091)"
+       cx="18.75"
+       cy="10.75"
+       r="2.75" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#ap"
+       id="radialGradient3158"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.63636,0,3.9091)"
+       cx="18.75"
+       cy="10.75"
+       r="2.75" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#c"
+       id="linearGradient3160"
+       gradientUnits="userSpaceOnUse"
+       x1="29"
+       y1="7.75"
+       x2="19"
+       y2="7.75" />
+  </defs>
+  <path
+     id="path3871"
+     style="fill:#f2f2f2;fill-opacity:1;stroke:#545454;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 2.2242716,2.5440772 4.3648243,14.5 C 6.8211677,15.161041 9.2008841,15.172273 11.5,14.5 L 13.640553,2.5440772"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 1.72,2 C 5.7764652,2.7259314 9.9932352,2.6050992 14.301684,2"
+     id="path3087"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+  <path
+     sodipodi:nodetypes="cc"
+     style="fill:none;stroke:#545454;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 6.8621358,14.5 5.7918595,2.5440772"
+     id="path3859"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path3865"
+     d="M 9.0026886,14.5 10.072964,2.5440772"
+     style="fill:none;stroke:#545454;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     sodipodi:nodetypes="cc" />
+  <path
+     sodipodi:nodetypes="cc"
+     style="fill:none;stroke:#545454;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 12.927035,5.5 C 9.5859843,6.2006337 6.2573434,6.1319655 2.9377892,5.5"
+     id="path3873"
+     inkscape:connector-curvature="0" />
+  <path
+     sodipodi:nodetypes="cc"
+     style="fill:none;stroke:#545454;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 12.570276,8.5 C 9.5427199,9.1319306 6.5637948,9.2006672 3.6513067,8.5"
+     id="path3877"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path3879"
+     d="m 11.856759,11.5 c -2.5930589,0.69594 -5.2112575,0.636851 -7.8486934,0"
+     style="fill:none;stroke:#545454;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     sodipodi:nodetypes="cc" />
+</svg>
--- a/bitmaps_png/sources/trash.svg
+++ b/bitmaps_png/sources/trash.svg
@ -5,29 +5,55 @@
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   version="1.0"
-   id="svg2"
-   inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
-   sodipodi:docname="trash.svg"
-   inkscape:export-filename="/Users/jeff/kicad_dev/kicad/bitmaps_png/png_16/trash2.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96">
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 24 24"
+   version="1.1"
+   sodipodi:docname="trash24.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2443"
+     inkscape:window-height="1715"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="27.961538"
+     inkscape:cx="9.966641"
+     inkscape:cy="10.903933"
+     inkscape:window-x="0"
+     inkscape:window-y="37"
+     inkscape:window-maximized="0"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="Слой_1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_kicad"
+       spacingx="0.5"
+       spacingy="0.5"
+       color="#9999ff"
+       opacity="0.13"
+       empspacing="2" />
+  </sodipodi:namedview>
  <metadata
-     id="metadata175">
+     id="metadata43">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:title>add_arc</dc:title>
      </cc:Work>
      <cc:License
         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
@ -46,528 +72,53 @@
      </cc:License>
    </rdf:RDF>
  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1035"
-     id="namedview173"
-     showgrid="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-to-guides="true"
-     inkscape:zoom="45.202419"
-     inkscape:cx="4.9942591"
-     inkscape:cy="7.1101731"
-     inkscape:window-x="0"
-     inkscape:window-y="23"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:document-rotation="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3162"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="0.5"
-       spacingy="0.5"
-       originx="0"
-       originy="0" />
-  </sodipodi:namedview>
  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3884">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3886" />
-      <stop
-         id="stop3896"
-         offset="0.2"
-         style="stop-color:#e6e6e6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#f6f6f6;stop-opacity:1;"
-         offset="0.41666666"
-         id="stop3898" />
-      <stop
-         id="stop3894"
-         offset="0.5714286"
-         style="stop-color:#ededed;stop-opacity:1;" />
-      <stop
-         id="stop3892"
-         offset="0.76190478"
-         style="stop-color:#e6e6e6;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3888" />
-    </linearGradient>
-    <linearGradient
-       id="a">
-      <stop
-         stop-color="#fff"
-         offset="0"
-         id="stop7" />
-      <stop
-         stop-color="#fff"
-         stop-opacity="0"
-         offset="1"
-         id="stop9" />
-    </linearGradient>
-    <linearGradient
-       id="b">
-      <stop
-         offset="0"
-         id="stop12" />
-      <stop
-         stop-color="#fff"
-         offset="1"
-         id="stop14" />
-    </linearGradient>
-    <radialGradient
-       id="al"
-       gradientUnits="userSpaceOnUse"
-       cy="12.219"
-       cx="23.969"
-       gradientTransform="matrix(0.94564,0,0,0.32574,1.3029,8.2386)"
-       r="14.969">
-      <stop
-         offset="0"
-         id="stop17" />
-      <stop
-         stop-opacity="0"
-         offset="1"
-         id="stop19" />
-    </radialGradient>
-    <linearGradient
-       id="ar"
-       y2="17.860001"
-       gradientUnits="userSpaceOnUse"
-       x2="6.1231999"
-       y1="17.860001"
-       x1="45.631001">
-      <stop
-         stop-color="#555753"
-         offset="0"
-         id="stop22" />
-      <stop
-         stop-color="#d5d9d2"
-         offset=".61818"
-         id="stop24" />
-      <stop
-         stop-color="#888a85"
-         offset="1"
-         id="stop26" />
-    </linearGradient>
-    <linearGradient
-       id="as"
-       y2="39.25"
-       gradientUnits="userSpaceOnUse"
-       x2="42.269001"
-       y1="39.25"
-       x1="18.871">
-      <stop
-         stop-color="#fff"
-         offset="0"
-         id="stop29" />
-      <stop
-         stop-color="#fff"
-         stop-opacity="0"
-         offset="1"
-         id="stop31" />
-    </linearGradient>
-    <linearGradient
-       id="at"
-       y2="26.125"
-       xlink:href="#b"
-       gradientUnits="userSpaceOnUse"
-       x2="25.976999"
-       gradientTransform="matrix(0.83333,0,0,1,3.6667,1)"
-       y1="26.125"
-       x1="21.096001" />
-    <linearGradient
-       id="au"
-       y2="25.275999"
-       xlink:href="#b"
-       gradientUnits="userSpaceOnUse"
-       x2="31.362"
-       gradientTransform="matrix(1.1429,0,0,1,-3.8571,1)"
-       y1="25.188"
-       x1="26.997" />
-    <linearGradient
-       id="av"
-       y2="24.5"
-       xlink:href="#b"
-       gradientUnits="userSpaceOnUse"
-       x2="37.535"
-       gradientTransform="matrix(1.25,0,0,1,-8.875,1)"
-       y1="24.5"
-       x1="32.699001" />
-    <linearGradient
-       id="aw"
-       y2="25"
-       xlink:href="#b"
-       gradientUnits="userSpaceOnUse"
-       x2="15.672"
-       gradientTransform="matrix(0.83333,0,0,1,2.25,1)"
-       y1="24.827"
-       x1="6.8744998" />
-    <linearGradient
-       id="ax"
-       y2="25.562"
-       xlink:href="#b"
-       gradientUnits="userSpaceOnUse"
-       x2="20.114"
-       gradientTransform="matrix(1.1429,0,0,1,-3,1)"
-       y1="25.620001"
-       x1="12.02" />
-    <linearGradient
-       id="ay"
-       y2="39.022999"
-       gradientUnits="userSpaceOnUse"
-       x2="21.969999"
-       gradientTransform="matrix(0.61028,0,0,1,9.3454,0)"
-       y1="41"
-       x1="27.006001">
-      <stop
-         stop-color="#fff"
-         offset="0"
-         id="stop39" />
-      <stop
-         stop-color="#fff"
-         stop-opacity="0"
-         offset="1"
-         id="stop41" />
-    </linearGradient>
-    <linearGradient
-       id="az"
-       y2="37.973"
-       xlink:href="#a"
-       gradientUnits="userSpaceOnUse"
-       x2="30"
-       gradientTransform="translate(-0.99704,5.0008e-4)"
-       y1="41.207001"
-       x1="33.398998" />
-    <linearGradient
-       id="ba"
-       y2="38.460999"
-       xlink:href="#a"
-       gradientUnits="userSpaceOnUse"
-       x2="16.620001"
-       gradientTransform="translate(1.0052,-5.6326e-6)"
-       y1="39.688"
-       x1="20.002001" />
-    <linearGradient
-       id="bb"
-       y2="32.848"
-       xlink:href="#a"
-       gradientUnits="userSpaceOnUse"
-       x2="36.562"
-       y1="40.759998"
-       x1="36.562" />
-    <linearGradient
-       id="bc"
-       y2="29.922001"
-       xlink:href="#a"
-       gradientUnits="userSpaceOnUse"
-       x2="11.5"
-       y1="38.062"
-       x1="11.5" />
-    <linearGradient
-       id="ad"
-       y2="38.210999"
-       xlink:href="#a"
-       gradientUnits="userSpaceOnUse"
-       x2="17.216"
-       gradientTransform="matrix(0.69296,0,0,1,2.0699,-0.97775)"
-       y1="38.813"
-       x1="21.445" />
-    <linearGradient
-       id="ae"
-       y2="37.973"
-       xlink:href="#a"
-       gradientUnits="userSpaceOnUse"
-       x2="30"
-       gradientTransform="matrix(0.64642,0,0,1,14.071,-0.9995)"
-       y1="41.207001"
-       x1="33.398998" />
-    <radialGradient
-       id="am"
-       gradientUnits="userSpaceOnUse"
-       cy="18.468"
-       cx="24"
-       gradientTransform="matrix(1,0,0,0.30363,0,14.142)"
-       r="14">
-      <stop
-         offset="0"
-         id="stop50" />
-      <stop
-         stop-opacity="0"
-         offset="1"
-         id="stop52" />
-    </radialGradient>
-    <linearGradient
-       id="af"
-       y2="11.686"
-       gradientUnits="userSpaceOnUse"
-       x2="5.2537999"
-       y1="11.686"
-       x1="43.299999">
-      <stop
-         stop-color="#6d6f6a"
-         offset="0"
-         id="stop55" />
-      <stop
-         stop-color="#e7e8e5"
-         offset=".61818"
-         id="stop57" />
-      <stop
-         stop-color="#999b96"
-         offset="1"
-         id="stop59" />
-    </linearGradient>
-    <linearGradient
-       id="c"
-       y2="7.75"
-       gradientUnits="userSpaceOnUse"
-       x2="19"
-       y1="7.75"
-       x1="29">
-      <stop
-         stop-color="#95998e"
-         offset="0"
-         id="stop62" />
-      <stop
-         stop-color="#fff"
-         offset=".59524"
-         id="stop64" />
-      <stop
-         stop-color="#dfdfdb"
-         offset="1"
-         id="stop66" />
-    </linearGradient>
-    <linearGradient
-       id="ag"
-       y2="20.608999"
-       gradientUnits="userSpaceOnUse"
-       x2="15.96"
-       y1="10.081"
-       x1="26.965">
-      <stop
-         stop-color="#babdb6"
-         offset="0"
-         id="stop69" />
-      <stop
-         stop-color="#fff"
-         offset="1"
-         id="stop71" />
-    </linearGradient>
-    <radialGradient
-       id="an"
-       gradientUnits="userSpaceOnUse"
-       cy="12.5"
-       cx="24"
-       gradientTransform="matrix(1,0,0,0.3871,0,7.6613)"
-       r="15.5">
-      <stop
-         offset="0"
-         id="stop74" />
-      <stop
-         stop-opacity="0"
-         offset="1"
-         id="stop76" />
-    </radialGradient>
-    <linearGradient
-       id="ah"
-       y2="16.375"
-       gradientUnits="userSpaceOnUse"
-       x2="46.327999"
-       y1="16.375"
-       x1="18.247">
-      <stop
-         stop-color="#fff"
-         offset="0"
-         id="stop79" />
-      <stop
-         stop-color="#fff"
-         stop-opacity="0"
-         offset="1"
-         id="stop81" />
-    </linearGradient>
-    <radialGradient
-       id="ao"
-       xlink:href="#a"
-       gradientUnits="userSpaceOnUse"
-       cy="27.858"
-       cx="18.034"
-       gradientTransform="matrix(1.2188,-0.17313,0.053174,0.2095,-4.4516,12.172)"
-       r="15.447" />
-    <radialGradient
-       id="ap"
-       gradientUnits="userSpaceOnUse"
-       cy="10.75"
-       cx="18.75"
-       gradientTransform="matrix(1,0,0,0.63636,0,3.9091)"
-       r="2.75">
-      <stop
-         offset="0"
-         id="stop85" />
-      <stop
-         stop-opacity="0"
-         offset="1"
-         id="stop87" />
-    </radialGradient>
-    <linearGradient
-       id="ai"
-       y2="10.809"
-       gradientUnits="userSpaceOnUse"
-       x2="26.127001"
-       y1="9.5279999"
-       x1="26.464001">
-      <stop
-         stop-color="#888a85"
-         offset="0"
-         id="stop90" />
-      <stop
-         stop-color="#d3d7cf"
-         offset="1"
-         id="stop92" />
-    </linearGradient>
-    <linearGradient
-       id="aj"
-       y2="-10.483"
-       gradientUnits="userSpaceOnUse"
-       x2="21.674"
-       y1="-8.5719004"
-       x1="21.084">
-      <stop
-         stop-color="#d3d7cf"
-         offset="0"
-         id="stop95" />
-      <stop
-         stop-color="#eeeeec"
-         offset="1"
-         id="stop97" />
-    </linearGradient>
-    <linearGradient
-       id="ak"
-       y2="10.94"
-       gradientUnits="userSpaceOnUse"
-       x2="6.25"
-       gradientTransform="translate(18)"
-       y1="8.2417002"
-       x1="6.25">
-      <stop
-         stop-opacity=".32317"
-         offset="0"
-         id="stop100" />
-      <stop
-         stop-opacity="0"
-         offset="1"
-         id="stop102" />
-    </linearGradient>
-    <radialGradient
-       id="aq"
-       xlink:href="#a"
-       gradientUnits="userSpaceOnUse"
-       cy="17.987"
-       cx="12.143"
-       gradientTransform="matrix(1.6798,-0.03179,0.0072084,0.21318,-9.2227,10.39)"
-       r="15.447" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#c"
-       id="linearGradient3152"
-       gradientUnits="userSpaceOnUse"
-       x1="29"
-       y1="7.75"
-       x2="19"
-       y2="7.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#ap"
-       id="radialGradient3154"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.63636,0,3.9091)"
-       cx="18.75"
-       cy="10.75"
-       r="2.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#ap"
-       id="radialGradient3156"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.63636,0,3.9091)"
-       cx="18.75"
-       cy="10.75"
-       r="2.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#ap"
-       id="radialGradient3158"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.63636,0,3.9091)"
-       cx="18.75"
-       cy="10.75"
-       r="2.75" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#c"
-       id="linearGradient3160"
-       gradientUnits="userSpaceOnUse"
-       x1="29"
-       y1="7.75"
-       x2="19"
-       y2="7.75" />
+     id="defs27397">
+    <style
+       id="style27395">.cls-1{fill:none;stroke:#545454;stroke-linecap:round;stroke-linejoin:round;stroke-width:2px;}</style>
  </defs>
+  <title
+     id="title27399">trash</title>
  <path
     id="path3871"
-     style="fill:#f2f2f2;fill-opacity:1;stroke:#545454;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 2.2242716,2.5440772 4.3648243,14.5 C 6.8211677,15.161041 9.2008841,15.172273 11.5,14.5 L 13.640553,2.5440772"
+     style="fill:#f2f2f2;fill-opacity:1;stroke:#333333;stroke-width:1.5088;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 3.2775734,3.5025271 6.507243,21.541657 c 3.706138,0.99738 7.296659,1.014327 10.76557,0 L 20.502484,3.5025271"
     inkscape:connector-curvature="0"
     sodipodi:nodetypes="cccc" />
  <path
-     style="fill:none;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 1.72,2 C 5.7764652,2.7259314 9.9932352,2.6050992 14.301684,2"
+     style="fill:none;stroke:#333333;stroke-width:3.01761;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 2.5167266,2.6816225 c 6.1204036,1.0952864 12.4826764,0.9129747 18.9832734,0"
     id="path3087"
     inkscape:connector-curvature="0"
     sodipodi:nodetypes="cc" />
  <path
     sodipodi:nodetypes="cc"
-     style="fill:none;stroke:#545454;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 6.8621358,14.5 5.7918595,2.5440772"
+     style="fill:none;stroke:#333333;stroke-width:1.5088;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 10.275193,21.541657 8.6603566,3.5025271"
     id="path3859"
     inkscape:connector-curvature="0" />
  <path
     inkscape:connector-curvature="0"
     id="path3865"
-     d="M 9.0026886,14.5 10.072964,2.5440772"
-     style="fill:none;stroke:#545454;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 13.504865,21.541657 15.119698,3.5025271"
+     style="fill:none;stroke:#333333;stroke-width:1.5088;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
     sodipodi:nodetypes="cc" />
  <path
     sodipodi:nodetypes="cc"
-     style="fill:none;stroke:#545454;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 12.927035,5.5 C 9.5859843,6.2006337 6.2573434,6.1319655 2.9377892,5.5"
+     style="fill:none;stroke:#333333;stroke-width:1.5088;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 19.425927,7.9624304 c -5.040985,1.0571182 -10.063247,0.9535117 -15.0717976,0"
     id="path3873"
     inkscape:connector-curvature="0" />
  <path
     sodipodi:nodetypes="cc"
-     style="fill:none;stroke:#545454;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 12.570276,8.5 C 9.5427199,9.1319306 6.5637948,9.2006672 3.6513067,8.5"
+     style="fill:none;stroke:#333333;stroke-width:1.5088;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 18.887648,12.488844 c -4.567984,0.953459 -9.0625924,1.057167 -13.4569611,0"
     id="path3877"
     inkscape:connector-curvature="0" />
  <path
     inkscape:connector-curvature="0"
     id="path3879"
-     d="m 11.856759,11.5 c -2.5930589,0.69594 -5.2112575,0.636851 -7.8486934,0"
-     style="fill:none;stroke:#545454;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 17.811092,17.01525 c -3.912414,1.050036 -7.8627587,0.960882 -11.8421263,0"
+     style="fill:none;stroke:#333333;stroke-width:1.5088;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
     sodipodi:nodetypes="cc" />
 </svg>
--- a/bitmaps_png/sources/trash24.svg
+++ b/bitmaps_png/sources/trash24.svg
@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="Слой_1"
-   data-name="Слой 1"
-   viewBox="0 0 24 24"
-   version="1.1"
-   sodipodi:docname="trash24.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2443"
-     inkscape:window-height="1715"
-     id="namedview30"
-     showgrid="true"
-     inkscape:zoom="27.961538"
-     inkscape:cx="9.966641"
-     inkscape:cy="10.903933"
-     inkscape:window-x="0"
-     inkscape:window-y="37"
-     inkscape:window-maximized="0"
-     inkscape:document-rotation="0"
-     inkscape:current-layer="Слой_1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid_kicad"
-       spacingx="0.5"
-       spacingy="0.5"
-       color="#9999ff"
-       opacity="0.13"
-       empspacing="2" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata43">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>add_arc</dc:title>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs27397">
-    <style
-       id="style27395">.cls-1{fill:none;stroke:#545454;stroke-linecap:round;stroke-linejoin:round;stroke-width:2px;}</style>
-  </defs>
-  <title
-     id="title27399">trash</title>
-  <path
-     id="path3871"
-     style="fill:#f2f2f2;fill-opacity:1;stroke:#333333;stroke-width:1.5088;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 3.2775734,3.5025271 6.507243,21.541657 c 3.706138,0.99738 7.296659,1.014327 10.76557,0 L 20.502484,3.5025271"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccc" />
-  <path
-     style="fill:none;stroke:#333333;stroke-width:3.01761;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 2.5167266,2.6816225 c 6.1204036,1.0952864 12.4826764,0.9129747 18.9832734,0"
-     id="path3087"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cc" />
-  <path
-     sodipodi:nodetypes="cc"
-     style="fill:none;stroke:#333333;stroke-width:1.5088;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 10.275193,21.541657 8.6603566,3.5025271"
-     id="path3859"
-     inkscape:connector-curvature="0" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path3865"
-     d="M 13.504865,21.541657 15.119698,3.5025271"
-     style="fill:none;stroke:#333333;stroke-width:1.5088;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     sodipodi:nodetypes="cc" />
-  <path
-     sodipodi:nodetypes="cc"
-     style="fill:none;stroke:#333333;stroke-width:1.5088;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 19.425927,7.9624304 c -5.040985,1.0571182 -10.063247,0.9535117 -15.0717976,0"
-     id="path3873"
-     inkscape:connector-curvature="0" />
-  <path
-     sodipodi:nodetypes="cc"
-     style="fill:none;stroke:#333333;stroke-width:1.5088;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 18.887648,12.488844 c -4.567984,0.953459 -9.0625924,1.057167 -13.4569611,0"
-     id="path3877"
-     inkscape:connector-curvature="0" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path3879"
-     d="m 17.811092,17.01525 c -3.912414,1.050036 -7.8627587,0.960882 -11.8421263,0"
-     style="fill:none;stroke:#333333;stroke-width:1.5088;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     sodipodi:nodetypes="cc" />
-</svg>
--- a/common/dialogs/dialog_configure_paths.cpp
+++ b/common/dialogs/dialog_configure_paths.cpp
@ -63,9 +63,9 @@ DIALOG_CONFIGURE_PATHS::DIALOG_CONFIGURE_PATHS( wxWindow* aParent, FILENAME_RESO
    m_helpDialog( nullptr )
 {
    m_btnAddEnvVar->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_btnDeleteEnvVar->SetBitmap( KiBitmap( trash_xpm ) );
+    m_btnDeleteEnvVar->SetBitmap( KiBitmap( small_trash_xpm ) );
    m_btnAddSearchPath->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_btnDeleteSearchPath->SetBitmap( KiBitmap( trash_xpm ) );
+    m_btnDeleteSearchPath->SetBitmap( KiBitmap( small_trash_xpm ) );
    m_btnMoveUp->SetBitmap( KiBitmap( small_up_xpm ) );
    m_btnMoveDown->SetBitmap( KiBitmap( small_down_xpm ) );

@ -491,7 +491,7 @@ void DIALOG_CONFIGURE_PATHS::OnGridCellRightClick( wxGridEvent& aEvent )
    {
        wxMenu menu;

-        AddMenuItem( &menu, 1, _( "File Browser..." ), KiBitmap( folder_xpm ) );
+        AddMenuItem( &menu, 1, _( "File Browser..." ), KiBitmap( small_folder_xpm ) );
        if( GetPopupMenuSelectionFromUser( menu ) == 1 )
        {
            wxDirDialog dlg( nullptr, _( "Select Path" ), m_curdir,
--- a/common/dialogs/dialog_migrate_settings.cpp
+++ b/common/dialogs/dialog_migrate_settings.cpp
@ -30,7 +30,7 @@ DIALOG_MIGRATE_SETTINGS::DIALOG_MIGRATE_SETTINGS( SETTINGS_MANAGER* aManager ) :
 {
    m_standardButtonsCancel->SetLabel( _( "Quit KiCad" ) );

-    m_btnCustomPath->SetBitmap( KiBitmap( folder_xpm ) );
+    m_btnCustomPath->SetBitmap( KiBitmap( small_folder_xpm ) );

    GetSizer()->SetSizeHints( this );
    Centre();
--- a/common/dialogs/panel_common_settings.cpp
+++ b/common/dialogs/panel_common_settings.cpp
@ -72,8 +72,8 @@ PANEL_COMMON_SETTINGS::PANEL_COMMON_SETTINGS( DIALOG_SHIM* aDialog, wxWindow* aP
    m_antialiasingFallbackLabel->Show( false );
 #endif

-    m_textEditorBtn->SetBitmap( KiBitmap( folder_xpm ) );
-    m_pdfViewerBtn->SetBitmap( KiBitmap( folder_xpm ) );
+    m_textEditorBtn->SetBitmap( KiBitmap( small_folder_xpm ) );
+    m_pdfViewerBtn->SetBitmap( KiBitmap( small_folder_xpm ) );

    m_canvasScaleCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED,
                                wxCommandEventHandler( PANEL_COMMON_SETTINGS::OnCanvasScaleChange ),
--- a/common/dialogs/panel_setup_netclasses.cpp
+++ b/common/dialogs/panel_setup_netclasses.cpp
@ -171,7 +171,7 @@ PANEL_SETUP_NETCLASSES::PANEL_SETUP_NETCLASSES( PAGED_DIALOG* aParent, NETCLASSE
    m_membershipGrid->SetColAttr( 0, attr );

    m_addButton->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_removeButton->SetBitmap( KiBitmap( trash_xpm ) );
+    m_removeButton->SetBitmap( KiBitmap( small_trash_xpm ) );

    // wxFormBuilder doesn't include this event...
    m_netclassGrid->Connect( wxEVT_GRID_CELL_CHANGING,
--- a/common/dialogs/panel_text_variables.cpp
+++ b/common/dialogs/panel_text_variables.cpp
@ -46,7 +46,7 @@ PANEL_TEXT_VARIABLES::PANEL_TEXT_VARIABLES( wxWindow* aParent, PROJECT* aProject
    m_gridWidthsDirty( true )
 {
    m_btnAddTextVar->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_btnDeleteTextVar->SetBitmap( KiBitmap( trash_xpm ) );
+    m_btnDeleteTextVar->SetBitmap( KiBitmap( small_trash_xpm ) );

    m_TextVars->DeleteRows( 0, m_TextVars->GetNumberRows() );

--- a/common/tool/actions.cpp
+++ b/common/tool/actions.cpp
@ -185,7 +185,7 @@ TOOL_ACTION ACTIONS::doDelete( "common.Interactive.delete",
        AS_GLOBAL,
        WXK_DELETE, LEGACY_HK_NAME( "Delete Item" ),
        _( "Delete" ), _( "Deletes selected item(s)" ),
-        trash24_xpm );
+        trash_xpm );

 TOOL_ACTION ACTIONS::deleteTool( "common.Interactive.deleteTool",
        AS_GLOBAL, 0, "",
@ -267,7 +267,7 @@ TOOL_ACTION ACTIONS::zoomRedraw( "common.Control.zoomRedraw",
 #endif
        LEGACY_HK_NAME( "Zoom Redraw" ),
        _( "Refresh" ), _( "Refresh" ),
-        refresh24_xpm );
+        refresh_xpm );

 TOOL_ACTION ACTIONS::zoomFitScreen( "common.Control.zoomFitScreen",
        AS_GLOBAL,
--- a/common/widgets/grid_text_button_helpers.cpp
+++ b/common/widgets/grid_text_button_helpers.cpp
@ -328,7 +328,7 @@ public:
            m_normalize( aNormalize ),
            m_normalizeBasePath( aNormalizeBasePath )
    {
-        SetButtonBitmaps( KiBitmap( folder_xpm ) );
+        SetButtonBitmaps( KiBitmap( small_folder_xpm ) );
    }

 protected:
--- a/eeschema/dialogs/dialog_bom.cpp
+++ b/eeschema/dialogs/dialog_bom.cpp
@ -232,7 +232,7 @@ DIALOG_BOM::DIALOG_BOM( SCH_EDIT_FRAME* parent ) :
        m_helpWindow( nullptr )
 {
    m_buttonAddGenerator->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_buttonDelGenerator->SetBitmap( KiBitmap( trash_xpm ) );
+    m_buttonDelGenerator->SetBitmap( KiBitmap( small_trash_xpm ) );
    m_buttonEdit->SetBitmap( KiBitmap( small_edit_xpm ) );

    installGeneratorsList();
--- a/eeschema/dialogs/dialog_fields_editor_global.cpp
+++ b/eeschema/dialogs/dialog_fields_editor_global.cpp
@ -685,7 +685,7 @@ DIALOG_FIELDS_EDITOR_GLOBAL::DIALOG_FIELDS_EDITOR_GLOBAL( SCH_EDIT_FRAME* parent
    // Get all symbols from the list of schematic sheets
    m_parent->Schematic().GetSheets().GetSymbols( m_symbolsList, false );

-    m_bRefresh->SetBitmap( KiBitmap( refresh_xpm ) );
+    m_bRefresh->SetBitmap( KiBitmap( small_refresh_xpm ) );

    m_fieldsCtrl->AppendTextColumn( _( "Field" ), wxDATAVIEW_CELL_INERT, 0,
                                    wxALIGN_LEFT, 0 );
--- a/eeschema/dialogs/dialog_lib_edit_pin_table.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_pin_table.cpp
@ -443,8 +443,8 @@ DIALOG_LIB_EDIT_PIN_TABLE::DIALOG_LIB_EDIT_PIN_TABLE( SYMBOL_EDIT_FRAME* parent,
    */

    m_addButton->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_deleteButton->SetBitmap( KiBitmap( trash_xpm ) );
-    m_refreshButton->SetBitmap( KiBitmap( refresh_xpm ) );
+    m_deleteButton->SetBitmap( KiBitmap( small_trash_xpm ) );
+    m_refreshButton->SetBitmap( KiBitmap( small_refresh_xpm ) );

    GetSizer()->SetSizeHints(this);
    Centre();
--- a/eeschema/dialogs/dialog_lib_symbol_properties.cpp
+++ b/eeschema/dialogs/dialog_lib_symbol_properties.cpp
@ -79,11 +79,11 @@ DIALOG_LIB_SYMBOL_PROPERTIES::DIALOG_LIB_SYMBOL_PROPERTIES( SYMBOL_EDIT_FRAME* a

    // Configure button logos
    m_bpAdd->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_bpDelete->SetBitmap( KiBitmap( trash_xpm ) );
+    m_bpDelete->SetBitmap( KiBitmap( small_trash_xpm ) );
    m_bpMoveUp->SetBitmap( KiBitmap( small_up_xpm ) );
    m_bpMoveDown->SetBitmap( KiBitmap( small_down_xpm ) );
    m_addFilterButton->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_deleteFilterButton->SetBitmap( KiBitmap( trash_xpm ) );
+    m_deleteFilterButton->SetBitmap( KiBitmap( small_trash_xpm ) );
    m_editFilterButton->SetBitmap( KiBitmap( small_edit_xpm ) );

    if( aParent->IsSymbolFromLegacyLibrary() )
--- a/eeschema/dialogs/dialog_pin_properties.cpp
+++ b/eeschema/dialogs/dialog_pin_properties.cpp
@ -195,7 +195,7 @@ DIALOG_PIN_PROPERTIES::DIALOG_PIN_PROPERTIES( SYMBOL_EDIT_FRAME* parent, LIB_PIN
    m_alternatesGrid->SetColAttr( COL_SHAPE, attr );

    m_addAlternate->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_deleteAlternate->SetBitmap( KiBitmap( trash_xpm ) );
+    m_deleteAlternate->SetBitmap( KiBitmap( small_trash_xpm ) );

    m_sdbSizerButtonsOK->SetDefault();
    SetInitialFocus( m_textPinName );
--- a/eeschema/dialogs/dialog_plot_schematic.cpp
+++ b/eeschema/dialogs/dialog_plot_schematic.cpp
@ -52,7 +52,7 @@ DIALOG_PLOT_SCHEMATIC::DIALOG_PLOT_SCHEMATIC( SCH_EDIT_FRAME* parent )
 {
    m_configChanged = false;

-    m_browseButton->SetBitmap( KiBitmap( folder_xpm ) );
+    m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) );

    // We use a sdbSizer to get platform-dependent ordering of the action buttons, but
    // that requires us to correct the button labels here.
--- a/eeschema/dialogs/dialog_sch_import_settings.cpp
+++ b/eeschema/dialogs/dialog_sch_import_settings.cpp
@ -37,7 +37,7 @@ DIALOG_SCH_IMPORT_SETTINGS::DIALOG_SCH_IMPORT_SETTINGS( wxWindow* aParent, SCH_E
        DIALOG_SCH_IMPORT_SETTINGS_BASE( aParent ),
        m_frame( aFrame )
 {
-    m_browseButton->SetBitmap( KiBitmap( folder_xpm ) );
+    m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) );

    m_sdbSizer1OK->SetLabel( _( "Import Settings" ) );
    m_buttonsSizer->Layout();
--- a/eeschema/dialogs/dialog_sheet_properties.cpp
+++ b/eeschema/dialogs/dialog_sheet_properties.cpp
@ -75,7 +75,7 @@ DIALOG_SHEET_PROPERTIES::DIALOG_SHEET_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_S

    // Configure button logos
    m_bpAdd->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_bpDelete->SetBitmap( KiBitmap( trash_xpm ) );
+    m_bpDelete->SetBitmap( KiBitmap( small_trash_xpm ) );
    m_bpMoveUp->SetBitmap( KiBitmap( small_up_xpm ) );
    m_bpMoveDown->SetBitmap( KiBitmap( small_down_xpm ) );

--- a/eeschema/dialogs/dialog_symbol_properties.cpp
+++ b/eeschema/dialogs/dialog_symbol_properties.cpp
@ -349,7 +349,7 @@ DIALOG_SYMBOL_PROPERTIES::DIALOG_SYMBOL_PROPERTIES( SCH_EDIT_FRAME* aParent,

    // Configure button logos
    m_bpAdd->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_bpDelete->SetBitmap( KiBitmap( trash_xpm ) );
+    m_bpDelete->SetBitmap( KiBitmap( small_trash_xpm ) );
    m_bpMoveUp->SetBitmap( KiBitmap( small_up_xpm ) );
    m_bpMoveDown->SetBitmap( KiBitmap( small_down_xpm ) );

--- a/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp
+++ b/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp
@ -50,7 +50,7 @@ PANEL_EESCHEMA_TEMPLATE_FIELDNAMES::PANEL_EESCHEMA_TEMPLATE_FIELDNAMES( SCH_EDIT
    }

    m_addFieldButton->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_deleteFieldButton->SetBitmap( KiBitmap( trash_xpm ) );
+    m_deleteFieldButton->SetBitmap( KiBitmap( small_trash_xpm ) );

    m_checkboxColWidth = m_grid->GetColSize( 1 );

--- a/eeschema/dialogs/panel_sym_lib_table.cpp
+++ b/eeschema/dialogs/panel_sym_lib_table.cpp
@ -283,10 +283,10 @@ PANEL_SYM_LIB_TABLE::PANEL_SYM_LIB_TABLE( DIALOG_EDIT_LIBRARY_TABLES* aParent, P

    // Configure button logos
    m_append_button->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_delete_button->SetBitmap( KiBitmap( trash_xpm ) );
+    m_delete_button->SetBitmap( KiBitmap( small_trash_xpm ) );
    m_move_up_button->SetBitmap( KiBitmap( small_up_xpm ) );
    m_move_down_button->SetBitmap( KiBitmap( small_down_xpm ) );
-    m_browse_button->SetBitmap( KiBitmap( folder_xpm ) );
+    m_browse_button->SetBitmap( KiBitmap( small_folder_xpm ) );
 }


--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@ -1593,7 +1593,7 @@ SIM_PLOT_FRAME::SIGNAL_CONTEXT_MENU::SIGNAL_CONTEXT_MENU( const wxString& aSigna

    AddMenuItem( this, HIDE_SIGNAL, _( "Hide Signal" ),
                 _( "Erase the signal from plot screen" ),
-                 KiBitmap( trash24_xpm ) );
+                 KiBitmap( trash_xpm ) );

    TRACE* trace = plot->GetTrace( m_signal );

--- a/eeschema/tools/ee_actions.cpp
+++ b/eeschema/tools/ee_actions.cpp
@ -139,7 +139,7 @@ TOOL_ACTION EE_ACTIONS::saveSymbolAs( "eeschema.SymbolLibraryControl.saveSymbolA
 TOOL_ACTION EE_ACTIONS::deleteSymbol( "eeschema.SymbolLibraryControl.deleteSymbol",
        AS_GLOBAL, 0, "",
        _( "Delete" ), _( "Remove the selected symbol from its library" ),
-        trash24_xpm );
+        trash_xpm );

 TOOL_ACTION EE_ACTIONS::cutSymbol( "eeschema.SymbolLibraryControl.cutSymbol",
        AS_GLOBAL, 0, "",
--- a/kicad/project_tree_pane.cpp
+++ b/kicad/project_tree_pane.cpp
@ -758,7 +758,7 @@ void PROJECT_TREE_PANE::onRight( wxTreeEvent& Event )
        }

        AddMenuItem( &popup_menu, ID_PROJECT_DELETE, _( "Delete" ), help_text,
-                     KiBitmap( trash24_xpm ) );
+                     KiBitmap( trash_xpm ) );
    }

    if( can_print )
--- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp
+++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp
@ -154,10 +154,10 @@ DIALOG_FOOTPRINT_FP_EDITOR::DIALOG_FOOTPRINT_FP_EDITOR( FOOTPRINT_EDIT_FRAME* aP

    // Configure button logos
    m_bpAdd->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_bpDelete->SetBitmap( KiBitmap( trash_xpm ) );
+    m_bpDelete->SetBitmap( KiBitmap( small_trash_xpm ) );
    m_button3DShapeAdd->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_button3DShapeBrowse->SetBitmap( KiBitmap( folder_xpm ) );
-    m_button3DShapeRemove->SetBitmap( KiBitmap( trash_xpm ) );
+    m_button3DShapeBrowse->SetBitmap( KiBitmap( small_folder_xpm ) );
+    m_button3DShapeRemove->SetBitmap( KiBitmap( small_trash_xpm ) );

    // wxFormBuilder doesn't include this event...
    m_itemsGrid->Connect( wxEVT_GRID_CELL_CHANGING, wxGridEventHandler( DIALOG_FOOTPRINT_FP_EDITOR::OnGridCellChanging ), NULL, this );
--- a/pcbnew/dialogs/dialog_export_svg.cpp
+++ b/pcbnew/dialogs/dialog_export_svg.cpp
@ -83,7 +83,7 @@ DIALOG_EXPORT_SVG::DIALOG_EXPORT_SVG( PCB_EDIT_FRAME* aParent, BOARD* aBoard ) :
        m_oneFileOnly( false ),
        m_lineWidth( aParent, m_penWidthLabel, m_penWidthCtrl, m_penWidthUnits, true )
 {
-    m_browseButton->SetBitmap( KiBitmap( folder_xpm ) );
+    m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) );

    initDialog();

--- a/pcbnew/dialogs/dialog_footprint_properties.cpp
+++ b/pcbnew/dialogs/dialog_footprint_properties.cpp
@ -168,10 +168,10 @@ DIALOG_FOOTPRINT_PROPERTIES::DIALOG_FOOTPRINT_PROPERTIES( PCB_EDIT_FRAME* aParen

    // Configure button logos
    m_bpAdd->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_bpDelete->SetBitmap( KiBitmap( trash_xpm ) );
+    m_bpDelete->SetBitmap( KiBitmap( small_trash_xpm ) );
    m_buttonAdd->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_buttonBrowse->SetBitmap( KiBitmap( folder_xpm ) );
-    m_buttonRemove->SetBitmap( KiBitmap( trash_xpm ) );
+    m_buttonBrowse->SetBitmap( KiBitmap( small_folder_xpm ) );
+    m_buttonRemove->SetBitmap( KiBitmap( small_trash_xpm ) );

    finishDialogSettings();
 }
--- a/pcbnew/dialogs/dialog_fp_plugin_options.cpp
+++ b/pcbnew/dialogs/dialog_fp_plugin_options.cpp
@ -91,7 +91,7 @@ public:

        // Configure button logos
        m_append_button->SetBitmap( KiBitmap( small_plus_xpm ) );
-        m_delete_button->SetBitmap( KiBitmap( trash_xpm ) );
+        m_delete_button->SetBitmap( KiBitmap( small_trash_xpm ) );

        // initial focus on the grid please.
        SetInitialFocus( m_grid );
--- a/pcbnew/dialogs/dialog_gendrill.cpp
+++ b/pcbnew/dialogs/dialog_gendrill.cpp
@ -117,7 +117,7 @@ void DIALOG_GENDRILL::initDialog()

 void DIALOG_GENDRILL::InitDisplayParams()
 {
-    m_browseButton->SetBitmap( KiBitmap( folder_xpm ) );
+    m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) );

    m_rbExcellon->SetValue( m_drillFileType == 0 );
    m_rbGerberX2->SetValue( m_drillFileType == 1 );
--- a/pcbnew/dialogs/dialog_group_properties.cpp
+++ b/pcbnew/dialogs/dialog_group_properties.cpp
@ -38,7 +38,7 @@ DIALOG_GROUP_PROPERTIES::DIALOG_GROUP_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent,
        m_group( aGroup )
 {
    m_bpAddMember->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_bpRemoveMember->SetBitmap( KiBitmap( trash_xpm ) );
+    m_bpRemoveMember->SetBitmap( KiBitmap( small_trash_xpm ) );

    m_nameCtrl->SetValue( m_group->GetName() );

--- a/pcbnew/dialogs/dialog_import_settings.cpp
+++ b/pcbnew/dialogs/dialog_import_settings.cpp
@ -39,7 +39,7 @@ DIALOG_IMPORT_SETTINGS::DIALOG_IMPORT_SETTINGS( wxWindow* aParent, PCB_EDIT_FRAM
 {
    wxSize sizeNeeded;

-    m_browseButton->SetBitmap( KiBitmap( folder_xpm ) );
+    m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) );

    // Button created in wxFormBuilder is an "OK" button. Change label here
    m_sdbSizer1OK->SetLabel( _( "Import Settings" ) );
--- a/pcbnew/dialogs/dialog_net_inspector.cpp
+++ b/pcbnew/dialogs/dialog_net_inspector.cpp
@ -893,7 +893,7 @@ DIALOG_NET_INSPECTOR::DIALOG_NET_INSPECTOR( PCB_EDIT_FRAME* aParent,

    m_addNet->SetBitmap( KiBitmap( small_plus_xpm ) );
    m_renameNet->SetBitmap( KiBitmap( small_edit_xpm ) );
-    m_deleteNet->SetBitmap( KiBitmap( trash_xpm ) );
+    m_deleteNet->SetBitmap( KiBitmap( small_trash_xpm ) );

    m_sdbSizerOK->SetDefault();
    m_renameNet->Disable();
--- a/pcbnew/dialogs/dialog_netlist.cpp
+++ b/pcbnew/dialogs/dialog_netlist.cpp
@ -66,7 +66,7 @@ DIALOG_NETLIST::DIALOG_NETLIST( PCB_EDIT_FRAME* aParent, wxString& aNetlistFullF
      m_runDragCommand( false )
 {
    m_NetlistFilenameCtrl->SetValue( m_netlistPath );
-    m_browseButton->SetBitmap( KiBitmap( folder_xpm ) );
+    m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) );

    auto cfg = m_parent->GetPcbNewSettings();

--- a/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp
+++ b/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp
@ -235,7 +235,7 @@ DIALOG_PAD_PRIMITIVE_POLY_PROPS::DIALOG_PAD_PRIMITIVE_POLY_PROPS( wxWindow* aPar
    }

    m_addButton->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_deleteButton->SetBitmap( KiBitmap( trash_xpm ) );
+    m_deleteButton->SetBitmap( KiBitmap( small_trash_xpm ) );
    m_warningIcon->SetBitmap( KiBitmap( dialog_warning_xpm ) );

    // Test for acceptable polygon (more than 2 corners, and not self-intersecting) and
--- a/pcbnew/dialogs/dialog_plot.cpp
+++ b/pcbnew/dialogs/dialog_plot.cpp
@ -82,7 +82,7 @@ void DIALOG_PLOT::init_Dialog()

    m_zoneFillCheck->SetValue( cfg->m_Plot.check_zones_before_plotting );

-    m_browseButton->SetBitmap( KiBitmap( folder_xpm ) );
+    m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) );

    // m_PSWidthAdjust is stored in mm in user config
    m_PSWidthAdjust = KiROUND( cfg->m_Plot.ps_fine_width_adjust * IU_PER_MM );
--- a/pcbnew/dialogs/panel_fp_editor_defaults.cpp
+++ b/pcbnew/dialogs/panel_fp_editor_defaults.cpp
@ -285,7 +285,7 @@ bool PANEL_FP_EDITOR_DEFAULTS::Show( bool aShow )
        // first displayed.  However, on OSX 3.0.5 (at least), if another panel is displayed
        // first then the icons will be blank unless they're set here.
        m_bpAdd->SetBitmap( KiBitmap( small_plus_xpm ) );
-        m_bpDelete->SetBitmap( KiBitmap( trash_xpm ) );
+        m_bpDelete->SetBitmap( KiBitmap( small_trash_xpm ) );
    }

    if( aShow && m_firstShow )
--- a/pcbnew/dialogs/panel_fp_lib_table.cpp
+++ b/pcbnew/dialogs/panel_fp_lib_table.cpp
@ -461,10 +461,10 @@ PANEL_FP_LIB_TABLE::PANEL_FP_LIB_TABLE( DIALOG_EDIT_LIBRARY_TABLES* aParent,

    // Configure button logos
    m_append_button->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_delete_button->SetBitmap( KiBitmap( trash_xpm ) );
+    m_delete_button->SetBitmap( KiBitmap( small_trash_xpm ) );
    m_move_up_button->SetBitmap( KiBitmap( small_up_xpm ) );
    m_move_down_button->SetBitmap( KiBitmap( small_down_xpm ) );
-    m_browseButton->SetBitmap( KiBitmap( folder_xpm ) );
+    m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) );

    // For aesthetic reasons, we must set the size of m_browseButton to match
    // the other bitmaps manually (for instance m_append_button)
--- a/pcbnew/dialogs/panel_pcbnew_action_plugins.cpp
+++ b/pcbnew/dialogs/panel_pcbnew_action_plugins.cpp
@ -41,7 +41,7 @@ PANEL_PCBNEW_ACTION_PLUGINS::PANEL_PCBNEW_ACTION_PLUGINS( PCB_EDIT_FRAME* aFrame

    m_moveUpButton->SetBitmap( KiBitmap( small_up_xpm ) );
    m_moveDownButton->SetBitmap( KiBitmap( small_down_xpm ) );
-    m_reloadButton->SetBitmap( KiBitmap( refresh_xpm ) );
+    m_reloadButton->SetBitmap( KiBitmap( small_refresh_xpm ) );
 }


--- a/pcbnew/dialogs/panel_setup_tracks_and_vias.cpp
+++ b/pcbnew/dialogs/panel_setup_tracks_and_vias.cpp
@ -63,11 +63,11 @@ PANEL_SETUP_TRACKS_AND_VIAS::PANEL_SETUP_TRACKS_AND_VIAS( PAGED_DIALOG* aParent,
    m_ConstraintsPanel = aConstraintsPanel;

    m_trackWidthsAddButton->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_trackWidthsRemoveButton->SetBitmap( KiBitmap( trash_xpm ) );
+    m_trackWidthsRemoveButton->SetBitmap( KiBitmap( small_trash_xpm ) );
    m_viaSizesAddButton->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_viaSizesRemoveButton->SetBitmap( KiBitmap( trash_xpm ) );
+    m_viaSizesRemoveButton->SetBitmap( KiBitmap( small_trash_xpm ) );
    m_diffPairsAddButton->SetBitmap( KiBitmap( small_plus_xpm ) );
-    m_diffPairsRemoveButton->SetBitmap( KiBitmap( trash_xpm ) );
+    m_diffPairsRemoveButton->SetBitmap( KiBitmap( small_trash_xpm ) );

    // Membership combobox editors require a bit more room, so increase the row size of
    // all our grids for consistency
--- a/pcbnew/exporters/gen_footprints_placefile.cpp
+++ b/pcbnew/exporters/gen_footprints_placefile.cpp
@ -149,7 +149,7 @@ bool DIALOG_GEN_FOOTPRINT_POSITION::m_includeBoardEdge = false;

 void DIALOG_GEN_FOOTPRINT_POSITION::initDialog()
 {
-    m_browseButton->SetBitmap( KiBitmap( folder_xpm ) );
+    m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) );

    auto cfg = m_parent->GetPcbNewSettings();

--- a/pcbnew/import_gfx/dialog_import_gfx.cpp
+++ b/pcbnew/import_gfx/dialog_import_gfx.cpp
@ -128,7 +128,7 @@ DIALOG_IMPORT_GFX::DIALOG_IMPORT_GFX( PCB_BASE_FRAME* aParent, bool aImportAsFoo

    m_choiceDxfUnits->SetSelection( m_dxfUnits );

-    m_browseButton->SetBitmap( KiBitmap( folder_xpm ) );
+    m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) );

    SetInitialFocus( m_textCtrlFileName );
    m_sdbSizerOK->SetDefault();
--- a/pcbnew/tools/pcb_actions.cpp
+++ b/pcbnew/tools/pcb_actions.cpp
@ -351,7 +351,7 @@ TOOL_ACTION PCB_ACTIONS::editFootprint( "pcbnew.ModuleEditor.editFootprint",
 TOOL_ACTION PCB_ACTIONS::deleteFootprint( "pcbnew.ModuleEditor.deleteFootprint",
        AS_GLOBAL, 0, "",
        _( "Delete Footprint from Library" ), "",
-        trash24_xpm );
+        trash_xpm );

 TOOL_ACTION PCB_ACTIONS::cutFootprint( "pcbnew.ModuleEditor.cutFootprint",
        AS_GLOBAL, 0, "",