diff --git a/companion/src/images/wizard/cyclic.png b/companion/src/images/wizard/cyclic.png
index 1d5a5cdc4..6b1922241 100644
Binary files a/companion/src/images/wizard/cyclic.png and b/companion/src/images/wizard/cyclic.png differ
diff --git a/companion/src/translations/companion_sv.ts b/companion/src/translations/companion_sv.ts
index 5ca910c7f..aa8f0447c 100644
--- a/companion/src/translations/companion_sv.ts
+++ b/companion/src/translations/companion_sv.ts
@@ -484,7 +484,7 @@ Om fältet lämnas tomt så är filtret aktivt hela tiden.</translation>
     <message>
         <location line="+1"/>
         <source>Ele</source>
-        <translation>Höj</translation>
+        <translation>Hjd</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -552,7 +552,7 @@ Om fältet lämnas tomt så är filtret aktivt hela tiden.</translation>
     <message>
         <location line="+0"/>
         <source>Ele</source>
-        <translation>Höj</translation>
+        <translation>Hjd</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -3899,7 +3899,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+1"/>
         <source>Ele</source>
-        <translation>Höj</translation>
+        <translation>Hjd</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4609,7 +4609,7 @@ p, li { white-space: pre-wrap; }
         <location line="+0"/>
         <location filename="../helpers.cpp" line="+0"/>
         <source>Ele</source>
-        <translation>Höj</translation>
+        <translation>Hjd</translation>
     </message>
     <message>
         <location line="+0"/>
diff --git a/companion/src/wizarddata.cpp b/companion/src/wizarddata.cpp
index b67adcb55..b4da413a1 100644
--- a/companion/src/wizarddata.cpp
+++ b/companion/src/wizarddata.cpp
@@ -37,10 +37,30 @@ WizMix::WizMix(const GeneralSettings & settings, const unsigned int modelId):
   strcpy(name, "            ");
 }
 
+void WizMix::addMix(ModelData &model, Input input, int weight, int channel, int & mixerIndex)
+{
+  if (input != NOINPUT) 
+  {
+    MixData & mix = model.mixData[mixerIndex++];
+    mix.destCh = channel+1;
+    if (input >= RUDDER && input <= AILERON) 
+    {
+      if (IS_TARANIS(GetEepromInterface()->getBoard()))
+        mix.srcRaw = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, input-1, &model);
+      else
+        mix.srcRaw = RawSource(SOURCE_TYPE_STICK, input-1);
+    }
+    if (input==FLAP){
+    }
+    if (input==AIRBREAK){
+    }
+    mix.weight = weight;
+  }
+}
+
 WizMix::operator ModelData()
 {
   ModelData model;
-
   model.used = true;
   model.modelId = modelId;
   model.setDefaultInputs(settings);
@@ -49,22 +69,13 @@ WizMix::operator ModelData()
   strncpy(model.name, name, WIZ_MODEL_NAME_LENGTH);
   model.name[WIZ_MODEL_NAME_LENGTH] = 0;
 
-  for (int i=0; i<WIZ_MAX_CHANNELS; i++ ) {
+  int mixIndex = 0;
+  for (int i=0; i<WIZ_MAX_CHANNELS; i++ ) 
+  {
     Channel ch = channel[i];
-    if (ch.page != Page_None) {
-      // qDebug() << "channel" << i << "page" << ch.page << ch.input1 << ch.input2;
-      MixData & mix = model.mixData[i];
-      mix.destCh = i+1;
-      if (ch.input1 >= RUDDER && ch.input1 <= AILERON) {
-        if (IS_TARANIS(GetEepromInterface()->getBoard()))
-          mix.srcRaw = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, ch.input1-1, &model);
-        else
-          mix.srcRaw = RawSource(SOURCE_TYPE_STICK, ch.input1-1);
-      }
-      mix.weight = ch.weight1;
-    }
+    addMix(model, ch.input1, ch.weight1, i, mixIndex);
+    addMix(model, ch.input2, ch.weight2, i, mixIndex);
   }
-
   return model;
 }
 
diff --git a/companion/src/wizarddata.h b/companion/src/wizarddata.h
index bc190fdf6..1fe1a4e0b 100644
--- a/companion/src/wizarddata.h
+++ b/companion/src/wizarddata.h
@@ -91,6 +91,7 @@ class WizMix
 
   private:
     WizMix();
+    void addMix(ModelData & model, Input input, int weight, int channel, int & mixerIndex);
 };
 
 #endif // WIZARDDATA_H
diff --git a/companion/src/wizarddialog.cpp b/companion/src/wizarddialog.cpp
index e5c5ba9d8..de3fdbed9 100644
--- a/companion/src/wizarddialog.cpp
+++ b/companion/src/wizarddialog.cpp
@@ -15,12 +15,14 @@
 #include <QtGui>
 #include "wizarddialog.h"
 #include "wizarddata.h"
+#include "helpers.h"
 
 WizardDialog::WizardDialog(const GeneralSettings & settings, unsigned int modelId, QWidget *parent)
   : QWizard(parent),
     mix(settings, modelId),
     settings(settings)
 {
+  setWindowIcon(CompanionIcon("wizard.png"));
   setWindowTitle(tr("Model Wizard"));
 
   setPage(Page_Models, new ModelSelectionPage(this, "models",tr("Model Type"),tr("Enter model name and model type.")));