diff --git a/companion/src/companion.qrc b/companion/src/companion.qrc
index ed4700fc7..018d2e9e2 100644
--- a/companion/src/companion.qrc
+++ b/companion/src/companion.qrc
@@ -5,39 +5,44 @@
     <file>../../CREDITS.txt</file>
     <file>../../DONATIONS.txt</file>
     <file>../releasenotes.txt</file>
-    <file>images/9xdb.png</file>
-    <file>images/9xdl.png</file>
-    <file>images/9xdr.png</file>
-    <file>images/9xdt.png</file>
-    <file>images/9xdb-bl.png</file>
-    <file>images/9xdl-bl.png</file>
-    <file>images/9xdr-bl.png</file>
-    <file>images/9xdt-bl.png</file>
-    <file>images/9xdb-gr.png</file>
-    <file>images/9xdl-gr.png</file>
-    <file>images/9xdr-gr.png</file>
-    <file>images/9xdt-gr.png</file>
-    <file>images/9xdb-or.png</file>
-    <file>images/9xdl-or.png</file>
-    <file>images/9xdr-or.png</file>
-    <file>images/9xdt-or.png</file>
-    <file>images/9xdb-yl.png</file>
-    <file>images/9xdl-yl.png</file>
-    <file>images/9xdr-yl.png</file>
-    <file>images/9xdt-yl.png</file>
-    <file>images/9xdb-rd.png</file>
-    <file>images/9xdl-rd.png</file>
-    <file>images/9xdr-rd.png</file>
-    <file>images/9xdt-rd.png</file>
-    <file>images/9xmenu.png</file>
-    <file>images/9xmenumenu.png</file>
-    <file>images/9xmenuexit.png</file>
-    <file>images/9xcurs.png</file>
-    <file>images/9xcursup.png</file>
-    <file>images/9xcursplus.png</file>
-    <file>images/9xcursmin.png</file>
-    <file>images/9xcursdown.png</file>
-    <file>images/9xcursphoto.png</file>
+    <file>images/simulator/Horus/middle.png</file>
+    <file>images/simulator/Horus/left.png</file>
+    <file>images/simulator/Horus/right.png</file>
+    <file>images/simulator/Horus/top.png</file>
+    <file>images/simulator/Horus/bottom.png</file>
+    <file>images/simulator/9X/9xdb.png</file>
+    <file>images/simulator/9X/9xdl.png</file>
+    <file>images/simulator/9X/9xdr.png</file>
+    <file>images/simulator/9X/9xdt.png</file>
+    <file>images/simulator/9X/9xdb-bl.png</file>
+    <file>images/simulator/9X/9xdl-bl.png</file>
+    <file>images/simulator/9X/9xdr-bl.png</file>
+    <file>images/simulator/9X/9xdt-bl.png</file>
+    <file>images/simulator/9X/9xdb-gr.png</file>
+    <file>images/simulator/9X/9xdl-gr.png</file>
+    <file>images/simulator/9X/9xdr-gr.png</file>
+    <file>images/simulator/9X/9xdt-gr.png</file>
+    <file>images/simulator/9X/9xdb-or.png</file>
+    <file>images/simulator/9X/9xdl-or.png</file>
+    <file>images/simulator/9X/9xdr-or.png</file>
+    <file>images/simulator/9X/9xdt-or.png</file>
+    <file>images/simulator/9X/9xdb-yl.png</file>
+    <file>images/simulator/9X/9xdl-yl.png</file>
+    <file>images/simulator/9X/9xdr-yl.png</file>
+    <file>images/simulator/9X/9xdt-yl.png</file>
+    <file>images/simulator/9X/9xdb-rd.png</file>
+    <file>images/simulator/9X/9xdl-rd.png</file>
+    <file>images/simulator/9X/9xdr-rd.png</file>
+    <file>images/simulator/9X/9xdt-rd.png</file>
+    <file>images/simulator/9X/9xmenu.png</file>
+    <file>images/simulator/9X/9xmenumenu.png</file>
+    <file>images/simulator/9X/9xmenuexit.png</file>
+    <file>images/simulator/9X/9xcurs.png</file>
+    <file>images/simulator/9X/9xcursup.png</file>
+    <file>images/simulator/9X/9xcursplus.png</file>
+    <file>images/simulator/9X/9xcursmin.png</file>
+    <file>images/simulator/9X/9xcursdown.png</file>
+    <file>images/simulator/9X/9xcursphoto.png</file>
     <file>images/screenshot.png</file>
     <file>images/splash-9x.png</file>
     <file>images/splash-9xrpro.png</file>
@@ -47,18 +52,18 @@
     <file>images/maps.png</file>
     <file>images/track.png</file>
     <file>images/track0.png</file>
-    <file>images/x9b0.png</file>
-    <file>images/x9l0.png</file>
-    <file>images/x9l1.png</file>
-    <file>images/x9l2.png</file>
-    <file>images/x9l3.png</file>
-    <file>images/x9l4.png</file>
-    <file>images/x9r0.png</file>
-    <file>images/x9r1.png</file>
-    <file>images/x9r2.png</file>
-    <file>images/x9r3.png</file>
-    <file>images/x9s0.png</file>
-    <file>images/x9t0.png</file>
+    <file>images/simulator/Taranis/x9b0.png</file>
+    <file>images/simulator/Taranis/x9l0.png</file>
+    <file>images/simulator/Taranis/x9l1.png</file>
+    <file>images/simulator/Taranis/x9l2.png</file>
+    <file>images/simulator/Taranis/x9l3.png</file>
+    <file>images/simulator/Taranis/x9l4.png</file>
+    <file>images/simulator/Taranis/x9r0.png</file>
+    <file>images/simulator/Taranis/x9r1.png</file>
+    <file>images/simulator/Taranis/x9r2.png</file>
+    <file>images/simulator/Taranis/x9r3.png</file>
+    <file>images/simulator/Taranis/x9s0.png</file>
+    <file>images/simulator/Taranis/x9t0.png</file>
     <file>images/taranison.png</file>    
     <file>images/wizard/ailerons.png</file>
     <file>images/wizard/airbrakes.png</file>
diff --git a/companion/src/images/9xcurs.png b/companion/src/images/simulator/9X/9xcurs.png
similarity index 100%
rename from companion/src/images/9xcurs.png
rename to companion/src/images/simulator/9X/9xcurs.png
diff --git a/companion/src/images/9xcursdown.png b/companion/src/images/simulator/9X/9xcursdown.png
similarity index 100%
rename from companion/src/images/9xcursdown.png
rename to companion/src/images/simulator/9X/9xcursdown.png
diff --git a/companion/src/images/9xcursmin.png b/companion/src/images/simulator/9X/9xcursmin.png
similarity index 100%
rename from companion/src/images/9xcursmin.png
rename to companion/src/images/simulator/9X/9xcursmin.png
diff --git a/companion/src/images/9xcursphoto.png b/companion/src/images/simulator/9X/9xcursphoto.png
similarity index 100%
rename from companion/src/images/9xcursphoto.png
rename to companion/src/images/simulator/9X/9xcursphoto.png
diff --git a/companion/src/images/9xcursplus.png b/companion/src/images/simulator/9X/9xcursplus.png
similarity index 100%
rename from companion/src/images/9xcursplus.png
rename to companion/src/images/simulator/9X/9xcursplus.png
diff --git a/companion/src/images/9xcursup.png b/companion/src/images/simulator/9X/9xcursup.png
similarity index 100%
rename from companion/src/images/9xcursup.png
rename to companion/src/images/simulator/9X/9xcursup.png
diff --git a/companion/src/images/9xdb-bl.png b/companion/src/images/simulator/9X/9xdb-bl.png
similarity index 100%
rename from companion/src/images/9xdb-bl.png
rename to companion/src/images/simulator/9X/9xdb-bl.png
diff --git a/companion/src/images/9xdb-gr.png b/companion/src/images/simulator/9X/9xdb-gr.png
similarity index 100%
rename from companion/src/images/9xdb-gr.png
rename to companion/src/images/simulator/9X/9xdb-gr.png
diff --git a/companion/src/images/9xdb-or.png b/companion/src/images/simulator/9X/9xdb-or.png
similarity index 100%
rename from companion/src/images/9xdb-or.png
rename to companion/src/images/simulator/9X/9xdb-or.png
diff --git a/companion/src/images/9xdb-rd.png b/companion/src/images/simulator/9X/9xdb-rd.png
similarity index 100%
rename from companion/src/images/9xdb-rd.png
rename to companion/src/images/simulator/9X/9xdb-rd.png
diff --git a/companion/src/images/9xdb-yl.png b/companion/src/images/simulator/9X/9xdb-yl.png
similarity index 100%
rename from companion/src/images/9xdb-yl.png
rename to companion/src/images/simulator/9X/9xdb-yl.png
diff --git a/companion/src/images/9xdb.png b/companion/src/images/simulator/9X/9xdb.png
similarity index 100%
rename from companion/src/images/9xdb.png
rename to companion/src/images/simulator/9X/9xdb.png
diff --git a/companion/src/images/9xdl-bl.png b/companion/src/images/simulator/9X/9xdl-bl.png
similarity index 100%
rename from companion/src/images/9xdl-bl.png
rename to companion/src/images/simulator/9X/9xdl-bl.png
diff --git a/companion/src/images/9xdl-gr.png b/companion/src/images/simulator/9X/9xdl-gr.png
similarity index 100%
rename from companion/src/images/9xdl-gr.png
rename to companion/src/images/simulator/9X/9xdl-gr.png
diff --git a/companion/src/images/9xdl-or.png b/companion/src/images/simulator/9X/9xdl-or.png
similarity index 100%
rename from companion/src/images/9xdl-or.png
rename to companion/src/images/simulator/9X/9xdl-or.png
diff --git a/companion/src/images/9xdl-rd.png b/companion/src/images/simulator/9X/9xdl-rd.png
similarity index 100%
rename from companion/src/images/9xdl-rd.png
rename to companion/src/images/simulator/9X/9xdl-rd.png
diff --git a/companion/src/images/9xdl-yl.png b/companion/src/images/simulator/9X/9xdl-yl.png
similarity index 100%
rename from companion/src/images/9xdl-yl.png
rename to companion/src/images/simulator/9X/9xdl-yl.png
diff --git a/companion/src/images/9xdl.png b/companion/src/images/simulator/9X/9xdl.png
similarity index 100%
rename from companion/src/images/9xdl.png
rename to companion/src/images/simulator/9X/9xdl.png
diff --git a/companion/src/images/9xdr-bl.png b/companion/src/images/simulator/9X/9xdr-bl.png
similarity index 100%
rename from companion/src/images/9xdr-bl.png
rename to companion/src/images/simulator/9X/9xdr-bl.png
diff --git a/companion/src/images/9xdr-gr.png b/companion/src/images/simulator/9X/9xdr-gr.png
similarity index 100%
rename from companion/src/images/9xdr-gr.png
rename to companion/src/images/simulator/9X/9xdr-gr.png
diff --git a/companion/src/images/9xdr-or.png b/companion/src/images/simulator/9X/9xdr-or.png
similarity index 100%
rename from companion/src/images/9xdr-or.png
rename to companion/src/images/simulator/9X/9xdr-or.png
diff --git a/companion/src/images/9xdr-rd.png b/companion/src/images/simulator/9X/9xdr-rd.png
similarity index 100%
rename from companion/src/images/9xdr-rd.png
rename to companion/src/images/simulator/9X/9xdr-rd.png
diff --git a/companion/src/images/9xdr-yl.png b/companion/src/images/simulator/9X/9xdr-yl.png
similarity index 100%
rename from companion/src/images/9xdr-yl.png
rename to companion/src/images/simulator/9X/9xdr-yl.png
diff --git a/companion/src/images/9xdr.png b/companion/src/images/simulator/9X/9xdr.png
similarity index 100%
rename from companion/src/images/9xdr.png
rename to companion/src/images/simulator/9X/9xdr.png
diff --git a/companion/src/images/9xdt-bl.png b/companion/src/images/simulator/9X/9xdt-bl.png
similarity index 100%
rename from companion/src/images/9xdt-bl.png
rename to companion/src/images/simulator/9X/9xdt-bl.png
diff --git a/companion/src/images/9xdt-gr.png b/companion/src/images/simulator/9X/9xdt-gr.png
similarity index 100%
rename from companion/src/images/9xdt-gr.png
rename to companion/src/images/simulator/9X/9xdt-gr.png
diff --git a/companion/src/images/9xdt-or.png b/companion/src/images/simulator/9X/9xdt-or.png
similarity index 100%
rename from companion/src/images/9xdt-or.png
rename to companion/src/images/simulator/9X/9xdt-or.png
diff --git a/companion/src/images/9xdt-rd.png b/companion/src/images/simulator/9X/9xdt-rd.png
similarity index 100%
rename from companion/src/images/9xdt-rd.png
rename to companion/src/images/simulator/9X/9xdt-rd.png
diff --git a/companion/src/images/9xdt-yl.png b/companion/src/images/simulator/9X/9xdt-yl.png
similarity index 100%
rename from companion/src/images/9xdt-yl.png
rename to companion/src/images/simulator/9X/9xdt-yl.png
diff --git a/companion/src/images/9xdt.png b/companion/src/images/simulator/9X/9xdt.png
similarity index 100%
rename from companion/src/images/9xdt.png
rename to companion/src/images/simulator/9X/9xdt.png
diff --git a/companion/src/images/9xmenu.png b/companion/src/images/simulator/9X/9xmenu.png
similarity index 100%
rename from companion/src/images/9xmenu.png
rename to companion/src/images/simulator/9X/9xmenu.png
diff --git a/companion/src/images/9xmenuexit.png b/companion/src/images/simulator/9X/9xmenuexit.png
similarity index 100%
rename from companion/src/images/9xmenuexit.png
rename to companion/src/images/simulator/9X/9xmenuexit.png
diff --git a/companion/src/images/9xmenumenu.png b/companion/src/images/simulator/9X/9xmenumenu.png
similarity index 100%
rename from companion/src/images/9xmenumenu.png
rename to companion/src/images/simulator/9X/9xmenumenu.png
diff --git a/companion/src/images/simulator/Horus/bottom.png b/companion/src/images/simulator/Horus/bottom.png
new file mode 100644
index 000000000..239eeb18f
Binary files /dev/null and b/companion/src/images/simulator/Horus/bottom.png differ
diff --git a/companion/src/images/simulator/Horus/left.png b/companion/src/images/simulator/Horus/left.png
new file mode 100644
index 000000000..4c1dfd345
Binary files /dev/null and b/companion/src/images/simulator/Horus/left.png differ
diff --git a/companion/src/images/simulator/Horus/middle.png b/companion/src/images/simulator/Horus/middle.png
new file mode 100644
index 000000000..8d3f480a0
Binary files /dev/null and b/companion/src/images/simulator/Horus/middle.png differ
diff --git a/companion/src/images/simulator/Horus/right.png b/companion/src/images/simulator/Horus/right.png
new file mode 100644
index 000000000..6c5011012
Binary files /dev/null and b/companion/src/images/simulator/Horus/right.png differ
diff --git a/companion/src/images/simulator/Horus/top.png b/companion/src/images/simulator/Horus/top.png
new file mode 100644
index 000000000..f0b6f7264
Binary files /dev/null and b/companion/src/images/simulator/Horus/top.png differ
diff --git a/companion/src/images/x9b0.png b/companion/src/images/simulator/Taranis/x9b0.png
similarity index 100%
rename from companion/src/images/x9b0.png
rename to companion/src/images/simulator/Taranis/x9b0.png
diff --git a/companion/src/images/x9l0.png b/companion/src/images/simulator/Taranis/x9l0.png
similarity index 100%
rename from companion/src/images/x9l0.png
rename to companion/src/images/simulator/Taranis/x9l0.png
diff --git a/companion/src/images/x9l1.png b/companion/src/images/simulator/Taranis/x9l1.png
similarity index 100%
rename from companion/src/images/x9l1.png
rename to companion/src/images/simulator/Taranis/x9l1.png
diff --git a/companion/src/images/x9l2.png b/companion/src/images/simulator/Taranis/x9l2.png
similarity index 100%
rename from companion/src/images/x9l2.png
rename to companion/src/images/simulator/Taranis/x9l2.png
diff --git a/companion/src/images/x9l3.png b/companion/src/images/simulator/Taranis/x9l3.png
similarity index 100%
rename from companion/src/images/x9l3.png
rename to companion/src/images/simulator/Taranis/x9l3.png
diff --git a/companion/src/images/x9l4.png b/companion/src/images/simulator/Taranis/x9l4.png
similarity index 100%
rename from companion/src/images/x9l4.png
rename to companion/src/images/simulator/Taranis/x9l4.png
diff --git a/companion/src/images/x9r0.png b/companion/src/images/simulator/Taranis/x9r0.png
similarity index 100%
rename from companion/src/images/x9r0.png
rename to companion/src/images/simulator/Taranis/x9r0.png
diff --git a/companion/src/images/x9r1.png b/companion/src/images/simulator/Taranis/x9r1.png
similarity index 100%
rename from companion/src/images/x9r1.png
rename to companion/src/images/simulator/Taranis/x9r1.png
diff --git a/companion/src/images/x9r2.png b/companion/src/images/simulator/Taranis/x9r2.png
similarity index 100%
rename from companion/src/images/x9r2.png
rename to companion/src/images/simulator/Taranis/x9r2.png
diff --git a/companion/src/images/x9r3.png b/companion/src/images/simulator/Taranis/x9r3.png
similarity index 100%
rename from companion/src/images/x9r3.png
rename to companion/src/images/simulator/Taranis/x9r3.png
diff --git a/companion/src/images/x9s0.png b/companion/src/images/simulator/Taranis/x9s0.png
similarity index 100%
rename from companion/src/images/x9s0.png
rename to companion/src/images/simulator/Taranis/x9s0.png
diff --git a/companion/src/images/x9t0.png b/companion/src/images/simulator/Taranis/x9t0.png
similarity index 100%
rename from companion/src/images/x9t0.png
rename to companion/src/images/simulator/Taranis/x9t0.png
diff --git a/companion/src/simulation/buttonswidget.h b/companion/src/simulation/buttonswidget.h
index 80d09ee06..e196b7b39 100644
--- a/companion/src/simulation/buttonswidget.h
+++ b/companion/src/simulation/buttonswidget.h
@@ -73,7 +73,9 @@ class ButtonsWidget : public QWidget
       
     void setBitmap(const char * bitmap)
     {
-      QWidget::setStyleSheet(QString("background:url(:/images/%1);").arg(bitmap));
+      if (bitmap) {
+        QWidget::setStyleSheet(QString("background:url(:/images/simulator/%1);").arg(bitmap));
+      }
     }
     
     virtual void mousePressEvent(QMouseEvent * event)
diff --git a/companion/src/simulation/simulatordialog-9x.ui b/companion/src/simulation/simulatordialog-9x.ui
index 085eb56b3..c7dde17b3 100644
--- a/companion/src/simulation/simulatordialog-9x.ui
+++ b/companion/src/simulation/simulatordialog-9x.ui
@@ -1289,7 +1289,7 @@ QPushButton:checked {
             </size>
            </property>
            <property name="styleSheet">
-            <string notr="true">background:url(:/images/9xdt.png)</string>
+            <string notr="true">background:url(:/images/simulator/9X/9xdt.png)</string>
            </property>
           </widget>
          </item>
@@ -1308,7 +1308,7 @@ QPushButton:checked {
             </size>
            </property>
            <property name="styleSheet">
-            <string notr="true">background:url(:/images/9xdl.png)</string>
+            <string notr="true">background:url(:/images/simulator/9X/9xdl.png)</string>
            </property>
           </widget>
          </item>
@@ -1327,7 +1327,7 @@ QPushButton:checked {
             </size>
            </property>
            <property name="styleSheet">
-            <string notr="true">background:url(:/images/9xmenu.png)</string>
+            <string notr="true">background:url(:/images/simulator/9X/9xmenu.png)</string>
            </property>
           </widget>
          </item>
@@ -1362,7 +1362,7 @@ QPushButton:checked {
             </size>
            </property>
            <property name="styleSheet">
-            <string notr="true">background:url(:/images/9xdb.png)</string>
+            <string notr="true">background:url(:/images/simulator/9X/9xdb.png)</string>
            </property>
           </widget>
          </item>
@@ -1381,7 +1381,7 @@ QPushButton:checked {
             </size>
            </property>
            <property name="styleSheet">
-            <string notr="true">background:url(:/images/9xdr.png)</string>
+            <string notr="true">background:url(:/images/simulator/9X/9xdr.png)</string>
            </property>
           </widget>
          </item>
@@ -1403,7 +1403,7 @@ QPushButton:checked {
             <bool>true</bool>
            </property>
            <property name="styleSheet">
-            <string notr="true">background:url(:/images/9xcurs.png);</string>
+            <string notr="true">background:url(:/images/simulator/9X/9xcurs.png);</string>
            </property>
           </widget>
          </item>
diff --git a/companion/src/simulation/simulatordialog-horus.ui b/companion/src/simulation/simulatordialog-horus.ui
index c51e173f9..8277cb0fa 100644
--- a/companion/src/simulation/simulatordialog-horus.ui
+++ b/companion/src/simulation/simulatordialog-horus.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>739</width>
-    <height>740</height>
+    <width>808</width>
+    <height>738</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -18,7 +18,7 @@
   </property>
   <property name="maximumSize">
    <size>
-    <width>739</width>
+    <width>808</width>
     <height>16777215</height>
    </size>
   </property>
@@ -55,7 +55,7 @@
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>570</width>
+       <width>700</width>
        <height>5</height>
       </size>
      </property>
@@ -83,17 +83,129 @@
      </property>
      <widget class="QWidget" name="simu">
       <attribute name="title">
-       <string>Forus Simulator</string>
+       <string>Horus Simulator</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_5">
+       <property name="topMargin">
+        <number>5</number>
+       </property>
+       <property name="bottomMargin">
+        <number>5</number>
+       </property>
+       <property name="horizontalSpacing">
+        <number>0</number>
+       </property>
        <item row="0" column="1">
-        <layout class="QGridLayout" name="gridLayout_3">
+        <layout class="QGridLayout" name="gridLayout_3" columnminimumwidth="147,480,147">
          <property name="sizeConstraint">
-          <enum>QLayout::SetMinimumSize</enum>
+          <enum>QLayout::SetFixedSize</enum>
          </property>
          <property name="spacing">
           <number>0</number>
          </property>
+         <item row="0" column="0" rowspan="3">
+          <widget class="ButtonsWidget" name="leftbuttons" native="true">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>147</width>
+             <height>292</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>147</width>
+             <height>292</height>
+            </size>
+           </property>
+           <property name="mouseTracking">
+            <bool>true</bool>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">background:url(:/images/simulator/Horus/left.png);</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="2" rowspan="3">
+          <widget class="ButtonsWidget" name="rightbuttons" native="true">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>147</width>
+             <height>292</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>147</width>
+             <height>292</height>
+            </size>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">background:url(:/images/simulator/Horus/right.png)</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QWidget" name="top" native="true">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>480</width>
+             <height>10</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>480</width>
+             <height>10</height>
+            </size>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">background:url(:/images/simulator/Horus/top.png)</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <widget class="QWidget" name="bottom" native="true">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>480</width>
+             <height>10</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>480</width>
+             <height>10</height>
+            </size>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">background:url(:/images/simulator/Horus/bottom.png)</string>
+           </property>
+          </widget>
+         </item>
          <item row="1" column="1">
           <widget class="LcdWidget" name="lcd" native="true">
            <property name="sizePolicy">
@@ -110,47 +222,6 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="0" rowspan="3">
-          <widget class="ButtonsWidget" name="leftbuttons" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>89</width>
-             <height>186</height>
-            </size>
-           </property>
-           <property name="mouseTracking">
-            <bool>true</bool>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">background:url(:/images/9xmenu.png);</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="2" rowspan="3">
-          <widget class="ButtonsWidget" name="rightbuttons" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>128</width>
-             <height>186</height>
-            </size>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">background:url(:/images/9xcurs.png)</string>
-           </property>
-          </widget>
-         </item>
         </layout>
        </item>
        <item row="0" column="0">
@@ -160,8 +231,8 @@
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>40</width>
-           <height>20</height>
+           <width>20</width>
+           <height>292</height>
           </size>
          </property>
         </spacer>
@@ -173,29 +244,12 @@
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>40</width>
-           <height>20</height>
+           <width>20</width>
+           <height>292</height>
           </size>
          </property>
         </spacer>
        </item>
-       <item row="1" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_8">
-         <item>
-          <spacer name="horizontalSpacer_3">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>438</width>
-             <height>6</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="outputs">
diff --git a/companion/src/simulation/simulatordialog-taranis.ui b/companion/src/simulation/simulatordialog-taranis.ui
index 65c040d92..e2f693cb8 100644
--- a/companion/src/simulation/simulatordialog-taranis.ui
+++ b/companion/src/simulation/simulatordialog-taranis.ui
@@ -112,7 +112,7 @@
             <bool>true</bool>
            </property>
            <property name="styleSheet">
-            <string notr="true">background:url(:/images/x9l0.png);</string>
+            <string notr="true">background:url(:/images/simulator/Taranis/x9l0.png);</string>
            </property>
           </widget>
          </item>
@@ -131,7 +131,7 @@
             </size>
            </property>
            <property name="styleSheet">
-            <string notr="true">background:url(:/images/x9t0.png)</string>
+            <string notr="true">background:url(:/images/simulator/Taranis/x9t0.png)</string>
            </property>
           </widget>
          </item>
@@ -150,7 +150,7 @@
             </size>
            </property>
            <property name="styleSheet">
-            <string notr="true">background:url(:/images/x9r0.png)</string>
+            <string notr="true">background:url(:/images/simulator/Taranis/x9r0.png)</string>
            </property>
           </widget>
          </item>
@@ -185,7 +185,7 @@
             </size>
            </property>
            <property name="styleSheet">
-            <string notr="true">background:url(:/images/x9b0.png)</string>
+            <string notr="true">background:url(:/images/simulator/Taranis/x9b0.png)</string>
            </property>
           </widget>
          </item>
diff --git a/companion/src/simulation/simulatordialog.cpp b/companion/src/simulation/simulatordialog.cpp
index fbf96467f..6d4b3f8e0 100644
--- a/companion/src/simulation/simulatordialog.cpp
+++ b/companion/src/simulation/simulatordialog.cpp
@@ -336,7 +336,7 @@ void SimulatorDialog::initUi(T * ui)
 
     QSlider * slider = new QSlider(tabWidget);
     slider->setEnabled(false);
-    slider->setMaximumSize(QSize(16777215, 18));
+    /*slider->setMaximumSize(QSize(16777215, 18));
     slider->setStyleSheet(QString::fromUtf8("QSlider::sub-page:horizontal:disabled {\n"
     "border-color: #999;\n"
     "}\n"
@@ -349,7 +349,7 @@ void SimulatorDialog::initUi(T * ui)
     "background: #0000CC;\n"
     "border: 1px solid #aaa;\n"
     "border-radius: 4px;\n"
-    "}"));
+    "}")); */
     slider->setMinimum(-1024);
     slider->setMaximum(1024);
     slider->setPageStep(128);
diff --git a/companion/src/simulation/simulatordialog9x.cpp b/companion/src/simulation/simulatordialog9x.cpp
index 3b84c8064..a2a87455e 100644
--- a/companion/src/simulation/simulatordialog9x.cpp
+++ b/companion/src/simulation/simulatordialog9x.cpp
@@ -16,17 +16,17 @@ SimulatorDialog9X::SimulatorDialog9X(QWidget * parent, SimulatorInterface *simul
   initUi<Ui::SimulatorDialog9X>(ui);
 
   polygon.setPoints(6, 68, 83, 28, 45, 51, 32, 83, 32, 105, 45, 68, 83);
-  ui->leftbuttons->addArea(polygon, Qt::Key_Up, "9xcursup.png");
+  ui->leftbuttons->addArea(polygon, Qt::Key_Up, "9X/9xcursup.png");
   polygon.setPoints(6, 74, 90, 114, 51, 127, 80, 127, 106, 114, 130, 74, 90);
-  ui->leftbuttons->addArea(polygon, Qt::Key_Right, "9xcursmin.png");
+  ui->leftbuttons->addArea(polygon, Qt::Key_Right, "9X/9xcursmin.png");
   polygon.setPoints(6, 68, 98, 28, 137, 51, 151, 83, 151, 105, 137, 68, 98);
-  ui->leftbuttons->addArea(polygon, Qt::Key_Down, "9xcursdown.png");
+  ui->leftbuttons->addArea(polygon, Qt::Key_Down, "9X/9xcursdown.png");
   polygon.setPoints(6, 80, 90, 20, 51, 7, 80, 7, 106, 20, 130, 80, 90);
-  ui->leftbuttons->addArea(polygon, Qt::Key_Left, "9xcursplus.png");
-  ui->leftbuttons->addArea(5, 148, 39, 182, Qt::Key_Print, "9xcursphoto.png");
+  ui->leftbuttons->addArea(polygon, Qt::Key_Left, "9X/9xcursplus.png");
+  ui->leftbuttons->addArea(5, 148, 39, 182, Qt::Key_Print, "9X/9xcursphoto.png");
 
-  ui->rightbuttons->addArea(25, 60, 71, 81, Qt::Key_Enter, "9xmenumenu.png");
-  ui->rightbuttons->addArea(25, 117, 71, 139, Qt::Key_Escape, "9xmenuexit.png");
+  ui->rightbuttons->addArea(25, 60, 71, 81, Qt::Key_Enter, "9X/9xmenumenu.png");
+  ui->rightbuttons->addArea(25, 117, 71, 139, Qt::Key_Escape, "9X/9xmenuexit.png");
 
   // install simulator TRACE hook
   simulator->installTraceHook(traceCb);
@@ -107,10 +107,10 @@ void SimulatorDialog9X::setLightOn(bool enable)
     list << "bl" << "gr" << "rd" << "or" << "yl";
     bg = QString("-") + list[backLight];
   }
-  ui->top->setStyleSheet(QString("background:url(:/images/9xdt%1.png);").arg(bg));
-  ui->bottom->setStyleSheet(QString("background:url(:/images/9xdb%1.png);").arg(bg));
-  ui->left->setStyleSheet(QString("background:url(:/images/9xdl%1.png);").arg(bg));
-  ui->right->setStyleSheet(QString("background:url(:/images/9xdr%1.png);").arg(bg));
+  ui->top->setStyleSheet(QString("background:url(:/images/simulator/9X/9xdt%1.png);").arg(bg));
+  ui->bottom->setStyleSheet(QString("background:url(:/images/simulator/9X/9xdb%1.png);").arg(bg));
+  ui->left->setStyleSheet(QString("background:url(:/images/simulator/9X/9xdl%1.png);").arg(bg));
+  ui->right->setStyleSheet(QString("background:url(:/images/simulator/9X/9xdr%1.png);").arg(bg));
 }
 
 void SimulatorDialog9X::updateBeepButton()
diff --git a/companion/src/simulation/simulatordialoghorus.cpp b/companion/src/simulation/simulatordialoghorus.cpp
index 3bd7733bb..cee428f69 100644
--- a/companion/src/simulation/simulatordialoghorus.cpp
+++ b/companion/src/simulation/simulatordialoghorus.cpp
@@ -11,23 +11,23 @@ SimulatorDialogHorus::SimulatorDialogHorus(QWidget * parent, SimulatorInterface
   QPolygon polygon;
 
   lcdWidth = 480;
-  lcdHeight = 270;
+  lcdHeight = 272;
   lcdDepth = 16;
 
   initUi<Ui::SimulatorDialogHorus>(ui);
 
   polygon.setPoints(6, 68, 83, 28, 45, 51, 32, 83, 32, 105, 45, 68, 83);
-  ui->rightbuttons->addArea(polygon, Qt::Key_Up, "9xcursup.png");
+  ui->rightbuttons->addArea(polygon, Qt::Key_Up, NULL);
   polygon.setPoints(6, 74, 90, 114, 51, 127, 80, 127, 106, 114, 130, 74, 90);
-  ui->rightbuttons->addArea(polygon, Qt::Key_Right, "9xcursmin.png");
+  ui->rightbuttons->addArea(polygon, Qt::Key_Right, NULL);
   polygon.setPoints(6, 68, 98, 28, 137, 51, 151, 83, 151, 105, 137, 68, 98);
-  ui->rightbuttons->addArea(polygon, Qt::Key_Down, "9xcursdown.png");
+  ui->rightbuttons->addArea(polygon, Qt::Key_Down, NULL);
   polygon.setPoints(6, 80, 90, 20, 51, 7, 80, 7, 106, 20, 130, 80, 90);
-  ui->rightbuttons->addArea(polygon, Qt::Key_Left, "9xcursplus.png");
-  ui->rightbuttons->addArea(5, 148, 39, 182, Qt::Key_Print, "9xcursphoto.png");
+  ui->rightbuttons->addArea(polygon, Qt::Key_Left, NULL);
+  ui->rightbuttons->addArea(5, 148, 39, 182, Qt::Key_Print, NULL);
 
-  ui->leftbuttons->addArea(25, 60, 71, 81, Qt::Key_PageUp, "9xmenumenu.png");
-  ui->leftbuttons->addArea(25, 117, 71, 139, Qt::Key_Escape, "9xmenuexit.png");
+  ui->leftbuttons->addArea(25, 60, 71, 81, Qt::Key_PageUp, NULL);
+  ui->leftbuttons->addArea(25, 117, 71, 139, Qt::Key_Escape, NULL);
 
   // install simulator TRACE hook
   simulator->installTraceHook(traceCb);
diff --git a/companion/src/simulation/simulatordialogtaranis.cpp b/companion/src/simulation/simulatordialogtaranis.cpp
index 432601a65..dc67dfa6c 100644
--- a/companion/src/simulation/simulatordialogtaranis.cpp
+++ b/companion/src/simulation/simulatordialogtaranis.cpp
@@ -15,18 +15,18 @@ SimulatorDialogTaranis::SimulatorDialogTaranis(QWidget * parent, SimulatorInterf
   initUi<Ui::SimulatorDialogTaranis>(ui);
 
   polygon.setPoints(6, 20, 59, 27, 50, 45, 52, 56, 59, 50, 71, 26, 72);
-  ui->leftbuttons->addArea(polygon, Qt::Key_PageUp, "x9l1.png");
+  ui->leftbuttons->addArea(polygon, Qt::Key_PageUp, "Taranis/x9l1.png");
   polygon.setPoints(6, 23, 107, 30, 99, 46, 100, 55, 106, 47, 117, 28, 117);
-  ui->leftbuttons->addArea(polygon, Qt::Key_PageDown, "x9l2.png");
+  ui->leftbuttons->addArea(polygon, Qt::Key_PageDown, "Taranis/x9l2.png");
   polygon.setPoints(6, 24, 154, 32, 144, 46, 146, 57, 156, 46, 167, 29, 166);
-  ui->leftbuttons->addArea(polygon, Qt::Key_Escape, "x9l3.png");
-  ui->leftbuttons->addArea(90, 177, 118, 197, Qt::Key_Print, "x9l4.png");
+  ui->leftbuttons->addArea(polygon, Qt::Key_Escape, "Taranis/x9l3.png");
+  ui->leftbuttons->addArea(90, 177, 118, 197, Qt::Key_Print, "Taranis/x9l4.png");
   polygon.setPoints(6, 64, 60, 71, 50, 90, 50, 100, 60, 90, 73, 72, 73);
-  ui->rightbuttons->addArea(polygon, Qt::Key_Plus, "x9r1.png");
+  ui->rightbuttons->addArea(polygon, Qt::Key_Plus, "Taranis/x9r1.png");
   polygon.setPoints(6, 63, 109, 73, 100, 88, 100, 98, 109, 88, 119, 72, 119);
-  ui->rightbuttons->addArea(polygon, Qt::Key_Minus, "x9r2.png");
+  ui->rightbuttons->addArea(polygon, Qt::Key_Minus, "Taranis/x9r2.png");
   polygon.setPoints(6, 63, 155, 72, 146, 90, 146, 98, 155, 88, 166, 72, 166);
-  ui->rightbuttons->addArea(polygon, Qt::Key_Enter, "x9r3.png");
+  ui->rightbuttons->addArea(polygon, Qt::Key_Enter, "Taranis/x9r3.png");
 
   // install simulator TRACE hook
   simulator->installTraceHook(traceCb);