diff --git a/components/com_config/tmpl/config/default.php b/components/com_config/tmpl/config/default.php
index cb496e69022..25dd2368888 100644
--- a/components/com_config/tmpl/config/default.php
+++ b/components/com_config/tmpl/config/default.php
@@ -20,20 +20,14 @@ HTMLHelper::_('script', 'com_config/config-default.js', ['version' => 'auto', 'r
 
 <form action="<?php echo Route::_('index.php?option=com_config'); ?>" id="application-form" method="post" name="adminForm" class="form-validate">
 
-	<div class="btn-toolbar" role="toolbar" aria-label="<?php echo Text::_('JTOOLBAR'); ?>">
-		<div class="btn-group">
-			<button type="button" class="btn btn-primary" data-submit-task="config.apply">
-				<span class="fas fa-check" aria-hidden="true"></span>
-				<?php echo Text::_('JSAVE') ?>
-			</button>
-		</div>
-		<div class="btn-group">
-			<button type="button" class="btn btn-danger" data-submit-task="config.cancel">
-				<span class="fas fa-times" aria-hidden="true"></span>
-				<?php echo Text::_('JCANCEL') ?>
-			</button>
-		</div>
-	</div>
+	<button type="button" class="btn btn-primary" data-submit-task="config.apply">
+		<span class="fas fa-check" aria-hidden="true"></span>
+		<?php echo Text::_('JSAVE') ?>
+	</button>
+	<button type="button" class="btn btn-danger" data-submit-task="config.cancel">
+		<span class="fas fa-times" aria-hidden="true"></span>
+		<?php echo Text::_('JCANCEL') ?>
+	</button>
 
 	<hr>
 
diff --git a/components/com_config/tmpl/modules/default.php b/components/com_config/tmpl/modules/default.php
index b7af5228823..6c393aecb17 100644
--- a/components/com_config/tmpl/modules/default.php
+++ b/components/com_config/tmpl/modules/default.php
@@ -46,20 +46,18 @@ if (Multilanguage::isEnabled())
 	<div class="row">
 		<div class="col-md-12">
 
-			<div role="toolbar" aria-label="<?php echo Text::_('JTOOLBAR'); ?>">
-				<button type="button" class="btn btn-primary" data-submit-task="modules.apply">
-					<span class="fas fa-check" aria-hidden="true"></span>
-					<?php echo Text::_('JAPPLY'); ?>
-				</button>
-				<button type="button" class="btn btn-secondary" data-submit-task="modules.save">
-					<span class="fas fa-check" aria-hidden="true"></span>
-					<?php echo Text::_('JSAVE'); ?>
-				</button>
-				<button type="button" class="btn btn-danger" data-submit-task="modules.cancel">
-					<span class="fas fa-times" aria-hidden="true"></span>
-					<?php echo Text::_('JCANCEL'); ?>
-				</button>
-			</div>
+			<button type="button" class="btn btn-primary" data-submit-task="modules.apply">
+				<span class="fas fa-check" aria-hidden="true"></span>
+				<?php echo Text::_('JAPPLY'); ?>
+			</button>
+			<button type="button" class="btn btn-secondary" data-submit-task="modules.save">
+				<span class="fas fa-check" aria-hidden="true"></span>
+				<?php echo Text::_('JSAVE'); ?>
+			</button>
+			<button type="button" class="btn btn-danger" data-submit-task="modules.cancel">
+				<span class="fas fa-times" aria-hidden="true"></span>
+				<?php echo Text::_('JCANCEL'); ?>
+			</button>
 
 			<hr>
 
diff --git a/components/com_config/tmpl/templates/default.php b/components/com_config/tmpl/templates/default.php
index 5cfe703b5df..b9f483e2e2f 100644
--- a/components/com_config/tmpl/templates/default.php
+++ b/components/com_config/tmpl/templates/default.php
@@ -23,20 +23,14 @@ HTMLHelper::_('script', 'com_config/templates-default.js', ['version' => 'auto',
 
 <form action="<?php echo Route::_('index.php?option=com_config'); ?>" method="post" name="adminForm" id="templates-form" class="form-validate">
 
-	<div class="btn-toolbar" role="toolbar" aria-label="<?php echo Text::_('JTOOLBAR'); ?>">
-		<div class="btn-group">
-			<button type="button" class="btn btn-primary" data-submit-task="templates.apply">
-				<span class="fas fa-check" aria-hidden="true"></span>
-				<?php echo Text::_('JSAVE') ?>
-			</button>
-		</div>
-		<div class="btn-group">
-			<button type="button" class="btn btn-danger" data-submit-task="templates.cancel">
-				<span class="fas fa-times" aria-hidden="true"></span>
-				<?php echo Text::_('JCANCEL') ?>
-			</button>
-		</div>
-	</div>
+	<button type="button" class="btn btn-primary" data-submit-task="templates.apply">
+		<span class="fas fa-check" aria-hidden="true"></span>
+		<?php echo Text::_('JSAVE') ?>
+	</button>
+	<button type="button" class="btn btn-danger" data-submit-task="templates.cancel">
+		<span class="fas fa-times" aria-hidden="true"></span>
+		<?php echo Text::_('JCANCEL') ?>
+	</button>
 
 	<hr>