diff --git a/src/admin/components/edition/taxonomy-edition-form.vue b/src/admin/components/edition/taxonomy-edition-form.vue
index 9d2383759..9deac6d56 100644
--- a/src/admin/components/edition/taxonomy-edition-form.vue
+++ b/src/admin/components/edition/taxonomy-edition-form.vue
@@ -93,20 +93,19 @@
                         </b-field>
 
                         <!-- Allow Insert -->
-                        <b-field 
-                                :addons="false"
-                                :label="$i18n.get('label_taxonomy_allow_new_terms')">
-                            <help-button 
-                                :title="$i18n.getHelperTitle('taxonomies', 'allow_insert')" 
-                                :message="$i18n.getHelperMessage('taxonomies', 'allow_insert')"/>
-                            <div class="block" >
-                                <b-checkbox
-                                        v-model="form.allowInsert"
-                                        true-value="yes"
-                                        false-value="no">
-                                    {{ labelNewTerms() }}
-                                </b-checkbox>
-                            </div>
+                        <b-field :addons="false">
+                            <label class="label is-inline">
+                                    {{ $i18n.get('label_taxonomy_allow_new_terms') }}
+                                    <b-switch
+                                            id="tainacan-checkbox-allow-insert" 
+                                            size="is-small"
+                                            v-model="form.allowInsert"
+                                            true-value="yes"
+                                            false-value="no" />
+                                    <help-button 
+                                        :title="$i18n.getHelperTitle('taxonomies', 'allow_insert')" 
+                                        :message="$i18n.getHelperMessage('taxonomies', 'allow_insert')"/>
+                                </label>
                         </b-field>
 
                         <!-- Hook for extra Form options -->
diff --git a/src/admin/components/lists/recursive-term-item.vue b/src/admin/components/lists/recursive-term-item.vue
index 13c9daccd..86cec7f28 100644
--- a/src/admin/components/lists/recursive-term-item.vue
+++ b/src/admin/components/lists/recursive-term-item.vue
@@ -347,7 +347,7 @@ export default {
             user-select: none;
         }
 
-        &.opened-term:first-child {
+        &.opened-term>div:first-child>div {
             cursor: default;
             background-color: $gray1;
 
diff --git a/src/admin/components/lists/terms-list.vue b/src/admin/components/lists/terms-list.vue
index b0c794a8c..080b9fc89 100644
--- a/src/admin/components/lists/terms-list.vue
+++ b/src/admin/components/lists/terms-list.vue
@@ -460,6 +460,29 @@ export default {
             border-color: transparent transparent transparent $gray2 !important;
         }
     }
+    .parent-term>div>.opened-term.term-item:first-child {
+        cursor: default;
+        background-color: $gray1 !important;
+
+        &:before {
+            content: '';
+            display: block;
+            position: absolute;
+            left: 100%;
+            right: -20px;
+            width: 0;
+            height: 0;
+            border-style: solid;
+            border-color: transparent transparent transparent $gray1;
+            border-left-width: 24px;
+            border-top-width: 20px;
+            border-bottom-width: 20px;
+            top: 0;
+        }
+        &:hover:before {
+            border-color: transparent transparent transparent $gray1;
+        }
+    }
 
     .view-more-terms-level-0 {
         font-size: 0.875rem;