diff --git a/src/components/db-editor/APIObjectDBEditorBase.vue b/src/components/db-editor/APIObjectDBEditorBase.vue
index 3a6a10bfcc92d77ccd682d7ccea728c170d8cd6c..e28cc38226a15a75f9ac3bca94d0d334758b00f6 100644
--- a/src/components/db-editor/APIObjectDBEditorBase.vue
+++ b/src/components/db-editor/APIObjectDBEditorBase.vue
@@ -20,7 +20,10 @@
                        v-if="'new' in data && (data.new.isRequired || non_optionals.includes(attr))"></DataEditField>
       </template>
       <template>
-        <b-link v-b-toggle.collapse-optional>{{ $tc('components.db_editor.advanced_parameter', 2) }}</b-link>
+        <b-link v-b-toggle.collapse-optional>
+          <span>{{ $tc('components.db_editor.advanced_parameter', 2) }}</span>
+          <NETVSIcon class="collapse-icon" icon="collapse"></NETVSIcon>
+        </b-link>
         <b-collapse id="collapse-optional">
           <hr/>
           <template v-for="(data,attr) in object_functions[object_function].parameters">
@@ -62,9 +65,12 @@
         />
       </template>
       <template>
-        <b-link v-b-toggle.collapse-optional>{{ $tc('components.db_editor.advanced_parameter', 2) }}</b-link>
+        <b-link v-b-toggle.collapse-optional>
+          <span>{{ $tc('components.db_editor.advanced_parameter', 2) }}</span>
+          <NETVSIcon class="collapse-icon" icon="collapse"></NETVSIcon>
+        </b-link>
         <b-collapse id="collapse-optional">
-          <hr/>
+          <hr v-if="object_functions[object_function].parameters.length > 0" />
           <template v-for="(data,attr) in object_functions[object_function].parameters">
             <template v-if="'new' in data && !non_optionals_order.includes(attr)">
               <APIObjectDataEditFieldList
@@ -103,10 +109,11 @@
 import DataEditField from './APIObjectDataEditField.vue'
 import TransactionUtil from '@/util/transactionutil'
 import APIObjectDataEditFieldList from '@/components/db-editor/APIObjectDataEditFieldList.vue'
+import NETVSIcon from '@/icons/NETVSIcon.vue'
 
 export default {
   name: 'APIObjectDBEditorBase',
-  components: {APIObjectDataEditFieldList, DataEditField},
+  components: { NETVSIcon, APIObjectDataEditFieldList, DataEditField},
   data() {
     return {
       show_result_int: false,
diff --git a/src/components/db-editor/HybridDBEditor.vue b/src/components/db-editor/HybridDBEditor.vue
index f3090f0aa802f942006680e938d4d47b3ff393fb..23ee5716727ef8a53069d9f1d7f7a60ccbc56e8c 100644
--- a/src/components/db-editor/HybridDBEditor.vue
+++ b/src/components/db-editor/HybridDBEditor.vue
@@ -44,7 +44,10 @@
                          v-if="'new' in data && (data.new.isRequired || non_optionals.includes(attr))"></APIObjectDataEditField>
         </template>
         <template>
-          <b-link v-b-toggle.collapse-optional>{{ $tc('components.db_editor.advanced_parameter', 2) }}</b-link>
+          <b-link v-b-toggle.collapse-optional>
+            <span>{{ $tc('components.db_editor.advanced_parameter', 2) }}</span>
+            <NETVSIcon class="collapse-icon" icon="collapse"></NETVSIcon>
+          </b-link>
           <b-collapse id="collapse-optional">
             <hr/>
             <template v-for="(data,attr) in object_functions[object_function].parameters">
@@ -96,7 +99,10 @@
           </template>
         </template>
         <template>
-          <b-link v-b-toggle.collapse-optional>{{ $tc('components.db_editor.advanced_parameter', 2) }}</b-link>
+          <b-link v-b-toggle.collapse-optional>
+            <span>{{ $tc('components.db_editor.advanced_parameter', 2) }}</span>
+            <NETVSIcon class="collapse-icon" icon="collapse"></NETVSIcon>
+          </b-link>
           <b-collapse id="collapse-optional">
             <hr/>
             <div v-for="(v, id) in template.variables" :key="v.id">
@@ -144,6 +150,7 @@ import JSONTemplateDataEditField from '@/components/db-editor/JSONTemplateDataEd
 import JSONTemplateDataEditFieldList from '@/components/db-editor/JSONTemplateDataEditFieldList.vue'
 import APIObjectDataEditField from '@/components/db-editor/APIObjectDataEditField.vue'
 import APIObjectDataEditFieldList from '@/components/db-editor/APIObjectDataEditFieldList.vue'
+import NETVSIcon from '@/icons/NETVSIcon.vue'
 
 const props = Object.assign({}, APIObjectDBEditor.props)
 props.template = {
@@ -154,6 +161,7 @@ delete props.only_emit_ta
 export default {
   name: 'APIObjectDBEditor',
   components: {
+    NETVSIcon,
     APIObjectDataEditFieldList,
     APIObjectDataEditField,
     JSONTemplateDataEditFieldList,