diff --git a/.gitattributes b/.gitattributes
index ecb713983c..4b1da2413b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1243,6 +1243,7 @@ images/components/tbitbtn.ico -text svneol=unset#image/x-icon
 images/components/tbitbtn.xpm -text svneol=native#image/x-xpixmap
 images/components/tbutton.ico -text svneol=unset#image/x-icon
 images/components/tbutton.xpm -text svneol=native#image/x-xpixmap
+images/components/tbuttonpanel.xpm svneol=native#text/plain
 images/components/tcalcedit.xpm -text svneol=native#image/x-xpixmap
 images/components/tcalculatordialog.xpm -text svneol=native#image/x-xpixmap
 images/components/tcalendar.ico -text svneol=unset#image/x-icon
diff --git a/images/components/tbuttonpanel.xpm b/images/components/tbuttonpanel.xpm
new file mode 100644
index 0000000000..f3f12d45b7
--- /dev/null
+++ b/images/components/tbuttonpanel.xpm
@@ -0,0 +1,239 @@
+/* XPM */
+static char * tbuttonpanel_xpm[] = {
+"23 23 213 2",
+"  	c None",
+". 	c #98A5A8",
+"+ 	c #5F839F",
+"@ 	c #5C819D",
+"# 	c #5D819D",
+"$ 	c #5883B6",
+"% 	c #E1F2FF",
+"& 	c #DDEDFF",
+"* 	c #5281B8",
+"= 	c #F7F9FD",
+"- 	c #FFFDF8",
+"; 	c #FEFCF8",
+"> 	c #FFFFFF",
+", 	c #FFFEFD",
+"' 	c #4C7DB6",
+") 	c #EEF2F8",
+"! 	c #F8F7F1",
+"~ 	c #F5F5F1",
+"{ 	c #F6F6F2",
+"] 	c #FCF6F9",
+"^ 	c #BBDDBB",
+"/ 	c #D5E9D2",
+"( 	c #4879B5",
+"_ 	c #EBF1F6",
+": 	c #F7F6F0",
+"< 	c #F4F4F0",
+"[ 	c #FFF9FF",
+"} 	c #BAE7B8",
+"| 	c #009300",
+"1 	c #5C8960",
+"2 	c #4678B3",
+"3 	c #EAF0F4",
+"4 	c #F6F5F0",
+"5 	c #F7F5F2",
+"6 	c #FAF7F5",
+"7 	c #F5F4F0",
+"8 	c #FBF1F7",
+"9 	c #C0EEC0",
+"0 	c #009C00",
+"a 	c #005600",
+"b 	c #EAE4E9",
+"c 	c #4275B3",
+"d 	c #E9EEF3",
+"e 	c #F9F6F2",
+"f 	c #DFEEDE",
+"g 	c #C1D8C4",
+"h 	c #FFFAFF",
+"i 	c #C0ECC2",
+"j 	c #009000",
+"k 	c #005505",
+"l 	c #E5DCE3",
+"m 	c #FDFBF8",
+"n 	c #4073B2",
+"o 	c #E8EDF2",
+"p 	c #FFFDFA",
+"q 	c #749E7F",
+"r 	c #009100",
+"s 	c #8EF387",
+"t 	c #009800",
+"u 	c #005000",
+"v 	c #F6E6F3",
+"w 	c #FCFBF6",
+"x 	c #F3F3ED",
+"y 	c #3F72B2",
+"z 	c #E7EBF2",
+"A 	c #FAF8F2",
+"B 	c #D7D5D2",
+"C 	c #004807",
+"D 	c #009B00",
+"E 	c #005B02",
+"F 	c #8D8A99",
+"G 	c #FFFFFC",
+"H 	c #F2F2ED",
+"I 	c #B9C0B9",
+"J 	c #5E829F",
+"K 	c #6D8DA9",
+"L 	c #6C8DA8",
+"M 	c #688AA8",
+"N 	c #A7B5B5",
+"O 	c #4174B5",
+"P 	c #E4E9F1",
+"Q 	c #F4F3EC",
+"R 	c #FCFAF7",
+"S 	c #E0DBDE",
+"T 	c #002623",
+"U 	c #868C94",
+"V 	c #F1F1EC",
+"W 	c #62839B",
+"X 	c #F7F3E4",
+"Y 	c #346AAF",
+"Z 	c #E8EBEE",
+"` 	c #FBF8EA",
+" .	c #F8F5EA",
+"..	c #FFFBF0",
+"+.	c #FFFBF2",
+"@.	c #FFFFF4",
+"#.	c #F8F6EA",
+"$.	c #65849D",
+"%.	c #F8F8F6",
+"&.	c #F9F9F7",
+"*.	c #EFECDD",
+"=.	c #3267A9",
+"-.	c #A5BDEE",
+";.	c #AABFEC",
+">.	c #A9BEEB",
+",.	c #65849B",
+"'.	c #FFFFFB",
+").	c #FFFFFE",
+"!.	c #112111",
+"~.	c #1E371E",
+"{.	c #727971",
+"].	c #FFFFF1",
+"^.	c #95A7B0",
+"/.	c #456EA8",
+"(.	c #486EAB",
+"_.	c #4970AC",
+":.	c #547BB7",
+"<.	c #5077B3",
+"[.	c #486FAB",
+"}.	c #65859C",
+"|.	c #FFFFFA",
+"1.	c #54624F",
+"2.	c #5E6357",
+"3.	c #9A9B93",
+"4.	c #837F78",
+"5.	c #B3AFA7",
+"6.	c #64849B",
+"7.	c #FFFFF8",
+"8.	c #F3F3EF",
+"9.	c #FFFFFD",
+"0.	c #360061",
+"a.	c #660F7C",
+"b.	c #5E6A99",
+"c.	c #8492A9",
+"d.	c #686E93",
+"e.	c #FFFFF7",
+"f.	c #F2F2EE",
+"g.	c #666664",
+"h.	c #FEFEFA",
+"i.	c #F8F8F4",
+"j.	c #C3C3C0",
+"k.	c #777775",
+"l.	c #ECECE8",
+"m.	c #5E5E5D",
+"n.	c #B0B0AD",
+"o.	c #64839B",
+"p.	c #691775",
+"q.	c #A02593",
+"r.	c #BEC4C9",
+"s.	c #6C7A94",
+"t.	c #696966",
+"u.	c #B1B1AE",
+"v.	c #6F6F6D",
+"w.	c #525251",
+"x.	c #D2D2CE",
+"y.	c #7C7C79",
+"z.	c #FFFFF6",
+"A.	c #671678",
+"B.	c #9D238E",
+"C.	c #BABCC0",
+"D.	c #6B798B",
+"E.	c #FFFEF7",
+"F.	c #FCFCF7",
+"G.	c #91918E",
+"H.	c #979794",
+"I.	c #BEBEBA",
+"J.	c #70706D",
+"K.	c #9C9C98",
+"L.	c #4C4C4B",
+"M.	c #C5C5C0",
+"N.	c #757573",
+"O.	c #FFFDF6",
+"P.	c #F1F1ED",
+"Q.	c #FFFFF9",
+"R.	c #6C167D",
+"S.	c #A02391",
+"T.	c #C1BCC4",
+"U.	c #6B718F",
+"V.	c #FEFEF6",
+"W.	c #FBFBF7",
+"X.	c #CDCDC9",
+"Y.	c #DBDBD7",
+"Z.	c #D0D0CC",
+"`.	c #ECECE7",
+" +	c #FFFDF5",
+".+	c #F0F1EC",
+"++	c #610774",
+"@+	c #941485",
+"#+	c #B2B7B8",
+"$+	c #6B6B81",
+"%+	c #FDFDF5",
+"&+	c #F5F5F0",
+"*+	c #F3F3EE",
+"=+	c #F1F2ED",
+"-+	c #5F8098",
+";+	c #FFFBEF",
+">+	c #F5F2E8",
+",+	c #F5F2E9",
+"'+	c #FBFAEE",
+")+	c #C5AEC3",
+"!+	c #DBB2CC",
+"~+	c #E1E2D9",
+"{+	c #CECACA",
+"]+	c #F9F6ED",
+"^+	c #8EA2A9",
+"/+	c #6C869B",
+"(+	c #7F92A0",
+"_+	c #7E91A0",
+":+	c #839AA5",
+"<+	c #829AA4",
+"[+	c #8094A2",
+"}+	c #7D919F",
+"|+	c #8296A3",
+"                                              ",
+"                        . + @ # # # # # # # # ",
+"                        $ % & & & & & & & & & ",
+"                        * = - ; ; ; ; ; ; > , ",
+"                        ' ) ! ~ ~ ~ ~ { ] ^ / ",
+"                        ( _ : < < < ~ [ } | 1 ",
+"                        2 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 w x ",
+"                        y z A B C D E F G H H ",
+"  I J K L L L L L L M N O P Q R S T U > V V V ",
+"  W > > > > > > > > > X Y Z `  ...+.@.#. . . .",
+"  $.> %.%.%.%.&.> > > *.=.-.;.>.>.;.>.>.>.>.>.",
+"  ,.'.~ ~ ~ { ).!.~.{.].^./.(._.:.<.[.[.[.[.[.",
+"  }.|.< < < ~ > 1.2.3.> G > > > 4.5.> > > > > ",
+"  6.7.8.8.8.9.0.a.b.c.d.e.f.'.g.h.i.j.k.l.m.n.",
+"  o.7.f.f.f.G p.q.r.> s.e.f.G t.> ).u.v.w.x.y.",
+"  o.z.H H H |.A.B.C.> D.E.H F.G.H.I.J.K.L.M.N.",
+"  6.O.V P.P.Q.R.S.T.> U.V.P.P.W.X.Y.V Z.`.V `.",
+"  6. +.+.+.+7.++@+#+> $+%+.+.+V &+*+H &+*+=+H ",
+"  -+;+>+,+,+'+)+!+~+e.{+]+,+,+,+,+,+,+,+,+,+,+",
+"  ^+/+(+_+_+_+:+<+[+}+|+_+_+_+_+_+_+_+_+_+_+_+",
+"                                              "};
diff --git a/images/components_images.lrs b/images/components_images.lrs
index 84a6372d92..6da260cc41 100644
--- a/images/components_images.lrs
+++ b/images/components_images.lrs
@@ -201,6 +201,91 @@ LazarusResources.Add('tbitbtn','XPM',[
   +',&''''/&&&&))(&)!)*;>",'#10'"+&&&&&&&&&&&&&&&&;>",'#10'"_:<[}|122222222345>'
   +'",'#10'">6>7>)>>>>>>>>>>6> "};'#10
 ]);
+LazarusResources.Add('tbuttonpanel','XPM',[
+  '/* XPM */'#10'static char * tbuttonpanel_xpm[] = {'#10'"23 23 213 2",'#10'" '
+  +' '#9'c None",'#10'". '#9'c #98A5A8",'#10'"+ '#9'c #5F839F",'#10'"@ '#9'c #5'
+  +'C819D",'#10'"# '#9'c #5D819D",'#10'"$ '#9'c #5883B6",'#10'"% '#9'c #E1F2FF"'
+  +','#10'"& '#9'c #DDEDFF",'#10'"* '#9'c #5281B8",'#10'"= '#9'c #F7F9FD",'#10
+  +'"- '#9'c #FFFDF8",'#10'"; '#9'c #FEFCF8",'#10'"> '#9'c #FFFFFF",'#10'", '#9
+  +'c #FFFEFD",'#10'"'' '#9'c #4C7DB6",'#10'") '#9'c #EEF2F8",'#10'"! '#9'c #F8'
+  +'F7F1",'#10'"~ '#9'c #F5F5F1",'#10'"{ '#9'c #F6F6F2",'#10'"] '#9'c #FCF6F9",'
+  +#10'"^ '#9'c #BBDDBB",'#10'"/ '#9'c #D5E9D2",'#10'"( '#9'c #4879B5",'#10'"_ '
+  +#9'c #EBF1F6",'#10'": '#9'c #F7F6F0",'#10'"< '#9'c #F4F4F0",'#10'"[ '#9'c #F'
+  +'FF9FF",'#10'"} '#9'c #BAE7B8",'#10'"| '#9'c #009300",'#10'"1 '#9'c #5C8960"'
+  +','#10'"2 '#9'c #4678B3",'#10'"3 '#9'c #EAF0F4",'#10'"4 '#9'c #F6F5F0",'#10
+  +'"5 '#9'c #F7F5F2",'#10'"6 '#9'c #FAF7F5",'#10'"7 '#9'c #F5F4F0",'#10'"8 '#9
+  +'c #FBF1F7",'#10'"9 '#9'c #C0EEC0",'#10'"0 '#9'c #009C00",'#10'"a '#9'c #005'
+  +'600",'#10'"b '#9'c #EAE4E9",'#10'"c '#9'c #4275B3",'#10'"d '#9'c #E9EEF3",'
+  +#10'"e '#9'c #F9F6F2",'#10'"f '#9'c #DFEEDE",'#10'"g '#9'c #C1D8C4",'#10'"h '
+  +#9'c #FFFAFF",'#10'"i '#9'c #C0ECC2",'#10'"j '#9'c #009000",'#10'"k '#9'c #0'
+  +'05505",'#10'"l '#9'c #E5DCE3",'#10'"m '#9'c #FDFBF8",'#10'"n '#9'c #4073B2"'
+  +','#10'"o '#9'c #E8EDF2",'#10'"p '#9'c #FFFDFA",'#10'"q '#9'c #749E7F",'#10
+  +'"r '#9'c #009100",'#10'"s '#9'c #8EF387",'#10'"t '#9'c #009800",'#10'"u '#9
+  +'c #005000",'#10'"v '#9'c #F6E6F3",'#10'"w '#9'c #FCFBF6",'#10'"x '#9'c #F3F'
+  +'3ED",'#10'"y '#9'c #3F72B2",'#10'"z '#9'c #E7EBF2",'#10'"A '#9'c #FAF8F2",'
+  +#10'"B '#9'c #D7D5D2",'#10'"C '#9'c #004807",'#10'"D '#9'c #009B00",'#10'"E '
+  +#9'c #005B02",'#10'"F '#9'c #8D8A99",'#10'"G '#9'c #FFFFFC",'#10'"H '#9'c #F'
+  +'2F2ED",'#10'"I '#9'c #B9C0B9",'#10'"J '#9'c #5E829F",'#10'"K '#9'c #6D8DA9"'
+  +','#10'"L '#9'c #6C8DA8",'#10'"M '#9'c #688AA8",'#10'"N '#9'c #A7B5B5",'#10
+  +'"O '#9'c #4174B5",'#10'"P '#9'c #E4E9F1",'#10'"Q '#9'c #F4F3EC",'#10'"R '#9
+  +'c #FCFAF7",'#10'"S '#9'c #E0DBDE",'#10'"T '#9'c #002623",'#10'"U '#9'c #868'
+  +'C94",'#10'"V '#9'c #F1F1EC",'#10'"W '#9'c #62839B",'#10'"X '#9'c #F7F3E4",'
+  +#10'"Y '#9'c #346AAF",'#10'"Z '#9'c #E8EBEE",'#10'"` '#9'c #FBF8EA",'#10'" .'
+  +#9'c #F8F5EA",'#10'"..'#9'c #FFFBF0",'#10'"+.'#9'c #FFFBF2",'#10'"@.'#9'c #F'
+  +'FFFF4",'#10'"#.'#9'c #F8F6EA",'#10'"$.'#9'c #65849D",'#10'"%.'#9'c #F8F8F6"'
+  +','#10'"&.'#9'c #F9F9F7",'#10'"*.'#9'c #EFECDD",'#10'"=.'#9'c #3267A9",'#10
+  +'"-.'#9'c #A5BDEE",'#10'";.'#9'c #AABFEC",'#10'">.'#9'c #A9BEEB",'#10'",.'#9
+  +'c #65849B",'#10'"''.'#9'c #FFFFFB",'#10'").'#9'c #FFFFFE",'#10'"!.'#9'c #11'
+  +'2111",'#10'"~.'#9'c #1E371E",'#10'"{.'#9'c #727971",'#10'"].'#9'c #FFFFF1",'
+  +#10'"^.'#9'c #95A7B0",'#10'"/.'#9'c #456EA8",'#10'"(.'#9'c #486EAB",'#10'"_.'
+  +#9'c #4970AC",'#10'":.'#9'c #547BB7",'#10'"<.'#9'c #5077B3",'#10'"[.'#9'c #4'
+  +'86FAB",'#10'"}.'#9'c #65859C",'#10'"|.'#9'c #FFFFFA",'#10'"1.'#9'c #54624F"'
+  +','#10'"2.'#9'c #5E6357",'#10'"3.'#9'c #9A9B93",'#10'"4.'#9'c #837F78",'#10
+  +'"5.'#9'c #B3AFA7",'#10'"6.'#9'c #64849B",'#10'"7.'#9'c #FFFFF8",'#10'"8.'#9
+  +'c #F3F3EF",'#10'"9.'#9'c #FFFFFD",'#10'"0.'#9'c #360061",'#10'"a.'#9'c #660'
+  +'F7C",'#10'"b.'#9'c #5E6A99",'#10'"c.'#9'c #8492A9",'#10'"d.'#9'c #686E93",'
+  +#10'"e.'#9'c #FFFFF7",'#10'"f.'#9'c #F2F2EE",'#10'"g.'#9'c #666664",'#10'"h.'
+  +#9'c #FEFEFA",'#10'"i.'#9'c #F8F8F4",'#10'"j.'#9'c #C3C3C0",'#10'"k.'#9'c #7'
+  +'77775",'#10'"l.'#9'c #ECECE8",'#10'"m.'#9'c #5E5E5D",'#10'"n.'#9'c #B0B0AD"'
+  +','#10'"o.'#9'c #64839B",'#10'"p.'#9'c #691775",'#10'"q.'#9'c #A02593",'#10
+  +'"r.'#9'c #BEC4C9",'#10'"s.'#9'c #6C7A94",'#10'"t.'#9'c #696966",'#10'"u.'#9
+  +'c #B1B1AE",'#10'"v.'#9'c #6F6F6D",'#10'"w.'#9'c #525251",'#10'"x.'#9'c #D2D'
+  +'2CE",'#10'"y.'#9'c #7C7C79",'#10'"z.'#9'c #FFFFF6",'#10'"A.'#9'c #671678",'
+  +#10'"B.'#9'c #9D238E",'#10'"C.'#9'c #BABCC0",'#10'"D.'#9'c #6B798B",'#10'"E.'
+  +#9'c #FFFEF7",'#10'"F.'#9'c #FCFCF7",'#10'"G.'#9'c #91918E",'#10'"H.'#9'c #9'
+  +'79794",'#10'"I.'#9'c #BEBEBA",'#10'"J.'#9'c #70706D",'#10'"K.'#9'c #9C9C98"'
+  +','#10'"L.'#9'c #4C4C4B",'#10'"M.'#9'c #C5C5C0",'#10'"N.'#9'c #757573",'#10
+  +'"O.'#9'c #FFFDF6",'#10'"P.'#9'c #F1F1ED",'#10'"Q.'#9'c #FFFFF9",'#10'"R.'#9
+  +'c #6C167D",'#10'"S.'#9'c #A02391",'#10'"T.'#9'c #C1BCC4",'#10'"U.'#9'c #6B7'
+  +'18F",'#10'"V.'#9'c #FEFEF6",'#10'"W.'#9'c #FBFBF7",'#10'"X.'#9'c #CDCDC9",'
+  +#10'"Y.'#9'c #DBDBD7",'#10'"Z.'#9'c #D0D0CC",'#10'"`.'#9'c #ECECE7",'#10'" +'
+  +#9'c #FFFDF5",'#10'".+'#9'c #F0F1EC",'#10'"++'#9'c #610774",'#10'"@+'#9'c #9'
+  +'41485",'#10'"#+'#9'c #B2B7B8",'#10'"$+'#9'c #6B6B81",'#10'"%+'#9'c #FDFDF5"'
+  +','#10'"&+'#9'c #F5F5F0",'#10'"*+'#9'c #F3F3EE",'#10'"=+'#9'c #F1F2ED",'#10
+  +'"-+'#9'c #5F8098",'#10'";+'#9'c #FFFBEF",'#10'">+'#9'c #F5F2E8",'#10'",+'#9
+  +'c #F5F2E9",'#10'"''+'#9'c #FBFAEE",'#10'")+'#9'c #C5AEC3",'#10'"!+'#9'c #DB'
+  +'B2CC",'#10'"~+'#9'c #E1E2D9",'#10'"{+'#9'c #CECACA",'#10'"]+'#9'c #F9F6ED",'
+  +#10'"^+'#9'c #8EA2A9",'#10'"/+'#9'c #6C869B",'#10'"(+'#9'c #7F92A0",'#10'"_+'
+  ,#9'c #7E91A0",'#10'":+'#9'c #839AA5",'#10'"<+'#9'c #829AA4",'#10'"[+'#9'c #8'
+  +'094A2",'#10'"}+'#9'c #7D919F",'#10'"|+'#9'c #8296A3",'#10'"                '
+  +'                              ",'#10'"                        . + @ # # # #'
+  +' # # # # ",'#10'"                        $ % & & & & & & & & & ",'#10'"    '
+  +'                    * = - ; ; ; ; ; ; > , ",'#10'"                        '
+  +''' ) ! ~ ~ ~ ~ { ] ^ / ",'#10'"                        ( _ : < < < ~ [ } | '
+  +'1 ",'#10'"                        2 3 4 5 6 7 8 9 0 a b ",'#10'"           '
+  +'             c d e f g h i j k l m ",'#10'"                        n o p q '
+  +'r s t u v w x ",'#10'"                        y z A B C D E F G H H ",'#10
+  +'"  I J K L L L L L L M N O P Q R S T U > V V V ",'#10'"  W > > > > > > > > '
+  +'> X Y Z `  ...+.@.#. . . .",'#10'"  $.> %.%.%.%.&.> > > *.=.-.;.>.>.;.>.>.>'
+  +'.>.>.",'#10'"  ,.''.~ ~ ~ { ).!.~.{.].^./.(._.:.<.[.[.[.[.[.",'#10'"  }.|.<'
+  +' < < ~ > 1.2.3.> G > > > 4.5.> > > > > ",'#10'"  6.7.8.8.8.9.0.a.b.c.d.e.f.'
+  +'''.g.h.i.j.k.l.m.n.",'#10'"  o.7.f.f.f.G p.q.r.> s.e.f.G t.> ).u.v.w.x.y.",'
+  +#10'"  o.z.H H H |.A.B.C.> D.E.H F.G.H.I.J.K.L.M.N.",'#10'"  6.O.V P.P.Q.R.S'
+  +'.T.> U.V.P.P.W.X.Y.V Z.`.V `.",'#10'"  6. +.+.+.+7.++@+#+> $+%+.+.+V &+*+H '
+  +'&+*+=+H ",'#10'"  -+;+>+,+,+''+)+!+~+e.{+]+,+,+,+,+,+,+,+,+,+,+",'#10'"  ^+'
+  +'/+(+_+_+_+:+<+[+}+|+_+_+_+_+_+_+_+_+_+_+_+",'#10'"                         '
+  +'                     "};'#10
+]);
 LazarusResources.Add('tbutton','XPM',[
   '/* XPM */'#10'static char * tbutton_xpm[] = {'#10'"19 11 50 1",'#10'" '#9'c '
   +'None",'#10'".'#9'c #F8F8F8",'#10'"+'#9'c #FFFFFF",'#10'"@'#9'c #EFEFEF",'#10