diff --git a/.gitattributes b/.gitattributes
index 416bf7d30e..6864bc6195 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7072,7 +7072,7 @@ images/actions/arrow_up_200.png -text
 images/actions/autocomplete.png -text
 images/actions/autocomplete_150.png -text
 images/actions/autocomplete_200.png -text
-images/actions/execute.xpm svneol=native#text/plain
+images/actions/execute.png -text
 images/actions/laz_add.png -text svneol=unset#image/png
 images/actions/laz_add_150.png -text
 images/actions/laz_add_200.png -text
@@ -7100,7 +7100,7 @@ images/actions/laz_set_color_default.png -text svneol=unset#image/png
 images/actions/laz_set_colors_default.png -text svneol=unset#image/png
 images/actions/laz_tick.png -text svneol=unset#image/png
 images/actions/laz_wand.png -text svneol=unset#image/png
-images/actions/preferences.xpm svneol=native#text/plain
+images/actions/preferences.png -text
 images/bookmark.res -text
 images/bookmark.sh svneol=native#text/plain
 images/bookmark_images.bat svneol=native#text/plain
@@ -8152,23 +8152,23 @@ images/splash_logo.res -text
 images/splash_logo.xpm -text svneol=native#image/x-xpixmap
 images/splash_source/cheetah.jpg -text svneol=unset#image/jpeg
 images/splash_source/paw.png -text svneol=unset#image/png
-images/states/quickfix12x12.png -text
-images/states/state12x12_error.png -text
-images/states/state12x12_fatal.png -text
-images/states/state12x12_hint.png -text
-images/states/state12x12_information.png -text
-images/states/state12x12_note.png -text
-images/states/state12x12_warning.png -text
+images/states/quickfix_75.png -text
 images/states/state_circular_reference.png -text svneol=unset#image/png
 images/states/state_error.png -text svneol=unset#image/png
+images/states/state_error_75.png -text
 images/states/state_fatal.png -text svneol=unset#image/png
+images/states/state_fatal_75.png -text
 images/states/state_hint.png -text svneol=unset#image/png
+images/states/state_hint_75.png -text
 images/states/state_information.png -text svneol=unset#image/png
+images/states/state_information_75.png -text
 images/states/state_not_found.png -text svneol=unset#image/png
 images/states/state_note.png -text svneol=unset#image/png
+images/states/state_note_75.png -text
 images/states/state_unit_circular_reference.png -text svneol=unset#image/png
 images/states/state_unknown.png -text svneol=unset#image/png
 images/states/state_warning.png -text svneol=unset#image/png
+images/states/state_warning_75.png -text
 images/template.png -text svneol=unset#image/png
 images/vase_trans.xpm -text svneol=native#image/x-xpixmap
 images/windows/win_formeditor.ico -text
diff --git a/components/ideintf/ideimagesintf.pas b/components/ideintf/ideimagesintf.pas
index e0a496b076..3dc7183fe7 100644
--- a/components/ideintf/ideimagesintf.pas
+++ b/components/ideintf/ideimagesintf.pas
@@ -34,21 +34,18 @@ type
 
   TIDEImages = class
   private
-    FImages_12: TCustomImageList;
-    FImages_16: TCustomImageList;
-    FImages_24: TCustomImageList;
-    FImageNames_12: TStringList;
-    FImageNames_16: TStringList;
-    FImageNames_24: TStringList;
+    FImages_12: TLCLGlyphs;
+    FImages_16: TLCLGlyphs;
+    FImages_24: TLCLGlyphs;
+    function GetImages(Size: Integer): TLCLGlyphs;
   protected
-    function GetImages_12: TCustomImageList;
-    function GetImages_16: TCustomImageList;
-    function GetImages_24: TCustomImageList;
+    function GetImages_12: TLCLGlyphs;
+    function GetImages_16: TLCLGlyphs;
+    function GetImages_24: TLCLGlyphs;
 
     class function CreateBitmapFromRes(const ImageName: string): TCustomBitmap;
     class function CreateBestBitmapForScalingFromRes(const ImageName: string; const aDefScale: Integer; out aBitmap: TCustomBitmap): Integer;
   public
-    constructor Create;
     destructor Destroy; override;
 
     class function GetScalePercent: Integer;
@@ -67,9 +64,10 @@ type
     function GetImageIndex(ImageSize: Integer; ImageName: String): Integer; deprecated 'Use the other overload instead.';
     function GetImageIndex(ImageName: String; ImageSize: Integer = 16): Integer;
 
-    property Images_12: TCustomImageList read GetImages_12;
-    property Images_16: TCustomImageList read GetImages_16;
-    property Images_24: TCustomImageList read GetImages_24;
+    property Images_12: TLCLGlyphs read GetImages_12;
+    property Images_16: TLCLGlyphs read GetImages_16;
+    property Images_24: TLCLGlyphs read GetImages_24;
+    property Images[Size: Integer]: TLCLGlyphs read GetImages;
   end;
 
 function IDEImages: TIDEImages;
@@ -81,38 +79,38 @@ var
 
 { TIDEImages }
 
-function TIDEImages.GetImages_12: TCustomImageList;
+function TIDEImages.GetImages_12: TLCLGlyphs;
 begin
   if FImages_12 = nil then
   begin
-    FImages_12 := TImageList.Create(nil);
-    FImages_12.Width := MulDiv(12, GetScalePercent, 100);
+    FImages_12 := TLCLGlyphs.Create(nil);
+    FImages_12.RegisterResolutions([12, 16, 24]);
+    FImages_12.Width := 12;
     FImages_12.Height := FImages_12.Width;
-    FImages_12.Scaled := False;
   end;
   Result := FImages_12;
 end;
 
-function TIDEImages.GetImages_16: TCustomImageList;
+function TIDEImages.GetImages_16: TLCLGlyphs;
 begin
   if FImages_16 = nil then
   begin
-    FImages_16 := TImageList.Create(nil);
-    FImages_16.Width := MulDiv(16, GetScalePercent, 100);
+    FImages_16 := TLCLGlyphs.Create(nil);
+    FImages_16.RegisterResolutions([16, 24, 32]);
+    FImages_16.Width := 16;
     FImages_16.Height := FImages_16.Width;
-    FImages_16.Scaled := False;
   end;
   Result := FImages_16;
 end;
 
-function TIDEImages.GetImages_24: TCustomImageList;
+function TIDEImages.GetImages_24: TLCLGlyphs;
 begin
   if FImages_24 = nil then
   begin
-    FImages_24 := TImageList.Create(nil);
-    FImages_24.Width := MulDiv(24, GetScalePercent, 100);
+    FImages_24 := TLCLGlyphs.Create(nil);
+    FImages_24.RegisterResolutions([24, 32, 48]);
+    FImages_24.Width := 24;
     FImages_24.Height := FImages_24.Width;
-    FImages_24.Scaled := False;
   end;
   Result := FImages_24;
 end;
@@ -159,6 +157,14 @@ begin
   Result := nil; // not found
 end;
 
+destructor TIDEImages.Destroy;
+begin
+  FImages_12.Free;
+  FImages_16.Free;
+  FImages_24.Free;
+  inherited Destroy;
+end;
+
 class procedure TIDEImages.AssignImage(const ABitmap: TCustomBitmap;
   ImageName: String; ImageSize: Integer);
 var
@@ -191,19 +197,6 @@ begin
   Result := ImageSize * GetScalePercent div 100;
 end;
 
-constructor TIDEImages.Create;
-begin
-  FImageNames_12 := TStringList.Create;
-  FImageNames_12.Sorted := True;
-  FImageNames_12.Duplicates := dupIgnore;
-  FImageNames_16 := TStringList.Create;
-  FImageNames_16.Sorted := True;
-  FImageNames_16.Duplicates := dupIgnore;
-  FImageNames_24 := TStringList.Create;
-  FImageNames_24.Sorted := True;
-  FImageNames_24.Duplicates := dupIgnore;
-end;
-
 class function TIDEImages.CreateBitmapFromRes(const ImageName: string
   ): TCustomBitmap;
 var
@@ -245,17 +238,6 @@ begin
   Result := CreateImage(ImageName, ImageSize);
 end;
 
-destructor TIDEImages.Destroy;
-begin
-  FreeAndNil(FImages_12);
-  FreeAndNil(FImages_16);
-  FreeAndNil(FImages_24);
-  FreeAndNil(FImageNames_12);
-  FreeAndNil(FImageNames_16);
-  FreeAndNil(FImageNames_24);
-  inherited Destroy;
-end;
-
 function TIDEImages.GetImageIndex(ImageSize: Integer; ImageName: String
   ): Integer;
 begin
@@ -265,76 +247,29 @@ end;
 function TIDEImages.GetImageIndex(ImageName: String; ImageSize: Integer
   ): Integer;
 var
-  List: TStringList;
+  List: TLCLGlyphs;
 begin
-  case ImageSize of
-    12: List := FImageNames_12;
-    16: List := FImageNames_16;
-    24: List := FImageNames_24;
-  else
-    List := nil;
-  end;
+  List := Images[ImageSize];
   if List <> nil then
-  begin
-    Result := List.IndexOf(ImageName);
-    if Result <> -1 then
-      Result := PtrInt(List.Objects[Result]);
-  end
+    Result := List.GetImageIndex(ImageName)
   else
     Result := -1;
 end;
 
+function TIDEImages.GetImages(Size: Integer): TLCLGlyphs;
+begin
+  case Size of
+    12: Result := Images_12;
+    16: Result := Images_16;
+    24: Result := Images_24;
+  else
+    Result := nil
+  end;
+end;
+
 function TIDEImages.LoadImage(ImageName: String; ImageSize: Integer): Integer;
-var
-  List: TCustomImageList;
-  Names: TStringList;
-  Grp: TGraphic;
-  Rc: TRect;
 begin
   Result := GetImageIndex(ImageName, ImageSize);
-  if Result <> -1 then Exit;
-
-  case ImageSize of
-    12:
-      begin
-        List := Images_12; // make sure we have a list
-        Names := FImageNames_12;
-      end;
-    16:
-      begin
-        List := Images_16; // make sure we have a list
-        Names := FImageNames_16;
-      end;
-    24:
-      begin
-        List := Images_24; // make sure we have a list
-        Names := FImageNames_24;
-      end;
-  else
-    Exit;
-  end;
-  try
-    Grp := CreateImage(ImageName, ImageSize);
-    try
-      if Grp=nil then
-        raise Exception.CreateFmt('TIDEImages.LoadImage: %s not found.', [ImageName]);
-      if Grp is TCustomBitmap then
-      begin
-        Rc := Rect(0, 0, List.Width, List.Height);
-        OffsetRect(Rc, (Grp.Width-List.Width) div 2, (Grp.Height-List.Height) div 2);
-        Result := List.AddSlice(TCustomBitmap(Grp), Rc);
-      end else
-        Result := List.AddIcon(Grp as TCustomIcon);
-    finally
-      Grp.Free;
-    end;
-  except
-    on E: Exception do begin
-      DebugLn('While loading IDEImages: ' + e.Message);
-      Result := -1;
-    end;
-  end;
-  Names.AddObject(ImageName, TObject(PtrInt(Result)));
 end;
 
 class function TIDEImages.ScaleImage(const AImage: TGraphic; out
diff --git a/ide/etmessageframe.pas b/ide/etmessageframe.pas
index 197734a7b2..79f1bf6d3a 100644
--- a/ide/etmessageframe.pas
+++ b/ide/etmessageframe.pas
@@ -3443,12 +3443,12 @@ begin
   inherited Create(TheOwner);
 
   MessagesCtrl:=TMessagesCtrl.Create(Self);
-  ImgIDInfo:=IDEImages.LoadImage('state12x12_information', 12);
-  ImgIDHint:=IDEImages.LoadImage('state12x12_hint', 12);
-  ImgIDNote:=IDEImages.LoadImage('state12x12_note', 12);
-  ImgIDWarning:=IDEImages.LoadImage('state12x12_warning', 12);
-  ImgIDError:=IDEImages.LoadImage('state12x12_error', 12);
-  ImgIDFatal:=IDEImages.LoadImage('state12x12_fatal', 12);
+  ImgIDInfo:=IDEImages.LoadImage('state_information', 12);
+  ImgIDHint:=IDEImages.LoadImage('state_hint', 12);
+  ImgIDNote:=IDEImages.LoadImage('state_note', 12);
+  ImgIDWarning:=IDEImages.LoadImage('state_warning', 12);
+  ImgIDError:=IDEImages.LoadImage('state_error', 12);
+  ImgIDFatal:=IDEImages.LoadImage('state_fatal', 12);
   with MessagesCtrl do begin
     Name:='MessagesCtrl';
     Align:=alClient;
diff --git a/images/actions/execute.png b/images/actions/execute.png
new file mode 100644
index 0000000000..4e7394dcc8
Binary files /dev/null and b/images/actions/execute.png differ
diff --git a/images/actions/execute.xpm b/images/actions/execute.xpm
deleted file mode 100644
index 165ca960b2..0000000000
--- a/images/actions/execute.xpm
+++ /dev/null
@@ -1,276 +0,0 @@
-/* XPM */
-static char * execute_xpm[] = {
-"16 16 257 2",
-"  	c None",
-". 	c #B57B4A",
-"+ 	c #C66B29",
-"@ 	c #C67B52",
-"# 	c #D66B18",
-"$ 	c #D68C52",
-"% 	c #D69431",
-"& 	c #E77B39",
-"* 	c #E78452",
-"= 	c #EF7B10",
-"- 	c #EF7B31",
-"; 	c #EF8410",
-"> 	c #EFAD29",
-", 	c #EFAD39",
-"' 	c #EFB510",
-") 	c #EFBD08",
-"! 	c #F77300",
-"~ 	c #F77318",
-"{ 	c #F77329",
-"] 	c #F78408",
-"^ 	c #F79408",
-"/ 	c #F7A518",
-"( 	c #F7CE00",
-"_ 	c #F7DE18",
-": 	c #F7DE63",
-"< 	c #FF00FF",
-"[ 	c #FF7300",
-"} 	c #FF7B00",
-"| 	c #FF8400",
-"1 	c #FF8C00",
-"2 	c #FF9400",
-"3 	c #FF9C00",
-"4 	c #FFA500",
-"5 	c #FFA510",
-"6 	c #FFA539",
-"7 	c #FFA552",
-"8 	c #FFA55A",
-"9 	c #FFAD00",
-"0 	c #FFAD29",
-"a 	c #FFAD31",
-"b 	c #FFB500",
-"c 	c #FFB56B",
-"d 	c #FFB584",
-"e 	c #FFBD00",
-"f 	c #FFBD08",
-"g 	c #FFBD10",
-"h 	c #FFC600",
-"i 	c #FFC608",
-"j 	c #FFC66B",
-"k 	c #FFCE00",
-"l 	c #FFCE18",
-"m 	c #FFD600",
-"n 	c #FFD608",
-"o 	c #FFD610",
-"p 	c #FFD621",
-"q 	c #FFD631",
-"r 	c #FFDE00",
-"s 	c #FFDE18",
-"t 	c #FFDE29",
-"u 	c #FFDE42",
-"v 	c #FFE700",
-"w 	c #FFE710",
-"x 	c #FFE718",
-"y 	c #FFE739",
-"z 	c #FFEF00",
-"A 	c #FFEF18",
-"B 	c #FFEF39",
-"C 	c #FFEF4A",
-"D 	c #FFF700",
-"E 	c #FFF708",
-"F 	c #FFF729",
-"G 	c #FFF731",
-"H 	c #FFF742",
-"I 	c #FFF74A",
-"J 	c #FFF75A",
-"K 	c #FFFF00",
-"L 	c #FFFF08",
-"M 	c #FFFF18",
-"N 	c #FFFF21",
-"O 	c #FFFF31",
-"P 	c #FFFF39",
-"Q 	c #FFFFFF",
-"R 	c #FFFFFF",
-"S 	c #FFFFFF",
-"T 	c #FFFFFF",
-"U 	c #FFFFFF",
-"V 	c #FFFFFF",
-"W 	c #FFFFFF",
-"X 	c #FFFFFF",
-"Y 	c #FFFFFF",
-"Z 	c #FFFFFF",
-"` 	c #FFFFFF",
-" .	c #FFFFFF",
-"..	c #FFFFFF",
-"+.	c #FFFFFF",
-"@.	c #FFFFFF",
-"#.	c #FFFFFF",
-"$.	c #FFFFFF",
-"%.	c #FFFFFF",
-"&.	c #FFFFFF",
-"*.	c #FFFFFF",
-"=.	c #FFFFFF",
-"-.	c #FFFFFF",
-";.	c #FFFFFF",
-">.	c #FFFFFF",
-",.	c #FFFFFF",
-"'.	c #FFFFFF",
-").	c #FFFFFF",
-"!.	c #FFFFFF",
-"~.	c #FFFFFF",
-"{.	c #FFFFFF",
-"].	c #FFFFFF",
-"^.	c #FFFFFF",
-"/.	c #FFFFFF",
-"(.	c #FFFFFF",
-"_.	c #FFFFFF",
-":.	c #FFFFFF",
-"<.	c #FFFFFF",
-"[.	c #FFFFFF",
-"}.	c #FFFFFF",
-"|.	c #FFFFFF",
-"1.	c #FFFFFF",
-"2.	c #FFFFFF",
-"3.	c #FFFFFF",
-"4.	c #FFFFFF",
-"5.	c #FFFFFF",
-"6.	c #FFFFFF",
-"7.	c #FFFFFF",
-"8.	c #FFFFFF",
-"9.	c #FFFFFF",
-"0.	c #FFFFFF",
-"a.	c #FFFFFF",
-"b.	c #FFFFFF",
-"c.	c #FFFFFF",
-"d.	c #FFFFFF",
-"e.	c #FFFFFF",
-"f.	c #FFFFFF",
-"g.	c #FFFFFF",
-"h.	c #FFFFFF",
-"i.	c #FFFFFF",
-"j.	c #FFFFFF",
-"k.	c #FFFFFF",
-"l.	c #FFFFFF",
-"m.	c #FFFFFF",
-"n.	c #FFFFFF",
-"o.	c #FFFFFF",
-"p.	c #FFFFFF",
-"q.	c #FFFFFF",
-"r.	c #FFFFFF",
-"s.	c #FFFFFF",
-"t.	c #FFFFFF",
-"u.	c #FFFFFF",
-"v.	c #FFFFFF",
-"w.	c #FFFFFF",
-"x.	c #FFFFFF",
-"y.	c #FFFFFF",
-"z.	c #FFFFFF",
-"A.	c #FFFFFF",
-"B.	c #FFFFFF",
-"C.	c #FFFFFF",
-"D.	c #FFFFFF",
-"E.	c #FFFFFF",
-"F.	c #FFFFFF",
-"G.	c #FFFFFF",
-"H.	c #FFFFFF",
-"I.	c #FFFFFF",
-"J.	c #FFFFFF",
-"K.	c #FFFFFF",
-"L.	c #FFFFFF",
-"M.	c #FFFFFF",
-"N.	c #FFFFFF",
-"O.	c #FFFFFF",
-"P.	c #FFFFFF",
-"Q.	c #FFFFFF",
-"R.	c #FFFFFF",
-"S.	c #FFFFFF",
-"T.	c #FFFFFF",
-"U.	c #FFFFFF",
-"V.	c #FFFFFF",
-"W.	c #FFFFFF",
-"X.	c #FFFFFF",
-"Y.	c #FFFFFF",
-"Z.	c #FFFFFF",
-"`.	c #FFFFFF",
-" +	c #FFFFFF",
-".+	c #FFFFFF",
-"++	c #FFFFFF",
-"@+	c #FFFFFF",
-"#+	c #FFFFFF",
-"$+	c #FFFFFF",
-"%+	c #FFFFFF",
-"&+	c #FFFFFF",
-"*+	c #FFFFFF",
-"=+	c #FFFFFF",
-"-+	c #FFFFFF",
-";+	c #FFFFFF",
-">+	c #FFFFFF",
-",+	c #FFFFFF",
-"'+	c #FFFFFF",
-")+	c #FFFFFF",
-"!+	c #FFFFFF",
-"~+	c #FFFFFF",
-"{+	c #FFFFFF",
-"]+	c #FFFFFF",
-"^+	c #FFFFFF",
-"/+	c #FFFFFF",
-"(+	c #FFFFFF",
-"_+	c #FFFFFF",
-":+	c #FFFFFF",
-"<+	c #FFFFFF",
-"[+	c #FFFFFF",
-"}+	c #FFFFFF",
-"|+	c #FFFFFF",
-"1+	c #FFFFFF",
-"2+	c #FFFFFF",
-"3+	c #FFFFFF",
-"4+	c #FFFFFF",
-"5+	c #FFFFFF",
-"6+	c #FFFFFF",
-"7+	c #FFFFFF",
-"8+	c #FFFFFF",
-"9+	c #FFFFFF",
-"0+	c #FFFFFF",
-"a+	c #FFFFFF",
-"b+	c #FFFFFF",
-"c+	c #FFFFFF",
-"d+	c #FFFFFF",
-"e+	c #FFFFFF",
-"f+	c #FFFFFF",
-"g+	c #FFFFFF",
-"h+	c #FFFFFF",
-"i+	c #FFFFFF",
-"j+	c #FFFFFF",
-"k+	c #FFFFFF",
-"l+	c #FFFFFF",
-"m+	c #FFFFFF",
-"n+	c #FFFFFF",
-"o+	c #FFFFFF",
-"p+	c #FFFFFF",
-"q+	c #FFFFFF",
-"r+	c #FFFFFF",
-"s+	c #FFFFFF",
-"t+	c #FFFFFF",
-"u+	c #FFFFFF",
-"v+	c #FFFFFF",
-"w+	c #FFFFFF",
-"x+	c #FFFFFF",
-"y+	c #FFFFFF",
-"z+	c #FFFFFF",
-"A+	c #FFFFFF",
-"B+	c #FFFFFF",
-"C+	c #FFFFFF",
-"D+	c #FFFFFF",
-"E+	c #FFFFFF",
-"F+	c #FFFFFF",
-"G+	c #FFFFFF",
-"H+	c #FFFFFF",
-"                          q 7 @ ",
-"                      q u o 8 @ ",
-"                  q D z 9 4 @   ",
-"              q E K D m b @     ",
-"          i y C H M K K L N @   ",
-"        6 h z D z r K K B i @   ",
-"        0 h z D D K C l 4 @     ",
-"        @ @ @ h L G g 9 @ @     ",
-"              b f 9 3 @         ",
-"            b i 3 3 @           ",
-"          b 1 2 @ @             ",
-"        3 1 1 @                 ",
-"      & } ! @                   ",
-"      - @ +                     ",
-"      @                         ",
-"                                "};
diff --git a/images/actions/preferences.png b/images/actions/preferences.png
new file mode 100644
index 0000000000..a6313e5920
Binary files /dev/null and b/images/actions/preferences.png differ
diff --git a/images/actions/preferences.xpm b/images/actions/preferences.xpm
deleted file mode 100644
index 19af37951f..0000000000
--- a/images/actions/preferences.xpm
+++ /dev/null
@@ -1,147 +0,0 @@
-/* XPM */
-static char * preferences16_xpm[] = {
-"16 16 128 2",
-"  	c None",
-". 	c #969697",
-"+ 	c #E4E4E5",
-"@ 	c #E9E9EA",
-"# 	c #BCBCBC",
-"$ 	c #9E9EA3",
-"% 	c #E0E0E1",
-"& 	c #C7C7C6",
-"* 	c #A3A3A5",
-"= 	c #A5A5B3",
-"- 	c #B2B2B2",
-"; 	c #A0A0A0",
-"> 	c #969699",
-", 	c #A0A0AB",
-"' 	c #E2E3E5",
-") 	c #AFAFAE",
-"! 	c #A1A1AB",
-"~ 	c #B6B6D8",
-"{ 	c #B48913",
-"] 	c #BE8F0D",
-"^ 	c #E2E5EC",
-"/ 	c #B2B2B1",
-"( 	c #A2A2AC",
-"_ 	c #B6B8E0",
-": 	c #C19A1E",
-"< 	c #BA9322",
-"[ 	c #AA800E",
-"} 	c #D3A220",
-"| 	c #EBBC36",
-"1 	c #E0E2E9",
-"2 	c #B4B6DD",
-"3 	c #FDE165",
-"4 	c #E6CA68",
-"5 	c #A47905",
-"6 	c #B88C14",
-"7 	c #CD9D1F",
-"8 	c #DDAC27",
-"9 	c #EFC547",
-"0 	c #B4B5DC",
-"a 	c #FBE47C",
-"b 	c #F9ECAC",
-"c 	c #E0CB8A",
-"d 	c #C4A548",
-"e 	c #BC921E",
-"f 	c #DFAD27",
-"g 	c #E3B431",
-"h 	c #F4CF5A",
-"i 	c #E2E3E9",
-"j 	c #B3B3B2",
-"k 	c #B5B7E1",
-"l 	c #FADC59",
-"m 	c #FFF09C",
-"n 	c #FCEFB5",
-"o 	c #BD9B3D",
-"p 	c #B88E1C",
-"q 	c #DEAD28",
-"r 	c #E7BB3F",
-"s 	c #F6D76D",
-"t 	c #D3C791",
-"u 	c #D8BC45",
-"v 	c #FFD202",
-"w 	c #FED314",
-"x 	c #FBD21E",
-"y 	c #CB9E0C",
-"z 	c #C09113",
-"A 	c #D7A622",
-"B 	c #EAC34E",
-"C 	c #F7DF81",
-"D 	c #FFEF92",
-"E 	c #E8D371",
-"F 	c #CCB85C",
-"G 	c #C9B250",
-"H 	c #EBC72A",
-"I 	c #FFD107",
-"J 	c #FECF04",
-"K 	c #FED009",
-"L 	c #F5C908",
-"M 	c #E1B40E",
-"N 	c #D7BA60",
-"O 	c #D2B048",
-"P 	c #E0BE53",
-"Q 	c #FFED95",
-"R 	c #FFEF8D",
-"S 	c #FFE55A",
-"T 	c #FFDA27",
-"U 	c #FFD81C",
-"V 	c #FFE252",
-"W 	c #FFE879",
-"X 	c #FFEB7D",
-"Y 	c #EECB3F",
-"Z 	c #D9B131",
-"` 	c #CEA42C",
-" .	c #B48C20",
-"..	c #BD982C",
-"+.	c #D5B54E",
-"@.	c #EFDB85",
-"#.	c #DEC051",
-"$.	c #ECC839",
-"%.	c #FFD71E",
-"&.	c #FFDB3A",
-"*.	c #F1D45F",
-"=.	c #DFC675",
-"-.	c #ECE1B0",
-";.	c #E1CE90",
-">.	c #B58B1B",
-",.	c #C9A532",
-"'.	c #DCB837",
-").	c #D9AE14",
-"!.	c #CBA111",
-"~.	c #F0C71D",
-"{.	c #F8D748",
-"].	c #CAA634",
-"^.	c #DDC15C",
-"/.	c #DEC467",
-"(.	c #C6A43F",
-"_.	c #C9A32B",
-":.	c #CCA524",
-"<.	c #AE840F",
-"[.	c #C39A14",
-"}.	c #D6AE24",
-"|.	c #D5B133",
-"1.	c #B48B18",
-"2.	c #AF8717",
-"3.	c #CCAB43",
-"4.	c #CBA83D",
-"5.	c #C9A120",
-"6.	c #CFAA2C",
-"7.	c #AC8210",
-"            . . . .             ",
-"          . + @ # $ .           ",
-"          . % & * = .           ",
-"          . - ; > , .           ",
-"          . ' ) ! ~ .           ",
-"      { ] . ^ / ( _ . : <       ",
-"    [ } | . 1 / ( 2 . 3 4 5     ",
-"  6 7 8 9 . 1 / ( 0 . a b c d   ",
-"  e f g h . i j ( k . l m n o   ",
-"  p q r s t . . . . u v w x y   ",
-"  z A B C D E F G H I J K L M   ",
-"  N O P Q R S T U V W X Y Z `   ",
-"   ...+.@.#.$.%.&.*.=.-.;.>.    ",
-"      ,.'.).!.~.{.].^./.(.      ",
-"      _.:.<.[.}.|.1.2.3.4.      ",
-"              5.6.7.            "};
diff --git a/images/laz_images.res b/images/laz_images.res
index af10651d33..c5b89251e8 100644
Binary files a/images/laz_images.res and b/images/laz_images.res differ
diff --git a/images/laz_images_list.txt b/images/laz_images_list.txt
index bb19c55384..d20de1465e 100644
--- a/images/laz_images_list.txt
+++ b/images/laz_images_list.txt
@@ -42,7 +42,7 @@ actions/arrow__darkred_up_200.png
 actions/autocomplete.png
 actions/autocomplete_150.png
 actions/autocomplete_200.png
-actions/execute.xpm
+actions/execute.png
 actions/laz_add.png
 actions/laz_add_150.png
 actions/laz_add_200.png
@@ -70,7 +70,7 @@ actions/laz_set_colors_default.png
 actions/laz_set_color_default.png
 actions/laz_tick.png
 actions/laz_wand.png
-actions/preferences.xpm
+actions/preferences.png
 codecompletion/cc_class.png
 codecompletion/cc_class_150.png
 codecompletion/cc_class_200.png
@@ -635,13 +635,13 @@ packages/pkg_runtime_overlay.png
 packages/pkg_sortalphabetically.png
 packages/pkg_text.png
 packages/pkg_unit.png
-states/quickfix12x12.png
-states/state12x12_error.png
-states/state12x12_fatal.png
-states/state12x12_hint.png
-states/state12x12_information.png
-states/state12x12_note.png
-states/state12x12_warning.png
+states/quickfix_75.png
+states/state_error_75.png
+states/state_fatal_75.png
+states/state_hint_75.png
+states/state_information_75.png
+states/state_note_75.png
+states/state_warning_75.png
 states/state_circular_reference.png
 states/state_error.png
 states/state_fatal.png
diff --git a/images/states/quickfix12x12.png b/images/states/quickfix_75.png
similarity index 100%
rename from images/states/quickfix12x12.png
rename to images/states/quickfix_75.png
diff --git a/images/states/state12x12_error.png b/images/states/state_error_75.png
similarity index 100%
rename from images/states/state12x12_error.png
rename to images/states/state_error_75.png
diff --git a/images/states/state12x12_fatal.png b/images/states/state_fatal_75.png
similarity index 100%
rename from images/states/state12x12_fatal.png
rename to images/states/state_fatal_75.png
diff --git a/images/states/state12x12_hint.png b/images/states/state_hint_75.png
similarity index 100%
rename from images/states/state12x12_hint.png
rename to images/states/state_hint_75.png
diff --git a/images/states/state12x12_information.png b/images/states/state_information_75.png
similarity index 100%
rename from images/states/state12x12_information.png
rename to images/states/state_information_75.png
diff --git a/images/states/state12x12_note.png b/images/states/state_note_75.png
similarity index 100%
rename from images/states/state12x12_note.png
rename to images/states/state_note_75.png
diff --git a/images/states/state12x12_warning.png b/images/states/state_warning_75.png
similarity index 100%
rename from images/states/state12x12_warning.png
rename to images/states/state_warning_75.png