diff --git a/ide/mainbase.pas b/ide/mainbase.pas
index 8368297fd7..18cf04e760 100644
--- a/ide/mainbase.pas
+++ b/ide/mainbase.pas
@@ -978,6 +978,9 @@ begin
   end;
 end;
 
+{ Note: Icons are specified as last argument in the CreateMenuItem call. If these
+  icons do not show up in the IDE there may be another registration place somewhere
+  else, usually in RegisterStandardSourceEditorMenuItems (sourceeditor unit). }
 procedure TMainIDEBase.SetupEditMenu;
 var
   ParentMI: TIDEMenuSection;
@@ -1024,6 +1027,9 @@ begin
   end;
 end;
 
+{ Note: Icons are specified as last argument in the CreateMenuItem call. If these
+  icons do not show up in the IDE there may be another registration place somewhere
+  else, usually in RegisterStandardSourceEditorMenuItems (sourceeditor unit). }
 procedure TMainIDEBase.SetupSearchMenu;
 var
   ParentMI: TIDEMenuSection;
@@ -1140,6 +1146,9 @@ begin
   end;
 end;
 
+{ Note: Icons are specified as last argument in the CreateMenuItem call. If these
+  icons do not show up in the IDE there may be another registration place somewhere
+  else, usually in RegisterStandardSourceEditorMenuItems (sourceeditor unit). }
 procedure TMainIDEBase.SetupSourceMenu;
 var
   ParentMI, SubParentMI: TIDEMenuSection;
@@ -1150,8 +1159,8 @@ begin
     CreateMenuItem(ParentMI,itmSourceCommentBlock,'itmSourceCommentBlock',lisMenuCommentSelection, 'menu_comment');
     CreateMenuItem(ParentMI,itmSourceUncommentBlock,'itmSourceUncommentBlock',lisMenuUncommentSelection, 'menu_uncomment');
     CreateMenuItem(ParentMI,itmSourceToggleComment,'itmSourceToggleComment',lisMenuToggleComment, 'menu_togglecomment');
-    CreateMenuItem(ParentMI,itmSourceEncloseBlock,'itmSourceEncloseBlock',lisMenuEncloseSelection);
-    CreateMenuItem(ParentMI,itmSourceEncloseInIFDEF,'itmSourceEncloseInIFDEF',lisMenuEncloseInIFDEF);
+    CreateMenuItem(ParentMI,itmSourceEncloseBlock,'itmSourceEncloseBlock',lisMenuEncloseSelection, 'menu_source_encloseselection');
+    CreateMenuItem(ParentMI,itmSourceEncloseInIFDEF,'itmSourceEncloseInIFDEF',lisMenuEncloseInIFDEF, 'menu_source_encloseinifdef');
     CreateMenuItem(ParentMI,itmSourceCompleteCodeInteractive,'itmSourceCompleteCodeInteractive',lisMenuCompleteCodeInteractive, 'menu_source_completecode');
     CreateMenuItem(ParentMI,itmRefactorInvertAssignment,'itmInvertAssignment',uemInvertAssignment);
     CreateMenuItem(ParentMI,itmSourceUseUnit,'itmSourceUseUnit',lisMenuUseUnit);
diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp
index 9b01f2d493..81fba6d601 100644
--- a/ide/sourceeditor.pp
+++ b/ide/sourceeditor.pp
@@ -1803,9 +1803,9 @@ begin
         'Source', uemSource, nil, nil, 'item_unit');
     AParent:=SrcEditSubMenuSource;
     SrcEditMenuEncloseSelection := RegisterIDEMenuCommand(AParent,
-        'EncloseSelection', lisMenuEncloseSelection);
+        'EncloseSelection', lisMenuEncloseSelection, nil, nil, nil, 'menu_source_encloseselection');
     SrcEditMenuEncloseInIFDEF := RegisterIDEMenuCommand(AParent,
-        'itmSourceEncloseInIFDEF', lisMenuEncloseInIFDEF);
+        'itmSourceEncloseInIFDEF', lisMenuEncloseInIFDEF, nil, nil, nil, 'menu_source_encloseinifdef');
     SrcEditMenuCompleteCode := RegisterIDEMenuCommand(AParent,
         'CompleteCode', lisMenuCompleteCode, nil, @ExecuteIdeMenuClick);
     SrcEditMenuInvertAssignment := RegisterIDEMenuCommand(AParent,
diff --git a/images/laz_images.res b/images/laz_images.res
index b900c6e6ee..89b818a5ba 100644
Binary files a/images/laz_images.res and b/images/laz_images.res differ
diff --git a/images/laz_images_list.txt b/images/laz_images_list.txt
index 18cbc13da7..7b85e7eb32 100644
--- a/images/laz_images_list.txt
+++ b/images/laz_images_list.txt
@@ -822,6 +822,12 @@ menu/menu_set_free_bookmark_200.png
 menu/menu_source_completecode.png
 menu/menu_source_completecode_150.png
 menu/menu_source_completecode_200.png
+menu/menu_source_encloseselection.png
+menu/menu_source_encloseselection_150.png
+menu/menu_source_encloseselection_200.png
+menu/menu_source_encloseinifdef.png
+menu/menu_source_encloseinifdef_150.png
+menu/menu_source_encloseinifdef_200.png
 menu/menu_source_makeresourcestring.png
 menu/menu_source_makeresourcestring_150.png
 menu/menu_source_makeresourcestring_200.png
diff --git a/images/menu/menu_source_encloseinifdef.png b/images/menu/menu_source_encloseinifdef.png
new file mode 100644
index 0000000000..08c3ed23ee
Binary files /dev/null and b/images/menu/menu_source_encloseinifdef.png differ
diff --git a/images/menu/menu_source_encloseinifdef_150.png b/images/menu/menu_source_encloseinifdef_150.png
new file mode 100644
index 0000000000..c0f356e671
Binary files /dev/null and b/images/menu/menu_source_encloseinifdef_150.png differ
diff --git a/images/menu/menu_source_encloseinifdef_200.png b/images/menu/menu_source_encloseinifdef_200.png
new file mode 100644
index 0000000000..f9bc3de93f
Binary files /dev/null and b/images/menu/menu_source_encloseinifdef_200.png differ
diff --git a/images/menu/menu_source_encloseselection.png b/images/menu/menu_source_encloseselection.png
new file mode 100644
index 0000000000..e350fdb74b
Binary files /dev/null and b/images/menu/menu_source_encloseselection.png differ
diff --git a/images/menu/menu_source_encloseselection_150.png b/images/menu/menu_source_encloseselection_150.png
new file mode 100644
index 0000000000..e8d0277ac1
Binary files /dev/null and b/images/menu/menu_source_encloseselection_150.png differ
diff --git a/images/menu/menu_source_encloseselection_200.png b/images/menu/menu_source_encloseselection_200.png
new file mode 100644
index 0000000000..de67de6f39
Binary files /dev/null and b/images/menu/menu_source_encloseselection_200.png differ
diff --git a/images/states/quickfix.png b/images/states/quickfix.png
index 936e99ade7..b8c2479c6f 100644
Binary files a/images/states/quickfix.png and b/images/states/quickfix.png differ
diff --git a/images/states/quickfix_150.png b/images/states/quickfix_150.png
index 9d48d07bdd..e0a1cf1eaf 100644
Binary files a/images/states/quickfix_150.png and b/images/states/quickfix_150.png differ
diff --git a/images/states/quickfix_200.png b/images/states/quickfix_200.png
index 4c06787279..8d476c91d2 100644
Binary files a/images/states/quickfix_200.png and b/images/states/quickfix_200.png differ
diff --git a/images/states/quickfix_69.png b/images/states/quickfix_69.png
index 933af2a1e3..fa7f4cf911 100644
Binary files a/images/states/quickfix_69.png and b/images/states/quickfix_69.png differ
diff --git a/images/states/quickfix_75.png b/images/states/quickfix_75.png
index 622740e954..ed48178dfe 100644
Binary files a/images/states/quickfix_75.png and b/images/states/quickfix_75.png differ