diff --git a/app/dialogs/path-options-dialog.c b/app/dialogs/path-options-dialog.c
index c7e5af04aa..eca76d92be 100644
--- a/app/dialogs/path-options-dialog.c
+++ b/app/dialogs/path-options-dialog.c
@@ -104,8 +104,8 @@ path_options_dialog_new (GimpImage               *image,
                                     parent, title, role,
                                     icon_name, desc, help_id,
                                     _("Path _name:"),
-                                    GIMP_ICON_LOCK_CONTENT,
-                                    _("Lock path _strokes"),
+                                    GIMP_ICON_LOCK_PATH,
+                                    _("Lock p_ath"),
                                     _("Lock path _position"),
                                     _("Lock path _visibility"),
                                     path_name,
diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h
index 02b7cdd20b..c050234b65 100644
--- a/app/widgets/gimphelp-ids.h
+++ b/app/widgets/gimphelp-ids.h
@@ -280,6 +280,7 @@
 #define GIMP_HELP_PATH_COLOR_TAG                  "gimp-path-color-tag"
 #define GIMP_HELP_PATH_LOCK_STROKES               "gimp-path-lock-strokes"
 #define GIMP_HELP_PATH_LOCK_POSITION              "gimp-path-lock-position"
+#define GIMP_HELP_PATH_LOCK_VISIBILITY            "gimp-path-lock-visibility"
 #define GIMP_HELP_PATH_SELECTION_REPLACE          "gimp-path-selection-replace"
 #define GIMP_HELP_PATH_SELECTION_ADD              "gimp-path-selection-add"
 #define GIMP_HELP_PATH_SELECTION_SUBTRACT         "gimp-path-selection-subtract"
diff --git a/app/widgets/gimppathtreeview.c b/app/widgets/gimppathtreeview.c
index 9903c84ff2..d629752612 100644
--- a/app/widgets/gimppathtreeview.c
+++ b/app/widgets/gimppathtreeview.c
@@ -97,22 +97,25 @@ gimp_path_tree_view_class_init (GimpPathTreeViewClass *klass)
   iv_class->remove_item     = (GimpRemoveItemFunc) gimp_image_remove_path;
   iv_class->new_item        = gimp_path_tree_view_item_new;
 
-  iv_class->action_group            = "vectors";
-  iv_class->activate_action         = "vectors-edit";
-  iv_class->new_action              = "vectors-new";
-  iv_class->new_default_action      = "vectors-new-last-values";
-  iv_class->raise_action            = "vectors-raise";
-  iv_class->raise_top_action        = "vectors-raise-to-top";
-  iv_class->lower_action            = "vectors-lower";
-  iv_class->lower_bottom_action     = "vectors-lower-to-bottom";
-  iv_class->duplicate_action        = "vectors-duplicate";
-  iv_class->delete_action           = "vectors-delete";
-  iv_class->lock_content_icon_name  = GIMP_ICON_TOOL_PATH;
-  iv_class->lock_content_tooltip    = _("Lock path");
-  iv_class->lock_content_help_id    = GIMP_HELP_PATH_LOCK_STROKES;
-  iv_class->lock_position_icon_name = GIMP_ICON_TOOL_MOVE;
-  iv_class->lock_position_tooltip   = _("Lock path position");
-  iv_class->lock_position_help_id   = GIMP_HELP_PATH_LOCK_POSITION;
+  iv_class->action_group              = "vectors";
+  iv_class->activate_action           = "vectors-edit";
+  iv_class->new_action                = "vectors-new";
+  iv_class->new_default_action        = "vectors-new-last-values";
+  iv_class->raise_action              = "vectors-raise";
+  iv_class->raise_top_action          = "vectors-raise-to-top";
+  iv_class->lower_action              = "vectors-lower";
+  iv_class->lower_bottom_action       = "vectors-lower-to-bottom";
+  iv_class->duplicate_action          = "vectors-duplicate";
+  iv_class->delete_action             = "vectors-delete";
+  iv_class->lock_content_icon_name    = GIMP_ICON_LOCK_PATH;
+  iv_class->lock_content_tooltip      = _("Lock path strokes");
+  iv_class->lock_content_help_id      = GIMP_HELP_PATH_LOCK_STROKES;
+  iv_class->lock_position_icon_name   = GIMP_ICON_LOCK_POSITION;
+  iv_class->lock_position_tooltip     = _("Lock path position");
+  iv_class->lock_position_help_id     = GIMP_HELP_PATH_LOCK_POSITION;
+  iv_class->lock_visibility_icon_name = GIMP_ICON_LOCK_VISIBILITY;
+  iv_class->lock_visibility_tooltip   = _("Lock path visibility");
+  iv_class->lock_position_help_id     = GIMP_HELP_PATH_LOCK_VISIBILITY;
 }
 
 static void
diff --git a/gimp-data b/gimp-data
index d129d52bf8..c23a30befe 160000
--- a/gimp-data
+++ b/gimp-data
@@ -1 +1 @@
-Subproject commit d129d52bf837f217b034947738fedf44a8dddc51
+Subproject commit c23a30befeec8862504d4a9b992b932d0af41e5a
diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h
index 9aee6a1876..96b245f5c9 100644
--- a/libgimpwidgets/gimpicons.h
+++ b/libgimpwidgets/gimpicons.h
@@ -183,6 +183,7 @@ G_BEGIN_DECLS
 #define GIMP_ICON_LOCK                      "gimp-lock"
 #define GIMP_ICON_LOCK_ALPHA                "gimp-lock-alpha"
 #define GIMP_ICON_LOCK_CONTENT              "gimp-lock-content"
+#define GIMP_ICON_LOCK_PATH                 "gimp-lock-path"
 #define GIMP_ICON_LOCK_POSITION             "gimp-lock-position"
 #define GIMP_ICON_LOCK_VISIBILITY           "gimp-lock-visibility"
 #define GIMP_ICON_LOCK_MULTI                "gimp-lock-multi"