diff --git a/dashboard/src/components/MailboxDialog.vue b/dashboard/src/components/MailboxDialog.vue
index 0da39bda2..0e9dea53b 100644
--- a/dashboard/src/components/MailboxDialog.vue
+++ b/dashboard/src/components/MailboxDialog.vue
@@ -133,20 +133,17 @@ defineExpose({
             <SingleSelect v-model="ownerId" :options="usersAndGroups" option-key="id" option-label="name"/>
           </FormGroup>
 
-          <Checkbox v-model="active" :label="$t('email.updateMailboxDialog.activeCheckbox')"/><br/>
+          <Checkbox v-model="active" :label="$t('email.updateMailboxDialog.activeCheckbox')"/>
 
-          <Checkbox v-model="enablePop3" :label="$t('email.updateMailboxDialog.enablePop3')"/><br/>
+          <Checkbox v-model="enablePop3" :label="$t('email.updateMailboxDialog.enablePop3')"/>
 
-          <FormGroup>
-            <div>
-              <Checkbox v-model="storageQuotaEnabled" :label="$t('email.editMailboxDialog.enableStorageQuota')"/>
-              <b v-if="storageQuotaEnabled">: {{ prettyDecimalSize(storageQuota) }}</b>
-            </div>
-            <input type="range" id="storageQuota" :disabled="!storageQuotaEnabled" v-model="storageQuota" step="500000000" :min="storageQuotaTicks[0]" :max="storageQuotaTicks[storageQuotaTicks.length-1]" list="storageQuotaTicks" />
+          <Checkbox v-model="storageQuotaEnabled" :label="$t('email.editMailboxDialog.enableStorageQuota') + (storageQuotaEnabled ? ` : ${prettyDecimalSize(storageQuota)}` : '')"/>
+          <div v-if="storageQuotaEnabled">
+            <input style="width: 100%;" type="range" id="storageQuota" :disabled="!storageQuotaEnabled" v-model="storageQuota" step="500000000" :min="storageQuotaTicks[0]" :max="storageQuotaTicks[storageQuotaTicks.length-1]" list="storageQuotaTicks" />
             <datalist id="storageQuotaTicks">
               <option v-for="quota in storageQuotaTicks" :value="quota" :key="quota"></option>
             </datalist>
-          </FormGroup>
+          </div>
 
           <!-- we only show this on edit for now as it is a separate REST call which may fail after the mailbox was added -->
           <FormGroup v-if="mailbox">
diff --git a/dashboard/src/components/app/Security.vue b/dashboard/src/components/app/Security.vue
index 505350700..93cc32dcf 100644
--- a/dashboard/src/components/app/Security.vue
+++ b/dashboard/src/components/app/Security.vue
@@ -60,11 +60,8 @@ onMounted(() => {
           <textarea id="cspInput" style="white-space: pre-wrap; font-family: monospace;" v-model="csp" placeholder="default-src 'self'; frame-ancestors 'none';" rows="2"></textarea>
         </FormGroup>
 
-        <br/>
+        <Checkbox v-model="hstsPreload" style="display: inline-flex;" :label="$t('app.security.hstsPreload')"/> <sup><a href="https://docs.cloudron.io/apps/#hsts-preload" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup>
 
-        <Checkbox v-model="hstsPreload" :label="$t('app.security.hstsPreload')"/> <sup><a href="https://docs.cloudron.io/apps/#hsts-preload" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup>
-
-        <br/>
         <br/>
 
         <Button @click="onSubmit()" :loading="busy" :disabled="busy">{{ $t('app.security.csp.saveAction') }}</Button>
diff --git a/dashboard/src/style.css b/dashboard/src/style.css
index e08320d49..546130a3a 100644
--- a/dashboard/src/style.css
+++ b/dashboard/src/style.css
@@ -105,6 +105,10 @@ hr {
   opacity: 0;
 }
 
+.pankow-checkbox {
+  margin: 8px 0;
+}
+
 .pankow-table-header-column {
   border-bottom-color: transparent;
 }