diff --git a/companion/src/companion.qrc b/companion/src/companion.qrc
index dcb97f0b3..df5a5470e 100644
--- a/companion/src/companion.qrc
+++ b/companion/src/companion.qrc
@@ -57,106 +57,21 @@
     <file>images/x9r3.png</file>
     <file>images/x9s0.png</file>
     <file>images/x9t0.png</file>
-    <file>images/mcw/aicon.png</file>
-    <file>images/mcw/dicon.png</file>
-    <file>images/mcw/gicon.png</file>
-    <file>images/mcw/hicon.png</file>
-    <file>images/mcw/at1e1r.png</file>
-    <file>images/mcw/at2e1r.png</file>
-    <file>images/mcw/atailv.png</file>
-    <file>images/mcw/aw0a0f.png</file>
-    <file>images/mcw/aw1a0f.png</file>
-    <file>images/mcw/aw1a1f.png</file>
-    <file>images/mcw/aw1a2f.png</file>
-    <file>images/mcw/aw2a0f.png</file>
-    <file>images/mcw/aw2a1f.png</file>
-    <file>images/mcw/aw2a2f.png</file>
-    <file>images/mcw/h90.png</file>
-    <file>images/mcw/h120.png</file>
-    <file>images/mcw/h120x.png</file>
-    <file>images/mcw/h140.png</file>
-    <file>images/mcw/hfbl.png</file>
-    <file>images/mcw/htailg.png</file>
-    <file>images/mcw/htailng.png</file>
-    <file>images/mcw/htailfblg.png</file>
-    <file>images/mcw/htailfblng.png</file>
-    <file>images/mcw/gt1e1r.png</file>
-    <file>images/mcw/gt2e1r.png</file>
-    <file>images/mcw/gtailv.png</file>
-    <file>images/mcw/gw0t0a0f0s.png</file>
-    <file>images/mcw/gw0t1a0f0s.png</file>
-    <file>images/mcw/gw0t1a0f1s.png</file>
-    <file>images/mcw/gw0t1a0f2s.png</file>
-    <file>images/mcw/gw0t1a1f0s.png</file>
-    <file>images/mcw/gw0t1a1f1s.png</file>
-    <file>images/mcw/gw0t1a1f2s.png</file>
-    <file>images/mcw/gw0t1a2f0s.png</file>
-    <file>images/mcw/gw0t1a2f1s.png</file>
-    <file>images/mcw/gw0t1a2f2s.png</file>
-    <file>images/mcw/gw0t2a0f0s.png</file>
-    <file>images/mcw/gw0t2a0f1s.png</file>
-    <file>images/mcw/gw0t2a0f2s.png</file>
-    <file>images/mcw/gw0t2a1f0s.png</file>
-    <file>images/mcw/gw0t2a1f1s.png</file>
-    <file>images/mcw/gw0t2a1f2s.png</file>
-    <file>images/mcw/gw0t2a2f0s.png</file>
-    <file>images/mcw/gw0t2a2f1s.png</file>
-    <file>images/mcw/gw0t2a2f2s.png</file>
-    <file>images/mcw/gw1t0a0f0s.png</file>
-    <file>images/mcw/gw1t1a0f0s.png</file>
-    <file>images/mcw/gw1t1a0f1s.png</file>
-    <file>images/mcw/gw1t1a0f2s.png</file>
-    <file>images/mcw/gw1t1a1f0s.png</file>
-    <file>images/mcw/gw1t1a1f1s.png</file>
-    <file>images/mcw/gw1t1a1f2s.png</file>
-    <file>images/mcw/gw1t1a2f0s.png</file>
-    <file>images/mcw/gw1t1a2f1s.png</file>
-    <file>images/mcw/gw1t1a2f2s.png</file>
-    <file>images/mcw/gw1t2a0f0s.png</file>
-    <file>images/mcw/gw1t2a0f1s.png</file>
-    <file>images/mcw/gw1t2a0f2s.png</file>
-    <file>images/mcw/gw1t2a1f0s.png</file>
-    <file>images/mcw/gw1t2a1f1s.png</file>
-    <file>images/mcw/gw1t2a1f2s.png</file>
-    <file>images/mcw/gw1t2a2f0s.png</file>
-    <file>images/mcw/gw1t2a2f1s.png</file>
-    <file>images/mcw/gw1t2a2f2s.png</file>
-    <file>images/mcw/db0t2e0f0r.png</file>
-    <file>images/mcw/db0t2e0f1r.png</file>
-    <file>images/mcw/db0t2e0f2r.png</file>
-    <file>images/mcw/db0t2e1f0r.png</file>
-    <file>images/mcw/db0t2e1f1r.png</file>
-    <file>images/mcw/db0t2e1f2r.png</file>
-    <file>images/mcw/db0t2e2f0r.png</file>
-    <file>images/mcw/db0t2e2f1r.png</file>
-    <file>images/mcw/db0t2e2f2r.png</file>
-    <file>images/mcw/db1t2e0f0r.png</file>
-    <file>images/mcw/db1t2e0f1r.png</file>
-    <file>images/mcw/db1t2e0f2r.png</file>
-    <file>images/mcw/db1t2e1f0r.png</file>
-    <file>images/mcw/db1t2e1f1r.png</file>
-    <file>images/mcw/db1t2e1f2r.png</file>
-    <file>images/mcw/db1t2e2f0r.png</file>
-    <file>images/mcw/db1t2e2f1r.png</file>
-    <file>images/mcw/db1t2e2f2r.png</file>
-    <file>images/mcw/dt0t2e0f0r.png</file>
-    <file>images/mcw/dt0t2e0f1r.png</file>
-    <file>images/mcw/dt0t2e0f2r.png</file>
-    <file>images/mcw/dt0t2e1f0r.png</file>
-    <file>images/mcw/dt0t2e1f1r.png</file>
-    <file>images/mcw/dt0t2e1f2r.png</file>
-    <file>images/mcw/dt0t2e2f0r.png</file>
-    <file>images/mcw/dt0t2e2f1r.png</file>
-    <file>images/mcw/dt0t2e2f2r.png</file>
-    <file>images/mcw/dt1t2e0f0r.png</file>
-    <file>images/mcw/dt1t2e0f1r.png</file>
-    <file>images/mcw/dt1t2e0f2r.png</file>
-    <file>images/mcw/dt1t2e1f0r.png</file>
-    <file>images/mcw/dt1t2e1f1r.png</file>
-    <file>images/mcw/dt1t2e1f2r.png</file>
-    <file>images/mcw/dt1t2e2f0r.png</file>
-    <file>images/mcw/dt1t2e2f1r.png</file>
-    <file>images/mcw/dt1t2e2f2r.png</file>
+    <file>images/wizard/ailerons.png</file>
+    <file>images/wizard/airbrakes.png</file>
+    <file>images/wizard/bank.png</file> 
+    <file>images/wizard/cyclic.png</file>
+    <file>images/wizard/fblheli.png</file>
+    <file>images/wizard/flaps.png</file>
+    <file>images/wizard/flybar.png</file>
+    <file>images/wizard/gyro.png</file>   
+    <file>images/wizard/helictrl.png</file>
+    <file>images/wizard/models.png</file>
+    <file>images/wizard/multirotor.png</file>
+    <file>images/wizard/simpletail.png</file>
+    <file>images/wizard/tail.png</file>
+    <file>images/wizard/tails.png</file>
+    <file>images/wizard/throttle.png</file>
     <file>images/library/00001.png</file>
     <file>images/library/00002.png</file>
     <file>images/library/00003.png</file>