diff --git a/designer/bookmark.lrs b/designer/bookmark.lrs
index cdaf20825b..517547b06f 100644
--- a/designer/bookmark.lrs
+++ b/designer/bookmark.lrs
@@ -1,288 +1,114 @@
   LazarusResources.Add('bookmark0','XPM',
-    '/* XPM */'#10'static char * bookmark0_xpm[] = {'#10'"16 16 61 1",'#10'" '
-    +#9'c None",'#10'".'#9'c #23422D",'#10'"+'#9'c #336041",'#10'"@'#9'c #203D'
-    +'29",'#10'"#'#9'c #23412C",'#10'"$'#9'c #3C6749",'#10'"%'#9'c #5F826A",'
-    +#10'"&'#9'c #8CA594",'#10'"*'#9'c #6B8C75",'#10'"='#9'c #426C4F",'#10'"-'
-    +#9'c #376344",'#10'";'#9'c #8DA695",'#10'">'#9'c #CAD6CE",'#10'",'#9'c #B'
-    +'9C9BE",'#10'"'''#9'c #DDE4DF",'#10'")'#9'c #95AD9D",'#10'"!'#9'c #356143'
-    +'",'#10'"~'#9'c #7F9B88",'#10'"{'#9'c #BCCAC0",'#10'"]'#9'c #587D64",'#10
-    +'"^'#9'c #7E9A87",'#10'"/'#9'c #D9E1DB",'#10'"('#9'c #4E755A",'#10'"_'#9
-    +'c #487055",'#10'":'#9'c #C7D3CB",'#10'"<'#9'c #62856D",'#10'"['#9'c #4B7'
-    +'357",'#10'"}'#9'c #FCFCFC",'#10'"|'#9'c #7A9783",'#10'"1'#9'c #91A998",'
-    +#10'"2'#9'c #CBD6CE",'#10'"3'#9'c #386446",'#10'"4'#9'c #FFFFFF",'#10'"5'
-    +#9'c #7F9B87",'#10'"6'#9'c #3E684B",'#10'"7'#9'c #366244",'#10'"8'#9'c #6'
-    +'78871",'#10'"9'#9'c #F4F6F5",'#10'"0'#9'c #6D8D77",'#10'"a'#9'c #567B61"'
-    +','#10'"b'#9'c #EEF2EF",'#10'"c'#9'c #849F8D",'#10'"d'#9'c #A2B6A8",'#10
-    +'"e'#9'c #DEE5E0",'#10'"f'#9'c #3D684B",'#10'"g'#9'c #BAC9BE",'#10'"h'#9
-    +'c #C4D1C8",'#10'"i'#9'c #406A4D",'#10'"j'#9'c #CDD8D1",'#10'"k'#9'c #8EA'
-    +'796",'#10'"l'#9'c #75947F",'#10'"m'#9'c #D5DED8",'#10'"n'#9'c #63856D",'
-    +#10'"o'#9'c #779480",'#10'"p'#9'c #6E8E78",'#10'"q'#9'c #62846D",'#10'"r'
-    +#9'c #3E694C",'#10'"s'#9'c #85A08E",'#10'"t'#9'c #C3D0C7",'#10'"u'#9'c #A'
-    +'FC0B4",'#10'"v'#9'c #668870",'#10'"    .++++++.    ",'#10'"   @++++++++@'
-    +'   ",'#10'"  #++++$%&*=+#  ",'#10'" @++++-;>,'')!+@ ",'#10'".+++++~{]-^/'
-    +'(++.",'#10'"+++++_:<++[}|+++",'#10'"+++++123++[45+++",'#10'"++++62{7++89'
-    +'0+++",'#10'"++++abc+++de_+++",'#10'"++++abc++fghi+++",'#10'"++++=jk!!lmn'
-    +'++++",'#10'".++++oeppmq++++.",'#10'" @+++rstuv7+++@ ",'#10'"  #+++++++++'
-    +'+#  ",'#10'"   @++++++++@   ",'#10'"    .++++++.    "};'#10
+    '/* 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 #5F82'
+    +'6A",'#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('bookmark1','XPM',
-    '/* XPM */'#10'static char * bookmark1_xpm[] = {'#10'"16 16 43 1",'#10'" '
-    +#9'c None",'#10'".'#9'c #23422D",'#10'"+'#9'c #336041",'#10'"@'#9'c #203D'
-    +'29",'#10'"#'#9'c #23412C",'#10'"$'#9'c #487155",'#10'"%'#9'c #52785E",'
-    +#10'"&'#9'c #809C89",'#10'"*'#9'c #5B7F66",'#10'"='#9'c #3D684A",'#10'"-'
-    +#9'c #B2C3B7",'#10'";'#9'c #CFD9D2",'#10'">'#9'c #F2F4F2",'#10'",'#9'c #8'
-    +'9A390",'#10'"'''#9'c #396446",'#10'")'#9'c #708F79",'#10'"!'#9'c #DAE2DD'
-    +'",'#10'"~'#9'c #5C8067",'#10'"{'#9'c #668870",'#10'"]'#9'c #E3E9E5",'#10
-    +'"^'#9'c #53795F",'#10'"/'#9'c #376344",'#10'"('#9'c #7B9884",'#10'"_'#9
-    +'c #C3D0C7",'#10'":'#9'c #406A4D",'#10'"<'#9'c #487054",'#10'"['#9'c #D0D'
-    +'AD3",'#10'"}'#9'c #ADBFB3",'#10'"|'#9'c #497156",'#10'"1'#9'c #D2DBD5",'
-    +#10'"2'#9'c #86A18F",'#10'"3'#9'c #6B8B75",'#10'"4'#9'c #F0F3F1",'#10'"5'
-    +#9'c #74927D",'#10'"6'#9'c #F4F6F4",'#10'"7'#9'c #567B62",'#10'"8'#9'c #8'
-    +'19D8A",'#10'"9'#9'c #CBD6CE",'#10'"0'#9'c #6C8C76",'#10'"a'#9'c #8AA391"'
-    +','#10'"b'#9'c #B8C8BD",'#10'"c'#9'c #C2CFC6",'#10'"d'#9'c #7E9A86",'#10
-    +'"    .++++++.    ",'#10'"   @++++++++@   ",'#10'"  #++++$%&*++#  ",'#10
-    +'" @++++=-;>,+++@ ",'#10'".+++++''%)!~++++.",'#10'"++++++++{]^+++++",'#10
-    +'"+++++++/(_:+++++",'#10'"+++++++<[}++++++",'#10'"+++++++|12++++++",'#10
-    +'"+++++++34*++++++",'#10'"+++++++567++++++",'#10'".++++++89++++++.",'#10
-    +'" @+++0abcd:+++@ ",'#10'"  #++++++++++#  ",'#10'"   @++++++++@   ",'#10
-    +'"    .++++++.    "};'#10
+    '/* 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 #5F82'
+    +'6A",'#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('bookmark2','XPM',
-    '/* XPM */'#10'static char * bookmark2_xpm[] = {'#10'"16 16 61 1",'#10'" '
-    +#9'c None",'#10'".'#9'c #23422D",'#10'"+'#9'c #336041",'#10'"@'#9'c #203D'
-    +'29",'#10'"#'#9'c #23412C",'#10'"$'#9'c #3E684B",'#10'"%'#9'c #567B62",'
-    +#10'"&'#9'c #7F9B88",'#10'"*'#9'c #8CA594",'#10'"='#9'c #5B7F66",'#10'"-'
-    +#9'c #3C6749",'#10'";'#9'c #98AE9F",'#10'">'#9'c #9CB1A2",'#10'",'#9'c #A'
-    +'CBFB2",'#10'"'''#9'c #C0CEC5",'#10'")'#9'c #D2DBD5",'#10'"!'#9'c #53795F'
-    +'",'#10'"~'#9'c #346042",'#10'"{'#9'c #8BA593",'#10'"]'#9'c #E7ECE9",'#10
-    +'"^'#9'c #3A6547",'#10'"/'#9'c #3B6648",'#10'"('#9'c #D1DBD4",'#10'"_'#9
-    +'c #B2C3B7",'#10'":'#9'c #5F826A",'#10'"<'#9'c #62846C",'#10'"['#9'c #346'
-    +'142",'#10'"}'#9'c #406A4D",'#10'"|'#9'c #D3DDD6",'#10'"1'#9'c #ADBFB2",'
-    +#10'"2'#9'c #76947F",'#10'"3'#9'c #E6EBE7",'#10'"4'#9'c #6B8B75",'#10'"5'
-    +#9'c #356143",'#10'"6'#9'c #5B7F67",'#10'"7'#9'c #CFD9D2",'#10'"8'#9'c #7'
-    +'89681",'#10'"9'#9'c #6D8D77",'#10'"0'#9'c #D0DAD3",'#10'"a'#9'c #6C8C76"'
-    +','#10'"b'#9'c #366244",'#10'"c'#9'c #3D684B",'#10'"d'#9'c #6A8B75",'#10
-    +'"e'#9'c #A7BAAD",'#10'"f'#9'c #466F53",'#10'"g'#9'c #64866E",'#10'"h'#9
-    +'c #A4B8AA",'#10'"i'#9'c #8DA695",'#10'"j'#9'c #4B7257",'#10'"k'#9'c #3F6'
-    +'94C",'#10'"l'#9'c #A9BCAF",'#10'"m'#9'c #476F53",'#10'"n'#9'c #4B7358",'
-    +#10'"o'#9'c #E8EDE9",'#10'"p'#9'c #EEF1EF",'#10'"q'#9'c #B8C7BC",'#10'"r'
-    +#9'c #CBD6CE",'#10'"s'#9'c #E0E7E2",'#10'"t'#9'c #4D7459",'#10'"u'#9'c #D'
-    +'6DFD9",'#10'"v'#9'c #C2CFC6",'#10'"    .++++++.    ",'#10'"   @++++++++@'
-    +'   ",'#10'"  #+++$%&*=++#  ",'#10'" @+++-;>,'')!~+@ ",'#10'".++++{]^+/(_'
-    +'-++.",'#10'"+++++:<[+}|1/+++",'#10'"+++++++++234++++",'#10'"+++++++5678['
-    +'++++",'#10'"+++++++90ab+++++",'#10'"+++++cde4+f-++++",'#10'"+++5ghij/klm'
-    +'++++",'#10'".++nopqqqrs++++.",'#10'" @+tuuuuuuv+++@ ",'#10'"  #+++++++++'
-    +'+#  ",'#10'"   @++++++++@   ",'#10'"    .++++++.    "};'#10
+    '/* 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 #8DA6'
+    +'95",'#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('bookmark3','XPM',
-    '/* XPM */'#10'static char * bookmark3_xpm[] = {'#10'"16 16 62 1",'#10'" '
-    +#9'c None",'#10'".'#9'c #23422D",'#10'"+'#9'c #336041",'#10'"@'#9'c #203D'
-    +'29",'#10'"#'#9'c #23412C",'#10'"$'#9'c #3E684B",'#10'"%'#9'c #567B62",'
-    +#10'"&'#9'c #7F9B88",'#10'"*'#9'c #8CA594",'#10'"='#9'c #5E8168",'#10'"-'
-    +#9'c #3D674A",'#10'";'#9'c #3C6749",'#10'">'#9'c #98AE9F",'#10'",'#9'c #B'
-    +'2C3B7",'#10'"'''#9'c #ADBFB2",'#10'")'#9'c #D3DCD6",'#10'"!'#9'c #DEE5E0'
-    +'",'#10'"~'#9'c #779580",'#10'"{'#9'c #346042",'#10'"]'#9'c #5E8269",'#10
-    +'"^'#9'c #F6F8F6",'#10'"/'#9'c #487055",'#10'"('#9'c #466F52",'#10'"_'#9
-    +'c #D4DDD7",'#10'":'#9'c #436C50",'#10'"<'#9'c #356243",'#10'"['#9'c #406'
-    +'A4D",'#10'"}'#9'c #D3DDD6",'#10'"|'#9'c #3B6648",'#10'"1'#9'c #A2B6A8",'
-    +#10'"2'#9'c #CCD7CF",'#10'"3'#9'c #4F765B",'#10'"4'#9'c #B0C1B5",'#10'"5'
-    +#9'c #B4C5B9",'#10'"6'#9'c #A5B9AB",'#10'"7'#9'c #60836B",'#10'"8'#9'c #5'
-    +'C8067",'#10'"9'#9'c #62846C",'#10'"0'#9'c #D6DFD9",'#10'"a'#9'c #D1DBD4"'
-    +','#10'"b'#9'c #53795F",'#10'"c'#9'c #7F9B87",'#10'"d'#9'c #E9EEEA",'#10
-    +'"e'#9'c #708F79",'#10'"f'#9'c #446D51",'#10'"g'#9'c #5B7F66",'#10'"h'#9
-    +'c #3B6749",'#10'"i'#9'c #A9BCAF",'#10'"j'#9'c #D5DED8",'#10'"k'#9'c #4E7'
-    +'55A",'#10'"l'#9'c #B5C5BB",'#10'"m'#9'c #5E8169",'#10'"n'#9'c #A4B8AA",'
-    +#10'"o'#9'c #C3D0C7",'#10'"p'#9'c #4B7358",'#10'"q'#9'c #366244",'#10'"r'
-    +#9'c #B1C2B6",'#10'"s'#9'c #C0CEC4",'#10'"t'#9'c #B9C8BE",'#10'"u'#9'c #8'
-    +'AA492",'#10'"v'#9'c #426C4F",'#10'"w'#9'c #346142",'#10'"    .++++++.   '
-    +' ",'#10'"   @++++++++@   ",'#10'"  #+++$%&*=-+#  ",'#10'" @+++;>,'')!~{+'
-    +'@ ",'#10'".++++]^/+(_,;++.",'#10'"+++++:~<+[}''|+++",'#10'"++++++++<123+'
-    +'+++",'#10'"+++++++4567+++++",'#10'"+++++++890ab++++",'#10'"+++++++++cde+'
-    +'+++",'#10'"+++f1g++hij$++++",'#10'".++kdlbmnop++++.",'#10'" @+qgrstuvw++'
-    +'+@ ",'#10'"  #++++++++++#  ",'#10'"   @++++++++@   ",'#10'"    .++++++. '
-    +'   "};'#10
+    '/* 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 #A3B7'
+    +'AA",'#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('bookmark4','XPM',
-    '/* XPM */'#10'static char * bookmark4_xpm[] = {'#10'"16 16 56 1",'#10'" '
-    +#9'c None",'#10'".'#9'c #23422D",'#10'"+'#9'c #336041",'#10'"@'#9'c #203D'
-    +'29",'#10'"#'#9'c #23412C",'#10'"$'#9'c #62846D",'#10'"%'#9'c #6E8E78",'
-    +#10'"&'#9'c #51775D",'#10'"*'#9'c #DAE2DC",'#10'"='#9'c #B1C2B6",'#10'"-'
-    +#9'c #547A60",'#10'";'#9'c #AABCB0",'#10'">'#9'c #F0F3F1",'#10'",'#9'c #7'
-    +'1907B",'#10'"'''#9'c #61836C",'#10'")'#9'c #86A18F",'#10'"!'#9'c #FBFCFB'
-    +'",'#10'"~'#9'c #63866E",'#10'"{'#9'c #52785D",'#10'"]'#9'c #5B7F66",'#10
-    +'"^'#9'c #668870",'#10'"/'#9'c #CED8D1",'#10'"('#9'c #466F53",'#10'"_'#9
-    +'c #356143",'#10'":'#9'c #54795F",'#10'"<'#9'c #9FB4A6",'#10'"['#9'c #547'
-    +'960",'#10'"}'#9'c #829D8A",'#10'"|'#9'c #ADBFB3",'#10'"1'#9'c #5F826A",'
-    +#10'"2'#9'c #B7C7BD",'#10'"3'#9'c #597E65",'#10'"4'#9'c #386446",'#10'"5'
-    +#9'c #BDCBC1",'#10'"6'#9'c #8BA493",'#10'"7'#9'c #376345",'#10'"8'#9'c #A'
-    +'EC0B4",'#10'"9'#9'c #D5DED7",'#10'"0'#9'c #BCCBC0",'#10'"a'#9'c #BBCABF"'
-    +','#10'"b'#9'c #C0CEC4",'#10'"c'#9'c #EDF0EE",'#10'"d'#9'c #C8D4CB",'#10
-    +'"e'#9'c #AFC1B4",'#10'"f'#9'c #497156",'#10'"g'#9'c #4D7459",'#10'"h'#9
-    +'c #53795F",'#10'"i'#9'c #789581",'#10'"j'#9'c #E2E8E4",'#10'"k'#9'c #709'
-    +'07A",'#10'"l'#9'c #50775C",'#10'"m'#9'c #5E8169",'#10'"n'#9'c #B5C5B9",'
-    +#10'"o'#9'c #7F9B87",'#10'"p'#9'c #B8C8BD",'#10'"q'#9'c #52785E",'#10'"  '
-    +'  .++++++.    ",'#10'"   @++++++++@   ",'#10'"  #++++++$%++#  ",'#10'" @'
-    +'++++++&*=+++@ ",'#10'".++++++-;>,++++.",'#10'"++++++'';)!~+++++",'#10'"+'
-    +'++++{;]^/(+++++",'#10'"+++_:<[+}|++++++",'#10'"+++12344567+++++",'#10'"+'
-    +'++890abcdef++++",'#10'"+++ghhhijkl4++++",'#10'".++++++mn++++++.",'#10'" '
-    +'@+++++op+++++@ ",'#10'"  #++++q1++++#  ",'#10'"   @++++++++@   ",'#10'" '
-    +'   .++++++.    "};'#10
+    '/* 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 #7795'
+    +'80",'#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('bookmark5','XPM',
-    '/* XPM */'#10'static char * bookmark5_xpm[] = {'#10'"16 16 56 1",'#10'" '
-    +#9'c None",'#10'".'#9'c #23422D",'#10'"+'#9'c #336041",'#10'"@'#9'c #203D'
-    +'29",'#10'"#'#9'c #23412C",'#10'"$'#9'c #406A4D",'#10'"%'#9'c #AABDB0",'
-    +#10'"&'#9'c #D6DFD9",'#10'"*'#9'c #D5DED8",'#10'"='#9'c #9EB3A4",'#10'"-'
-    +#9'c #3B6648",'#10'";'#9'c #436C50",'#10'">'#9'c #C8D4CC",'#10'",'#9'c #B'
-    +'BCABF",'#10'"'''#9'c #B8C7BC",'#10'")'#9'c #B5C5BA",'#10'"!'#9'c #75937F'
-    +'",'#10'"~'#9'c #366244",'#10'"{'#9'c #60836A",'#10'"]'#9'c #B0C1B5",'#10
-    +'"^'#9'c #3E684B",'#10'"/'#9'c #3A6648",'#10'"('#9'c #356243",'#10'"_'#9
-    +'c #63866E",'#10'":'#9'c #ADBFB2",'#10'"<'#9'c #70907A",'#10'"['#9'c #C2C'
-    +'FC6",'#10'"}'#9'c #A0B5A6",'#10'"|'#9'c #9EB4A5",'#10'"1'#9'c #6C8C76",'
-    +#10'"2'#9'c #53795F",'#10'"3'#9'c #73927D",'#10'"4'#9'c #E3E9E5",'#10'"5'
-    +#9'c #789681",'#10'"6'#9'c #BDCBC1",'#10'"7'#9'c #E6EBE8",'#10'"8'#9'c #3'
-    +'86445",'#10'"9'#9'c #366243",'#10'"0'#9'c #B3C4B8",'#10'"a'#9'c #466F53"'
-    +','#10'"b'#9'c #C4D1C8",'#10'"c'#9'c #6A8B74",'#10'"d'#9'c #446D50",'#10
-    +'"e'#9'c #BECCC2",'#10'"f'#9'c #51775D",'#10'"g'#9'c #497155",'#10'"h'#9
-    +'c #DAE2DC",'#10'"i'#9'c #ADBFB3",'#10'"j'#9'c #87A18F",'#10'"k'#9'c #ACB'
-    +'EB2",'#10'"l'#9'c #B9C8BD",'#10'"m'#9'c #426C4F",'#10'"n'#9'c #346142",'
-    +#10'"o'#9'c #5B7F66",'#10'"p'#9'c #8AA492",'#10'"q'#9'c #8CA594",'#10'"  '
-    +'  .++++++.    ",'#10'"   @++++++++@   ",'#10'"  #++++++++++#  ",'#10'" @'
-    +'+++$%&&&*=-+@ ",'#10'".++++;>,'''')!~++.",'#10'"+++++{]^--/(++++",'#10'"'
-    +'+++++_:(++++++++",'#10'"+++++<[}|1~+++++",'#10'"+++++213=45+++++",'#10'"'
-    +'++++++++~67+++++",'#10'"++++^8++90,+++++",'#10'".++abc+d3ef++++.",'#10'"'
-    +' @+ghijklmn+++@ ",'#10'"  #nopq1m++++#  ",'#10'"   @++++++++@   ",'#10'"'
-    +'    .++++++.    "};'#10
+    '/* 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 #BBCA'
+    +'BF",'#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('bookmark6','XPM',
-    '/* XPM */'#10'static char * bookmark6_xpm[] = {'#10'"16 16 68 1",'#10'" '
-    +#9'c None",'#10'".'#9'c #23422D",'#10'"+'#9'c #336041",'#10'"@'#9'c #203D'
-    +'29",'#10'"#'#9'c #23412C",'#10'"$'#9'c #346142",'#10'"%'#9'c #62856D",'
-    +#10'"&'#9'c #5A7E65",'#10'"*'#9'c #466E52",'#10'"='#9'c #8DA695",'#10'"-'
-    +#9'c #B2C3B7",'#10'";'#9'c #9FB4A5",'#10'">'#9'c #7E9B87",'#10'",'#9'c #3'
-    +'E684B",'#10'"'''#9'c #97AD9E",'#10'")'#9'c #A9BCAF",'#10'"!'#9'c #6A8B74'
-    +'",'#10'"~'#9'c #ABBDB1",'#10'"{'#9'c #819D8A",'#10'"]'#9'c #396547",'#10
-    +'"^'#9'c #708F79",'#10'"/'#9'c #B4C4B9",'#10'"('#9'c #5D8168",'#10'"_'#9
-    +'c #AABCAF",'#10'":'#9'c #4B7357",'#10'"<'#9'c #477054",'#10'"['#9'c #DAE'
-    +'2DC",'#10'"}'#9'c #CDD8D0",'#10'"|'#9'c #9AB0A0",'#10'"1'#9'c #91AA99",'
-    +#10'"2'#9'c #C9D4CC",'#10'"3'#9'c #D5DED8",'#10'"4'#9'c #5F826A",'#10'"5'
-    +#9'c #6D8D77",'#10'"6'#9'c #F4F6F5",'#10'"7'#9'c #71907A",'#10'"8'#9'c #3'
-    +'B6649",'#10'"9'#9'c #50765C",'#10'"0'#9'c #E3E9E4",'#10'"a'#9'c #B1C2B6"'
-    +','#10'"b'#9'c #7F9B87",'#10'"c'#9'c #FFFFFF",'#10'"d'#9'c #386446",'#10
-    +'"e'#9'c #D6DFD8",'#10'"f'#9'c #BBCABF",'#10'"g'#9'c #7A9783",'#10'"h'#9
-    +'c #FCFCFC",'#10'"i'#9'c #52785E",'#10'"j'#9'c #476F53",'#10'"k'#9'c #E3E'
-    +'9E5",'#10'"l'#9'c #789681",'#10'"m'#9'c #4E755A",'#10'"n'#9'c #D3DCD6",'
-    +#10'"o'#9'c #9BB1A1",'#10'"p'#9'c #376344",'#10'"q'#9'c #96AD9D",'#10'"r'
-    +#9'c #CAD6CE",'#10'"s'#9'c #4C7358",'#10'"t'#9'c #356143",'#10'"u'#9'c #6'
-    +'68871",'#10'"v'#9'c #CBD6CF",'#10'"w'#9'c #93AB9B",'#10'"x'#9'c #ABBDB0"'
-    +','#10'"y'#9'c #53785E",'#10'"z'#9'c #688972",'#10'"A'#9'c #8CA594",'#10
-    +'"B'#9'c #7F9B88",'#10'"C'#9'c #426C4F",'#10'"    .++++++.    ",'#10'"   '
-    +'@++++++++@   ",'#10'"  #+++++$%&++#  ",'#10'" @++++*=-;>+++@ ",'#10'".++'
-    +'++,'')!++++++.",'#10'"++++,~{]++++++++",'#10'"++++^/(__:++++++",'#10'"++'
-    +'+<[}|1234+++++",'#10'"+++5678+90a+++++",'#10'"+++bc:++def+++++",'#10'"++'
-    +'+ghi++jkl+++++",'#10'".++mnop]qrs++++.",'#10'" @+tuvwqxy++++@ ",'#10'"  '
-    +'#++zABC++++#  ",'#10'"   @++++++++@   ",'#10'"    .++++++.    "};'#10
+    '/* 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 #5F82'
+    +'6A",'#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('bookmark7','XPM',
-    '/* XPM */'#10'static char * bookmark7_xpm[] = {'#10'"16 16 50 1",'#10'" '
-    +#9'c None",'#10'".'#9'c #23422D",'#10'"+'#9'c #336041",'#10'"@'#9'c #203D'
-    +'29",'#10'"#'#9'c #23412C",'#10'"$'#9'c #C2CFC6",'#10'"%'#9'c #D6DFD9",'
-    +#10'"&'#9'c #D4DDD7",'#10'"*'#9'c #6C8D76",'#10'"='#9'c #4B7257",'#10'"-'
-    +#9'c #CBD7CF",'#10'";'#9'c #B8C7BC",'#10'">'#9'c #CFD9D2",'#10'",'#9'c #D'
-    +'1DBD4",'#10'"'''#9'c #52785D",'#10'")'#9'c #6B8B75",'#10'"!'#9'c #8CA594'
-    +'",'#10'"~'#9'c #3B6648",'#10'"{'#9'c #3C6749",'#10'"]'#9'c #6D8D77",'#10
-    +'"^'#9'c #C8D4CC",'#10'"/'#9'c #5B7F66",'#10'"('#9'c #406A4D",'#10'"_'#9
-    +'c #376345",'#10'":'#9'c #CBD6CE",'#10'"<'#9'c #8DA695",'#10'"['#9'c #9AB'
-    +'0A1",'#10'"}'#9'c #9DB2A4",'#10'"|'#9'c #346142",'#10'"1'#9'c #346041",'
-    +#10'"2'#9'c #6C8C76",'#10'"3'#9'c #AFC0B4",'#10'"4'#9'c #487055",'#10'"5'
-    +#9'c #53785E",'#10'"6'#9'c #DBE3DE",'#10'"7'#9'c #688972",'#10'"8'#9'c #4'
-    +'26B4F",'#10'"9'#9'c #9FB4A6",'#10'"0'#9'c #85A08E",'#10'"a'#9'c #3B6649"'
-    +','#10'"b'#9'c #A1B5A7",'#10'"c'#9'c #356243",'#10'"d'#9'c #5D8068",'#10
-    +'"e'#9'c #AEBFB3",'#10'"f'#9'c #487054",'#10'"g'#9'c #557A60",'#10'"h'#9
-    +'c #BBCABF",'#10'"i'#9'c #6B8C75",'#10'"j'#9'c #24402D",'#10'"k'#9'c #3D6'
-    +'84B",'#10'"    .++++++.    ",'#10'"   @++++++++@   ",'#10'"  #++++++++++'
-    +'#  ",'#10'" @+++$%%%%%&*+@ ",'#10'".+++=-;;;;>,''++.",'#10'"++++)!~~{]^/'
-    +'++++",'#10'"++++{(++_:<_++++",'#10'"+++++++{[}|+++++",'#10'"++++++1234++'
-    +'++++",'#10'"++++++567+++++++",'#10'"+++++890a+++++++",'#10'".++++!bc++++'
-    +'+++.",'#10'" @+cdef+++++++@ ",'#10'"  #ghi+++++++#  ",'#10'"   jk|++++++'
-    +'@   ",'#10'"    .++++++.    "};'#10
+    '/* 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 #8DA6'
+    +'95",'#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('bookmark8','XPM',
-    '/* XPM */'#10'static char * bookmark8_xpm[] = {'#10'"16 16 71 1",'#10'" '
-    +#9'c None",'#10'".'#9'c #23422D",'#10'"+'#9'c #336041",'#10'"@'#9'c #203D'
-    +'29",'#10'"#'#9'c #23412C",'#10'"$'#9'c #446D51",'#10'"%'#9'c #708F7A",'
-    +#10'"&'#9'c #8BA493",'#10'"*'#9'c #5C8067",'#10'"='#9'c #3A6547",'#10'"-'
-    +#9'c #456E51",'#10'";'#9'c #AFC0B4",'#10'">'#9'c #BFCDC3",'#10'",'#9'c #B'
-    +'3C4B8",'#10'"'''#9'c #D0DAD3",'#10'")'#9'c #829D8B",'#10'"!'#9'c #366244'
-    +'",'#10'"~'#9'c #93AB9B",'#10'"{'#9'c #ADBFB3",'#10'"]'#9'c #436C50",'#10
-    +'"^'#9'c #91A998",'#10'"/'#9'c #E5EBE7",'#10'"('#9'c #50765C",'#10'"_'#9
-    +'c #DFE6E1",'#10'":'#9'c #849F8D",'#10'"<'#9'c #346142",'#10'"['#9'c #98A'
-    +'E9F",'#10'"}'#9'c #E2E8E4",'#10'"|'#9'c #4D7459",'#10'"1'#9'c #D4DED7",'
-    +#10'"2'#9'c #BDCBC1",'#10'"3'#9'c #557A60",'#10'"4'#9'c #456E52",'#10'"5'
-    +#9'c #CDD8D0",'#10'"6'#9'c #7C9985",'#10'"7'#9'c #7F9B87",'#10'"8'#9'c #D'
-    +'DE4DF",'#10'"9'#9'c #C2CFC7",'#10'"0'#9'c #829E8B",'#10'"a'#9'c #396547"'
-    +','#10'"b'#9'c #3D674A",'#10'"c'#9'c #98AF9F",'#10'"d'#9'c #ABBDB1",'#10
-    +'"e'#9'c #6A8B74",'#10'"f'#9'c #AEC0B4",'#10'"g'#9'c #ECF0ED",'#10'"h'#9
-    +'c #819D8A",'#10'"i'#9'c #5E8169",'#10'"j'#9'c #EBEFEC",'#10'"k'#9'c #416'
-    +'B4E",'#10'"l'#9'c #DEE5E0",'#10'"m'#9'c #BBCABF",'#10'"n'#9'c #789681",'
-    +#10'"o'#9'c #FBFBFB",'#10'"p'#9'c #587D63",'#10'"q'#9'c #346041",'#10'"r'
-    +#9'c #557B61",'#10'"s'#9'c #DEE5E1",'#10'"t'#9'c #CDD8D1",'#10'"u'#9'c #C'
-    +'CD7D0",'#10'"v'#9'c #60836B",'#10'"w'#9'c #688972",'#10'"x'#9'c #B3C3B8"'
-    +','#10'"y'#9'c #70907A",'#10'"z'#9'c #356143",'#10'"A'#9'c #577C63",'#10
-    +'"B'#9'c #A0B4A7",'#10'"C'#9'c #C3D0C7",'#10'"D'#9'c #B2C3B7",'#10'"E'#9
-    +'c #769480",'#10'"F'#9'c #376344",'#10'"    .++++++.    ",'#10'"   @+++++'
-    +'+++@   ",'#10'"  #+++$%&*=++#  ",'#10'" @+++-;>,'')!++@ ",'#10'".++++~{]'
-    +'+^/(+++.",'#10'"+++++_:+<[}|++++",'#10'"+++++123456+++++",'#10'"++++=758'
-    +'90a+++++",'#10'"+++bcd3efgh+++++",'#10'"+++ij*++klm+++++",'#10'"+++nopq<'
-    +'rs:+++++",'#10'".++-tuvwxy+++++.",'#10'" @+zABCDEF++++@ ",'#10'"  #+++++'
-    +'+++++#  ",'#10'"   @++++++++@   ",'#10'"    .++++++.    "};'#10
+    '/* 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 #8DA6'
+    +'95",'#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('bookmark9','XPM',
-    '/* XPM */'#10'static char * bookmark9_xpm[] = {'#10'"16 16 68 1",'#10'" '
-    +#9'c None",'#10'".'#9'c #23422D",'#10'"+'#9'c #336041",'#10'"@'#9'c #203D'
-    +'29",'#10'"#'#9'c #23412C",'#10'"$'#9'c #6F8E79",'#10'"%'#9'c #8CA594",'
-    +#10'"&'#9'c #7C9985",'#10'"*'#9'c #3E694C",'#10'"='#9'c #3C6749",'#10'"-'
-    +#9'c #708F79",'#10'";'#9'c #BBCAC0",'#10'">'#9'c #B3C4B8",'#10'",'#9'c #D'
-    +'1DBD4",'#10'"'''#9'c #90A897",'#10'")'#9'c #3A6547",'#10'"!'#9'c #6D8D77'
-    +'",'#10'"~'#9'c #CBD7CF",'#10'"{'#9'c #456E52",'#10'"]'#9'c #577C62",'#10
-    +'"^'#9'c #D9E1DC",'#10'"/'#9'c #91A999",'#10'"('#9'c #386446",'#10'"_'#9
-    +'c #436D50",'#10'":'#9'c #B7C7BB",'#10'"<'#9'c #7F9B88",'#10'"['#9'c #CED'
-    +'8D1",'#10'"}'#9'c #BDCCC2",'#10'"|'#9'c #3D684B",'#10'"1'#9'c #799782",'
-    +#10'"2'#9'c #E6EBE7",'#10'"3'#9'c #698A73",'#10'"4'#9'c #72917B",'#10'"5'
-    +#9'c #E5EAE6",'#10'"6'#9'c #87A18F",'#10'"7'#9'c #346142",'#10'"8'#9'c #5'
-    +'4795F",'#10'"9'#9'c #D4DDD6",'#10'"0'#9'c #8AA492",'#10'"a'#9'c #356243"'
-    +','#10'"b'#9'c #416B4E",'#10'"c'#9'c #9DB2A4",'#10'"d'#9'c #EBF0ED",'#10
-    +'"e'#9'c #95AC9C",'#10'"f'#9'c #91A998",'#10'"g'#9'c #BECCC2",'#10'"h'#9
-    +'c #E4EAE6",'#10'"i'#9'c #587C63",'#10'"j'#9'c #436C50",'#10'"k'#9'c #97A'
-    +'E9E",'#10'"l'#9'c #ADBFB3",'#10'"m'#9'c #C8D4CC",'#10'"n'#9'c #AABDB0",'
-    +#10'"o'#9'c #6F8F79",'#10'"p'#9'c #C5D2C9",'#10'"q'#9'c #466F53",'#10'"r'
-    +#9'c #3F694C",'#10'"s'#9'c #8BA593",'#10'"t'#9'c #A5B8AB",'#10'"u'#9'c #4'
-    +'F755B",'#10'"v'#9'c #497156",'#10'"w'#9'c #668871",'#10'"x'#9'c #AFC0B4"'
-    +','#10'"y'#9'c #96AD9D",'#10'"z'#9'c #366243",'#10'"A'#9'c #72917C",'#10
-    +'"B'#9'c #829D8A",'#10'"C'#9'c #567B62",'#10'"    .++++++.    ",'#10'"   '
-    +'@++++++++@   ",'#10'"  #++++$%&*++#  ",'#10'" @+++=-;>,'')++@ ",'#10'".+'
-    +'+++!~{+]^/(++.",'#10'"++++_:<+++[}|+++",'#10'"++++123+++[}|+++",'#10'"++'
-    +'++4567+890a+++",'#10'"++++bcdefghi++++",'#10'"+++++jkl0mn+++++",'#10'"++'
-    +'+++++(opq+++++",'#10'".+++++rstu+++++.",'#10'" @+7vwxyv+++++@ ",'#10'"  '
-    +'#zABC++++++#  ",'#10'"   @77++++++@   ",'#10'"    .++++++.    "};'#10
+    '/* 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 #8DA6'
+    +'95",'#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('ActiveBreakPoint','XPM',
-    '/* XPM */'#10'static char * ActiveBreakPoint_xpm[] = {'#10'"16 16 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'"    .+++++.     ",'#10'"     '
-    +'.....      ",'#10'"                ",'#10'"                ",'#10'"     '
-    +'           "};'#10
+    '/* XPM */'#10'static char * ActiveBreakPoint_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('InactiveBreakPoint','XPM',
-    '/* XPM */'#10'static char * InactiveBreakPoint_xpm[] = {'#10'"16 16 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'"    .+++++.     ",'#10'"     '
-    +'.....      ",'#10'"                ",'#10'"                ",'#10'"     '
-    +'           "};'#10
+    '/* 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
   );
diff --git a/ide/uniteditor.pp b/ide/uniteditor.pp
index 84ce75a471..86a3d0946e 100644
--- a/ide/uniteditor.pp
+++ b/ide/uniteditor.pp
@@ -1504,6 +1504,8 @@ begin
 
 
   MarksImgList := TImageList.Create(AOwner);
+  MarksImgList.Width:=11;
+  MarksImgList.Height:=11;
 
   //load 10 bookmark images
   for I := 0 to 9 do Begin