diff --git a/bundles/org.openhab.ui.basic/src/main/resources/snippets/buttongrid.html b/bundles/org.openhab.ui.basic/src/main/resources/snippets/buttongrid.html
index bf66c46833..48f5c95575 100644
--- a/bundles/org.openhab.ui.basic/src/main/resources/snippets/buttongrid.html
+++ b/bundles/org.openhab.ui.basic/src/main/resources/snippets/buttongrid.html
@@ -6,7 +6,7 @@
 		%label%
 	</span>
 </div>
-<div class="mdl-form__row-buttongrid mdl-form__row--height-auto mdl-cell mdl-cell--12-col %visibility_class%">
+<div class="mdl-form__row mdl-cell mdl-cell--12-col mdl-form__row--height-auto %visibility_class%">
 	<div
 		class="mdl-form__control mdl-form__buttongrid mdl-grid"
 		data-control-type="buttons"
diff --git a/bundles/org.openhab.ui.basic/web-src/_layout.scss b/bundles/org.openhab.ui.basic/web-src/_layout.scss
index 9cba1af393..0fceebb73d 100644
--- a/bundles/org.openhab.ui.basic/web-src/_layout.scss
+++ b/bundles/org.openhab.ui.basic/web-src/_layout.scss
@@ -115,13 +115,6 @@
 			display: none;
 		}
 	}
-	&__row-buttongrid {
-		margin: 0;
-		border-bottom: 1px solid $item-separator-color;
-		&:last-child {
-			border: none;
-		}
-	}
 	&__image {
 		&.mdl-form__control {
 			padding-left: 0;
@@ -434,6 +427,8 @@
 	}
 	&__buttongrid {
 		padding: 0;
+		display: flex;
+		width: 100%;
 	}
 	&--no-label {
 		.mdl-form__title {
diff --git a/bundles/org.openhab.ui.basic/web-src/_theming.scss b/bundles/org.openhab.ui.basic/web-src/_theming.scss
index d40f818626..95451647d2 100644
--- a/bundles/org.openhab.ui.basic/web-src/_theming.scss
+++ b/bundles/org.openhab.ui.basic/web-src/_theming.scss
@@ -82,8 +82,7 @@ body {
 	color: var(--container-text-color, #616161) !important;
 }
 
-.mdl-form__row,
-.mdl-form__row-buttongrid {
+.mdl-form__row {
 	border-bottom: 1px solid #ccc;
 	border-bottom: 1px solid var(--border-color, #ccc);
 	color: #616161 !important;