diff --git a/src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue b/src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue
index a784b0bdcf0..9ffc47bd8ce 100644
--- a/src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue
+++ b/src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue
@@ -38,24 +38,26 @@
 						max="20">
 
 					<label class="breakout-rooms-editor__caption">{{ t('spreed', 'Assignment method') }}</label>
-					<NcCheckboxRadioSwitch :checked.sync="mode"
-						value="1"
-						name="mode_radio"
-						type="radio">
-						{{ t('spreed', 'Automatically assign participants') }}
-					</NcCheckboxRadioSwitch>
-					<NcCheckboxRadioSwitch :checked.sync="mode"
-						value="2"
-						name="mode_radio"
-						type="radio">
-						{{ t('spreed', 'Manually assign participants') }}
-					</NcCheckboxRadioSwitch>
-					<NcCheckboxRadioSwitch :checked.sync="mode"
-						value="3"
-						name="mode_radio"
-						type="radio">
-						{{ t('spreed', 'Allow participants to choose') }}
-					</NcCheckboxRadioSwitch>
+					<fieldset>
+						<NcCheckboxRadioSwitch :checked.sync="mode"
+							value="1"
+							name="mode_radio"
+							type="radio">
+							{{ t('spreed', 'Automatically assign participants') }}
+						</NcCheckboxRadioSwitch>
+						<NcCheckboxRadioSwitch :checked.sync="mode"
+							value="2"
+							name="mode_radio"
+							type="radio">
+							{{ t('spreed', 'Manually assign participants') }}
+						</NcCheckboxRadioSwitch>
+						<NcCheckboxRadioSwitch :checked.sync="mode"
+							value="3"
+							name="mode_radio"
+							type="radio">
+							{{ t('spreed', 'Allow participants to choose') }}
+						</NcCheckboxRadioSwitch>
+					</fieldset>
 				</div>
 				<div class="breakout-rooms-editor__buttons">
 					<NcButton v-if="mode === '2'" type="primary" @click="isEditingParticipants = true">
diff --git a/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue b/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue
index 25e5153ebd7..5d474162930 100644
--- a/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue
+++ b/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue
@@ -82,6 +82,7 @@
 				{{ resetButtonLabel }}
 			</NcButton>
 			<NcActions v-if="hasSelected"
+				type="primary"
 				:menu-title="t('spreed', 'Assign')">
 				<NcActionButton v-for="(item, index) in assignments"
 					:key="index"
@@ -95,7 +96,7 @@
 				</NcActionButton>
 			</NcActions>
 			<NcButton :disabled="!hasAssigned"
-				type="primary"
+				:type="confirmButtonType"
 				@click="handleSubmit">
 				{{ confirmButtonLabel }}
 			</NcButton>
@@ -204,6 +205,10 @@ export default {
 			return this.isReorganizingAttendees ? t('spreed', 'Confirm') : t('spreed', 'Create breakout rooms')
 		},
 
+		confirmButtonType() {
+			return this.hasUnassigned ? 'secondary' : 'primary'
+		},
+
 		resetButtonLabel() {
 			return t('spreed', 'Reset')
 		},