diff --git a/.gitattributes b/.gitattributes
index 849eda6582..5f70bf95b2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2276,6 +2276,7 @@ images/menu/menu_edit_uppercase.png -text svneol=unset#image/png
 images/menu/menu_editor_options.png -text svneol=unset#image/png
 images/menu/menu_environment_options.png -text svneol=unset#image/png
 images/menu/menu_exit.png -text svneol=unset#image/png
+images/menu/menu_goto_line.png -text svneol=unset#image/png
 images/menu/menu_help.png -text svneol=unset#image/png
 images/menu/menu_indent.png -text svneol=unset#image/png
 images/menu/menu_information.png -text svneol=unset#image/png
@@ -2319,6 +2320,7 @@ images/menu/menu_view_forms.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/menu/menu_view_unit_info.png -text svneol=unset#image/png
 images/menu/menu_view_units.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 2858684f81..11534d35b9 100644
--- a/ide/mainbase.pas
+++ b/ide/mainbase.pas
@@ -462,7 +462,7 @@ begin
     CreateMenuItem(ParentMI, itmSearchReplace, 'itmSearchReplace',
       lisMenuReplace2, 'menu_search_replace');
     CreateMenuItem(ParentMI,itmIncrementalFind,'itmIncrementalFind',lisMenuIncrementalFind);
-    CreateMenuItem(ParentMI,itmGotoLine,'itmGotoLine',lisMenuGotoLine);
+    CreateMenuItem(ParentMI,itmGotoLine,'itmGotoLine',lisMenuGotoLine, 'menu_goto_line');
 
     CreateMenuSeparatorSection(mnuSearch,itmJumpings,'itmJumpings');
     ParentMI:=itmJumpings;
@@ -515,7 +515,7 @@ begin
     CreateMenuItem(ParentMI,itmViewUnits,'itmViewUnits',lisMenuViewUnits, 'menu_view_units');
     CreateMenuItem(ParentMI,itmViewForms,'itmViewForms',lisMenuViewForms, 'menu_view_forms');
     CreateMenuItem(ParentMI,itmViewUnitDependencies,'itmViewUnitDependencies',lisMenuViewUnitDependencies);
-    CreateMenuItem(ParentMI,itmViewUnitInfo,'itmViewUnitInfo',lisMenuViewUnitInfo);
+    CreateMenuItem(ParentMI,itmViewUnitInfo,'itmViewUnitInfo',lisMenuViewUnitInfo, 'menu_view_unit_info');
     CreateMenuItem(ParentMI,itmViewToggleFormUnit,'itmViewToggleFormUnit',lisMenuViewToggleFormUnit, 'menu_view_toggle_form_unit');
 
     CreateMenuSeparatorSection(mnuView,itmViewSecondaryWindows,'itmViewSecondaryWindows');
diff --git a/images/laz_images.lrs b/images/laz_images.lrs
index 7a159b9e0d..b40991a6fc 100644
--- a/images/laz_images.lrs
+++ b/images/laz_images.lrs
@@ -1882,6 +1882,32 @@ LazarusResources.Add('menu_exit','PNG',[
   +#251'A8'#168'-'#173#255#1#156#162#177'@'#134#27#179#141#0#0#0#0'IEND'#174'B`'
   +#130
 ]);
+LazarusResources.Add('menu_goto_line','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#18#0#0
+  +#11#18#1#210#221'~'#252#0#0#0#7'tIME'#7#215#9#24#16' '#21#191'-'#248#15#0#0#1
+  +#224'IDATx'#218#141#147#223'KSa'#24#199'?'#231#236'='#155#232'&'#137#16'FE'
+  +#130#253' '#240'&I'#216#234#166#232#162#155'""'#163'_C'#11'"'#13#130#192#249
+  +'O'#132'c'#20'Jf7:'#131'%T$ug'#4#187#136'~\'#180#27#161'n'#12#169#136'6'#144
+  +'L'#157#185#229'9'#239#227#197#242'4'#231':'#249#133#23#30#158#231#251'~'#222
+  +#31#15#143#1'00|W'#150'm'#11#191#178#152#157#207'3'#245'-O'#174#224#163#198
+  +#167'i'#172#249'E{'#147#159'JY*@'#172#183#207'P'#0'u'#193'F'#236'e'#155#166
+  +#134#16#13#219'['#232'8'#219#202#146#237#240#225#251'"'#239#223#166#153#248
+  +'4'#203#155'{}'#235#0#241#196'-'#0#20'@.'#151'e'#230#235#23#166#196'$'#235'l'
+  +'a4'#253#17#159#178#184'x'#252#16#23'N'#157' '#247#228#21#145#158'8'#233';7'
+  +#0#240#251#3'.H'#1#24'v'#158#225'D'#156'b'#177'@29'#6#8#240#155#251#227#207
+  +#136']='#199#209#3#187'I}'#158#166#154'Te'#162#171#171#211#141'G2'#131'd'#166
+  +#179'l'#13'*,'#229#251'?'#224#200#205#193#170#166'w3s'#172#216'NE'#189#4'4'
+  +#203#141'ko'#4#184'|'#254'4'#145#240'A'#10#133'%'#182#133'L'#14#135#219#233
+  +#236'8'#233#214#207#236'u6'#2#202'!'#163#227'O'#217#215#188#19#19#3#19#131
+  +#240#254']'#140'=~'#14#192#235#161#152#235#223#0'p'#28#135#151#137#235'.$'
+  +#210#218#194#158#230#29#220'~0'#1#192#139'x'#143#247''''#166'R'#15#209'Zs'
+  +#165#173#158#145#204#2#3#201'G'#20'W'#156'?'#155#187#17#209#222#128'h'#244#18
+  +#0'"B4*'#28#235#29#2'`'#178#255#26'ZkD<'#186' "'#216#182#141#136#184'k'#178
+  +#191#27#17'Ak'#1'J'#185''#2#180#214#4'C'#245'U['#249's'#238#7'"x'#3'D'#132
+  +#252#226'B'#217#13#248#27#235#181#211'='#0#181#181'ulF'#134'a'#172#7'X*'#224
+  +'N'#215'fe'#150#6#153'U;'#141#209#227'L'#224'='#255#0#0#0#0'IEND'#174'B`'#130
+]);
 LazarusResources.Add('menu_help','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#2#180'IDATx^'#165'S]HTi'#24'~'#230'4'#146'a'#165'f'#228#140#19#150#166#8
@@ -3101,6 +3127,38 @@ LazarusResources.Add('menu_view_toggle_form_unit','PNG',[
   +'oQ~'#129'OF'#163'09'#205#177'}'#146#14#176#182#13#198#208'C'#241#15#228#145
   +'l'#190'y'#205'&>'#0#194#131#4#8#222'hM'#29#0#0#0#0'IEND'#174'B`'#130
 ]);
+LazarusResources.Add('menu_view_unit_info','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#18#0#0
+  +#11#18#1#210#221'~'#252#0#0#0#7'tIME'#7#215#9#24#16'!'#3'R'#226'|'#31#0#0#2
+  +'yIDATx'#218'm'#147'KlMQ'#20#134#191#189#206#217#167'W[m'#149#182'4'#209'^Zm'
+  +#24' MP'#3'#3L'#136#152#24#8'a'#196#192#164#138'I'#139'H<'#18'A'#24#136#161
+  +#196#128#152'#1)'#137'H'#136#198#227'JSE=ZJ'#221'[T'#219#243#216#203#224#222
+  +#171#30']'#195#189#215#254#246#191#254'o'#163#170#0#220#238#253#164#247#250
+  +#179#188#26#25'''J'#28#133'e0'#128#26'PGME@KM%{7'#164#141#239#153#252'v'#17
+  +#208'q'#229#169#30#222#220#130#17#131'S'#133#2#224'm'#231'"'#0#26'N'#190'f'
+  +#228'{'#200#213#135'9'#178#195#17'gv'#165#141#245#5#191'p'#15'C'#185'I'#172
+  +#239#241#236#147'"F'#192'@p'#162#129'e]G'#1#200't.b'#233#185'!'#214#180#248
+  +'<p'#159#217''#249#141#158#221#147'6R'#4'L'#197#138's'#142#192#19#172#128'o'
+  +#152#161#28#11'*'#2'6'#173'Z@}'#218'r'#234'F'#159#254'V'#224'T'#25#15#21#1
+  +#140#1#197'P'#213#213'O'#230#200#18#0#170#186#250#25#254':Ac'#185'G'#137#245
+  +'I'#175#157#203#142#243#131#211'#8'#132#19'=c'#140'%JG'#251'<'#206#245#230#0
+  +#216#182#239'%'#0'_F'#243'}'#161#139'q.d'#221#226#18'|'#235#229#1#223'&'#29
+  +'QY'#13#190#21#228'g'#130#24#3'q'#254#192#188#11#205'y@'#1#148#10'<'#156#243
+  +'P'#4#140#224#223#204#140#235#181#190#159#180'.,c,'#151#176'{U5b'#12#187#150
+  +'W'#144':'#213'8m'#226#145'f&'#15#12#18''''#138#138#226#0'U'#144'k/'#198#153
+  +'_*'#12'g#v'#182#149'2g'#182'_L'#240#191'2'#128'/'#6#223#19#18#7#137#3#217
+  +#218'4'#139#183#159'C'#170#3#143'Kw'#199#24#205'E'#168#206#140#176'"'#248'b'
+  +#240#196#144#178#6#151'('#178'a'#229'lsqK'#173#201#188#200#145'J'#9#23'o}$q3'
+  +'+P'#192#21#222#152#245#132'8'#140#243'&V'#150'zX'#151'%'#202#166#248#17#193
+  +#177#199'!'#0#135#254#1#28#239#141'('#178#175#206#183'DS'#250'G'#140'.'#230
+  +#216#246':N?'#15'h'#171#149#25#21#172'oJ'#161#10'OFb'#212')'#209'd<'#13'HB%Q'
+  +'%L'#224#254#135#132#236'D'#196#138''#0#143#134'cT'#12#226#12#214#10#202#31
+  +#10'*'#2#143#242#192#227#224#242#8#231'\~'#208#213#3'd'#186#155#0#168#236#30
+  +#224'dJ'#153'e'#13'"'#6#235#25#234'*'#131#233#223'x'#189#231#189#222'y4B'#223
+  +#187#239'L'#132#201'_'#206')'#160#197'p'#21'J'#172#208#186#176#156#141#237
+  +#245#252#2'i_'#15'zBt'#248#135#0#0#0#0'IEND'#174'B`'#130
+]);
 LazarusResources.Add('menu_view_units','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#18#0#0
diff --git a/images/laz_images_list.txt b/images/laz_images_list.txt
index a21080cf5e..6ea2794106 100644
--- a/images/laz_images_list.txt
+++ b/images/laz_images_list.txt
@@ -58,6 +58,7 @@ menu/menu_edit_sort_16.xpm
 menu/menu_edit_uppercase.png
 menu/menu_environment_options.png
 menu/menu_exit.png
+menu/menu_goto_line.png
 menu/menu_help.png
 menu/menu_indent.png
 menu/menu_information.png
@@ -101,6 +102,7 @@ menu/menu_view_forms.png
 menu/menu_view_inspector.png
 menu/menu_view_source_editor.png
 menu/menu_view_toggle_form_unit.png
+menu/menu_view_unit_info.png
 menu/menu_view_units.png
 codeexplorer/ce_class.xpm
 codeexplorer/ce_const.xpm
diff --git a/images/menu/menu_goto_line.png b/images/menu/menu_goto_line.png
new file mode 100644
index 0000000000..21a1fd972d
Binary files /dev/null and b/images/menu/menu_goto_line.png differ
diff --git a/images/menu/menu_view_unit_info.png b/images/menu/menu_view_unit_info.png
new file mode 100644
index 0000000000..104b0dd917
Binary files /dev/null and b/images/menu/menu_view_unit_info.png differ