diff --git a/app/actions/view-actions.c b/app/actions/view-actions.c
index a2873e05e4..0f3b1b2395 100644
--- a/app/actions/view-actions.c
+++ b/app/actions/view-actions.c
@@ -91,7 +91,7 @@ static const GimpActionEntry view_actions[] =
     view_zoom_fit_in_cmd_callback,
     GIMP_HELP_VIEW_ZOOM_FIT_IN },
 
-  { "view-zoom-fill", GIMP_ICON_ZOOM_FIT_BEST,
+  { "view-zoom-fill", GIMP_ICON_VIEW_ZOOM_FILL,
     NC_("view-action", "Fi_ll Window"), NULL, { NULL },
     NC_("view-action", "Adjust the zoom ratio so that the entire window is used"),
     view_zoom_fill_cmd_callback,
@@ -148,7 +148,7 @@ static const GimpActionEntry view_actions[] =
     view_color_management_reset_cmd_callback,
     GIMP_HELP_VIEW_COLOR_MANAGEMENT },
 
-  { "view-shrink-wrap", GIMP_ICON_ZOOM_FIT_BEST,
+  { "view-shrink-wrap", GIMP_ICON_VIEW_SHRINK_WRAP,
     NC_("view-action", "Shrink _Wrap"), NULL, { "<primary>J", NULL },
     NC_("view-action", "Reduce the image window to the size of the image display"),
     view_shrink_wrap_cmd_callback,
diff --git a/gimp-data b/gimp-data
index cd59b23be0..fef782c772 160000
--- a/gimp-data
+++ b/gimp-data
@@ -1 +1 @@
-Subproject commit cd59b23be0aa686493d6083d3ec678387e7eda78
+Subproject commit fef782c772ed28790202d617246bf8b7eb8ade98
diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h
index 96b245f5c9..1eccb8be22 100644
--- a/libgimpwidgets/gimpicons.h
+++ b/libgimpwidgets/gimpicons.h
@@ -413,6 +413,8 @@ G_BEGIN_DECLS
 
 #define GIMP_ICON_VIEW_REFRESH              "view-refresh"
 #define GIMP_ICON_VIEW_FULLSCREEN           "view-fullscreen"
+#define GIMP_ICON_VIEW_SHRINK_WRAP          "view-shrink-wrap"
+#define GIMP_ICON_VIEW_ZOOM_FILL            "view-zoom-fill"
 
 #define GIMP_ICON_WILBER                    "gimp-wilber"
 #define GIMP_ICON_WILBER_EEK                "gimp-wilber-eek"