diff --git a/administrator/components/com_menus/tmpl/menus/default.php b/administrator/components/com_menus/tmpl/menus/default.php
index 09d4e4a71bbce..beb0b25a04071 100644
--- a/administrator/components/com_menus/tmpl/menus/default.php
+++ b/administrator/components/com_menus/tmpl/menus/default.php
@@ -151,7 +151,7 @@
 								<td class="text-center d-none d-lg-table-cell itemnumber">
 									<?php if (isset($this->modules[$item->menutype])) : ?>
 										<div class="dropdown">
-											<button type="button" class="btn btn-secondary btn-sm dropdown-toggle"  data-bs-toggle="dropdown">
+											<button type="button" class="btn btn-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown">
 												<?php echo Text::_('COM_MENUS_MODULES'); ?>
 												<span class="caret"></span>
 											</button>
diff --git a/administrator/components/com_modules/tmpl/module/edit_assignment.php b/administrator/components/com_modules/tmpl/module/edit_assignment.php
index 7a60303d1c541..9373390ed1f83 100644
--- a/administrator/components/com_modules/tmpl/module/edit_assignment.php
+++ b/administrator/components/com_modules/tmpl/module/edit_assignment.php
@@ -133,7 +133,7 @@
 				<div class="hidden" id="treeselectmenu">
 					<div class="nav-hover treeselect-menu">
 						<div class="dropdown">
-							<button type="button"  data-bs-toggle="dropdown" class="dropdown-toggle btn btn-sm btn-light">
+							<button type="button" data-bs-toggle="dropdown" class="dropdown-toggle btn btn-sm btn-light">
 								<span class="caret"></span>
 								<span class="visually-hidden"><?php echo Text::sprintf('JGLOBAL_TOGGLE_DROPDOWN'); ?></span>
 							</button>
diff --git a/administrator/components/com_users/tmpl/users/default.php b/administrator/components/com_users/tmpl/users/default.php
index 4d65a2aea2f30..e2e7fc13fad95 100644
--- a/administrator/components/com_users/tmpl/users/default.php
+++ b/administrator/components/com_users/tmpl/users/default.php
@@ -118,7 +118,7 @@
 									<div class="btn-group">
 										<?php echo HTMLHelper::_('users.addNote', $item->id); ?>
 										<?php if ($item->note_count > 0) : ?>
-										<button type="button" class="btn btn-secondary btn-sm dropdown-toggle dropdown-toggle-split"  data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+										<button type="button" class="btn btn-secondary btn-sm dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 											<span class="visually-hidden"><?php echo Text::_('JGLOBAL_TOGGLE_DROPDOWN'); ?></span>
 										</button>
 										<div class="dropdown-menu">
diff --git a/administrator/components/com_workflow/tmpl/transition/edit.php b/administrator/components/com_workflow/tmpl/transition/edit.php
index 89499552a610a..e3a43356d5151 100644
--- a/administrator/components/com_workflow/tmpl/transition/edit.php
+++ b/administrator/components/com_workflow/tmpl/transition/edit.php
@@ -31,7 +31,7 @@
 
 ?>
 
-<form action="<?php echo Route::_('index.php?option=com_workflow&view=transition&workflow_id=' . $this->workflowID . '&extension=' . $this->input->getCmd('extension') . '&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="workflow-form"  aria-label="<?php echo Text::_('COM_WORKFLOW_TRANSITION_FORM_' . ( (int) $this->item->id === 0 ? 'NEW' : 'EDIT'), true); ?>" class="form-validate">
+<form action="<?php echo Route::_('index.php?option=com_workflow&view=transition&workflow_id=' . $this->workflowID . '&extension=' . $this->input->getCmd('extension') . '&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="workflow-form" aria-label="<?php echo Text::_('COM_WORKFLOW_TRANSITION_FORM_' . ( (int) $this->item->id === 0 ? 'NEW' : 'EDIT'), true); ?>" class="form-validate">
 	<div>
 		<?php echo LayoutHelper::render('joomla.edit.title_alias', $this); ?>
 
diff --git a/administrator/modules/mod_menu/tmpl/default_submenu.php b/administrator/modules/mod_menu/tmpl/default_submenu.php
index 6da1885f3a7f4..d2cfd98caf4a1 100644
--- a/administrator/modules/mod_menu/tmpl/default_submenu.php
+++ b/administrator/modules/mod_menu/tmpl/default_submenu.php
@@ -73,7 +73,7 @@
 
 	if ($current->level > 2)
 	{
-		$dataToggle  = '  data-bs-toggle="dropdown"';
+		$dataToggle  = ' data-bs-toggle="dropdown"';
 	}
 }
 else
diff --git a/administrator/modules/mod_user/tmpl/default.php b/administrator/modules/mod_user/tmpl/default.php
index e8d4e27066434..b850bbeb6ad17 100644
--- a/administrator/modules/mod_user/tmpl/default.php
+++ b/administrator/modules/mod_user/tmpl/default.php
@@ -21,7 +21,7 @@
 $hideLinks = $app->input->getBool('hidemainmenu');
 ?>
 <div class="header-item-content dropdown header-profile d-flex">
-	<button class="dropdown-toggle d-flex flex-column align-items-stretch <?php echo ($hideLinks ? 'disabled' : ''); ?>"  data-bs-toggle="dropdown" type="button" <?php echo ($hideLinks ? 'disabled' : ''); ?>
+	<button class="dropdown-toggle d-flex flex-column align-items-stretch <?php echo ($hideLinks ? 'disabled' : ''); ?>" data-bs-toggle="dropdown" type="button" <?php echo ($hideLinks ? 'disabled' : ''); ?>
 		title="<?php echo Text::_('MOD_USER_MENU'); ?>">
 		<div class="d-flex align-items-end mx-auto">
 			<span class="icon-user-circle" aria-hidden="true"></span>
diff --git a/administrator/templates/atum/html/layouts/chromes/body.php b/administrator/templates/atum/html/layouts/chromes/body.php
index 4506d48b34b47..58767ae365df6 100644
--- a/administrator/templates/atum/html/layouts/chromes/body.php
+++ b/administrator/templates/atum/html/layouts/chromes/body.php
@@ -45,7 +45,7 @@
 		<?php if ($canEdit || $canChange) : ?>
 			<?php $dropdownPosition = Factory::getLanguage()->isRTL() ? 'start' : 'end'; ?>
 			<div class="module-actions dropdown">
-				<button type="button"  data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn" id="dropdownMenuButton-<?php echo $id; ?>">
+				<button type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn" id="dropdownMenuButton-<?php echo $id; ?>">
 					<span class="icon-cog" aria-hidden="true"></span>
 					<span class="visually-hidden"><?php echo Text::sprintf('JACTION_EDIT_MODULE', $module->title); ?></span>
 				</button>
diff --git a/administrator/templates/atum/html/layouts/chromes/well.php b/administrator/templates/atum/html/layouts/chromes/well.php
index ab0cef50c86b9..ba60b79b969a6 100644
--- a/administrator/templates/atum/html/layouts/chromes/well.php
+++ b/administrator/templates/atum/html/layouts/chromes/well.php
@@ -50,7 +50,7 @@
 				<?php if ($canEdit || $canChange) : ?>
 					<?php $dropdownPosition = Factory::getLanguage()->isRTL() ? 'start' : 'end'; ?>
 					<div class="module-actions dropdown">
-						<button type="button"  data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn" id="dropdownMenuButton-<?php echo $id; ?>">
+						<button type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn" id="dropdownMenuButton-<?php echo $id; ?>">
 							<span class="icon-cog" aria-hidden="true"></span>
 							<span class="visually-hidden"><?php echo Text::sprintf('JACTION_EDIT_MODULE', $module->title); ?></span>
 						</button>
diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php
index 2dba1f48635e3..1457a79e78844 100644
--- a/administrator/templates/atum/login.php
+++ b/administrator/templates/atum/login.php
@@ -99,7 +99,7 @@
 			<div class="d-flex align-items-center">
 				<div class="logo">
 					<img src="<?php echo $logoBrandLarge; ?>" <?php echo $logoBrandLargeAlt; ?>>
-					<img class="logo-collapsed" src="<?php echo $logoBrandSmall; ?>"  <?php echo $logoBrandSmallAlt; ?>>
+					<img class="logo-collapsed" src="<?php echo $logoBrandSmall; ?>" <?php echo $logoBrandSmallAlt; ?>>
 				</div>
 			</div>
 			<jdoc:include type="modules" name="title" />
diff --git a/libraries/src/Form/Field/ModulepositionField.php b/libraries/src/Form/Field/ModulepositionField.php
index 2ede2dbe4c849..5813e6441d277 100644
--- a/libraries/src/Form/Field/ModulepositionField.php
+++ b/libraries/src/Form/Field/ModulepositionField.php
@@ -154,8 +154,8 @@ protected function getInput()
 		// The current user display field.
 		$html[] = '<div class="input-append">';
 		$html[] = parent::getInput()
-			. '<a class="btn" title="' . Text::_('COM_MODULES_CHANGE_POSITION_TITLE') . '"  href="' . $link
-			. '"  data-bs-toggle="modal" data-bs-target="#modulePositionModal">'
+			. '<a class="btn" title="' . Text::_('COM_MODULES_CHANGE_POSITION_TITLE') . '" href="' . $link
+			. '" data-bs-toggle="modal" data-bs-target="#modulePositionModal">'
 			. Text::_('COM_MODULES_CHANGE_POSITION_BUTTON') . '</a>';
 
 		$html[] = HTMLHelper::_(
diff --git a/libraries/src/HTML/Helpers/ActionsDropdown.php b/libraries/src/HTML/Helpers/ActionsDropdown.php
index 917d8f9ad0dfa..08f0b40ae882a 100644
--- a/libraries/src/HTML/Helpers/ActionsDropdown.php
+++ b/libraries/src/HTML/Helpers/ActionsDropdown.php
@@ -40,7 +40,7 @@ public static function render($item = '')
 	{
 		$html = array();
 
-		$html[] = '<button  data-bs-toggle="dropdown" class="dropdown-toggle btn btn-sm btn-secondary">';
+		$html[] = '<button data-bs-toggle="dropdown" class="dropdown-toggle btn btn-sm btn-secondary">';
 		$html[] = '<span class="caret"></span>';
 
 		if ($item)
diff --git a/libraries/src/HTML/Helpers/Dropdown.php b/libraries/src/HTML/Helpers/Dropdown.php
index ba764fe373881..ba94079e24489 100644
--- a/libraries/src/HTML/Helpers/Dropdown.php
+++ b/libraries/src/HTML/Helpers/Dropdown.php
@@ -95,7 +95,7 @@ public static function start()
 		}
 
 		$dropDownList = '<div class="btn-group" style="margin-left:6px;display:none">
-							<a href="#"  data-bs-toggle="dropdown" class="dropdown-toggle btn btn-secondary btn-sm">
+							<a href="#" data-bs-toggle="dropdown" class="dropdown-toggle btn btn-secondary btn-sm">
 								<span class="caret"></span>
 							</a>
 							<ul class="dropdown-menu">';
diff --git a/modules/mod_languages/tmpl/default.php b/modules/mod_languages/tmpl/default.php
index 7d439589744f2..6de0194133bd1 100644
--- a/modules/mod_languages/tmpl/default.php
+++ b/modules/mod_languages/tmpl/default.php
@@ -71,7 +71,7 @@
 		</ul>
 	</div>
 <?php else : ?>
-	<ul class="mod-languages__list <?php echo $params->get('inline', 1) ? 'lang-inline' : 'lang-block'; ?>"  dir="<?php echo $app->getLanguage()->isRtl() ? 'rtl' : 'ltr'; ?>">
+	<ul class="mod-languages__list <?php echo $params->get('inline', 1) ? 'lang-inline' : 'lang-block'; ?>" dir="<?php echo $app->getLanguage()->isRtl() ? 'rtl' : 'ltr'; ?>">
 	<?php foreach ($list as $language) : ?>
 		<?php if (!$language->active) : ?>
 			<li>