diff --git a/TODO.md b/TODO.md
index b5903d7a..94a04b6a 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,17 +1,18 @@
 # TODO
 
+- add unread counts on accounts
+- add account number binds
 - rename goto*account → scrollto*account
-- account number binds
-- update glass theme
-- back/front buttons in small window
-- minimum sizes
-- lag when switching accounts
-- message delegate too tall
-- unread counts on accounts
-- fix compact mode
-- left rooms opacity
 
+- fix back/front buttons in small window
+- fix message delegate too tall
+- fix compact mode
+- fix left rooms opacity
 - fix escape keybinds (filter rooms, message selection)
+
+- lag when switching accounts
+- update glass theme
+
 - if last room event is a membership change, it won't be visible in timeline
 - use uiState instead of open_room
 
diff --git a/src/gui/Base/HButton.qml b/src/gui/Base/HButton.qml
index 5cc89830..10e635db 100644
--- a/src/gui/Base/HButton.qml
+++ b/src/gui/Base/HButton.qml
@@ -8,7 +8,7 @@ Button {
     id: button
     enabled: ! button.loading
     spacing: theme.spacing
-    topPadding: padded ? spacing / (circle ? 1.75 : 1.5) : 0
+    topPadding: padded ? spacing / (circle ? 1.75 : 2) : 0
     bottomPadding: topPadding
     leftPadding: padded ? spacing / (circle ? 1.5 : 1) : 0
     rightPadding: leftPadding
diff --git a/src/gui/Base/HTile/HTile.qml b/src/gui/Base/HTile/HTile.qml
index 23c13285..5610f4e6 100644
--- a/src/gui/Base/HTile/HTile.qml
+++ b/src/gui/Base/HTile/HTile.qml
@@ -18,6 +18,9 @@ HButton {
     property alias contextMenu: contextMenuLoader.sourceComponent
 
 
+    Behavior on topPadding { HNumberAnimation {} }
+    Behavior on bottomPadding { HNumberAnimation {} }
+
     Binding on topPadding {
         value: spacing / 4
         when: compact
diff --git a/src/gui/MainPane/Account.qml b/src/gui/MainPane/Account.qml
index e6c75ac8..1edb494d 100644
--- a/src/gui/MainPane/Account.qml
+++ b/src/gui/MainPane/Account.qml
@@ -85,25 +85,6 @@ HTile {
     property bool isCurrent: false
 
 
-    Behavior on leftPadding { HNumberAnimation {} }
-    Behavior on topPadding { HNumberAnimation {} }
-
-    Binding on leftPadding {
-        value: (mainPane.minimumSize - avatar.width) / 2
-        when: mainPane.small
-    }
-
-    Binding on topPadding {
-        value: theme.spacing
-        when: mainPane.small
-    }
-
-    Binding on bottomPadding {
-        value: theme.spacing
-        when: mainPane.small
-    }
-
-
     HShortcut {
         enabled: isCurrent
         sequences: window.settings.keys.accountSettings
diff --git a/src/gui/MainPane/MainPane.qml b/src/gui/MainPane/MainPane.qml
index c5c2b356..9cee8ba7 100644
--- a/src/gui/MainPane/MainPane.qml
+++ b/src/gui/MainPane/MainPane.qml
@@ -8,15 +8,13 @@ HDrawer {
     id: mainPane
     saveName: "mainPane"
     background: null
-    // minimumSize: bottomBar.addAccountButton.width
+    minimumSize:
+        accountBar.width + theme.controls.avatar.size + theme.spacing * 2
 
     readonly property alias accountBar: accountBar
     readonly property alias roomList: roomList
     readonly property alias filterRoomsField: filterRoomsField
 
-    readonly property bool small:
-        width < theme.controls.avatar.size + theme.spacing * 2
-
 
     Behavior on opacity { HNumberAnimation {} }
 
diff --git a/src/gui/MainPane/Room.qml b/src/gui/MainPane/Room.qml
index a5872ad4..34494687 100644
--- a/src/gui/MainPane/Room.qml
+++ b/src/gui/MainPane/Room.qml
@@ -22,11 +22,7 @@ HTileDelegate {
             displayName: model.display_name
             mxc: model.avatar_url
             compact: room.compact
-
-            radius:
-                mainPane.small ?
-                theme.accountView.roomList.room.collapsedAvatarRadius :
-                theme.accountView.roomList.room.avatarRadius
+            radius: theme.accountView.roomList.room.avatarRadius
 
             Behavior on radius { HNumberAnimation {} }
         }
@@ -215,20 +211,4 @@ HTileDelegate {
 
 
     Behavior on opacity { HNumberAnimation {} }
-    Behavior on leftPadding { HNumberAnimation {} }
-
-    Binding on leftPadding {
-        value: (mainPane.minimumSize - avatar.width) / 2
-        when: mainPane.small
-    }
-
-    Binding on topPadding {
-        value: leftPadding / 2
-        when: mainPane.small
-    }
-
-    Binding on bottomPadding {
-        value: leftPadding / 2
-        when: mainPane.small
-    }
 }
diff --git a/src/themes/Midnight.qpl b/src/themes/Midnight.qpl
index 5bf871db..ad8da3e7 100644
--- a/src/themes/Midnight.qpl
+++ b/src/themes/Midnight.qpl
@@ -310,8 +310,7 @@ accountView:
             color subtitle:      colors.dimText
             color subtitleQuote: chat.message.quote
 
-            int avatarRadius:          controls.avatar.radius
-            int collapsedAvatarRadius: controls.avatar.radius
+            int avatarRadius: controls.avatar.radius
 
             unreadIndicator:
                 color background:        colors.accentBackground