diff --git a/uppsrc/ide/Common/ComDlg.cpp b/uppsrc/ide/Common/ComDlg.cpp
index 282cf345d..47c96b7b9 100644
--- a/uppsrc/ide/Common/ComDlg.cpp
+++ b/uppsrc/ide/Common/ComDlg.cpp
@@ -25,6 +25,10 @@ void IdeFileIcon0(bool dir, const String& filename, Image& img)
 		img = IdeCommonImg::witz();
 	if(ext == ".js")
 		img = IdeCommonImg::js();
+	if(ext == ".json")
+		img = IdeCommonImg::json();
+	if(ext == ".xml")
+		img == IdeCommonImg::xml();
 	if(ext == ".usc")
 		img = IdeCommonImg::Script();
 	if(ext == ".lng" || ext == ".lngj" || ext == ".t" || ext == ".jt")
diff --git a/uppsrc/ide/Common/common.iml b/uppsrc/ide/Common/common.iml
index bf9c2b6bd..b30a631b0 100644
--- a/uppsrc/ide/Common/common.iml
+++ b/uppsrc/ide/Common/common.iml
@@ -15,6 +15,8 @@ IMAGE_ID(FFff)
 IMAGE_ID(Source)
 IMAGE_ID(Fast)
 IMAGE_ID(ISource)
+IMAGE_ID(json)
+IMAGE_ID(xml)
 IMAGE_ID(js)
 IMAGE_ID(html)
 IMAGE_ID(css)
@@ -77,32 +79,36 @@ IMAGE_DATA(106,248,36,7,233,154,137,106,51,51,136,243,224,126,28,198,79,198,207,
 IMAGE_END_DATA(1568, 16)
 
 IMAGE_BEGIN_DATA
-IMAGE_DATA(120,156,237,153,191,107,20,65,20,199,167,180,176,72,37,70,176,187,34,164,178,246,47,56,8,28,17,29,242,15,216,164)
-IMAGE_DATA(23,146,46,215,165,11,92,111,99,33,226,18,68,139,251,11,210,104,27,199,226,174,22,33,130,136,73,23,73,158,251,221)
-IMAGE_DATA(201,155,155,153,221,157,31,187,23,18,33,47,60,230,199,206,231,189,55,111,102,103,39,137,88,17,43,34,81,100,169,116)
-IMAGE_DATA(85,230,138,148,47,4,21,239,5,161,204,180,97,88,186,204,182,177,96,47,52,143,50,209,134,227,151,89,214,136,13,215)
-IMAGE_DATA(239,69,53,206,225,2,249,104,140,185,226,203,250,104,228,62,107,176,225,198,124,89,247,223,100,67,232,181,109,157,55,243)
-IMAGE_DATA(80,245,85,251,12,228,193,216,96,95,60,222,230,83,114,248,233,163,27,47,226,224,254,236,53,76,91,187,160,141,190,123)
-IMAGE_DATA(184,3,107,108,136,238,239,95,154,100,28,6,57,66,9,26,154,20,133,36,193,70,148,47,138,34,100,35,213,191,253,18)
-IMAGE_DATA(37,243,13,182,26,121,41,139,50,78,85,149,220,22,98,207,180,99,60,198,10,49,174,74,136,82,39,85,27,101,23,255)
-IMAGE_DATA(122,252,56,57,254,190,243,135,175,195,195,19,227,211,247,157,194,111,109,253,234,204,219,121,119,243,57,78,226,251,204,63)
-IMAGE_DATA(83,151,35,119,135,193,237,61,12,10,85,144,44,100,176,30,226,49,70,157,168,96,61,196,139,241,98,30,125,121,140,231)
-IMAGE_DATA(152,237,122,106,252,93,120,59,79,40,209,246,235,215,181,126,153,122,59,228,134,14,131,216,85,39,150,252,206,135,137,136)
-IMAGE_DATA(31,4,169,254,67,11,217,103,35,25,190,233,75,102,247,199,120,124,209,236,91,0,4,237,197,151,46,204,187,99,199,53)
-IMAGE_DATA(155,41,243,247,191,202,9,95,85,135,183,111,39,245,91,74,156,7,51,26,189,115,202,28,62,36,33,62,67,111,143,224)
-IMAGE_DATA(48,160,189,155,142,162,85,248,247,164,46,201,148,229,15,9,85,106,219,79,152,119,217,124,255,174,47,153,116,8,182,243)
-IMAGE_DATA(69,182,141,250,220,243,108,232,252,21,158,13,149,181,137,155,109,228,189,4,218,70,206,186,53,105,122,252,237,251,69,37)
-IMAGE_DATA(229,175,239,135,240,230,196,62,12,232,193,125,130,218,207,127,14,137,160,168,203,103,247,36,157,173,18,157,61,242,147,89)
-IMAGE_DATA(189,180,49,94,179,171,4,59,62,43,234,9,171,234,175,159,20,52,122,40,171,62,248,173,177,155,79,73,188,121,85,227)
-IMAGE_DATA(148,82,149,10,247,38,96,47,198,130,253,243,161,182,104,96,249,244,231,210,185,81,128,253,50,209,172,197,243,216,245,245)
-IMAGE_DATA(245,26,111,190,38,204,66,81,63,173,251,111,241,171,149,253,174,61,214,109,139,159,205,102,52,157,78,105,48,24,152,190)
-IMAGE_DATA(225,112,88,245,225,89,10,63,159,207,27,213,240,129,248,49,230,251,143,9,253,62,29,210,121,249,2,65,81,71,159,225)
-IMAGE_DATA(3,249,131,31,140,127,94,190,116,127,73,43,234,232,195,51,39,15,236,219,227,207,175,56,246,207,117,195,131,97,13,248)
-IMAGE_DATA(231,190,86,255,13,138,60,243,252,57,126,158,63,158,121,123,208,23,201,235,53,153,76,76,222,81,71,95,132,173,217,241)
-IMAGE_DATA(52,206,121,55,131,232,100,69,228,84,61,58,150,180,177,75,166,36,108,106,75,99,60,152,141,29,210,229,110,214,213,108)
-IMAGE_DATA(41,254,189,113,185,185,112,226,132,255,253,183,133,19,19,218,60,183,70,222,242,143,177,159,191,141,52,179,67,110,187,133)
-IMAGE_DATA(183,21,254,182,15,148,241,231,199,19,203,133,23,103,118,46,120,190,108,235,232,56,235,202,109,98,93,228,178,221,70,44)
-IMAGE_DATA(23,60,151,237,131,236,43,191,147,139,237,151,170,182,167,82,247,245,254,102,57,159,53,217,153,111,99,83,248,36,189,166)
-IMAGE_DATA(191,25,244,149,126,255,198,148,248,154,10,146,249,87,115,195,150,25,238,98,195,176,172,104,139,240,66,45,211,191,99,163)
-IMAGE_DATA(3,107,108,136,238,249,191,147,255,84,254,1,122,13,201,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
-IMAGE_END_DATA(896, 8)
+IMAGE_DATA(120,156,237,154,189,107,20,65,20,192,167,180,176,72,37,70,176,75,17,82,89,219,108,123,16,56,34,58,228,31,176,73)
+IMAGE_DATA(47,36,93,174,75,23,184,94,16,11,17,151,32,90,164,15,164,209,54,142,69,210,196,66,132,8,18,76,186,72,242,220)
+IMAGE_DATA(183,147,55,55,51,59,159,187,119,220,41,247,194,99,62,118,126,239,205,123,51,59,59,154,176,5,182,192,254,83,41,42)
+IMAGE_DATA(133,136,22,62,174,40,10,56,61,61,5,159,224,51,28,99,217,41,66,220,160,26,139,234,177,83,251,13,249,116,241,100)
+IMAGE_DATA(131,98,10,137,143,71,153,20,175,51,41,188,29,127,10,127,112,112,160,214,193,149,127,226,124,172,150,255,174,235,63,142)
+IMAGE_DATA(253,55,61,153,31,6,110,110,18,135,65,196,142,113,24,48,54,48,202,162,120,85,109,220,111,117,169,247,147,13,138,137)
+IMAGE_DATA(196,53,158,212,230,101,219,228,137,197,210,53,159,24,239,155,111,140,247,197,239,42,81,165,159,240,97,16,146,249,97,160)
+IMAGE_DATA(73,198,97,192,153,12,128,183,112,195,249,51,6,229,59,6,88,102,218,80,44,220,100,219,24,177,215,146,199,50,209,134)
+IMAGE_DATA(225,151,88,210,136,13,211,239,245,237,139,162,113,129,124,56,231,92,243,85,189,223,55,159,57,108,152,115,190,105,250,119)
+IMAGE_DATA(217,96,114,109,189,113,19,143,42,190,72,159,129,60,40,27,228,139,198,235,124,74,14,63,126,48,231,139,243,160,254,236)
+IMAGE_DATA(53,76,91,187,160,141,174,123,184,5,171,108,176,246,239,95,154,76,232,102,16,59,17,99,65,5,79,243,4,27,81,190)
+IMAGE_DATA(44,203,144,141,84,255,250,75,148,204,59,108,57,121,206,203,106,158,162,46,169,205,216,182,106,199,120,28,43,191,160,219)
+IMAGE_DATA(117,91,136,179,186,141,101,27,255,114,188,243,139,62,145,248,209,215,222,222,153,247,54,145,194,175,175,255,106,205,235,121)
+IMAGE_DATA(55,243,57,72,226,187,196,159,169,227,145,249,97,48,187,135,65,41,74,224,37,15,214,67,60,142,17,103,34,88,15,241)
+IMAGE_DATA(108,48,138,163,43,143,227,105,206,122,61,117,254,109,120,61,79,88,98,219,174,79,106,253,50,117,54,100,74,135,65,236)
+IMAGE_DATA(170,19,75,126,235,195,132,197,15,130,84,255,161,133,236,178,145,20,239,250,146,233,253,49,30,191,104,250,45,0,5,219)
+IMAGE_DATA(163,47,93,152,55,199,14,26,54,83,226,15,253,95,65,10,175,223,78,154,183,148,56,143,76,191,255,214,40,115,248,144)
+IMAGE_DATA(132,248,12,157,29,193,195,0,182,167,61,11,175,208,191,147,218,36,147,87,63,192,68,165,190,159,48,111,178,249,254,77)
+IMAGE_DATA(95,60,233,16,244,243,101,182,141,102,236,121,54,100,254,74,203,134,200,218,196,110,27,121,47,129,180,145,179,110,46,77)
+IMAGE_DATA(159,191,127,191,136,164,252,117,253,16,78,79,244,195,0,238,221,5,84,253,249,207,30,0,42,214,249,147,59,28,46,23)
+IMAGE_DATA(1,46,31,216,201,172,95,218,24,47,217,69,64,59,54,203,154,9,171,235,47,31,149,208,191,207,235,62,244,219,96,215)
+IMAGE_DATA(30,3,123,253,162,193,9,33,106,101,230,77,64,95,140,17,251,251,125,99,209,144,165,211,159,74,227,70,129,236,231,161)
+IMAGE_DATA(100,53,158,198,174,172,172,52,120,245,53,33,22,21,235,23,77,255,30,191,82,201,239,242,67,217,214,248,227,227,99,216)
+IMAGE_DATA(223,223,135,165,165,37,213,215,235,245,234,62,124,150,194,159,156,156,56,85,241,129,249,227,152,239,63,134,112,126,209,131)
+IMAGE_DATA(171,234,5,66,197,58,246,41,62,144,63,244,131,227,159,86,47,221,31,144,138,117,236,195,103,70,30,200,183,197,95,221)
+IMAGE_DATA(114,228,159,234,138,71,134,52,224,159,250,188,254,29,138,121,166,248,105,254,20,63,62,179,246,160,45,156,214,107,56,28)
+IMAGE_DATA(170,188,99,29,251,34,108,195,142,165,113,206,186,25,68,131,101,145,83,245,240,136,195,234,22,168,18,112,83,107,26,227)
+IMAGE_DATA(145,89,221,4,89,110,101,93,205,198,226,223,26,151,155,11,99,158,232,127,231,77,105,204,9,219,20,155,147,215,252,227)
+IMAGE_DATA(216,79,95,251,146,217,4,179,237,225,117,69,127,27,187,66,249,179,231,19,203,133,53,207,236,92,80,188,100,235,240,40)
+IMAGE_DATA(235,202,173,230,58,202,165,223,70,44,23,20,203,198,110,246,149,223,200,197,198,115,209,216,83,169,251,122,103,173,138,103)
+IMAGE_DATA(153,183,230,125,108,10,159,164,51,250,119,6,221,126,141,201,241,107,202,128,231,95,205,21,91,101,184,141,13,197,146,98)
+IMAGE_DATA(155,133,23,106,156,254,13,27,45,88,101,131,181,207,255,92,254,81,249,11,209,148,24,101,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(1024, 10)
diff --git a/uppsrc/ide/Xml.cpp b/uppsrc/ide/Xml.cpp
index 4dbaf01df..749832728 100644
--- a/uppsrc/ide/Xml.cpp
+++ b/uppsrc/ide/Xml.cpp
@@ -106,7 +106,7 @@ XmlView::XmlView()
 
 	Sizeable().Zoomable();
 
-	Icon(IdeImg::XmlIcon());
+	Icon(IdeCommonImg::xml());
 	
 	xml.WhenLeftDouble = THISBACK(CopyPath);
 }
diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico
index ed674dab4..181a17c24 100644
Binary files a/uppsrc/ide/icon.ico and b/uppsrc/ide/icon.ico differ
diff --git a/uppsrc/ide/ide.iml b/uppsrc/ide/ide.iml
index 7048a9652..380c32175 100644
--- a/uppsrc/ide/ide.iml
+++ b/uppsrc/ide/ide.iml
@@ -86,7 +86,6 @@ IMAGE_ID(XmlText)
 IMAGE_ID(XmlPI)
 IMAGE_ID(XmlDecl)
 IMAGE_ID(XmlComment)
-IMAGE_ID(XmlIcon)
 
 IMAGE_BEGIN_DATA
 IMAGE_DATA(120,156,237,152,141,153,131,32,12,134,29,161,35,220,116,157,163,163,117,179,92,181,141,66,126,72,20,17,84,194,147,167)
@@ -2340,9 +2339,3 @@ IMAGE_DATA(142,245,214,96,26,195,192,27,219,182,139,137,246,36,177,182,120,151,7
 IMAGE_DATA(137,19,145,79,29,35,16,39,17,31,23,67,135,143,235,143,161,134,44,231,37,171,245,17,138,37,241,134,182,255,1,251)
 IMAGE_DATA(141,23,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
 IMAGE_END_DATA(1760, 17)
-
-IMAGE_BEGIN_DATA
-IMAGE_DATA(120,156,99,16,96,16,96,248,255,159,97,184,130,255,4,48,94,125,132,0,14,115,8,234,195,97,14,138,94,6,134,6)
-IMAGE_DATA(162,104,116,183,224,211,15,195,196,232,71,87,67,13,251,169,173,31,213,63,152,97,72,44,192,22,135,20,196,63,53,210)
-IMAGE_DATA(223,128,0,0,210,206,155,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
-IMAGE_END_DATA(96, 1)
diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp
index df18e6410..c4cc20ff7 100644
--- a/uppsrc/ide/idebar.cpp
+++ b/uppsrc/ide/idebar.cpp
@@ -526,7 +526,7 @@ void Ide::BrowseMenu(Bar& menu) {
 	menu.AddMenu(AK_CALC, IdeImg::calc(), THISBACK1(ToggleBottom, BCALC))
 	     .Check(IsBottomShown() && btabs.GetCursor() == BCALC);
 	menu.AddMenu(AK_QTF, IdeImg::qtf(), THISBACK(Qtf));
-	menu.AddMenu(!designer, AK_XML, IdeImg::XmlIcon(), THISBACK(Xml));
+	menu.AddMenu(!designer, AK_XML, IdeCommonImg::xml(), THISBACK(Xml));
 	menu.MenuSeparator();
 	menu.Add(AK_BROWSETOPICS, IdeImg::help(), THISBACK(ShowTopics));
 	menu.Add(AK_SEARCHTOPICS, THISBACK(SearchTopics));