diff --git a/src/Demos/wxsgv/icons/camera.ico b/src/Demos/wxsgv/icons/camera.ico
deleted file mode 100644
index 449029ac7..000000000
Binary files a/src/Demos/wxsgv/icons/camera.ico and /dev/null differ
diff --git a/src/Demos/wxsgv/icons/engine.ico b/src/Demos/wxsgv/icons/engine.ico
deleted file mode 100644
index 5b52a4179..000000000
Binary files a/src/Demos/wxsgv/icons/engine.ico and /dev/null differ
diff --git a/src/Demos/wxsgv/icons/geom.ico b/src/Demos/wxsgv/icons/geom.ico
deleted file mode 100644
index 597c89f8a..000000000
Binary files a/src/Demos/wxsgv/icons/geom.ico and /dev/null differ
diff --git a/src/Demos/wxsgv/icons/group.ico b/src/Demos/wxsgv/icons/group.ico
deleted file mode 100644
index 636845406..000000000
Binary files a/src/Demos/wxsgv/icons/group.ico and /dev/null differ
diff --git a/src/Demos/wxsgv/icons/icon1.xpm b/src/Demos/wxsgv/icons/icon1.xpm
new file mode 100644
index 000000000..4926b2622
--- /dev/null
+++ b/src/Demos/wxsgv/icons/icon1.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char *icon1_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"` c #000000",
+"a c #C0C0C0",
+"b c #FF0000",
+"c c #FFFFFF",
+"d c #FFFF00",
+"e c #808000",
+/* pixels */
+"cccccccccccccccc",
+"cccccccccceddecc",
+"ccccccccceddddec",
+"ccbbbcccceddddec",
+"cc```cccceddddec",
+"a`````````edde`a",
+"``````accca`````",
+"``aaa`ccccc`````",
+"`````ccccccc````",
+"``````ccccc`````",
+"``````accca`````",
+"a``````````````a",
+"ca````````````ac",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc"
+};
diff --git a/src/Demos/wxsgv/icons/icon10.xpm b/src/Demos/wxsgv/icons/icon10.xpm
new file mode 100644
index 000000000..21d51f409
--- /dev/null
+++ b/src/Demos/wxsgv/icons/icon10.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char *icon10_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 5 1",
+/* colors */
+"` c #00FF00",
+"a c #FF0000",
+"b c #FFFFFF",
+"c c #808000",
+"d c #0000FF",
+/* pixels */
+"bbbbbbbbbbbbbbbb",
+"bbbbbbbbbbbbbbbb",
+"bbb``bbbbbbbbbbb",
+"bb````bbbbdddbbb",
+"bbb``bbbbbdddbbb",
+"bbb``bbbbddddbbb",
+"bbb``bbbdddbbbbb",
+"bbb``bbdddbbbbbb",
+"bbb``bdddbbbbbbb",
+"bbb``dddbbbbbbbb",
+"bbb``ddbbbbbabbb",
+"bbb`caaaaaaaaabb",
+"bbbcaaaaaaaaaabb",
+"bbbbbbbbbbbbabbb",
+"bbbbbbbbbbbbbbbb",
+"bbbbbbbbbbbbbbbb"
+};
diff --git a/src/Demos/wxsgv/icons/icon2.xpm b/src/Demos/wxsgv/icons/icon2.xpm
new file mode 100644
index 000000000..e6a052a25
--- /dev/null
+++ b/src/Demos/wxsgv/icons/icon2.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char *icon2_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 4 1",
+/* colors */
+"` c #000000",
+"a c #C0C0C0",
+"b c #808080",
+"c c #FFFFFF",
+/* pixels */
+"cccccccccccccccc",
+"ccccb`bccb`bcccc",
+"cccca``cc``acccc",
+"ccccc``bb``ccccc",
+"ca`ccb````bcc`ac",
+"c```b``````b```c",
+"ca`````bb`````ac",
+"cccb``bccb``bccc",
+"cccb``bccb``bccc",
+"ca`````bb`````ac",
+"c```b``````b```c",
+"ca`ccb````bcc`ac",
+"ccccc``bb``ccccc",
+"cccca``cc``acccc",
+"ccccb`bccb`bcccc",
+"cccccccccccccccc"
+};
diff --git a/src/Demos/wxsgv/icons/icon3.xpm b/src/Demos/wxsgv/icons/icon3.xpm
new file mode 100644
index 000000000..b020786fe
--- /dev/null
+++ b/src/Demos/wxsgv/icons/icon3.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char *icon3_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 7 1",
+/* colors */
+"` c #000000",
+"a c #00FF00",
+"b c #C0C0C0",
+"c c #000080",
+"d c #FFFFFF",
+"e c #008000",
+"f c #0000FF",
+/* pixels */
+"ddddddd`dddddddd",
+"dddddd```ddddddd",
+"ddddd`a``bdddddd",
+"dddd`aa`f`dddddd",
+"ddd`aaa`ff`ddddd",
+"dd`aaaa`fff`dddd",
+"d`aaaaacfff`bddd",
+"`aaaaaecffff`ddd",
+"b`aaaaecfffff`dd",
+"d`aaaa`fffffff`d",
+"dd`aaa`fffffff`b",
+"ddd`aa`fffffff``",
+"dddb`a`fff````bd",
+"dddd`a````bddddd",
+"ddddd``bdddddddd",
+"dddddddddddddddd"
+};
diff --git a/src/Demos/wxsgv/icons/icon4.xpm b/src/Demos/wxsgv/icons/icon4.xpm
new file mode 100644
index 000000000..8c21f6b86
--- /dev/null
+++ b/src/Demos/wxsgv/icons/icon4.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char *icon4_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 4 1",
+/* colors */
+"` c #000000",
+"a c #FFFFFF",
+"b c #FFFF00",
+"c c #808000",
+/* pixels */
+"aaaaaaaaaaaaaaaa",
+"aaaaac````caaaaa",
+"aaac`bbbbbb`caaa",
+"aac`bbbbbbbb`caa",
+"aa`bbbc``cbbb`aa",
+"accbb`caac`bbcca",
+"a`bbccaaaaccbbca",
+"a`bb`aaaaaa`bb`a",
+"a`bb`aaaaaa`bb`a",
+"a`bbccaaaaccbbca",
+"accbb`caac`bbcca",
+"aa`bbbc``cbbb`aa",
+"aaa`bbbbbbbb`aaa",
+"aaaa`bbbbbb`aaaa",
+"aaaaac````caaaaa",
+"aaaaaaaaaaaaaaaa"
+};
diff --git a/src/Demos/wxsgv/icons/icon5.xpm b/src/Demos/wxsgv/icons/icon5.xpm
new file mode 100644
index 000000000..d626c5164
--- /dev/null
+++ b/src/Demos/wxsgv/icons/icon5.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char *icon5_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 5 1",
+/* colors */
+"` c #000000",
+"a c #C0C0C0",
+"b c #FFFFFF",
+"c c #FFFF00",
+"d c #808000",
+/* pixels */
+"bbbbbbbbbbbbbbbb",
+"bbbbdbbbbbbbdbbb",
+"dbbbbd````bdbbbb",
+"bdbbb`bbcb`bbbbb",
+"bbdd`bbcccb`bbbb",
+"bbbb`bcbcbc`dddd",
+"bbbb`cccbcb`bbbb",
+"bbdd`ccccbc`dbbb",
+"ddbb`bccccc`bddb",
+"bbbbb`bccb`bbbbd",
+"bbbbdb````bbdbbb",
+"bbbdbb````bbbdbb",
+"bbbdbb````bbbdbb",
+"bbdbbb````bbbbdb",
+"bbbbbba``abbbbbb",
+"bbbbbbbbbbbbbbbb"
+};
diff --git a/src/Demos/wxsgv/icons/icon6.xpm b/src/Demos/wxsgv/icons/icon6.xpm
new file mode 100644
index 000000000..f68291f6c
--- /dev/null
+++ b/src/Demos/wxsgv/icons/icon6.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char *icon6_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"` c #000000",
+"a c #C0C0C0",
+"b c #808080",
+"c c #FFFFFF",
+"d c #FFFF00",
+"e c #808000",
+/* pixels */
+"cccccccccccccccc",
+"cabbbbbbbbaccccc",
+"cb````````bccccc",
+"cb`dddddd`bccccc",
+"cb`dddddd`bbaccc",
+"cb`dddddd```bacc",
+"cb`dddddd`dd`bcc",
+"cb`dddddd`dd`bac",
+"cb`dddddd`ddd`bc",
+"cb````````ddd`bc",
+"cabbb`ddddddebac",
+"cccab`dddddd`bcc",
+"ccccab``dde`bacc",
+"cccccabb``bbaccc",
+"cccccccabbaccccc",
+"cccccccccccccccc"
+};
diff --git a/src/Demos/wxsgv/icons/icon7.xpm b/src/Demos/wxsgv/icons/icon7.xpm
new file mode 100644
index 000000000..0596ceaa0
--- /dev/null
+++ b/src/Demos/wxsgv/icons/icon7.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char *icon7_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"` c #000000",
+"a c #00FF00",
+"b c #C0C0C0",
+"c c #808080",
+"d c #FFFFFF",
+"e c #008000",
+/* pixels */
+"dddddddddddddddd",
+"dddddddddddddddd",
+"ddddddd`dddddddd",
+"ddddddbe`ddddddd",
+"dddddd`aebdddddd",
+"dddddbeaa`dddddd",
+"ddddd`aaaebddddd",
+"ddddbeaaaa`ddddd",
+"dddd`aaaaaaedddd",
+"ddddeaaaaaa`dddd",
+"dddeaaaaaaaa`ddd",
+"ddd`aaaaaaaaebdd",
+"ddbeaaaaaaaaa`dd",
+"dd`aaaaaaaaaaacd",
+"dd`````````````d",
+"dddddddddddddddd"
+};
diff --git a/src/Demos/wxsgv/icons/icon8.xpm b/src/Demos/wxsgv/icons/icon8.xpm
new file mode 100644
index 000000000..59298efa4
--- /dev/null
+++ b/src/Demos/wxsgv/icons/icon8.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static char *icon8_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 3 1",
+/* colors */
+"` c #000000",
+"a c #FFFFFF",
+"b c #0000FF",
+/* pixels */
+"aaaaaaaaaaaaaaaa",
+"aaaaaaaa`aaaaaaa",
+"aaaaaaaa``aaaaaa",
+"aaaaaaaa`b`aaaaa",
+"aaaaaaaa`bb`aaaa",
+"aaaaaaaa`bbb`aaa",
+"a````````bbbb`aa",
+"a`bbbbbbbbbbbb`a",
+"a`bbbbbbbbbbbb`a",
+"a````````bbbb`aa",
+"aaaaaaaa`bbb`aaa",
+"aaaaaaaa`bb`aaaa",
+"aaaaaaaa`b`aaaaa",
+"aaaaaaaa``aaaaaa",
+"aaaaaaaa`aaaaaaa",
+"aaaaaaaaaaaaaaaa"
+};
diff --git a/src/Demos/wxsgv/icons/icon9.xpm b/src/Demos/wxsgv/icons/icon9.xpm
new file mode 100644
index 000000000..d9244139b
--- /dev/null
+++ b/src/Demos/wxsgv/icons/icon9.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char *icon9_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 5 1",
+/* colors */
+"` c #000000",
+"a c #C0C0C0",
+"b c #808080",
+"c c #000080",
+"d c #FFFFFF",
+/* pixels */
+"dddddddddddddddd",
+"dddddacccccadddd",
+"ddddacccccccaddd",
+"dddacccbdacccddd",
+"dddacccddacccddd",
+"dddabcbddacccddd",
+"ddddddddacccaddd",
+"dddddddacccaaddd",
+"ddddddaacccadddd",
+"ddddddacccaddddd",
+"ddddddabcbaddddd",
+"dddddddddddddddd",
+"dddddddb`bdddddd",
+"ddddddacccaddddd",
+"dddddddbcbdddddd",
+"dddddddddddddddd"
+};
diff --git a/src/Demos/wxsgv/icons/light.ico b/src/Demos/wxsgv/icons/light.ico
deleted file mode 100644
index fb0187402..000000000
Binary files a/src/Demos/wxsgv/icons/light.ico and /dev/null differ
diff --git a/src/Demos/wxsgv/icons/lod.ico b/src/Demos/wxsgv/icons/lod.ico
deleted file mode 100644
index eb2c216a9..000000000
Binary files a/src/Demos/wxsgv/icons/lod.ico and /dev/null differ
diff --git a/src/Demos/wxsgv/icons/mesh.ico b/src/Demos/wxsgv/icons/mesh.ico
deleted file mode 100644
index ce76f84d6..000000000
Binary files a/src/Demos/wxsgv/icons/mesh.ico and /dev/null differ
diff --git a/src/Demos/wxsgv/icons/top.ico b/src/Demos/wxsgv/icons/top.ico
deleted file mode 100644
index 99f87d22c..000000000
Binary files a/src/Demos/wxsgv/icons/top.ico and /dev/null differ
diff --git a/src/Demos/wxsgv/icons/unknown.ico b/src/Demos/wxsgv/icons/unknown.ico
deleted file mode 100644
index 46a492dda..000000000
Binary files a/src/Demos/wxsgv/icons/unknown.ico and /dev/null differ
diff --git a/src/Demos/wxsgv/icons/wxsgv.ico b/src/Demos/wxsgv/icons/wxsgv.ico
deleted file mode 100644
index c517e7962..000000000
Binary files a/src/Demos/wxsgv/icons/wxsgv.ico and /dev/null differ
diff --git a/src/Demos/wxsgv/icons/wxsgv.xpm b/src/Demos/wxsgv/icons/wxsgv.xpm
new file mode 100644
index 000000000..4e4333417
--- /dev/null
+++ b/src/Demos/wxsgv/icons/wxsgv.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char *wxsgv[] = {
+/* width height num_colors chars_per_pixel */
+"    32    32        9            1",
+/* colors */
+". c #000000",
+"# c #000080",
+"a c #0000ff",
+"b c #008000",
+"c c #00ff00",
+"d c #808000",
+"e c #808080",
+"f c #ffff00",
+"g c #ffffff",
+/* pixels */
+"gggggggggggggggggggggggggggggggg",
+"ggggd....dgggggggggggggggggggggg",
+"ggd.ffffffddgggggggggggggggggggg",
+"gd.ffffffffddggggggggggggggggggg",
+"g.fffd..dfffdggggggggggggggggggg",
+"ddffddggdddfddgggggggggggggggggg",
+".ffddggggddffdgggggggggggggggggg",
+".ff.gggggg.dfdgggggggggggggggggg",
+".ff.gggggg.dfdgggggggggggggggggg",
+".ffddgggg.ddfdgggggggggggggggggg",
+"ddffddgg..dffdgggggggggggggggggg",
+"g.ffdd..ddffdggggggggggggggggggg",
+"ggdfffdddffdgggggggggggggggggggg",
+"gggdffffffdggggggggggggggggggggg",
+"ggggddddddgggggggggggggggggggggg",
+"gggggggggggggggggggggggggggggggg",
+"gggggggeggggggggggggggg.gggggggg",
+"gggggggggggggggggggggg...ggggggg",
+"gggggggeggggggggggggg.b..egggggg",
+"gggggggggggggggggggg.cc.##gggggg",
+"gggeeeeeeeeeggggggg.ccc.#a#ggggg",
+"gggegggggggegggggg.cccc.#aa#gggg",
+"gggeggg.gggeggggg.ccccc#aaa#eggg",
+"gggeggg.gggegggg.bccccb#aaaa#ggg",
+"gggeg.....gegegeebccccb#aaaaa#gg",
+"gggeggg.gggeggggg.ccccb#aaaaaa#g",
+"gggeggg.gggeggggggbccc.aaaaaaa#e",
+"gggegggggggegggggggbcc.aaaaaaa#.",
+"gggeeeeeeeeegggggggebc.aaa#####g",
+"gggggggggggggggggggg.c.###eggggg",
+"gggggggggggggggggggggb.egggggggg",
+"gggggggggggggggggggggggggggggggg"
+};
diff --git a/src/Demos/wxsgv/icons/xform.ico b/src/Demos/wxsgv/icons/xform.ico
deleted file mode 100644
index 7e85d0d17..000000000
Binary files a/src/Demos/wxsgv/icons/xform.ico and /dev/null differ