diff --git a/src/GUI/qml/Launcher.qml b/src/GUI/qml/Launcher.qml
index c15bef507..644924dbb 100644
--- a/src/GUI/qml/Launcher.qml
+++ b/src/GUI/qml/Launcher.qml
@@ -79,7 +79,6 @@ Item {
 
     Sidebar {
         id: sidebar
-        width: Style.strutSize * 2
         height: parent.height
         z: 1
         pagesModel: pagesModel
diff --git a/src/GUI/qml/Sidebar.qml b/src/GUI/qml/Sidebar.qml
index ada3b7c23..93e7a0409 100644
--- a/src/GUI/qml/Sidebar.qml
+++ b/src/GUI/qml/Sidebar.qml
@@ -12,6 +12,8 @@ Rectangle {
 
     readonly property int minimumHeight: mainColumn.childrenRect.height + flyButton.height
 
+    implicitWidth: flyButton.width
+
     signal selectPage(var pageSource);
 
     signal showMenu();
@@ -70,7 +72,6 @@ Rectangle {
         id: flyButton
         label: qsTr("Fly!")
         anchors.bottom: parent.bottom
-        anchors.bottomMargin: Style.margin
         enabled: _launcher.canFly
         disabledText: qsTr("The selected aircraft is not installed or has updates pending")
         icon: "qrc:///svg/toolbox-fly"
diff --git a/src/GUI/qml/SidebarButton.qml b/src/GUI/qml/SidebarButton.qml
index 0f289a0c3..f1930f4a2 100644
--- a/src/GUI/qml/SidebarButton.qml
+++ b/src/GUI/qml/SidebarButton.qml
@@ -6,7 +6,7 @@ Item {
     id: root
 
     width: Style.strutSize * 2
-    height: Style.strutSize * 2
+    height: iconImage.height + label.height + Style.margin * 3
 
     property alias icon: iconImage.source
     property alias label: label.text
@@ -33,8 +33,9 @@ Item {
 
     Image {
         id: iconImage
-        anchors.centerIn: parent
+        anchors.horizontalCenter: parent.horizontalCenter
         opacity: root.enabled ? 1.0 : 0.5
+        y: Style.margin
     }
 
     Text {