diff --git a/app/src/components/v-checkbox-tree/v-checkbox-tree-checkbox.vue b/app/src/components/v-checkbox-tree/v-checkbox-tree-checkbox.vue
index 61bb6b102a..9150dec789 100644
--- a/app/src/components/v-checkbox-tree/v-checkbox-tree-checkbox.vue
+++ b/app/src/components/v-checkbox-tree/v-checkbox-tree-checkbox.vue
@@ -4,6 +4,7 @@
 		v-show="visibleChildrenValues.length > 0"
 		:value="value"
 		:open="typeof search === 'string' && search.length > 0"
+		arrow-placement="before"
 	>
 		<template #activator>
 			<v-checkbox
@@ -34,7 +35,7 @@
 		/>
 	</v-list-group>
 
-	<v-list-item v-else-if="!children && !hidden">
+	<v-list-item v-else-if="!children && !hidden" class="item">
 		<v-checkbox v-model="treeValue" :disabled="disabled" :checked="checked" :label="text" :value="value" />
 	</v-list-item>
 </template>
@@ -442,3 +443,9 @@ export default defineComponent({
 	},
 });
 </script>
+
+<style scoped>
+.item {
+	padding-left: 32px;
+}
+</style>
diff --git a/app/src/components/v-list/v-list-group.vue b/app/src/components/v-list/v-list-group.vue
index 06f7f06589..f5aacc1bc4 100644
--- a/app/src/components/v-list/v-list-group.vue
+++ b/app/src/components/v-list/v-list-group.vue
@@ -10,9 +10,21 @@
 			clickable
 			@click="onClick"
 		>
+			<v-list-item-icon
+				v-if="$slots.default && arrowPlacement === 'before'"
+				class="activator-icon"
+				:class="{ active: groupActive }"
+			>
+				<v-icon name="chevron_right" :disabled="disabled" @click.stop.prevent="toggle" />
+			</v-list-item-icon>
+
 			<slot name="activator" :active="groupActive" />
 
-			<v-list-item-icon v-if="$slots.default" class="activator-icon" :class="{ active: groupActive }">
+			<v-list-item-icon
+				v-if="$slots.default && arrowPlacement === 'after'"
+				class="activator-icon"
+				:class="{ active: groupActive }"
+			>
 				<v-icon name="chevron_right" :disabled="disabled" @click.stop.prevent="toggle" />
 			</v-list-item-icon>
 		</v-list-item>
@@ -69,6 +81,11 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
+		arrowPlacement: {
+			type: String,
+			default: 'after',
+			validator: (val: string) => ['before', 'after'].includes(val),
+		},
 	},
 	emits: ['click'],
 	setup(props, { emit }) {
@@ -101,6 +118,7 @@ export default defineComponent({
 	}
 
 	.activator-icon {
+		margin-right: 0 !important;
 		color: var(--foreground-subdued);
 		transform: rotate(0deg);
 		transition: transform var(--medium) var(--transition);