diff --git a/Widgets/NComboBox.qml b/Widgets/NComboBox.qml
index 0104640f..deb0ba9d 100644
--- a/Widgets/NComboBox.qml
+++ b/Widgets/NComboBox.qml
@@ -8,7 +8,7 @@ import qs.Widgets
 RowLayout {
   id: root
 
-  property real minimumWidth: 280 * Style.uiScaleRatio
+  property real minimumWidth: 200 * Style.uiScaleRatio
   property real popupHeight: 180 * Style.uiScaleRatio
 
   property string label: ""
diff --git a/Widgets/NToggle.qml b/Widgets/NToggle.qml
index 81cc9533..4cdc91f9 100644
--- a/Widgets/NToggle.qml
+++ b/Widgets/NToggle.qml
@@ -19,7 +19,9 @@ RowLayout {
   signal exited
 
   Layout.fillWidth: true
+
   opacity: enabled ? 1.0 : 0.6
+  spacing: Style.marginM
 
   NLabel {
     label: root.label
@@ -29,6 +31,8 @@ RowLayout {
   Rectangle {
     id: switcher
 
+    Layout.alignment: Qt.AlignVCenter
+
     implicitWidth: Math.round(root.baseSize * .85) * 2
     implicitHeight: Math.round(root.baseSize * .5) * 2
     radius: height * 0.5