diff --git a/.gitattributes b/.gitattributes
index 5de7ac1857..af28cb1f98 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -301,6 +301,16 @@ images/logo_big.jpg -text svneol=unset#image/jpeg
 images/mainicon.ico -text svneol=unset#image/x-icon
 images/mainicon.lrs svneol=native#text/pascal
 images/mainicon.xpm -text svneol=native#image/x-xpixmap
+images/menu/menu_copy.xpm -text svneol=native#image/x-xpixmap
+images/menu/menu_cut.xpm -text svneol=native#image/x-xpixmap
+images/menu/menu_indent.xpm -text svneol=native#image/x-xpixmap
+images/menu/menu_new.xpm -text svneol=native#image/x-xpixmap
+images/menu/menu_open.xpm -text svneol=native#image/x-xpixmap
+images/menu/menu_paste.xpm -text svneol=native#image/x-xpixmap
+images/menu/menu_redo.xpm -text svneol=native#image/x-xpixmap
+images/menu/menu_save.xpm -text svneol=native#image/x-xpixmap
+images/menu/menu_undo.xpm -text svneol=native#image/x-xpixmap
+images/menu/menu_unindent.xpm -text svneol=native#image/x-xpixmap
 images/mouse.ico -text svneol=unset#image/x-icon
 images/mouse.xpm -text svneol=native#image/x-xpixmap
 images/notebook.ico -text svneol=unset#image/x-icon
diff --git a/images/menu/menu_copy.xpm b/images/menu/menu_copy.xpm
new file mode 100644
index 0000000000..4953d13099
--- /dev/null
+++ b/images/menu/menu_copy.xpm
@@ -0,0 +1,120 @@
+/* XPM */
+static char * menu_copy_xpm[] = {
+"22 23 94 2",
+"  	c None",
+". 	c #010101",
+"+ 	c #B9B9B9",
+"@ 	c #FEFEFE",
+"# 	c #F9F9F9",
+"$ 	c #757575",
+"% 	c #F5F5E8",
+"& 	c #575752",
+"* 	c #FFFFFF",
+"= 	c #A0A0A0",
+"- 	c #939393",
+"; 	c #7C7C7C",
+"> 	c #CFC6A0",
+", 	c #D7CEAA",
+"' 	c #4C493D",
+") 	c #6D6D6D",
+"! 	c #6C6C6C",
+"~ 	c #A9A9A9",
+"{ 	c #3E3B31",
+"] 	c #979178",
+"^ 	c #8A793E",
+"/ 	c #C3BB9A",
+"( 	c #454337",
+"_ 	c #FAFAFA",
+": 	c #EFEFEF",
+"< 	c #C7C7C7",
+"[ 	c #D8D8D8",
+"} 	c #D2D2D2",
+"| 	c #7B7B7B",
+"1 	c #312F27",
+"2 	c #89846C",
+"3 	c #C4BC9A",
+"4 	c #847236",
+"5 	c #555143",
+"6 	c #181713",
+"7 	c #C5C5C5",
+"8 	c #A7A7A7",
+"9 	c #ADADAD",
+"0 	c #9A9A9A",
+"a 	c #9B9B9B",
+"b 	c #868686",
+"c 	c #434343",
+"d 	c #13120F",
+"e 	c #22211B",
+"f 	c #847034",
+"g 	c #444135",
+"h 	c #B3B3B3",
+"i 	c #B4B4B4",
+"j 	c #5D5D5D",
+"k 	c #474747",
+"l 	c #3C3C3C",
+"m 	c #404040",
+"n 	c #D6D6D6",
+"o 	c #191814",
+"p 	c #826F34",
+"q 	c #444136",
+"r 	c #161511",
+"s 	c #141310",
+"t 	c #8F8F8F",
+"u 	c #989898",
+"v 	c #C6C6C6",
+"w 	c #020202",
+"x 	c #806F34",
+"y 	c #7F6C33",
+"z 	c #3A372E",
+"A 	c #636363",
+"B 	c #767676",
+"C 	c #7F6E33",
+"D 	c #424035",
+"E 	c #151411",
+"F 	c #4D4D49",
+"G 	c #515151",
+"H 	c #353535",
+"I 	c #202020",
+"J 	c #2D2D2D",
+"K 	c #3E3E3E",
+"L 	c #171717",
+"M 	c #7D692F",
+"N 	c #1A1A1A",
+"O 	c #1D1C17",
+"P 	c #26251F",
+"Q 	c #292721",
+"R 	c #7F6B2F",
+"S 	c #020201",
+"T 	c #A19A7F",
+"U 	c #A39D81",
+"V 	c #806C30",
+"W 	c #100F0C",
+"X 	c #A9A186",
+"Y 	c #0D0B05",
+"Z 	c #89783D",
+"` 	c #7A672E",
+" .	c #76652A",
+"..	c #78672C",
+"                      . . . .               ",
+"          . . . . . . + @ # $ . . . . . .   ",
+"        . % % % % % & * = - ; & % % % % > . ",
+"        . % , , , , ' * ) ! ~ { ] , , , ^ . ",
+"        . % / / / ( _ : < [ } | 1 2 / 3 4 . ",
+"        . % , 5 6 7 8 8 9 0 a b c d e , f . ",
+"        . % g h i j k l l l l l m i n o p . ",
+"        . % q * * i i i i i i i i * * r p . ",
+"        . % s * 8 t t u * v t * t v * w x . ",
+"        . % r * * * * * * * * * * * * w y . ",
+"        . % z * ) A * B t v * v t * * d C . ",
+"        . % D * * * * * * * * * * * * E p . ",
+"  . . . . F d G H I J K L t v * u t * d x . ",
+". h * * * * * * * * * * n I * * * * * r M . ",
+". * * * * * * * * * * * * N * * * * n O M . ",
+". * 8 t t u * v t * t v * . P P P P Q , R . ",
+". * * * * * * * * * * * * S T T T T T U V . ",
+". * ) A * B t v * v t * * r , , , , , , y . ",
+". * * * * * * * * * * * * W T T T T T X y . ",
+". * 8 t t * t t v * u t * r , , , , , , V . ",
+". * * * * * * * * * * * * Y V Z p p `  .... ",
+". n * * * * * * * * * * n . . . . . . . .   ",
+"  . . . . . . . . . . . .                   "};
diff --git a/images/menu/menu_cut.xpm b/images/menu/menu_cut.xpm
new file mode 100644
index 0000000000..8c5234d31b
--- /dev/null
+++ b/images/menu/menu_cut.xpm
@@ -0,0 +1,157 @@
+/* XPM */
+static char * menu_cut_xpm[] = {
+"22 23 131 2",
+"  	c None",
+". 	c #010101",
+"+ 	c #B9B9B9",
+"@ 	c #FEFEFE",
+"# 	c #F9F9F9",
+"$ 	c #757575",
+"% 	c #F5F5E8",
+"& 	c #575752",
+"* 	c #FFFFFF",
+"= 	c #A0A0A0",
+"- 	c #939393",
+"; 	c #7C7C7C",
+"> 	c #CFC6A0",
+", 	c #D7CEAA",
+"' 	c #4C493D",
+") 	c #6D6D6D",
+"! 	c #6C6C6C",
+"~ 	c #A9A9A9",
+"{ 	c #3E3B31",
+"] 	c #979178",
+"^ 	c #8A793E",
+"/ 	c #C3BB9A",
+"( 	c #454337",
+"_ 	c #FAFAFA",
+": 	c #EFEFEF",
+"< 	c #C7C7C7",
+"[ 	c #D8D8D8",
+"} 	c #D2D2D2",
+"| 	c #7B7B7B",
+"1 	c #312F27",
+"2 	c #89846C",
+"3 	c #C4BC9A",
+"4 	c #847236",
+"5 	c #C5C5C5",
+"6 	c #A7A7A7",
+"7 	c #ADADAD",
+"8 	c #9A9A9A",
+"9 	c #9B9B9B",
+"0 	c #868686",
+"a 	c #434343",
+"b 	c #847034",
+"c 	c #C9C09E",
+"d 	c #474438",
+"e 	c #36342B",
+"f 	c #2E2C24",
+"g 	c #C6BE9D",
+"h 	c #826F34",
+"i 	c #191917",
+"j 	c #141310",
+"k 	c #323027",
+"l 	c #2B2A22",
+"m 	c #2F2D25",
+"n 	c #1F1E19",
+"o 	c #806F34",
+"p 	c #B3B3B3",
+"q 	c #D6D6D6",
+"r 	c #1B1A15",
+"s 	c #7F6C33",
+"t 	c #393939",
+"u 	c #CFCFCF",
+"v 	c #12110E",
+"w 	c #B1AA8C",
+"x 	c #BBB394",
+"y 	c #7F6E33",
+"z 	c #878787",
+"A 	c #848484",
+"B 	c #969696",
+"C 	c #E7E7E7",
+"D 	c #494949",
+"E 	c #D48B44",
+"F 	c #303030",
+"G 	c #BABABA",
+"H 	c #7A7A7A",
+"I 	c #AAAAAA",
+"J 	c #020202",
+"K 	c #F1DD8E",
+"L 	c #D68A40",
+"M 	c #984722",
+"N 	c #222222",
+"O 	c #E2E2E2",
+"P 	c #EFDE90",
+"Q 	c #F5E186",
+"R 	c #AC632E",
+"S 	c #A45C30",
+"T 	c #232323",
+"U 	c #161511",
+"V 	c #7D692F",
+"W 	c #3E3E3E",
+"X 	c #F1E28C",
+"Y 	c #EDE094",
+"Z 	c #F1DF8C",
+"` 	c #B46E36",
+" .	c #BB6633",
+"..	c #C37B55",
+"+.	c #474747",
+"@.	c #100F0C",
+"#.	c #A19A7F",
+"$.	c #A7A083",
+"%.	c #BEBEBE",
+"&.	c #262626",
+"*.	c #1E1E1E",
+"=.	c #3F3F3F",
+"-.	c #A66134",
+";.	c #555555",
+">.	c #7F6B2F",
+",.	c #2F2F2F",
+"'.	c #F3E08A",
+").	c #A65F30",
+"!.	c #A8A8A8",
+"~.	c #E4E4E4",
+"{.	c #A39D81",
+"].	c #806C30",
+"^.	c #8D8D8D",
+"/.	c #B4B4B4",
+"(.	c #9D9D9D",
+"_.	c #8F8F8F",
+":.	c #040403",
+"<.	c #323232",
+"[.	c #D18C49",
+"}.	c #A56033",
+"|.	c #A9A186",
+"1.	c #A3A3A3",
+"2.	c #EAEAEA",
+"3.	c #9F9F9F",
+"4.	c #8E8E8E",
+"5.	c #F1F1F1",
+"6.	c #0D0B05",
+"7.	c #89783D",
+"8.	c #7A672E",
+"9.	c #76652A",
+"0.	c #78672C",
+"                      . . . .               ",
+"          . . . . . . + @ # $ . . . . . .   ",
+"        . % % % % % & * = - ; & % % % % > . ",
+"        . % , , , , ' * ) ! ~ { ] , , , ^ . ",
+"        . % / / / ( _ : < [ } | 1 2 / 3 4 . ",
+"        . % , , ' 5 6 6 7 8 9 0 a ' , , b . ",
+"        . % c / 2 d e f f f f f 1 2 / g h . ",
+"        . % , , , ] ] ] ] ] ] ] ] , , , h . ",
+"  . . . . i j k { { l { m n / / / / / g o . ",
+". p * * * * * * * * * * * q r , , , , , s . ",
+". * * * * * * t u * * * * * v w w w w x y . ",
+". * z A B C D E F G * H I * J , , , , , h . ",
+". * * * * D K L M N u * * * J w w w w x o . ",
+". * B O D P Q L R S T G * * U , , , , , V . ",
+". * * W X Y Z L `  ...+.u * @.#.#.#.#.$.V . ",
+". * %.&.*.=.X L -.. ;.t B * U , , , , , >.. ",
+". * * * * ,.'.L ).. !.!.~.* . #.#.#.#.{.].. ",
+". * ^./.* ,.Z E -.. (._.* * :., , , , , s . ",
+". * * * * <.Y [.}.. !.~.* * @.#.#.#.#.|.s . ",
+". * 6 1.2.. . . . . 3.4._.* U , , , , , ].. ",
+". * * * * u !.!.!.!.!.5.* * 6.7.h h 8.9.0.. ",
+". q * * * * 5.5.5.5.5.5.* q . . . . . . .   ",
+"  . . . . . . . . . . . . .                 "};
diff --git a/images/menu/menu_indent.xpm b/images/menu/menu_indent.xpm
new file mode 100644
index 0000000000..f1194726f5
--- /dev/null
+++ b/images/menu/menu_indent.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char * menu_indent_xpm[] = {
+"18 15 3 1",
+" 	c None",
+".	c #010101",
+"+	c #000000",
+"...........       ",
+"                  ",
+". . . . . . . . . ",
+"                  ",
+"    +   ..........",
+" +....  ..........",
+" ......           ",
+" +....  ........  ",
+"    +   ........  ",
+"                  ",
+". . . . . . . . . ",
+"                  ",
+".............     ",
+"                  ",
+"...........       "};
diff --git a/images/menu/menu_new.xpm b/images/menu/menu_new.xpm
new file mode 100644
index 0000000000..7bfc7ccfe9
--- /dev/null
+++ b/images/menu/menu_new.xpm
@@ -0,0 +1,113 @@
+/* XPM */
+static char * menu_new_xpm[] = {
+"18 21 89 1",
+" 	c None",
+".	c #010101",
+"+	c #ADAD9C",
+"@	c #959585",
+"#	c #DCDCC5",
+"$	c #DFDFC8",
+"%	c #252525",
+"&	c #A7A796",
+"*	c #D7D7C1",
+"=	c #D9D9C3",
+"-	c #DCDCC4",
+";	c #DDDDC7",
+">	c #E1E1CA",
+",	c #A6A694",
+"'	c #D6D6BF",
+")	c #D8D8C2",
+"!	c #DBDBC4",
+"~	c #DFDFC7",
+"{	c #E3E3CB",
+"]	c #B2B29F",
+"^	c #7C7C7C",
+"/	c #646464",
+"(	c #D5D5BD",
+"_	c #D5D5BF",
+":	c #D7D7C0",
+"<	c #DADAC3",
+"[	c #DEDEC6",
+"}	c #E1E1C9",
+"|	c #E5E5CD",
+"1	c #E9E9D1",
+"2	c #353535",
+"3	c #E7E7E7",
+"4	c #383837",
+"5	c #B8B8A6",
+"6	c #D3D3BC",
+"7	c #D9D9C2",
+"8	c #DDDDC5",
+"9	c #E0E0C8",
+"0	c #E8E8D0",
+"a	c #ECECD4",
+"b	c #EEEED5",
+"c	c #ECECEC",
+"d	c #EDEDED",
+"e	c #3E3E38",
+"f	c #CECEB7",
+"g	c #E6E6CE",
+"h	c #EAEAD2",
+"i	c #F1F1D8",
+"j	c #A5A594",
+"k	c #EEEEE5",
+"l	c #3D3D3D",
+"m	c #8F8F80",
+"n	c #D0D0B9",
+"o	c #E4E4CB",
+"p	c #EAEAD1",
+"q	c #ECECD3",
+"r	c #EFEFD6",
+"s	c #F2F2D9",
+"t	c #F3F3DA",
+"u	c #EEEEE6",
+"v	c #515151",
+"w	c #929282",
+"x	c #D1D1B9",
+"y	c #E7E7CF",
+"z	c #EBEBD2",
+"A	c #F4F4DB",
+"B	c #F5F5DC",
+"C	c #969686",
+"D	c #D2D2BC",
+"E	c #E0E0C9",
+"F	c #E9E9D0",
+"G	c #EDEDD4",
+"H	c #F0F0D7",
+"I	c #BEBEAB",
+"J	c #797973",
+"K	c #D8D8C1",
+"L	c #DDDDC6",
+"M	c #98988F",
+"N	c #E4E4CC",
+"O	c #818174",
+"P	c #E2E2CA",
+"Q	c #BEBEAE",
+"R	c #4F4F4F",
+"S	c #828274",
+"T	c #EBEBD3",
+"U	c #BBBBA8",
+"V	c #CDCDB8",
+"W	c #4E4E46",
+"X	c #A6A696",
+"         .        ",
+"       ..+.       ",
+"     ..@#$%       ",
+"   ..&*=-;>.      ",
+" ..,'**)!~{].     ",
+".^/'(_:<[}|12     ",
+".3456*789|0ab.    ",
+".cdef_!9g0hbij.   ",
+".kklmn9opqrist.   ",
+".uvwx-}yzbittAB.  ",
+"..CD!E{FGHtAABBI. ",
+".JK7L>ypbitBBBBB).",
+".M!#$NyzbitBBBBBO.",
+" .~9P|1qrsABBBB.. ",
+" .Q||0hGHtABB<.   ",
+"  R01hGrstAsS.    ",
+"  .TaGriss<.      ",
+"   .rHis1j.       ",
+"   .UstVW.        ",
+"    .tX.          ",
+"     ..           "};
diff --git a/images/menu/menu_open.xpm b/images/menu/menu_open.xpm
new file mode 100644
index 0000000000..379692385d
--- /dev/null
+++ b/images/menu/menu_open.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static char * menu_open_xpm[] = {
+"18 16 5 1",
+" 	c None",
+".	c #010101",
+"+	c #99907B",
+"@	c #FFFEF7",
+"#	c #FFFFFF",
+"           ..     ",
+"        ...++.    ",
+" ..  ...++++@@#...",
+".++..++++@@@@..++.",
+".+++++@@@@@..++++.",
+" .++@@@@@..++++++.",
+" .++@@@..++++++++.",
+"  .+@@.++++++++++.",
+"  .++@.++++++++++.",
+"   .+@.++++++++++.",
+"   .++.++++++++.. ",
+"    .+.++++++..   ",
+"    .+.+++++.     ",
+"     ..+++..      ",
+"     ..+..        ",
+"      ..          "};
diff --git a/images/menu/menu_paste.xpm b/images/menu/menu_paste.xpm
new file mode 100644
index 0000000000..8b35acf455
--- /dev/null
+++ b/images/menu/menu_paste.xpm
@@ -0,0 +1,151 @@
+/* XPM */
+static char * menu_paste_xpm[] = {
+"22 23 125 2",
+"  	c None",
+". 	c #010101",
+"+ 	c #B9B9B9",
+"@ 	c #FEFEFE",
+"# 	c #F9F9F9",
+"$ 	c #757575",
+"% 	c #F5F5E8",
+"& 	c #575752",
+"* 	c #FFFFFF",
+"= 	c #A0A0A0",
+"- 	c #939393",
+"; 	c #7C7C7C",
+"> 	c #CFC6A0",
+", 	c #D7CEAA",
+"' 	c #4C493D",
+") 	c #6D6D6D",
+"! 	c #6C6C6C",
+"~ 	c #A9A9A9",
+"{ 	c #3E3B31",
+"] 	c #979178",
+"^ 	c #8A793E",
+"/ 	c #C3BB9A",
+"( 	c #454337",
+"_ 	c #FAFAFA",
+": 	c #EFEFEF",
+"< 	c #C7C7C7",
+"[ 	c #D8D8D8",
+"} 	c #D2D2D2",
+"| 	c #7B7B7B",
+"1 	c #312F27",
+"2 	c #89846C",
+"3 	c #C4BC9A",
+"4 	c #847236",
+"5 	c #C5C5C5",
+"6 	c #A7A7A7",
+"7 	c #ADADAD",
+"8 	c #9A9A9A",
+"9 	c #9B9B9B",
+"0 	c #868686",
+"a 	c #434343",
+"b 	c #847034",
+"c 	c #C9C09E",
+"d 	c #474438",
+"e 	c #36342B",
+"f 	c #2E2C24",
+"g 	c #C6BE9D",
+"h 	c #826F34",
+"i 	c #9E977D",
+"j 	c #4D4A3D",
+"k 	c #181713",
+"l 	c #141310",
+"m 	c #3F3C32",
+"n 	c #292311",
+"o 	c #484539",
+"p 	c #B3B3B3",
+"q 	c #D6D6D6",
+"r 	c #B7AE90",
+"s 	c #B1AA8C",
+"t 	c #38362C",
+"u 	c #161511",
+"v 	c #C9C9C9",
+"w 	c #E5E5E5",
+"x 	c #C6C6C6",
+"y 	c #B9B293",
+"z 	c #12110E",
+"A 	c #323232",
+"B 	c #B3D2BA",
+"C 	c #7BA676",
+"D 	c #61815A",
+"E 	c #444136",
+"F 	c #8D8D8D",
+"G 	c #B4B4B4",
+"H 	c #2F2F2F",
+"I 	c #AFD2B6",
+"J 	c #79A674",
+"K 	c #62825B",
+"L 	c #888888",
+"M 	c #BABABA",
+"N 	c #AAA48B",
+"O 	c #A5A086",
+"P 	c #A19A7F",
+"Q 	c #323027",
+"R 	c #AED2B6",
+"S 	c #78A672",
+"T 	c #608159",
+"U 	c #DEDEDE",
+"V 	c #262626",
+"W 	c #1E1E1E",
+"X 	c #3F3F3F",
+"Y 	c #AFD2B7",
+"Z 	c #555555",
+"` 	c #393939",
+" .	c #AFA88C",
+"..	c #060504",
+"+.	c #3E3E3E",
+"@.	c #688C60",
+"#.	c #6B9061",
+"$.	c #83A07A",
+"%.	c #474747",
+"&.	c #13120F",
+"*.	c #ABABAB",
+"=.	c #494949",
+"-.	c #B1D2B8",
+";.	c #ACD2B4",
+">.	c #618459",
+",.	c #618058",
+"'.	c #2C2C2C",
+").	c #A9A489",
+"!.	c #A39E85",
+"~.	c #B0D2B7",
+"{.	c #58734B",
+"].	c #222222",
+"^.	c #797979",
+"/.	c #EBE7D0",
+"(.	c #292929",
+"_.	c #7AA674",
+":.	c #232323",
+"<.	c #C0C0C0",
+"[.	c #D2C9A5",
+"}.	c #A29054",
+"|.	c #8E7C3E",
+"1.	c #88793C",
+"2.	c #806C30",
+"3.	c #78652C",
+"4.	c #26200D",
+"              . . . .                       ",
+"  . . . . . . + @ # $ . . . . . .           ",
+". % % % % % & * = - ; & % % % % > .         ",
+". % , , , , ' * ) ! ~ { ] , , , ^ .         ",
+". % / / / ( _ : < [ } | 1 2 / 3 4 .         ",
+". % , , ' 5 6 6 7 8 9 0 a ' , , b .         ",
+". % c / 2 d e f f f f f 1 2 / g h .         ",
+". % , , , ] ] ] ] ] ] ] ] , , , h .         ",
+". % c / / / / i j k l l l l { m n . . . .   ",
+". % , , , , , o p * * * * * * * * * * * q . ",
+". % r s s s s t * * * * * * * * * * * * * . ",
+". % , , , , , u * 6 v w . . . . . * v x * . ",
+". % y s s s s z * * * * A B C D . < * * * . ",
+". % , , , , , E * F G * H I J K . L M * * . ",
+". % N O P P P Q * * * * H R S T . 9 * * * . ",
+". % , , , , , E * U V W X Y S K . Z ` v * . ",
+". %  .O P P P ..* * +.Y B I S @.#.$.%.9 * . ",
+". % , , , , , &.* + *.=.-.;.S >.,.'.0 < * . ",
+". % ).!.P P P Q * * * < =.~.S {.].^.< * * . ",
+". /., , , , , E * 6 v w < (._.:.L x <.6 * . ",
+". [.}.|.1.2.3.4.* * * * * < ` 9 < * * * * . ",
+"  . . . . . . . q * * * * * * * * * * * q . ",
+"                . . . . . . . . . . . . .   "};
diff --git a/images/menu/menu_redo.xpm b/images/menu/menu_redo.xpm
new file mode 100644
index 0000000000..cc03b412c8
--- /dev/null
+++ b/images/menu/menu_redo.xpm
@@ -0,0 +1,60 @@
+/* XPM */
+static char * menu_redo_xpm[] = {
+"14 18 39 1",
+" 	c None",
+".	c #7F7F7F",
+"+	c #C9CCC6",
+"@	c #DCE7CE",
+"#	c #C8CCC5",
+"$	c #B9C0B0",
+"%	c #CED8C2",
+"&	c #E0EAD4",
+"*	c #E8EFDE",
+"=	c #DEE8D1",
+"-	c #CCD0C7",
+";	c #C3CBB9",
+">	c #EAF0E2",
+",	c #E6EDDD",
+"'	c #E8EFDF",
+")	c #E2EBD6",
+"!	c #C8CBC4",
+"~	c #E9EFE2",
+"{	c #E9EFE0",
+"]	c #DFE9D2",
+"^	c #CDD4C3",
+"/	c #D5DDCA",
+"(	c #C8D6B0",
+"_	c #BDCD9F",
+":	c #ACB796",
+"<	c #BFC6B5",
+"[	c #E3ECD8",
+"}	c #C2D0A6",
+"|	c #A9B494",
+"1	c #CDDAB8",
+"2	c #B6C39C",
+"3	c #CAD3BE",
+"4	c #C5D3AC",
+"5	c #B2B8AA",
+"6	c #CBD7B9",
+"7	c #D7E1C9",
+"8	c #B6BCAD",
+"9	c #CDD7C1",
+"0	c #C3CBB8",
+"       .      ",
+"       ..     ",
+"       .+.    ",
+"    ....@#.   ",
+"   .$%&*=@-.  ",
+"  .;>,')@@@!. ",
+" .$~{*]@@@@@^.",
+" ./>(______:. ",
+".<[}______|.  ",
+".%1_:..._|.   ",
+".@_2.  .:.    ",
+".@_.   ..     ",
+".34.   .      ",
+".56.          ",
+" .7.          ",
+" .89.         ",
+"  .$0.        ",
+"   ..         "};
diff --git a/images/menu/menu_save.xpm b/images/menu/menu_save.xpm
new file mode 100644
index 0000000000..5fd3a35165
--- /dev/null
+++ b/images/menu/menu_save.xpm
@@ -0,0 +1,115 @@
+/* XPM */
+static char * menu_save_xpm[] = {
+"18 18 94 2",
+"  	c None",
+". 	c #010101",
+"+ 	c #F6F9FF",
+"@ 	c #ABD5FF",
+"# 	c #DEA69C",
+"$ 	c #E1B3AB",
+"% 	c #E0B2AB",
+"& 	c #E0B2AA",
+"* 	c #DDACA3",
+"= 	c #DAA299",
+"- 	c #DBA59C",
+"; 	c #D6958A",
+"> 	c #99CCFF",
+", 	c #C5E1FF",
+"' 	c #6699CC",
+") 	c #CC8376",
+"! 	c #C97362",
+"~ 	c #C97261",
+"{ 	c #C97061",
+"] 	c #C97364",
+"^ 	c #C87060",
+"/ 	c #CC7464",
+"( 	c #CC7F73",
+"_ 	c #416080",
+": 	c #B4D9FF",
+"< 	c #FFFFFF",
+"[ 	c #426283",
+"} 	c #F7F7F7",
+"| 	c #6090C0",
+"1 	c #3E5D7B",
+"2 	c #CCCCCC",
+"3 	c #CACACA",
+"4 	c #BDBDBD",
+"5 	c #E7E7E7",
+"6 	c #5D8AB8",
+"7 	c #3B5976",
+"8 	c #F9F9F9",
+"9 	c #EBEBEB",
+"0 	c #FCFCFC",
+"a 	c #F2F2F2",
+"b 	c #C8C8C8",
+"c 	c #C0C0C0",
+"d 	c #B8B8B8",
+"e 	c #EFEFEF",
+"f 	c #EBF1F8",
+"g 	c #F5F5F5",
+"h 	c #BBCAD7",
+"i 	c #6496C8",
+"j 	c #5D8BB9",
+"k 	c #5C89B7",
+"l 	c #5B87B5",
+"m 	c #6598CB",
+"n 	c #8EA4BC",
+"o 	c #C2C2C2",
+"p 	c #DFDFDF",
+"q 	c #72787D",
+"r 	c #2F475F",
+"s 	c #446587",
+"t 	c #273B50",
+"u 	c #314A61",
+"v 	c #CBCBCB",
+"w 	c #AAAAAA",
+"x 	c #263A4D",
+"y 	c #4B7095",
+"z 	c #436385",
+"A 	c #6294C5",
+"B 	c #C1C1C1",
+"C 	c #2F465D",
+"D 	c #446688",
+"E 	c #B3B3B3",
+"F 	c #243749",
+"G 	c #496D91",
+"H 	c #566B81",
+"I 	c #5E8EBD",
+"J 	c #2A3F55",
+"K 	c #476A8E",
+"L 	c #B4B4B4",
+"M 	c #9F9F9F",
+"N 	c #24374A",
+"O 	c #4A6E93",
+"P 	c #3B5A77",
+"Q 	c #4B5C6C",
+"R 	c #3D5C7A",
+"S 	c #919191",
+"T 	c #B2B2B2",
+"U 	c #808080",
+"V 	c #7D7D7D",
+"W 	c #777777",
+"X 	c #626262",
+"Y 	c #585858",
+"Z 	c #1A2836",
+"` 	c #354F69",
+" .	c #37526D",
+"..	c #273B4F",
+"  . . . . . . . . . . . . . . . .   ",
+". + @ # $ % & & & & & * = - ; > > . ",
+". , ' ) ! ~ { { { { { ] ^ / ( ' _ . ",
+". : ' < < < < < < < < < < < < ' [ . ",
+". : ' < < < < < < < < < < < } | 1 . ",
+". : ' < 2 2 2 2 2 2 2 2 3 4 5 6 7 . ",
+". : ' < < < < < < < < 8 9 5 5 6 7 . ",
+". : ' < < < < < < 0 a 5 5 5 5 6 7 . ",
+". : ' < 2 2 2 b c d d d d d 5 6 7 . ",
+". : ' < < < e 5 5 5 5 5 5 5 5 6 7 . ",
+". : ' f < g 5 5 5 5 5 5 5 5 h 6 7 . ",
+". : ' ' i j 6 6 6 6 6 k l 6 6 6 7 . ",
+". : ' m n d d o p 5 2 q r s 6 6 7 . ",
+". : ' | d d t u 5 v d w x y z 6 7 . ",
+". : A 6 d B C D B d d E F G D 6 7 . ",
+". H I 6 c p J K d d L M N O D 6 P . ",
+"  . Q R S T U U V W X Y Z u `  .... ",
+"    . . . . . . . . . . . . . . .   "};
diff --git a/images/menu/menu_undo.xpm b/images/menu/menu_undo.xpm
new file mode 100644
index 0000000000..3196538096
--- /dev/null
+++ b/images/menu/menu_undo.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * menu_undo_xpm[] = {
+"14 19 26 1",
+" 	c None",
+".	c #7F7F7F",
+"+	c #F7F2DC",
+"@	c #F7F3E0",
+"#	c #F6EABF",
+"$	c #F7F1DA",
+"%	c #E5DBB6",
+"&	c #CAC2A7",
+"*	c #D7CEAE",
+"=	c #DFD7B9",
+"-	c #CBB583",
+";	c #E8C985",
+">	c #EDD59A",
+",	c #C7B182",
+"'	c #EACE8D",
+")	c #D1C9AB",
+"!	c #EFDBA4",
+"~	c #DBC084",
+"{	c #EBD295",
+"]	c #DFD5B2",
+"^	c #E9D8A7",
+"/	c #C1BAA2",
+"(	c #EFE4BB",
+"_	c #E4D9B5",
+":	c #C6BEA4",
+"<	c #D6CDAD",
+"              ",
+"      .       ",
+"     ..       ",
+"    .+.       ",
+"   .@#....    ",
+"  .$####%&.   ",
+" .+#######*.  ",
+".=#########&. ",
+" .-;;;;;;>#%. ",
+"  .,;;;;;;'#).",
+"   .,;...-;!%.",
+"    .-.  .~;#.",
+"     ..   .;#.",
+"      .   .{].",
+"          .^/.",
+"          .(. ",
+"         ._:. ",
+"        .<&.  ",
+"         ..   "};
diff --git a/images/menu/menu_unindent.xpm b/images/menu/menu_unindent.xpm
new file mode 100644
index 0000000000..e0e0a82400
--- /dev/null
+++ b/images/menu/menu_unindent.xpm
@@ -0,0 +1,20 @@
+/* XPM */
+static char * menu_unindent_xpm[] = {
+"18 15 2 1",
+" 	c None",
+".	c #010101",
+"...........       ",
+"                  ",
+". . . . . . . . . ",
+"                  ",
+"  .     ..........",
+" .....  ..........",
+"......            ",
+" .....  ........  ",
+"  .     ........  ",
+"                  ",
+". . . . . . . . . ",
+"                  ",
+".............     ",
+"                  ",
+"...........       "};
diff --git a/lcl/interfaces/gtk/gtkobject.inc b/lcl/interfaces/gtk/gtkobject.inc
index e7569655bb..a4de6cacb3 100644
--- a/lcl/interfaces/gtk/gtkobject.inc
+++ b/lcl/interfaces/gtk/gtkobject.inc
@@ -2523,7 +2523,7 @@ begin
   if (Sender is TWinControl) and (TWinControl(Sender).HandleAllocated) then
   begin
     Widget:=Pointer(TWinControl(Sender).Handle);
-    if Gtk_Is_Object(Widget) then
+    if GtkWidgetIsA(Widget,gtk_object_get_type) then
     Begin
       Info := GetWidgetInfo(Widget, False);
       if Info <> nil then Dispose(Info);
@@ -4847,7 +4847,7 @@ var
   procedure SetContainerMenuToggleSize;
   var MenuClass: PGtkWidgetClass;
   begin
-    if GTK_IS_MENU(ContainerMenu) then begin
+    if GtkWidgetIsA(ContainerMenu,GTK_MENU_TYPE) then begin
       MenuClass:=GTK_WIDGET_CLASS(PGtkObject(ContainerMenu)^.klass);
       if OldMenuSizeRequestProc=nil then begin
         OldMenuSizeRequestProc:=MenuClass^.size_request;
@@ -4863,7 +4863,7 @@ begin
     MenuItem := PGtkWidget(Handle);
     ParentMenuWidget := PGtkWidget(Parent.Handle);
 
-    if GTK_IS_MENU_BAR(ParentMenuWidget) then begin
+    if GtkWidgetIsA(ParentMenuWidget,GTK_MENU_BAR_TYPE) then begin
       // mainmenu
       ContainerMenu:=ParentMenuWidget;
       gtk_menu_bar_insert(PGtkMenuBar(ParentMenuWidget),MenuItem,
@@ -4895,7 +4895,7 @@ begin
     
     SetContainerMenuToggleSize;
     
-    if GTK_IS_RADIO_MENU_ITEM(MenuItem) then
+    if GtkWidgetIsA(MenuItem,GTK_RADIO_MENU_ITEM_TYPE) then
       RegroupMenuItem(HMENU(MenuItem),GroupIndex);
 
     // Add accelerators
@@ -5347,6 +5347,9 @@ end;
  { =============================================================================
 
   $Log$
+  Revision 1.164  2002/08/16 17:47:38  lazarus
+  MG: added some IDE menuicons, fixed submenu indicator bug
+
   Revision 1.163  2002/08/15 15:46:49  lazarus
   MG: added changes from Andrew (Clipping)
 
@@ -5905,4 +5908,4 @@ end;
   Revision 1.1  2000/07/13 10:28:29  michael
   + Initial import
 
-}
\ No newline at end of file
+}