diff --git a/src/components/NcActionCheckbox/NcActionCheckbox.vue b/src/components/NcActionCheckbox/NcActionCheckbox.vue
index bc4c8cd98b..0d8051e01d 100644
--- a/src/components/NcActionCheckbox/NcActionCheckbox.vue
+++ b/src/components/NcActionCheckbox/NcActionCheckbox.vue
@@ -9,10 +9,10 @@ This component is made to be used inside of the [NcActions](#NcActions) componen
 ```vue
 <template>
 	<NcActions>
-		<NcActionCheckbox @change="alert('(un)checked !')">First choice</NcActionCheckbox>
-		<NcActionCheckbox v-model="checkboxValue" value="second" @change="alert('(un)checked !')">Second choice (v-model)</NcActionCheckbox>
-		<NcActionCheckbox :model-value="checkboxValue" @change="alert('(un)checked !')">Third choice (checked)</NcActionCheckbox>
-		<NcActionCheckbox :disabled="true" @change="alert('(un)checked !')">Fourth choice (disabled)</NcActionCheckbox>
+		<NcActionCheckbox @change="log('(un)checked !')">First choice</NcActionCheckbox>
+		<NcActionCheckbox value="second" @change="log('(un)checked !')">Second choice</NcActionCheckbox>
+		<NcActionCheckbox v-model="checkboxValue" @change="log('(un)checked !')">Third choice (checked)</NcActionCheckbox>
+		<NcActionCheckbox :disabled="true" @change="log('(un)checked !')">Second choice (disabled)</NcActionCheckbox>
 	</NcActions>
 </template>
 
@@ -20,15 +20,13 @@ This component is made to be used inside of the [NcActions](#NcActions) componen
 export default {
 	data() {
 		return {
-			checkboxValue: false,
+			checkboxValue: true,
 		}
 	},
 
 	methods: {
-		alert(message) {
-			alert(message)
-		}
-	}
+		log: console.log,
+	},
 }
 </script>
 ```
@@ -36,27 +34,28 @@ export default {
 
 <template>
 	<li class="action" :class="{ 'action--disabled': disabled }" :role="isInSemanticMenu && 'presentation'">
-		<span class="action-checkbox" :role="isInSemanticMenu && 'menuitemcheckbox'" :aria-checked="ariaChecked">
-			<input
-				:id="id"
-				ref="checkbox"
-				:disabled="disabled"
-				:checked="model"
-				:value="value"
-				:class="{ focusable: isFocusable }"
-				type="checkbox"
-				class="checkbox action-checkbox__checkbox"
-				@keydown.enter.exact.prevent="checkInput"
-				@change="onChange">
-			<label ref="label" :for="id" class="action-checkbox__label">{{ text }}</label>
-
-			<!-- fake slot to gather inner text -->
-			<slot v-if="false" />
-		</span>
+		<label class="action-checkbox" :role="isInSemanticMenu && 'menuitemcheckbox'" :aria-checked="isInSemanticMenu && localModel.toString()">
+			<span class="action-checkbox__icon">
+				<input
+					:id="id"
+					v-model="localModel"
+					type="checkbox"
+					class="action-checkbox__input"
+					:class="{ focusable: !disabled }"
+					:value="value"
+					:disabled="disabled"
+					@change="onChange">
+				<NcIconSvgWrapper :path="localModel ? mdiCheckboxMarked : mdiCheckboxBlankOutline" :size="20" />
+			</span>
+			<span class="action-checkbox__text">{{ text }}</span>
+		</label>
 	</li>
 </template>
 
 <script>
+import { mdiCheckboxBlankOutline, mdiCheckboxMarked } from '@mdi/js'
+import { ref, watch } from 'vue'
+import NcIconSvgWrapper from '../NcIconSvgWrapper/NcIconSvgWrapper.vue'
 import { useModelMigration } from '../../composables/useModelMigration.ts'
 import ActionGlobalMixin from '../../mixins/actionGlobal.js'
 import GenRandomId from '../../utils/GenRandomId.js'
@@ -64,6 +63,10 @@ import GenRandomId from '../../utils/GenRandomId.js'
 export default {
 	name: 'NcActionCheckbox',
 
+	components: {
+		NcIconSvgWrapper,
+	},
+
 	mixins: [ActionGlobalMixin],
 
 	inject: {
@@ -125,8 +128,11 @@ export default {
 	},
 
 	emits: [
+		/** Native change event */
 		'change',
+		/** Checkbox is checked */
 		'check',
+		/** Checkbox is unchecked */
 		'uncheck',
 		/**
 		 * Removed in v9 - use `update:modelValue` (`v-model`) instead
@@ -146,63 +152,25 @@ export default {
 
 	setup() {
 		const model = useModelMigration('checked', 'update:checked')
-		return {
-			model,
-		}
-	},
 
-	computed: {
-		/**
-		 * determines if the action is focusable
-		 *
-		 * @return {boolean} is the action focusable ?
-		 */
-		isFocusable() {
-			return !this.disabled
-		},
+		// For backward compatibility to support using without v-model binding (passive model)
+		const localModel = ref(model.value)
+		watch(model, (newValue) => (localModel.value = newValue), { flush: 'sync' })
+		watch(localModel, (newValue) => (model.value = newValue), { flush: 'sync' })
 
-		/**
-		 * aria-checked attribute for role="menuitemcheckbox"
-		 *
-		 * @return {'true'|'false'|undefined} aria-checked value if needed
-		 */
-		ariaChecked() {
-			if (this.isInSemanticMenu) {
-				return this.model ? 'true' : 'false'
-			}
-			return undefined
-		},
+		return {
+			localModel,
+			mdiCheckboxBlankOutline,
+			mdiCheckboxMarked,
+		}
 	},
 
 	methods: {
-		checkInput() {
-			// by clicking we also trigger the change event
-			this.$refs.label.click()
-		},
-
 		onChange(event) {
-			this.model = this.$refs.checkbox.checked
-
-			/**
-			 * Emitted when the checkbox state is changed
-			 *
-			 * @type {Event}
-			 */
 			this.$emit('change', event)
-
-			if (this.$refs.checkbox.checked) {
-				/**
-				 * Emitted when the checkbox is checked
-				 *
-				 * @type {Event}
-				 */
+			if (event.target.checked) {
 				this.$emit('check')
 			} else {
-				/**
-				 * Emitted when the checkbox is unchecked
-				 *
-				 * @type {Event}
-				 */
 				this.$emit('uncheck')
 			}
 		},
@@ -214,56 +182,24 @@ export default {
 @use '../../assets/action.scss' as *;
 @include action-active;
 @include action--disabled;
+@include action-item('checkbox');
 
-.action-checkbox {
-	display: flex;
-	align-items: flex-start;
-
-	width: 100%;
-	height: auto;
-	margin: 0;
-	padding: 0;
-
-	cursor: pointer;
-	white-space: nowrap;
-
-	color: var(--color-main-text);
-	border: 0;
-	border-radius: 0; // otherwise Safari will cut the border-radius area
-	background-color: transparent;
-	box-shadow: none;
+.action:has(:focus-visible) {
+	outline: 2px solid currentColor;
+}
 
-	font-weight: normal;
-	line-height: var(--default-clickable-area);
+.action-checkbox {
+	&__icon {
+		color: var(--color-primary-element);
+	}
 
-	/* checkbox/radio fixes */
-	&__checkbox {
+	&__input {
+		width: 20px;
+		height: 20px;
+		margin: auto;
 		position: absolute;
-		inset-inline-start: 0 !important;
 		z-index: -1;
-		opacity: 0;
-	}
-
-	&__label {
-		display: flex;
-		align-items: center; // align checkbox to text
-
-		width: 100%;
-		padding: 0 !important;
-		padding-inline-end: $icon-margin !important;
-
-		&::before {
-			margin-block: 0 !important;
-			margin-inline: calc((var(--default-clickable-area) - 14px) / 2) !important;
-		}
-	}
-
-	&--disabled {
-		&,
-		.action-checkbox__label {
-			cursor: pointer;
-		}
+		opacity: 0 !important;
 	}
 }
-
 </style>
diff --git a/src/components/NcActionRadio/NcActionRadio.vue b/src/components/NcActionRadio/NcActionRadio.vue
index 29a97c7e1c..a7a3487551 100644
--- a/src/components/NcActionRadio/NcActionRadio.vue
+++ b/src/components/NcActionRadio/NcActionRadio.vue
@@ -45,28 +45,29 @@ So that only one of each name set can be selected at the same time.
 
 <template>
 	<li class="action" :class="{ 'action--disabled': disabled }" :role="isInSemanticMenu && 'presentation'">
-		<span class="action-radio" role="menuitemradio" :aria-checked="ariaChecked">
-			<input
-				:id="id"
-				v-model="model"
-				:disabled="disabled"
-				:name="name"
-				:value="value"
-				:class="{ focusable: isFocusable }"
-				type="radio"
-				class="radio action-radio__radio"
-				@keydown.enter.exact.prevent="toggleInput"
-				@change="onChange">
-			<label ref="label" :for="id" class="action-radio__label">{{ text }}</label>
-
-			<!-- fake slot to gather inner text -->
-			<slot v-if="false" />
-		</span>
+		<label class="action-radio" :role="isInSemanticMenu && 'menuitemradio'" :aria-checked="isInSemanticMenu && isChecked.toString()">
+			<span class="action-radio__icon">
+				<input
+					:id="id"
+					v-model="model"
+					type="radio"
+					class="action-radio__input"
+					:class="{ focusable: !disabled }"
+					:value="value"
+					:name="name"
+					:disabled="disabled"
+					@change="$emit('change', $event)">
+				<NcIconSvgWrapper :path="isChecked ? mdiRadioboxMarked : mdiRadioboxBlank" :size="20" />
+			</span>
+			<span class="action-radio__text">{{ text }}</span>
+		</label>
 	</li>
 </template>
 
 <script>
+import { mdiRadioboxBlank, mdiRadioboxMarked } from '@mdi/js'
 import Vue from 'vue'
+import NcIconSvgWrapper from '../NcIconSvgWrapper/NcIconSvgWrapper.vue'
 import { useModelMigration } from '../../composables/useModelMigration.ts'
 import ActionGlobalMixin from '../../mixins/actionGlobal.js'
 import GenRandomId from '../../utils/GenRandomId.js'
@@ -74,6 +75,10 @@ import GenRandomId from '../../utils/GenRandomId.js'
 export default {
 	name: 'NcActionRadio',
 
+	components: {
+		NcIconSvgWrapper,
+	},
+
 	mixins: [ActionGlobalMixin],
 
 	inject: {
@@ -171,29 +176,14 @@ export default {
 		const model = useModelMigration('checked', 'update:checked')
 		return {
 			model,
+			mdiRadioboxBlank,
+			mdiRadioboxMarked,
 		}
 	},
 
 	computed: {
-		/**
-		 * determines if the action is focusable
-		 *
-		 * @return {boolean} is the action focusable ?
-		 */
-		isFocusable() {
-			return !this.disabled
-		},
-
-		/**
-		 * aria-checked attribute for role="menuitemcheckbox"
-		 *
-		 * @return {'true'|'false'|undefined} aria-checked value if needed
-		 */
-		ariaChecked() {
-			if (this.isInSemanticMenu) {
-				return this.model ? 'true' : 'false'
-			}
-			return undefined
+		isChecked() {
+			return this.model === this.value
 		},
 	},
 
@@ -219,56 +209,24 @@ export default {
 @use '../../assets/action.scss' as *;
 @include action-active;
 @include action--disabled;
+@include action-item('radio');
 
-.action-radio {
-	display: flex;
-	align-items: flex-start;
-
-	width: 100%;
-	height: auto;
-	margin: 0;
-	padding: 0;
-
-	cursor: pointer;
-	white-space: nowrap;
-
-	color: var(--color-main-text);
-	border: 0;
-	border-radius: 0; // otherwise Safari will cut the border-radius area
-	background-color: transparent;
-	box-shadow: none;
+.action:has(:focus-visible) {
+	outline: 2px solid currentColor;
+}
 
-	font-weight: normal;
-	line-height: var(--default-clickable-area);
+.action-radio {
+	&__icon {
+		color: var(--color-primary-element);
+	}
 
-	/* checkbox/radio fixes */
-	&__radio {
+	&__input {
+		width: 20px;
+		height: 20px;
+		margin: auto;
 		position: absolute;
-		inset-inline-start: 0 !important;
 		z-index: -1;
-		opacity: 0;
-	}
-
-	&__label {
-		display: flex;
-		align-items: center; // align radio to text
-
-		width: 100%;
-		padding: 0 !important;
-		padding-inline-end: $icon-margin !important;
-
-		// (34 -14) / 2 = 10 same as ncactioncheckbox
-		&::before {
-			margin: calc((var(--default-clickable-area) - 14px) / 2) !important;
-		}
-	}
-
-	&--disabled {
-		&,
-		.action-radio__label {
-			cursor: pointer;
-		}
+		opacity: 0 !important;
 	}
 }
-
 </style>