diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index d7a0a89ee1ed9ab83f0ab900f45a6574957f28a2..a271fab10940c15fbecc9f63f41e123ad3354ff5 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -43,7 +43,7 @@ Window {
     property int mainViewWindowPreferredHeight: 600
     property int sidePanelViewStackPreferredWidth: 250
     property int mainViewStackPreferredWidth: 250
-    property int aboutPopUpPreferredWidth: 250
+    property int aboutPopUpPreferredWidth: 400
 
     property int savedSidePanelViewMinWidth: 0
     property int savedSidePanelViewMaxWidth: 0
@@ -679,7 +679,7 @@ Window {
 
         x: Math.round((mainViewWindow.width - width) / 2)
         y: Math.round((mainViewWindow.height - height) / 2)
-        width: Math.max(mainViewWindow.width / 2, aboutPopUpPreferredWidth)
+        width: aboutPopUpPreferredWidth
         height: aboutPopUpDialog.contentHeight
     }
 
diff --git a/src/mainview/components/AboutPopUp.qml b/src/mainview/components/AboutPopUp.qml
index f13c46a01556a6bf79cef292dfda5436a35a2b24..0ed5fb7f9d81be8293c1c2df7b1e3ca1a986c6af 100644
--- a/src/mainview/components/AboutPopUp.qml
+++ b/src/mainview/components/AboutPopUp.qml
@@ -241,22 +241,11 @@ Dialog {
 
                     anchors.fill: parent
 
-                    HoverableButton {
+                    MaterialButton {
                         id: changeLogButton
-
-                        Layout.alignment: Qt.AlignCenter
-                        Layout.preferredWidth: textMetricschangeLogButton.boundingRect.width + 20
-                        Layout.preferredHeight: 30
-
-                        radius: 10
-                        fontPointSize: JamiTheme.textFontSize - 2
-                        text: textMetricschangeLogButton.text
-
-                        TextMetrics {
-                            id: textMetricschangeLogButton
-                            font: changeLogButton.font
-                            text: qsTr("Change Log")
-                        }
+                        text: qsTr("Changelog")
+                        color: projectCreditsScrollView.visible? JamiTheme.buttonTintedGreyInactive : JamiTheme.buttonTintedGrey
+                        Layout.preferredWidth: 100
 
                         onClicked: {
                             if (changeLogOrCreditsStack.depth > 1) {
@@ -265,16 +254,11 @@ Dialog {
                         }
                     }
 
-                    HoverableButton {
+                    MaterialButton {
                         id: creditsButton
-
-                        Layout.alignment: Qt.AlignCenter
-                        Layout.preferredWidth: changeLogButton.width
-                        Layout.preferredHeight: 30
-
-                        radius: 10
-                        fontPointSize: JamiTheme.textFontSize - 2
-                        text: qsTr("Credits")
+                        text: qsTr("Credit")
+                        color: projectCreditsScrollView.visible? JamiTheme.buttonTintedGrey : JamiTheme.buttonTintedGreyInactive
+                        Layout.preferredWidth: 100
 
                         onClicked: {
                             if (changeLogOrCreditsStack.depth == 1) {
diff --git a/src/mainview/components/WelcomePage.qml b/src/mainview/components/WelcomePage.qml
index ad48871743f7b1069b1689510e9e129b98505c06..49d8061d80a95414efe99e5dda95f347505e032e 100644
--- a/src/mainview/components/WelcomePage.qml
+++ b/src/mainview/components/WelcomePage.qml
@@ -99,37 +99,27 @@ Rectangle {
 
             Rectangle {
                 id: jamiRegisteredNameRect
-
                 Layout.alignment: Qt.AlignCenter
                 Layout.preferredWidth: welcomeRectComponentsGroup.width
                 Layout.preferredHeight: 65
                 Layout.bottomMargin: 5
-
                 visible: accountListModel.data(accountListModel.index(
                                                    0, 0),
                                                260) === 1
                 ColumnLayout {
                     id: jamiRegisteredNameRectColumnLayout
-
                     spacing: 0
-
                     Text {
                         id: jamiRegisteredNameText
-
                         Layout.alignment: Qt.AlignCenter
                         Layout.preferredWidth: welcomeRectComponentsGroup.width
                         Layout.preferredHeight: 30
-
                         font.pointSize: JamiTheme.textFontSize + 1
-
                         horizontalAlignment: Text.AlignHCenter
                         verticalAlignment: Text.AlignVCenter
-
                         text: textMetricsjamiRegisteredNameText.elidedText
-
                         TextMetrics {
                             id: textMetricsjamiRegisteredNameText
-
                             font: jamiRegisteredNameText.font
                             text: accountListModel.data(
                                       accountListModel.index(
@@ -138,17 +128,13 @@ Rectangle {
                             elide: Qt.ElideMiddle
                         }
                     }
-
                     HoverableButton {
                         id: copyRegisterednameButton
-
                         Layout.alignment: Qt.AlignCenter
                         Layout.preferredWidth: buttonPreferredSize
                         Layout.preferredHeight: buttonPreferredSize
-
                         radius: 30
                         source: "qrc:/images/icons/ic_content_copy.svg"
-
                         onClicked: {
                             ClientWrapper.utilsAdaptor.setText(
                                         textMetricsjamiRegisteredNameText.text)
@@ -159,6 +145,24 @@ Rectangle {
         }
     }
 
+
+    Button {
+        anchors.bottom: parent.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+        background: Rectangle {
+            color: "transparent"
+        }
+        anchors.bottomMargin: 12
+        contentItem: Text {
+            text: qsTr("About Jami")
+            color: "grey"
+        }
+
+        onClicked: {
+            aboutPopUpDialog.open()
+        }
+    }
+
     CustomBorder {
         commonBorder: false
         lBorderwidth: 1