diff --git a/src/apps/marble-maps/AboutDialog.qml b/src/apps/marble-maps/AboutDialog.qml
--- a/src/apps/marble-maps/AboutDialog.qml
+++ b/src/apps/marble-maps/AboutDialog.qml
@@ -13,144 +13,137 @@
 import QtQuick.Window 2.2
 import QtQuick.Layouts 1.1
 
-import org.kde.marble 0.20
-
-Item {
-    id: root
-    height: Screen.pixelDensity * 2 + Math.max(marbleText.height, devText.height)
-
-    SystemPalette {
-        id: palette
-        colorGroup: SystemPalette.Active
-    }
+import org.kde.kirigami 2.0 as Kirigami
 
-    Rectangle {
-        anchors.fill: parent
-        color: palette.base
-    }
+import org.kde.marble 0.20
 
-    SwipeView {
-        id: tabView
-        currentIndex: pageIndicator.currentIndex
+Kirigami.Page {
+    Item {
+        id: root
         anchors.fill: parent
+        height: Screen.pixelDensity * 2 + Math.max(marbleText.height, devText.height)
 
-        Item {
-            id: marbleItem
-            Text {
-                id: marbleText
-                anchors.bottom: parent.bottom
-                anchors.left: parent.left
-                anchors.right: marbleLogo.left
-                anchors.margins: Screen.pixelDensity * 1
-                anchors.leftMargin: Screen.pixelDensity * 2
-
-                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-                text: qsTr("<h3>Marble Maps</h3><p>Find your way! Marble Maps brings the highly detailed OpenStreetMap to your mobile devices. It features a crisp, beautiful map with an intuitive user interface. It's open source, entirely based on free data and open standards and respects your privacy.</p>")
-                onLinkActivated: Qt.openUrlExternally(link)
-            }
-
-            Image {
-                id: marbleLogo
-                anchors.right: parent.right
-                anchors.bottom: parent.bottom
-                anchors.margins: Screen.pixelDensity * 2
-                height: 0.8 * marbleText.height
-
-                fillMode: Image.PreserveAspectFit
-                source: "qrc:/konqi/globe.png"
-            }
+        SystemPalette {
+            id: palette
+            colorGroup: SystemPalette.Active
         }
-        Item {
-            id: supportItem
-            Text {
-                id: groupText
-                anchors.left: parent.left
-                anchors.right: groupKonqi.left
-                anchors.bottom: parent.bottom
-                anchors.margins: Screen.pixelDensity * 1
-                anchors.leftMargin: Screen.pixelDensity * 2
-
-                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-                text: qsTr("<h3>Support</h3><p>Do you have a question? Want to file a suggestion for improvement? Please use the <a href=\"https://forum.kde.org/viewforum.php?f=217\">Marble forum</a> to get in touch with fellow Marble users and developers. Further support channels are listed at <a href=\"https://marble.kde.org/support.php\">marble.kde.org</a>. We are looking forward to your feedback!</p>")
-                onLinkActivated: Qt.openUrlExternally(link)
-            }
-
-            Image {
-                id: groupKonqi
-                anchors.right: parent.right
-                anchors.bottom: parent.bottom
-                anchors.bottomMargin: Screen.pixelDensity * 3
-                anchors.rightMargin: Screen.pixelDensity * 2
-                height: 0.8 * groupText.height
 
-                fillMode: Image.PreserveAspectFit
-                source: "qrc:/konqi/group.png"
+        SwipeView {
+            id: tabView
+            currentIndex: pageIndicator.currentIndex
+            anchors.fill: parent
+            spacing: 100
+
+            Item {
+                id: marbleItem
+                Text {
+                    id: marbleText
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.margins: Screen.pixelDensity * 1
+                    wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                    text: qsTr("<h3>Marble Maps</h3><p>Find your way! Marble Maps brings the highly detailed OpenStreetMap to your mobile devices. It features a crisp, beautiful map with an intuitive user interface. It's open source, entirely based on free data and open standards and respects your privacy.</p>")
+                    onLinkActivated: Qt.openUrlExternally(link)
+                }
+
+                Image {
+                    id: marbleLogo
+                    anchors.right: parent.right
+                    anchors.bottom: parent.bottom
+                    anchors.margins: Screen.pixelDensity
+                    height:  marbleText.height
+
+                    fillMode: Image.PreserveAspectFit
+                    source: "qrc:/konqi/globe.png"
+                }
             }
-        }
-        Item {
-            id: devItem
-            Text {
-                id: devText
-                anchors.left: parent.left
-                anchors.right: devKonqi.left
-                anchors.bottom: parent.bottom
-                anchors.margins: Screen.pixelDensity * 1
-                anchors.leftMargin: Screen.pixelDensity * 2
-
-                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-                text: qsTr("<h3>Development Team</h3><p>The main developers of this app are Dennis Nienhüser, Torsten Rahn, Sanjiban Bairagya, Friedrich W. H. Kossebau, Gábor Péterffy and Mikhail Ivchenko. They are part of more than 200 developers who already contributed to the Marble project. Contact us via <a href=\"https://mail.kde.org/mailman/listinfo/marble-devel\">marble-devel@kde.org</a>.</p>")
-                onLinkActivated: Qt.openUrlExternally(link)
+            Item {
+                id: supportItem
+                Text {
+                    id: groupText
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.margins: Screen.pixelDensity * 1
+
+                    wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                    text: qsTr("<h3>Support</h3><p>Do you have a question? Want to file a suggestion for improvement? Please use the <a href=\"https://forum.kde.org/viewforum.php?f=217\">Marble forum</a> to get in touch with fellow Marble users and developers. Further support channels are listed at <a href=\"https://marble.kde.org/support.php\">marble.kde.org</a>. We are looking forward to your feedback!</p>")
+                    onLinkActivated: Qt.openUrlExternally(link)
+                }
+
+                Image {
+                    id: groupKonqi
+                    anchors.right: parent.right
+                    anchors.bottom: parent.bottom
+                    anchors.bottomMargin: Screen.pixelDensity * 3
+                    anchors.rightMargin: Screen.pixelDensity * 2
+                    height: groupText.height
+
+                    fillMode: Image.PreserveAspectFit
+                    source: "qrc:/konqi/group.png"
+                }
             }
-
-            Image {
-                id: devKonqi
-                anchors.right: parent.right
-                anchors.bottom: parent.bottom
-                anchors.bottomMargin: Screen.pixelDensity * 3
-                anchors.rightMargin: Screen.pixelDensity * 2
-                height: 0.8 * devText.height
-
-                fillMode: Image.PreserveAspectFit
-                source: "qrc:/konqi/app-dev.png"
+            Item {
+                id: devItem
+                Text {
+                    id: devText
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.margins: Screen.pixelDensity * 1
+
+                    wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                    text: qsTr("<h3>Development Team</h3><p>The main developers of this app are Dennis Nienhüser, Torsten Rahn, Sanjiban Bairagya, Friedrich W. H. Kossebau, Gábor Péterffy and Mikhail Ivchenko. They are part of more than 200 developers who already contributed to the Marble project. <br> Contact us via <a href=\"https://mail.kde.org/mailman/listinfo/marble-devel\">marble-devel@kde.org</a>.</p>")
+                    onLinkActivated: Qt.openUrlExternally(link)
+                }
+
+                Image {
+                    id: devKonqi
+                    anchors.right: parent.right
+                    anchors.bottom: parent.bottom
+                    anchors.bottomMargin: Screen.pixelDensity * 3
+                    anchors.rightMargin: Screen.pixelDensity * 2
+                    height: devText.height
+
+                    fillMode: Image.PreserveAspectFit
+                    source: "qrc:/konqi/app-dev.png"
+                }
             }
-        }
-        Item {
-            id: attributionItem
-            Text {
-                id: attributionText
-                anchors.left: parent.left
-                anchors.right: devQtKonqi.left
-                anchors.bottom: parent.bottom
-                anchors.margins: Screen.pixelDensity * 1
-                anchors.leftMargin: Screen.pixelDensity * 2
-
-                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-                width: parent.width
-                text: qsTr("<h3>Attribution</h3><p>The map is based on data from the <a href=\"https://www.openstreetmap.org\">OpenStreetMap</a> project, available under the <a href=\"http://opendatacommons.org/licenses/odbl/\">Open Database License</a>. Additionally public domain data from the <a href=\"http://www.naturalearthdata.com/\">Natural Earth</a> project is used. The map style is influenced by and uses icons from <a href=\"https://github.com/gravitystorm/openstreetmap-carto\">OpenStreetMap Carto</a> (<a href=\"http://creativecommons.org/publicdomain/zero/1.0/\">CC0 Public Domain)</a>.</p>")
-                onLinkActivated: Qt.openUrlExternally(link)
-            }
-
-            Image {
-                id: devQtKonqi
-                anchors.right: parent.right
-                anchors.bottom: parent.bottom
-                anchors.bottomMargin: Screen.pixelDensity * 3
-                anchors.rightMargin: Screen.pixelDensity * 2
-                height: 0.8 * attributionText.height
-
-                fillMode: Image.PreserveAspectFit
-                source: "qrc:/konqi/dev-qt.png"
+            Item {
+                id: attributionItem
+                Text {
+                    id: attributionText
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.margins: Screen.pixelDensity * 1
+                    anchors.leftMargin: Screen.pixelDensity * 2
+
+                    wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                    width: parent.width
+                    text: qsTr("<h3>Attribution</h3><p>The map is based on data from the <a href=\"https://www.openstreetmap.org\">OpenStreetMap</a> project, available under the <a href=\"http://opendatacommons.org/licenses/odbl/\">Open Database License</a>. Additionally public domain data from the <a href=\"http://www.naturalearthdata.com/\">Natural Earth</a> project is used. The map style is influenced by and uses icons from <a href=\"https://github.com/gravitystorm/openstreetmap-carto\">OpenStreetMap Carto</a> (<a href=\"http://creativecommons.org/publicdomain/zero/1.0/\">CC0 Public Domain)</a>.</p>")
+                    onLinkActivated: Qt.openUrlExternally(link)
+                }
+
+                Image {
+                    id: devQtKonqi
+                    anchors.right: parent.right
+                    anchors.bottom: parent.bottom
+                    anchors.bottomMargin: Screen.pixelDensity * 3
+                    anchors.rightMargin: Screen.pixelDensity * 2
+                    height: attributionText.height
+
+                    fillMode: Image.PreserveAspectFit
+                    source: "qrc:/konqi/dev-qt.png"
+                }
             }
         }
-    }
 
-    PageIndicator {
-        id: pageIndicator
-        interactive: true
-        count: tabView.count
-        currentIndex: tabView.currentIndex
+        PageIndicator {
+            id: pageIndicator
+            interactive: true
+            count: tabView.count
+            currentIndex: tabView.currentIndex
 
-        anchors.bottom: parent.bottom
-        anchors.horizontalCenter: parent.horizontalCenter
+            anchors.bottom: parent.bottom
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
     }
 }
diff --git a/src/apps/marble-maps/MainScreen.qml b/src/apps/marble-maps/MainScreen.qml
--- a/src/apps/marble-maps/MainScreen.qml
+++ b/src/apps/marble-maps/MainScreen.qml
@@ -114,7 +114,18 @@
 
                 }
             },
-            Kirigami.Action{ enabled: false}
+            Kirigami.Action{ enabled: false},
+            Kirigami.Action {
+                text: "About"
+                iconName: "qrc:///marble.svg"
+                visible: true
+                onTriggered: {
+                    app.state = "about"
+                    sidePanel.close()
+                    source = ""
+                    app.pageStack.push("qrc:///AboutDialog.qml")
+                }
+            }
         ]
     }
 
@@ -527,7 +538,7 @@
           },
           State {
               name: "about"
-              PropertyChanges { target: dialogLoader; source: "AboutDialog.qml" }
+              PropertyChanges { target: dialogLoader; source: "" }
           },
           State {
               name: "settings"