diff --git a/app/widgets/gimpviewablebox.c b/app/widgets/gimpviewablebox.c
index c79d78dcdb..05e8abb10d 100644
--- a/app/widgets/gimpviewablebox.c
+++ b/app/widgets/gimpviewablebox.c
@@ -655,7 +655,7 @@ gimp_viewable_box_new (GimpContainer *container,
       gtk_box_pack_end (GTK_BOX (entry_hbox), edit_button, FALSE, FALSE, 0);
       gtk_widget_show (edit_button);
 
-      image = gtk_image_new_from_icon_name (GIMP_STOCK_EDIT,
+      image = gtk_image_new_from_icon_name (GTK_STOCK_EDIT,
                                             GTK_ICON_SIZE_BUTTON);
       gtk_misc_set_alignment (GTK_MISC (image), 0.5, 1.0);
       gtk_container_add (GTK_CONTAINER (edit_button), image);
diff --git a/icons/Color/16/gimp-edit.png b/icons/Color/16/gtk-edit.png
similarity index 100%
rename from icons/Color/16/gimp-edit.png
rename to icons/Color/16/gtk-edit.png
diff --git a/icons/Color/color-scalable.svg b/icons/Color/color-scalable.svg
index 8f3d89c06e..ae69235a68 100644
--- a/icons/Color/color-scalable.svg
+++ b/icons/Color/color-scalable.svg
@@ -35825,7 +35825,7 @@
     </g>
     <g
        transform="translate(90.856833,-1064.1307)"
-       id="gimp-edit">
+       id="gtk-edit">
       <g
          id="g4514">
         <g
diff --git a/icons/Color/scalable/gimp-edit.svg b/icons/Color/scalable/gtk-edit.svg
similarity index 100%
rename from icons/Color/scalable/gimp-edit.svg
rename to icons/Color/scalable/gtk-edit.svg
diff --git a/icons/Legacy/16/gimp-edit.png b/icons/Legacy/16/gtk-edit.png
similarity index 100%
rename from icons/Legacy/16/gimp-edit.png
rename to icons/Legacy/16/gtk-edit.png
diff --git a/icons/Legacy/Makefile.am b/icons/Legacy/Makefile.am
index 4d7c7507b8..c50aca3781 100644
--- a/icons/Legacy/Makefile.am
+++ b/icons/Legacy/Makefile.am
@@ -38,6 +38,8 @@ icons12_DATA = \
 	12/gimp-zoom-follow-window.png
 
 icons16_DATA = \
+	16/gtk-edit.png						\
+										\
 	16/gimp-anchor.png				\
 	16/gimp-cap-butt.png				\
 	16/gimp-cap-round.png				\
@@ -74,7 +76,6 @@ icons16_DATA = \
 	16/gimp-display-filter.png			\
 	16/gimp-duplicate.png				\
 	16/gimp-dynamics.png				\
-	16/gimp-edit.png				\
 	16/gimp-flip-horizontal.png			\
 	16/gimp-flip-vertical.png			\
 	16/gimp-floating-selection.png			\
diff --git a/icons/Symbolic/16/gimp-edit.png b/icons/Symbolic/16/gtk-edit.png
similarity index 100%
rename from icons/Symbolic/16/gimp-edit.png
rename to icons/Symbolic/16/gtk-edit.png
diff --git a/icons/Symbolic/scalable/gimp-edit.svg b/icons/Symbolic/scalable/gtk-edit.svg
similarity index 100%
rename from icons/Symbolic/scalable/gimp-edit.svg
rename to icons/Symbolic/scalable/gtk-edit.svg
diff --git a/icons/Symbolic/symbolic-scalable.svg b/icons/Symbolic/symbolic-scalable.svg
index 8e4397f7ab..44816571ab 100644
--- a/icons/Symbolic/symbolic-scalable.svg
+++ b/icons/Symbolic/symbolic-scalable.svg
@@ -26228,8 +26228,8 @@
     <g
        transform="translate(-96.0906,-437.50285)"
        style="display:inline"
-       id="gimp-edit"
-       inkscape:label="gimp-edit">
+       id="gtk-edit"
+       inkscape:label="gtk-edit">
       <rect
          transform="translate(241.0002,217)"
          y="182"
diff --git a/icons/icon-list.mk b/icons/icon-list.mk
index 2498f1f113..958e6241f7 100644
--- a/icons/icon-list.mk
+++ b/icons/icon-list.mk
@@ -44,6 +44,7 @@ scalable_images = \
 	scalable/zoom-out.svg						\
 												\
 	scalable/gtk-cancel.svg						\
+	scalable/gtk-edit.svg						\
 	scalable/gtk-justify-fill.svg				\
 	scalable/gtk-justify-center.svg				\
 	scalable/gtk-justify-left.svg				\
@@ -101,7 +102,6 @@ scalable_images = \
 	scalable/gimp-display-filter.svg		\
 	scalable/gimp-duplicate.svg			\
 	scalable/gimp-dynamics.svg			\
-	scalable/gimp-edit.svg				\
 	scalable/gimp-error.svg				\
 	scalable/gimp-file-manager.svg			\
 	scalable/gimp-flip-horizontal.svg		\
@@ -530,6 +530,7 @@ icons16_images = \
 	16/zoom-out.png								\
 												\
 	16/gtk-cancel.png							\
+	16/gtk-edit.png								\
 	16/gtk-no.png								\
 	16/gtk-ok.png								\
 	16/gtk-select-color.png						\
@@ -578,7 +579,6 @@ icons16_images = \
 	16/gimp-display-filter.png					\
 	16/gimp-duplicate.png						\
 	16/gimp-dynamics.png						\
-	16/gimp-edit.png							\
 	16/gimp-error.png							\
 	16/gimp-file-manager.png					\
 	16/gimp-flip-horizontal.png					\
diff --git a/libgimpwidgets/gimpicons.c b/libgimpwidgets/gimpicons.c
index f04b1245b2..c715403f48 100644
--- a/libgimpwidgets/gimpicons.c
+++ b/libgimpwidgets/gimpicons.c
@@ -61,7 +61,6 @@ static const GtkStockItem gimp_stock_items[] =
   { GIMP_STOCK_ANCHOR,         N_("Anchor"),          0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_CENTER,         N_("C_enter"),         0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_DUPLICATE,      N_("_Duplicate"),      0, 0, LIBGIMP_DOMAIN },
-  { GIMP_STOCK_EDIT,           N_("_Edit"),           0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_LINKED,         N_("Linked"),          0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_PASTE_AS_NEW,   N_("Paste as New"),    0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_PASTE_INTO,     N_("Paste Into"),      0, 0, LIBGIMP_DOMAIN },
diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h
index 468e4199cf..add5adfaed 100644
--- a/libgimpwidgets/gimpicons.h
+++ b/libgimpwidgets/gimpicons.h
@@ -36,7 +36,6 @@ G_BEGIN_DECLS
 #define GIMP_STOCK_ANCHOR                   "gimp-anchor"
 #define GIMP_STOCK_CENTER                   "gimp-center"
 #define GIMP_STOCK_DUPLICATE                "gimp-duplicate"
-#define GIMP_STOCK_EDIT                     "gimp-edit"
 #define GIMP_STOCK_LINKED                   "gimp-linked"
 #define GIMP_STOCK_PASTE_AS_NEW             "gimp-paste-as-new"
 #define GIMP_STOCK_PASTE_INTO               "gimp-paste-into"