diff --git a/companion/src/apppreferencesdialog.cpp b/companion/src/apppreferencesdialog.cpp
index fcb6157bb..e43cef1c3 100644
--- a/companion/src/apppreferencesdialog.cpp
+++ b/companion/src/apppreferencesdialog.cpp
@@ -2,6 +2,10 @@
 #include "ui_apppreferencesdialog.h"
 #include "mainwindow.h"
 #include "helpers.h"
+#ifdef JOYSTICKS
+#include "joystick.h"
+#include "joystickdialog.h"
+#endif
 #include <QDesktopServices>
 #include <QtGui>
 
@@ -13,7 +17,14 @@ appPreferencesDialog::appPreferencesDialog(QWidget *parent) :
   setWindowIcon(CompanionIcon("preferences.png"));
   initSettings();
   connect(this, SIGNAL(accepted()), this, SLOT(writeValues()));
-//  resize(0,0);
+#ifndef JOYSTICKS
+  ui->joystickCB->hide();
+  ui->joystickCB->setDisabled(true);
+  ui->joystickcalButton->hide();
+  ui->joystickChkB->hide();
+  ui->label_11->hide();
+#endif
+  resize(0,0);
 }
 
 appPreferencesDialog::~appPreferencesDialog()
@@ -28,23 +39,59 @@ void appPreferencesDialog::writeValues()
   settings.setValue("startup_check_fw", ui->startupCheck_fw->isChecked());
   settings.setValue("wizardEnable", ui->wizardEnable_ChkB->isChecked());
   settings.setValue("show_splash", ui->showSplash->isChecked());
+  settings.setValue("simuSW", ui->simuSW->isChecked());
   settings.setValue("history_size", ui->historySize->value());
+  settings.setValue("backLight", ui->backLightColor->currentIndex());
   settings.setValue("gePath", ui->ge_lineedit->text());
   settings.setValue("backupEnable", ui->backupEnable->isChecked());
+
+  if (ui->joystickChkB ->isChecked() && ui->joystickCB->isEnabled()) {
+    settings.setValue("js_support", ui->joystickChkB ->isChecked());  
+    settings.setValue("js_ctrl", ui->joystickCB ->currentIndex());
+  }
+  else {
+    settings.remove("js_support");
+    settings.remove("js_ctrl");
+  }
+
   MainWindow * mw = (MainWindow *)this->parent();
   mw->unloadProfile();
 }
 
+void appPreferencesDialog::on_snapshotPathButton_clicked()
+{
+  QSettings settings;
+  QString fileName = QFileDialog::getExistingDirectory(this,tr("Select your snapshot folder"), settings.value("snapshotPath").toString());
+  if (!fileName.isEmpty()) {
+    settings.setValue("snapshotpath", fileName);
+    settings.setValue("snapshot_to_clipboard", false);
+    ui->snapshotPath->setText(fileName);
+  }
+}
+
 void appPreferencesDialog::initSettings()
 {
   QSettings settings;
+  ui->snapshotClipboardCKB->setChecked(settings.value("snapshot_to_clipboard", false).toBool());
+  
+  QString Path=settings.value("snapshotPath", "").toString();
+  if (QDir(Path).exists()) {
+    ui->snapshotPath->setText(Path);
+    ui->snapshotPath->setReadOnly(true);
+  }
+  if (ui->snapshotClipboardCKB->isChecked()) {
+    ui->snapshotPath->setDisabled(true);
+    ui->snapshotPathButton->setDisabled(true);
+  }
   ui->startupCheck_companion9x->setChecked(settings.value("startup_check_companion", true).toBool());
   ui->startupCheck_fw->setChecked(settings.value("startup_check_fw", true).toBool());
   ui->wizardEnable_ChkB->setChecked(settings.value("wizardEnable", true).toBool());
   ui->showSplash->setChecked(settings.value("show_splash", true).toBool());
   ui->historySize->setValue(settings.value("history_size", 10).toInt());
+  ui->backLightColor->setCurrentIndex(settings.value("backLight", 0).toInt());
+  ui->simuSW->setChecked(settings.value("simuSW", false).toBool());
 
-  QString Path=settings.value("gePath", "").toString();
+  Path=settings.value("gePath", "").toString();
   if (QFile(Path).exists()) {
     ui->ge_lineedit->setText(Path);
   }  
@@ -60,6 +107,48 @@ void appPreferencesDialog::initSettings()
   } else {
       ui->backupEnable->setDisabled(true);
   }
+#ifdef JOYSTICKS
+  ui->joystickChkB->setChecked(settings.value("js_support", false).toBool());
+  if (ui->joystickChkB->isChecked()) {
+    QStringList joystickNames;
+    joystickNames << tr("No joysticks found");
+    joystick = new Joystick(0,false,0,0);
+    ui->joystickcalButton->setDisabled(true);
+    ui->joystickCB->setDisabled(true);
+
+    if ( joystick ) {
+      if ( joystick->joystickNames.count() > 0 ) {
+        joystickNames = joystick->joystickNames;
+        ui->joystickCB->setEnabled(true);
+        ui->joystickcalButton->setEnabled(true);
+      }
+      joystick->close();
+    }
+    ui->joystickCB->clear();
+    ui->joystickCB->insertItems(0, joystickNames);
+    ui->joystickCB->setCurrentIndex(settings.value("js_ctrl", 0).toInt());
+  }
+  else {
+    ui->joystickCB->clear();
+    ui->joystickCB->setDisabled(true);
+    ui->joystickcalButton->setDisabled(true);
+  }
+#endif  
+}
+
+void appPreferencesDialog::on_snapshotClipboardCKB_clicked()
+{
+  QSettings settings;
+  if (ui->snapshotClipboardCKB->isChecked()) {
+    ui->snapshotPath->setDisabled(true);
+    ui->snapshotPathButton->setDisabled(true);
+    settings.setValue("snapshot_to_clipboard", true);
+  } else {
+    ui->snapshotPath->setEnabled(true);
+    ui->snapshotPath->setReadOnly(true);
+    ui->snapshotPathButton->setEnabled(true);
+    settings.setValue("snapshot_to_clipboard", false);
+  }
 }
 
 void appPreferencesDialog::on_backupPathButton_clicked()
@@ -82,4 +171,38 @@ void appPreferencesDialog::on_ge_pathButton_clicked()
   }
 }
  
+#ifdef JOYSTICKS
+void appPreferencesDialog::on_joystickChkB_clicked() {
+  if (ui->joystickChkB->isChecked()) {
+    QStringList joystickNames;
+    joystickNames << tr("No joysticks found");
+    joystick = new Joystick(0,false,0,0);
+    ui->joystickcalButton->setDisabled(true);
+    ui->joystickCB->setDisabled(true);
+
+    if ( joystick ) {
+      if ( joystick->joystickNames.count() > 0 ) {
+        joystickNames = joystick->joystickNames;
+        ui->joystickCB->setEnabled(true);
+        ui->joystickcalButton->setEnabled(true);
+      }
+      joystick->close();
+    }
+    ui->joystickCB->clear();
+    ui->joystickCB->insertItems(0, joystickNames);
+  }
+  else {
+    ui->joystickCB->clear();
+    ui->joystickCB->setDisabled(true);
+    ui->joystickcalButton->setDisabled(true);
+  }
+}
+
+void appPreferencesDialog::on_joystickcalButton_clicked() {
+   //QSettings settings;
+   //settings.setValue("joystick-name",ui->joystickCB->currentText());
+   joystickDialog * jd=new joystickDialog(this, ui->joystickCB->currentIndex());
+   jd->exec();
+}
+#endif
 
diff --git a/companion/src/apppreferencesdialog.h b/companion/src/apppreferencesdialog.h
index 01b28f08a..09bda9bfb 100644
--- a/companion/src/apppreferencesdialog.h
+++ b/companion/src/apppreferencesdialog.h
@@ -9,6 +9,8 @@ namespace Ui {
     class appPreferencesDialog;
 }
 
+class Joystick;
+
 class appPreferencesDialog : public QDialog
 {
     Q_OBJECT
@@ -16,6 +18,7 @@ class appPreferencesDialog : public QDialog
 public:
     explicit appPreferencesDialog(QWidget *parent = 0);
     ~appPreferencesDialog();
+    Joystick *joystick;
 
 private:
     Ui::appPreferencesDialog *ui;
@@ -23,8 +26,14 @@ private:
 
 private slots:
     void writeValues();
+    void on_snapshotPathButton_clicked();
+    void on_snapshotClipboardCKB_clicked();
     void on_backupPathButton_clicked();
     void on_ge_pathButton_clicked();
+#ifdef JOYSTICKS
+    void on_joystickChkB_clicked();
+    void on_joystickcalButton_clicked();
+#endif
 };
 
 #endif // APPPREFERENCESDIALOG_H
diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui
index c896b3c2e..5dc0a3388 100644
--- a/companion/src/apppreferencesdialog.ui
+++ b/companion/src/apppreferencesdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>685</width>
-    <height>313</height>
+    <height>473</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -26,6 +26,80 @@
    <string>Application Preferences</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="13" column="0">
+    <widget class="QLabel" name="label_19">
+     <property name="text">
+      <string>Simulator capture folder</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" colspan="8">
+    <widget class="Line" name="line_4">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="15" column="1" colspan="7">
+    <widget class="QCheckBox" name="simuSW">
+     <property name="text">
+      <string>Remember simulator switch values</string>
+     </property>
+    </widget>
+   </item>
+   <item row="12" column="1" colspan="8">
+    <widget class="Line" name="line_3">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="13" column="8">
+    <widget class="QPushButton" name="snapshotPathButton">
+     <property name="text">
+      <string>Open Folder</string>
+     </property>
+     <property name="flat">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="1" colspan="8">
+    <widget class="Line" name="line_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="16" column="1">
+    <widget class="QComboBox" name="backLightColor">
+     <item>
+      <property name="text">
+       <string>Blue</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Green</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Red</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Orange</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Yellow</string>
+      </property>
+     </item>
+    </widget>
+   </item>
    <item row="2" column="0">
     <widget class="QLabel" name="label_5">
      <property name="sizePolicy">
@@ -35,7 +109,149 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>Recent Files</string>
+      <string>Files to keep</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="7">
+    <widget class="QLineEdit" name="ge_lineedit">
+     <property name="minimumSize">
+      <size>
+       <width>250</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="16" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Simulator BackLight</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="18" column="1" colspan="8">
+    <widget class="Line" name="line_5">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="0">
+    <widget class="QLabel" name="label_17">
+     <property name="text">
+      <string>Automatic Backup Folder</string>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="1" colspan="7">
+    <widget class="QLineEdit" name="backupPath">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="8">
+    <widget class="QPushButton" name="backupPathButton">
+     <property name="text">
+      <string>Open Folder</string>
+     </property>
+    </widget>
+   </item>
+   <item row="17" column="1">
+    <widget class="QComboBox" name="joystickCB">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="19" column="7" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="14" column="1" colspan="7">
+    <widget class="QCheckBox" name="snapshotClipboardCKB">
+     <property name="text">
+      <string>Only capture to clipboard</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1" colspan="8">
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="13" column="1" colspan="7">
+    <widget class="QLineEdit" name="snapshotPath">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="17" column="0">
+    <widget class="QLabel" name="label_11">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Joystick</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="8">
+    <widget class="QPushButton" name="ge_pathButton">
+     <property name="text">
+      <string>Find Executable</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="ge_label">
+     <property name="text">
+      <string>Google Earth Executable</string>
+     </property>
+    </widget>
+   </item>
+   <item row="17" column="8">
+    <widget class="QPushButton" name="joystickcalButton">
+     <property name="text">
+      <string>Calibrate</string>
+     </property>
+    </widget>
+   </item>
+   <item row="17" column="4" colspan="4">
+    <widget class="QCheckBox" name="joystickChkB">
+     <property name="text">
+      <string>Enable</string>
      </property>
     </widget>
    </item>
@@ -55,7 +271,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="1" colspan="3">
+   <item row="5" column="1" colspan="7">
     <widget class="QCheckBox" name="showSplash">
      <property name="text">
       <string>Show splash screen when Companion starts</string>
@@ -65,76 +281,7 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="1" colspan="3">
-    <widget class="QCheckBox" name="startupCheck_companion9x">
-     <property name="text">
-      <string>Automatic check for Companion updates</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="1" colspan="3">
-    <widget class="QCheckBox" name="backupEnable">
-     <property name="text">
-      <string>Enable automatic backup before writing firmware</string>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="0">
-    <widget class="QLabel" name="label_17">
-     <property name="text">
-      <string>Automatic Backup Folder</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="1" colspan="4">
-    <widget class="Line" name="line_3">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" colspan="3">
-    <widget class="QLineEdit" name="ge_lineedit">
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="4">
-    <widget class="QPushButton" name="ge_pathButton">
-     <property name="text">
-      <string>Find Executable</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1" colspan="4">
-    <widget class="Line" name="line">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="3" colspan="2">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="1" colspan="4">
-    <widget class="Line" name="line_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1" colspan="3">
+   <item row="6" column="1" colspan="7">
     <widget class="QCheckBox" name="startupCheck_fw">
      <property name="text">
       <string>Automatic check for OpenTX firmware updates</string>
@@ -144,7 +291,17 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="1" colspan="3">
+   <item row="7" column="1" colspan="7">
+    <widget class="QCheckBox" name="startupCheck_companion9x">
+     <property name="text">
+      <string>Automatic check for Companion updates</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="1" colspan="7">
     <widget class="QCheckBox" name="wizardEnable_ChkB">
      <property name="text">
       <string>Offer to use wizard for new models</string>
@@ -154,62 +311,66 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="ge_label">
+   <item row="11" column="1" colspan="7">
+    <widget class="QCheckBox" name="backupEnable">
      <property name="text">
-      <string>Google Earth Executable</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" colspan="4">
-    <widget class="Line" name="line_4">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2" colspan="2">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>(Number of recent Models&amp;Settings files to remember)</string>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="4">
-    <widget class="QPushButton" name="backupPathButton">
-     <property name="text">
-      <string>Open Folder</string>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="1" colspan="3">
-    <widget class="QLineEdit" name="backupPath">
-     <property name="readOnly">
-      <bool>true</bool>
+      <string>Enable automatic backup before writing firmware</string>
      </property>
     </widget>
    </item>
   </layout>
-  <zorder>historySize</zorder>
   <zorder>startupCheck_companion9x</zorder>
   <zorder>backupEnable</zorder>
-  <zorder>label_17</zorder>
-  <zorder>ge_lineedit</zorder>
   <zorder>line</zorder>
-  <zorder>buttonBox</zorder>
   <zorder>backupPath</zorder>
   <zorder>line_2</zorder>
   <zorder>startupCheck_fw</zorder>
   <zorder>wizardEnable_ChkB</zorder>
   <zorder>ge_label</zorder>
-  <zorder>label</zorder>
   <zorder>label_5</zorder>
   <zorder>showSplash</zorder>
   <zorder>line_3</zorder>
   <zorder>ge_pathButton</zorder>
   <zorder>line_4</zorder>
   <zorder>backupPathButton</zorder>
+  <zorder>label_3</zorder>
+  <zorder>backLightColor</zorder>
+  <zorder>snapshotPath</zorder>
+  <zorder>snapshotPathButton</zorder>
+  <zorder>snapshotClipboardCKB</zorder>
+  <zorder>label_11</zorder>
+  <zorder>joystickCB</zorder>
+  <zorder>joystickcalButton</zorder>
+  <zorder>ge_lineedit</zorder>
+  <zorder>simuSW</zorder>
+  <zorder>buttonBox</zorder>
+  <zorder>line_5</zorder>
+  <zorder>joystickChkB</zorder>
+  <zorder>label_17</zorder>
+  <zorder>label_19</zorder>
+  <zorder>historySize</zorder>
  </widget>
+ <tabstops>
+  <tabstop>buttonBox</tabstop>
+  <tabstop>ge_lineedit</tabstop>
+  <tabstop>ge_pathButton</tabstop>
+  <tabstop>historySize</tabstop>
+  <tabstop>showSplash</tabstop>
+  <tabstop>startupCheck_fw</tabstop>
+  <tabstop>startupCheck_companion9x</tabstop>
+  <tabstop>wizardEnable_ChkB</tabstop>
+  <tabstop>backupPath</tabstop>
+  <tabstop>backupPathButton</tabstop>
+  <tabstop>backupEnable</tabstop>
+  <tabstop>snapshotPath</tabstop>
+  <tabstop>snapshotPathButton</tabstop>
+  <tabstop>snapshotClipboardCKB</tabstop>
+  <tabstop>simuSW</tabstop>
+  <tabstop>backLightColor</tabstop>
+  <tabstop>joystickCB</tabstop>
+  <tabstop>joystickChkB</tabstop>
+  <tabstop>joystickcalButton</tabstop>
+ </tabstops>
  <resources>
   <include location="companion.qrc"/>
  </resources>
diff --git a/companion/src/companion.qrc b/companion/src/companion.qrc
index acb1591a1..6b2d3b724 100644
--- a/companion/src/companion.qrc
+++ b/companion/src/companion.qrc
@@ -326,6 +326,8 @@
     <file>themes/monochrome/16/compare.png</file>
     <file>themes/monochrome/16/saveas.png</file>
     <file>themes/monochrome/16/preferences.png</file>
+    <file>themes/monochrome/16/apppreferences.png</file>
+    <file>themes/monochrome/16/fwpreferences.png</file>
     <file>themes/monochrome/16/movedown.png</file>
     <file>themes/monochrome/16/currentmodel.png</file>
     <file>themes/monochrome/16/read_flash.png</file>
@@ -368,6 +370,8 @@
     <file>themes/monochrome/24/compare.png</file>
     <file>themes/monochrome/24/saveas.png</file>
     <file>themes/monochrome/24/preferences.png</file>
+    <file>themes/monochrome/24/apppreferences.png</file>
+    <file>themes/monochrome/24/fwpreferences.png</file>
     <file>themes/monochrome/24/movedown.png</file>
     <file>themes/monochrome/24/currentmodel.png</file>
     <file>themes/monochrome/24/read_flash.png</file>
@@ -410,6 +414,8 @@
     <file>themes/monochrome/32/compare.png</file>
     <file>themes/monochrome/32/saveas.png</file>
     <file>themes/monochrome/32/preferences.png</file>
+    <file>themes/monochrome/32/apppreferences.png</file>
+    <file>themes/monochrome/32/fwpreferences.png</file>
     <file>themes/monochrome/32/movedown.png</file>
     <file>themes/monochrome/32/currentmodel.png</file>
     <file>themes/monochrome/32/read_flash.png</file>
@@ -452,6 +458,8 @@
     <file>themes/monochrome/48/compare.png</file>
     <file>themes/monochrome/48/saveas.png</file>
     <file>themes/monochrome/48/preferences.png</file>
+    <file>themes/monochrome/48/apppreferences.png</file>
+    <file>themes/monochrome/48/fwpreferences.png</file>
     <file>themes/monochrome/48/movedown.png</file>
     <file>themes/monochrome/48/currentmodel.png</file>
     <file>themes/monochrome/48/read_flash.png</file>
@@ -494,6 +502,8 @@
     <file>themes/classic/16/compare.png</file>
     <file>themes/classic/16/saveas.png</file>
     <file>themes/classic/16/preferences.png</file>
+    <file>themes/classic/16/apppreferences.png</file>
+    <file>themes/classic/16/fwpreferences.png</file>
     <file>themes/classic/16/movedown.png</file>
     <file>themes/classic/16/currentmodel.png</file>
     <file>themes/classic/16/read_flash.png</file>
@@ -536,6 +546,8 @@
     <file>themes/classic/24/compare.png</file>
     <file>themes/classic/24/saveas.png</file>
     <file>themes/classic/24/preferences.png</file>
+    <file>themes/classic/24/apppreferences.png</file>
+    <file>themes/classic/24/fwpreferences.png</file>
     <file>themes/classic/24/movedown.png</file>
     <file>themes/classic/24/currentmodel.png</file>
     <file>themes/classic/24/read_flash.png</file>
@@ -578,6 +590,8 @@
     <file>themes/classic/32/compare.png</file>
     <file>themes/classic/32/saveas.png</file>
     <file>themes/classic/32/preferences.png</file>
+    <file>themes/classic/32/apppreferences.png</file>
+    <file>themes/classic/32/fwpreferences.png</file>
     <file>themes/classic/32/movedown.png</file>
     <file>themes/classic/32/currentmodel.png</file>
     <file>themes/classic/32/read_flash.png</file>
@@ -620,6 +634,8 @@
     <file>themes/classic/48/compare.png</file>
     <file>themes/classic/48/saveas.png</file>
     <file>themes/classic/48/preferences.png</file>
+    <file>themes/classic/48/apppreferences.png</file>
+    <file>themes/classic/48/fwpreferences.png</file>
     <file>themes/classic/48/movedown.png</file>
     <file>themes/classic/48/currentmodel.png</file>
     <file>themes/classic/48/read_flash.png</file>
@@ -662,6 +678,8 @@
     <file>themes/monoblue/16/compare.png</file>
     <file>themes/monoblue/16/saveas.png</file>
     <file>themes/monoblue/16/preferences.png</file>
+    <file>themes/monoblue/16/apppreferences.png</file>
+    <file>themes/monoblue/16/fwpreferences.png</file>
     <file>themes/monoblue/16/movedown.png</file>
     <file>themes/monoblue/16/currentmodel.png</file>
     <file>themes/monoblue/16/read_flash.png</file>
@@ -704,6 +722,8 @@
     <file>themes/monoblue/24/compare.png</file>
     <file>themes/monoblue/24/saveas.png</file>
     <file>themes/monoblue/24/preferences.png</file>
+    <file>themes/monoblue/24/apppreferences.png</file>
+    <file>themes/monoblue/24/fwpreferences.png</file>
     <file>themes/monoblue/24/movedown.png</file>
     <file>themes/monoblue/24/currentmodel.png</file>
     <file>themes/monoblue/24/read_flash.png</file>
@@ -746,6 +766,8 @@
     <file>themes/monoblue/32/compare.png</file>
     <file>themes/monoblue/32/saveas.png</file>
     <file>themes/monoblue/32/preferences.png</file>
+    <file>themes/monoblue/32/apppreferences.png</file>
+    <file>themes/monoblue/32/fwpreferences.png</file>
     <file>themes/monoblue/32/movedown.png</file>
     <file>themes/monoblue/32/currentmodel.png</file>
     <file>themes/monoblue/32/read_flash.png</file>
@@ -788,6 +810,8 @@
     <file>themes/monoblue/48/compare.png</file>
     <file>themes/monoblue/48/saveas.png</file>
     <file>themes/monoblue/48/preferences.png</file>
+    <file>themes/monoblue/48/apppreferences.png</file>
+    <file>themes/monoblue/48/fwpreferences.png</file>
     <file>themes/monoblue/48/movedown.png</file>
     <file>themes/monoblue/48/currentmodel.png</file>
     <file>themes/monoblue/48/read_flash.png</file>
@@ -830,6 +854,8 @@
     <file>themes/monowhite/16/compare.png</file>
     <file>themes/monowhite/16/saveas.png</file>
     <file>themes/monowhite/16/preferences.png</file>
+    <file>themes/monowhite/16/apppreferences.png</file>
+    <file>themes/monowhite/16/fwpreferences.png</file>
     <file>themes/monowhite/16/movedown.png</file>
     <file>themes/monowhite/16/currentmodel.png</file>
     <file>themes/monowhite/16/read_flash.png</file>
@@ -872,6 +898,8 @@
     <file>themes/monowhite/24/compare.png</file>
     <file>themes/monowhite/24/saveas.png</file>
     <file>themes/monowhite/24/preferences.png</file>
+    <file>themes/monowhite/24/apppreferences.png</file>
+    <file>themes/monowhite/24/fwpreferences.png</file>
     <file>themes/monowhite/24/movedown.png</file>
     <file>themes/monowhite/24/currentmodel.png</file>
     <file>themes/monowhite/24/read_flash.png</file>
@@ -914,6 +942,8 @@
     <file>themes/monowhite/32/compare.png</file>
     <file>themes/monowhite/32/saveas.png</file>
     <file>themes/monowhite/32/preferences.png</file>
+    <file>themes/monowhite/32/apppreferences.png</file>
+    <file>themes/monowhite/32/fwpreferences.png</file>
     <file>themes/monowhite/32/movedown.png</file>
     <file>themes/monowhite/32/currentmodel.png</file>
     <file>themes/monowhite/32/read_flash.png</file>
@@ -956,6 +986,8 @@
     <file>themes/monowhite/48/compare.png</file>
     <file>themes/monowhite/48/saveas.png</file>
     <file>themes/monowhite/48/preferences.png</file>
+    <file>themes/monowhite/48/apppreferences.png</file>
+    <file>themes/monowhite/48/fwpreferences.png</file>
     <file>themes/monowhite/48/movedown.png</file>
     <file>themes/monowhite/48/currentmodel.png</file>
     <file>themes/monowhite/48/read_flash.png</file>
diff --git a/companion/src/fwpreferencesdialog.ui b/companion/src/fwpreferencesdialog.ui
index dd21fe9ad..bd495c9aa 100644
--- a/companion/src/fwpreferencesdialog.ui
+++ b/companion/src/fwpreferencesdialog.ui
@@ -26,19 +26,6 @@
    <string>Firmware Preferences</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="4" column="3" colspan="4">
-    <widget class="QLabel" name="FwInfo">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>FwInfo</string>
-     </property>
-    </widget>
-   </item>
    <item row="13" column="5">
     <widget class="QCheckBox" name="optionCheckBox_19">
      <property name="sizePolicy">
@@ -630,19 +617,6 @@ This is used by the templated to determine which channel goes to what number out
      </property>
     </widget>
    </item>
-   <item row="18" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_40">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>CheckBox</string>
-     </property>
-    </widget>
-   </item>
    <item row="17" column="6">
     <widget class="QCheckBox" name="optionCheckBox_36">
      <property name="sizePolicy">
@@ -695,19 +669,6 @@ This is used by the templated to determine which channel goes to what number out
      </property>
     </widget>
    </item>
-   <item row="18" column="6">
-    <widget class="QCheckBox" name="optionCheckBox_39">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>CheckBox</string>
-     </property>
-    </widget>
-   </item>
    <item row="6" column="3" colspan="3">
     <widget class="QLineEdit" name="sdPath">
      <property name="enabled">
@@ -950,13 +911,6 @@ This is used by the templated to determine which channel goes to what number out
      </property>
     </widget>
    </item>
-   <item row="32" column="6">
-    <widget class="QPushButton" name="fw_dnld">
-     <property name="text">
-      <string>Download FW</string>
-     </property>
-    </widget>
-   </item>
    <item row="37" column="6">
     <widget class="QPushButton" name="import_PB">
      <property name="text">
@@ -991,20 +945,7 @@ This is used by the templated to determine which channel goes to what number out
    <item row="31" column="3" colspan="3">
     <widget class="QCheckBox" name="renameFirmware">
      <property name="text">
-      <string>Append version number the FW file name</string>
-     </property>
-    </widget>
-   </item>
-   <item row="31" column="6">
-    <widget class="QPushButton" name="checkFWUpdates">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Check for updates</string>
+      <string>Append version number to FW file name</string>
      </property>
     </widget>
    </item>
@@ -1050,8 +991,128 @@ This is used by the templated to determine which channel goes to what number out
      </property>
     </widget>
    </item>
+   <item row="18" column="5">
+    <widget class="QCheckBox" name="optionCheckBox_39">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>CheckBox</string>
+     </property>
+    </widget>
+   </item>
+   <item row="18" column="6">
+    <widget class="QCheckBox" name="optionCheckBox_40">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>CheckBox</string>
+     </property>
+    </widget>
+   </item>
+   <item row="33" column="3" colspan="3">
+    <widget class="QLabel" name="FwInfo">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>FwInfo</string>
+     </property>
+    </widget>
+   </item>
+   <item row="33" column="6">
+    <widget class="QPushButton" name="fw_dnld">
+     <property name="text">
+      <string>Download FW</string>
+     </property>
+    </widget>
+   </item>
+   <item row="32" column="6">
+    <widget class="QPushButton" name="checkFWUpdates">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>Check for updates</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>buttonBox</tabstop>
+  <tabstop>downloadVerCB</tabstop>
+  <tabstop>CPU_ID_LE</tabstop>
+  <tabstop>sdPath</tabstop>
+  <tabstop>sdPathButton</tabstop>
+  <tabstop>langCombo</tabstop>
+  <tabstop>optionCheckBox_2</tabstop>
+  <tabstop>optionCheckBox_1</tabstop>
+  <tabstop>optionCheckBox_3</tabstop>
+  <tabstop>optionCheckBox_4</tabstop>
+  <tabstop>optionCheckBox_5</tabstop>
+  <tabstop>optionCheckBox_6</tabstop>
+  <tabstop>optionCheckBox_7</tabstop>
+  <tabstop>optionCheckBox_8</tabstop>
+  <tabstop>optionCheckBox_9</tabstop>
+  <tabstop>optionCheckBox_10</tabstop>
+  <tabstop>optionCheckBox_11</tabstop>
+  <tabstop>optionCheckBox_12</tabstop>
+  <tabstop>optionCheckBox_13</tabstop>
+  <tabstop>optionCheckBox_14</tabstop>
+  <tabstop>optionCheckBox_15</tabstop>
+  <tabstop>optionCheckBox_16</tabstop>
+  <tabstop>optionCheckBox_17</tabstop>
+  <tabstop>optionCheckBox_18</tabstop>
+  <tabstop>optionCheckBox_19</tabstop>
+  <tabstop>optionCheckBox_20</tabstop>
+  <tabstop>optionCheckBox_21</tabstop>
+  <tabstop>optionCheckBox_22</tabstop>
+  <tabstop>optionCheckBox_23</tabstop>
+  <tabstop>optionCheckBox_24</tabstop>
+  <tabstop>optionCheckBox_25</tabstop>
+  <tabstop>optionCheckBox_26</tabstop>
+  <tabstop>optionCheckBox_27</tabstop>
+  <tabstop>optionCheckBox_28</tabstop>
+  <tabstop>optionCheckBox_29</tabstop>
+  <tabstop>optionCheckBox_30</tabstop>
+  <tabstop>optionCheckBox_31</tabstop>
+  <tabstop>optionCheckBox_32</tabstop>
+  <tabstop>optionCheckBox_33</tabstop>
+  <tabstop>optionCheckBox_34</tabstop>
+  <tabstop>optionCheckBox_35</tabstop>
+  <tabstop>optionCheckBox_36</tabstop>
+  <tabstop>optionCheckBox_37</tabstop>
+  <tabstop>optionCheckBox_38</tabstop>
+  <tabstop>optionCheckBox_39</tabstop>
+  <tabstop>optionCheckBox_40</tabstop>
+  <tabstop>optionCheckBox_41</tabstop>
+  <tabstop>optionCheckBox_42</tabstop>
+  <tabstop>stickmodeCB</tabstop>
+  <tabstop>channelorderCB</tabstop>
+  <tabstop>renameFirmware</tabstop>
+  <tabstop>burnFirmware</tabstop>
+  <tabstop>voiceCombo</tabstop>
+  <tabstop>voice_dnld</tabstop>
+  <tabstop>ProfName_LE</tabstop>
+  <tabstop>import_PB</tabstop>
+  <tabstop>ProfSlot_SB</tabstop>
+  <tabstop>export_PB</tabstop>
+  <tabstop>ProfSave_PB</tabstop>
+ </tabstops>
  <resources>
   <include location="companion.qrc"/>
  </resources>
diff --git a/companion/src/images/9xcurs.png b/companion/src/images/9xcurs.png
index e311f1712..e526a44a0 100644
Binary files a/companion/src/images/9xcurs.png and b/companion/src/images/9xcurs.png differ
diff --git a/companion/src/images/9xcursdown.png b/companion/src/images/9xcursdown.png
index 509df9091..d1460c08f 100644
Binary files a/companion/src/images/9xcursdown.png and b/companion/src/images/9xcursdown.png differ
diff --git a/companion/src/images/9xcursmin.png b/companion/src/images/9xcursmin.png
index a69beea4c..0cc3ee566 100644
Binary files a/companion/src/images/9xcursmin.png and b/companion/src/images/9xcursmin.png differ
diff --git a/companion/src/images/9xcursphoto.png b/companion/src/images/9xcursphoto.png
index 10f5272d5..96a84b22b 100644
Binary files a/companion/src/images/9xcursphoto.png and b/companion/src/images/9xcursphoto.png differ
diff --git a/companion/src/images/9xcursplus.png b/companion/src/images/9xcursplus.png
index fd49b8f1c..177975166 100644
Binary files a/companion/src/images/9xcursplus.png and b/companion/src/images/9xcursplus.png differ
diff --git a/companion/src/images/9xcursup.png b/companion/src/images/9xcursup.png
index 301d83f3c..bb3130d4b 100644
Binary files a/companion/src/images/9xcursup.png and b/companion/src/images/9xcursup.png differ
diff --git a/companion/src/images/originals/classical icons/apppreferences.png b/companion/src/images/originals/classical icons/apppreferences.png
new file mode 100644
index 000000000..cfdfb2dbe
Binary files /dev/null and b/companion/src/images/originals/classical icons/apppreferences.png differ
diff --git a/companion/src/images/originals/classical icons/fwpreferences.png b/companion/src/images/originals/classical icons/fwpreferences.png
new file mode 100644
index 000000000..b619d999f
Binary files /dev/null and b/companion/src/images/originals/classical icons/fwpreferences.png differ
diff --git a/companion/src/images/splash.png b/companion/src/images/splash.png
index e9aa7e601..c1dd30dec 100644
Binary files a/companion/src/images/splash.png and b/companion/src/images/splash.png differ
diff --git a/companion/src/preferences_simulation.ui b/companion/src/imgpreferences.ui
similarity index 100%
rename from companion/src/preferences_simulation.ui
rename to companion/src/imgpreferences.ui
diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp
index 74f1b73c3..a8f770911 100644
--- a/companion/src/mainwindow.cpp
+++ b/companion/src/mainwindow.cpp
@@ -1699,11 +1699,11 @@ void MainWindow::createActions()
     preferencesAct->setStatusTip(tr("Edit general preferences"));
     connect(preferencesAct, SIGNAL(triggered()), this, SLOT(preferences()));
 
-    appPreferencesAct = new QAction(tr("&Application Preferences..."), this);
+    appPreferencesAct = new QAction(CompanionIcon("apppreferences.png"), tr("&Application Preferences..."), this);
     appPreferencesAct->setStatusTip(tr("Edit application preferences"));
     connect(appPreferencesAct, SIGNAL(triggered()), this, SLOT(appPreferences()));
 
-    fwPreferencesAct = new QAction(tr("&Firmware Preferences..."), this);
+    fwPreferencesAct = new QAction(CompanionIcon("fwpreferences.png"), tr("&Firmware Preferences..."), this);
     fwPreferencesAct->setStatusTip(tr("Edit firmware preferences"));
     connect(fwPreferencesAct, SIGNAL(triggered()), this, SLOT(fwPreferences()));
 
@@ -2048,8 +2048,8 @@ void MainWindow::createToolBars()
     fileToolBar->addAction(saveAct);
     fileToolBar->addAction(logsAct);
     fileToolBar->addSeparator();
+    fileToolBar->addAction(appPreferencesAct);
     fileToolBar->addAction(fwPreferencesAct);
-    fileToolBar->addAction(preferencesAct);
     profileButton = new QToolButton;
     profileButton->setPopupMode(QToolButton::InstantPopup);
     profileButton->setMenu(createProfilesMenu());
diff --git a/companion/src/preferencesdialog.cpp b/companion/src/preferencesdialog.cpp
index c69672349..7b4ce1707 100644
--- a/companion/src/preferencesdialog.cpp
+++ b/companion/src/preferencesdialog.cpp
@@ -4,7 +4,7 @@
 #include "eeprominterface.h"
 #include "splashlibrary.h"
 #include "helpers.h"
-#ifdef JOYSTICKS
+#ifdef JOYSTICKS 
 #include "joystick.h"
 #include "joystickdialog.h"
 #endif
diff --git a/companion/src/preferencesdialog.h b/companion/src/preferencesdialog.h
index 9a31ea8fd..80f3826b6 100644
--- a/companion/src/preferencesdialog.h
+++ b/companion/src/preferencesdialog.h
@@ -5,7 +5,7 @@
 #include <QCheckBox>
 #include "eeprominterface.h"
 
-namespace Ui {
+namespace Ui { 
     class preferencesDialog;
 }
 
diff --git a/companion/src/themes/classic/16/apppreferences.png b/companion/src/themes/classic/16/apppreferences.png
new file mode 100644
index 000000000..bc8dc0953
Binary files /dev/null and b/companion/src/themes/classic/16/apppreferences.png differ
diff --git a/companion/src/themes/classic/16/fwpreferences.png b/companion/src/themes/classic/16/fwpreferences.png
new file mode 100644
index 000000000..2944e026a
Binary files /dev/null and b/companion/src/themes/classic/16/fwpreferences.png differ
diff --git a/companion/src/themes/classic/24/apppreferences.png b/companion/src/themes/classic/24/apppreferences.png
new file mode 100644
index 000000000..ff3207d1f
Binary files /dev/null and b/companion/src/themes/classic/24/apppreferences.png differ
diff --git a/companion/src/themes/classic/24/fwpreferences.png b/companion/src/themes/classic/24/fwpreferences.png
new file mode 100644
index 000000000..8988a18db
Binary files /dev/null and b/companion/src/themes/classic/24/fwpreferences.png differ
diff --git a/companion/src/themes/classic/32/apppreferences.png b/companion/src/themes/classic/32/apppreferences.png
new file mode 100644
index 000000000..d0751e887
Binary files /dev/null and b/companion/src/themes/classic/32/apppreferences.png differ
diff --git a/companion/src/themes/classic/32/fwpreferences.png b/companion/src/themes/classic/32/fwpreferences.png
new file mode 100644
index 000000000..e8e2e6cfc
Binary files /dev/null and b/companion/src/themes/classic/32/fwpreferences.png differ
diff --git a/companion/src/themes/classic/48/apppreferences.png b/companion/src/themes/classic/48/apppreferences.png
new file mode 100644
index 000000000..23f398dca
Binary files /dev/null and b/companion/src/themes/classic/48/apppreferences.png differ
diff --git a/companion/src/themes/classic/48/fwpreferences.png b/companion/src/themes/classic/48/fwpreferences.png
new file mode 100644
index 000000000..d5afe2aed
Binary files /dev/null and b/companion/src/themes/classic/48/fwpreferences.png differ
diff --git a/companion/src/themes/monoblue/16/apppreferences.png b/companion/src/themes/monoblue/16/apppreferences.png
new file mode 100644
index 000000000..566b610b2
Binary files /dev/null and b/companion/src/themes/monoblue/16/apppreferences.png differ
diff --git a/companion/src/themes/monoblue/16/fwpreferences.png b/companion/src/themes/monoblue/16/fwpreferences.png
new file mode 100644
index 000000000..566b610b2
Binary files /dev/null and b/companion/src/themes/monoblue/16/fwpreferences.png differ
diff --git a/companion/src/themes/monoblue/24/apppreferences.png b/companion/src/themes/monoblue/24/apppreferences.png
new file mode 100644
index 000000000..91ff56782
Binary files /dev/null and b/companion/src/themes/monoblue/24/apppreferences.png differ
diff --git a/companion/src/themes/monoblue/24/fwpreferences.png b/companion/src/themes/monoblue/24/fwpreferences.png
new file mode 100644
index 000000000..91ff56782
Binary files /dev/null and b/companion/src/themes/monoblue/24/fwpreferences.png differ
diff --git a/companion/src/themes/monoblue/32/apppreferences.png b/companion/src/themes/monoblue/32/apppreferences.png
new file mode 100644
index 000000000..dbeafbc37
Binary files /dev/null and b/companion/src/themes/monoblue/32/apppreferences.png differ
diff --git a/companion/src/themes/monoblue/32/fwpreferences.png b/companion/src/themes/monoblue/32/fwpreferences.png
new file mode 100644
index 000000000..dbeafbc37
Binary files /dev/null and b/companion/src/themes/monoblue/32/fwpreferences.png differ
diff --git a/companion/src/themes/monoblue/48/apppreferences.png b/companion/src/themes/monoblue/48/apppreferences.png
new file mode 100644
index 000000000..3b4d91a3b
Binary files /dev/null and b/companion/src/themes/monoblue/48/apppreferences.png differ
diff --git a/companion/src/themes/monoblue/48/fwpreferences.png b/companion/src/themes/monoblue/48/fwpreferences.png
new file mode 100644
index 000000000..3b4d91a3b
Binary files /dev/null and b/companion/src/themes/monoblue/48/fwpreferences.png differ
diff --git a/companion/src/themes/monochrome/16/apppreferences.png b/companion/src/themes/monochrome/16/apppreferences.png
new file mode 100644
index 000000000..566b610b2
Binary files /dev/null and b/companion/src/themes/monochrome/16/apppreferences.png differ
diff --git a/companion/src/themes/monochrome/16/fwpreferences.png b/companion/src/themes/monochrome/16/fwpreferences.png
new file mode 100644
index 000000000..566b610b2
Binary files /dev/null and b/companion/src/themes/monochrome/16/fwpreferences.png differ
diff --git a/companion/src/themes/monochrome/24/apppreferences.png b/companion/src/themes/monochrome/24/apppreferences.png
new file mode 100644
index 000000000..91ff56782
Binary files /dev/null and b/companion/src/themes/monochrome/24/apppreferences.png differ
diff --git a/companion/src/themes/monochrome/24/fwpreferences.png b/companion/src/themes/monochrome/24/fwpreferences.png
new file mode 100644
index 000000000..91ff56782
Binary files /dev/null and b/companion/src/themes/monochrome/24/fwpreferences.png differ
diff --git a/companion/src/themes/monochrome/32/apppreferences.png b/companion/src/themes/monochrome/32/apppreferences.png
new file mode 100644
index 000000000..dbeafbc37
Binary files /dev/null and b/companion/src/themes/monochrome/32/apppreferences.png differ
diff --git a/companion/src/themes/monochrome/32/fwpreferences.png b/companion/src/themes/monochrome/32/fwpreferences.png
new file mode 100644
index 000000000..dbeafbc37
Binary files /dev/null and b/companion/src/themes/monochrome/32/fwpreferences.png differ
diff --git a/companion/src/themes/monochrome/48/apppreferences.png b/companion/src/themes/monochrome/48/apppreferences.png
new file mode 100644
index 000000000..3b4d91a3b
Binary files /dev/null and b/companion/src/themes/monochrome/48/apppreferences.png differ
diff --git a/companion/src/themes/monochrome/48/fwpreferences.png b/companion/src/themes/monochrome/48/fwpreferences.png
new file mode 100644
index 000000000..3b4d91a3b
Binary files /dev/null and b/companion/src/themes/monochrome/48/fwpreferences.png differ
diff --git a/companion/src/themes/monowhite/16/apppreferences.png b/companion/src/themes/monowhite/16/apppreferences.png
new file mode 100644
index 000000000..566b610b2
Binary files /dev/null and b/companion/src/themes/monowhite/16/apppreferences.png differ
diff --git a/companion/src/themes/monowhite/16/fwpreferences.png b/companion/src/themes/monowhite/16/fwpreferences.png
new file mode 100644
index 000000000..566b610b2
Binary files /dev/null and b/companion/src/themes/monowhite/16/fwpreferences.png differ
diff --git a/companion/src/themes/monowhite/24/apppreferences.png b/companion/src/themes/monowhite/24/apppreferences.png
new file mode 100644
index 000000000..91ff56782
Binary files /dev/null and b/companion/src/themes/monowhite/24/apppreferences.png differ
diff --git a/companion/src/themes/monowhite/24/fwpreferences.png b/companion/src/themes/monowhite/24/fwpreferences.png
new file mode 100644
index 000000000..91ff56782
Binary files /dev/null and b/companion/src/themes/monowhite/24/fwpreferences.png differ
diff --git a/companion/src/themes/monowhite/32/apppreferences.png b/companion/src/themes/monowhite/32/apppreferences.png
new file mode 100644
index 000000000..dbeafbc37
Binary files /dev/null and b/companion/src/themes/monowhite/32/apppreferences.png differ
diff --git a/companion/src/themes/monowhite/32/fwpreferences.png b/companion/src/themes/monowhite/32/fwpreferences.png
new file mode 100644
index 000000000..dbeafbc37
Binary files /dev/null and b/companion/src/themes/monowhite/32/fwpreferences.png differ
diff --git a/companion/src/themes/monowhite/48/apppreferences.png b/companion/src/themes/monowhite/48/apppreferences.png
new file mode 100644
index 000000000..3b4d91a3b
Binary files /dev/null and b/companion/src/themes/monowhite/48/apppreferences.png differ
diff --git a/companion/src/themes/monowhite/48/fwpreferences.png b/companion/src/themes/monowhite/48/fwpreferences.png
new file mode 100644
index 000000000..3b4d91a3b
Binary files /dev/null and b/companion/src/themes/monowhite/48/fwpreferences.png differ
diff --git a/radio/src/.gitignore b/radio/src/.gitignore
index 0f2d1136d..abbd8a427 100644
--- a/radio/src/.gitignore
+++ b/radio/src/.gitignore
@@ -7,3 +7,6 @@
 /simu.d
 /snapshot_*.png
 /*.sh
+/*.o
+/*.bin
+/*.lst