diff --git a/Components/Input.qml b/Components/Input.qml
index 0e629ae..79e7857 100644
--- a/Components/Input.qml
+++ b/Components/Input.qml
@@ -476,15 +476,10 @@ Column {
         }
     }
 
-    SessionButton {
-        id: sessionSelect
-        loginButtonWidth: loginButton.background.width
-    }
-
     Connections {
         target: sddm
-        onLoginSucceeded: {}
-        onLoginFailed: {
+        function onLoginSucceeded() {}
+        function onLoginFailed() {
             failed = true
             resetError.running ? resetError.stop() && resetError.start() : resetError.start()
         }
diff --git a/Components/SessionButton.qml b/Components/SessionButton.qml
index ef9220b..002832b 100644
--- a/Components/SessionButton.qml
+++ b/Components/SessionButton.qml
@@ -22,7 +22,7 @@ Item {
         // change also in errorMessage
         height: root.font.pointSize * 2
         hoverEnabled: true
-        anchors.left: parent.left
+        anchors.horizontalCenter: parent.horizontalCenter
         Keys.onPressed: {
             if (event.key == Qt.Key_Up && loginButton.state != "enabled" && !popup.opened)
                 revealSecret.focus = true,
@@ -67,11 +67,9 @@ Item {
 
         contentItem: Text {
             id: displayedItem
-            text: selectSession.currentText
+            text: (config.TranslateSessionSelection || "Session") + " (" + selectSession.currentText + ")"
             color: root.palette.text
             verticalAlignment: Text.AlignVCenter
-            anchors.left: parent.left
-            anchors.leftMargin: 3
             font.pointSize: root.font.pointSize * 0.8
             font.family: root.font.family
             Keys.onReleased: parent.popup.open()
@@ -90,9 +88,10 @@ Item {
 
         popup: Popup {
             id: popupHandler
-            y: parent.height - 1
-            x: config.RightToLeftLayout == "true" ? -loginButtonWidth + displayedItem.width : 0
             width: sessionButton.width
+            y: parent.height - 1
+            x:  -popupHandler.width/2 + displayedItem.width/2
+            // x: config.RightToLeftLayout == "true" ? -loginButtonWidth + displayedItem.width : 0
             implicitHeight: contentItem.implicitHeight
             padding: 10
 
diff --git a/Components/SystemButtons.qml b/Components/SystemButtons.qml
index aef0c24..5efcee3 100644
--- a/Components/SystemButtons.qml
+++ b/Components/SystemButtons.qml
@@ -11,17 +11,17 @@ RowLayout {
 
     spacing: root.font.pointSize
 
+    property var shutdown: ["Shutdown", config.TranslateShutdown || textConstants.shutdown, sddm.canPowerOff]
+    property var reboot: ["Reboot", config.TranslateReboot || textConstants.reboot, sddm.canReboot]
     property var suspend: ["Suspend", config.TranslateSuspend || textConstants.suspend, sddm.canSuspend]
     property var hibernate: ["Hibernate", config.TranslateHibernate || textConstants.hibernate, sddm.canHibernate]
-    property var reboot: ["Reboot", config.TranslateReboot || textConstants.reboot, sddm.canReboot]
-    property var shutdown: ["Shutdown", config.TranslateShutdown || textConstants.shutdown, sddm.canPowerOff]
 
     property Control exposedSession
 
     Repeater {
 
         id: systemButtons
-        model: [suspend, hibernate, reboot, shutdown]
+        model: [shutdown, reboot, suspend, hibernate]
 
         RoundButton {
             text: modelData[1]
@@ -34,7 +34,7 @@ RowLayout {
             display: AbstractButton.TextUnderIcon
             visible: config.HideSystemButtons != "true" && modelData[2]
             hoverEnabled: true
-            palette.buttonText: root.palette.text
+            palette.buttonText: config.SystemButtonsIconColor
             background: Rectangle {
                 height: 2
                 color: "transparent"
@@ -46,7 +46,7 @@ RowLayout {
             Keys.onReturnPressed: clicked()
             onClicked: {
                 parent.forceActiveFocus()
-                index == 0 ? sddm.suspend() : index == 1 ? sddm.hibernate() : index == 2 ? sddm.reboot() : sddm.powerOff()
+                index == 0 ? sddm.powerOff() : index == 1 ? sddm.reboot() : index == 2 ? sddm.suspend() : sddm.hibernate()
             }
             KeyNavigation.up: exposedSession
             KeyNavigation.left: parent.children[index-1]
diff --git a/Main.qml b/Main.qml
index fe00928..0ea338d 100644
--- a/Main.qml
+++ b/Main.qml
@@ -25,11 +25,11 @@ Pane {
     palette.window: config.BackgroundColor
     palette.text: config.TextColor
     palette.shadow: config.PlaceholderColor
-    palette.buttonText: root.palette.text
-    palette.highlightedText: config.HighlightTextColor == "" ? root.palette.highlight : config.HighlightTextColor
-    palette.link: config.LoginButtonBackgroundColor == "" ? root.palette.highlight : config.LoginButtonBackgroundColor
-    palette.mid: config.LoginButtonTextColor == "" ? root.palette.text : config.LoginButtonTextColor
-    palette.alternateBase: config.BackgroundListColor == "" ? root.palette.window : config.BackgroundListColor
+    palette.buttonText: config.TextColor
+    palette.highlightedText: config.HighlightTextColor == "" ? config.HighlightColor : config.HighlightTextColor
+    palette.link: config.LoginButtonBackgroundColor == "" ? config.HighlightColor : config.LoginButtonBackgroundColor
+    palette.mid: config.LoginButtonTextColor == "" ? config.TextColor : config.LoginButtonTextColor
+    palette.alternateBase: config.BackgroundListColor == "" ? config.BackgroundColor: config.BackgroundListColor
 
     font.family: config.Font
     font.pointSize: config.FontSize !== "" ? config.FontSize : parseInt(height / 80)
@@ -91,8 +91,14 @@ Pane {
             anchors.left: config.FormPosition == "left" ? parent.left : undefined
             anchors.right: config.FormPosition == "right" ? parent.right : undefined
             z: 1
+            
+            SessionButton {
+                id: sessionSelect
+                anchors.bottom: parent.bottom
+                anchors.bottomMargin: 70
+            }
         }
-
+        
         Button {
             id: vkb
             checkable: true
diff --git a/Themes/theme1.conf b/Themes/theme1.conf
index 765053d..c20c01e 100644
--- a/Themes/theme1.conf
+++ b/Themes/theme1.conf
@@ -122,5 +122,6 @@ TranslateSuspend=""
 TranslateHibernate=""
 TranslateReboot=""
 TranslateShutdown=""
+TranslateSessionSelection=""
 TranslateVirtualKeyboardButtonOn=""
 TranslateVirtualKeyboardButtonOff=""
\ No newline at end of file