diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
index 3ca72b060f0e2..eaa8f892e28d7 100644
--- a/administrator/components/com_admin/script.php
+++ b/administrator/components/com_admin/script.php
@@ -1087,6 +1087,7 @@ public function deleteUnexistingFiles()
 			'/administrator/components/com_modules/controllers/module.php',
 			'/administrator/components/com_modules/controllers/modules.php',
 			'/administrator/components/com_modules/helpers/xml.php',
+			'/administrator/components/com_modules/layouts/toolbar/newmodule.php',
 			'/administrator/components/com_modules/models/fields/modulesmodule.php',
 			'/administrator/components/com_modules/models/fields/modulesposition.php',
 			'/administrator/components/com_modules/models/forms/advanced.xml',
diff --git a/administrator/components/com_modules/View/Modules/HtmlView.php b/administrator/components/com_modules/View/Modules/HtmlView.php
index de66f26a17f87..853af4a1d36d3 100644
--- a/administrator/components/com_modules/View/Modules/HtmlView.php
+++ b/administrator/components/com_modules/View/Modules/HtmlView.php
@@ -148,7 +148,7 @@ protected function addToolbar()
 		$user  = Factory::getUser();
 
 		// Get the toolbar object instance
-		$bar = Toolbar::getInstance('toolbar');
+		$toolbar = Toolbar::getInstance('toolbar');
 
 		if ($state->get('client_id') == 1)
 		{
@@ -161,52 +161,68 @@ protected function addToolbar()
 
 		if ($canDo->get('core.create'))
 		{
-			// Instantiate a new FileLayout instance and render the layout
-			$layout = new FileLayout('toolbar.newmodule');
+			$toolbar->standardButton('new', 'JTOOLBAR_NEW')
+				->onclick("location.href='index.php?option=com_modules&view=select'");
 
-			$bar->appendButton('Custom', $layout->render(array()), 'new');
+			$toolbar->standardButton('copy')
+				->text('JTOOLBAR_DUPLICATE')
+				->task('modules.duplicate')
+				->listCheck(true);
 		}
 
-		if ($canDo->get('core.create'))
+		if ($canDo->get('core.edit.state') || Factory::getUser()->authorise('core.admin'))
 		{
-			ToolbarHelper::custom('modules.duplicate', 'copy.png', 'copy_f2.png', 'JTOOLBAR_DUPLICATE', true);
-		}
+			$dropdown = $toolbar->dropdownButton('status-group')
+				->text('JTOOLBAR_CHANGE_STATUS')
+				->toggleSplit(false)
+				->icon('fa fa-globe')
+				->buttonClass('btn btn-info')
+				->listCheck(true);
 
-		if ($canDo->get('core.edit.state'))
-		{
-			ToolbarHelper::publish('modules.publish', 'JTOOLBAR_PUBLISH', true);
-			ToolbarHelper::unpublish('modules.unpublish', 'JTOOLBAR_UNPUBLISH', true);
-			ToolbarHelper::checkin('modules.checkin');
+			$childBar = $dropdown->getChildToolbar();
+
+			if ($canDo->get('core.edit.state'))
+			{
+				$childBar->publish('modules.publish')->listCheck(true);
+
+				$childBar->unpublish('modules.unpublish')->listCheck(true);
+			}
+
+			if (Factory::getUser()->authorise('core.admin'))
+			{
+				$childBar->checkin('modules.checkin')->listCheck(true);
+			}
+
+			if ($canDo->get('core.edit.state') && $this->state->get('filter.published') != -2)
+			{
+				$childBar->trash('modules.trash')->listCheck(true);
+			}
 		}
 
 		// Add a batch button
 		if ($user->authorise('core.create', 'com_modules') && $user->authorise('core.edit', 'com_modules')
 			&& $user->authorise('core.edit.state', 'com_modules'))
 		{
-			$title = Text::_('JTOOLBAR_BATCH');
-
-			// Instantiate a new FileLayout instance and render the batch button
-			$layout = new FileLayout('joomla.toolbar.batch');
-
-			$dhtml = $layout->render(array('title' => $title));
-			$bar->appendButton('Custom', $dhtml, 'batch');
+			$toolbar->popupButton('batch')
+				->text('JTOOLBAR_BATCH')
+				->selector('collapseModal')
+				->listCheck(true);
 		}
 
 		if ($state->get('filter.state') == -2 && $canDo->get('core.delete'))
 		{
-			ToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'modules.delete', 'JTOOLBAR_EMPTY_TRASH');
-		}
-		elseif ($canDo->get('core.edit.state'))
-		{
-			ToolbarHelper::trash('modules.trash');
+			$toolbar->delete('modules.delete')
+				->text('JTOOLBAR_EMPTY_TRASH')
+				->message('JGLOBAL_CONFIRM_DELETE')
+				->listCheck(true);
 		}
 
 		if ($canDo->get('core.admin'))
 		{
-			ToolbarHelper::preferences('com_modules');
+			$toolbar->preferences('com_modules');
 		}
 
-		ToolbarHelper::help('JHELP_EXTENSIONS_MODULE_MANAGER');
+		$toolbar->help('JHELP_EXTENSIONS_MODULE_MANAGER');
 
 		if (\JHtmlSidebar::getEntries())
 		{
diff --git a/administrator/components/com_modules/layouts/toolbar/newmodule.php b/administrator/components/com_modules/layouts/toolbar/newmodule.php
deleted file mode 100644
index 291a2833e3f98..0000000000000
--- a/administrator/components/com_modules/layouts/toolbar/newmodule.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_modules
- *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Language\Text;
-
-$text = Text::_('JTOOLBAR_NEW');
-?>
-<button onclick="location.href='index.php?option=com_modules&amp;view=select'" class="btn btn-sm btn-success" title="<?php echo $text; ?>">
-	<span class="icon-plus" aria-hidden="true"></span>
-	<?php echo $text; ?>
-</button>