diff --git a/ide/keymapping.pp b/ide/keymapping.pp
index c66e886b22..6eb5499d95 100644
--- a/ide/keymapping.pp
+++ b/ide/keymapping.pp
@@ -2835,6 +2835,7 @@ procedure TKeyCommandRelationList.DefineCommandCategories;
 
 var
   C: TIDECommandCategory;
+  i: integer;
 begin
   Clear;
   // moving
@@ -3064,43 +3065,21 @@ begin
 
   // marker - without menu items in the IDE bar
   C:=Categories[AddCategory('Marker',srkmCatMarker,IDECmdScopeSrcEditOnly)];
-  AddDefault(C, 'Set free Bookmark', lisKMSetFreeBookmark, ecSetFreeBookmark);
+  AddDefault(C, 'Set free Bookmark', srkmecSetFreeBookmark, ecSetFreeBookmark);
   AddDefault(C, 'Clear Bookmarks for current file', srkmecClearBookmarkForFile, ecClearBookmarkForFile);
   AddDefault(C, 'Clear all Bookmarks', srkmecClearAllBookmark, ecClearAllBookmark);
   AddDefault(C, 'Previous Bookmark', srkmecPrevBookmark, ecPrevBookmark);
   AddDefault(C, 'Next Bookmark', srkmecNextBookmark, ecNextBookmark);
   AddDefault(C, 'Go to Bookmark...', uemGotoBookmarks, ecGotoBookmarks);
-  AddDefault(C, 'Go to marker 0', lisKMGoToMarker0, ecGotoMarker0);
-  AddDefault(C, 'Go to marker 1', lisKMGoToMarker1, ecGotoMarker1);
-  AddDefault(C, 'Go to marker 2', lisKMGoToMarker2, ecGotoMarker2);
-  AddDefault(C, 'Go to marker 3', lisKMGoToMarker3, ecGotoMarker3);
-  AddDefault(C, 'Go to marker 4', lisKMGoToMarker4, ecGotoMarker4);
-  AddDefault(C, 'Go to marker 5', lisKMGoToMarker5, ecGotoMarker5);
-  AddDefault(C, 'Go to marker 6', lisKMGoToMarker6, ecGotoMarker6);
-  AddDefault(C, 'Go to marker 7', lisKMGoToMarker7, ecGotoMarker7);
-  AddDefault(C, 'Go to marker 8', lisKMGoToMarker8, ecGotoMarker8);
-  AddDefault(C, 'Go to marker 9', lisKMGoToMarker9, ecGotoMarker9);
-  AddDefault(C, 'Set marker 0', lisKMSetMarker0, ecSetMarker0);
-  AddDefault(C, 'Set marker 1', lisKMSetMarker1, ecSetMarker1);
-  AddDefault(C, 'Set marker 2', lisKMSetMarker2, ecSetMarker2);
-  AddDefault(C, 'Set marker 3', lisKMSetMarker3, ecSetMarker3);
-  AddDefault(C, 'Set marker 4', lisKMSetMarker4, ecSetMarker4);
-  AddDefault(C, 'Set marker 5', lisKMSetMarker5, ecSetMarker5);
-  AddDefault(C, 'Set marker 6', lisKMSetMarker6, ecSetMarker6);
-  AddDefault(C, 'Set marker 7', lisKMSetMarker7, ecSetMarker7);
-  AddDefault(C, 'Set marker 8', lisKMSetMarker8, ecSetMarker8);
-  AddDefault(C, 'Set marker 9', lisKMSetMarker9, ecSetMarker9);
+
+  for i:=0 to 9 do
+    AddDefault(C, Format('Go to marker %d', [i]), Format(srkmecGotoMarker, [i]), ecGotoMarker0+i);
+  for i:=0 to 9 do
+    AddDefault(C, Format('Set marker %d', [i]), Format(srkmecSetMarker, [i]), ecSetMarker0+i);
+
   AddDefault(C, 'Toggle Bookmark...', uemToggleBookmarks, ecToggleBookmarks);
-  AddDefault(C, 'Toggle marker 0', lisKMToggleMarker0, ecToggleMarker0);
-  AddDefault(C, 'Toggle marker 1', lisKMToggleMarker1, ecToggleMarker1);
-  AddDefault(C, 'Toggle marker 2', lisKMToggleMarker2, ecToggleMarker2);
-  AddDefault(C, 'Toggle marker 3', lisKMToggleMarker3, ecToggleMarker3);
-  AddDefault(C, 'Toggle marker 4', lisKMToggleMarker4, ecToggleMarker4);
-  AddDefault(C, 'Toggle marker 5', lisKMToggleMarker5, ecToggleMarker5);
-  AddDefault(C, 'Toggle marker 6', lisKMToggleMarker6, ecToggleMarker6);
-  AddDefault(C, 'Toggle marker 7', lisKMToggleMarker7, ecToggleMarker7);
-  AddDefault(C, 'Toggle marker 8', lisKMToggleMarker8, ecToggleMarker8);
-  AddDefault(C, 'Toggle marker 9', lisKMToggleMarker9, ecToggleMarker9);
+  for i:=0 to 9 do
+    AddDefault(C, Format('Toggle marker %d', [i]), Format(srkmecToggleMarker, [i]), ecToggleMarker0+i);
 
   // codetools
   C:=Categories[AddCategory(CommandCategoryCodeTools,srkmCatCodeTools,IDECmdScopeSrcEditOnly)];
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index b3ac545652..e69a122720 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -1731,7 +1731,7 @@ resourcestring
   dlfMouseSimpleButtonAddHistoryPoint  = 'Add history point';
   dlfMouseSimpleButtonHistBack = 'History back';
   dlfMouseSimpleButtonHistForw = 'History forward';
-  dlfMouseSimpleButtonSetFreeBookmark  = 'Set free bookmark';
+  dlfMouseSimpleButtonSetFreeBookmark  = 'Set a free bookmark';
   dlfMouseSimpleButtonZoomReset        = 'Reset zoom';
   dlfMouseSimpleButtonContextMenu      = 'Context Menu';
   dlfMouseSimpleButtonContextMenuDbg   = 'Context Menu (debug)';
@@ -2889,7 +2889,6 @@ resourcestring
   lisCopyFilename = 'Copy Filename %s';
   uemGotoBookmark = '&Goto Bookmark';
   uemGotoBookmarks = 'Goto Bookmark ...';
-  uemSetFreeBookmark = 'Set a Free Bookmark';
   uemNextBookmark = 'Goto Next Bookmark';
   uemPrevBookmark = 'Goto Previous Bookmark';
   uemBookmarkNUnSetDisabled = 'Bookmark %s';
@@ -3162,36 +3161,6 @@ resourcestring
   srkmecClearAllBookmark      = 'Clear all Bookmarks';
   srkmecPrevBookmark          = 'Previous Bookmark';
   srkmecNextBookmark          = 'Next Bookmark';
-  lisKMGoToMarker0 = 'Go to bookmark 0';
-  lisKMGoToMarker1 = 'Go to bookmark 1';
-  lisKMGoToMarker2 = 'Go to bookmark 2';
-  lisKMGoToMarker3 = 'Go to bookmark 3';
-  lisKMGoToMarker4 = 'Go to bookmark 4';
-  lisKMGoToMarker5 = 'Go to bookmark 5';
-  lisKMGoToMarker6 = 'Go to bookmark 6';
-  lisKMGoToMarker7 = 'Go to bookmark 7';
-  lisKMGoToMarker8 = 'Go to bookmark 8';
-  lisKMGoToMarker9 = 'Go to bookmark 9';
-  lisKMSetMarker0 = 'Set bookmark 0';
-  lisKMSetMarker1 = 'Set bookmark 1';
-  lisKMSetMarker2 = 'Set bookmark 2';
-  lisKMSetMarker3 = 'Set bookmark 3';
-  lisKMSetMarker4 = 'Set bookmark 4';
-  lisKMSetMarker5 = 'Set bookmark 5';
-  lisKMSetMarker6 = 'Set bookmark 6';
-  lisKMSetMarker7 = 'Set bookmark 7';
-  lisKMSetMarker8 = 'Set bookmark 8';
-  lisKMSetMarker9 = 'Set bookmark 9';
-  lisKMToggleMarker0 = 'Toggle bookmark 0';
-  lisKMToggleMarker1 = 'Toggle bookmark 1';
-  lisKMToggleMarker2 = 'Toggle bookmark 2';
-  lisKMToggleMarker3 = 'Toggle bookmark 3';
-  lisKMToggleMarker4 = 'Toggle bookmark 4';
-  lisKMToggleMarker5 = 'Toggle bookmark 5';
-  lisKMToggleMarker6 = 'Toggle bookmark 6';
-  lisKMToggleMarker7 = 'Toggle bookmark 7';
-  lisKMToggleMarker8 = 'Toggle bookmark 8';
-  lisKMToggleMarker9 = 'Toggle bookmark 9';
   srkmecGotoMarker   = 'Go to bookmark %d';
   srkmecSetMarker    = 'Set bookmark %d';
   srkmecToggleMarker = 'Toggle bookmark %d';
@@ -3467,7 +3436,6 @@ resourcestring
   srkmCatSearchReplace  = 'Text search and replace commands';
   srkmCatMarker         = 'Text bookmark commands';
   srkmCatFold           = 'Text folding commands';
-  lisKMSetFreeBookmark = 'Set free Bookmark';
   srkmCatCodeTools      = 'CodeTools commands';
   srkmCatMacroRecording = 'Macros';
   srkmCatTemplateEdit   = 'Template Editing';
diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp
index 658be24f48..cf8431b305 100644
--- a/ide/sourceeditor.pp
+++ b/ide/sourceeditor.pp
@@ -1833,7 +1833,7 @@ begin
 
       AParent:=RegisterIDEMenuSection(AParent, 'Set Free Bookmark section');
       SrcEditMenuSetFreeBookmark:=RegisterIDEMenuCommand(AParent,
-          'Set a free Bookmark',uemSetFreeBookmark, nil, @ExecuteIdeMenuClick, nil, 'menu_set_free_bookmark');
+          'Set a free Bookmark',lisMenuSetFreeBookmark, nil, @ExecuteIdeMenuClick, nil, 'menu_set_free_bookmark');
 
       AParent:=RegisterIDEMenuSection(AParent, 'Clear Bookmarks section');
       SrcEditMenuClearFileBookmark:=RegisterIDEMenuCommand(AParent,