diff --git a/administrator/components/com_templates/View/Styles/HtmlView.php b/administrator/components/com_templates/View/Styles/HtmlView.php
index a99c08b9689f2..a3479462b5a25 100644
--- a/administrator/components/com_templates/View/Styles/HtmlView.php
+++ b/administrator/components/com_templates/View/Styles/HtmlView.php
@@ -16,6 +16,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 
 /**
@@ -109,6 +110,9 @@ protected function addToolbar()
 	{
 		$canDo = ContentHelper::getActions('com_templates');
 
+		// Get the toolbar object instance
+		$toolbar = Toolbar::getInstance('toolbar');
+
 		// Set the title.
 		if ((int) $this->get('State')->get('client_id') === 1)
 		{
@@ -121,28 +125,35 @@ protected function addToolbar()
 
 		if ($canDo->get('core.edit.state'))
 		{
-			ToolbarHelper::makeDefault('styles.setDefault', 'COM_TEMPLATES_TOOLBAR_SET_HOME');
-			ToolbarHelper::divider();
+			$toolbar->confirmButton('default')
+				->text('COM_TEMPLATES_TOOLBAR_SET_HOME')
+				->message('COM_TEMPLATES_TOOLBAR_CONFIRM_SET_DEFAULT')
+				->task('styles.setDefault')
+				->listCheck(true);
 		}
 
 		if ($canDo->get('core.create'))
 		{
-			ToolbarHelper::custom('styles.duplicate', 'copy.png', 'copy_f2.png', 'JTOOLBAR_DUPLICATE', true);
-			ToolbarHelper::divider();
+			$toolbar->standardButton('copy')
+				->text('JTOOLBAR_DUPLICATE')
+				->task('styles.duplicate')
+				->listCheck(true);
 		}
 
 		if ($canDo->get('core.delete'))
 		{
-			ToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'styles.delete', 'JTOOLBAR_DELETE');
-			ToolbarHelper::divider();
+			$toolbar->confirmButton('delete')
+				->text('JTOOLBAR_DELETE')
+				->message('JGLOBAL_CONFIRM_DELETE')
+				->task('styles.delete')
+				->listCheck(true);
 		}
 
 		if ($canDo->get('core.admin') || $canDo->get('core.options'))
 		{
-			ToolbarHelper::preferences('com_templates');
-			ToolbarHelper::divider();
+			$toolbar->preferences('com_templates');
 		}
 
-		ToolbarHelper::help('JHELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES');
+		$toolbar->help('JHELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES');
 	}
 }
diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index df5c64bdfe3d8..a6244284c422c 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -228,6 +228,7 @@ COM_TEMPLATES_TEMPLATE_PREVIEW="Preview"
 COM_TEMPLATES_TEMPLATES_FILTER_SEARCH_DESC="Search in template name or folder name."
 COM_TEMPLATES_TEMPLATES_TABLE_CAPTION="Table of Templates"
 COM_TEMPLATES_TOGGLE_FULL_SCREEN="Press Ctrl-Q to toggle Full Screen editing."
+COM_TEMPLATES_TOOLBAR_CONFIRM_SET_DEFAULT="Before confirming, please make sure you have selected a single template style to set as default."
 COM_TEMPLATES_TOOLBAR_SET_HOME="Default"
 COM_TEMPLATES_N_CONFLICT="%d Changes found"
 COM_TEMPLATES_N_CONFLICT_1="Change found"