diff --git a/.gitattributes b/.gitattributes
index 84076e6050..4837a9bc02 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2283,6 +2283,8 @@ images/actions/open.png -text svneol=unset#image/png
 images/actions/paste.png -text svneol=unset#image/png
 images/actions/refresh.png -text svneol=unset#image/png
 images/bookmark.lrs svneol=native#text/pascal
+images/bookmark.sh svneol=native#text/plain
+images/bookmark_list.txt svneol=native#text/plain
 images/btn_downarrow.png -text
 images/codeexplorer/ce_class.png -text
 images/codeexplorer/ce_const.png -text
diff --git a/images/bookmark.lrs b/images/bookmark.lrs
index e5dc8edcd9..bcb2dccd74 100644
--- a/images/bookmark.lrs
+++ b/images/bookmark.lrs
@@ -1,134 +1,313 @@
-LazarusResources.Add('ActiveBreakPoint','XPM',[
-  '/* XPM */'#10'static char * ActiveBreakPoint_xpm[] = {'#10'"11 11 5 1",'#10
-  +'" '#9'c None",'#10'".'#9'c #000000",'#10'"+'#9'c #FF0000",'#10'"@'#9'c #00F'
-  +'F00",'#10'"#'#9'c #008000",'#10'"   .....   ",'#10'"  .+++++.  ",'#10'" .++'
-  +'+++@#. ",'#10'".++++++@#+.",'#10'".+++++@#++.",'#10'".+++++@#++.",'#10'".+@'
-  +'++@#+++.",'#10'".++@+@#+++.",'#10'" .++@#+++. ",'#10'"  .+++++.  ",'#10'"  '
-  +' .....   "};'#10
+LazarusResources.Add('ActiveBreakPoint','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#11#0#0#0#11#8#6#0#0#0#169#172'w&'#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#19#0#0#11#19#1#0#154#156#24#0#0#0#7'tIME'#7#216#3#1#22
+  +#8#1'j'#208'L'#11#0#0#1'wIDAT'#24#211'U'#143#207'+'#164'a'#0#199'?'#207#243
+  +#190#239'$'#198'*'#210'NB'#26#146#221#230' '#7'V'#9#7'%'#7'W''9(g9'#236#213
+  +'e..r'#155#218#180#181#151'-'#133#131'r'#192'?'#128#161'&aW$'#147#223#243#206
+  +#143'wj'#7#239#206#188#243'<'#14'v_|O'#223#195#247#167#224#31#242#191'~'#235
+  +#192#217#30#238#249')*'#159#197#168#15'Q'#209#246#153'B{/'#245#173#141#2'@'#0
+  +'d'#214#150#181'8'#222'A'#229#179#232'r'#25#148#2#195#0#192#248#216'D'#169'{'
+  +#152#208'@'#191'0s'#137#132'.'#175'|'#195#187'N'#162#1#164#1'B'#128#214#204
+  +#206#156#19#141'=b'#26#22#206#193#161'6'#229#246#6#238'e'#18'/'#155#230'-'
+  +#162's'#15'>'#247'N'#143#200#231#28#204'B|'#27'/'#157#249#191#232#189'!'#22
+  +#193'M&A'#10#30#174'n1'#221#187'{'#188#180#253'N4'#255#163#210#231#174'm'#131
+  +'R'#252#173#8'b'#234#170#26'T'#206'a'#225#251#203#161#153')'#237#167#230#18
+  +#135'h'#25'@Z&:P'#137#172#254#210#135#242#20#209'X'#4#128#133#197#215'9E;M'
+  +#241'>'#133#252'PCUw/R'#13#141'a'#133#219#185']'#223#244#13#209'X'#132#155
+  +#245'-J'#133'G'#0'dG''u'#147'__^],'#173#234#226#214'*'#197#147'#<'#199'A==!'
+  +#131'A'#172#218'Z'#172'H'#23#214#232'8'#225#145'A'#225'w'#166'v'#247'u'#234
+  +#231'"'#246#227#148#236#20#129#230#22#170'{z'#168#155#152#166#225'S'#139#0
+  +'x'#6'K'#142#153#176#147#129#195'0'#0#0#0#0'IEND'#174'B`'#130
 ]);
-LazarusResources.Add('bookmark0','XPM',[
-  '/* XPM */'#10'static char * bookmark0_xpm[] = {'#10'"11 11 12 1",'#10'" '#9
-  +'c None",'#10'".'#9'c #000000",'#10'"+'#9'c #336041",'#10'"@'#9'c #5F826A",'
-  +#10'"#'#9'c #BBCABF",'#10'"$'#9'c #A3B7AA",'#10'"%'#9'c #FFFFFF",'#10'"&'#9
-  +'c #D1DBD4",'#10'"*'#9'c #779580",'#10'"='#9'c #E7ECE9",'#10'"-'#9'c #8DA695'
-  +'",'#10'";'#9'c #497155",'#10'"   .....   ",'#10'"  .+++++.  ",'#10'" .++@#$'
-  +'++. ",'#10'".++@%#&$++.",'#10'".++##+*=++.",'#10'".++##+*%++.",'#10'".++##+'
-  +'*%++.",'#10'".++$&+-=++.",'#10'" .+;=%%*+. ",'#10'"  .++*@+.  ",'#10'"   ..'
-  +'...   "};'#10
+LazarusResources.Add('bookmark0','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#11#0#0#0#11#8#6#0#0#0#169#172'w&'#0
+  +#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#0#0#0#0#0#249'C'#187''#0#0#0#9
+  +'pHYs'#0#0#11#19#0#0#11#19#1#0#154#156#24#0#0#0#7'tIME'#7#216#3#1#14','#7'`n'
+  +#250'P'#0#0#1'*IDAT'#24#211'cd'#128#2'i=o.'#14#1#165'4'#14'A%'#15'&Vn'#145''
+  +#191#191#190#249#241#254#222#142#31#31#238#205'zzi'#235'7'#6#6#6#6'F'#6#6#6#6
+  +'y'#211'Hy^'#25#171#131#172'R'#161#242#204#156#226'0'#253#12#223#159#237'e`'
+  +#252'~'#253#225#231''''#199#236#31#158'^'#254#144'EZ'#207#155#139'W'#198#234
+  +' '#151'f'#142#252#191'_'#12#12#167#187#225'j'#25'LK'#157#25'~'#190#17#144
+  +#231'e`8('#253#243#147#22#11#135#128'R'#26#171'd'#8'\a'#217'f'#132#226#211
+  +#221#12#12#166#165#198#12#31'_'#29#147#231#16'PJc'#226#16'T'#242'`'#230#146
+  +'`@'#6#251#15#161'p'#25#248#181'r'#25'8'#4#149'<'#152#152'X'#185'E'#24#136#0
+  +'L'#172#220'"L'#255'~}'#195#240#239#15'^'#133'_'#238#173'`'#248#247#251#235
+  +#27#166#31#239#239#237#248#246'l/'#138#164#163#29#170#226'_'#239'.0'#252'xo'
+  +#7#163#180#158'7'#151#160#178#199'5F>SyvQs'#180#208'``'#248'xu"'#3';'#7#243
+  +#195#247'wwh'#161#132#243#207#239#191#229#249'u'#10#225#138#223#157#169'`'
+  +#224#18#148#129#135'3#)1'#8#0#220'4{L'#0#137#218#231#0#0#0#0'IEND'#174'B`'
+  +#130
 ]);
-LazarusResources.Add('bookmark1','XPM',[
-  '/* XPM */'#10'static char * bookmark1_xpm[] = {'#10'"11 11 11 1",'#10'" '#9
-  +'c None",'#10'".'#9'c #000000",'#10'"+'#9'c #336041",'#10'"@'#9'c #5F826A",'
-  +#10'"#'#9'c #8DA695",'#10'"$'#9'c #497155",'#10'"%'#9'c #A3B7AA",'#10'"&'#9
-  +'c #E7ECE9",'#10'"*'#9'c #BBCABF",'#10'"='#9'c #779580",'#10'"-'#9'c #D1DBD4'
-  +'",'#10'"   .....   ",'#10'"  .+++++.  ",'#10'" .+++@#++. ",'#10'".++$%&*+++'
-  +'.",'#10'".++$=-*+++.",'#10'".++++**+++.",'#10'".++++**+++.",'#10'".++++**++'
-  +'+.",'#10'" .+++**++. ",'#10'"  .++@@+.  ",'#10'"   .....   "};'#10
+LazarusResources.Add('bookmark1','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#11#0#0#0#11#8#6#0#0#0#169#172'w&'#0
+  +#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#0#0#0#0#0#249'C'#187''#0#0#0#9
+  +'pHYs'#0#0#11#19#0#0#11#19#1#0#154#156#24#0#0#0#7'tIME'#7#216#3#1#15#2'*/t'
+  +#197'>'#0#0#1'4IDAT'#24#211'cd'#128#2'i=o.'#14#1#165'4'#14'A%'#15'&Vn'#145''
+  +#191#191#190#249#241#254#222#142#31#31#238#205'zzi'#235'7'#6#6#6#6'F'#6#6#6#6
+  +'y'#211'Hy^'#25#171#131#172'R'#161#242#204#156#226'0'#253#12#223#159#237'e`'
+  +#252'~'#253#225#231''''#199#236#31#158'^'#254#144'YZ'#207#155#139'_'#193#241
+  +#12#151'f'#142'<3'#7#15#131#131'5'#3#195#234#28#6#134';?'#25#24#158#188'Sb'
+  +#248#251#143'Y'#128#141#157'1'#144#149#141'i'#22#19#135#128'R'#26#171'd'#136
+  +#252#191'_'#12#12#246#22#12#12']'#190#12'('#128']'#196#152#225#231#207#255
+  +#242#28#2'JiL'#28#130'J'#30#204'\'#18#12#12#12#16#133'e'#155#25'0'#0#191'V.'
+  +#3#135#160#146#7#11#19'+'#183#8'L'#208#180#20#202#240#197#212#192#196#202'-'
+  +#194#244#239#247#215'7'#12#255#254'0'#224#3'_'#238#173'`'#248#247#251#235#27
+  +#166#31#239#239#237#248#246'l/^'#197#191#222']`'#248#241#254#222#14#166#31#31
+  +#238#205'b'#250'y'#251#225#207#215''''#177'*'#252'xu"'#3#151#160#204#195#31
+  +#31#238#205'B'#9#231#159#223''#203#243#235#20#194#21#190';S'#193#192'%('#3
+  +#15'gFRb'#16#0#251'O}'#195'+'#201#254#190#0#0#0#0'IEND'#174'B`'#130
 ]);
-LazarusResources.Add('bookmark2','XPM',[
-  '/* XPM */'#10'static char * bookmark2_xpm[] = {'#10'"11 11 12 1",'#10'" '#9
-  +'c None",'#10'".'#9'c #000000",'#10'"+'#9'c #336041",'#10'"@'#9'c #8DA695",'
-  +#10'"#'#9'c #BBCABF",'#10'"$'#9'c #A3B7AA",'#10'"%'#9'c #497155",'#10'"&'#9
-  +'c #FFFFFF",'#10'"*'#9'c #E7ECE9",'#10'"='#9'c #779580",'#10'"-'#9'c #D1DBD4'
-  +'",'#10'";'#9'c #5F826A",'#10'"   .....   ",'#10'"  .+++++.  ",'#10'" .++@#$'
-  +'%+. ",'#10'".++@&#**++.",'#10'".++@@+=&++.",'#10'".+++++--++.",'#10'".+++%*'
-  +'-%++.",'#10'".++%*#++++.",'#10'" .+#&&&&+. ",'#10'"  .;====.  ",'#10'"   ..'
-  +'...   "};'#10
+LazarusResources.Add('bookmark2','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#11#0#0#0#11#8#6#0#0#0#169#172'w&'#0
+  +#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#0#0#0#0#0#249'C'#187''#0#0#0#9
+  +'pHYs'#0#0#11#19#0#0#11#19#1#0#154#156#24#0#0#0#7'tIME'#7#216#3#1#15#0'3y)'
+  +#15'|'#0#0#1';IDAT'#24#211'cd'#128#2'i=o.'#14#1#165'4'#14'A%'#15'&Vn'#145''
+  +#191#191#190#249#241#254#222#142#31#31#238#205'zzi'#235'7'#6#6#6#6'F'#6#6#6#6
+  +'y'#211'Hy^'#25#171#131#172'R'#161#242#204#156#226'0'#253#12#223#159#237'e`'
+  +#252'~'#253#225#231''''#199#236#31#158'^'#254#144'EZ'#207#155#139'W'#198#234
+  +' '#151'f'#142#188#189#5#3'C'#151'/\-C'#217'fg'#134#29#235#4#228'y'#25#24#14
+  +'J'#255#252#164#197#194'!'#160#148#198'*'#25'"'#255#239#23'D'#161'i)B'#241
+  +#233'n'#6#134#253#135#140#25'>'#190':&'#207'!'#160#148#198#196'!'#168#228#193
+  +#204'%'#193#192#192#128#170#16#25#240'k'#229'2p'#8'*y'#176'0'#177'r'#139#160
+  +'K'#158#238#134'9'#3'!'#198#196#202'-'#194#242#239#247#215'7'#12#255#254'000'
+  +#177#192#21#150'mf`'#216''#8#161#240#203#189#21#12#204''#191#190'a'#250#241
+  +#254#222#142'o'#207#246#226'T'#200#192#192#192#240#235#221#5#134#31#239#239
+  +#237'`'#148#214#243#230#18'T'#246#184#198#200'g*i'#129'9'#134'{'#213#188'&2'
+  +#176's0?|w'#135#22'J8'#255#252#254'['#158'_'#167#16#174#240#221#153#10#6'.A'
+  +#25'x83'#146#18#131#0#245#31'_~+N,'#0#0#0#0'IEND'#174'B`'#130
 ]);
-LazarusResources.Add('bookmark3','XPM',[
-  '/* XPM */'#10'static char * bookmark3_xpm[] = {'#10'"11 11 12 1",'#10'" '#9
-  +'c None",'#10'".'#9'c #000000",'#10'"+'#9'c #336041",'#10'"@'#9'c #A3B7AA",'
-  +#10'"#'#9'c #BBCABF",'#10'"$'#9'c #497155",'#10'"%'#9'c #E7ECE9",'#10'"&'#9
-  +'c #D1DBD4",'#10'"*'#9'c #5F826A",'#10'"='#9'c #8DA695",'#10'"-'#9'c #FFFFFF'
-  +'",'#10'";'#9'c #779580",'#10'"   .....   ",'#10'"  .+++++.  ",'#10'" .++@#@'
-  +'$+. ",'#10'".++@%#&%++.",'#10'".++**+=%++.",'#10'".++++#-*++.",'#10'".++++;'
-  +'#%++.",'#10'".++=@+=-++.",'#10'" .+;---#+. ",'#10'"  .+$;*+.  ",'#10'"   ..'
-  +'...   "};'#10
+LazarusResources.Add('bookmark3','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#11#0#0#0#11#8#6#0#0#0#169#172'w&'#0
+  +#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#0#0#0#0#0#249'C'#187''#0#0#0#9
+  +'pHYs'#0#0#11#19#0#0#11#19#1#0#154#156#24#0#0#0#7'tIME'#7#216#3#1#15#0#0#198
+  +#249'nj'#0#0#1'@IDAT'#24#211'cd'#128#2'i=o.'#14#1#165'4'#14'A%'#15'&Vn'#145
+  +''#191#191#190#249#241#254#222#142#31#31#238#205'zzi'#235'7'#6#6#6#6'F'#6#6
+  +#6#6'y'#211'Hy^'#25#171#131#172'R'#161#242#204#156#226'0'#253#12#223#159#237
+  +'e`'#252'~'#253#225#231''''#199#236#31#158'^'#254#144'EZ'#207#155#139'W'#198
+  +#234' '#151'f'#142#188#189#5#3'C'#151'/\-C'#217'fg'#134#29#235#4#228'y'#25#24
+  +#14'J'#255#252#164#197#194'!'#160#148#198'*'#25'"'#255#239#23'D'#161'i)B'#241
+  +#233'n'#6#134#253#135#140#25'>'#190':&'#207'!'#160#148#198#196'!'#168#228#193
+  +#204'%'#193#192#192#128#170#16#25#240'k'#229'2p'#8'*y'#176'0'#177'r'#139#160
+  +'K'#158#238#134'9'#3'!'#198#196#202'-'#194#242#239#247#215'7'#12#255#254'000'
+  +#177#192'%`6'#156#238'f`0='#196#192#240#229#222#10#6#230#191'_'#223'0'#253'x'
+  +'o'#199#183'g{QLD'#7#191#222']`'#248#241#254#222#14#150#31#31#238#205#226#20
+  +#190']'#240#243#181#128'|'#217'fs'#20#13'e'#155#25#24'>^'#157#200#192'%('#243
+  +#240#253#221#29#179'P'#194#249#231#247#223#242#252':'#133'p'#197#239#206'T0p'
+  +#9#202#192#195#153#145#148#24#4#0'bI'#132'W'''#179'n'#0#0#0#0'IEND'#174'B`'
+  +#130
 ]);
-LazarusResources.Add('bookmark4','XPM',[
-  '/* XPM */'#10'static char * bookmark4_xpm[] = {'#10'"11 11 12 1",'#10'" '#9
-  +'c None",'#10'".'#9'c #000000",'#10'"+'#9'c #336041",'#10'"@'#9'c #779580",'
-  +#10'"#'#9'c #BBCABF",'#10'"$'#9'c #5F826A",'#10'"%'#9'c #D1DBD4",'#10'"&'#9
-  +'c #FFFFFF",'#10'"*'#9'c #A3B7AA",'#10'"='#9'c #8DA695",'#10'"-'#9'c #497155'
-  +'",'#10'";'#9'c #E7ECE9",'#10'"   .....   ",'#10'"  .+++++.  ",'#10'" .+++@#'
-  +'$+. ",'#10'".++++%&@++.",'#10'".+++*=&@++.",'#10'".++-;+&@++.",'#10'".++##@'
-  +'&*-+.",'#10'".++#&&&&@+.",'#10'" .++++&@+. ",'#10'"  .+++@-.  ",'#10'"   ..'
-  +'...   "};'#10
+LazarusResources.Add('bookmark4','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#11#0#0#0#11#8#6#0#0#0#169#172'w&'#0
+  +#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#0#0#0#0#0#249'C'#187''#0#0#0#9
+  +'pHYs'#0#0#11#19#0#0#11#19#1#0#154#156#24#0#0#0#7'tIME'#7#216#3#1#14'0'#5'h'
+  +#23#198'!'#0#0#1'BIDAT'#24#211'cd'#128#2'i=o.'#14#1#165'4'#14'A%'#15'&Vn'#145
+  +''#191#191#190#249#241#254#222#142#31#31#238#205'zzi'#235'7'#6#6#6#6'F'#6#6
+  +#6#6'y'#211'Hy^'#25#171#131#172'R'#161#242#204#156#226'0'#253#12#223#159#237
+  +'e`'#252'~'#253#225#231''''#199#236#31#158'^'#254#144'YZ'#207#155#139'_'#193
+  +#241#12#151'f'#142'<3'#7#15#195#255#191#12#12#142'v'#12#12#171's'#24#24#230
+  +#159'Pb'#248#251#143'Y'#128#141#157'1'#144#149#141'i'#22#19#135#128'R'#26#171
+  +'d'#136#252#191'_'#12#12#255'~A'#20'v'#249#194#13'g`'#23'1f'#248#249#243#191
+  +'<'#135#128'R'#26#19#135#160#146#7'3'#151#4#3#3#3'B'#161'i)'#3#10#224#215#202
+  +'e'#224#16'T'#242'`bb'#229#22#129#9'bS'#8#3'L'#172#220'"L'#255'~}'#195#240
+  +#239#15'\'#240't7'#4#195#216#12#12#12#12'_'#238#173'`'#248#247#251#235#27#150
+  +#31#239#239#237#248#255'l'#175';'#151#140';'#138#169#167#187#17#182#252'zw'
+  +#129#129#241#223#183#29'L?>'#220#155#197#244#243#246#195#159#175'Ob'#181#254
+  +#227#213#137#12'\'#130'2'#15'|'#184'7'#11'%'#156'~'#255'-'#207#175'S'#8'W'
+  +#248#238'L'#5#3#151#160#12'<'#156#25'I'#137'A'#0#181#169#134#166'F'#179#178
+  +#224#0#0#0#0'IEND'#174'B`'#130
 ]);
-LazarusResources.Add('bookmark5','XPM',[
-  '/* XPM */'#10'static char * bookmark5_xpm[] = {'#10'"11 11 11 1",'#10'" '#9
-  +'c None",'#10'".'#9'c #000000",'#10'"+'#9'c #336041",'#10'"@'#9'c #BBCABF",'
-  +#10'"#'#9'c #8DA695",'#10'"$'#9'c #FFFFFF",'#10'"%'#9'c #779580",'#10'"&'#9
-  +'c #E7ECE9",'#10'"*'#9'c #A3B7AA",'#10'"='#9'c #497155",'#10'"-'#9'c #5F826A'
-  +'",'#10'"   .....   ",'#10'"  .+++++.  ",'#10'" .++@@@#+. ",'#10'".+++$@@#++'
-  +'.",'#10'".++%&@*=++.",'#10'".++%$@&*++.",'#10'".++--+#$++.",'#10'".++##+#$+'
-  +'+.",'#10'" .+%$$$*+. ",'#10'"  .+=%-+.  ",'#10'"   .....   "};'#10
+LazarusResources.Add('bookmark5','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#11#0#0#0#11#8#6#0#0#0#169#172'w&'#0
+  +#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#0#0#0#0#0#249'C'#187''#0#0#0#9
+  +'pHYs'#0#0#11#19#0#0#11#19#1#0#154#156#24#0#0#0#7'tIME'#7#216#3#1#14'8"'#5
+  +#196#249'B'#0#0#1'/IDAT'#24#211'cd'#128#2'i=o.'#14#1#165'4'#14'A%'#15'&Vn'
+  +#145''#191#191#190#249#241#254#222#142#31#31#238#205'zzi'#235'7'#6#6#6#6'F'
+  +#6#6#6#6'y'#211'Hy^'#25#171#131#172'R'#161#242#204#156#226'0'#253#12#223#159
+  +#237'e`'#252'~'#253#225#231''''#199#236#31#158'^'#254#144'EZ'#207#155#139'W'
+  +#198#234' '#151'f'#142#252#201'V'#6'4'#224#204#160#151'( '#207#203#192'pP'
+  +#250#231'''-'#22#14#1#165'4V'#201#16#249''#191' '#210#166#165#168#202#217'E'
+  +#140#25'>'#190':&'#207'!'#160#148#198#194'!'#168#228#193#204'%'#1#151'<'#221
+  +#141'PX'#182#153#129'a'#255'!'#6#6'~'#173'\'#134#239#183'''x'#176'0'#177'r'
+  +#139#192'$'#209'M='#221#205#192'`z'#8#194'fb'#229#22'a'#250#247#251#235#27
+  +#134''#24#240#129'/'#247'V0'#252#251#253#245#13#211#143#247#247'v|{'#182#23
+  +#195#9#200#224#215#187#11#12'?'#222#223#219#193#242#227#195#189'Y'#156#194
+  +#183#11'~'#190#22#144'/'#219'l'#142#225#230#143'W''2p'#9#202'<|w'#199','#148
+  +'p'#254#249#253#183'<'#191'N!\'#241#187'3'#21#12'\'#130'2'#240'pf$%'#6#1#174
+  +#216#130#181#158#215#186#149#0#0#0#0'IEND'#174'B`'#130
 ]);
-LazarusResources.Add('bookmark6','XPM',[
-  '/* XPM */'#10'static char * bookmark6_xpm[] = {'#10'"11 11 11 1",'#10'" '#9
-  +'c None",'#10'".'#9'c #000000",'#10'"+'#9'c #336041",'#10'"@'#9'c #5F826A",'
-  +#10'"#'#9'c #BBCABF",'#10'"$'#9'c #497155",'#10'"%'#9'c #FFFFFF",'#10'"&'#9
-  +'c #D1DBD4",'#10'"*'#9'c #A3B7AA",'#10'"='#9'c #779580",'#10'"-'#9'c #E7ECE9'
-  +'",'#10'"   .....   ",'#10'"  .+++++.  ",'#10'" .++@##@+. ",'#10'".++$%#&%$+'
-  +'.",'#10'".++*&@=+++.",'#10'".++#-%%-++.",'#10'".++#&+@%=+.",'#10'".++*&+$%='
-  +'+.",'#10'" .+$-%%#+. ",'#10'"  .++=@+.  ",'#10'"   .....   "};'#10
+LazarusResources.Add('bookmark6','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#11#0#0#0#11#8#6#0#0#0#169#172'w&'#0
+  +#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#0#0#0#0#0#249'C'#187''#0#0#0#9
+  +'pHYs'#0#0#11#19#0#0#11#19#1#0#154#156#24#0#0#0#7'tIME'#7#216#3#1#14'71'#6
+  +#226#164'S'#0#0#1'OIDAT'#24#211#149'Q=K'#195'`'#24#188'|a'#154#18#155'H'#196
+  +#143#6'^'#200'"'#22#233'"'#1#233'`'#17'Q'#10#165#155#14#130#147'C&'#29#28'Z'
+  +#252#13'ur'#245#15#232#228'R'#148',E'#218#193#165#14#218#197'-'#18#208#186
+  +#148'V'#180#31'IkS'#135#216#180#29#189#229#158#225#238'8'#238#161#240#135'h<'
+  +'-'#240#146'f'#240#178#150#162#185#176#226#245#219'u'#167'i'#153#206#167'u'
+  +#249'^'#189#237#0#0#5#0'D? '#162#154'(q'#203#251#132#9'-'#140#252#232#214#138
+  +#160#186'/'#246#247#219'C'#210#174'\'#217'l4'#158#22'D5Q'#18'V'#143'Ir'#3#200
+  +'g'#2'-r'#133'm'#152'7'#18#17#129'R'#212#253#138#209#188#164#25#220#210#30
+  +#241'z'#190'0W'#0#244#172#207#249#12'0'#163#172#195'u'#135#132#151'4'#131#230
+  +'e-'#197#8#139'A'#218'}y'#204'z'#214#191'#'#177#19#240#178#150'bi.'#172'`'#2
+  +#149#243#201#26'c3'#205#133#21#214#235#183#235#240'~'#0#154#5'0N'#27#25#245
+  +'2'#208#178#174#193#12#218'u'#218'iZf'#167'V'#12#4'['#155#211#12#0#189#198#19
+  +#156#166'e2Bd'#190'*'#204#206#29#14#6'C'#233#149'Q'#145#207#0#198'.'#176#179
+  +#226#215'x'#190#187'@H'#148#236#214'G'#229'hjg'#183#219''''#145#181#211' '
+  +#177#241'x'#6'AV'#131#157#169#255'|'#240#23#174#5#134#194#206#159#191'o'#0#0
+  +#0#0'IEND'#174'B`'#130
 ]);
-LazarusResources.Add('bookmark7','XPM',[
-  '/* XPM */'#10'static char * bookmark7_xpm[] = {'#10'"11 11 11 1",'#10'" '#9
-  +'c None",'#10'".'#9'c #000000",'#10'"+'#9'c #336041",'#10'"@'#9'c #8DA695",'
-  +#10'"#'#9'c #BBCABF",'#10'"$'#9'c #5F826A",'#10'"%'#9'c #D1DBD4",'#10'"&'#9
-  +'c #FFFFFF",'#10'"*'#9'c #E7ECE9",'#10'"='#9'c #A3B7AA",'#10'"-'#9'c #779580'
-  +'",'#10'"   .....   ",'#10'"  .+++++.  ",'#10'" .+@####$. ",'#10'".++@##%&$+'
-  +'.",'#10'".+++++*@++.",'#10'".++++=*+++.",'#10'".++++&@+++.",'#10'".+++-&+++'
-  +'+.",'#10'" .++#%+++. ",'#10'"  .+$$++.  ",'#10'"   .....   "};'#10
+LazarusResources.Add('bookmark7','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#11#0#0#0#11#8#6#0#0#0#169#172'w&'#0
+  +#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#0#0#0#0#0#249'C'#187''#0#0#0#9
+  +'pHYs'#0#0#11#19#0#0#11#19#1#0#154#156#24#0#0#0#7'tIME'#7#216#3#1#15#4#16#191
+  +'"'#187#10#0#0#1'+IDAT'#24#211'cd'#128#2'i=o.'#14#1#165'4'#14'A%'#15'&Vn'#145
+  +''#191#191#190#249#241#254#222#142#31#31#238#205'zzi'#235'7'#6#6#6#6'F'#6#6
+  +#6#6'y'#211'Hy^'#25#171#131#172'R'#161#242#204#156#226'0'#253#12#223#159#237
+  +'e`'#252'~'#253#225#231''''#199#236#31#158'^'#254#144'EZ'#207#155#139'W'#198
+  +#234' '#151'f'#142#188#189#5#3'C'#151'/\-C'#217'fg'#134#29#235#4#228'y'#25#24
+  +#14'J'#255#252#164#197#196'!'#160#148#198'*'#25'"'#255#239#23'L'#1#4#195#0
+  +#187#136'1'#195#207#159#255#229'9'#4#148#210'X8'#4#149'<'#152#185'$'#24#24#24
+  +#24#24#246#31'B(b@'#178#129'_+'#151#225#251#237#9#30'LL'#172#220'"'#12'h'#224
+  +'t7'#196'td'#205'L'#172#220'"L'#255'~}'#195#240#239#15#3'>'#240#229#222#10
+  +#134''#191#191#190'a'#250#241#254#222#142'o'#207#246#226'5'#245#215#187#11
+  +#12'?'#222#223#219#193#244#227#195#189'YL?o?'#252#249#250'$VS?^'#157#200#192
+  +'%('#243#240#199#135'{'#179'P'#194#249#231#247#223#242#252':'#133'p'#133#239
+  +#206'T0p'#9#202#192#195#153#145#148#24#4#0#174'D'#134'u'#29#196#24#197#0#0#0
+  +#0'IEND'#174'B`'#130
 ]);
-LazarusResources.Add('bookmark8','XPM',[
-  '/* XPM */'#10'static char * bookmark8_xpm[] = {'#10'"11 11 12 1",'#10'" '#9
-  +'c None",'#10'".'#9'c #000000",'#10'"+'#9'c #336041",'#10'"@'#9'c #8DA695",'
-  +#10'"#'#9'c #BBCABF",'#10'"$'#9'c #A3B7AA",'#10'"%'#9'c #497155",'#10'"&'#9
-  +'c #E7ECE9",'#10'"*'#9'c #D1DBD4",'#10'"='#9'c #FFFFFF",'#10'"-'#9'c #779580'
-  +'",'#10'";'#9'c #5F826A",'#10'"   .....   ",'#10'"  .+++++.  ",'#10'" .++@#$'
-  +'%+. ",'#10'".++$&#*&++.",'#10'".++#*+@=++.",'#10'".++%===$++.",'#10'".++$&-'
-  +'@=;+.",'#10'".++#*+%=-+.",'#10'" .+-===&+. ",'#10'"  .+%--+.  ",'#10'"   ..'
-  +'...   "};'#10
+LazarusResources.Add('bookmark8','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#11#0#0#0#11#8#6#0#0#0#169#172'w&'#0
+  +#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#0#0#0#0#0#249'C'#187''#0#0#0#9
+  +'pHYs'#0#0#11#19#0#0#11#19#1#0#154#156#24#0#0#0#7'tIME'#7#216#3#1#15#7#16#148
+  +#15#232#201#0#0#1'RIDAT'#24#211#149'Q'#189'K'#195'p'#20#188'|a'#154#18#155'H'
+  +#196#143#6'~'#144'E'#20#233'"'#5#233'`'#17'Q'#10'%'#155#14#130#147'C&'#29#28
+  +','#254#13#233#228#234'?'#160#147'KQ'#178#20'i'#7#151'8h'#23#183'H@'#235'RZ'
+  +#209'~$'#173'm'#29'bS;z'#203#189#225#222#189#227#30#133'_'#196#19'Y'#129#151
+  +'4'#131#151#181#12#205'E'#149'A'#175'U'#243#26#142#229'}8'#23'o'#149#155'6'#0
+  +'P'#0'@'#146#251'DTS%nq'#143'0'#145#185#209'>:'#213'"'#168#206#179#251#245'z'
+  +#159'v'#237'K'#151#141''''#178#130#168#166'J'#194#242#17'I'#175#3#166#30'j'
+  +#145'+l'#193#186#150#136#8#148#226#254#231#10#205'K'#154#193'-'#236#146'A7'
+  +#16#230#10'@'#242'4`S'#7#166#148'5'#248#254#144#240#146'f'#208#188#172'e'#24
+  +'a>t'#187'+O2'#0#196'V'#142#193#203'Z'#134#165#185#168'2>'#11#216#249#191'1'
+  +#198'3'#205'E'#21'v'#208'k'#213'0'#248#6'h'#22#166#30'D'#24#193#206#3#201'2'
+  +#208't'#174#192#244'[5'#218'k8V'#187'Z'#12#5#155#27#147#12#0#221#250'#'#188
+  +#134'c1Bl'#182'"L'#207#28#244#251'C'#233#133'Qa'#234#128#177#3'l/'#5'1'#158
+  +'n'#207#17#17'%'#183#249'n'#31'N'#244#236'wz$'#182'z'#18':'#214#31#206' '#200
+  +'j'#216'3'#245#159#15#254#0'h'#24#134#151#201#207#28#202#0#0#0#0'IEND'#174'B'
+  +'`'#130
 ]);
-LazarusResources.Add('bookmark9','XPM',[
-  '/* XPM */'#10'static char * bookmark9_xpm[] = {'#10'"11 11 12 1",'#10'" '#9
-  +'c None",'#10'".'#9'c #000000",'#10'"+'#9'c #336041",'#10'"@'#9'c #8DA695",'
-  +#10'"#'#9'c #BBCABF",'#10'"$'#9'c #A3B7AA",'#10'"%'#9'c #497155",'#10'"&'#9
-  +'c #FFFFFF",'#10'"*'#9'c #E7ECE9",'#10'"='#9'c #D1DBD4",'#10'"-'#9'c #779580'
-  +'",'#10'";'#9'c #5F826A",'#10'"   .....   ",'#10'"  .+++++.  ",'#10'" .++@#$'
-  +'%+. ",'#10'".++@&#*=++.",'#10'".++##+-&++.",'#10'".++$*-#&++.",'#10'".++%=&'
-  +'=&++.",'#10'".++;;+@*++.",'#10'" .+;&&&-+. ",'#10'"  .+%-%+.  ",'#10'"   ..'
-  +'...   "};'#10
+LazarusResources.Add('bookmark9','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#11#0#0#0#11#8#6#0#0#0#169#172'w&'#0
+  +#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#0#0#0#0#0#249'C'#187''#0#0#0#9
+  +'pHYs'#0#0#11#19#0#0#11#19#1#0#154#156#24#0#0#0#7'tIME'#7#216#3#1#15#6'6_'#25
+  +'\u'#0#0#1'SIDAT'#24#211#149'Q'#189'K'#195'p'#16'}'#249#194'4%6'#145#136#31
+  +#13#252' '#139'X'#164#139#20#164#131'ED)'#148'n:'#8'N'#14#153'tp'#176#248'7'
+  +#180#147#171#255#128'N.E'#201'RJ;'#184#196'A'#187#184'E'#2'Z'#151#210#138#246
+  +'#im'#234#16#155#214#209'['#222#29#247#238#221#227#142#194'oD'#227#25#129#151
+  +'4'#157#151#181'4'#205#133#21'o'#208'i8-'#203'p>'#172#203#183#218'm'#23#0'('
+  +#0' '#137#3'"'#170#201#10#183#188'O'#152#208#194'x'#30#189'z'#9'T'#239#217
+  +#254'z'#189'O'#217#230#149#205'F'#227#25'AT'#147#21'a'#245#152#164'6'#128'|6'
+  +#224'"W'#220#134'q#'#17#17#168'D'#221#207#24#205'K'#154#206'-'#237#17#175#239
+  +#19'sE q'#230'c>'#11#204'('#235'p'#221#17#225'%M'#167'yYK3'#194'b'#160'V'#174
+  +#254'E'#0#136#196'N'#192#203'Z'#154#165#185#176'2Y'#11#152#133'i'#27#147#156
+  +#230#194#10#235#13':'#13'x'#223#0#205#162'\'#5#18'S'#138'f'#193#175#219#214
+  +'5'#152'a'#167'A;-'#203#232#214'KAsk'#211''''#142#17#0#250#205'G8-'#203'`'
+  +#132#200'|M'#152#157';'#28#14'G'#210#11#163'"'#159#5#244']`g'#197#183#241'tw'
+  +#129#144'('#217#237'w'#243#232#207#157#221#222#128'D'#214'N'#3#197#230#195'9'
+  +#4'Y'#13#238'L'#253#231#131'?'#17'['#136#228'3b'#165#247#0#0#0#0'IEND'#174'B'
+  +'`'#130
 ]);
-LazarusResources.Add('InactiveBreakPoint','XPM',[
-  '/* XPM */'#10'static char * InactiveBreakPoint_xpm[] = {'#10'"11 11 3 1",'#10
-  +'" '#9'c None",'#10'".'#9'c #000000",'#10'"+'#9'c #0DA500",'#10'"   .....   '
-  +'",'#10'"  .+++++.  ",'#10'" .+++++++. ",'#10'".+++++++++.",'#10'".+++++++++'
-  +'.",'#10'".+++++++++.",'#10'".+++++++++.",'#10'".+++++++++.",'#10'" .+++++++'
-  +'. ",'#10'"  .+++++.  ",'#10'"   .....   "};'#10
+LazarusResources.Add('InactiveBreakPoint','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#11#0#0#0#11#8#6#0#0#0#169#172'w&'#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#19#0#0#11#19#1#0#154#156#24#0#0#0#7'tIME'#7#216#3#1#21
+  +'04)'#186#138#138#0#0#1'tIDAT'#24#211'm'#202'MKTQ'#28#128#241#231''#238#25
+  +#135'F'#189#142#217#220#22#189#12#26'-L'#137#2#161#178'M'#16#18'D'#181#169'm'
+  +#185#13#250'6}'#139'Z'#181#139'h'#23#210#128'P'#16#4'IDEa:2yg'#28#239#203#185
+  +#231#156'{'#218'F'#246#131'g'#247#200#247'A@'#1#3#213#11'_'#170'W|'#206#222
+  +#145#218'_$'#205#5'.L]e!'#186'G'#28#206'K'#13#200#207'A`'#163'x'#26'>'#230'/'
+  +'I'#237#14'>8'#234#224#137#164'A'#164'4'''#27#243#172'L>'#228'r'#243#174#232
+  +#237#176#17'6'#15'^'#240#163#248#4#8'J4'#130#16'B'#141#199#177'['#236#16#17
+  +#211#180#173'T'#247'F'#207#249'v'#248#149#204#25#180'4'#0#207#223#170#218#176
+  +'%'#239')'#156'm'#235#183#253'7'#12'M'#142#173'kD*'#254#21#128'm'#219'g/'#31
+  +#163'w'#15#6#228#190#194#7#143' '#255#153#3#165#148#168#204#162'cIH'#203'1'
+  +#198'['#148#28#157#235#16'h5&'#152#246'm'#212#245'd'#13#239'"'#198#133#161'4'
+  +#245#145'F'#185'!V'#29'V'#147#155#168#27#201'#'#206'M-'#227#28#164'yEVV'#20
+  +#198#145#149#21#251'YE'#240#176#24'_'#225'v'#247#241'Pw[Kr'#191#251'$'#204
+  +#232#14'['#233#7'R'#179'O'#233#10'&'''#166#153';v'#130#165#217#21'n'#157'Zg'
+  +#185'siV'#219#26#238#156'~ '#137#158#27#190#14#207'f6'#251'=~'#219'='#206'4'
+  +#231#185'v|'#149#181#179#235#163#197#228'b'#251#208')'#254#0'_!'#186#9'X'#232
+  +'J1'#0#0#0#0'IEND'#174'B`'#130
 ]);
-LazarusResources.Add('InvalidBreakPoint','XPM',[
-  '/* XPM */'#10'static char * InvalidBreakPoint_xpm[] = {'#10'"11 11 5 1",'#10
-  +'" '#9'c None",'#10'".'#9'c #000000",'#10'"+'#9'c #FF0000",'#10'"@'#9'c #FF0'
-  +'400",'#10'"#'#9'c #FFFF00",'#10'"   .....   ",'#10'"  .+++++.  ",'#10'" .++'
-  +'++++@. ",'#10'".++#+++#@+.",'#10'".+++###@++.",'#10'".++++#@@++.",'#10'".+@'
-  +'+###+++.",'#10'".++#+@@#++.",'#10'" .++@@+++. ",'#10'"  .+++++.  ",'#10'"  '
-  +' .....   "};'#10
+LazarusResources.Add('InvalidBreakPoint','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#11#0#0#0#11#8#6#0#0#0#169#172'w&'#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#19#0#0#11#19#1#0#154#156#24#0#0#0#7'tIME'#7#216#3#1#22
+  +#7'+6'#243#153#18#0#0#1#148'IDAT'#24#211'M'#143'Kk'#19'Q'#24'@'#207#189#147
+  +#201#195'>'#130'-'#209'1H'#13'*'#157#166#184#144'*i'#10#162#27#161#168#224'R'
+  +'p#'#210'?'#224#202#31'#'#21#233'F'#16'Z'#23'.'#196#252#3#163'N(b5'#166'*'
+  +#214#208'63Mb'#226#3#162#147#153#251#185#168'E'#207#242#172#206'Q'#252#165
+  +#255#174'.'#201#15#175#248#245'i'#19#211#239'b'#229#28#210#167'g'#249'9'#189
+  +'@'#238#212'q'#5#160#0':OVE'#189#173'b'#250']$'#142#193#24#176','#148#182#208
+  +#185'<'#195#210'"'#206#165#139'*'#241'u}]'#226#181'{D'#219'['#8#128#182'@)'
+  +#16#1#19#163#130#22#9#203#166#247#250#141'h'#253#188#194#176#185'E'#216'n'
+  +#227#172'T'#0#24#250'-'#0#156#149#10'a'#167'C'#180#185'Aw'#245'>j'#251#246'u'
+  +#137#252#221#131'tN<'#243#240#151#174#225'<x'#202#151'+'#231#247#165'V|S6'
+  +#234#227'bI'#162#182#207#255#184#181'&'#141'sS'#255#132'1|O'#143#162'e$'#139
+  +#177'R'#24';'#131#177'3'#184#181'&'#245#178#139'[kb'#236#12#177'N"'#169'Q$y'
+  +#8'=V'#190#128#137#12#191'w['#20#171#13#234'e'#151'p'#175'M'#189#236'R'#172
+  +'6'#8#253#0'='#158'e'#164#180#128'6'#151'o`'#159#156'FD'#240#142#166#25#236
+  +#248#196#177'0'#216'i'#225#29'I'#239''''#207#156'er'#233'.'#137#252'\Q}~'#244
+  +'X'#200#30'&|'#191'A'#212#235'a'#6#3#244'x'#150#212#196#4#246#153'9'#172#171
+  +'796[P'#234#224'!x'#225'I'#240'p'#153#31#222'K'#134'{'#1#201#169#2'c'#243#243
+  +'L'#222#186'C'#190'XP'#0''#0'AW'#166#29's'#226's'#164#0#0#0#0'IEND'#174'B`'
+  +#130
 ]);
-LazarusResources.Add('MultiBreakPoint','XPM',[
-  '/* XPM */'#10'static char * MultiBreakPoint_xpm[] = {'#10'"11 11 3 1",'#10'"'
-  +' '#9'c None",'#10'".'#9'c #000000",'#10'"+'#9'c #FF0000",'#10'"   ...     "'
-  +','#10'"  .+++.    ",'#10'" .+++...   ",'#10'".+++.+++.  ",'#10'".++.+++++. '
-  +'",'#10'".+.+++++++.",'#10'" ..+++++++.",'#10'"  .+++++++.",'#10'"   .+++++.'
-  +' ",'#10'"    .+++.  ",'#10'"     ...   "};'#10
+LazarusResources.Add('MultiBreakPoint','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#11#0#0#0#11#8#6#0#0#0#169#172'w&'#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#19#0#0#11#19#1#0#154#156#24#0#0#0#7'tIME'#7#216#3#1#22
+  +#6'5'#213#231#149'0'#0#0#1#148'IDAT'#24#211#133#208'AHS'#1#28#199#241#239#255
+  +#189#167'>'#7#233'do0'#156'6Q'#216'AB'#161#131#181#144#138#8#132' '#8#15#29
+  +#242#18#12#162#147#157#22#157#132'@'#5#189't'#18#15'u'#26'E^$X'#16#148'Y#'#8
+  +'&h'#18'yH'#15#217#201#167#175#173'Q{'#185'x'#155#254'='#140#14'I'#208#253#7
+  +#159#31'_'#1'x77'#247'h('#209#145#246#215#11#216#157''''#9'RW'#197#140#245'D'
+  +#154'Wr%?'#153'"'#218#215#5#128#188#156#153'y|'#206#170#140#249#27'kHK+'#212
+  +#3#204#176#131'\'#26#21#205'?'#195#136'vR'#27#26'!v'#225'<'#198#217'v'#25'+/'
+  +#191#160#182#235#177#19#238'&|'#237#6#210#222#134#237'n'#169'y'#243#30'Vz"b'
+  +#173#189#161#252#241#19#242#229'JJ'#15'~'#150#241'N_d '#225#240'/'#161#158
+  +#203#226';q,3'#158#160#178#185#201#169#254'^'#202#185#5'P'#161'88L'#255#240
+  +#25#252#245#2#182#187#165#193#248#148'Dc='#17'q'#243#239')e'#210#26#138'v'
+  +#240'?'#193#210#238#164#211'v;#ZX'#210#227#2#134'4*'#236#184'z'#168#150#202
+  +#238#236'}'#138'O'#179'D'#30'd'#255#18#196'j'#2#213#198'X'#149'_'#181#3#140
+  +#195#203#215'i'#234'M'#242'G0'#227#9#246']'#143#170'W'#164#234#149#168'~'#251
+  +#206#190#235'!'''#194#8#192#246#194'"'#193#171'E'#130#207#27'8'#211#243#148
+  +'2i'#253#253'u['#141#214#144'h'#16#208#28#178'Uo'#221#149#198')`oe'#149#189
+  +''''#15'q'#238'L:'#245'|'#174#248'c'#233#185'V>'#172'bw'#197'1GFY~'#253'V'
+  +#142#0#145#9#183#132''''#246#17'N'#0#0#0#0'IEND'#174'B`'#130
 ]);
-LazarusResources.Add('UnknownBreakPoint','XPM',[
-  '/* XPM */'#10'static char * UnknownBreakPoint_xpm[] = {'#10'"11 11 5 1",'#10
-  +'" '#9'c None",'#10'".'#9'c #000000",'#10'"+'#9'c #FF0000",'#10'"@'#9'c #FFF'
-  +'F00",'#10'"#'#9'c #FF8000",'#10'"   .....   ",'#10'"  .+++++.  ",'#10'" .++'
-  +'@@@#+. ",'#10'".++@+++@#+.",'#10'".++++++@#+.",'#10'".+++++@#++.",'#10'".++'
-  +'++@#+++.",'#10'".+++++++++.",'#10'" .+++@#++. ",'#10'"  .+++++.  ",'#10'"  '
-  +' .....   "};'#10
+LazarusResources.Add('UnknownBreakPoint','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#11#0#0#0#11#8#6#0#0#0#169#172'w&'#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#19#0#0#11#19#1#0#154#156#24#0#0#0#7'tIME'#7#216#3#1#22
+  +#11#20', '#251'#'#0#0#1#160'IDAT'#24#211'='#142#191'O'#19'a'#0#134#159#251
+  +#238#218'T*'#130' i'#163'='#172'H'#10'mb4h'#160'M'#140#14#24'i'#140#186#24'A'
+  +#23'S'#9#19#3'&&'#14#198#141#255#192#209#232#208#197'I'#23#7#147'['#156#171
+  +#136#178#128'D'#140#9'p'#165#237#181#244'G"&'#215'r'#247'}'#12#4#222#229#201
+  +#147'<'#195#171#1',Bl'#225#215#186#29#252#243#29#247#239#6#178'UG'#31#136#18
+  +#26'N'#177#151#200#240#242'b'#204'|'#7'Em'#17'b'#243#159'>'#216#218#218'Wd'
+  +#171#142#242'}'#144#18't'#29'M'#232#136#129#179#236#143'O'#241#252#230#13'Sk'
+  +#172#172'('#255#227#27#252#226'&'#10#136#230'-'#142'V'#201'e'#209#0#227'r'#26
+  +'}'#242#1#134'(X'#184#219#155'x'#245#26#230#231#31'8'#185#236'q'#28#205'['
+  +#216'w'#175#193#198'*'#173'F'#19'co'#169#128'W'#219#5'4'#156'\'#22#215#217#5
+  +' '#20'9'#3#128#244#193#221#222#226#191']'#194'p'#203#21#188'Z'#21#0#183'z'
+  +#200#222'K)"y'#139#223'W'#7#129'*HI;t'#18'C'#133'{'#144#141'&'#8#1'@'#223#232
+  +#5'"y'#139#245#244#8#4'@'#249'>"`'#160#130']'#136#238#244'u'#164'''i'#151#202
+  +#180'K'#229#227#191'G'#222#169'8'#136'S='#132#199'3'#8'yk'#154#192'P'#2#165
+  +#20'^'#187#195#206#151#2'?'#207#159'F*'#240#220#14#0'b'#244#10#253#179'/'#16
+  +#175#198#146'f'#240#225#28#225#219#247#8#13'''87'#153'al'#171#137#232#237#227
+  +'D2E'#215#253#25#244';'#143'y'#154#138#155#26#192'#'#136#189#254#182'l;'#239
+  +#223#242'oy'#137#253#170'Cp0N'#247#196#4#253'O'#158'1'#155#140#155#22#20#15#0
+  +'A'#8#163#169'A'#166#192#8#0#0#0#0'IEND'#174'B`'#130
 ]);
diff --git a/images/bookmark.sh b/images/bookmark.sh
new file mode 100755
index 0000000000..1ff54b3553
--- /dev/null
+++ b/images/bookmark.sh
@@ -0,0 +1 @@
+../tools/lazres bookmark.lrs @bookmark_list.txt
diff --git a/images/bookmark_list.txt b/images/bookmark_list.txt
new file mode 100644
index 0000000000..474301b410
--- /dev/null
+++ b/images/bookmark_list.txt
@@ -0,0 +1,15 @@
+sourceeditor/ActiveBreakPoint.png
+sourceeditor/bookmark0.png
+sourceeditor/bookmark1.png
+sourceeditor/bookmark2.png
+sourceeditor/bookmark3.png
+sourceeditor/bookmark4.png
+sourceeditor/bookmark5.png
+sourceeditor/bookmark6.png
+sourceeditor/bookmark7.png
+sourceeditor/bookmark8.png
+sourceeditor/bookmark9.png
+sourceeditor/InactiveBreakPoint.png
+sourceeditor/InvalidBreakPoint.png
+sourceeditor/MultiBreakPoint.png
+sourceeditor/UnknownBreakPoint.png
diff --git a/images/propertygrid/issue_nogui.png b/images/propertygrid/issue_nogui.png
index 6110ee5588..cd30fe3a11 100644
Binary files a/images/propertygrid/issue_nogui.png and b/images/propertygrid/issue_nogui.png differ