diff --git a/.gitattributes b/.gitattributes
index 285f7bc05b..f5d7cb8b2a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -62,7 +62,6 @@ designer/abstracteditor.pp svneol=native#text/pascal
 designer/abstractfilesystem.pp svneol=native#text/pascal
 designer/abstractformeditor.pp svneol=native#text/pascal
 designer/aligncompsdlg.pp svneol=native#text/pascal
-designer/bookmark.lrs svneol=native#text/pascal
 designer/controlselection.pp svneol=native#text/pascal
 designer/customeditor.pp svneol=native#text/pascal
 designer/designer.pp svneol=native#text/pascal
@@ -142,6 +141,7 @@ ide/viewunit_dlg.lfm svneol=native#text/plain
 ide/viewunit_dlg.pp svneol=native#text/pascal
 ide/viewunits1.lrs svneol=native#text/pascal
 ide/wordcompletion.pp svneol=native#text/pascal
+images/bookmark.lrs svneol=native#text/pascal
 images/btn_downarrow.ico -text svneol=unset#image/x-icon
 images/btn_downarrow.xpm -text svneol=native#image/x-xpixmap
 images/btn_newform.ico -text svneol=unset#image/x-icon
@@ -167,6 +167,8 @@ images/btn_viewunits.ico -text svneol=unset#image/x-icon
 images/btn_viewunits.xpm -text svneol=native#image/x-xpixmap
 images/color.ico -text svneol=unset#image/x-icon
 images/color.xpm -text svneol=native#image/x-xpixmap
+images/components/default.ico -text svneol=unset#image/x-icon
+images/components/default.xpm -text svneol=native#image/x-xpixmap
 images/components/tbevel.ico -text svneol=unset#image/x-icon
 images/components/tbevel.xpm -text svneol=native#image/x-xpixmap
 images/components/tbitbtn.ico -text svneol=unset#image/x-icon
@@ -249,8 +251,6 @@ images/components/ttoolbar.xpm -text svneol=native#image/x-xpixmap
 images/components/ttrackbar.ico -text svneol=unset#image/x-icon
 images/components/ttrackbar.xpm -text svneol=native#image/x-xpixmap
 images/components_images.lrs svneol=native#text/pascal
-images/default.ico -text svneol=native#image/x-icon
-images/default.xpm -text svneol=native#image/x-xpixmap
 images/downarrow.ico -text svneol=unset#image/x-icon
 images/downarrow.xpm -text svneol=native#image/x-xpixmap
 images/fonts.ico -text svneol=unset#image/x-icon
diff --git a/ide/uniteditor.pp b/ide/uniteditor.pp
index bdf9db6d9b..a49658968d 100644
--- a/ide/uniteditor.pp
+++ b/ide/uniteditor.pp
@@ -2895,7 +2895,7 @@ initialization
   IdentCompletionTimer:=nil;
   AWordCompletion:=nil;
 
-{$I designer/bookmark.lrs}
+{$I images/bookmark.lrs}
 
 finalization
   aWordCompletion.Free;
diff --git a/images/README b/images/README
index cfd8bb1a7d..753ae6444d 100644
--- a/images/README
+++ b/images/README
@@ -4,7 +4,7 @@ in xpm format.
 
 mainicon.lrs - This is the IDE program icon.
 laz_images.lrs - The icons for the speedbuttons (Open, Save, Run,...)
-
+components_images.lrs - Icons and pics for lcl components
 
 How to update the image resources:
 
@@ -15,13 +15,27 @@ cd <lazarusdir>/tools/
 ppc386 -Fu../lcl/units -Fu../lcl/units/gtk lazres.pp
 
 
-1. mainicon
+1. mainicon.lrs
 
 cd <lazarusdir>/images/
 ../tools/lazres mainicon.lrs mainicon.xpm
 
+
 2. laz_images.lrs
 
 cd <lazarusdir>/images/
 ../tools/lazres laz_images.lrs btn_*.xpm
 
+
+3. components_images.lrs
+
+cd <lazarusdir>/images/components/
+../../tools/lazres ../components_images.lrs *.xpm
+
+
+4. bookmark.lrs
+
+cd <lazarusdir>/images/sourceeditor/
+../../tools/lazres ../bookmark.lrs *.xpm
+
+
diff --git a/designer/bookmark.lrs b/images/bookmark.lrs
similarity index 100%
rename from designer/bookmark.lrs
rename to images/bookmark.lrs
index 517547b06f..15e2e5c0fb 100644
--- a/designer/bookmark.lrs
+++ b/images/bookmark.lrs
@@ -1,3 +1,10 @@
+  LazarusResources.Add('ActiveBreakPoint','XPM',
+    '/* 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('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 #5F82'
@@ -98,13 +105,6 @@
     +'++.",'#10'".++%=&=&++.",'#10'".++;;+@*++.",'#10'" .+;&&&-+. ",'#10'"  .+'
     +'%-%+.  ",'#10'"   .....   "};'#10
   );
-  LazarusResources.Add('ActiveBreakPoint','XPM',
-    '/* 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'"11 11 3 1",'
     +#10'" '#9'c None",'#10'".'#9'c #000000",'#10'"+'#9'c #0DA500",'#10'"   ..'
diff --git a/images/components/default.ico b/images/components/default.ico
new file mode 100644
index 0000000000..dd310bdf4a
Binary files /dev/null and b/images/components/default.ico differ
diff --git a/images/default.xpm b/images/components/default.xpm
similarity index 100%
rename from images/default.xpm
rename to images/components/default.xpm
diff --git a/images/components_images.lrs b/images/components_images.lrs
index 29a461fb69..8659731359 100644
--- a/images/components_images.lrs
+++ b/images/components_images.lrs
@@ -1,3 +1,15 @@
+  LazarusResources.Add('default','XPM',
+    '/* XPM */'#10'static char * default_xpm[] = {'#10'"19 17 9 1",'#10'" '#9
+    +'c None",'#10'".'#9'c #D11B76",'#10'"+'#9'c #770D46",'#10'"@'#9'c #B21A75'
+    +'",'#10'"#'#9'c #14BC2D",'#10'"$'#9'c #09F41D",'#10'"%'#9'c #99155F",'#10
+    +'"&'#9'c #17D323",'#10'"*'#9'c #127C1F",'#10'"                   ",'#10'"'
+    +'                   ",'#10'"                   ",'#10'"        .         '
+    +' ",'#10'"       +.@         ",'#10'"       +.@         ",'#10'"      ++.'
+    +'@@        ",'#10'"      ++.@@    #   ",'#10'"     +++.@@@  #### ",'#10'"'
+    +'     +++.@@@ #$$$##",'#10'"    +++%.@@@@#$$#&#",'#10'"    +++%.@@@#*##&&'
+    +'#",'#10'"   +++%%.@@@#**#&&#",'#10'"  ....%%....#**#&&#",'#10'"         '
+    +'    #*### ",'#10'"              ###  ",'#10'"                   "};'#10
+  );
   LazarusResources.Add('tbevel','XPM',
     '/* XPM */'#10'static char * tbevel_xpm[] = {'#10'"25 25 4 1",'#10'" '#9'c'
     +' None",'#10'".'#9'c #FFFFFF",'#10'"+'#9'c #C0C0C0",'#10'"@'#9'c #808080"'
@@ -865,34 +877,34 @@
   );
   LazarusResources.Add('tmouse','XPM',
     '/* XPM */'#10'static char * mouse_xpm[] = {'#10'"25 25 52 1",'#10'" '#9'c'
-    +' None",'#10'".'#9'c None'#10'"+'#9'c #070244",'#10'"@'#9'c #000030",'#10
-    +'"#'#9'c #00002C",'#10'"$'#9'c #FBFAFF",'#10'"%'#9'c #00001E",'#10'"&'#9
-    +'c #0C0C2E",'#10'"*'#9'c #F7F8FF",'#10'"='#9'c #F8FBFF",'#10'"-'#9'c #000'
-    +'009",'#10'";'#9'c #000010",'#10'">'#9'c #FBFDFF",'#10'",'#9'c #FCFFFF",'
-    +#10'"'''#9'c #FBFCFE",'#10'")'#9'c #000200",'#10'"!'#9'c #02050A",'#10'"~'
-    +#9'c #F2F6F9",'#10'"{'#9'c #FBFDF8",'#10'"]'#9'c #FEFFFA",'#10'"^'#9'c #0'
-    +'70908",'#10'"/'#9'c #FCFEFB",'#10'"('#9'c #FCFEF9",'#10'"_'#9'c #F6F9F2"'
-    +','#10'":'#9'c #FFFFFA",'#10'"<'#9'c #000100",'#10'"['#9'c #FEFFFB",'#10
-    +'"}'#9'c #F5F8F1",'#10'"|'#9'c #FFFFFD",'#10'"1'#9'c #000002",'#10'"2'#9
-    +'c #FAFAF8",'#10'"3'#9'c #F9F9F7",'#10'"4'#9'c #0B0B0B",'#10'"5'#9'c #000'
-    +'004",'#10'"6'#9'c #030208",'#10'"7'#9'c #FDFDFF",'#10'"8'#9'c #07060E",'
-    +#10'"9'#9'c #FAFAFC",'#10'"0'#9'c #FFFEFF",'#10'"a'#9'c #000005",'#10'"b'
-    +#9'c #08080A",'#10'"c'#9'c #FDFDFD",'#10'"d'#9'c #040406",'#10'"e'#9'c #0'
-    +'8050E",'#10'"f'#9'c #010000",'#10'"g'#9'c #020003",'#10'"h'#9'c #090803"'
-    +','#10'"i'#9'c #FDFCF7",'#10'"j'#9'c #FFFEFA",'#10'"k'#9'c #040301",'#10
-    +'"l'#9'c #010100",'#10'"m'#9'c #020200",'#10'".........................",'
-    +#10'".........................",'#10'".........................",'#10'"..'
-    +'.......................",'#10'".........................",'#10'"........'
-    +'+@...............",'#10'"........#$%..............",'#10'"........&*=-..'
-    +'...........",'#10'"........;>,'')............",'#10'"........!~,{]).....'
-    +'......",'#10'"........^/(]_:<..........",'#10'"........<[[}]]|1.........'
-    +'",'#10'"........1.|234156........",'#10'"........5.7..1...........",'#10
-    +'"........8$51905..........",'#10'"........-a.bc.d..........",'#10'".....'
-    +'...e...f|0g.........",'#10'"............hijk.........",'#10'"...........'
-    +'..lm..........",'#10'".........................",'#10'".................'
-    +'........",'#10'".........................",'#10'".......................'
-    +'..",'#10'".........................",'#10'"........................."};'
-    +#10
+    +' None",'#10'".'#9'c None",'#10'"+'#9'c #070244",'#10'"@'#9'c #000030",'
+    +#10'"#'#9'c #00002C",'#10'"$'#9'c #FBFAFF",'#10'"%'#9'c #00001E",'#10'"&'
+    +#9'c #0C0C2E",'#10'"*'#9'c #F7F8FF",'#10'"='#9'c #F8FBFF",'#10'"-'#9'c #0'
+    +'00009",'#10'";'#9'c #000010",'#10'">'#9'c #FBFDFF",'#10'",'#9'c #FCFFFF"'
+    +','#10'"'''#9'c #FBFCFE",'#10'")'#9'c #000200",'#10'"!'#9'c #02050A",'#10
+    +'"~'#9'c #F2F6F9",'#10'"{'#9'c #FBFDF8",'#10'"]'#9'c #FEFFFA",'#10'"^'#9
+    +'c #070908",'#10'"/'#9'c #FCFEFB",'#10'"('#9'c #FCFEF9",'#10'"_'#9'c #F6F'
+    +'9F2",'#10'":'#9'c #FFFFFA",'#10'"<'#9'c #000100",'#10'"['#9'c #FEFFFB",'
+    +#10'"}'#9'c #F5F8F1",'#10'"|'#9'c #FFFFFD",'#10'"1'#9'c #000002",'#10'"2'
+    +#9'c #FAFAF8",'#10'"3'#9'c #F9F9F7",'#10'"4'#9'c #0B0B0B",'#10'"5'#9'c #0'
+    +'00004",'#10'"6'#9'c #030208",'#10'"7'#9'c #FDFDFF",'#10'"8'#9'c #07060E"'
+    +','#10'"9'#9'c #FAFAFC",'#10'"0'#9'c #FFFEFF",'#10'"a'#9'c #000005",'#10
+    +'"b'#9'c #08080A",'#10'"c'#9'c #FDFDFD",'#10'"d'#9'c #040406",'#10'"e'#9
+    +'c #08050E",'#10'"f'#9'c #010000",'#10'"g'#9'c #020003",'#10'"h'#9'c #090'
+    +'803",'#10'"i'#9'c #FDFCF7",'#10'"j'#9'c #FFFEFA",'#10'"k'#9'c #040301",'
+    +#10'"l'#9'c #010100",'#10'"m'#9'c #020200",'#10'"........................'
+    +'.",'#10'".........................",'#10'".........................",'#10
+    +'".........................",'#10'".........................",'#10'".....'
+    +'...+@...............",'#10'"........#$%..............",'#10'"........&*='
+    +'-.............",'#10'"........;>,'')............",'#10'"........!~,{])..'
+    +'.........",'#10'"........^/(]_:<..........",'#10'"........<[[}]]|1......'
+    +'...",'#10'"........1.|234156........",'#10'"........5.7..1...........",'
+    +#10'"........8$51905..........",'#10'"........-a.bc.d..........",'#10'"..'
+    +'......e...f|0g.........",'#10'"............hijk.........",'#10'"........'
+    +'.....lm..........",'#10'".........................",'#10'"..............'
+    +'...........",'#10'".........................",'#10'"....................'
+    +'.....",'#10'".........................",'#10'"........................."'
+    +'};'#10
   );
   LazarusResources.Add('tnotebook','XPM',
     '/* XPM */'#10'static char * notebook_xpm[] = {'#10'"25 25 29 1",'#10'" '#9
@@ -1440,15 +1452,3 @@
     +'"                         ",'#10'"                         ",'#10'"     '
     +'                    ",'#10'"                         "};'#10
   );
-  LazarusResources.Add('default','XPM',
-    '/* XPM */'#10'static char * default_xpm[] = {'#10'"19 17 9 1",'#10'" '#9
-    +'c None",'#10'".'#9'c #D11B76",'#10'"+'#9'c #770D46",'#10'"@'#9'c #B21A75'
-    +'",'#10'"#'#9'c #14BC2D",'#10'"$'#9'c #09F41D",'#10'"%'#9'c #99155F",'#10
-    +'"&'#9'c #17D323",'#10'"*'#9'c #127C1F",'#10'"                   ",'#10'"'
-    +'                   ",'#10'"                   ",'#10'"        .         '
-    +' ",'#10'"       +.@         ",'#10'"       +.@         ",'#10'"      ++.'
-    +'@@        ",'#10'"      ++.@@    #   ",'#10'"     +++.@@@  #### ",'#10'"'
-    +'     +++.@@@ #$$$##",'#10'"    +++%.@@@@#$$#&#",'#10'"    +++%.@@@#*##&&'
-    +'#",'#10'"   +++%%.@@@#**#&&#",'#10'"  ....%%....#**#&&#",'#10'"         '
-    +'    #*### ",'#10'"              ###  ",'#10'"                   "};'#10
-  );
diff --git a/images/default.ico b/images/default.ico
deleted file mode 100644
index c3a2d1b82e..0000000000
Binary files a/images/default.ico and /dev/null differ