diff --git a/.gitattributes b/.gitattributes
index 5ba851730a..38f71e68a0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2259,6 +2259,8 @@ images/codeexplorer/ce_property.png -text
 images/codeexplorer/ce_type.png -text
 images/codeexplorer/ce_unit.png -text
 images/codeexplorer/ce_variable.png -text
+images/codeexplorer/show_category.png -text
+images/codeexplorer/show_source.png -text
 images/codetoolsdefines/block_22x22.xpm -text svneol=native#image/x-xpixmap
 images/codetoolsdefines/ctdefinestate_auto_22x22.xpm -text svneol=native#image/x-xpixmap
 images/codetoolsdefines/ctdefinestate_autoproj_22x22.xpm -text svneol=native#image/x-xpixmap
diff --git a/ide/codeexplorer.pas b/ide/codeexplorer.pas
index d7356d7d3a..e74515fc79 100644
--- a/ide/codeexplorer.pas
+++ b/ide/codeexplorer.pas
@@ -524,7 +524,9 @@ function TCodeExplorerView.GetCodeNodeImage(Tool: TFindDeclarationTool;
 begin
   case CodeNode.Desc of
   ctnProgram,ctnLibrary,ctnPackage:   Result:=ImgIDProgram;
-  ctnUnit:                            Result:=ImgIDInterfaceSection;
+//  ctnUnit:                            Result:=ImgIDInterfaceSection;
+  ctnUnit:                            Result:=ImgIDUnit;
+  ctnInterface:                       Result:=ImgIDInterfaceSection;
   ctnImplementation:                  Result:=ImgIDImplementation;
   ctnInitialization:                  Result:=ImgIDInitialization;
   ctnFinalization:                    Result:=ImgIDFinalization;
@@ -770,14 +772,22 @@ begin
 end;
 
 procedure TCodeExplorerView.UpdateMode;
+var
+  B: TBitmap;
 begin
   if FMode=cemCategory then
   begin
-    ModeSpeedButton.Caption:='C'; // To-Do: Change it to use image instead of 'C'.
+    B := LoadBitmapFromLazarusResource('show_category');
+    ModeSpeedButton.Glyph := B;
+    B.Free;
+    //ModeSpeedButton.Caption:='C'; // To-Do: Change it to use image instead of 'C'.
     ModeSpeedButton.Hint:=lisCEModeShowSourceNodes;
   end
   else begin
-    ModeSpeedButton.Caption:='S'; // To-Do: Change it to use image instead of 'S'.
+    B := LoadBitmapFromLazarusResource('show_source');
+    ModeSpeedButton.Glyph := B;
+    B.Free;
+    //ModeSpeedButton.Caption:='S'; // To-Do: Change it to use image instead of 'S'.
     ModeSpeedButton.Hint:=lisCEModeShowCategories;
   end;
   Refresh(true);
diff --git a/images/codeexplorer/show_category.png b/images/codeexplorer/show_category.png
new file mode 100644
index 0000000000..17b4aa0301
Binary files /dev/null and b/images/codeexplorer/show_category.png differ
diff --git a/images/codeexplorer/show_source.png b/images/codeexplorer/show_source.png
new file mode 100644
index 0000000000..a6ad7e0d59
Binary files /dev/null and b/images/codeexplorer/show_source.png differ
diff --git a/images/laz_images.lrs b/images/laz_images.lrs
index 27429f0142..5709ae377d 100644
--- a/images/laz_images.lrs
+++ b/images/laz_images.lrs
@@ -3001,6 +3001,35 @@ LazarusResources.Add('ce_variable','PNG',[
   +#160#234'/T'#137#131#128#231#254#198' '#224'9u'#7'u'#220#221'n'#130#149#223
   +#218#0#0#0#0'IEND'#174'B`'#130
 ]);
+LazarusResources.Add('show_source','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
+  +#0#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#255#0#255#0#255#160#189#167
+  +#147#0#0#0#9'pHYs'#0#0#11#18#0#0#11#18#1#210#221'~'#252#0#0#0#7'tIME'#7#216#1
+  +#24#17#17'-'#145#150#212#0#0#0#0#186'IDAT8'#203#237#146'A'#18#193'@'#20'D_'
+  +#200'>'#149#27#252#163#224#0#22#14#128#27#224#30#4#247#144'da'#143#163#204#21
+  +#178'E'#180#21'BB'#146#189#174#250'USS='#175#255'T'#181''''#137'$'#141#229
+  +#156#163'Nf'#198'p8'#242#252#174#247#186#148#196'*Z*'#207#243#218'YEK'#197
+  +#201'N'#231'K'#142'$$'#209')&dY'#246'u'#0'&'#227')'#206'9'#246#251'T'#151#235
+  +#13#224#29#208'DE'#8#128#255'i8'#158#14#165'G'#253#222#0#128'0'#12#1#152#207
+  +#22'l'#182'k*'#1#15#243#167#30#223#0#8#130#224'y'#246#171#204'U[|'#11#240#155
+  +#152'~'#233#191'A'#203#30'4'#2#180'I/'#1#138#5'i'#5'0'#179'g5'#155#202#204#0
+  +#184#3'_'#15#130#15#176#138'6'#171#0#0#0#0'IEND'#174'B`'#130
+]);
+LazarusResources.Add('show_category','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
+  +#0#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#255#0#255#0#255#160#189#167
+  +#147#0#0#0#9'pHYs'#0#0#11#18#0#0#11#18#1#210#221'~'#252#0#0#0#7'tIME'#7#216#1
+  +#24#17#18#5#143#14'/9'#0#0#0#199'IDAT8'#203#229'S;'#14#130'@'#20#28#148'~'
+  +#179'7'#216#163#168#7#160#240#0#234#13#212#134'C'#16'@-'#185#131'HA'#175#30
+  +'eo`hE'#24'+~'#162#129#173#157#228'%'#179#159'7;;'#201#179'H'#226#146#196#212
+  +'Zc'#8'J)8'#206#210#178#167'V'#179'I'#18'A'#232#179'('#138#193#10'B'#159#241
+  +#229#204'g^'#128'$Hb'#210'~!'#203#178#159#5#0#235#213#6'Zk'#164'i'#194#252'U'
+  +#2'@W`'#12#218'"'#198#2'RJH)'#177#219#238'Qef'#247'.'#185'n'#205#31#158#215
+  +#249'^'#5'!D'#205'{'#2#237#166#10#183#251#181#230#243#217#162'sf'#143#177#254
+  +#217'd,`'#228#224'['#6'F'#14#254'='#3'!'#4#202'(j'#214'#'#220#217#213#152#30
+  +'O'#7#163#153'PJ'#1#0#222#189#197#142#178#182'b'#241#211#0#0#0#0'IEND'#174'B'
+  +'`'#130
+]);
 LazarusResources.Add('anchor_bottom','PNG',[
   #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
   +#0#0#0#4'gAMA'#0#0#175#200'7'#5#138#233#0#0#0#25'tEXtSoftware'#0'Adobe Image'
diff --git a/images/laz_images_list.txt b/images/laz_images_list.txt
index 4c2e821980..a77429a425 100644
--- a/images/laz_images_list.txt
+++ b/images/laz_images_list.txt
@@ -115,6 +115,8 @@ codeexplorer/ce_property.png
 codeexplorer/ce_type.png
 codeexplorer/ce_unit.png
 codeexplorer/ce_variable.png
+codeexplorer/show_source.png
+codeexplorer/show_category.png
 designer/anchor_bottom.png
 designer/anchor_center_horizontal.png
 designer/anchor_center_vertical.png