diff --git a/.gitattributes b/.gitattributes
index a05628a5d5..61c395ad82 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3722,9 +3722,12 @@ components/opengl/glqtcontext.pas svneol=native#text/plain
 components/opengl/glwin32wglcontext.pas svneol=native#text/plain
 components/opengl/lazopenglcontext.lpk svneol=native#text/plain
 components/opengl/lazopenglcontext.pas svneol=native#text/plain
+components/opengl/makeicon.bat svneol=native#text/plain
 components/opengl/openglcontext.pas svneol=native#text/plain
 components/opengl/openglcontext.res -text
-components/opengl/topenglcontrol.xpm svneol=native#text/plain
+components/opengl/topenglcontrol.png -text svneol=unset#image/png
+components/opengl/topenglcontrol_150.png -text svneol=unset#image/png
+components/opengl/topenglcontrol_200.png -text svneol=unset#image/png
 components/packagetabs/README.txt svneol=native#text/plain
 components/packagetabs/languages/packagetabsstr.de.po svneol=native#text/plain
 components/packagetabs/languages/packagetabsstr.fr.po svneol=native#text/plain
diff --git a/components/opengl/makeicon.bat b/components/opengl/makeicon.bat
new file mode 100644
index 0000000000..e52c7b56a3
--- /dev/null
+++ b/components/opengl/makeicon.bat
@@ -0,0 +1 @@
+@..\..\tools\lazres.exe openglcontext.res topenglcontrol.png topenglcontrol_150.png topenglcontrol_200.png
diff --git a/components/opengl/openglcontext.res b/components/opengl/openglcontext.res
index 3c81c75e2f..9e7b40b4cf 100644
Binary files a/components/opengl/openglcontext.res and b/components/opengl/openglcontext.res differ
diff --git a/components/opengl/topenglcontrol.png b/components/opengl/topenglcontrol.png
new file mode 100644
index 0000000000..133fc79bbf
Binary files /dev/null and b/components/opengl/topenglcontrol.png differ
diff --git a/components/opengl/topenglcontrol.xpm b/components/opengl/topenglcontrol.xpm
deleted file mode 100644
index cbe4bca2f6..0000000000
--- a/components/opengl/topenglcontrol.xpm
+++ /dev/null
@@ -1,211 +0,0 @@
-/* XPM */
-static char * tgtkglareacontrol_xpm[] = {
-"18 21 187 2",
-"  	c None",
-". 	c #C2DAFE",
-"+ 	c #BECEFE",
-"@ 	c #B2C2FE",
-"# 	c #B6CAFE",
-"$ 	c #AABAFE",
-"% 	c #A2AEFE",
-"& 	c #96A2FE",
-"* 	c #A2B2FE",
-"= 	c #929EFE",
-"- 	c #8E92FE",
-"; 	c #868AFE",
-"> 	c #8A82FE",
-", 	c #62AAFE",
-"' 	c #7EAAFA",
-") 	c #A6BEFA",
-"! 	c #AEBEFE",
-"~ 	c #9AA2FE",
-"{ 	c #9296FE",
-"] 	c #7E86F6",
-"^ 	c #3E66DE",
-"/ 	c #064ABA",
-"( 	c #66AAFE",
-"_ 	c #5E96F6",
-": 	c #5A92F6",
-"< 	c #7E9AF6",
-"[ 	c #92A2FA",
-"} 	c #7E92FA",
-"| 	c #4E76E6",
-"1 	c #1252C6",
-"2 	c #0246B2",
-"3 	c #06429E",
-"4 	c #66A2FA",
-"5 	c #5E8AEE",
-"6 	c #5A8EEE",
-"7 	c #527EE6",
-"8 	c #527AE6",
-"9 	c #2262E6",
-"0 	c #0252CE",
-"a 	c #024ABA",
-"b 	c #0642A6",
-"c 	c #0A4296",
-"d 	c #5286FA",
-"e 	c #527AE2",
-"f 	c #5276DA",
-"g 	c #4272E2",
-"h 	c #0A5ADE",
-"i 	c #024EBE",
-"j 	c #0246AA",
-"k 	c #063A92",
-"l 	c #06367E",
-"m 	c #FEDADA",
-"n 	c #FACECE",
-"o 	c #3E76EE",
-"p 	c #5272DA",
-"q 	c #4E6ED6",
-"r 	c #3A5AC6",
-"s 	c #0A4EC2",
-"t 	c #0646AA",
-"u 	c #063E92",
-"v 	c #06327A",
-"w 	c #062E72",
-"x 	c #FEC2C2",
-"y 	c #F6B6B6",
-"z 	c #3266DE",
-"A 	c #4A66CE",
-"B 	c #4A62CA",
-"C 	c #0A46AE",
-"D 	c #063686",
-"E 	c #062E6A",
-"F 	c #0A2656",
-"G 	c #FEB6B6",
-"H 	c #F6A6AA",
-"I 	c #4662CE",
-"J 	c #425ACA",
-"K 	c #3E52C2",
-"L 	c #324EB6",
-"M 	c #0A3272",
-"N 	c #12223E",
-"O 	c #FE6666",
-"P 	c #FE8686",
-"Q 	c #FEAAAA",
-"R 	c #FEAEB2",
-"S 	c #FEA6A2",
-"T 	c #E67E7E",
-"U 	c #864666",
-"V 	c #4A4EAA",
-"W 	c #3E4ABA",
-"X 	c #2E42AA",
-"Y 	c #0A368A",
-"Z 	c #0E2652",
-"` 	c #223E46",
-" .	c #5A6E26",
-"..	c #FA4E4E",
-"+.	c #F64646",
-"@.	c #F64A4A",
-"#.	c #F66E72",
-"$.	c #F28A86",
-"%.	c #DA6E6E",
-"&.	c #862626",
-"*.	c #461206",
-"=.	c #3A529A",
-"-.	c #0A2E6E",
-";.	c #425A32",
-">.	c #5E8222",
-",.	c #5E9626",
-"'.	c #629622",
-").	c #F24242",
-"!.	c #EE3E3E",
-"~.	c #EE3A3A",
-"{.	c #E63232",
-"].	c #9E0A0A",
-"^.	c #6A0202",
-"/.	c #72DE3E",
-"(.	c #96EE6A",
-"_.	c #5ADA26",
-":.	c #6EB23E",
-"<.	c #6ABA3E",
-"[.	c #66BA3E",
-"}.	c #5EBE32",
-"|.	c #4AA21E",
-"1.	c #367A0E",
-"2.	c #EE4242",
-"3.	c #E63636",
-"4.	c #A60606",
-"5.	c #7A0206",
-"6.	c #3ECE02",
-"7.	c #3ECA0A",
-"8.	c #76E64A",
-"9.	c #8AFE62",
-"0.	c #76FA4E",
-"a.	c #62DA3A",
-"b.	c #329616",
-"c.	c #1E6E06",
-"d.	c #1A6206",
-"e.	c #E63632",
-"f.	c #E62E2E",
-"g.	c #E22626",
-"h.	c #960206",
-"i.	c #6E0206",
-"j.	c #3EC606",
-"k.	c #3AC606",
-"l.	c #36BA02",
-"m.	c #32B602",
-"n.	c #4EC226",
-"o.	c #36961E",
-"p.	c #1E7206",
-"q.	c #1A6202",
-"r.	c #165E02",
-"s.	c #1A5A06",
-"t.	c #EA3636",
-"u.	c #E22E2E",
-"v.	c #DE2A2A",
-"w.	c #D61E1E",
-"x.	c #820202",
-"y.	c #560206",
-"z.	c #36B606",
-"A.	c #32AE06",
-"B.	c #2EA206",
-"C.	c #1E6606",
-"D.	c #1A5E06",
-"E.	c #165606",
-"F.	c #164E06",
-"G.	c #420206",
-"H.	c #32AA06",
-"I.	c #2EA606",
-"J.	c #269606",
-"K.	c #124606",
-"L.	c #5E0206",
-"M.	c #2AA206",
-"N.	c #2A9E06",
-"O.	c #268E06",
-"P.	c #165206",
-"Q.	c #164A06",
-"R.	c #123E06",
-"S.	c #2AA606",
-"T.	c #2A9A06",
-"U.	c #228606",
-"V.	c #124E06",
-"W.	c #124206",
-"X.	c #0E3A06",
-"Y.	c #123606",
-"Z.	c #228A06",
-"`.	c #1A7A06",
-" +	c #0E3E06",
-".+	c #1A6E06",
-"++	c #0E3606",
-"                    . +             ",
-"                @ @ # $ % &         ",
-"            @ @ @ @ @ * = - ; >     ",
-"            , ' ) ! % ~ { ] ^ /     ",
-"            ( _ : < [ } | 1 2 3     ",
-"            4 5 6 7 8 9 0 a b c     ",
-"            d 7 e f g h i j k l     ",
-"        m n o f p q r s t u v w     ",
-"    x x x y z q A B r C k D E F     ",
-"x x x x G H I B J K L c v M F N     ",
-"O P Q G R S T U V W X Y w Z `  .    ",
-"..+.@.#.$.%.&.*.*.*.=.-.` ;. .>.,.'.",
-"@.).!.~.{.].^.*./.(._.:.:.<.[.}.|.1.",
-"2.!.3.3.{.4.5.*.6.7._.8.9.0.a.b.c.d.",
-"!.e.{.f.g.h.i.*.j.k.l.m.n.o.p.q.r.s.",
-"t.u.v.g.w.x.y.*.l.z.z.A.B.r.C.D.E.F.",
-"    w.w.w.i.G.*.z.H.I.I.J.D.D.E.F.K.",
-"        w.L.    H.I.M.N.O.E.P.Q.K.R.",
-"                S.T.J.O.U.Q.V.W.X.Y.",
-"                    Z.Z.`.W. +X.    ",
-"                        .+++        "};
diff --git a/components/opengl/topenglcontrol_150.png b/components/opengl/topenglcontrol_150.png
new file mode 100644
index 0000000000..a1a9f08d82
Binary files /dev/null and b/components/opengl/topenglcontrol_150.png differ
diff --git a/components/opengl/topenglcontrol_200.png b/components/opengl/topenglcontrol_200.png
new file mode 100644
index 0000000000..40d6de49e7
Binary files /dev/null and b/components/opengl/topenglcontrol_200.png differ