diff --git a/docs/TODO.md b/docs/TODO.md
index bc2be6b9..07faa48c 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -11,7 +11,6 @@
 - Rename the alertOn(Mention/Message)ForMsec options, default Message to non-0
 - Make local unread counter an optional turned off by default
 
-- fix DeviceSection padding
 - Implement fallback QML notifications, usable if dbus isn't available
 - annoying tooltips when menu open
 
@@ -24,13 +23,10 @@
 
 - SSO device delete?
 - filter > enter > room list is always scrolled to top
-- session list: prevent tab-focusing the delegates
 - refresh server list button
 
 - global presence control
 
-- fix local unread counters order
-
 - publish room or alias control
 
 - open context menus centered on touch screens 
diff --git a/src/gui/Base/HCheckBox.qml b/src/gui/Base/HCheckBox.qml
index ae547ed2..d7abc008 100644
--- a/src/gui/Base/HCheckBox.qml
+++ b/src/gui/Base/HCheckBox.qml
@@ -23,7 +23,7 @@ CheckBox {
 
     indicator: Rectangle {
         opacity: box.enabled ? 1 : theme.disabledElementsOpacity + 0.2
-        implicitWidth: theme.controls.checkBox.boxSize
+        implicitWidth: 24
         implicitHeight: implicitWidth
         x: box.leftPadding
         y: box.topPadding + box.availableHeight / 2 - height / 2
@@ -41,6 +41,10 @@ CheckBox {
 
         Behavior on border.color { HColorAnimation { factor: 0.5 } }
 
+        // FIXME: workaround for sizing bug in Security.qml ListView sections
+        Component.onCompleted:
+            implicitWidth = Qt.binding(() => theme.controls.checkBox.boxSize)
+
         HIcon {
             anchors.centerIn: parent
             dimension: parent.width - 2
diff --git a/src/gui/Pages/AccountSettings/Security.qml b/src/gui/Pages/AccountSettings/Security.qml
index 09d4a204..03fcb859 100644
--- a/src/gui/Pages/AccountSettings/Security.qml
+++ b/src/gui/Pages/AccountSettings/Security.qml
@@ -238,6 +238,12 @@ HColumnPage {
             }
         }
 
+        section.property: "type"
+        section.delegate: DeviceSection {
+            width: deviceList.width
+            view: deviceList
+        }
+
         delegate: DeviceDelegate {
             width: deviceList.width
             view: deviceList
@@ -249,12 +255,6 @@ HColumnPage {
             onDeleteRequest: page.deleteDevices(model.index)
         }
 
-        section.property: "type"
-        section.delegate: DeviceSection {
-            width: deviceList.width
-            view: deviceList
-        }
-
         Component.onCompleted: page.loadDevices()
 
         Layout.fillWidth: true