diff --git a/.gitattributes b/.gitattributes
index 82a927bb62..f18e60294d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2296,7 +2296,9 @@ images/menu/menu_uncomment_16.xpm svneol=native#text/plain
 images/menu/menu_undo.png -text svneol=unset#image/png
 images/menu/menu_unindent.png -text svneol=unset#image/png
 images/menu/menu_view_anchor_editor.png -text svneol=unset#image/png
+images/menu/menu_view_code_explorer.png -text svneol=unset#image/png
 images/menu/menu_view_inspector.png -text svneol=unset#image/png
+images/menu/menu_view_source_editor.png -text svneol=unset#image/png
 images/menu/menu_view_toggle_form_unit.png -text svneol=unset#image/png
 images/mouse.xpm -text svneol=native#image/x-xpixmap
 images/notebook.xpm -text svneol=native#image/x-xpixmap
diff --git a/ide/mainbase.pas b/ide/mainbase.pas
index 00e1ec1960..f125552473 100644
--- a/ide/mainbase.pas
+++ b/ide/mainbase.pas
@@ -504,8 +504,8 @@ begin
     ParentMI:=itmViewMainWindows;
 
     CreateMenuItem(ParentMI,itmViewInspector,'itmViewInspector',lisMenuViewObjectInspector, 'menu_view_inspector');
-    CreateMenuItem(ParentMI,itmViewSourceEditor,'itmViewSourceEditor',lisMenuViewSourceEditor);
-    CreateMenuItem(ParentMI,itmViewCodeExplorer,'itmViewCodeExplorer',lisMenuViewCodeExplorer);
+    CreateMenuItem(ParentMI,itmViewSourceEditor,'itmViewSourceEditor',lisMenuViewSourceEditor, 'menu_view_source_editor');
+    CreateMenuItem(ParentMI,itmViewCodeExplorer,'itmViewCodeExplorer',lisMenuViewCodeExplorer, 'menu_view_code_explorer');
     CreateMenuItem(ParentMI,itmViewLazDoc,'itmViewLazDoc',lisMenuLazDoc);   //DBlaszijk 5-sep-05
     CreateMenuItem(ParentMI,itmViewCodeBrowser,'itmViewCodeBrowser',lisMenuViewCodeBrowser);
 
diff --git a/images/laz_images.lrs b/images/laz_images.lrs
index a62b9c358c..395214ff4f 100644
--- a/images/laz_images.lrs
+++ b/images/laz_images.lrs
@@ -2944,6 +2944,28 @@ LazarusResources.Add('menu_view_anchor_editor','PNG',[
   +#242#215'2'#143#23#151#208'u'#29#183#219#205#232#213#17#162#209's'#156':yZ'
   +#253#6'U'#202#10'7'#13'['#12#5#0#0#0#0'IEND'#174'B`'#130
 ]);
+LazarusResources.Add('menu_view_code_explorer','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#6'bKGD'#0#255#0#255#0#255#160#189#167#147#0#0#0#9'pHYs'#0#0#11#19#0#0
+  +#11#19#1#0#154#156#24#0#0#0#7'tIME'#7#215#9#23#21#17#10#170#208' '#245#0#0#1
+  +#131'IDATx'#218#165'S;H'#3'A'#16'}'#27'/'#26#21#172'D'#146'&'#160#160#160#4
+  +'ce'#179#22'W'#164#17#2'6&Z'#164#178#176#17'!'#181'k'#145'f;'#11'AD+'#27'm'
+  +#252'Ta+A'#184'f'#213't*F!'#130'H'#154#164'1B'#154#160'r'#172'E'#184#229'r'
+  +#217#136#224'T'#203#204#188'7'#179'of'#136'R'#10#255'1'#139's'#174#25'l'#219
+  +#6#165#148#248#19#252'q'#191'y'#185#22#0#164#211'i'#0#128#16#2#142#227't'#1
+  +#188#184#223#132#16#160#148#194#178'm'#27'B'#8#29'`'#140#17#206#185#186''
+  +#184#211'>'#239#157#156#157#235'""&'#13#178'+'#25#5#0#27#155#5'D'#167'&Q'#175
+  +#188'`'#175#0#0'8;='#239#248'b'#168#23'x)W'#232#240''#141#175#235'8'#231'\'
+  +'I)'#149#145#0#0#198#226#20#135#165'&'#174'oK('#158#28#163#225'ZH'#166#166
+  +#145'X'#219#213#154'8'#142#211#158#130#137#160#25#142'c'#213#142'!'#17#25'A'
+  +#195#181'p%'#203#168#186#163#136#185'5-'#160#30#163#137'`X'#213#240#238#134
+  +#241#214#138'`0'#236'bqa'#6#213'V'#4#245#190#9'|<_'#128'1Fz'#138#232'i'#224
+  +#181#251'zS'#198#231#183#139'Vh'#0#253#149#3'='#13'o'#15'BA'#240'P'#238#18#0
+  +#240'x'#148#215#254#249#133#132#6#179#173#237#14#13't'#7'~p*'#154'Gq'#231#169
+  +#235'k'#193'=`'#140#181'7'#209#4#14#206#187#231'-'#152#192#254'J'#186#133'`'
+  +'e'#206#185#242#3''#187#5#146#201'.'#235'DS'#219'RJ'#229#9#22'4'#198#24#249
+  +#1'k{'#181'Q'#218#168#218'%'#0#0#0#0'IEND'#174'B`'#130
+]);
 LazarusResources.Add('menu_view_inspector','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#6'bKGD'#0#255#0#255#0#255#160#189#167#147#0#0#0#9'pHYs'#0#0#11#19#0#0
@@ -2984,6 +3006,30 @@ LazarusResources.Add('menu_view_inspector','PNG',[
   +#243#1#250#159';H'#244#214#173#130'vk'#241#23#254#6#167'7e'#15#204#248#6#0#0
   +#0#0'IEND'#174'B`'#130
 ]);
+LazarusResources.Add('menu_view_source_editor','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#6'bKGD'#0#255#0#255#0#255#160#189#167#147#0#0#0#9'pHYs'#0#0#11#19#0#0
+  +#11#19#1#0#154#156#24#0#0#0#7'tIME'#7#215#9#23#21#21#26#211#11#245#149#0#0#1
+  +#162'IDATx'#218#149#147'KK'#27'Q'#20#128#191#9#145'`'#2#221#169'['#23#174'E'
+  +#193#157#171#254#132'.\'#20#161'F'#212#138#132'dT'#210#136#138'+Q'#26'M&f'
+  +#180'>'#130#160'('#174'T\'#11#130#248#136#171'BQ4 '#5#137#8#130#182'2*'#134
+  +'vb'#152#235'B'#19#156'L'#226#227#192#129'{'#207#227';'#231'p'#207#149#132#16
+  +'('#145#176#184#207#232#188'Ez'#190#245'I&'#131#16#130#239'#C'#226#173#242#20
+  +'KVm'#207'a'#186#254#255'U'#237#244'u'#19#28#29#22#217#28'[~'#139#201#242#138
+  +#156#142#169#10'c'#170'b'#25'#'#224#239'%'#164#4#5#128'='#223'Yyy'#145';w'
+  +#230#249#166#154']'#0#200'K'#153#156#205#2'(T'#17#192#241'k'#0#0#183#26''''
+  +#218'h'#135#186#225#194#0#175'G'#182'$'#199'Z?'#224'V'#227#204#251#234#153
+  +#247#213#155'|'#22#192'G'#255#154#233#254#249#186#9#183#26#231'lk'#145#178
+  +#234#6#254#28',#/e'#8'GF'#10#3'6C'#159'L'#149#155#162#187'$7'#23#216'?'#190
+  +'BK'#172#208#26#187'y'#185#131#241#31#209#220#204'_'#194';$7'#22'88'#209#208
+  +#18'+t'#204#165'H'#167#211#166'x'#203'3'#202#222#174#199#228#208'6'#191#215
+  +#231'H'#156'jhG'#203#180#204'h'#232#186#142'a'#136#226#29#8'!'#136#142'G8'
+  +#254'W'#195#209#222#30#167#231'7'#252'=\E'#175#29'drz'#2#128#246#182#142#226
+  +#0#195'0'#240'zd\'#129'~'#156#14';U'#182#159'|'#157#189'}'#182#169#233#215';'
+  +#152#152'TI'#165#238#10#238#130'a'#24#192#11#0#167#211'E'#192#223'['#244''''
+  +#150#150':'#1#144'$'#201#12'('#177';'#8')A'#222'#6'#233#177#246#3'j'#18#237
+  +#222'j'#199'I'#243#0#0#0#0'IEND'#174'B`'#130
+]);
 LazarusResources.Add('menu_view_toggle_form_unit','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#1#171'IDATx^'#165#146#177'kSA'#24#192'w'#185#4'kj'#169#131#169'u'#147
diff --git a/images/laz_images_list.txt b/images/laz_images_list.txt
index e6b18ef7ea..b6c0332fb1 100644
--- a/images/laz_images_list.txt
+++ b/images/laz_images_list.txt
@@ -95,7 +95,9 @@ menu/menu_uncomment_16.xpm
 menu/menu_undo.png
 menu/menu_unindent.png
 menu/menu_view_anchor_editor.png
+menu/menu_view_code_explorer.png
 menu/menu_view_inspector.png
+menu/menu_view_source_editor.png
 menu/menu_view_toggle_form_unit.png
 codeexplorer/ce_class.xpm
 codeexplorer/ce_const.xpm
diff --git a/images/menu/menu_view_code_explorer.png b/images/menu/menu_view_code_explorer.png
new file mode 100644
index 0000000000..2a61f2768e
Binary files /dev/null and b/images/menu/menu_view_code_explorer.png differ
diff --git a/images/menu/menu_view_source_editor.png b/images/menu/menu_view_source_editor.png
new file mode 100644
index 0000000000..6c831739b5
Binary files /dev/null and b/images/menu/menu_view_source_editor.png differ