diff --git a/luci-base/ucode/template/header.ut b/luci-base/ucode/template/header.ut
index e0f45885f..7cc14c55f 100644
--- a/luci-base/ucode/template/header.ut
+++ b/luci-base/ucode/template/header.ut
@@ -23,12 +23,6 @@
 	include(`themes/${theme}/header`);
 -%}
 
-{% if (wizard_pending): %}
-<script>
-	window.location.replace({{ sprintf('%J', dispatcher.build_url('admin/wizard')) }});
-</script>
-{% endif %}
-
 <script src="{{ resource }}/luci.js?v={# PKG_VERSION #}-{{ pkgs_update_time }}"></script>
 <script>
 	L = new LuCI({{ replace(`${ {
diff --git a/luci-theme-material3/htdocs/luci-static/material3/cascade.css b/luci-theme-material3/htdocs/luci-static/material3/cascade.css
index 268797e3f..11e637e03 100644
--- a/luci-theme-material3/htdocs/luci-static/material3/cascade.css
+++ b/luci-theme-material3/htdocs/luci-static/material3/cascade.css
@@ -1548,6 +1548,14 @@ select {
 	color: var(--text-color-high);
 }
 
+.cbi-value[data-widget="CBI.FlagValue"]:has(> .cbi-value-field > .cbi-checkbox) {
+	align-items: center;
+}
+
+.cbi-value[data-widget="CBI.FlagValue"]:has(> .cbi-value-field > .cbi-checkbox)>label.cbi-value-title {
+	padding-top: 0;
+}
+
 .cbi-value>.cbi-section,
 .cbi-value>.cbi-tblsection {
 	width: 100%;
@@ -1555,7 +1563,7 @@ select {
 
 label>input[type="checkbox"],
 label>input[type="radio"] {
-	vertical-align: text-top;
+	vertical-align: middle;
 	margin: 0;
 }
 
@@ -1797,17 +1805,44 @@ input[type="radio"]::before {
 	border-radius: 2px;
 }
 
+input[type="checkbox"] {
+	--switch-track: var(--surface-container-high);
+	--switch-thumb: var(--outline);
+	--switch-checked-track: var(--primary);
+	--switch-checked-thumb: var(--on-primary);
+	width: 44px;
+	height: 24px;
+	vertical-align: middle;
+}
+
+input[type="checkbox"]::before {
+	width: 44px;
+	height: 24px;
+	background: var(--switch-track);
+	border: 1px solid var(--bd-color);
+	border-radius: 12px;
+	transition: background-color .2s ease, border-color .2s ease, box-shadow .2s ease;
+}
+
+input[type="checkbox"]:checked::before {
+	background: var(--switch-checked-track);
+	border-color: var(--switch-checked-track);
+}
+
 input[type="radio"],
 input[type="radio"]::before {
 	border-radius: 50%;
 }
 
-input[type="checkbox"]::after,
 input[type="radio"]::after {
 	top: 2px;
 	left: 2px;
 	width: 10px;
 	height: 10px;
+	border-radius: 50%;
+	transform: scale(0);
+	transform-origin: center;
+	transition: background-color .2s ease, transform .18s cubic-bezier(.2, 0, 0, 1);
 }
 
 input[type="checkbox"]:checked::after,
@@ -1820,6 +1855,47 @@ input[type="radio"]:checked::after {
 
 input[type="radio"]:checked:after {
 	--checkmark-icon: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='20' height='20'><circle cx='10' cy='10' r='7'/></svg>");
+	transform: scale(1);
+}
+
+input[type="checkbox"]::after {
+	top: 3px;
+	left: 3px;
+	width: 18px;
+	height: 18px;
+	border-radius: 50%;
+	background: var(--switch-thumb);
+	transition: transform .2s ease, background-color .2s ease;
+}
+
+input[type="checkbox"]:checked::after {
+	-webkit-mask: none;
+	mask: none;
+	background: var(--switch-checked-thumb);
+	transform: translateX(20px);
+}
+
+.cbi-checkbox {
+	position: relative;
+}
+
+.cbi-checkbox input[type="checkbox"]+label {
+	position: absolute;
+	inset: 0;
+	pointer-events: none;
+}
+
+.cbi-checkbox input[type="checkbox"]:checked+label::before {
+	--switch-check-icon: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'><path d='M1.6 4.1 3.1 5.6 6.4 2.4' fill='none' stroke='%23000' stroke-width='1' stroke-linecap='round' stroke-linejoin='round'/></svg>");
+	content: "";
+	position: absolute;
+	top: 10px;
+	left: 28px;
+	width: 10px;
+	height: 10px;
+	background: var(--primary);
+	-webkit-mask: var(--switch-check-icon) center/contain no-repeat;
+	mask: var(--switch-check-icon) center/contain no-repeat;
 }
 
 input[type="checkbox"].cbi-input-invalid,
@@ -1872,6 +1948,18 @@ select:focus {
 	text-decoration: none;
 }
 
+input[type="radio"]::before {
+	transition: border-color .2s ease, background-color .2s ease, box-shadow .18s ease;
+	box-shadow: 0 0 0 0 color-mix(in srgb, var(--text-color-high) 0%, transparent);
+}
+
+.cbi-radio:hover input[type="radio"]::before,
+label:hover > input[type="radio"]::before,
+input[type="radio"]:hover::before,
+input[type="radio"]:focus::before {
+	box-shadow: 0 0 0 7px color-mix(in srgb, var(--text-color-high) 10%, transparent);
+}
+
 .btn:hover,
 .btn:focus,
 .cbi-button:hover,
@@ -2534,7 +2622,9 @@ li.menu,
 	color: var(--text-color-highest) !important;
 }
 
-@media (hover: none), (pointer: coarse), (any-pointer: coarse) {
+@media (hover: none),
+(pointer: coarse),
+(any-pointer: coarse) {
 	.nav>li:not(.active)>a:hover {
 		background: transparent;
 		color: var(--text-color-high);
diff --git a/luci-theme-material3/htdocs/luci-static/material3/mobile.css b/luci-theme-material3/htdocs/luci-static/material3/mobile.css
index 4a120cad3..025a08a77 100644
--- a/luci-theme-material3/htdocs/luci-static/material3/mobile.css
+++ b/luci-theme-material3/htdocs/luci-static/material3/mobile.css
@@ -263,6 +263,39 @@ header h3 a {
 		font-weight: bold;
 	}
 
+	.cbi-value[data-widget="CBI.FlagValue"]:has(> .cbi-value-field > .cbi-checkbox) {
+		display: grid;
+		grid-template-columns: minmax(0, 1fr) max-content;
+		align-items: center;
+		column-gap: 10px;
+	}
+
+	.cbi-value[data-widget="CBI.FlagValue"]:has(> .cbi-value-field > .cbi-checkbox) > label.cbi-value-title {
+		width: auto;
+		max-width: none;
+		padding: 0;
+		margin: 0;
+		text-align: left;
+		text-indent: 0;
+		white-space: normal;
+	}
+
+	.cbi-value[data-widget="CBI.FlagValue"]:has(> .cbi-value-field > .cbi-checkbox) > .cbi-value-field {
+		display: contents;
+	}
+
+	.cbi-value[data-widget="CBI.FlagValue"]:has(> .cbi-value-field > .cbi-checkbox) > .cbi-value-field > .cbi-checkbox {
+		grid-column: 2;
+	}
+
+	.cbi-value[data-widget="CBI.FlagValue"]:has(> .cbi-value-field > .cbi-checkbox) > .cbi-value-field > .cbi-value-description {
+		grid-column: 1 / -1;
+		width: auto;
+		max-width: calc(100% - 1.25em);
+		box-sizing: border-box;
+		margin: .25em 0 0 1.25em;
+	}
+
 	.cbi-value-field,
 	.cbi-select,
 	.cbi-dynlist,
@@ -525,7 +558,7 @@ header h3 a {
 	}
 
 	body[data-page="admin-network-wireless"] .td[data-name="_badge"] {
-		max-width: 50px;
+		max-width: 90px;
 		align-self: center;
 	}
 
@@ -572,4 +605,4 @@ header h3 a {
 	.ifacebox .ifacebox-body>* {
 		margin: .125em;
 	}
-}
+}
\ No newline at end of file