diff --git a/.gitattributes b/.gitattributes
index 6ff5f2640e..99aec7df55 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2182,6 +2182,7 @@ images/actions/arrow_left.png -text svneol=unset#image/png
 images/actions/arrow_right.png -text svneol=unset#image/png
 images/actions/arrow_up.png -text svneol=unset#image/png
 images/actions/delete.png -text svneol=unset#image/png
+images/actions/refresh.png -text svneol=unset#image/png
 images/bookmark.lrs svneol=native#text/pascal
 images/btn_downarrow.xpm -text svneol=native#image/x-xpixmap
 images/codeexplorer/ce_class.xpm -text svneol=native#image/x-xpixmap
@@ -2409,7 +2410,6 @@ 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
 images/menu/menu_new.png -text svneol=unset#image/png
-images/menu/menu_open.png -text svneol=unset#image/png
 images/menu/menu_pause.png -text svneol=unset#image/png
 images/menu/menu_project_add.png -text svneol=unset#image/png
 images/menu/menu_project_close.png -text svneol=unset#image/png
@@ -2425,7 +2425,6 @@ images/menu/menu_quick_compile.png -text svneol=unset#image/png
 images/menu/menu_redo.png -text svneol=unset#image/png
 images/menu/menu_reportingbug.png -text svneol=unset#image/png
 images/menu/menu_reset_debugger.png -text svneol=unset#image/png
-images/menu/menu_restart_16.xpm svneol=native#text/plain
 images/menu/menu_run.png -text svneol=unset#image/png
 images/menu/menu_run_cursor.png -text svneol=unset#image/png
 images/menu/menu_run_file.png -text svneol=unset#image/png
@@ -2459,6 +2458,7 @@ 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/menu/open.png -text svneol=unset#image/png
 images/mouse.xpm -text svneol=native#image/x-xpixmap
 images/notebook.xpm -text svneol=native#image/x-xpixmap
 images/packages/pkg_add.png -text svneol=unset#image/png
diff --git a/ide/main.pp b/ide/main.pp
index 2d6d46490a..cdb0879a5d 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -1462,7 +1462,7 @@ begin
   ButtonLeft := 2;
   MainIDEBar.NewUnitSpeedBtn       := CreateButton('NewUnitSpeedBtn'      , 'item_unit'   , 1, ButtonLeft, ButtonTop, [mfLeft], @mnuNewUnitClicked, lisMenuNewUnit);
 
-  MainIDEBar.OpenFileSpeedBtn      := CreateButton('OpenFileSpeedBtn'     , 'menu_open'  , 1, ButtonLeft, ButtonTop, [mfLeft], @mnuOpenClicked, lisHintOpen);
+  MainIDEBar.OpenFileSpeedBtn      := CreateButton('OpenFileSpeedBtn'     , 'open'  , 1, ButtonLeft, ButtonTop, [mfLeft], @mnuOpenClicked, lisHintOpen);
 
   // store left
   n := ButtonLeft;
diff --git a/ide/mainbase.pas b/ide/mainbase.pas
index 434f7f6114..a369e1a2d6 100644
--- a/ide/mainbase.pas
+++ b/ide/mainbase.pas
@@ -334,7 +334,7 @@ begin
     CreateMenuSeparatorSection(mnuFile,itmFileOpenSave,'itmFileOpenSave');
     ParentMI:=itmFileOpenSave;
 
-    CreateMenuItem(ParentMI, itmFileOpen, 'itmFileOpen', lisMenuOpen, 'menu_open');
+    CreateMenuItem(ParentMI, itmFileOpen, 'itmFileOpen', lisMenuOpen, 'open');
     CreateMenuItem(ParentMI,itmFileRevert,'itmFileRevert',lisMenuRevert, 'menu_file_revert');
     CreateMenuSubSection(ParentMI,itmFileRecentOpen,'itmFileRecentOpen',lisMenuOpenRecent);
     CreateMenuItem(ParentMI,itmFileSave,'itmFileSave',lisMenuSave,'menu_save');
@@ -351,7 +351,7 @@ begin
     CreateMenuSeparatorSection(mnuFile,itmFileIDEStart,'itmFileIDEStart');
     ParentMI:=itmFileIDEStart;
 
-    CreateMenuItem(ParentMI,itmFileRestart,'itmFileRestart',lisMenuRestart, 'menu_restart_16');
+    CreateMenuItem(ParentMI,itmFileRestart,'itmFileRestart',lisMenuRestart, 'refresh');
     CreateMenuItem(ParentMI,itmFileQuit,'itmFileQuit',lisMenuQuit, 'menu_exit');
   end;
 end;
diff --git a/ide/unitdependencies.lfm b/ide/unitdependencies.lfm
index fe61842e90..fa74306229 100644
--- a/ide/unitdependencies.lfm
+++ b/ide/unitdependencies.lfm
@@ -1,7 +1,7 @@
 object UnitDependenciesView: TUnitDependenciesView
   Left = 318
   Height = 300
-  Top = 632
+  Top = 355
   Width = 400
   HorzScrollBar.Page = 399
   VertScrollBar.Page = 299
@@ -18,7 +18,7 @@ object UnitDependenciesView: TUnitDependenciesView
     ButtonHeight = 46
     ButtonWidth = 47
     Caption = 'ToolBar'
-    Images = ToolbarImageList
+    Flat = True
     ParentShowHint = False
     ShowCaptions = True
     ShowHint = True
@@ -27,21 +27,18 @@ object UnitDependenciesView: TUnitDependenciesView
       Left = 167
       Top = 2
       Caption = 'ShowProjectButton'
-      ImageIndex = 2
       OnClick = ShowProjectButtonClick
     end
     object SelectUnitButton: TToolButton
       Left = 1
       Top = 2
       Caption = 'SelectUnitButton'
-      ImageIndex = 0
       OnClick = SelectUnitButtonClick
     end
     object RefreshButton: TToolButton
       Left = 89
       Top = 2
       Caption = 'RefreshButton'
-      ImageIndex = 1
       OnClick = RefreshButtonClick
     end
   end
@@ -89,194 +86,4 @@ object UnitDependenciesView: TUnitDependenciesView
     OnExpanding = UnitTreeViewExpanding
     OnMouseDown = UnitTreeViewMouseDown
   end
-  object ToolbarImageList: TImageList
-    Height = 22
-    Width = 22
-    left = 88
-    top = 40
-    Bitmap = {
-      4C69030000001600000016000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000000000000000009C9C9CFFBEBE
-      BEFFBDBDBDFFBCBCBCFFBBBBBBFFBCBCBCFFBDBDBDFFBEBEBEFFBEBEBEFFBEBE
-      BEFFC0C0C0FFC1C1C1FFC2C2C2FFC2C2C2FFA2A2A2FF00000000000000000000
-      00007C7C7CFF818181FF828282FF838383FFC0C0C0FFFAFAFAFFE8E8E8FFE6E6
-      E6FFE6E6E6FFE6E6E6FFE6E6E6FFE6E6E6FFE6E6E6FFE6E6E6FFE6E6E6FFE6E6
-      E6FFE9E9E9FFFAFAFAFFBCBCBCFF00000000000000006C6C6CFFC6C6C6FFB0B0
-      B0FFB0B0B0FFB0B0B0FFC2C2C2FFF0F0F0FFCDCDCDFFCBCBCBFFCBCBCBFFCBCB
-      CBFFCBCBCBFFCCCCCCFFCCCCCCFFCCCCCCFFCDCDCDFFDEDEDEFFE2E2E2FFF4F4
-      F4FFB0B0B0FF000000000000000000000000B9B9B9FF9F9F9FFF9F9F9FFF9595
-      95FFCCCCCCFFE0E0E0FFC3C3C3FFC3C3C3FFC3C3C3FFC3C3C3FFC3C3C3FFC3C3
-      C3FFC4C4C4FFC4C4C4FFC4C4C4FFCACACAFFCBCBCBFFE4E4E4FF9E9E9EFF0000
-      00000000000000000000B6B6B6FF9E9E9EFF9E9E9EFF888888FFDFDFDFFFCACA
-      CAFFBABABAFFBABABAFFBABABAFFBABABAFFBABABAFFBBBBBBFFBBBBBBFFBBBB
-      BBFFBCBCBCFFBCBCBCFFC6C6C6FFD7D7D7FF8A8A8AFF00000000000000000000
-      0000B2B2B2FF9E9E9EFF9E9E9EFFACACACFFC8C8C8FFB9B9B9FFB4B4B4FFB5B5
-      B5FFB5B5B5FFB5B5B5FFB5B5B5FFB6B6B6FFB6B6B6FFB6B6B6FFB6B6B6FFB7B7
-      B7FFC8C8C8FFB4B4B4FF00000000000000000000000000000000ADADADFF9E9E
-      9EFF8E8E8EFFBEBEBEFFB3B3B3FFACACACFFADADADFFADADADFFADADADFFADAD
-      ADFFADADADFFADADADFFAEAEAEFFB6B6B6FFB9B9B9FFBABABAFFBABABAFF8383
-      83FF00000000000000000000000000000000A7A7A7FF9D9D9DFF828282FFBEBE
-      BEFFB08A6CFFB89474FFB89474FFB99475FFB99475FFB99575FFB99575FFB995
-      75FFBA9575FFBA9575FFBA9575FFBA9575FFB89474FFB18764FFBE8C64FFBE8C
-      64FFB2794CFF000000009D9D9DFF9B9B9BFFA2A2A2FFAFADACFFC9A485FFDAB4
-      90FFDAB491FFDAB491FFDAB491FFDAB491FFDAB491FFDAB491FFDAB390FFD9B3
-      90FFD9B28FFFD9B28EFFD9B28DFFD8B18CFFD8B18BFFDDBB9CFFB78256FF0000
-      0000919191FF878787FFB7B7B7FFB2A8A0FFD1AB8AFFD5AC85FFD5AC85FFD5AC
-      85FFD5AC85FFD5AC85FFD5AC85FFD5AB84FFD5AB83FFD4AA82FFD4A981FFD4A8
-      80FFD3A77EFFD3A77DFFD1A277FFD7B18DFFAD7141FF00000000878787FF7D7D
-      7DFFCACACAFFB59E8CFFD6AF8DFFD5AC85FFD5AC85FFD5AC85FFD5AC85FFD5AC
-      85FFD5AB84FFD5AB83FFD4AA82FFD4A981FFD4A880FFD3A77EFFD3A77DFFD1A2
-      77FFCF9F72FFCBA17CFF00000000000000007C7C7CFF7D7D7DFFCCCCCCFFB793
-      76FFD9B391FFD5AC85FFD5AC85FFD5AC85FFD5AC85FFD5AC85FFD5AB84FFD5AA
-      83FFD4AA81FFD4A980FFD3A87FFFD2A57BFFD0A174FFCF9F72FFD2A47AFFBE8C
-      62FF0000000000000000707070FF7F7F7FFFCDCDCDFFBE9676FFD7AF8AFFD5AC
-      85FFD5AC85FFD5AC85FFD5AC85FFD5AB84FFD5AA83FFD4A981FFD3A77DFFD1A4
-      79FFD0A276FFCF9F72FFCF9F72FFCF9F72FFD4A981FFB17849FF000000000000
-      00006A6A6AFF7B7B7BFF8F8F8FFFB88D69FFD5AC86FFD5AB84FFD3A67DFFD1A4
-      79FFD0A175FFCFA073FFCF9F72FFCF9F72FFCF9F72FFCF9F72FFCF9F72FFCF9F
-      72FFCF9F72FFCF9F72FFCC9E75FF000000000000000000000000000000008A8A
-      8AFF7D6E63FFC4956DFFD0A176FFCF9F72FFCF9F72FFCF9F72FFCF9F72FFCF9F
-      72FFCF9F72FFCF9F72FFCF9F72FFCF9F72FFCF9F72FFCF9F72FFCF9F72FFD0A0
-      74FFBC865AFF00000000000000000000000000000000858585FF9E7451FFCF9D
-      6FFFCE9B6CFFCE9A6CFFCE9A6CFFCE9A6CFFCE9A6BFFCE9A6BFFCE9A6BFFCD9A
-      6BFFCD9A6BFFCD9A6AFFCD9A6AFFCD9A6AFFCD996AFFCE9A6CFFAF7343FF0000
-      0000000000000000000000000000867160FFB78152FFC7905EFFC7905EFFC78F
-      5EFFC78F5EFFC78F5EFFC78F5DFFC78F5DFFC78F5DFFC68F5DFFC68F5DFFC68F
-      5CFFC68F5CFFC68F5CFFC68E5CFFB77D4CFF0000000000000000000000000000
-      00000000000000000000836045FF805E43FF7C5B41FF79593FFF76573EFF7354
-      3CFF71533BFF6F523AFF70523AFF72543CFF75563DFF78583FFF7A5A40FF7D5C
-      40FF81532DFF0000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000BE906CFFCEAB8FFFD3B298FFD0AD
-      92FFBE906BFF0000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000C09471FFE9D6C6FFF1E3D6FFEFE0D1FFEFDFCFFFEFDFCFFFF1E2D5FFEBDA
-      CBFFD7BAA3FFBD8F68FF00000000000000000000000000000000B47E54FF0000
-      00000000000000000000000000000000000000000000CEAA8FFFF2E4D8FFEDDC
-      CCFFEDDCCCFFEDDCCCFFEDDCCCFFEDDCCCFFEDDCCCFFEDDCCCFFEEDDCDFFF1E3
-      D6FFDBC0A9FF0000000000000000D7B89FFFC89E7EFF00000000000000000000
-      00000000000000000000BF936EFFF0E1D4FFEFE0D2FFDABFA7FFD4B59CFFD5B8
-      A0FFDEC6B2FFEDDBCDFFF0E0D2FFEDDDCDFFEDDCCCFFEDDBCAFFECD8C6FFE8D3
-      C3FFCFAC8FFFECDAC9FFC89E7EFF000000000000000000000000000000000000
-      0000DCC3AFFFDFC8B5FFAF774BFFA66838FFA56736FF00000000000000000000
-      0000C8A283FFDEC6B2FFECD9C7FFE7CFB9FFE7CFB9FFE7CFB9FFE9D4C0FFEAD4
-      C1FFC79E7EFF0000000000000000000000000000000000000000D9BEA7FFAD72
-      44FFB4794CFFA96B3BFF00000000000000000000000000000000000000000000
-      0000C39876FFE0C8B3FFE8D2BDFFE7CFB9FFE7CFB9FFEAD4C1FFC79E7DFF0000
-      000000000000000000000000000000000000B27B4FFFBF865CFFBD8359FFA86A
-      3AFF00000000000000000000000000000000000000000000000000000000B17A
-      50FFECDACAFFE7CFB9FFE7CFB9FFEAD4C0FFC79E7EFF00000000000000000000
-      00000000000000000000B37C50FF000000000000000000000000000000000000
-      000000000000000000000000000000000000B7845BFFE3CDB9FFE7CFBAFFE7CF
-      B9FFE7CFB9FFEAD4C0FFC79E7EFF000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000C89F7FFFD8BBA3FFD8BAA1FFD8BAA1FFD8BAA1FFD9BB
-      A3FFBD8C67FF0000000000000000000000000000000000000000C2946EFFCEA8
-      88FFCFAA8AFFD0AB8CFFD1AC8EFFD1AD8DFFA86B3BFF00000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000D8B79AFFDAB693FFDAB693FFDBB7
-      94FFE0C1A4FFC9A07EFF00000000000000000000000000000000000000000000
-      000000000000000000000000000000000000A86A3AFF00000000000000000000
-      00000000000000000000D9B89BFFDAB693FFDBB794FFDEBC9DFFD3B194FF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000AA6D3DFF000000000000000000000000000000000000
-      0000D9B89BFFDAB794FFDBB795FFDDBA9AFFDFC2A7FFC79F7CFF000000000000
-      00000000000000000000000000000000000000000000E6CCB5FF00000000C08E
-      65FFBB875CFF0000000000000000000000000000000000000000DAB99CFFDBB7
-      95FFDCBA99FFDCB998FFDAB694FFD7AE89FFD3AE8DFFBC8C63FF000000000000
-      00000000000000000000D8AB85FFDAB89AFFB57D4EFFDDC0A5FFB0784AFF0000
-      000000000000000000000000000000000000DABA9DFFE2C6ADFFD1AC8DFFE0BF
-      A1FFD0A175FFCF9F72FFCF9F73FFD6AD86FFD6B08EFFCAA280FFC3936CFFC391
-      69FFC4956EFFD0A987FFDBB897FFCEA684FF0000000000000000000000000000
-      00000000000000000000DEC2A9FFBA8963FF00000000BD8F6AFFD5AE8CFFD0A2
-      76FFCF9F72FFCF9F72FFCF9F72FFCF9F72FFD2A57AFFD3A77EFFD2A47AFFD0A1
-      75FFD8B594FFA56E42FF00000000000000000000000000000000000000000000
-      0000B37F56FF0000000000000000000000009B683DFFBE9470FFD4AC88FFD7AF
-      89FFD2A57AFFCF9F72FFD0A074FFD1A479FFDBB795FFCFA988FF9E6B42FF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000684224FFA57853FFB68D6BFFC199
-      78FFC29977FFBA916EFF9E6A41FF000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000001111BAFF1414C4FF00000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00001A1AC2FF3A3AE9FF2A2AE8FF1717C9FF0000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000002323C9FF4343ECFF4545
-      F1FF2B2BE8FF2626E3FF1919CCFF000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000002D2DCFFF4D4DEFFF4C4CF2FF3E3EF0FF2929ECFF2727
-      E4FF2626E1FF1B1BCEFF00000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000003A3A
-      D8FF5757F2FF5353F2FF3D3DF1FF2525E4FF1D1ED3FF2828EBFF2727E2FF2626
-      DEFF1D1DCFFF0707AEFF00000000000000000000000000000000000000000000
-      0000000000000000000000000000000000004949DFFF6060F3FF5858F3FF3A3A
-      F0FF2425DBFF676AC7FF9E9FCEFF2A2BCEFF2728EAFF2727E1FF2626DBFF1F1F
-      D0FF0A0AB2FF0000000000000000000000000000000000000000000000000000
-      00001F1FBDFF5656E5FF6868F4FF5C5CF3FF3636EEFF2828D5FF8A8BCDFFD8D8
-      DAFFD9D9D9FFADADD1FF3838CCFF2626E9FF2727E1FF2525D9FF2020CFFF0D0D
-      B5FF0000000000000000000000000000000000000000000000005D5DE6FF7070
-      F4FF5D5DF3FF3131ECFF3334CFFFA4A4D4FFDCDCDDFFE0E0E0FFEDEDEDFFE5E5
-      E5FFBBBBD5FF4141CAFF2626E7FF2727E1FF2525D6FF1F1FCDFF000000000000
-      00000000000000000000000000003D3DCEFF7676F4FF5A5AF3FF2C2CEAFF3F3F
-      CBFFBFBFDCFFE2E2E2FFE7E7E7FFEFEFEFFFF0F0F0FFEFEFEFFFE8E8E8FFC9C9
-      DAFF4848C7FF2525E6FF2727E2FF2424D3FF1313BBFF00000000000000000000
-      0000000000006666E7FF5555F2FF2828E5FF4D4DC9FFD7D7E4FFE6E6E6FFECEC
-      ECFFEFEFEFFFEEEEEEFFEDEDEDFFECECECFFEBEBEBFFE8E8E8FFD6D6DFFF5353
-      C6FF2424E3FF2727E3FF1E1EC8FF0000000000000000000000003131CAFF4848
-      F1FF2525DDFF7070CEFFE8E8EBFFEAEAEAFFEDEDEDFFEDEDEDFFECECECFFEBEB
-      EBFFEAEAEAFFE9E9E9FFE8E8E8FFE7E7E7FFE6E6E6FFDFDFE1FF6A6AC8FF2424
-      DEFF2727E5FF1010B9FF00000000000000002222D6FF2121D3FF8484CCFFE9E9
-      ECFFE8E8E8FFE9E9E9FFE9E9E9FFE9E9E9FFE9E9E9FFE9E9E9FFE8E8E8FFE1E1
-      E1FFDEDDDDFFDCDCDCFFDCDBDBFFDCDBDBFFDEDEE1FF7777C5FF2020D6FF1919
-      D0FF00000000000000000808B2FF00000000C9C9CBFFE4E4E4FFAFB1B0FFA8AA
-      A9FFACAFAEFFB1B4B3FFBABCBBFFE8E8E8FFE3E3E3FFA6988DFFAB937FFF8A85
-      80FFA08D7EFFA18D7DFFD4D4D4FFC1C1C3FF2A2AA0FF0808B2FF000000000000
-      00000000000000000000C1C1C1FFE4E4E4FF969998FF7D8280FF7E8381FF7E83
-      81FF878C8AFFE3E4E4FFDFDFDFFFA8907DFFC19879FF847C77FFAE8D74FFAC8C
-      73FFD2D2D2FFBCBCBCFF00000000000000000000000000000000000000000000
-      0000B8B8B8FFE4E4E4FF9DA09EFF818684FF828785FF828785FF8A8F8DFFE2E2
-      E2FFDDDDDDFFA58C79FFB98D6BFF817973FFA27858FF9D7B60FFD6D6D6FFB4B4
-      B4FF000000000000000000000000000000000000000000000000AEAEAEFFE4E4
-      E4FFA2A4A3FF828886FF828886FF628C8FFF749293FFE0E1E1FFDBDBDAFF9A7C
-      64FFA26739FF7D736BFF996943FF957358FFD8D8D8FFABABABFF000000000000
-      000000000000000000000000000000000000A7A7A7FFE1E1E1FFA9ABAAFF8489
-      87FF848987FF678F91FF769293FFDFDFDFFFD8D8D8FFA19183FFA88970FF9590
-      8CFFA58B77FF9D8C7EFFD9D9D9FFA4A4A4FF0000000000000000000000000000
-      00000000000000000000A3A3A3FFDEDEDEFFAFB0B0FF858B88FF858B88FF858B
-      88FF8D928FFFDDDEDDFFC5C5C5FFACACACFFB1B1B1FFB1B1B1FFB1B1B1FFAEAE
-      AEFFC0C0C0FF9E9E9EFF00000000000000000000000000000000000000000000
-      00009A9A9AFFDCDCDCFFB9BAB9FF858B88FF858B88FF868C89FF8E9390FFDEDF
-      DEFFD1D1D1FFC6C6C6FFC6C6C6FFC5C5C5FFC4C4C4FFC3C3C3FFCBCBCBFF9595
-      95FF000000000000000000000000000000000000000000000000000000008F8F
-      8FFF868786FF757777FF757676FF747675FF757676FF858585FF828282FF8282
-      82FF838383FF848484FF868686FF898989FF8A8A8AFF00000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000000000000000000000
-    }
-  end
 end
diff --git a/ide/unitdependencies.lrs b/ide/unitdependencies.lrs
index 3be312acb4..f138a72964 100644
--- a/ide/unitdependencies.lrs
+++ b/ide/unitdependencies.lrs
@@ -2,19 +2,18 @@
 
 LazarusResources.Add('TUnitDependenciesView','FORMDATA',[
   'TPF0'#21'TUnitDependenciesView'#20'UnitDependenciesView'#4'Left'#3'>'#1#6'He'
-  +'ight'#3','#1#3'Top'#3'x'#2#5'Width'#3#144#1#18'HorzScrollBar.Page'#3#143#1
+  +'ight'#3','#1#3'Top'#3'c'#1#5'Width'#3#144#1#18'HorzScrollBar.Page'#3#143#1
   +#18'VertScrollBar.Page'#3'+'#1#13'ActiveControl'#7#15'UnitHistoryList'#7'Cap'
   +'tion'#6#20'UnitDependenciesView'#12'ClientHeight'#3','#1#11'ClientWidth'#3
   +#144#1#10'KeyPreview'#9#7'OnClose'#7#25'UnitDependenciesViewClose'#8'Positio'
   +'n'#7#14'poScreenCenter'#0#8'TToolBar'#7'ToolBar'#6'Height'#2'0'#5'Width'#3
-  +#144#1#12'ButtonHeight'#2'.'#11'ButtonWidth'#2'/'#7'Caption'#6#7'ToolBar'#6
-  +'Images'#7#16'ToolbarImageList'#14'ParentShowHint'#8#12'ShowCaptions'#9#8'Sh'
-  +'owHint'#9#8'TabOrder'#2#0#0#11'TToolButton'#17'ShowProjectButton'#4'Left'#3
-  +#167#0#3'Top'#2#2#7'Caption'#6#17'ShowProjectButton'#10'ImageIndex'#2#2#7'On'
-  +'Click'#7#22'ShowProjectButtonClick'#0#0#11'TToolButton'#16'SelectUnitButton'
-  +#4'Left'#2#1#3'Top'#2#2#7'Caption'#6#16'SelectUnitButton'#10'ImageIndex'#2#0
-  +#7'OnClick'#7#21'SelectUnitButtonClick'#0#0#11'TToolButton'#13'RefreshButton'
-  +#4'Left'#2'Y'#3'Top'#2#2#7'Caption'#6#13'RefreshButton'#10'ImageIndex'#2#1#7
+  +#144#1#12'ButtonHeight'#2'.'#11'ButtonWidth'#2'/'#7'Caption'#6#7'ToolBar'#4
+  +'Flat'#9#14'ParentShowHint'#8#12'ShowCaptions'#9#8'ShowHint'#9#8'TabOrder'#2
+  +#0#0#11'TToolButton'#17'ShowProjectButton'#4'Left'#3#167#0#3'Top'#2#2#7'Capt'
+  +'ion'#6#17'ShowProjectButton'#7'OnClick'#7#22'ShowProjectButtonClick'#0#0#11
+  +'TToolButton'#16'SelectUnitButton'#4'Left'#2#1#3'Top'#2#2#7'Caption'#6#16'Se'
+  +'lectUnitButton'#7'OnClick'#7#21'SelectUnitButtonClick'#0#0#11'TToolButton'
+  +#13'RefreshButton'#4'Left'#2'Y'#3'Top'#2#2#7'Caption'#6#13'RefreshButton'#7
   +'OnClick'#7#18'RefreshButtonClick'#0#0#0#9'TComboBox'#15'UnitHistoryList'#4
   +'Left'#2#6#6'Height'#2#21#3'Top'#2'6'#5'Width'#3#132#1#5'Align'#7#5'alTop'#16
   +'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0
@@ -30,234 +29,5 @@ LazarusResources.Add('TUnitDependenciesView','FORMDATA',[
   +'ht'#8'akBottom'#0#20'BorderSpacing.Bottom'#2#6#17'DefaultItemHeight'#2#15#8
   +'TabOrder'#2#3#24'OnAdvancedCustomDrawItem'#7'"UnitTreeViewAdvancedCustomDra'
   +'wItem'#12'OnCollapsing'#7#22'UnitTreeViewCollapsing'#11'OnExpanding'#7#21'U'
-  +'nitTreeViewExpanding'#11'OnMouseDown'#7#21'UnitTreeViewMouseDown'#0#0#10'TI'
-  +'mageList'#16'ToolbarImageList'#6'Height'#2#22#5'Width'#2#22#4'left'#2'X'#3
-  +'top'#2'('#6'Bitmap'#10#190#22#0#0'Li'#3#0#0#0#22#0#0#0#22#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#156#156#156#255#190#190
-  +#190#255#189#189#189#255#188#188#188#255#187#187#187#255#188#188#188#255#189
-  +#189#189#255#190#190#190#255#190#190#190#255#190#190#190#255#192#192#192#255
-  +#193#193#193#255#194#194#194#255#194#194#194#255#162#162#162#255#0#0#0#0#0#0
-  +#0#0#0#0#0#0'|||'#255#129#129#129#255#130#130#130#255#131#131#131#255#192#192
-  +#192#255#250#250#250#255#232#232#232#255#230#230#230#255#230#230#230#255#230
-  +#230#230#255#230#230#230#255#230#230#230#255#230#230#230#255#230#230#230#255
-  +#230#230#230#255#230#230#230#255#233#233#233#255#250#250#250#255#188#188#188
-  +#255#0#0#0#0#0#0#0#0'lll'#255#198#198#198#255#176#176#176#255#176#176#176#255
-  +#176#176#176#255#194#194#194#255#240#240#240#255#205#205#205#255#203#203#203
-  +#255#203#203#203#255#203#203#203#255#203#203#203#255#204#204#204#255#204#204
-  +#204#255#204#204#204#255#205#205#205#255#222#222#222#255#226#226#226#255#244
-  +#244#244#255#176#176#176#255#0#0#0#0#0#0#0#0#0#0#0#0#185#185#185#255#159#159
-  +#159#255#159#159#159#255#149#149#149#255#204#204#204#255#224#224#224#255#195
-  +#195#195#255#195#195#195#255#195#195#195#255#195#195#195#255#195#195#195#255
-  +#195#195#195#255#196#196#196#255#196#196#196#255#196#196#196#255#202#202#202
-  +#255#203#203#203#255#228#228#228#255#158#158#158#255#0#0#0#0#0#0#0#0#0#0#0#0
-  +#182#182#182#255#158#158#158#255#158#158#158#255#136#136#136#255#223#223#223
-  +#255#202#202#202#255#186#186#186#255#186#186#186#255#186#186#186#255#186#186
-  +#186#255#186#186#186#255#187#187#187#255#187#187#187#255#187#187#187#255#188
-  +#188#188#255#188#188#188#255#198#198#198#255#215#215#215#255#138#138#138#255
-  +#0#0#0#0#0#0#0#0#0#0#0#0#178#178#178#255#158#158#158#255#158#158#158#255#172
-  +#172#172#255#200#200#200#255#185#185#185#255#180#180#180#255#181#181#181#255
-  +#181#181#181#255#181#181#181#255#181#181#181#255#182#182#182#255#182#182#182
-  +#255#182#182#182#255#182#182#182#255#183#183#183#255#200#200#200#255#180#180
-  +#180#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#173#173#173#255#158#158#158#255#142
-  +#142#142#255#190#190#190#255#179#179#179#255#172#172#172#255#173#173#173#255
-  +#173#173#173#255#173#173#173#255#173#173#173#255#173#173#173#255#173#173#173
-  +#255#174#174#174#255#182#182#182#255#185#185#185#255#186#186#186#255#186#186
-  +#186#255#131#131#131#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#167#167#167#255#157
-  ,#157#157#255#130#130#130#255#190#190#190#255#176#138'l'#255#184#148't'#255
-  +#184#148't'#255#185#148'u'#255#185#148'u'#255#185#149'u'#255#185#149'u'#255
-  +#185#149'u'#255#186#149'u'#255#186#149'u'#255#186#149'u'#255#186#149'u'#255
-  +#184#148't'#255#177#135'd'#255#190#140'd'#255#190#140'd'#255#178'yL'#255#0#0
-  +#0#0#157#157#157#255#155#155#155#255#162#162#162#255#175#173#172#255#201#164
-  +#133#255#218#180#144#255#218#180#145#255#218#180#145#255#218#180#145#255#218
-  +#180#145#255#218#180#145#255#218#180#145#255#218#179#144#255#217#179#144#255
-  +#217#178#143#255#217#178#142#255#217#178#141#255#216#177#140#255#216#177#139
-  +#255#221#187#156#255#183#130'V'#255#0#0#0#0#145#145#145#255#135#135#135#255
-  +#183#183#183#255#178#168#160#255#209#171#138#255#213#172#133#255#213#172#133
-  +#255#213#172#133#255#213#172#133#255#213#172#133#255#213#172#133#255#213#171
-  +#132#255#213#171#131#255#212#170#130#255#212#169#129#255#212#168#128#255#211
-  +#167'~'#255#211#167'}'#255#209#162'w'#255#215#177#141#255#173'qA'#255#0#0#0#0
-  +#135#135#135#255'}}}'#255#202#202#202#255#181#158#140#255#214#175#141#255#213
-  +#172#133#255#213#172#133#255#213#172#133#255#213#172#133#255#213#172#133#255
-  +#213#171#132#255#213#171#131#255#212#170#130#255#212#169#129#255#212#168#128
-  +#255#211#167'~'#255#211#167'}'#255#209#162'w'#255#207#159'r'#255#203#161'|'
-  +#255#0#0#0#0#0#0#0#0'|||'#255'}}}'#255#204#204#204#255#183#147'v'#255#217#179
-  +#145#255#213#172#133#255#213#172#133#255#213#172#133#255#213#172#133#255#213
-  +#172#133#255#213#171#132#255#213#170#131#255#212#170#129#255#212#169#128#255
-  +#211#168''#255#210#165'{'#255#208#161't'#255#207#159'r'#255#210#164'z'#255
-  +#190#140'b'#255#0#0#0#0#0#0#0#0'ppp'#255''#255#205#205#205#255#190#150'v'
-  +#255#215#175#138#255#213#172#133#255#213#172#133#255#213#172#133#255#213#172
-  +#133#255#213#171#132#255#213#170#131#255#212#169#129#255#211#167'}'#255#209
-  +#164'y'#255#208#162'v'#255#207#159'r'#255#207#159'r'#255#207#159'r'#255#212
-  +#169#129#255#177'xI'#255#0#0#0#0#0#0#0#0'jjj'#255'{{{'#255#143#143#143#255
-  +#184#141'i'#255#213#172#134#255#213#171#132#255#211#166'}'#255#209#164'y'#255
-  +#208#161'u'#255#207#160's'#255#207#159'r'#255#207#159'r'#255#207#159'r'#255
-  +#207#159'r'#255#207#159'r'#255#207#159'r'#255#207#159'r'#255#207#159'r'#255
-  +#204#158'u'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#138#138#138#255'}nc'#255#196
-  +#149'm'#255#208#161'v'#255#207#159'r'#255#207#159'r'#255#207#159'r'#255#207
-  +#159'r'#255#207#159'r'#255#207#159'r'#255#207#159'r'#255#207#159'r'#255#207
-  +#159'r'#255#207#159'r'#255#207#159'r'#255#207#159'r'#255#208#160't'#255#188
-  +#134'Z'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#133#133#133#255#158'tQ'#255#207
-  +#157'o'#255#206#155'l'#255#206#154'l'#255#206#154'l'#255#206#154'l'#255#206
-  +#154'k'#255#206#154'k'#255#206#154'k'#255#205#154'k'#255#205#154'k'#255#205
-  +#154'j'#255#205#154'j'#255#205#154'j'#255#205#153'j'#255#206#154'l'#255#175
-  +'sC'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#134'q`'#255#183#129'R'#255#199#144
-  +'^'#255#199#144'^'#255#199#143'^'#255#199#143'^'#255#199#143'^'#255#199#143
-  +']'#255#199#143']'#255#199#143']'#255#198#143']'#255#198#143']'#255#198#143
-  +'\'#255#198#143'\'#255#198#143'\'#255#198#142'\'#255#183'}L'#255#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#131'`E'#255#128'^C'#255'|[A'#255'yY?'
-  +#255'vW>'#255'sT<'#255'qS;'#255'oR:'#255'pR:'#255'rT<'#255'uV='#255'xX?'#255
-  +'zZ@'#255'}\@'#255#129'S-'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#190#144'l'#255
-  +#206#171#143#255#211#178#152#255#208#173#146#255#190#144'k'#255#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#192#148'q'#255#233#214#198#255#241#227#214#255
-  +#239#224#209#255#239#223#207#255#239#223#207#255#241#226#213#255#235#218#203
-  +#255#215#186#163#255#189#143'h'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#180'~T'
-  +#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#206#170#143#255#242#228
-  +#216#255#237#220#204#255#237#220#204#255#237#220#204#255#237#220#204#255#237
-  +#220#204#255#237#220#204#255#237#220#204#255#238#221#205#255#241#227#214#255
-  +#219#192#169#255#0#0#0#0#0#0#0#0#215#184#159#255#200#158'~'#255#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#191#147'n'#255#240#225#212#255#239#224#210#255#218
-  ,#191#167#255#212#181#156#255#213#184#160#255#222#198#178#255#237#219#205#255
-  +#240#224#210#255#237#221#205#255#237#220#204#255#237#219#202#255#236#216#198
-  +#255#232#211#195#255#207#172#143#255#236#218#201#255#200#158'~'#255#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#220#195#175#255#223#200#181#255#175'wK'#255
-  +#166'h8'#255#165'g6'#255#0#0#0#0#0#0#0#0#0#0#0#0#200#162#131#255#222#198#178
-  +#255#236#217#199#255#231#207#185#255#231#207#185#255#231#207#185#255#233#212
-  +#192#255#234#212#193#255#199#158'~'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#217#190#167#255#173'rD'#255#180'yL'#255#169'k;'#255#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#195#152'v'#255#224#200#179#255#232#210#189#255#231
-  +#207#185#255#231#207#185#255#234#212#193#255#199#158'}'#255#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#178'{O'#255#191#134'\'#255#189#131'Y'#255#168'j:'#255
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#177'zP'#255#236#218
-  +#202#255#231#207#185#255#231#207#185#255#234#212#192#255#199#158'~'#255#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#179'|P'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#183#132'['#255#227#205#185#255#231
-  +#207#186#255#231#207#185#255#231#207#185#255#234#212#192#255#199#158'~'#255#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#200#159''#255#216#187#163#255#216
-  +#186#161#255#216#186#161#255#216#186#161#255#217#187#163#255#189#140'g'#255#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#194#148'n'#255#206#168#136#255#207#170
-  +#138#255#208#171#140#255#209#172#142#255#209#173#141#255#168'k;'#255#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#216#183#154#255#218#182#147#255#218#182
-  +#147#255#219#183#148#255#224#193#164#255#201#160'~'#255#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#168'j:'#255#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#217#184#155#255#218#182#147#255#219#183
-  +#148#255#222#188#157#255#211#177#148#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#170'm='#255#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#217#184#155#255#218#183#148#255#219#183#149#255
-  +#221#186#154#255#223#194#167#255#199#159'|'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#230#204#181#255#0#0#0#0#192#142'e'#255#187#135'\'
-  +#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#218#185#156#255#219#183#149#255
-  +#220#186#153#255#220#185#152#255#218#182#148#255#215#174#137#255#211#174#141
-  +#255#188#140'c'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#216#171#133#255#218#184
-  +#154#255#181'}N'#255#221#192#165#255#176'xJ'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#218#186#157#255#226#198#173#255#209#172#141#255#224#191#161#255
-  +#208#161'u'#255#207#159'r'#255#207#159's'#255#214#173#134#255#214#176#142#255
-  +#202#162#128#255#195#147'l'#255#195#145'i'#255#196#149'n'#255#208#169#135#255
-  +#219#184#151#255#206#166#132#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#222#194#169#255#186#137'c'#255#0#0#0#0#189#143'j'#255#213#174#140#255
-  +#208#162'v'#255#207#159'r'#255#207#159'r'#255#207#159'r'#255#207#159'r'#255
-  +#210#165'z'#255#211#167'~'#255#210#164'z'#255#208#161'u'#255#216#181#148#255
-  +#165'nB'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#179'V'#255#0#0
-  +#0#0#0#0#0#0#0#0#0#0#155'h='#255#190#148'p'#255#212#172#136#255#215#175#137
-  +#255#210#165'z'#255#207#159'r'#255#208#160't'#255#209#164'y'#255#219#183#149
-  +#255#207#169#136#255#158'kB'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'hB$'#255#165'xS'
-  +#255#182#141'k'#255#193#153'x'#255#194#153'w'#255#186#145'n'#255#158'jA'#255
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#17
-  +#17#186#255#20#20#196#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#26#26#194#255'::'#233#255'**'#232#255#23#23#201#255
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'##'#201#255'CC'
-  ,#236#255'EE'#241#255'++'#232#255'&&'#227#255#25#25#204#255#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0'--'#207#255'MM'#239#255'LL'#242#255'>>'#240#255')'
-  +')'#236#255''''''#228#255'&&'#225#255#27#27#206#255#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0'::'#216#255'WW'#242#255'SS'#242#255'=='#241#255'%%'#228#255#29#30#211#255
-  +'(('#235#255''''''#226#255'&&'#222#255#29#29#207#255#7#7#174#255#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'II'#223
-  +#255'``'#243#255'XX'#243#255'::'#240#255'$%'#219#255'gj'#199#255#158#159#206
-  +#255'*+'#206#255'''('#234#255''''''#225#255'&&'#219#255#31#31#208#255#10#10
-  +#178#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#31#31#189
-  +#255'VV'#229#255'hh'#244#255'\\'#243#255'66'#238#255'(('#213#255#138#139#205
-  +#255#216#216#218#255#217#217#217#255#173#173#209#255'88'#204#255'&&'#233#255
-  +''''''#225#255'%%'#217#255'  '#207#255#13#13#181#255#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0']]'#230#255'pp'#244#255']]'#243#255'11'#236#255'34'
-  +#207#255#164#164#212#255#220#220#221#255#224#224#224#255#237#237#237#255#229
-  +#229#229#255#187#187#213#255'AA'#202#255'&&'#231#255''''''#225#255'%%'#214
-  +#255#31#31#205#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'=='#206#255'vv'
-  +#244#255'ZZ'#243#255',,'#234#255'??'#203#255#191#191#220#255#226#226#226#255
-  +#231#231#231#255#239#239#239#255#240#240#240#255#239#239#239#255#232#232#232
-  +#255#201#201#218#255'HH'#199#255'%%'#230#255''''''#226#255'$$'#211#255#19#19
-  +#187#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'ff'#231#255'UU'#242#255'(('#229#255
-  +'MM'#201#255#215#215#228#255#230#230#230#255#236#236#236#255#239#239#239#255
-  +#238#238#238#255#237#237#237#255#236#236#236#255#235#235#235#255#232#232#232
-  +#255#214#214#223#255'SS'#198#255'$$'#227#255''''''#227#255#30#30#200#255#0#0
-  +#0#0#0#0#0#0#0#0#0#0'11'#202#255'HH'#241#255'%%'#221#255'pp'#206#255#232#232
-  +#235#255#234#234#234#255#237#237#237#255#237#237#237#255#236#236#236#255#235
-  +#235#235#255#234#234#234#255#233#233#233#255#232#232#232#255#231#231#231#255
-  +#230#230#230#255#223#223#225#255'jj'#200#255'$$'#222#255''''''#229#255#16#16
-  +#185#255#0#0#0#0#0#0#0#0'""'#214#255'!!'#211#255#132#132#204#255#233#233#236
-  +#255#232#232#232#255#233#233#233#255#233#233#233#255#233#233#233#255#233#233
-  +#233#255#233#233#233#255#232#232#232#255#225#225#225#255#222#221#221#255#220
-  +#220#220#255#220#219#219#255#220#219#219#255#222#222#225#255'ww'#197#255'  '
-  +#214#255#25#25#208#255#0#0#0#0#0#0#0#0#8#8#178#255#0#0#0#0#201#201#203#255
-  +#228#228#228#255#175#177#176#255#168#170#169#255#172#175#174#255#177#180#179
-  +#255#186#188#187#255#232#232#232#255#227#227#227#255#166#152#141#255#171#147
-  +''#255#138#133#128#255#160#141'~'#255#161#141'}'#255#212#212#212#255#193#193
-  +#195#255'**'#160#255#8#8#178#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#193#193#193
-  +#255#228#228#228#255#150#153#152#255'}'#130#128#255'~'#131#129#255'~'#131#129
-  +#255#135#140#138#255#227#228#228#255#223#223#223#255#168#144'}'#255#193#152
-  +'y'#255#132'|w'#255#174#141't'#255#172#140's'#255#210#210#210#255#188#188#188
-  +#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#184#184#184#255#228#228
-  +#228#255#157#160#158#255#129#134#132#255#130#135#133#255#130#135#133#255#138
-  +#143#141#255#226#226#226#255#221#221#221#255#165#140'y'#255#185#141'k'#255
-  +#129'ys'#255#162'xX'#255#157'{`'#255#214#214#214#255#180#180#180#255#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#174#174#174#255#228#228#228#255#162
-  +#164#163#255#130#136#134#255#130#136#134#255'b'#140#143#255't'#146#147#255
-  +#224#225#225#255#219#219#218#255#154'|d'#255#162'g9'#255'}sk'#255#153'iC'#255
-  +#149'sX'#255#216#216#216#255#171#171#171#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#167#167#167#255#225#225#225#255#169#171#170#255#132#137#135
-  +#255#132#137#135#255'g'#143#145#255'v'#146#147#255#223#223#223#255#216#216
-  +#216#255#161#145#131#255#168#137'p'#255#149#144#140#255#165#139'w'#255#157
-  +#140'~'#255#217#217#217#255#164#164#164#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#163#163#163#255#222#222#222#255#175#176#176#255#133#139#136
-  +#255#133#139#136#255#133#139#136#255#141#146#143#255#221#222#221#255#197#197
-  +#197#255#172#172#172#255#177#177#177#255#177#177#177#255#177#177#177#255#174
-  +#174#174#255#192#192#192#255#158#158#158#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#154#154#154#255#220#220#220#255#185#186#185#255#133#139#136
-  +#255#133#139#136#255#134#140#137#255#142#147#144#255#222#223#222#255#209#209
-  +#209#255#198#198#198#255#198#198#198#255#197#197#197#255#196#196#196#255#195
-  +#195#195#255#203#203#203#255#149#149#149#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#143#143#143#255#134#135#134#255'uww'#255'uvv'#255't'
-  +'vu'#255'uvv'#255#133#133#133#255#130#130#130#255#130#130#130#255#131#131#131
-  +#255#132#132#132#255#134#134#134#255#137#137#137#255#138#138#138#255#0#0#0#0
-  ,#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +'nitTreeViewExpanding'#11'OnMouseDown'#7#21'UnitTreeViewMouseDown'#0#0#0
 ]);
diff --git a/ide/unitdependencies.pas b/ide/unitdependencies.pas
index 72506dfdc8..206b495026 100644
--- a/ide/unitdependencies.pas
+++ b/ide/unitdependencies.pas
@@ -161,7 +161,6 @@ type
 
   TUnitDependenciesView = class(TForm)
     CloseButton: TBitBtn;
-    ToolbarImageList: TImageList;
     ToolBar: TToolBar;
     RefreshButton: TToolButton;
     ShowProjectButton: TToolButton;
@@ -428,6 +427,10 @@ begin
   ShowProjectButton.Caption:=dlgEnvProject;
   CloseButton.Caption:=lisClose;
   UnitTreeView.Images := IDEImages.Images_16;
+  ToolBar.Images := IDEImages.Images_16;
+  ShowProjectButton.ImageIndex := IDEImages.LoadImage(16, 'item_project');
+  SelectUnitButton.ImageIndex := IDEImages.LoadImage(16, 'open');
+  RefreshButton.ImageIndex := IDEImages.LoadImage(16, 'refresh');
 end;
 
 destructor TUnitDependenciesView.Destroy;
diff --git a/images/actions/refresh.png b/images/actions/refresh.png
new file mode 100644
index 0000000000..3fd71d6e59
Binary files /dev/null and b/images/actions/refresh.png differ
diff --git a/images/laz_images.lrs b/images/laz_images.lrs
index 5969eefbf3..9029bfb17d 100644
--- a/images/laz_images.lrs
+++ b/images/laz_images.lrs
@@ -707,6 +707,45 @@ LazarusResources.Add('delete','PNG',[
   +#211#152#158#236'Tsw'#230#6#225'_'#183#241'_'#243#19#29#210#206#185'Ir'#27
   +#254#0#0#0#0'IEND'#174'B`'#130
 ]);
+LazarusResources.Add('refresh','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'sBIT'#8#8#8#8'|'#8'd'#136#0#0#0#25'tEXtSoftware'#0'www.inkscape.org'
+  +#155#238'<'#26#0#0#3'"IDAT8'#141'mRMlTe'#20'='#247'{'#239#149#249#173'3m'#7
+  +'['#168#182#10#134#18#166#161#162'3'#141''#209#152'F7'#196'`X'#168#188'D'
+  +#140#144#129#240#179'a'#7#27#12'M'#12#17'ta'#162#224#3#163'1L%'#152'4'#1'7'
+  +#252#4'!'#146#212#194#171'q'#209#208#146#212#210#198#1'F;'#180#29#232#204#180
+  +#243#222#251#190#235#162#243#146'Yp'#146#155#220#197'='''''#231'\bf'#248'He'
+  +#178#207'4'#232#218#17#16#222#244#164'j'#213#132#152''''#194#184#227#202#19#0
+  +'.'#216#150#233#214#221#30#4'p'#130'|'#129't&'#187'E'#211#196'@O'#215'*}]g'
+  +#179#209#214#20#1#152'Q(V02v'#191'|g'#250#161''''#21#239#182'-'#243'lzW6'#195
+  +#140#239#0#196#136#153#145#202'd'#215#27#186#24#217#218#215#29#138#199#130
+  +#208#137#208#28#13' '#28#208#17#13#25#8#26#2'3'#197'E'#28#207#14'W'#10#197
+  +#138#29#13'5'#244'>.W'#13'f4'#17'3'#227#213'=gO'#245#172'k'#251'4'#24'0'#196
+  +#173#209#28#170#174#7'C'#215#228#154#213#177#197#190#244#243#225#222#245#173
+  +#164#9#130#16#132'_'#174'M'#168#183'^l'#23#7#190#190#234'8'#174'l'#209#1#128
+  +#153'?'#188'3]'#16#174#167'X1/2'#227'3'#199#149'g'#198#167'g'#147#19#247#230
+  +#143'^'#239'h'#238#218#183'uS('#17#11#225#227'w'#187'D-'#6#2#160#4#0'H'#169
+  +#194'U'#199#243#146'/<'#251#131#148#234#17#128'A'#219'2'#243#182'e^'#249#227
+  +#219#143'^'#26#157','#236#221'}'#236#18#238'?,az'#166#12#169#24#0#3#0#11','
+  +#175#170#233#169'Hc$'#240'Ug'#251#202'n'#0'Sui'#235#186'&vn{'''#233'v>'#29
+  +'E'#162'q'#5'4A'#190#3#214'kw'#241'_?'#223#188#128''''#227#180''''#213'k'#23
+  +#135''''#171'W'#237#169'%'#223#188#227#170#0#0#246'['#168#2'0j'#4#174#155#223
+  +#0#236#4#224'>AX'#183'-'#243#158'/'#224#157'?'#250#190#6#16#152#25#23#237''
+  +#212#169#243''#229#164'T='#182'e'#22#235'Y'#135#179'c'#171'J'#229#165#142
+  +#223'G'#198'o'#0#136#233#0'@'#4#16#17#238#254'W'#134'!'#24''''#7#255'$'#0'_'
+  +#212#147'S'#153'l'#152#136#238#246'n\{&?3'#151#2#160#1#168#10#0#16'D'#4#0#29
+  +#137#16'V'#183#132#241#229#254#183#169#173'%r'#236#149'=?'#223'Je'#178#233
+  +#154#198#246#21#134#174#231#242#179#7#242#133#226#235#154'F'#174'm'#153#174
+  +'Xv@x\qqah'#138'='#143#209#190'2'#138#195';'#222#8'}'#208#151'|'#185#181'9r-'
+  +#189'k'#192'5t'#241#141'T2>'#247'h'#1'M'#141'A'#210#132#24#4#0#255#145#168
+  +#255#199#161#165#137#220#220#228#165#225#201#206#204#150'M'#225'D,'#136#238
+  +#181#9'z'#174'='#30'*'#150']'#252';['#130#227'x'#20#9#26'8wy'#180#226'Iu'#4#0
+  +#150#31'I1M'#228#230'N'#223'<'#185'-'#249#160#176#240'I'#255#247'7'#230#143
+  +#15#220','#13#223#206'#?[F'#213#149#16'D('#204#151#228#185#203#163#139'R'#169
+  +#140'm'#153'c'#0#224#183#240#19#128#237#182'er-0'#3#192'{'#13#134#182'W1o'
+  +#144'R'#197#13']'#155'!'#194'P'#213#145#135'l'#203#252#219#15#247'.Uvj'#19
+  +'e'#204#198#0#0#0#0'IEND'#174'B`'#130
+]);
 LazarusResources.Add('item_form','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'eIDATx^'#165#147'1K'#195'P'#20#133#207#11'Q'#10#5'G;8(u'#177't'#170't'
@@ -1644,7 +1683,7 @@ LazarusResources.Add('menu_new','PNG',[
   +#11#141'@'#132#247#207#223#156#187'$"'#199#8#142#180#207#145'0'#216'>'#215'u'
   +'U}]8'#204#154#224'/D8'#30'V6('#129#24#0#0#0#0'IEND'#174'B`'#130
 ]);
-LazarusResources.Add('menu_open','PNG',[
+LazarusResources.Add('open','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'AIDATx^'#133#204#189'k'#149'g'#28#198#241#239#239'~'#238#243'F'#240
   +#168#131'm'#176#232'R'#136#146']'#5'_(Y:)'#232'R(8'#136'CQ'#250'O'#184#136#5
@@ -2140,70 +2179,6 @@ LazarusResources.Add('menu_reset_debugger','PNG',[
   +#233#191#128#21#237#185#224'-^'#214#154#156#166#249#11#191'H:'#246#156#136'5'
   +#137#0#0#0#0'IEND'#174'B`'#130
 ]);
-LazarusResources.Add('menu_restart_16','XPM',[
-  '/* XPM */'#13#10'static char * menu_restart_16_xpm[] = {'#13#10'"16 16 147 2'
-  +'",'#13#10'"  '#9'c None",'#13#10'". '#9'c #3465A4",'#13#10'"+ '#9'c #3566A4'
-  +'",'#13#10'"@ '#9'c #3666A4",'#13#10'"# '#9'c #3666A5",'#13#10'"$ '#9'c #366'
-  +'7A5",'#13#10'"% '#9'c #3767A5",'#13#10'"& '#9'c #3768A5",'#13#10'"* '#9'c #'
-  +'3868A5",'#13#10'"= '#9'c #3868A6",'#13#10'"- '#9'c #3968A6",'#13#10'"; '#9
-  +'c #3969A6",'#13#10'"> '#9'c #3A69A7",'#13#10'", '#9'c #3A6AA6",'#13#10'"'' '
-  +#9'c #3B6BA7",'#13#10'") '#9'c #3C6BA8",'#13#10'"! '#9'c #3C6CA8",'#13#10'"~'
-  +' '#9'c #3D6CA7",'#13#10'"{ '#9'c #3D6CA8",'#13#10'"] '#9'c #3D6DA9",'#13#10
-  +'"^ '#9'c #3E6DA8",'#13#10'"/ '#9'c #3E6DA9",'#13#10'"( '#9'c #3F6DA9",'#13
-  +#10'"_ '#9'c #3F6EA9",'#13#10'": '#9'c #406EA9",'#13#10'"< '#9'c #416FA9",'
-  +#13#10'"[ '#9'c #416FAA",'#13#10'"} '#9'c #4170AB",'#13#10'"| '#9'c #4270AA"'
-  +','#13#10'"1 '#9'c #4370AA",'#13#10'"2 '#9'c #4471AC",'#13#10'"3 '#9'c #4673'
-  +'AD",'#13#10'"4 '#9'c #4975AE",'#13#10'"5 '#9'c #4A75AF",'#13#10'"6 '#9'c #4'
-  +'976AE",'#13#10'"7 '#9'c #4B76AE",'#13#10'"8 '#9'c #4C78AF",'#13#10'"9 '#9'c'
-  +' #4C78B0",'#13#10'"0 '#9'c #4D78B0",'#13#10'"a '#9'c #4F7AB0",'#13#10'"b '#9
-  +'c #4F7AB1",'#13#10'"c '#9'c #527BB2",'#13#10'"d '#9'c #4F7CB6",'#13#10'"e '
-  +#9'c #527CB2",'#13#10'"f '#9'c #537DB2",'#13#10'"g '#9'c #537DB3",'#13#10'"h'
-  +' '#9'c #547EB3",'#13#10'"i '#9'c #5680B4",'#13#10'"j '#9'c #5881B4",'#13#10
-  +'"k '#9'c #5D86B8",'#13#10'"l '#9'c #5F86B7",'#13#10'"m '#9'c #6088B9",'#13
-  +#10'"n '#9'c #6188B9",'#13#10'"o '#9'c #658BBA",'#13#10'"p '#9'c #668BBB",'
-  +#13#10'"q '#9'c #668CBC",'#13#10'"r '#9'c #678DBC",'#13#10'"s '#9'c #688DBB"'
-  +','#13#10'"t '#9'c #6C8FBD",'#13#10'"u '#9'c #6C90BD",'#13#10'"v '#9'c #6A91'
-  +'C0",'#13#10'"w '#9'c #6E91BE",'#13#10'"x '#9'c #6B92C1",'#13#10'"y '#9'c #6'
-  +'F95C3",'#13#10'"z '#9'c #7298C5",'#13#10'"A '#9'c #7C9CC4",'#13#10'"B '#9'c'
-  +' #7D9DC5",'#13#10'"C '#9'c #7E9DC5",'#13#10'"D '#9'c #7C9EC8",'#13#10'"E '#9
-  +'c #809EC6",'#13#10'"F '#9'c #84A1C8",'#13#10'"G '#9'c #82A5CE",'#13#10'"H '
-  +#9'c #87A4CA",'#13#10'"I '#9'c #84A6CE",'#13#10'"J '#9'c #8BA7CB",'#13#10'"K'
-  +' '#9'c #89A8CE",'#13#10'"L '#9'c #88ABD2",'#13#10'"M '#9'c #8AACD3",'#13#10
-  +'"N '#9'c #8CADD3",'#13#10'"O '#9'c #8FADD2",'#13#10'"P '#9'c #8EAED3",'#13
-  +#10'"Q '#9'c #91AED1",'#13#10'"R '#9'c #8FB0D3",'#13#10'"S '#9'c #93B1D4",'
-  +#13#10'"T '#9'c #95B2D4",'#13#10'"U '#9'c #97B6D8",'#13#10'"V '#9'c #9FB6D4"'
-  +','#13#10'"W '#9'c #99B9DB",'#13#10'"X '#9'c #9DB8D7",'#13#10'"Y '#9'c #A2B8'
-  +'D5",'#13#10'"Z '#9'c #A1BBD9",'#13#10'"` '#9'c #9DBDDC",'#13#10'" .'#9'c #A'
-  +'2BBDD",'#13#10'"..'#9'c #A0BEDE",'#13#10'"+.'#9'c #A1BEDD",'#13#10'"@.'#9'c'
-  +' #A7BDD9",'#13#10'"#.'#9'c #ABBFD9",'#13#10'"$.'#9'c #A8C1DE",'#13#10'"%.'#9
-  +'c #A8C2DF",'#13#10'"&.'#9'c #AEC2DB",'#13#10'"*.'#9'c #AEC4E1",'#13#10'"=.'
-  +#9'c #B3C5DD",'#13#10'"-.'#9'c #B0C9E3",'#13#10'";.'#9'c #B7C8DF",'#13#10'">'
-  +'.'#9'c #B4CAE3",'#13#10'",.'#9'c #B4CBE5",'#13#10'"''.'#9'c #B9CAE0",'#13#10
-  +'").'#9'c #BCCCE1",'#13#10'"!.'#9'c #BDCDE1",'#13#10'"~.'#9'c #C0CFE2",'#13
-  +#10'"{.'#9'c #BCD1E7",'#13#10'"].'#9'c #BFD2E7",'#13#10'"^.'#9'c #C1D2E6",'
-  +#13#10'"/.'#9'c #BFD3E9",'#13#10'"(.'#9'c #C8D5E6",'#13#10'"_.'#9'c #C4D7EB"'
-  +','#13#10'":.'#9'c #C7D7E9",'#13#10'"<.'#9'c #C6D8EB",'#13#10'"[.'#9'c #C8D8'
-  +'EA",'#13#10'"}.'#9'c #C9D9EA",'#13#10'"|.'#9'c #C9DAEC",'#13#10'"1.'#9'c #C'
-  +'DDBEB",'#13#10'"2.'#9'c #CCDCED",'#13#10'"3.'#9'c #CCDDEE",'#13#10'"4.'#9'c'
-  +' #D4DEEC",'#13#10'"5.'#9'c #D5E2F0",'#13#10'"6.'#9'c #D8E4F1",'#13#10'"7.'#9
-  +'c #DBE6F2",'#13#10'"8.'#9'c #DEE6F0",'#13#10'"9.'#9'c #DDE8F3",'#13#10'"0.'
-  +#9'c #DFE8F4",'#13#10'"a.'#9'c #E0E9F4",'#13#10'"b.'#9'c #E2E9F2",'#13#10'"c'
-  +'.'#9'c #E3EAF3",'#13#10'"d.'#9'c #E2EBF5",'#13#10'"e.'#9'c #E3ECF5",'#13#10
-  +'"f.'#9'c #E4ECF5",'#13#10'"g.'#9'c #E4EDF5",'#13#10'"h.'#9'c #E5EDF5",'#13
-  +#10'"i.'#9'c #E5EDF6",'#13#10'"j.'#9'c #E8EDF5",'#13#10'"k.'#9'c #E6EEF6",'
-  +#13#10'"l.'#9'c #E7EEF6",'#13#10'"m.'#9'c #E8EEF7",'#13#10'"n.'#9'c #E9EEF5"'
-  +','#13#10'"o.'#9'c #EBF0F6",'#13#10'"p.'#9'c #ECF1F6",'#13#10'"      j.F f {'
-  +' 0 w !.        V   ",'#13#10'"    ~.( x R %.$.S q 1 ''.  &..   ",'#13#10'" '
-  +' 8.< N ` +.,./.3.5.].e s 4 &   ",'#13#10'"  H v z ) + ! o Z 6.7.9.K [._   "'
-  +','#13#10'"  [ } ] | Y o.(.l r 1.d.k.k./   ",'#13#10'"  @ {  .7 c.      =.+ '
-  +':.<.e.^   ",'#13#10'"  $ @.m.          p Q l.7.k.~   ",'#13#10'"           '
-  +'     E . 8 c c e .   ",'#13#10'"  ; + + # $ % t j.p.p.p.p.p.n.  ",'#13#10'"'
-  +'  $ h.i.f.X b             0.$   ",'#13#10'"  & k._.}.+ #.        3 *.D .   '
-  +'",'#13#10'"  - k.e.g.^.h n 4.  #.5 d '' ''   ",'#13#10'"  > 6.T a.9.2.O g ='
-  +' ; , ] 9 B   ",'#13#10'"  * m j i >.|.{.-...L G P : 8.  ",'#13#10'"  . J   '
-  +').2 k I U W M y ( ;.    ",'#13#10'"  C         !.u 6 ; a A b.      "};'#13
-  +#10
-]);
 LazarusResources.Add('menu_run','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#199'IDATx^'#157#211'AH'#20'Q'#24#192#241#255#155'y;'#169#137'e'#151
diff --git a/images/laz_images_list.txt b/images/laz_images_list.txt
index a54e3d21a2..fbe23dc648 100644
--- a/images/laz_images_list.txt
+++ b/images/laz_images_list.txt
@@ -23,6 +23,7 @@ actions/arrow_left.png
 actions/arrow_right.png
 actions/arrow_up.png
 actions/delete.png
+actions/refresh.png
 items/item_form.png
 items/item_library.png
 items/item_package.png
@@ -58,7 +59,7 @@ menu/menu_help.png
 menu/menu_indent.png
 menu/menu_information.png
 menu/menu_new.png
-menu/menu_open.png
+menu/open.png
 menu/menu_pause.png
 menu/menu_project_add.png
 menu/menu_project_close.png
@@ -74,7 +75,6 @@ menu/menu_quick_compile.png
 menu/menu_redo.png
 menu/menu_reportingbug.png
 menu/menu_reset_debugger.png
-menu/menu_restart_16.xpm
 menu/menu_run.png
 menu/menu_run_cursor.png
 menu/menu_run_file.png
diff --git a/images/menu/menu_restart_16.xpm b/images/menu/menu_restart_16.xpm
deleted file mode 100644
index 102d9b54c0..0000000000
--- a/images/menu/menu_restart_16.xpm
+++ /dev/null
@@ -1,166 +0,0 @@
-/* XPM */
-static char * menu_restart_16_xpm[] = {
-"16 16 147 2",
-"  	c None",
-". 	c #3465A4",
-"+ 	c #3566A4",
-"@ 	c #3666A4",
-"# 	c #3666A5",
-"$ 	c #3667A5",
-"% 	c #3767A5",
-"& 	c #3768A5",
-"* 	c #3868A5",
-"= 	c #3868A6",
-"- 	c #3968A6",
-"; 	c #3969A6",
-"> 	c #3A69A7",
-", 	c #3A6AA6",
-"' 	c #3B6BA7",
-") 	c #3C6BA8",
-"! 	c #3C6CA8",
-"~ 	c #3D6CA7",
-"{ 	c #3D6CA8",
-"] 	c #3D6DA9",
-"^ 	c #3E6DA8",
-"/ 	c #3E6DA9",
-"( 	c #3F6DA9",
-"_ 	c #3F6EA9",
-": 	c #406EA9",
-"< 	c #416FA9",
-"[ 	c #416FAA",
-"} 	c #4170AB",
-"| 	c #4270AA",
-"1 	c #4370AA",
-"2 	c #4471AC",
-"3 	c #4673AD",
-"4 	c #4975AE",
-"5 	c #4A75AF",
-"6 	c #4976AE",
-"7 	c #4B76AE",
-"8 	c #4C78AF",
-"9 	c #4C78B0",
-"0 	c #4D78B0",
-"a 	c #4F7AB0",
-"b 	c #4F7AB1",
-"c 	c #527BB2",
-"d 	c #4F7CB6",
-"e 	c #527CB2",
-"f 	c #537DB2",
-"g 	c #537DB3",
-"h 	c #547EB3",
-"i 	c #5680B4",
-"j 	c #5881B4",
-"k 	c #5D86B8",
-"l 	c #5F86B7",
-"m 	c #6088B9",
-"n 	c #6188B9",
-"o 	c #658BBA",
-"p 	c #668BBB",
-"q 	c #668CBC",
-"r 	c #678DBC",
-"s 	c #688DBB",
-"t 	c #6C8FBD",
-"u 	c #6C90BD",
-"v 	c #6A91C0",
-"w 	c #6E91BE",
-"x 	c #6B92C1",
-"y 	c #6F95C3",
-"z 	c #7298C5",
-"A 	c #7C9CC4",
-"B 	c #7D9DC5",
-"C 	c #7E9DC5",
-"D 	c #7C9EC8",
-"E 	c #809EC6",
-"F 	c #84A1C8",
-"G 	c #82A5CE",
-"H 	c #87A4CA",
-"I 	c #84A6CE",
-"J 	c #8BA7CB",
-"K 	c #89A8CE",
-"L 	c #88ABD2",
-"M 	c #8AACD3",
-"N 	c #8CADD3",
-"O 	c #8FADD2",
-"P 	c #8EAED3",
-"Q 	c #91AED1",
-"R 	c #8FB0D3",
-"S 	c #93B1D4",
-"T 	c #95B2D4",
-"U 	c #97B6D8",
-"V 	c #9FB6D4",
-"W 	c #99B9DB",
-"X 	c #9DB8D7",
-"Y 	c #A2B8D5",
-"Z 	c #A1BBD9",
-"` 	c #9DBDDC",
-" .	c #A2BBDD",
-"..	c #A0BEDE",
-"+.	c #A1BEDD",
-"@.	c #A7BDD9",
-"#.	c #ABBFD9",
-"$.	c #A8C1DE",
-"%.	c #A8C2DF",
-"&.	c #AEC2DB",
-"*.	c #AEC4E1",
-"=.	c #B3C5DD",
-"-.	c #B0C9E3",
-";.	c #B7C8DF",
-">.	c #B4CAE3",
-",.	c #B4CBE5",
-"'.	c #B9CAE0",
-").	c #BCCCE1",
-"!.	c #BDCDE1",
-"~.	c #C0CFE2",
-"{.	c #BCD1E7",
-"].	c #BFD2E7",
-"^.	c #C1D2E6",
-"/.	c #BFD3E9",
-"(.	c #C8D5E6",
-"_.	c #C4D7EB",
-":.	c #C7D7E9",
-"<.	c #C6D8EB",
-"[.	c #C8D8EA",
-"}.	c #C9D9EA",
-"|.	c #C9DAEC",
-"1.	c #CDDBEB",
-"2.	c #CCDCED",
-"3.	c #CCDDEE",
-"4.	c #D4DEEC",
-"5.	c #D5E2F0",
-"6.	c #D8E4F1",
-"7.	c #DBE6F2",
-"8.	c #DEE6F0",
-"9.	c #DDE8F3",
-"0.	c #DFE8F4",
-"a.	c #E0E9F4",
-"b.	c #E2E9F2",
-"c.	c #E3EAF3",
-"d.	c #E2EBF5",
-"e.	c #E3ECF5",
-"f.	c #E4ECF5",
-"g.	c #E4EDF5",
-"h.	c #E5EDF5",
-"i.	c #E5EDF6",
-"j.	c #E8EDF5",
-"k.	c #E6EEF6",
-"l.	c #E7EEF6",
-"m.	c #E8EEF7",
-"n.	c #E9EEF5",
-"o.	c #EBF0F6",
-"p.	c #ECF1F6",
-"      j.F f { 0 w !.        V   ",
-"    ~.( x R %.$.S q 1 '.  &..   ",
-"  8.< N ` +.,./.3.5.].e s 4 &   ",
-"  H v z ) + ! o Z 6.7.9.K [._   ",
-"  [ } ] | Y o.(.l r 1.d.k.k./   ",
-"  @ {  .7 c.      =.+ :.<.e.^   ",
-"  $ @.m.          p Q l.7.k.~   ",
-"                E . 8 c c e .   ",
-"  ; + + # $ % t j.p.p.p.p.p.n.  ",
-"  $ h.i.f.X b             0.$   ",
-"  & k._.}.+ #.        3 *.D .   ",
-"  - k.e.g.^.h n 4.  #.5 d ' '   ",
-"  > 6.T a.9.2.O g = ; , ] 9 B   ",
-"  * m j i >.|.{.-...L G P : 8.  ",
-"  . J   ).2 k I U W M y ( ;.    ",
-"  C         !.u 6 ; a A b.      "};
diff --git a/images/menu/menu_open.png b/images/menu/open.png
similarity index 100%
rename from images/menu/menu_open.png
rename to images/menu/open.png