diff --git a/src/VehicleSetup/FirmwareImage.cc b/src/VehicleSetup/FirmwareImage.cc
index 435a9caf4a0a91a433683b5a88a7525bc06c17d9..eb37b5b5eeca049ef679b8114df6eff993a55708 100644
--- a/src/VehicleSetup/FirmwareImage.cc
+++ b/src/VehicleSetup/FirmwareImage.cc
@@ -54,7 +54,7 @@ bool FirmwareImage::load(const QString& imageFilename, uint32_t boardId)
     if (imageFilename.endsWith(".bin")) {
         _binFormat = true;
         return _binLoad(imageFilename);
-    } else if (imageFilename.endsWith(".px4") || imageFilename.endsWith(".zip")) {
+    } else if (imageFilename.endsWith(".px4")) {
         _binFormat = true;
         return _px4Load(imageFilename);
     } else if (imageFilename.endsWith(".ihx")) {
diff --git a/src/VehicleSetup/FirmwareUpgrade.qml b/src/VehicleSetup/FirmwareUpgrade.qml
index 4e0f525cf7998c60394c465882ab623675762fea..35a4fdf8816a8409515893cc17f0c5f242d40da2 100644
--- a/src/VehicleSetup/FirmwareUpgrade.qml
+++ b/src/VehicleSetup/FirmwareUpgrade.qml
@@ -311,7 +311,7 @@ SetupPage {
                             visible:    !px4Flow
 
                             Rectangle {
-                                height: 1
+                                height:     1
                                 width:      ScreenTools.defaultFontPixelWidth * 5
                                 color:      qgcPal.text
                                 anchors.verticalCenter: _advanced.verticalCenter
@@ -341,7 +341,7 @@ SetupPage {
                             width:      parent.width
                             wrapMode:   Text.WordWrap
                             visible:    showFirmwareTypeSelection
-                            text:       px4Flow ? qsTr("Select which version of the firmware you would like to install:") : qsTr("Select which version of the above flight stack you would like to install:")
+                            text:       _singleFirmwareMode ?  qsTr("Select the standard version or one from the file system (previously downloaded):") : (px4Flow ? qsTr("Select which version of the firmware you would like to install:") : qsTr("Select which version of the above flight stack you would like to install:"))
                         }
 
                         QGCComboBox {