diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt
index d23efdf179..67c8b07a09 100644
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@@ -176,7 +176,7 @@ set( BMAPS_MID
     copper_layers_setup
     cursor_shape
     cursor
-    cut_button
+    cut
     cvpcb
     dashline
     datasheet
@@ -199,7 +199,6 @@ set( BMAPS_MID
     delete_rectangle
     delete_segment
     delete_sheet
-    delete_text
     delete_track
     delete
     directory
diff --git a/bitmaps_png/cpp_26/cut_button.cpp b/bitmaps_png/cpp_26/cut.cpp
similarity index 99%
rename from bitmaps_png/cpp_26/cut_button.cpp
rename to bitmaps_png/cpp_26/cut.cpp
index fe29c57cc7..f2e2ba728c 100644
--- a/bitmaps_png/cpp_26/cut_button.cpp
+++ b/bitmaps_png/cpp_26/cut.cpp
@@ -93,6 +93,6 @@ static const unsigned char png[] = {
  0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
-const BITMAP_OPAQUE cut_button_xpm[1] = {{ png, sizeof( png ), "cut_button_xpm" }};
+const BITMAP_OPAQUE cut_xpm[1] = {{ png, sizeof( png ), "cut_xpm" }};
 
 //EOF
diff --git a/bitmaps_png/cpp_26/delete_text.cpp b/bitmaps_png/cpp_26/delete_text.cpp
deleted file mode 100644
index 4a856bef71..0000000000
--- a/bitmaps_png/cpp_26/delete_text.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-
-/* Do not modify this file, it was automatically generated by the
- * PNG2cpp CMake script, using a *.png file as input.
- */
-
-#include <bitmaps.h>
-
-static const unsigned char png[] = {
- 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
- 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
- 0xce, 0x00, 0x00, 0x02, 0xb8, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x18, 0x05, 0x94,
- 0x02, 0x3d, 0xbd, 0xff, 0x62, 0xda, 0xda, 0xff, 0x3b, 0xb4, 0xb5, 0x7f, 0x77, 0x69, 0x69, 0xfd,
- 0xec, 0xa6, 0x04, 0x6b, 0x6a, 0x7e, 0xf4, 0x02, 0x1a, 0xc9, 0x0a, 0xc4, 0x8c, 0x18, 0x16, 0x01,
- 0x2d, 0xd1, 0xd2, 0xd1, 0xf9, 0xff, 0x9f, 0x1a, 0x58, 0x59, 0xf9, 0xe4, 0x32, 0xa0, 0x91, 0x16,
- 0x40, 0xcc, 0x46, 0xd0, 0x22, 0x15, 0x95, 0xcb, 0x2f, 0x95, 0x95, 0xcf, 0x3f, 0x03, 0x61, 0x0d,
- 0x8d, 0x17, 0x9f, 0xd0, 0x0d, 0xd3, 0xd6, 0xfe, 0xf1, 0x1b, 0x26, 0x0f, 0xc2, 0x5a, 0x5a, 0x5f,
- 0x7e, 0xc0, 0xe4, 0x64, 0x64, 0x16, 0x5c, 0x04, 0x1a, 0x59, 0x0f, 0xc4, 0x7c, 0x78, 0x2d, 0x92,
- 0x96, 0x9e, 0x73, 0x0d, 0x28, 0xb4, 0x0a, 0x88, 0x67, 0x03, 0xf1, 0x14, 0x19, 0x99, 0x85, 0x27,
- 0xd0, 0x2d, 0x52, 0x57, 0x7f, 0xfc, 0x09, 0x28, 0xb7, 0x1a, 0x88, 0x67, 0x82, 0xd4, 0xf0, 0xf1,
- 0x79, 0xaf, 0x04, 0x59, 0x8e, 0xa4, 0xbf, 0x0d, 0x88, 0xf9, 0x71, 0x5a, 0xa4, 0xa4, 0x74, 0xf4,
- 0x32, 0x03, 0x03, 0xd3, 0x72, 0xa0, 0x50, 0x07, 0x10, 0x6b, 0x02, 0xb1, 0xa0, 0x96, 0xd6, 0xbb,
- 0x76, 0x1c, 0x16, 0x2d, 0x00, 0x62, 0x33, 0x20, 0x16, 0x02, 0xa9, 0x53, 0x50, 0xd8, 0x95, 0xae,
- 0xad, 0xfd, 0xf7, 0x9f, 0x8c, 0xcc, 0xbc, 0x2b, 0x38, 0x2d, 0x0a, 0x0d, 0xfd, 0xcf, 0x2c, 0x25,
- 0x35, 0x51, 0x8e, 0x89, 0x89, 0xa3, 0x1a, 0xc8, 0xed, 0x01, 0x62, 0x43, 0x68, 0x84, 0x32, 0xe8,
- 0xe8, 0xfc, 0x6e, 0xc0, 0x61, 0xd1, 0x7c, 0x20, 0xd6, 0x02, 0x62, 0x66, 0xa8, 0x31, 0xac, 0xbc,
- 0xbc, 0x0e, 0x36, 0x2c, 0x2c, 0x02, 0x13, 0x80, 0xec, 0x1a, 0xac, 0x41, 0x07, 0x53, 0x08, 0xc4,
- 0xea, 0x40, 0xac, 0x8a, 0x1c, 0x91, 0x24, 0x58, 0xc4, 0x00, 0xd5, 0xa7, 0x02, 0x0d, 0x0d, 0x56,
- 0x5c, 0x16, 0x31, 0x42, 0x35, 0x21, 0x6b, 0x24, 0xd5, 0x22, 0x06, 0x24, 0x33, 0x18, 0x49, 0xca,
- 0x63, 0x64, 0x58, 0x44, 0x1e, 0x18, 0xb5, 0x88, 0xa6, 0x16, 0x35, 0xb8, 0x5b, 0x0a, 0xa1, 0xeb,
- 0x83, 0x8a, 0x31, 0x52, 0xcd, 0xa2, 0xf5, 0x01, 0xce, 0xc9, 0x2f, 0xe2, 0xfd, 0x3f, 0xae, 0x0f,
- 0x70, 0x0f, 0x86, 0xe9, 0x59, 0x13, 0xec, 0x65, 0xfe, 0x34, 0xce, 0xff, 0xed, 0xae, 0x60, 0xf7,
- 0x46, 0xa2, 0x2d, 0xc3, 0x67, 0x51, 0xad, 0xb9, 0x41, 0xc9, 0xb3, 0x60, 0x97, 0xef, 0x6f, 0xfc,
- 0x1d, 0xfe, 0x3f, 0x0d, 0x72, 0xfe, 0xbc, 0xca, 0xcb, 0xc1, 0x63, 0x91, 0xb7, 0x83, 0xce, 0xbd,
- 0x20, 0xd7, 0x57, 0x20, 0xb1, 0x57, 0x81, 0x2e, 0x7f, 0x36, 0xfb, 0xb8, 0x94, 0x12, 0xb0, 0xe2,
- 0x3f, 0x93, 0xae, 0xee, 0xff, 0x72, 0xa0, 0xc1, 0x5f, 0xb1, 0x95, 0xd2, 0x8a, 0x8a, 0x87, 0xee,
- 0xfb, 0xcb, 0x69, 0xb7, 0xdf, 0x76, 0x34, 0xf9, 0xf2, 0xdc, 0xd5, 0xe2, 0x3f, 0x08, 0xdf, 0xf7,
- 0xb4, 0xf9, 0x74, 0xcb, 0xd3, 0xe6, 0x05, 0x8c, 0xff, 0xc0, 0xd9, 0xec, 0x57, 0x8d, 0xba, 0x7c,
- 0x35, 0x4e, 0x2b, 0x8c, 0x8d, 0xff, 0xf3, 0x03, 0x0d, 0xdb, 0x45, 0xa8, 0x4a, 0xd0, 0xd6, 0xfe,
- 0xf8, 0xc1, 0x43, 0x26, 0x60, 0xd2, 0x75, 0x73, 0x9d, 0x4f, 0x8f, 0xad, 0x0d, 0xfe, 0x23, 0xe3,
- 0x3b, 0x96, 0xfa, 0x3f, 0xf3, 0xe5, 0x24, 0xca, 0xf1, 0x95, 0x10, 0xc0, 0xe0, 0xfa, 0xaf, 0xac,
- 0xa3, 0xf3, 0xef, 0x9e, 0x96, 0xd6, 0xb7, 0xa7, 0x9a, 0x9a, 0x6f, 0xde, 0x03, 0xab, 0x8a, 0xcf,
- 0x1a, 0x1a, 0xcf, 0xbf, 0x60, 0xe2, 0x17, 0x9f, 0x25, 0x25, 0xa7, 0xed, 0x4f, 0x91, 0x12, 0x9f,
- 0x7d, 0xcf, 0x50, 0xe3, 0x3f, 0x32, 0x9e, 0xa6, 0x26, 0x3f, 0x07, 0x68, 0x14, 0x3b, 0x31, 0xd1,
- 0xc3, 0x03, 0xc4, 0x05, 0x40, 0x3c, 0x1d, 0x88, 0xe7, 0xe2, 0xc2, 0x0a, 0x3c, 0xdc, 0xcb, 0x0e,
- 0xe9, 0x6b, 0x7e, 0xb8, 0xa5, 0xae, 0xf0, 0x1f, 0x19, 0x5f, 0xd4, 0x57, 0x7f, 0x3f, 0xcf, 0xd4,
- 0xc0, 0x8a, 0x18, 0x8b, 0x18, 0xa1, 0x96, 0x09, 0xe0, 0xc2, 0xf1, 0x2a, 0x2a, 0xda, 0x87, 0x35,
- 0x54, 0xef, 0x5d, 0x95, 0x95, 0xf8, 0x0f, 0xc2, 0x97, 0x65, 0x25, 0xfe, 0x9e, 0x97, 0x15, 0xff,
- 0x05, 0xe3, 0x9f, 0x56, 0x57, 0x7e, 0x35, 0xc5, 0xd8, 0xd8, 0x88, 0xe2, 0x3c, 0xd6, 0x25, 0x29,
- 0xde, 0x7a, 0x41, 0x58, 0xe0, 0xdf, 0x45, 0x61, 0x81, 0xff, 0xe7, 0x81, 0x74, 0x1d, 0x0f, 0xd7,
- 0x8c, 0x4c, 0x2e, 0x8e, 0x9a, 0xd3, 0x42, 0xfc, 0xbf, 0x40, 0x62, 0x20, 0x3c, 0x43, 0x52, 0x6c,
- 0x19, 0x35, 0xf2, 0x33, 0x4f, 0x2d, 0x2b, 0xeb, 0xdc, 0x13, 0x9c, 0x1c, 0x7f, 0x4a, 0x59, 0x59,
- 0x27, 0x01, 0xf9, 0x9c, 0xa0, 0xc8, 0x4f, 0x66, 0x61, 0x29, 0x3f, 0xca, 0xc9, 0xf1, 0x73, 0x32,
- 0x3b, 0xdb, 0x0e, 0x20, 0x5f, 0x84, 0x5a, 0x8d, 0x28, 0x7e, 0x60, 0x4e, 0xcd, 0x83, 0x06, 0x33,
- 0x0c, 0xb0, 0x87, 0x30, 0x30, 0x64, 0x71, 0x31, 0x30, 0x48, 0x82, 0x38, 0x00, 0xd5, 0x01, 0x24,
- 0x29, 0xda, 0x84, 0xa8, 0xa5, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
- 0x82,
-};
-
-const BITMAP_OPAQUE delete_text_xpm[1] = {{ png, sizeof( png ), "delete_text_xpm" }};
-
-//EOF
diff --git a/bitmaps_png/sources/cut_button.svg b/bitmaps_png/sources/cut.svg
similarity index 100%
rename from bitmaps_png/sources/cut_button.svg
rename to bitmaps_png/sources/cut.svg
diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp
index bfa72bb56f..7865260f62 100644
--- a/eeschema/tool_sch.cpp
+++ b/eeschema/tool_sch.cpp
@@ -80,7 +80,7 @@ void SCH_EDIT_FRAME::ReCreateHToolbar()
 
     m_mainToolBar->AddSeparator();
 
-    m_mainToolBar->AddTool( wxID_CUT, wxEmptyString, KiBitmap( cut_button_xpm ),
+    m_mainToolBar->AddTool( wxID_CUT, wxEmptyString, KiBitmap( cut_xpm ),
                             _( "Cut selected item" ) );
 
     m_mainToolBar->AddTool( wxID_COPY, wxEmptyString, KiBitmap( copy_xpm ),
diff --git a/include/bitmaps.h b/include/bitmaps.h
index 8ede59c465..f38e7bd862 100644
--- a/include/bitmaps.h
+++ b/include/bitmaps.h
@@ -105,7 +105,7 @@ EXTERN_BITMAP( copy_pad_settings_xpm )
 EXTERN_BITMAP( create_cmp_file_xpm )
 EXTERN_BITMAP( cursor_shape_xpm )
 EXTERN_BITMAP( cursor_xpm )
-EXTERN_BITMAP( cut_button_xpm )
+EXTERN_BITMAP( cut_xpm )
 EXTERN_BITMAP( cvpcb_xpm )
 EXTERN_BITMAP( dashline_xpm )
 EXTERN_BITMAP( datasheet_xpm )