diff --git a/src/blackgui/editors/matchingform.cpp b/src/blackgui/editors/matchingform.cpp
index c73e57d4f..deaadb091 100644
--- a/src/blackgui/editors/matchingform.cpp
+++ b/src/blackgui/editors/matchingform.cpp
@@ -32,8 +32,6 @@ namespace BlackGui
         void CMatchingForm::setReadOnly(bool readonly)
         {
             CGuiUtility::checkBoxReadOnly(ui->cb_ByModelString, readonly);
-            CGuiUtility::checkBoxReadOnly(ui->cb_ByIcaoDataAircraft1st, readonly);
-            CGuiUtility::checkBoxReadOnly(ui->cb_ByIcaoDataAirline1st, readonly);
             CGuiUtility::checkBoxReadOnly(ui->cb_ByFamily, readonly);
             CGuiUtility::checkBoxReadOnly(ui->cb_ByLivery, readonly);
             CGuiUtility::checkBoxReadOnly(ui->cb_ByCombinedCode, readonly);
@@ -43,6 +41,8 @@ namespace BlackGui
             const bool enabled = !readonly;
             ui->rb_Reduction->setEnabled(enabled);
             ui->rb_ScoreBased->setEnabled(enabled);
+            ui->rb_ByIcaoDataAircraft1st->setEnabled(enabled);
+            ui->rb_ByIcaoDataAirline1st->setEnabled(enabled);
         }
 
         CStatusMessageList CMatchingForm::validate(bool withNestedForms) const
@@ -56,8 +56,8 @@ namespace BlackGui
             const CAircraftMatcherSetup::MatchingMode mode = setup.getMatchingMode();
             ui->cb_ByModelString->setChecked(mode.testFlag(CAircraftMatcherSetup::ByModelString));
             ui->cb_ByCombinedCode->setChecked(mode.testFlag(CAircraftMatcherSetup::ByCombinedType));
-            ui->cb_ByIcaoDataAircraft1st->setChecked(mode.testFlag(CAircraftMatcherSetup::ByIcaoOrderAircraftFirst));
-            ui->cb_ByIcaoDataAirline1st->setChecked(mode.testFlag(CAircraftMatcherSetup::ByIcaoOrderAirlineFirst));
+            ui->rb_ByIcaoDataAircraft1st->setChecked(mode.testFlag(CAircraftMatcherSetup::ByIcaoOrderAircraftFirst));
+            ui->rb_ByIcaoDataAirline1st->setChecked(mode.testFlag(CAircraftMatcherSetup::ByIcaoOrderAirlineFirst));
             ui->cb_ByLivery->setChecked(mode.testFlag(CAircraftMatcherSetup::ByLivery));
             ui->cb_ByFamily->setChecked(mode.testFlag(CAircraftMatcherSetup::ByFamily));
             ui->cb_ScoreIgnoreZeros->setChecked(mode.testFlag(CAircraftMatcherSetup::ScoreIgnoreZeros));
@@ -95,7 +95,7 @@ namespace BlackGui
         {
             return CAircraftMatcherSetup::matchingMode(
                        ui->cb_ByModelString->isChecked(),
-                       ui->cb_ByIcaoDataAircraft1st->isChecked(), ui->cb_ByIcaoDataAirline1st->isChecked(),
+                       ui->rb_ByIcaoDataAircraft1st->isChecked(), ui->rb_ByIcaoDataAirline1st->isChecked(),
                        ui->cb_ByFamily->isChecked(), ui->cb_ByLivery->isChecked(),
                        ui->cb_ByCombinedCode->isChecked(),
                        ui->cb_ScoreIgnoreZeros->isChecked(), ui->cb_ScorePreferColorLiveries->isChecked()
diff --git a/src/blackgui/editors/matchingform.ui b/src/blackgui/editors/matchingform.ui
index 0cf0567f2..144c78d40 100644
--- a/src/blackgui/editors/matchingform.ui
+++ b/src/blackgui/editors/matchingform.ui
@@ -55,45 +55,45 @@
       <string>Reduction</string>
      </property>
      <layout class="QGridLayout" name="gl_Mode">
-      <item row="2" column="0">
-       <widget class="QCheckBox" name="cb_ByFamily">
-        <property name="text">
-         <string>by family</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
+      <item row="3" column="1">
        <widget class="QCheckBox" name="cb_ByCombinedCode">
         <property name="text">
          <string>combined code</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
+      <item row="3" column="0">
+       <widget class="QCheckBox" name="cb_ByLivery">
+        <property name="text">
+         <string>by livery</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QCheckBox" name="cb_ByFamily">
+        <property name="text">
+         <string>by family</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
        <widget class="QCheckBox" name="cb_ByModelString">
         <property name="text">
          <string>by model string</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QCheckBox" name="cb_ByIcaoDataAirline1st">
-        <property name="text">
-         <string>by ICAO: airline first</string>
-        </property>
-       </widget>
-      </item>
       <item row="1" column="0">
-       <widget class="QCheckBox" name="cb_ByIcaoDataAircraft1st">
+       <widget class="QRadioButton" name="rb_ByIcaoDataAircraft1st">
         <property name="text">
          <string>by ICAO: aircraft first</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="QCheckBox" name="cb_ByLivery">
+      <item row="1" column="1">
+       <widget class="QRadioButton" name="rb_ByIcaoDataAirline1st">
         <property name="text">
-         <string>by livery</string>
+         <string>by ICAO: airline first</string>
         </property>
        </widget>
       </item>
@@ -128,9 +128,9 @@
  <tabstops>
   <tabstop>rb_ScoreBased</tabstop>
   <tabstop>rb_Reduction</tabstop>
+  <tabstop>rb_ByIcaoDataAircraft1st</tabstop>
+  <tabstop>rb_ByIcaoDataAirline1st</tabstop>
   <tabstop>cb_ByModelString</tabstop>
-  <tabstop>cb_ByIcaoDataAircraft1st</tabstop>
-  <tabstop>cb_ByIcaoDataAirline1st</tabstop>
   <tabstop>cb_ByFamily</tabstop>
   <tabstop>cb_ByLivery</tabstop>
   <tabstop>cb_ByCombinedCode</tabstop>