diff --git a/components/workspace/BatteryIcon.qml b/components/workspace/BatteryIcon.qml
--- a/components/workspace/BatteryIcon.qml
+++ b/components/workspace/BatteryIcon.qml
@@ -39,7 +39,7 @@
     PlasmaCore.SvgItem {
         id: batterySvg
         anchors.centerIn: parent
-        width: units.roundToIconSize(Math.min(parent.width, parent.height))
+        width: units.roundToIconSize(Math.max(Math.min(parent.width, parent.height), 22)) // Battery icons are at least 22px large
         height: width
         svg: svg
         elementId: "Battery"
diff --git a/lookandfeel/contents/lockscreen/LockScreenUi.qml b/lookandfeel/contents/lockscreen/LockScreenUi.qml
--- a/lookandfeel/contents/lockscreen/LockScreenUi.qml
+++ b/lookandfeel/contents/lockscreen/LockScreenUi.qml
@@ -206,7 +206,7 @@
                     state = "hidden";
                 }
             }
-            
+
             states: [
                 State {
                     name: "visible"
@@ -357,18 +357,19 @@
 
         RowLayout {
             id: footer
+            height: 35
             anchors {
                 bottom: parent.bottom
                 left: parent.left
                 right: parent.right
                 margins: units.smallSpacing
             }
 
             PlasmaComponents.ToolButton {
+                Layout.fillHeight: true
                 text: i18ndc("plasma_lookandfeel_org.kde.lookandfeel", "Button to show/hide virtual keyboard", "Virtual Keyboard")
                 iconName: inputPanel.keyboardActive ? "input-keyboard-virtual-on" : "input-keyboard-virtual-off"
                 onClicked: inputPanel.showHide()
-
                 visible: inputPanel.status == Loader.Ready
             }
 
@@ -379,7 +380,10 @@
                 Layout.fillWidth: true
             }
 
-            Battery {}
+            Battery {
+                Layout.preferredHeight: 22
+                Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+            }
         }
     }
 
diff --git a/sddm-theme/Main.qml b/sddm-theme/Main.qml
--- a/sddm-theme/Main.qml
+++ b/sddm-theme/Main.qml
@@ -298,6 +298,7 @@
     //Footer
     RowLayout {
         id: footer
+        height: 35
         anchors {
             bottom: parent.bottom
             left: parent.left
@@ -312,6 +313,7 @@
         }
 
         PlasmaComponents.ToolButton {
+            Layout.fillHeight: true
             text: i18ndc("plasma_lookandfeel_org.kde.lookandfeel", "Button to show/hide virtual keyboard", "Virtual Keyboard")
             iconName: inputPanel.keyboardActive ? "input-keyboard-virtual-on" : "input-keyboard-virtual-off"
             onClicked: inputPanel.showHide()
@@ -329,7 +331,10 @@
             Layout.fillWidth: true
         }
 
-        Battery { }
+        Battery {
+            Layout.preferredHeight: 22
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+        }
     }
 
     Connections {