diff --git a/src/ce_editor.lfm b/src/ce_editor.lfm
index 03be8fa7..9d9f3799 100644
--- a/src/ce_editor.lfm
+++ b/src/ce_editor.lfm
@@ -24,7 +24,6 @@ inherited CEEditorWidget: TCEEditorWidget
         Width = 459
         Align = alClient
         BorderSpacing.Around = 2
-        Images = imgList
         TabOrder = 0
         OnChange = PageControlChange
         Options = [nboShowCloseButtons, nboShowAddTabButton]
@@ -51,50 +50,17 @@ inherited CEEditorWidget: TCEEditorWidget
       end
     end
   end
+  inherited contextMenu: TPopupMenu
+    left = 32
+    top = 40
+  end
   object macRecorder: TSynMacroRecorder[2]
     RecordShortCut = 24658
     PlaybackShortCut = 24656
-    left = 64
-  end
-  object imgList: TImageList[3]
     left = 32
-    Bitmap = {
-      4C69010000001000000010000000CCCBC900CCCBC900CCCBC900CCCBC900CCCB
-      C900CCCBC900CCCBC900CDCCCA00D1D0CE00B0AFAD96817F7DFF7F7D7CFF7C7A
-      78FFA4A2A1977674720078767400CCCBC900CCCBC900CBCAC800CCCBC900CCCB
-      C900CCCBC900CCCBC900CECDCB00D2D2D0A77B7876FFEEEDECFFD5D3D2FFC3C2
-      C0FF73716EFF9B9997979C9A9800CCCBC900CCCBC900CDCCCA00D0CFCD00D2D1
-      CF00D2D1CF00D2D1CF00D3D2D097797775FFF5F5F4FF7E7B79FF787878876C6A
-      67FFB9B7B4FF6D6B6AFF706E6D00CCCBC900CDCCCA00D0CFCD007D7B7900817F
-      7D0083817E0082807E007F7D7BFFEEEDECFF7F7D7AFF00000033000000158D8D
-      8D98B2B0ADFF696865FF6E6C6900CCCBC900CDCCCA00D1D0CE00827F7D008381
-      7F0083818100838180007F7D7CFFD6D4D3FF797775FF6E6C69FF62605E005D5C
-      58FFA9A9A2FF5F625AFF64675E00CCCBC900CDCCCA00D2D1CF0083807E008583
-      810083817E00807E7C007D7B79FF777572FFF4F4F5FF575554FF605F5CFFA9A9
-      A2FFC78BDFFFC58CDCFFB47ED600CCCBC900CECDCB00D2D1CF00827F7D008482
-      800082807E007E7C7A007A7876FFF5F5F5FF565351FFB6B3B0FFABA7A4FF8687
-      81FFE3B3E3FFCC96C7FFAF7DCFFFCFCECC00CFCECC00D3D2D0967F7D7BFF807E
-      7CFF7F7D7BFF7A7876FFF6F5F5FF5B5552FF413B36FF6E655DFF8E8680FFECEA
-      E6FF898C83FFBA7AB6FF9869CAFFAEADAB00D4D3D1A7787675FFEEEDECFFD7D5
-      D5FF797775FFF6F6F6FF5B5652FF00000033000000332F80D1FFB2DEF3FF9289
-      80FFC1BFB8FF777C6EFF00000033B4B3B1AC7A7876FFEAEBEAFF848280FF7A78
-      76FFB9B8B7FF585553FF423B36FF3487D9003880CBFF47CAFFFF22ABFFFF84B1
-      D8FF7F7971FF000000339D6BCF007F7D7AFFEEEDECFF83817FFF000000336D6A
-      68FF595654FFB9B3AEFF76675AFF3680CEFF49CBFFFF2EACFFFF179DFFFF316B
-      A2FF000000337E8073009E6BCF007C7A78FFD5D3D2FF77777788A4A4A5000000
-      003375706CFFB4A69DFF2B7CCFFF43C8FFFF2CABFFFF1B9EFFFF3C6D9BFF0000
-      0033877F76007E8073009E6BCF00767472FFC1C1BEFF7F7D7BFFA3A4A474726F
-      6CFFA19993FF45B6FCFF8CE8FFFF81D5FFFF159BFFFF3D6D9BFF000000333471
-      AA00878076007E8073009E6BCF00A9A7A5AC6A6866FFB7B5B3FFB2B0AEFFAFAB
-      A8FF665F5BFF5C87A5FF81A8B7FF90D6FFFF376A9BFF000000333A73A6003472
-      AB00878076007E8073009E6BCF000000001E9F9C9BAC676564FF676564FF6461
-      60FF7D7874B1566C7EFF4A6784FF5291D9FF000000333B72A5003A73A7003472
-      AB00878076007E8073009E6BCF00000000000000001E00000033000000330000
-      00330000001F0000003300000033000000330000000000000000000000000000
-      0000000000000000000000000000
-    }
+    top = 144
   end
-  object completion: TSynCompletion[4]
+  object completion: TSynCompletion[3]
     OnExecute = completionExecute
     Position = 0
     LinesInWindow = 8
@@ -106,6 +72,7 @@ inherited CEEditorWidget: TCEEditorWidget
     EndOfTokenChr = '()[].!+"''(-*/\$:;?<>'
     OnCodeCompletion = completionCodeCompletion
     ExecCommandID = ecSynCompletionExecute
-    left = 96
+    left = 32
+    top = 88
   end
 end
diff --git a/src/ce_editor.pas b/src/ce_editor.pas
index c304fcca..0aef4e06 100644
--- a/src/ce_editor.pas
+++ b/src/ce_editor.pas
@@ -20,7 +20,6 @@ type
   end;
 
   TCEEditorWidget = class(TCEWidget, ICEMultiDocObserver, ICEMultiDocHandler)
-    imgList: TImageList;
     PageControl: TExtendedNotebook;
     macRecorder: TSynMacroRecorder;
     editorStatus: TStatusBar;
@@ -86,7 +85,7 @@ end;
 {$REGION Standard Comp/Obj------------------------------------------------------}
 constructor TCEEditorWidget.create(aOwner: TComponent);
 var
-  bmp: TBitmap;
+  png: TPortableNetworkGraphic;
 begin
   inherited;
   //
@@ -97,12 +96,12 @@ begin
   fSyncEdit := TSynPluginSyncroEdit.Create(self);
   //TODO-cLCL&LAZ-specific: activate this after next Laz release
   //fSyncEdit.CaseSensitive:=true;
-  bmp := TBitmap.Create;
+  png := TPortableNetworkGraphic.Create;
   try
-    imgList.GetBitmap(0, bmp);
-    fSyncEdit.GutterGlyph.Assign(bmp);
+    png.LoadFromLazarusResource('link_edit');
+    fSyncEdit.GutterGlyph.Assign(png);
   finally
-    bmp.Free;
+    png.Free;
   end;
   //
   {$IFDEF LINUX}