diff --git a/src/views/settings/components/Frontend.vue b/src/views/settings/components/Frontend.vue
index 5fd44399..15d29084 100644
--- a/src/views/settings/components/Frontend.vue
+++ b/src/views/settings/components/Frontend.vue
@@ -3,6 +3,7 @@
     <el-form :model="frontendData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="frontend" :data="frontendData"/>
     </el-form>
+    <el-divider v-if="frontend" class="divider thick-line"/>
     <el-form :model="staticFeData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="staticFe" :data="staticFeData"/>
     </el-form>
diff --git a/src/views/settings/components/Http.vue b/src/views/settings/components/Http.vue
index f5faa752..128aa5f4 100644
--- a/src/views/settings/components/Http.vue
+++ b/src/views/settings/components/Http.vue
@@ -3,6 +3,7 @@
     <el-form :model="httpData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="http" :data="httpData"/>
     </el-form>
+    <el-divider v-if="http" class="divider thick-line"/>
     <el-form :model="corsPlugData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="corsPlug" :data="corsPlugData"/>
     </el-form>
diff --git a/src/views/settings/components/Instance.vue b/src/views/settings/components/Instance.vue
index 64939814..245d53d8 100644
--- a/src/views/settings/components/Instance.vue
+++ b/src/views/settings/components/Instance.vue
@@ -27,6 +27,7 @@
     <el-form :model="feedData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="feed" :data="feedData"/>
     </el-form>
+    <el-divider v-if="uriSchemes" class="divider thick-line"/>
     <el-form :model="streamerData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="streamer" :data="streamerData"/>
     </el-form>
diff --git a/src/views/settings/components/JobQueue.vue b/src/views/settings/components/JobQueue.vue
index 97b78191..a2c03349 100644
--- a/src/views/settings/components/JobQueue.vue
+++ b/src/views/settings/components/JobQueue.vue
@@ -3,9 +3,11 @@
     <el-form :model="obanQueuesData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="obanQueues" :data="obanQueuesData"/>
     </el-form>
+    <el-divider v-if="obanQueues" class="divider thick-line"/>
     <el-form :model="workersData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="workers" :data="workersData"/>
     </el-form>
+    <el-divider v-if="workers" class="divider thick-line"/>
     <el-form :model="activityExpirationData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="activityExpiration" :data="activityExpirationData"/>
     </el-form>
diff --git a/src/views/settings/components/Mailer.vue b/src/views/settings/components/Mailer.vue
index 6a05dcee..65ec18e0 100644
--- a/src/views/settings/components/Mailer.vue
+++ b/src/views/settings/components/Mailer.vue
@@ -11,9 +11,11 @@
     <el-form :model="emailNotificationsData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="emailNotifications" :data="emailNotificationsData"/>
     </el-form>
+    <el-divider v-if="emailNotifications" class="divider thick-line"/>
     <el-form :model="userEmailData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="userEmail" :data="userEmailData"/>
     </el-form>
+    <el-divider v-if="userEmail" class="divider thick-line"/>
     <el-form :model="newUsersDigestEmailData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="newUsersDigestEmail" :data="newUsersDigestEmailData"/>
     </el-form>
diff --git a/src/views/settings/components/Other.vue b/src/views/settings/components/Other.vue
index 7f64884b..978b93e4 100644
--- a/src/views/settings/components/Other.vue
+++ b/src/views/settings/components/Other.vue
@@ -3,6 +3,7 @@
     <el-form :model="mimeTypesData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="mimeTypes" :data="mimeTypesData"/>
     </el-form>
+    <el-divider v-if="mimeTypes" class="divider thick-line"/>
     <el-form :model="remoteIpData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="remoteIp" :data="remoteIpData"/>
     </el-form>
diff --git a/src/views/settings/components/Upload.vue b/src/views/settings/components/Upload.vue
index 50674951..019f9a5f 100644
--- a/src/views/settings/components/Upload.vue
+++ b/src/views/settings/components/Upload.vue
@@ -3,6 +3,7 @@
     <el-form :model="uploadData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="upload" :data="uploadData"/>
     </el-form>
+    <el-divider v-if="upload" class="divider thick-line"/>
     <el-form v-if="showUploadersLocal" :model="uploadersLocalData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="uploadersLocal" :data="uploadersLocalData"/>
       <el-divider v-if="uploadersLocal" class="divider thick-line"/>