diff --git a/TODO.md b/TODO.md
index fb144411..5c19fe3f 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,4 +1,7 @@
 - Refactoring
+  - Repair timer/connection
+  - Repair filter members field and retest its performance
+
   - Use HInterfaceBox for EditAccount Profile and Encryption 
 
   - Make all icon SVG files white/black, since we can now use ColorOverlay
diff --git a/src/qml/Base/HButton.qml b/src/qml/Base/HButton.qml
index 35df7aa5..5cc5c748 100644
--- a/src/qml/Base/HButton.qml
+++ b/src/qml/Base/HButton.qml
@@ -55,6 +55,8 @@ Button {
             x: button.leftPadding
             y: button.topPadding + button.availableHeight / 2 - height / 2
             svgName: loading ? "hourglass" : iconName
+
+            Layout.fillHeight: true
         }
 
         HLabel {
@@ -66,6 +68,7 @@ Button {
             verticalAlignment: Text.AlignVCenter
 
             Layout.fillWidth: true
+            Layout.fillHeight: true
         }
     }
 }
diff --git a/src/qml/Pages/SignIn.qml b/src/qml/Pages/SignIn.qml
index 05be13b2..1fe7e48b 100644
--- a/src/qml/Pages/SignIn.qml
+++ b/src/qml/Pages/SignIn.qml
@@ -64,6 +64,7 @@ HPage {
 
                 HButton {
                     iconName: modelData
+                    ico.dimension: 24
                     circle: true
                     checked: loginWith == modelData
                     enabled: modelData == "username"