diff --git a/src/app/commoncomponents/BaseModalDialog.qml b/src/app/commoncomponents/BaseModalDialog.qml
index 5cdda80f..858f74f1 100644
--- a/src/app/commoncomponents/BaseModalDialog.qml
+++ b/src/app/commoncomponents/BaseModalDialog.qml
@@ -35,6 +35,7 @@ Popup {
     property alias popupContent: containerSubContentLoader.sourceComponent
     property int popupContentPreferredHeight: 0
     property int popupContentPreferredWidth: 0
+    property int popupContentMargins: 0
 
     parent: Overlay.overlay
 
@@ -77,8 +78,9 @@ Popup {
             Loader {
                 id: containerSubContentLoader
 
+                Layout.topMargin: popupContentMargins
+                Layout.bottomMargin: popupContentMargins
                 Layout.alignment: Qt.AlignCenter
-
                 Layout.fillWidth: popupContentPreferredWidth === 0
                 Layout.fillHeight: popupContentPreferredHeight === 0
                 Layout.preferredHeight: popupContentPreferredHeight
diff --git a/src/app/commoncomponents/JamiFlickable.qml b/src/app/commoncomponents/JamiFlickable.qml
index d602ebc2..259704f4 100644
--- a/src/app/commoncomponents/JamiFlickable.qml
+++ b/src/app/commoncomponents/JamiFlickable.qml
@@ -39,6 +39,7 @@ Flickable {
     }
     ScrollBar.horizontal: JamiScrollBar {
         id: horizontalScrollBar
+
         attachedFlickableMoving: root.attachedFlickableMoving
         orientation: Qt.Horizontal
     }
diff --git a/src/app/mainview/components/AboutPopUp.qml b/src/app/mainview/components/AboutPopUp.qml
index f6168713..09f6dd74 100644
--- a/src/app/mainview/components/AboutPopUp.qml
+++ b/src/app/mainview/components/AboutPopUp.qml
@@ -32,32 +32,33 @@ BaseModalDialog {
     id: root
 
 
-    popupContent: Rectangle {
+    popupContentMargins: 14
+
+    PushButton {
+        id: btnClose
+
+        anchors.right: parent.right
+        anchors.top: parent.top
+        anchors.topMargin: JamiTheme.preferredMarginSize
+        anchors.rightMargin: JamiTheme.preferredMarginSize
+        imageColor: "grey"
+        normalColor: JamiTheme.transparentColor
+
+        source: JamiResources.round_close_24dp_svg
+
+        onClicked: { close();}
+    }
+
+    popupContent: JamiFlickable {
         id: aboutPopUpScrollView
 
-        color: JamiTheme.transparentColor
         width: root.width
+        contentHeight: aboutPopUpContentRectColumnLayout.implicitHeight
 
         ColumnLayout {
             id: aboutPopUpContentRectColumnLayout
 
             width: root.width
-            height: Math.max(aboutPopUpScrollView.height, implicitHeight)
-
-            PushButton {
-                id: btnCancel
-
-                Layout.alignment: Qt.AlignRight
-
-                imageColor: "grey"
-                normalColor: "transparent"
-                Layout.topMargin: 10
-                Layout.rightMargin: 10
-
-                source: JamiResources.round_close_24dp_svg
-
-                onClicked: { close();}
-            }
 
             ResponsiveImage {
                 id: aboutPopUPJamiLogoImage
@@ -66,7 +67,6 @@ BaseModalDialog {
                 Layout.topMargin: JamiTheme.preferredMarginSize
                 Layout.preferredWidth: JamiTheme.aboutLogoPreferredWidth
                 Layout.preferredHeight: JamiTheme.aboutLogoPreferredHeight
-                height: 10
 
                 source: JamiTheme.darkTheme ?
                             JamiResources.logo_jami_standard_coul_white_svg :
@@ -78,7 +78,6 @@ BaseModalDialog {
 
                 Layout.alignment: Qt.AlignCenter
                 Layout.preferredWidth: aboutPopUpScrollView.width
-                Layout.preferredHeight: textMetricsjamiSlogansText.boundingRect.height
                 Layout.topMargin: 26
 
                 wrapMode: Text.WordWrap
@@ -97,7 +96,7 @@ BaseModalDialog {
                 }
             }
 
-            MaterialLineEdit {
+            Label {
                 id: jamiVersionText
 
                 Layout.alignment: Qt.AlignCenter
@@ -106,8 +105,6 @@ BaseModalDialog {
                 font.pixelSize: JamiTheme.tinyCreditsTextSize
 
                 padding: 0
-                readOnly: true
-                selectByMouse: true
 
                 text: JamiStrings.version + ": " + UtilsAdapter.getVersionStr()
                 color: JamiTheme.textColor
@@ -116,13 +113,11 @@ BaseModalDialog {
                 verticalAlignment: Text.AlignVCenter
             }
 
-
             Label {
                 id: jamiDeclarationText
 
                 Layout.alignment: Qt.AlignCenter
                 Layout.preferredWidth: aboutPopUpScrollView.width - JamiTheme.preferredMarginSize * 2
-                Layout.preferredHeight: 40
                 Layout.topMargin: 15
 
                 wrapMode: Text.WordWrap
@@ -143,7 +138,6 @@ BaseModalDialog {
 
                 // Strangely, hoveredLink works badly when width grows too large
                 Layout.preferredWidth: 50
-                Layout.preferredHeight: textMetricsjamiDeclarationHyperText.boundingRect.height
                 Layout.topMargin: 15
 
                 color: JamiTheme.textColor
@@ -191,7 +185,7 @@ BaseModalDialog {
                     id: textMetricsjamiNoneWarrantyHyperText
                     font: jamiDeclarationHyperText.font
                     text: JamiStrings.declarationYear + " " + '<html><style type="text/css"></style><a href="https://savoirfairelinux.com">Savoir-faire Linux Inc.<br></a></html>'
-                    + '<html><style type="text/css"></style>This program comes with absolutely no warranty. See the <a href="http://www.gnu.org/licenses/gpl-3.0.html">GNU General Public License</a>, version 3 or later for details.</html>'
+                          + '<html><style type="text/css"></style>This program comes with absolutely no warranty. See the <a href="http://www.gnu.org/licenses/gpl-3.0.html">GNU General Public License</a>, version 3 or later for details.</html>'
                 }
 
                 MouseArea {