diff --git a/Makefile.in b/Makefile.in
index 89da1cd83..4c5b4df0b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -275,6 +275,7 @@ install-shared:
 	done
 	@for dir in share/icons/* ; do \
 		dir=`echo "$$dir" | sed 's,.*/,,'` ; \
+		test "$$dir" = "windows" && continue ; \
 		echo "$(mkinstalldirs) $(DESTDIR)$(icondir)/$$dir/apps" ; \
 		$(mkinstalldirs) $(DESTDIR)$(icondir)/$$dir/apps ; \
 		for file in share/icons/$$dir/*.png ; do \
diff --git a/installer/mkvtoolnix-unicode.nsi b/installer/mkvtoolnix-unicode.nsi
index 920461557..4854d1ff3 100644
--- a/installer/mkvtoolnix-unicode.nsi
+++ b/installer/mkvtoolnix-unicode.nsi
@@ -18,7 +18,7 @@ SetCompressorDictSize 64
 
 # MUI Settings
 !define MUI_ABORTWARNING
-!define MUI_ICON "matroskalogo_big.ico"
+!define MUI_ICON "mkvmergeGUI.ico"
 
 # Language Selection Dialog Settings
 !define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
diff --git a/share/icons/32x32/mkvinfo.xpm b/share/icons/32x32/mkvinfo.xpm
new file mode 100644
index 000000000..ec6bec15c
--- /dev/null
+++ b/share/icons/32x32/mkvinfo.xpm
@@ -0,0 +1,271 @@
+/* XPM */
+static const char * mkvinfo_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 233 2",
+"   c #242472",
+".  c #505050",
+"X  c #585857",
+"o  c #5D5D5C",
+"O  c #65635F",
+"+  c #646463",
+"@  c #696766",
+"#  c #6C6B6A",
+"$  c #706F6E",
+"%  c #70706E",
+"&  c #737271",
+"*  c #7A7976",
+"=  c #7C7B7A",
+"-  c #A60606",
+";  c #B00303",
+":  c #BF0000",
+">  c #A51211",
+",  c #C00101",
+"<  c #C00A0A",
+"1  c #C21E1D",
+"2  c #C2201F",
+"3  c #C43937",
+"4  c #C53B39",
+"5  c #AC6566",
+"6  c #C64744",
+"7  c #83817E",
+"8  c #1E1E98",
+"9  c #0101A4",
+"0  c #0D0DA5",
+"q  c #1515A7",
+"w  c #1A1AA8",
+"e  c #201FA9",
+"r  c #403EAE",
+"t  c #2C4780",
+"y  c #234688",
+"u  c #23498D",
+"i  c #2F4F8F",
+"p  c #304981",
+"a  c #38548E",
+"s  c #2C5192",
+"d  c #2E5698",
+"f  c #345E9E",
+"g  c #174CAC",
+"h  c #1A53B4",
+"j  c #4A5D84",
+"k  c #535284",
+"l  c #415E97",
+"z  c #56678A",
+"x  c #4D6494",
+"c  c #546C9C",
+"v  c #5E7097",
+"b  c #666484",
+"n  c #696784",
+"m  c #7E7D87",
+"M  c #6D7992",
+"N  c #6F7C98",
+"B  c #4645AF",
+"V  c #4B49AD",
+"C  c #4C4BB0",
+"Z  c #5453B1",
+"A  c #5A59B2",
+"S  c #4C78AF",
+"D  c #557BAC",
+"F  c #4B77B1",
+"G  c #577CB1",
+"H  c #677AA1",
+"J  c #7674AC",
+"K  c #6866B4",
+"L  c #6C6AB6",
+"P  c #2C5AC6",
+"I  c #2B64C6",
+"U  c #2662C9",
+"Y  c #2865C8",
+"T  c #2E6BC8",
+"R  c #3461C7",
+"E  c #4A6DC7",
+"W  c #4B75C9",
+"Q  c #7D7CC5",
+"!  c #7D869B",
+"~  c #508BAC",
+"^  c #5E81B4",
+"/  c #5486BA",
+"(  c #5C87B9",
+")  c #7A89A7",
+"_  c #659CA7",
+"`  c #6E9BA4",
+"'  c #729CA3",
+"]  c #6184B5",
+"[  c #648BBB",
+"{  c #4D83C0",
+"}  c #4E89CE",
+"|  c #5F93C4",
+" . c #6994C1",
+".. c #6295C8",
+"X. c #659CCB",
+"o. c #689ECC",
+"O. c #6BA0CE",
+"+. c #76A7CF",
+"@. c #77A8CD",
+"#. c #7EB7C2",
+"$. c #7EBBC8",
+"%. c #6BA7D9",
+"&. c #6DACDF",
+"*. c #72ACD7",
+"=. c #78AFDD",
+"-. c #77C5D7",
+";. c #838382",
+":. c #8A8986",
+">. c #86858C",
+",. c #8C8B8C",
+"<. c #908E8C",
+"1. c #93918E",
+"2. c #828A9D",
+"3. c #918F90",
+"4. c #959493",
+"5. c #989794",
+"6. c #9B9A96",
+"7. c #919499",
+"8. c #9C9B9A",
+"9. c #A09E9C",
+"0. c #868FA2",
+"q. c #8992A8",
+"w. c #8F9EBA",
+"e. c #9EA0A2",
+"r. c #9BA4B9",
+"t. c #A3A3A2",
+"y. c #A8A7A4",
+"u. c #AAA8A5",
+"i. c #ACACAB",
+"p. c #B0AFAD",
+"a. c #ABADB0",
+"s. c #AEB0B1",
+"d. c #B5B4B3",
+"f. c #B8B7B5",
+"g. c #B9B9B6",
+"h. c #B8B6BE",
+"j. c #BBBBBA",
+"k. c #C68681",
+"l. c #E3ACAA",
+"z. c #E4B6B4",
+"x. c #C3C1BF",
+"c. c #8282C5",
+"v. c #9391C8",
+"b. c #8EA4C6",
+"n. c #98A8C3",
+"m. c #85AFD7",
+"M. c #8FB0D7",
+"N. c #81B3D9",
+"B. c #81B8DE",
+"V. c #88BCDE",
+"C. c #A6A4CC",
+"Z. c #BDBDC7",
+"A. c #B0BBCE",
+"S. c #ADACD9",
+"D. c #A9BAD2",
+"F. c #A0BED8",
+"G. c #BAB8D7",
+"H. c #86C9DA",
+"J. c #88CDDF",
+"K. c #95D2DF",
+"L. c #BFC1C2",
+"P. c #B6C4D7",
+"I. c #B2C3D9",
+"U. c #85C2E3",
+"Y. c #8AC5E4",
+"T. c #92C3E2",
+"R. c #93CCE7",
+"E. c #9CCBE6",
+"W. c #91CCEA",
+"Q. c #93D1E6",
+"!. c #96D3EE",
+"~. c #9BD3EC",
+"^. c #99D7F0",
+"/. c #9DDAF2",
+"(. c #A1C6E4",
+"). c #A1CEE9",
+"_. c #A2DCE7",
+"`. c #A0D7EF",
+"'. c #B8DDEA",
+"]. c #A2DBF1",
+"[. c #9DE7F9",
+"{. c #A5E3F6",
+"}. c #ABE4F6",
+"|. c #A8E6F8",
+" X c #A7EBFA",
+".X c #ACEDFC",
+"XX c #B4ECF7",
+"oX c #B2EEFB",
+"OX c #BAEDFB",
+"+X c #B6F0FD",
+"@X c #BBF2FD",
+"#X c #C4C3C3",
+"$X c #C8C7C5",
+"%X c #C9C8C6",
+"&X c #C3C4CB",
+"*X c #CBCBCA",
+"=X c #D0CFCC",
+"-X c #D3D1CE",
+";X c #CACAD3",
+":X c #CECDDE",
+">X c #CED1D2",
+",X c #D4D4D3",
+"<X c #D8D7D4",
+"1X c #DBD9D6",
+"2X c #D7D8D8",
+"3X c #DDDDDC",
+"4X c #E6C6C4",
+"5X c #E7CFCC",
+"6X c #E0DFDE",
+"7X c #ECDEDB",
+"8X c #E2E0DD",
+"9X c #F2E0DE",
+"0X c #DCDAE1",
+"qX c #C2E7F6",
+"wX c #C4EAF4",
+"eX c #C0ECF9",
+"rX c #C5F3FD",
+"tX c #CBF4FD",
+"yX c #D3F6FD",
+"uX c #DBF9FE",
+"iX c #E4E4E3",
+"pX c #E9E8E7",
+"aX c #E7E8E9",
+"sX c #EBECEB",
+"dX c #F3E9E8",
+"fX c #F1F0EE",
+"gX c #ECECF0",
+"hX c #EFF1F2",
+"jX c #F4F4F4",
+"kX c #F8F7F6",
+"lX c #F8F8F7",
+"zX c #F7F8F8",
+"xX c #FFFFFF",
+/* pixels */
+"xXxXxXxXxXxXxXxXxXzXzXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxX",
+"xXxXxXxXxXzXsXiX<X&X%X,X8XsXzXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxX",
+"xXxXxXxXaX,Xj.! j j a o M a.=XsXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxX",
+"xXxXxX3Xx.0.p u ] ....[ s t M g.3XxXxXxXxXxXxXxXxXxXxXxXxXxXxXxX",
+"xXxX3Xd.N y G +.~.R.R.).@.D u z y.;.#XxXxXxXxXxXxXxXxXxXxXxXxXxX",
+"xXkXp.2.y [ V.`.qX].Q.'.~.T. .u M y.6.# sXz.l.4XxXxXxXxXxXxXxXxX",
+"xX%X8.a S E.~.}.eXH.J.OX}.`.).( i 7.*X9X4 , , , 6 7X6X1X1XsXxXxX",
+"xXy.! d N.~./.}.J.-.[.[.}.`.!.V.f M y.3 , , , , : 6 kXpX,Xi.7 $X",
+"aX5.v F W.!.{.}.$. X X.XoX|.^.W./ x 1.; , : , , : < dXxXxXxXiXo ",
+"2X4.c | !.{..XK._.+X+X+XoX.X{.U.{ l ,.- , : , , , , 5XxXxXxXxX@ ",
+",X1.c o.^.|..X#.+X@X@X@X@X}.&.T h x ,.> , : , , , 1 xXxXxXxXiXo ",
+"8X4.H ../.|.OX` tXtXtXtXXXT U Y h c >.5 , : : : < k.*XxXxXxX= = ",
+"zX6.q.{ /.}.OX' tXyXyXwXW P P Y g ) b V k.4 2 4 z.xX+ xXxX8.@ iX",
+"xXi.t.^ U.}.@X' yXuXuXm.P I } %.F r.k 9 q C K C Q xXf.f.9.@ 6XxX",
+"xX3X6.r...!.oX' yXuXuXE R B.{.X.w.6.8XC.0 9 9 9 w jXsX7 # iXxXxX",
+"xXxXd.y.n.O.!._ rXyX'.R =.].*.b.f.j.xXxXv.9 9 9 w h.% * pXxXxXxX",
+"xXxXxX4.p.A.N.~ R.}.Y.Y H.=.D.d.t.sX2X#XiXe 9 Z ,.+ u.f.f.xXxXxX",
+"xXxX=XlXs.t.%XP.F.(.T.M.I.&Xu.s.#Xy.>XaX&XJ 0.$ 5 iXxX,X6.xXxXxX",
+"xXd.jXxXxX2Xy.t.i.f.d.a.y.4.*XxX3X. = >XgXd.# 0.P sXxXxX;.xXxXxX",
+"*X$XxXxXxXxXxXsX@ i.#Xn o o # 3XjX;.o & #XgXZ.8 C xXxXxX& xXxXxX",
+"= kXxXxXxXxXxXxXiX7 xX$ o o o & y.% X + # a.hX;X&XxXxXsX1.xXxXxX",
+"+ =XxXxXxXxXxXxXxX:.*X+ o o o o 5.,XxX>.# + e.aX6X,XxX%Xt.xXxXxX",
+"= @ j.<XpXlX8X<X$Xy.7 O o o o m 0X:Xc.q   & # 7.iXaX,X5.=XxXxXxX",
+"sX8.@ o + + + + $ ;.j.<.' 5 t.G.L B r A S.e.= % ,.2XaX<.xXxXxXxX",
+"xXxXxX1X1X<X1XlXxXxXxX,X# sXxXxXxXxXxXxXzXxXd.;.= ;.*XsX,XzXxXxX",
+"xXxXxXxXxXxXxXxXxXxXxXxX1XO 1XxXxXxXxXxXxXxXxX#X3.>.= L.sX>XsXxX",
+"xXxXxXxXxXxXxXxXxXxXxXxXxXpX7 <.aXxXxXxXxXxXxXxX8.:.7.7 d.iX,XaX",
+"xXxXxXxXxXxXxXxXxXxXxXxXxXxXxX#X$ * d.-X1X-Xp.@ 4.2Xt.t.;.i.iX%X",
+"xXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXsXf.6.5.6.j.fXzXxXiXy.a.3.t.3X",
+"xXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXaXd.7.g.xX",
+"xXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXsX$XxXxX",
+"xXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxX"
+};
diff --git a/src/mmg/matroskalogo.xpm b/share/icons/32x32/mkvmergeGUI.xpm
similarity index 99%
rename from src/mmg/matroskalogo.xpm
rename to share/icons/32x32/mkvmergeGUI.xpm
index a180aeeb5..2be4450ba 100644
--- a/src/mmg/matroskalogo.xpm
+++ b/share/icons/32x32/mkvmergeGUI.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * matroskalogo_xpm[] = {
+static const char * mkvmergeGUI_xpm[] = {
 "32 32 262 2",
 "  	c None",
 ". 	c #FFFFFF",
diff --git a/share/icons/64x64/mkvinfo.xpm b/share/icons/64x64/mkvinfo.xpm
new file mode 100644
index 000000000..f8f205c8c
--- /dev/null
+++ b/share/icons/64x64/mkvinfo.xpm
@@ -0,0 +1,320 @@
+/* XPM */
+static const char * mkvinfo_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"64 64 250 2",
+"   c #282726",
+".  c #282826",
+"X  c #302F2D",
+"o  c #32312F",
+"O  c #3A3937",
+"+  c #41403D",
+"@  c #15155D",
+"#  c #0F0F6E",
+"$  c #1B366E",
+"%  c #183779",
+"&  c #2F3B6F",
+"*  c #2C406B",
+"=  c #3A496A",
+"-  c #444442",
+";  c #4B4947",
+":  c #504E4B",
+">  c #54524F",
+",  c #555554",
+"<  c #5A5957",
+"1  c #5C5C5C",
+"2  c #615F5C",
+"3  c #64625E",
+"4  c #444A6D",
+"5  c #455474",
+"6  c #595C73",
+"7  c #5F687A",
+"8  c #626262",
+"9  c #6B6965",
+"0  c #676868",
+"q  c #6C6B6B",
+"w  c #71716E",
+"e  c #6A6B74",
+"r  c #747373",
+"t  c #7B7976",
+"y  c #777578",
+"u  c #7C7C7C",
+"i  c #930A0A",
+"p  c #A00101",
+"a  c #BF0101",
+"s  c #B10C0C",
+"d  c #942E2C",
+"f  c #C00000",
+"g  c #C00C0C",
+"h  c #C21615",
+"j  c #C01D1C",
+"k  c #C32523",
+"l  c #C33634",
+"z  c #C5403D",
+"x  c #817E7B",
+"c  c #9F7571",
+"v  c #C64744",
+"b  c #C75956",
+"n  c #C9615E",
+"m  c #CA736F",
+"M  c #85837D",
+"N  c #03039C",
+"B  c #14149C",
+"V  c #1A3D84",
+"C  c #143B89",
+"Z  c #0101A4",
+"A  c #0C0CA5",
+"S  c #1414A7",
+"D  c #1B1AA8",
+"F  c #2827AA",
+"G  c #302FAB",
+"H  c #3736A9",
+"J  c #1C4087",
+"K  c #1E438A",
+"L  c #154296",
+"P  c #22458B",
+"I  c #25478B",
+"U  c #2B4C8D",
+"Y  c #324D83",
+"T  c #294D91",
+"R  c #2E5395",
+"E  c #355795",
+"W  c #2D698C",
+"Q  c #3C629D",
+"!  c #2153AD",
+"~  c #2357B1",
+"^  c #3A65A5",
+"/  c #2760BF",
+"(  c #4F5D8C",
+")  c #4B7882",
+"_  c #536A98",
+"`  c #737985",
+"'  c #6E7493",
+"]  c #4948B0",
+"[  c #5A58B2",
+"{  c #605EA3",
+"}  c #466BA3",
+"|  c #4B74AA",
+" . c #5474A8",
+".. c #5776A9",
+"X. c #4C7CB5",
+"o. c #6975A2",
+"O. c #7876B7",
+"+. c #2C5BC6",
+"@. c #3156C4",
+"#. c #2662C5",
+"$. c #2661C9",
+"%. c #2A65C8",
+"&. c #3666C7",
+"*. c #3874CB",
+"=. c #4B71C8",
+"-. c #4378CB",
+";. c #538895",
+":. c #798297",
+">. c #588BA8",
+",. c #5582B5",
+"<. c #5A86B8",
+"1. c #699CA8",
+"2. c #6E8CB5",
+"3. c #6589B8",
+"4. c #7694BD",
+"5. c #59A7BA",
+"6. c #75A5AF",
+"7. c #6BA8B6",
+"8. c #598DC5",
+"9. c #528CCB",
+"0. c #6799C7",
+"q. c #789BC8",
+"w. c #6997D1",
+"e. c #6CA4C4",
+"r. c #73A4CD",
+"t. c #70ADD1",
+"y. c #76AAD5",
+"u. c #6CB2D1",
+"i. c #7AB7D8",
+"p. c #7BB4DB",
+"a. c #7CC7D9",
+"s. c #848483",
+"d. c #888682",
+"f. c #8C8985",
+"g. c #86878A",
+"h. c #8B8B8B",
+"j. c #918E89",
+"k. c #93918E",
+"l. c #848A97",
+"z. c #949494",
+"x. c #989691",
+"c. c #9B9995",
+"v. c #95979A",
+"b. c #9C9C9B",
+"n. c #A19E99",
+"m. c #A4A29D",
+"M. c #A8A59E",
+"N. c #868FAA",
+"B. c #9B9BA4",
+"V. c #8987BA",
+"C. c #8B98B6",
+"Z. c #9B98BC",
+"A. c #A19EBF",
+"S. c #95AAB6",
+"D. c #A4A4A4",
+"F. c #ACAAA4",
+"G. c #A3A5A9",
+"H. c #A7A8A8",
+"J. c #ACACAC",
+"K. c #B1AEA7",
+"L. c #B2AFA9",
+"P. c #B4B1AC",
+"I. c #B9B6AF",
+"U. c #ABA9BA",
+"Y. c #AFB2B6",
+"T. c #B4B4B4",
+"R. c #BAB7B1",
+"E. c #BCB9B3",
+"W. c #B7B7B9",
+"Q. c #BCBCBC",
+"!. c #CD8C87",
+"~. c #CE9993",
+"^. c #D0A59E",
+"/. c #CCACA5",
+"(. c #C3BEB9",
+"). c #C5C3BD",
+"_. c #839CC6",
+"`. c #8DB0C8",
+"'. c #89B7D8",
+"]. c #83BCDC",
+"[. c #93B7D6",
+"{. c #ADAAC1",
+"}. c #A8B2CD",
+"|. c #B9B8C4",
+" X c #85BEE2",
+".X c #C1BDC4",
+"XX c #93C6CF",
+"oX c #8AC5D9",
+"OX c #97C9DB",
+"+X c #BFC1C2",
+"@X c #A7C6D7",
+"#X c #87C1E4",
+"$X c #8BC5E6",
+"%X c #8CC8E5",
+"&X c #8FCAE9",
+"*X c #97C9E6",
+"=X c #92CDEA",
+"-X c #8FD2EE",
+";X c #9BD9E6",
+":X c #95D2ED",
+">X c #9BD5EE",
+",X c #98D8F1",
+"<X c #9DD9F1",
+"1X c #A0CFEA",
+"2X c #B8CBE4",
+"3X c #A3D4ED",
+"4X c #AAD9EA",
+"5X c #B3DBEA",
+"6X c #A2DDF3",
+"7X c #9AE7FA",
+"8X c #A5E3F6",
+"9X c #A9E4F6",
+"0X c #A5E6F8",
+"qX c #ABE6F8",
+"wX c #A4EAFB",
+"eX c #ACECFB",
+"rX c #B3E2F3",
+"tX c #BCE6F6",
+"yX c #B3ECFB",
+"uX c #BBEEFB",
+"iX c #B5F1FD",
+"pX c #BBF2FD",
+"aX c #C3C3C4",
+"sX c #C9C9C8",
+"dX c #CBCBCB",
+"fX c #D2D0CF",
+"gX c #CACCD1",
+"hX c #CED1D2",
+"jX c #CBD1DF",
+"kX c #D3D4D4",
+"lX c #D5DADC",
+"zX c #D8D8D8",
+"xX c #DBDBDB",
+"cX c #E3E1DE",
+"vX c #C9D4E4",
+"bX c #DBDDE1",
+"nX c #DDE2E3",
+"mX c #C5ECF9",
+"MX c #C5F2FC",
+"NX c #CCF4FD",
+"BX c #D3F6FE",
+"VX c #D7F8FE",
+"CX c #DBF9FE",
+"ZX c #E4E4E4",
+"AX c #E5E9EA",
+"SX c #ECECED",
+"DX c #F0EFED",
+"FX c #E5F7FA",
+"GX c #F3F3F3",
+"HX c #FFFFFF",
+/* pixels */
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXDXDXGXGXGXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXAXxXzXhXfXkXhXkXkXzXxXAXGXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXGXzXsXfXxXxXxXkXfXsXkXzXzXxXhXfXzXGXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXkXaXsXxXkXP.g.7 5 = = 4 5 ` v.).zXkXaXzXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXSXaXaXxXdXv.5 $ $ % K P I I % % $ & e K.kXaXaXDXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXZXW.aXkXF.5 $ V P E 3.4.<.<.4.3.} I P % & ` +XaXW.AXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXZXY.Q.dX:.$ V E } ^ q.[.[.0.e.[.[.`.| } } P % 6 F.+XJ.cXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXAXJ.T.).' % U } ..X.q.OXOX$X X X%XoX[.r.<.3. .E V 5 B.T.b.m.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXGXY.J.E.` % U  .3.4.y.%X*X>X3X&X:X>X3X*Xi.e...| } E V 5 m.Y.r o 8 m.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXaXB.Y.l.V U | <.0.].=X4XtXtXtX-X-XrX5X5XOXoX*Xr.<.} R V _ D.D.f.9 O + f.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXxXb.F.D.Y K ^ ,.y.*X=X:XrXtXuXtX-Xa.OX5X5XrX>X3X4X[.3.} I * l.D.b.ZXcXf.> F.HX~.m b b m ^.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXT.v.H.' V E X.'.1X3X=X6XtXmXMXmXa.5.5XNXmXuX<X>X4X>X[.0.} K ( D.b.T.HXHXHX~.l g f a a a g v /.HXHXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXZXz.v.G.U T | y.*X3X1X>X6XuXtXyXoX5.a.8XrXqXtX8X<X4X4X*X'.X.R K :.b.z.ZXHX!.h f f f f f f a a k ~.cX(.E.I.P.K.P.E.HXHXHXHXHX",
+"HXHX|.h.B.:.V Q 8.*X*X4X>X6XqX9X7Xa.5.a.7X7X7X7X8X9X6X>X>X>X*Xw.} K _ b.h.+X~.s f f f f f f f f a a j /.SXDXcXE.P.m.d.y M m.HXHX",
+"HXHXD.k.G._ P | y.*X=X:X>X6XqXqX7X7.a.7X7X7XwXwXeXeX6X<X:X:X&X].<.R T B.z.D.l a f f f f f f f f a a a n HXHXHXHXHXHXHXE.s.1 w K.",
+"HXSXz.h.G.U R 3.#X$X:X<X6X8XeXiXa.7.wXwXwXwXwXeXeXyX9X8X<X:X&X$Xe.Q K N.n.x s f f f f f f f f f a a a s HXHXHXHXHXHXHXHXHXf.1 8 ",
+"HXkXd.z.C.I ^ y.$X&X:X<X8XqXeX4X7.XXeXeXeXeXiXiXpXeXeX0X6X<X=X&Xp.| K o.x.x p f f f f f f f f f a a f h ^.HXHXHXHXHXHXHXHXHX8 1 ",
+"HXsXs.c.N.J | ].%X:X7X0XeXeXeXoXXXiXiXiXiXiXiXiXiXeXeXeXwX7X>X&X X<.P o.n.x i f f f f f f f f f f f f g ~.HXHXHXHXHXHXHXHXHXt 1 ",
+"HXQ.u b.N.K <.#X%X>X8XeXeXeXiX7.XXiXpXpXiXpXpXiXiXiXeXeXqX0X].0.9./ C _ n.x i f f f f f f f f f f f f g ^.HXHXHXHXHXHXHXHXHXq 1 ",
+"HXQ.x c.N.K 8.#X&X,X0XwXeXeX;X7.8XpXpXpXpXpXpXpXyXyXiXeX7Xi.*.%.~ ~ C  .n.` i f f a f f f f f f f f f j HXHXHXHXHXHXHXHXHXHX8 1 ",
+"HX+Xx c.C.K 8.$X-X;X0XeXeXeXXX6.pXpXpXpXpXpXpXpXpXyXiX%Xw.9.#.#.#.~ C o.D.s.d f f f f f f f a f f f f b HXHXHXHXHXHXHXHXHXk.1 1 ",
+"HXsX:.x.S.I 3.%X-X;X4XeXiXpX1.1.MXNXNXNXNXNXNXMXMXuXu.%.$.$.#.#.#.~ C 2.n.y c g a f f f f f a g f f j /.DXHXHXHXHXHXHXHXE.2 1 y ",
+"HXxXd.z.Y.R ,.#X;X;X0XyXyXpX;.S.NXNXNXNXNXNXNXNXMXy.%.$.$.$.$.#.#.! V C.n.7 B.m g a f f f f f a f h ~.(.- HXHXHXHXHXHXHXt 1 2 I.",
+"HXSXj.h.W. .^ ].=X>X9XyXuXuX) S.NXNXBXBXBXNXBXNX'.+.+.+.$.$.$.#.~ ! R T.z.4 H (.!.k f f f f a a l ^.HXHX- x HXHXHXHXHXf.1 1 c.HX",
+"HXGXb.h.F.C.R p.$X>X8XeXuXuX) XXNXBXVXVXVXVXBX@X=.+.+.+.$.$.#.#.~ L  .W.g.# N H A.(.!.b z z b ~.HXHXHXHXn.X HXHXHXHXk.1 1 f.HXHX",
+"HXHXQ.g.v.|.E 8.$X=X6XeXiXpX) +XNXBXVXCXCXVXNXw.+.+.+.$.#.%.-.9.9.I A.J.` # Z Z A ] V.|..X.X{.V.[ HXHXHXHX- M HXHXz.1 1 x HXHXHX",
+"HXHXAXh.v.R.C.^  X=X<XqXyXiX) XXVXVXCXCXCXCX}.=.@.+.+.%.w.p.:X$XX. .aXc.e { S Z Z Z Z Z A S Z Z Z Z.HXHXHXx., HXf.1 1 M HXHXHXHX",
+"HXHXGXJ.h.D.sX} 8.$X:X8XyXyXW XXNXVXCXCXFXCXq.@.+.+.-.'.9X>X=Xy.E |.P.h.G.GX{.G Z Z Z Z Z Z Z Z Z ] HXHXHXHXE.M 1 1 f.HXHXHXHXHX",
+"HXHXHXZXh.b.Y.|.^ y.=X%X9XyX;.S.NXVXVXFXCXCX=.@.@.-.oXeX<X=X X^ `.sXv.h.ZXHXHX.XH Z Z Z Z Z Z Z Z D gXHXHXE.q 1 1 x.HXHXHXHXHXHX",
+"HXHXHXHXQ.h.G.Q.}.} e.=X>X9X>.6.MXNXVXVXCX@X*.+.&.oXeX6X:X$XX.4.zXD.v.aXHXHXHXHX{.D Z Z Z Z Z Z Z A A.HXM.8 1 8 F.HXHXHXHXHXHXHX",
+"HXHXHXHXGXb.z.J.sX}.X.y.=X<X1.1.pXpXMXNXNX[.&.+.w.eX6X=X#XX._.xXJ.G.|.cXHXHXHXHXHXO.Z Z Z Z Z Z A [ W.s.1 2 w E.HXHXHXHXHXHXHXHX",
+"HXHXHXHXHXAXz.v.P.aXgX8.e.#Xe.;.9XyXyXpXuXp.%.*.].>X=Xy.<.}.xXT.D.G.AXSXSXsXH.ZXHXgXF Z Z Z Z F Z.F.q 1 1 k.HXw M HXHXHXHXHXHXHX",
+"HXHXHXHXHXHXx.j.b.T..XlX[.0.0.W t.<X<X0X8Xy.+.-.%Xp.w.r.vXkXT.B.s.T.nXAXkX.XfXJ.xXHX[ Z Z S O.Q.M 1 < w P.HXHXt 1 HXHXHXHXHXHXHX",
+"HXHXHXHXHXm.HXZXv.k.T.Q.fXbX2X4.0.y.p.i.p.8.&.8.y.[.vXxXsXT.z.z.H.L.Q.sXkXSXSXzXJ.kXV.Z ] U.n.8 1 2 x.HXHXHXHXn.O HXHXHXHXHXHXHX",
+"HXHXHXHXc.HXHXHXSXY.g.D.Q..XfXxXnXvX2X2X2X2XvXjXxXzXsXQ.D.g.L.GXHXJ.b.g.T.bXSXSXcXT.B.U.F.w 1 1 u I.HXHXHXHXHXE.  HXHXHXHXHXHXHX",
+"HXHXHXz.sXHXHXHXHXHXkXv.h.D.T.|.sXsXkXfXkXfXgXsX.XT.B.h.b.xXGXHXHXAXq , q J.lXAXGXAXT.r 1 1 q m.U.] U.HXHXHXHXHX  HXHXHXHXHXHXHX",
+"HXHXc.M.HXHXHXHXHXHXHXGXzXD.g.h.` b.D.H.D.H.B.g.j.w 9 j.).HXHXHXHXb.+ 1 2 e D.kXnXGXSXQ.w c.U.[ A F HXHXHXHXHXHX  ).HXHXHXHXHXHX",
+"HXI.t HXHXHXHXHXHXHXHXHXHXGXAXkX9 . v.z.v.v.6 4 9 < 1 1 2 h.HXHXHXzX0 , 0 2 0 b.dXnXDXGXsX' B N Z O.HXHXHXHXHXHX  E.HXHXHXHXHXHX",
+"HXt m.HXHXHXHXHXHXHXHXHXHXHXHXHXHXo k.GXGXGXW.6 1 1 1 1 1 1 x HXHXHXnX0 < q 2 8 v.sXbXSXGXzX{ N D |.HXHXHXHXHXHX. ).HXHXHXHXHXHX",
+"K.1 cXHXHXHXHXHXHXHXHXHXHXHXHXHXHXM + HXHXHXk.1 1 1 < 1 1 1 1 n.HX(.k.8 O 1 r 8 1 h.aXlXAXHXxX' o.HXHXHXHXHXHXHX  HXHXHXHXHXHXHX",
+"s.1 HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXO f.HXHXw 1 1 1 1 1 1 1 1 q u 0 2 2 w , 1 y 8 1 s.W.hXAXGXAXJ.xXHXHXHXHXHXE.  HXHXHXHXHXHXHX",
+"w 1 E.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXz.o E.HXq 1 1 1 1 1 1 1 1 1 1 q k.I.HXSXt < t 9 , t T.kXAXGXSXT.sXHXHXHXHXm.X HXHXHXHXHXHXHX",
+"q 1 M HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX3 x HXw 1 1 1 1 1 1 1 1 q M.HXHXHXHXHXSX4 1 :.w , r J.sXbXHXGXQ.sXHXHXHXx , HXHXHXHXHXHXHX",
+"u 1 1 k.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXE.F.m.q 1 1 1 1 1 2 < 2 n.HXHXHXHXHXU.] N @ 1 d.y , q D.sXlXGXGXsX).HXHX: M HXHXHXHXHXHXHX",
+"I.8 1 1 q d.M.I.E.DXHXDXsXI.P.F.c.g.y q 2 1 1 1 1 1 1 1 1 < 6 A.|.|.{.V.] S Z Z N @ 1 h.` 1 0 b..XxXSXHXsXQ.xX  R.HXHXHXHXHXHXHX",
+"HXK.q 1 1 1 1 1 8 q q q q 3 8 1 < 1 1 2 q t k.M.u 2 1 1 2 x N.[ G F S Z Z Z Z S H O.y 1 k.s.8 8 z.|.kXSXHXfXg.O HXHXHXHXHXHXHXHX",
+"HXHXHXm.t q 8 1 2 1 1 1 2 2 9 w t f.n.I.HXHXm.7 R.L.n.n.I.HXHXHX|.A.V.O.O.V.{.{.HXHXHXD.8 k.h.q 8 k.W.gXAXHXcXj.AXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXE.P.K.K.K.K.P.E.cXHXHXHXHXHXHXHXHX1 : ).HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXT.8 z.z.r 8 h.T.gXZXHXZXW.ZXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX< - P.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXQ.8 z.v.u 9 s.J.aXxXGXAXW.xXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX9 O m.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXsXq c.b.s.q x H.aXzXGXSXQ.kXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXM o t HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXkXr c.D.g.r u b.).zXSXDXaXsXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXM.+ ; F.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXbXu v.H.z.y t c.Q.kXSXGXsXsXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXt o 2 F.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXL.; + c.J.b.:.t v.E.dXZXSXsXW.HX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXP.3 o , x.cXHXHXHXHXHXHXHXHXHXHXP.9 X 9 GXz.v.T.b.g.t z.T.dXZXSXsXW.",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXI.t O o > t n.K.P.I.K.c.w ; X 1 F.HXHXGXb.b.W.D.k.` h.J.sXZXAXW.",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXK.M < O o X   . + 3 j.).HXHXHXHXHXHXD.b.T.F.v.s.h.H.sXQ.xX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXJ.b.Q.J.b.h.h.v.kXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXT.n.aXT.B.w Q.HXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXQ.D.T.w E.HXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXsXr T.HXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXSXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX"
+};
diff --git a/src/mmg/matroskalogo_big.xpm b/share/icons/64x64/mkvmergeGUI.xpm
similarity index 99%
rename from src/mmg/matroskalogo_big.xpm
rename to share/icons/64x64/mkvmergeGUI.xpm
index d1e5c347c..ccf90f09d 100644
--- a/src/mmg/matroskalogo_big.xpm
+++ b/share/icons/64x64/mkvmergeGUI.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *matroskalogo_big_xpm[] = {
+static const char *mkvmergeGUI_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "64 64 218 2",
 "   c #242322",
diff --git a/share/icons/windows/mkvinfo.ico b/share/icons/windows/mkvinfo.ico
new file mode 100644
index 000000000..46fbeffb5
Binary files /dev/null and b/share/icons/windows/mkvinfo.ico differ
diff --git a/src/mmg/matroskalogo_big.ico b/share/icons/windows/mkvmergeGUI.ico
similarity index 100%
rename from src/mmg/matroskalogo_big.ico
rename to share/icons/windows/mkvmergeGUI.ico
diff --git a/src/extract/resources.rc b/src/extract/resources.rc
index 3ce26d9d7..ca2ec9e5b 100644
--- a/src/extract/resources.rc
+++ b/src/extract/resources.rc
@@ -1,4 +1,4 @@
-MATROSKAICON ICON  "../mmg/matroskalogo_big.ico"
+MATROSKAICON ICON  "../../share/icons/windows/mkvmergeGUI.ico"
 
 1 VERSIONINFO
  FILEVERSION 4, 0, 0, 0
diff --git a/src/info/matroska.xpm b/src/info/matroska.xpm
deleted file mode 100644
index c58fa86cc..000000000
--- a/src/info/matroska.xpm
+++ /dev/null
@@ -1,195 +0,0 @@
-/* XPM */
-static const char * matroska_xpm[] = {
-"32 32 160 2",
-"  	c None",
-". 	c #121212",
-"+ 	c #090909",
-"@ 	c #0A0A0A",
-"# 	c #4D4D4D",
-"$ 	c #F0F0F0",
-"% 	c #FFFFFF",
-"& 	c #FAFAFA",
-"* 	c #6D6D6D",
-"= 	c #080808",
-"- 	c #727272",
-"; 	c #7D7D7D",
-"> 	c #0B0B0B",
-", 	c #878787",
-"' 	c #ABABAB",
-") 	c #000000",
-"! 	c #212121",
-"~ 	c #D5D5D5",
-"{ 	c #EDEDED",
-"] 	c #484848",
-"^ 	c #6C6C6C",
-"/ 	c #777777",
-"( 	c #010101",
-"_ 	c #E7E7E7",
-": 	c #F9F9F9",
-"< 	c #616161",
-"[ 	c #020202",
-"} 	c #B0B0B0",
-"| 	c #191919",
-"1 	c #7B7B7B",
-"2 	c #F4F4F4",
-"3 	c #545454",
-"4 	c #7C7C7C",
-"5 	c #B8B8B8",
-"6 	c #7E7E7E",
-"7 	c #252525",
-"8 	c #FCFCFC",
-"9 	c #F2F2F2",
-"0 	c #525252",
-"a 	c #353535",
-"b 	c #868686",
-"c 	c #343434",
-"d 	c #FEFEFE",
-"e 	c #555555",
-"f 	c #151515",
-"g 	c #181818",
-"h 	c #DEDEDE",
-"i 	c #404040",
-"j 	c #8D8D8D",
-"k 	c #7F7F7F",
-"l 	c #4C4C4C",
-"m 	c #F3F3F3",
-"n 	c #515151",
-"o 	c #030303",
-"p 	c #595959",
-"q 	c #101010",
-"r 	c #0D0D0D",
-"s 	c #9A9A9A",
-"t 	c #CECECE",
-"u 	c #898989",
-"v 	c #373737",
-"w 	c #B3B3B3",
-"x 	c #C9C9C9",
-"y 	c #858585",
-"z 	c #1D1D1D",
-"A 	c #070707",
-"B 	c #F7F7F7",
-"C 	c #F8F8F8",
-"D 	c #F5F5F5",
-"E 	c #CDCDCD",
-"F 	c #8A8A8A",
-"G 	c #161616",
-"H 	c #8E8E8E",
-"I 	c #434343",
-"J 	c #CCCCCC",
-"K 	c #131313",
-"L 	c #8C8C8C",
-"M 	c #7A7A7A",
-"N 	c #4F4F4F",
-"O 	c #D6D6D6",
-"P 	c #C5C5C5",
-"Q 	c #232323",
-"R 	c #2A2A2A",
-"S 	c #ADADAD",
-"T 	c #6E6E6E",
-"U 	c #939393",
-"V 	c #4B4B4B",
-"W 	c #D9D9D9",
-"X 	c #FDFDFD",
-"Y 	c #707070",
-"Z 	c #828282",
-"` 	c #717171",
-" .	c #747474",
-"..	c #F1F1F1",
-"+.	c #141414",
-"@.	c #BCBCBC",
-"#.	c #FBFBFB",
-"$.	c #6A6A6A",
-"%.	c #666666",
-"&.	c #505050",
-"*.	c #E1E1E1",
-"=.	c #F6F6F6",
-"-.	c #686868",
-";.	c #1A1A1A",
-">.	c #CBCBCB",
-",.	c #B2B2B2",
-"'.	c #A5A5A5",
-").	c #EAEAEA",
-"!.	c #EBEBEB",
-"~.	c #3F3F3F",
-"{.	c #959595",
-"].	c #B5B5B5",
-"^.	c #6B6B6B",
-"/.	c #636363",
-"(.	c #2C2C2C",
-"_.	c #E3E3E3",
-":.	c #272727",
-"<.	c #E2E2E2",
-"[.	c #AEAEAE",
-"}.	c #BBBBBB",
-"|.	c #BFBFBF",
-"1.	c #E4E4E4",
-"2.	c #909090",
-"3.	c #787878",
-"4.	c #282828",
-"5.	c #C0C0C0",
-"6.	c #3C3C3C",
-"7.	c #333333",
-"8.	c #0C0C0C",
-"9.	c #C4C4C4",
-"0.	c #DDDDDD",
-"a.	c #E8E8E8",
-"b.	c #565656",
-"c.	c #1C1C1C",
-"d.	c #EFEFEF",
-"e.	c #424242",
-"f.	c #797979",
-"g.	c #040404",
-"h.	c #454545",
-"i.	c #9E9E9E",
-"j.	c #A9A9A9",
-"k.	c #5D5D5D",
-"l.	c #111111",
-"m.	c #DCDCDC",
-"n.	c #8F8F8F",
-"o.	c #DADADA",
-"p.	c #474747",
-"q.	c #D4D4D4",
-"r.	c #1B1B1B",
-"s.	c #D3D3D3",
-"t.	c #242424",
-"u.	c #393939",
-"v.	c #C1C1C1",
-"w.	c #989898",
-"x.	c #C3C3C3",
-"y.	c #DFDFDF",
-"z.	c #4A4A4A",
-"A.	c #575757",
-"B.	c #292929",
-"C.	c #9C9C9C",
-". + @ @ @ @ @ @ + # $ % & * + = - % % % % % ; + > , & % % % % ' ",
-"@ ) ) ) ) ) ) ) ) ! ~ % { ] ) ) ^ % % % % % / ( @ _ % % % % : < ",
-"@ ) ) ) ) ) ) ) ) [ } % ~ | ) ) ^ % % % % % 1 ( | & % % % % 2 3 ",
-"@ ) ) ) ) ) ) ) ) ) 4 % 5 [ ) ) ^ % % % % % 6 [ 7 8 % % % % 9 0 ",
-"@ ) ) ) ) ) ) ) ) ) a 8 b ) ) ) ^ % % % % % 6 [ c d % % % % 2 e ",
-"@ ) ) ) ) ( f ( ) ) g h i ) ) ) j % % % % % k [ l d % % % % m n ",
-"@ ) ) ) ) o p q ) ) r s ! ) ) ) t % % % % % u v w % % % % % x 7 ",
-"@ ) ) ) ) ) y ] ) ) [ z A ) ) > B % % % % % & C d % % D E F G A ",
-"@ ) ) ) ) ) H b ) ) ) ) ) ) ) I % % % % % % & & % % % D J b K A ",
-"@ ) ) ) ) ) L } = ) ) ) ) ) ) y % % % % % d M N O % % % % % P Q ",
-"@ ) ) ) ) ) F O R ) ) ) ) ) > S % % % % % 8 T [ U % % % % % 9 n ",
-"@ ) ) ) ) ) M 2 V ) ) ) ) ) R W % % % % % X Y ( j % % % % % 2 e ",
-"@ ) ) ) ) ) Y 8 Z ) ) ) ) ) I 2 % % % % % d - ( j % % % % % m 0 ",
-"@ ) ) ) ) ) ` 8 x ) ) ) ) )  .d % % % % % 8 * ( L % % % % % 2 3 ",
-"@ ) ) ) ) ) ` 8 ..+.) ) ) ) @.% % % % % % #.$.( T % % % % % #.%.",
-"= ) ) ) ) ) ` 8 & &.) ) ) = *.=.$ $ $ $ $ $ -.( ;.>...#.% % % ,.",
-"'.).!.!.!.!.2 % d L [ ) ) ~.m * ) ) ) ) ) ) ) ) ) ) A {.d % % O ",
-"-.D % % % % % % % ].. ) ) ^.& * ) ) ) ) ) ) ) ) ) ) ) /.B % % O ",
-"(.W % % % % % % % _.(.) o H d * ) ) ) ) ) ) ) ) ) ) ) :.<.% % O ",
-"> [.% % % % % % % : ] ) +.}.% * ) ) ) ) ) Q A ) ) ) ) o |.% % O ",
-"( ^ % % % % % % % % b ) :.1.% * ) ) ) ) ) 2.:.) ) ) ) ) 3.% % O ",
-"( 4.9 % % % % % % % 5.) 6.: % * ) ) ) ) G J I ) ) ) ) ) 7.m % O ",
-"( 8.9.% % % % % % % 0.r ^.% % * ) ) ) ) V a.b.) ) ) ) ) c.J % O ",
-"( o 4 #.% % % % % % d.e.'.% % * ) ) ) ( f.& / ( ) ) ) ) g.H d O ",
-"( ) h.!.% % % % % % C -.9.% % * ) ) ) + i.% j.g.) ) ) ) ) k.C O ",
-"( ) l.>.% % % % % % X i.h % % * ) ) ) g E d m.= ) ) ) ) ) l._ O ",
-"( ) ( n.% % % % % % % o.m % % * ) ) ) = I N p.o ) ) ) ) ) ) @.O ",
-"( ) ) e.& % % % % % % 8 d % % * ) ) ) ) ) ) ) ) ) ) ) ) ) ) $.q.",
-"( ) ) r.s.% % % % % % % % % % * ) ) ) o z t.t.= ) ) ) ) ) ) u.v.",
-"( ) ) A w.d % % % % % % % % % * ) ) ) ;.x.y.h z.) ) ) ) ) ) G w.",
-"( ) ) ) A.2 % % % % % % % % % * ) ) ) B.D % % k ) ) ) ) ) ) ( Y ",
-"( ( ( ( r._ % % % % % % % % % - = @ = l X % % C.+ @ @ @ @ @ + ~."};
diff --git a/src/info/resources.rc b/src/info/resources.rc
index c46fe4799..981996e6c 100644
--- a/src/info/resources.rc
+++ b/src/info/resources.rc
@@ -1,4 +1,4 @@
-MATROSKAICON ICON  "../mmg/matroskalogo_big.ico"
+MATROSKAICON ICON  "../../share/icons/windows/mkvinfo.ico"
 
 #include "wx/msw/wx.rc"
 
diff --git a/src/info/wxwidgets_ui.cpp b/src/info/wxwidgets_ui.cpp
index 58011a498..9eaef81b1 100644
--- a/src/info/wxwidgets_ui.cpp
+++ b/src/info/wxwidgets_ui.cpp
@@ -27,10 +27,8 @@
 #include "common/version.h"
 #include "common/wx.h"
 #include "info/wxwidgets_ui.h"
-#if !defined(SYS_WINDOWS)
-#include "info/matroska.xpm"
-#endif
 #include "info/mkvinfo.h"
+#include "share/icons/32x32/mkvinfo.xpm"
 
 using namespace libebml;
 using namespace libmatroska;
@@ -113,7 +111,7 @@ mi_frame::mi_frame(const wxString &title,
   , file_open(false)
   , tree(new wxTreeCtrl(this, 4254))
 {
-  SetIcon(wxICON(matroska));
+  SetIcon(wxIcon(mkvinfo_xpm));
 
   menu_file           = new wxMenu();
   menu_options        = new wxMenu();
diff --git a/src/merge/resources.rc b/src/merge/resources.rc
index 89e471d81..e4bad7024 100644
--- a/src/merge/resources.rc
+++ b/src/merge/resources.rc
@@ -1,4 +1,4 @@
-MATROSKAICON ICON  "../mmg/matroskalogo_big.ico"
+MATROSKAICON ICON  "../../share/icons/windows/mkvmergeGUI.ico"
 
 1 VERSIONINFO
  FILEVERSION 4, 0, 0, 0
diff --git a/src/mmg/header_editor/frame.cpp b/src/mmg/header_editor/frame.cpp
index 99588a1e7..880a89668 100644
--- a/src/mmg/header_editor/frame.cpp
+++ b/src/mmg/header_editor/frame.cpp
@@ -41,9 +41,11 @@
 #include "mmg/header_editor/top_level_page.h"
 #include "mmg/header_editor/track_type_page.h"
 #include "mmg/header_editor/unsigned_integer_value_page.h"
-#include "mmg/matroskalogo.xpm"
 #include "mmg/mmg_dialog.h"
 #include "mmg/mmg.h"
+#if !defined(SYS_WINDOWS)
+# include "share/icons/32x32/mkvmergeGUI.xpm"
+#endif
 
 class header_editor_drop_target_c: public wxFileDropTarget {
 private:
@@ -125,7 +127,7 @@ header_editor_frame_c::header_editor_frame_c(wxWindow *parent)
 
   m_status_bar_timer.SetOwner(this, ID_T_HE_STATUS_BAR);
 
-  SetIcon(wxIcon(matroskalogo_xpm));
+  SetIcon(wxICON(mkvmergeGUI));
   SetDropTarget(new header_editor_drop_target_c(this));
 
   set_status_bar(Z("Header editor ready."));
diff --git a/src/mmg/mmg-resources.rc b/src/mmg/mmg-resources.rc
index 7e3ae8fd4..cf3d2303e 100644
--- a/src/mmg/mmg-resources.rc
+++ b/src/mmg/mmg-resources.rc
@@ -1,4 +1,4 @@
-MATROSKAICON ICON  matroskalogo_big.ico
+MATROSKAICON ICON  "../../share/icons/windows/mkvmergeGUI.ico"
 
 #include "wx/msw/wx.rc"
 
diff --git a/src/mmg/mmg_dialog.cpp b/src/mmg/mmg_dialog.cpp
index 86f982503..66c3442b4 100644
--- a/src/mmg/mmg_dialog.cpp
+++ b/src/mmg/mmg_dialog.cpp
@@ -44,7 +44,6 @@
 #include "mmg/cli_options_dlg.h"
 #include "mmg/header_editor/frame.h"
 #include "mmg/jobs.h"
-#include "mmg/matroskalogo.xpm"
 #include "mmg/mmg_dialog.h"
 #include "mmg/mmg.h"
 #include "mmg/mux_dialog.h"
@@ -54,6 +53,7 @@
 #include "mmg/tabs/chapters.h"
 #include "mmg/tabs/global.h"
 #include "mmg/tabs/input.h"
+#include "share/icons/32x32/mkvmergeGUI.xpm"
 
 mmg_dialog *mdlg;
 wxString last_open_dir;
@@ -158,7 +158,7 @@ mmg_dialog::mmg_dialog()
 
   load_job_queue();
 
-  SetIcon(wxIcon(matroskalogo_xpm));
+  SetIcon(wxIcon(mkvmergeGUI_xpm));
 
   help = NULL;
 
diff --git a/src/propedit/resources.rc b/src/propedit/resources.rc
index afbfe2b4c..92c989f3d 100644
--- a/src/propedit/resources.rc
+++ b/src/propedit/resources.rc
@@ -1,4 +1,4 @@
-MATROSKAICON ICON  "../mmg/matroskalogo_big.ico"
+MATROSKAICON ICON  "../../share/icons/windows/mkvmergeGUI.ico"
 
 #include "wx/msw/wx.rc"