diff --git a/companion/src/companion.qrc b/companion/src/companion.qrc
index 018d2e9e2..ba6baa82e 100644
--- a/companion/src/companion.qrc
+++ b/companion/src/companion.qrc
@@ -10,6 +10,8 @@
     <file>images/simulator/Horus/right.png</file>
     <file>images/simulator/Horus/top.png</file>
     <file>images/simulator/Horus/bottom.png</file>
+    <file>images/simulator/Horus/led.png</file>
+    <file>images/simulator/Horus/border-right.png</file>
     <file>images/simulator/9X/9xdb.png</file>
     <file>images/simulator/9X/9xdl.png</file>
     <file>images/simulator/9X/9xdr.png</file>
diff --git a/companion/src/images/simulator/Horus/border-right.png b/companion/src/images/simulator/Horus/border-right.png
new file mode 100644
index 000000000..8c2398885
Binary files /dev/null and b/companion/src/images/simulator/Horus/border-right.png differ
diff --git a/companion/src/images/simulator/Horus/bottom.png b/companion/src/images/simulator/Horus/bottom.png
index 239eeb18f..7d3fb11b1 100644
Binary files a/companion/src/images/simulator/Horus/bottom.png and b/companion/src/images/simulator/Horus/bottom.png differ
diff --git a/companion/src/images/simulator/Horus/led.png b/companion/src/images/simulator/Horus/led.png
new file mode 100644
index 000000000..faa808888
Binary files /dev/null and b/companion/src/images/simulator/Horus/led.png differ
diff --git a/companion/src/images/simulator/Horus/top.png b/companion/src/images/simulator/Horus/top.png
index f0b6f7264..334f6bc56 100644
Binary files a/companion/src/images/simulator/Horus/top.png and b/companion/src/images/simulator/Horus/top.png differ
diff --git a/companion/src/simulation/simulatordialog-horus.ui b/companion/src/simulation/simulatordialog-horus.ui
index 8277cb0fa..dad0695bf 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>808</width>
-    <height>738</height>
+    <width>960</width>
+    <height>850</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -18,8 +18,14 @@
   </property>
   <property name="maximumSize">
    <size>
-    <width>808</width>
-    <height>16777215</height>
+    <width>960</width>
+    <height>850</height>
+   </size>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>960</width>
+    <height>850</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -96,7 +102,7 @@
         <number>0</number>
        </property>
        <item row="0" column="1">
-        <layout class="QGridLayout" name="gridLayout_3" columnminimumwidth="147,480,147">
+        <layout class="QGridLayout" name="gridLayout_3">
          <property name="sizeConstraint">
           <enum>QLayout::SetFixedSize</enum>
          </property>
@@ -131,7 +137,145 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="2" rowspan="3">
+         <item row="0" column="2">
+          <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>9</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>480</width>
+             <height>9</height>
+            </size>
+           </property>
+           <property name="font">
+            <font>
+             <pointsize>5</pointsize>
+            </font>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">background:url(:/images/simulator/Horus/top.png)</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="2">
+          <widget class="LcdWidget" name="lcd" 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>275</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>480</width>
+             <height>272</height>
+            </size>
+           </property>
+           <property name="font">
+            <font>
+             <pointsize>5</pointsize>
+            </font>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="2">
+          <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>11</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>480</width>
+             <height>11</height>
+            </size>
+           </property>
+           <property name="font">
+            <font>
+             <pointsize>5</pointsize>
+             <kerning>false</kerning>
+            </font>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">background:url(:/images/simulator/Horus/bottom.png)</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1" rowspan="3">
+          <widget class="ButtonsWidget" name="led" native="true">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>24</width>
+             <height>292</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>24</width>
+             <height>292</height>
+            </size>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">background:url(:/images/simulator/Horus/led.png)</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="3" rowspan="3">
+          <widget class="ButtonsWidget" name="borderRight" native="true">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>27</width>
+             <height>292</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>27</width>
+             <height>292</height>
+            </size>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">background:url(:/images/simulator/Horus/border-right.png)</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="4" rowspan="3">
           <widget class="ButtonsWidget" name="rightbuttons" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -156,76 +300,10 @@
            </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">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>480</width>
-             <height>272</height>
-            </size>
-           </property>
-          </widget>
-         </item>
         </layout>
        </item>
-       <item row="0" column="0">
-        <spacer name="horizontalSpacer_2">
+       <item row="0" column="2">
+        <spacer name="horizontalSpacer_5">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -237,8 +315,8 @@
          </property>
         </spacer>
        </item>
-       <item row="0" column="2">
-        <spacer name="horizontalSpacer_5">
+       <item row="0" column="0">
+        <spacer name="horizontalSpacer_2">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -254,7 +332,7 @@
      </widget>
      <widget class="QWidget" name="outputs">
       <attribute name="title">
-       <string>Outputs</string>
+       <string>O&amp;utputs</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_7">
        <item row="0" column="0">
@@ -267,7 +345,7 @@
      </widget>
      <widget class="QWidget" name="outputs2">
       <attribute name="title">
-       <string>Outputs2</string>
+       <string>Ou&amp;tputs2</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
@@ -280,7 +358,7 @@
      </widget>
      <widget class="QWidget" name="misc">
       <attribute name="title">
-       <string>Gvars</string>
+       <string>&amp;Gvars</string>
       </attribute>
       <widget class="QWidget" name="gridLayoutWidget">
        <property name="geometry">
diff --git a/radio/src/debug.h b/radio/src/debug.h
index 92640a397..db2591144 100644
--- a/radio/src/debug.h
+++ b/radio/src/debug.h
@@ -78,8 +78,13 @@ void debugPrintf(const char * format, ...);
 #define TRACE_WARNING_WP(...) debugPrintf(__VA_ARGS__)
 #define TRACE_ERROR(...)      debugPrintf("-E- " __VA_ARGS__)
 
+#if defined(DEBUG) && !defined(SIMU)
 #define TIME_MEASURE_START(id) uint16_t t0 ## id = getTmr2MHz()
 #define TIME_MEASURE_STOP(id)  TRACE("Measure(" # id ") = %.1fus", float((uint16_t)(getTmr2MHz() - t0 ## id))/2)
+#else
+#define TIME_MEASURE_START(id)
+#define TIME_MEASURE_STOP(id)
+#endif
 
 #if defined(DEBUG_TRACE_BUFFER)