diff --git a/settings/ui/components/SettingsBundle.vue b/settings/ui/components/SettingsBundle.vue
index eec2d93766..69bc29575b 100644
--- a/settings/ui/components/SettingsBundle.vue
+++ b/settings/ui/components/SettingsBundle.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="uk-width-1-1 uk-width-2-3@m uk-width-1-2@l">
+  <div class="uk-width-1-1 uk-width-2-3@m uk-width-1-2@l uk-width-1-3@xl">
     <div class="oc-text-bold oc-mb-s">
       <translate>{{ bundle.displayName }}</translate>
     </div>
diff --git a/settings/ui/components/settings/SettingMultiChoice.vue b/settings/ui/components/settings/SettingMultiChoice.vue
index a7767bb5c7..8a1bbd2961 100644
--- a/settings/ui/components/settings/SettingMultiChoice.vue
+++ b/settings/ui/components/settings/SettingMultiChoice.vue
@@ -1,12 +1,13 @@
 <template>
   <div>
-    <oc-button :id="buttonElementId" class="uk-width-expand">
+    <oc-button :id="buttonElementId" class="uk-width-expand" justify-content="space-between">
       <span v-if="selectedOptions !== null && selectedOptions.length > 0">
         {{ selectedOptionsDisplayValues }}
       </span>
       <span v-else>
         {{ setting.placeholder || $gettext('Please select') }}
       </span>
+      <oc-icon name="expand_more" />
     </oc-button>
     <oc-drop
       :drop-id="dropElementId"
diff --git a/settings/ui/components/settings/SettingSingleChoice.vue b/settings/ui/components/settings/SettingSingleChoice.vue
index b57c08c67e..d6e71e8478 100644
--- a/settings/ui/components/settings/SettingSingleChoice.vue
+++ b/settings/ui/components/settings/SettingSingleChoice.vue
@@ -1,12 +1,13 @@
 <template>
   <div>
-    <oc-button :id="buttonElementId" class="uk-width-expand">
+    <oc-button :id="buttonElementId" class="uk-width-expand" justify-content="space-between">
       <span v-if="selectedOption">
         {{ selectedOption.displayValue }}
       </span>
       <span v-else>
         {{ setting.placeholder || $gettext('Please select') }}
       </span>
+      <oc-icon name="expand_more" />
     </oc-button>
     <oc-drop
       :drop-id="dropElementId"