diff --git a/components/com_config/tmpl/config/default.php b/components/com_config/tmpl/config/default.php
index 9e476dcbb5a9c..6952448da521a 100644
--- a/components/com_config/tmpl/config/default.php
+++ b/components/com_config/tmpl/config/default.php
@@ -24,36 +24,38 @@
 
 <form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="application-form" method="post" name="adminForm" class="form-validate">
 
-	<div class="row">
-		<!-- Begin Content -->
-
-		<div class="btn-toolbar" role="toolbar" aria-label="<?php echo JText::_('JTOOLBAR'); ?>">
-			<div class="btn-group">
-				<button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('config.apply')">
-					<span class="icon-ok"></span> <?php echo JText::_('JSAVE') ?>
-				</button>
-			</div>
-			<div class="btn-group">
-				<button type="button" class="btn" onclick="Joomla.submitbutton('config.cancel')">
-					<span class="icon-cancel"></span> <?php echo JText::_('JCANCEL') ?>
-				</button>
-			</div>
+	<div class="btn-toolbar" role="toolbar" aria-label="<?php echo JText::_('JTOOLBAR'); ?>">
+		<div class="btn-group mr-2">
+			<button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('config.apply')">
+				<span class="fa fa-check" aria-hidden="true"></span>
+				<?php echo JText::_('JSAVE') ?>
+			</button>
+		</div>
+		<div class="btn-group">
+			<button type="button" class="btn btn-danger" onclick="Joomla.submitbutton('config.cancel')">
+				<span class="fa fa-times" aria-hidden="true"></span>
+				<?php echo JText::_('JCANCEL') ?>
+			</button>
 		</div>
+	</div>
 
-		<hr>
+	<hr>
 
-		<div id="page-site" class="tab-pane active">
-			<div class="row">
+	<div id="page-site" class="tab-pane active">
+		<div class="row">
+			<div class="col-md-12">
 				<?php echo $this->loadTemplate('site'); ?>
-				<?php echo $this->loadTemplate('metadata'); ?>
+			</div>
+			<div class="col-md-12">
 				<?php echo $this->loadTemplate('seo'); ?>
 			</div>
+			<div class="col-md-12">
+				<?php echo $this->loadTemplate('metadata'); ?>
+			</div>
 		</div>
-
-		<input type="hidden" name="task" value="">
-		<?php echo JHtml::_('form.token'); ?>
-
-		<!-- End Content -->
 	</div>
 
+	<input type="hidden" name="task" value="">
+	<?php echo JHtml::_('form.token'); ?>
+
 </form>
diff --git a/components/com_config/tmpl/config/default_metadata.php b/components/com_config/tmpl/config/default_metadata.php
index 1441e9974d319..ed4ec04b0c762 100644
--- a/components/com_config/tmpl/config/default_metadata.php
+++ b/components/com_config/tmpl/config/default_metadata.php
@@ -9,16 +9,15 @@
 
 defined('_JEXEC') or die;
 ?>
-<fieldset class="form-horizontal">
+<fieldset>
+
 	<legend><?php echo JText::_('COM_CONFIG_METADATA_SETTINGS'); ?></legend>
-	<?php
-	foreach ($this->form->getFieldset('metadata') as $field) :
-	?>
+
+	<?php foreach ($this->form->getFieldset('metadata') as $field) : ?>
 		<div class="control-group">
 			<div class="control-label"><?php echo $field->label; ?></div>
 			<div class="controls"><?php echo $field->input; ?></div>
 		</div>
-	<?php
-	endforeach;
-	?>
+	<?php endforeach; ?>
+
 </fieldset>
diff --git a/components/com_config/tmpl/config/default_seo.php b/components/com_config/tmpl/config/default_seo.php
index 6327c0284d5e9..04013a2c84d95 100644
--- a/components/com_config/tmpl/config/default_seo.php
+++ b/components/com_config/tmpl/config/default_seo.php
@@ -9,16 +9,15 @@
 
 defined('_JEXEC') or die;
 ?>
-<fieldset class="form-horizontal">
+<fieldset>
+
 	<legend><?php echo JText::_('COM_CONFIG_SEO_SETTINGS'); ?></legend>
-	<?php
-	foreach ($this->form->getFieldset('seo') as $field) :
-	?>
+
+	<?php foreach ($this->form->getFieldset('seo') as $field) : ?>
 		<div class="control-group">
 			<div class="control-label"><?php echo $field->label; ?></div>
 			<div class="controls"><?php echo $field->input; ?></div>
 		</div>
-	<?php
-	endforeach;
-	?>
+	<?php endforeach; ?>
+
 </fieldset>
diff --git a/components/com_config/tmpl/config/default_site.php b/components/com_config/tmpl/config/default_site.php
index c50a3963d3c17..037029005aae7 100644
--- a/components/com_config/tmpl/config/default_site.php
+++ b/components/com_config/tmpl/config/default_site.php
@@ -8,18 +8,16 @@
  */
 
 defined('_JEXEC') or die;
-
 ?>
-<fieldset class="form-horizontal">
+<fieldset>
+
 	<legend><?php echo JText::_('COM_CONFIG_SITE_SETTINGS'); ?></legend>
-	<?php
-	foreach ($this->form->getFieldset('site') as $field) :
-	?>
+
+	<?php foreach ($this->form->getFieldset('site') as $field) : ?>
 		<div class="control-group">
 			<div class="control-label"><?php echo $field->label; ?></div>
 			<div class="controls"><?php echo $field->input; ?></div>
 		</div>
-	<?php
-	endforeach;
-	?>
+	<?php endforeach; ?>
+
 </fieldset>
diff --git a/components/com_config/tmpl/modules/default.php b/components/com_config/tmpl/modules/default.php
index f927b1877e3c6..a292a55aa4a5a 100644
--- a/components/com_config/tmpl/modules/default.php
+++ b/components/com_config/tmpl/modules/default.php
@@ -36,22 +36,22 @@
 	<div class="row">
 		<div class="col-md-12">
 
-			<div role="toolbar" aria-label="<?php echo JText::_('JTOOLBAR'); ?>">
-				<div class="btn-group">
+			<div class="btn-toolbar" role="toolbar" aria-label="<?php echo JText::_('JTOOLBAR'); ?>">
+				<div class="btn-group mr-2">
 					<button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('modules.apply')">
-						<span class="icon-apply"></span>
+						<span class="fa fa-check" aria-hidden="true"></span>
 						<?php echo JText::_('JAPPLY') ?>
 					</button>
 				</div>
-				<div class="btn-group">
+				<div class="btn-group mr-2">
 					<button type="button" class="btn btn-secondary" onclick="Joomla.submitbutton('modules.save')">
-						<span class="icon-save"></span>
+						<span class="fa fa-check" aria-hidden="true"></span>
 						<?php echo JText::_('JSAVE') ?>
 					</button>
 				</div>
 				<div class="btn-group">
 					<button type="button" class="btn btn-danger" onclick="Joomla.submitbutton('modules.cancel')">
-						<span class="icon-cancel"></span>
+						<span class="fa fa-times" aria-hidden="true"></span>
 						<?php echo JText::_('JCANCEL') ?>
 					</button>
 				</div>
@@ -100,8 +100,7 @@
 
 					<hr>
 
-					<?php
-					if (JFactory::getUser()->authorise('core.edit.state', 'com_modules.module.' . $this->item['id'])) : ?>
+					<?php if (JFactory::getUser()->authorise('core.edit.state', 'com_modules.module.' . $this->item['id'])) : ?>
 					<div class="control-group">
 						<div class="control-label">
 							<?php echo $this->form->getLabel('published'); ?>
diff --git a/components/com_config/tmpl/modules/default_positions.php b/components/com_config/tmpl/modules/default_positions.php
index dedc93787fce1..0fad7a00d4906 100644
--- a/components/com_config/tmpl/modules/default_positions.php
+++ b/components/com_config/tmpl/modules/default_positions.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;;
 
-JHtml::_('formbehavior.chosen', '#jform_position', null, array('disable_search_threshold' => 0 ));
+JHtml::_('formbehavior.chosen', '#jform_position', null, array('disable_search_threshold' => 0));
 
 // Add custom position to options
 $customGroupText = JText::_('COM_MODULES_CUSTOM_POSITION');
diff --git a/components/com_config/tmpl/templates/default.php b/components/com_config/tmpl/templates/default.php
index 7b981a07c483d..34dca456690db 100644
--- a/components/com_config/tmpl/templates/default.php
+++ b/components/com_config/tmpl/templates/default.php
@@ -25,34 +25,33 @@
 ?>
 
 <form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" method="post" name="adminForm" id="templates-form" class="form-validate">
-	<div class="row">
-
-		<div role="toolbar" aria-label="<?php echo JText::_('JTOOLBAR'); ?>">
-			<div class="btn-group">
-				<button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('templates.apply')">
-					<span class="icon-ok"></span>
-					<?php echo JText::_('JSAVE') ?>
-				</button>
-			</div>
-			<div class="btn-group">
-				<button type="button" class="btn btn-danger" onclick="Joomla.submitbutton('config.cancel')">
-					<span class="icon-cancel"></span>
-					<?php echo JText::_('JCANCEL') ?>
-				</button>
-			</div>
+
+	<div class="btn-toolbar" role="toolbar" aria-label="<?php echo JText::_('JTOOLBAR'); ?>">
+		<div class="btn-group mr-2">
+			<button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('templates.apply')">
+				<span class="fa fa-check" aria-hidden="true"></span>
+				<?php echo JText::_('JSAVE') ?>
+			</button>
+		</div>
+		<div class="btn-group">
+			<button type="button" class="btn btn-danger" onclick="Joomla.submitbutton('config.cancel')">
+				<span class="fa fa-times" aria-hidden="true"></span>
+				<?php echo JText::_('JCANCEL') ?>
+			</button>
 		</div>
+	</div>
 
-		<hr>
+	<hr>
 
-		<div id="page-site" class="tab-pane active">
-			<div class="row">
-				<?php // Get the menu parameters that are automatically set but may be modified.
-				echo $this->loadTemplate('options'); ?>
+	<div id="page-site" class="tab-pane active">
+		<div class="row">
+			<div class="col-md-12">
+				<?php echo $this->loadTemplate('options'); ?>
 			</div>
 		</div>
+	</div>
 
-		<input type="hidden" name="task" value="">
-		<?php echo JHtml::_('form.token'); ?>
+	<input type="hidden" name="task" value="">
+	<?php echo JHtml::_('form.token'); ?>
 
-	</div>
 </form>