diff --git a/files/styles/style-light.css b/files/styles/style-light.css
index 6414e520ce831af19750a58b7ecd695b5bfb5cea..8e80798864fa112618cc04b3772fa3863419aa6e 100644
--- a/files/styles/style-light.css
+++ b/files/styles/style-light.css
@@ -309,6 +309,11 @@ QPushButton#flightModeMenuButton, QPushButton#safetyConfigButton {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #BBB, stop: 1 #777);
 }
 
+VehicleSetupButton, VehicleComponentButton {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #BBB, stop: 1 #777);
+    border-color: #465158;
+}
+
 QPushButton#planePushButton, QPushButton#flyingWingPushButton, QPushButton#quadXPushButton,
 QPushButton#quadPlusPushButton, QPushButton#hexaXPushButton, QPushButton#hexaPlusPushButton,
 QPushButton#octoXPushButton, QPushButton#octoPlusPushButton, QPushButton#hPushButton {
diff --git a/src/qgcunittest/MockUASManager.h b/src/qgcunittest/MockUASManager.h
index 9e39d92498f4680491da2a89eabde28638edd2b5..0648f70a9709dfc0aa2eb893d7565252f022ab72 100644
--- a/src/qgcunittest/MockUASManager.h
+++ b/src/qgcunittest/MockUASManager.h
@@ -93,7 +93,6 @@ public slots:
     virtual bool returnActiveUAS() { Q_ASSERT(false); return false; }
     virtual bool stopActiveUAS() { Q_ASSERT(false); return false; }
     virtual bool killActiveUAS() { Q_ASSERT(false); return false; }
-    virtual void configureActiveUAS() { Q_ASSERT(false); }
     virtual bool shutdownActiveUAS() { Q_ASSERT(false); return false; }
     virtual bool setHomePosition(double lat, double lon, double alt)
         { Q_ASSERT(false); Q_UNUSED(lat); Q_UNUSED(lon); Q_UNUSED(alt); return false; }
diff --git a/src/uas/UASManager.cc b/src/uas/UASManager.cc
index fe2fd53daf83742b6cf61039ef9efb5caa5c090d..79c8ac323ac62e47b59b2d9441bcb25af6be045d 100644
--- a/src/uas/UASManager.cc
+++ b/src/uas/UASManager.cc
@@ -436,14 +436,6 @@ bool UASManager::shutdownActiveUAS()
     return (activeUAS);
 }
 
-void UASManager::configureActiveUAS()
-{
-    UASInterface* actUAS = getActiveUAS();
-    if(actUAS) {
-        // Do something
-    }
-}
-
 UASInterface* UASManager::getUASForId(int id)
 {
     UASInterface* system = NULL;
diff --git a/src/uas/UASManager.h b/src/uas/UASManager.h
index 7a8b59717d3b64ec749d0e3052be3289592d9723..a0847cf5c2ced904a167a91941665eba90b0d513 100644
--- a/src/uas/UASManager.h
+++ b/src/uas/UASManager.h
@@ -227,13 +227,6 @@ public slots:
      */
     bool killActiveUAS();
 
-    /**
-     * @brief Configure the currently active UAS
-     *
-     * This command will bring up the configuration dialog for the particular UAS.
-     */
-    void configureActiveUAS();
-
     /** @brief Shut down the onboard operating system down */
     bool shutdownActiveUAS();
 
diff --git a/src/uas/UASManagerInterface.h b/src/uas/UASManagerInterface.h
index c7b649e952a5ac0567f774ba8adf7112384a31b5..a1b3e7d38f688599c16fb3a5d15e460607cb873c 100644
--- a/src/uas/UASManagerInterface.h
+++ b/src/uas/UASManagerInterface.h
@@ -82,7 +82,6 @@ public slots:
     virtual bool returnActiveUAS() = 0;
     virtual bool stopActiveUAS() = 0;
     virtual bool killActiveUAS() = 0;
-    virtual void configureActiveUAS() = 0;
     virtual bool shutdownActiveUAS() = 0;
     virtual bool setHomePosition(double lat, double lon, double alt) = 0;
     virtual bool setHomePositionAndNotify(double lat, double lon, double alt) = 0;
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index bf238e659595f53e1b4b4db451c1e937623eb75c..c6cdc06442b158bb19da4e5e2aace8f94df8a851 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -1237,7 +1237,6 @@ void MainWindow::connectCommonActions()
     connect(ui.actionEmergency_Land, SIGNAL(triggered()), UASManager::instance(), SLOT(stopActiveUAS()));
     connect(ui.actionEmergency_Kill, SIGNAL(triggered()), UASManager::instance(), SLOT(killActiveUAS()));
     connect(ui.actionShutdownMAV, SIGNAL(triggered()), UASManager::instance(), SLOT(shutdownActiveUAS()));
-    connect(ui.actionConfiguration, SIGNAL(triggered()), UASManager::instance(), SLOT(configureActiveUAS()));
 
     // Views actions
     connect(ui.actionFlightView, SIGNAL(triggered()), this, SLOT(loadPilotView()));
diff --git a/src/ui/MainWindow.ui b/src/ui/MainWindow.ui
index a565aeae9869a6866cfff736ceeccfa913997cc6..ebeddfe187c7de82349ae4f709edb7fb5bd99a5c 100644
--- a/src/ui/MainWindow.ui
+++ b/src/ui/MainWindow.ui
@@ -181,18 +181,6 @@
     <string>Add Link</string>
    </property>
   </action>
-  <action name="actionConfiguration">
-   <property name="icon">
-    <iconset resource="../../qgroundcontrol.qrc">
-     <normaloff>:/files/images/categories/applications-system.svg</normaloff>:/files/images/categories/applications-system.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Preferences</string>
-   </property>
-   <property name="toolTip">
-    <string>Open UAS Preferences</string>
-   </property>
-  </action>
   <action name="actionJoystickSettings">
    <property name="icon">
     <iconset resource="../../qgroundcontrol.qrc">
@@ -375,6 +363,9 @@
    <property name="toolTip">
     <string>Application settings</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::PreferencesRole</enum>
+   </property>
   </action>
   <action name="actionFullscreen">
    <property name="checkable">
@@ -442,6 +433,9 @@
    <property name="toolTip">
     <string>Setup of the vehicle</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionAdvanced_Mode">
    <property name="checkable">