diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/ConfigureExtensionViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/ConfigureExtensionViewHelper.php
index 21d1900e814d1ac1c4eddecc2a34ddc76f45cbae..a436615e216ce223b4a02187d20c8c5cba2148cb 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/ConfigureExtensionViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/ConfigureExtensionViewHelper.php
@@ -13,6 +13,8 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
  *
  * The TYPO3 project - inspiring people to share!
  */
+use TYPO3\CMS\Backend\Utility\IconUtility;
+
 /**
  * View helper for configure extension link
  *
@@ -56,7 +58,7 @@ class ConfigureExtensionViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\Act
 			$this->tag->setContent($content);
 			$content = $this->tag->render();
 		} elseif ($forceConfiguration) {
-			$content = '';
+			$content = '<span class="btn disabled">' . IconUtility::getSpriteIcon('empty-empty') . '</span>';
 		}
 
 		return $content;
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionDataViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionDataViewHelper.php
index 8d1e372fe1c3b04938d3b2541e1a05df24913713..7327ecc65374f4011783af4de278c9f3a3ee9a27 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionDataViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionDataViewHelper.php
@@ -13,6 +13,8 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
  *
  * The TYPO3 project - inspiring people to share!
  */
+use TYPO3\CMS\Backend\Utility\IconUtility;
+
 /**
  * view helper for displaying a download extension data link
  *
@@ -35,7 +37,7 @@ class DownloadExtensionDataViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\
 	public function render($extension) {
 		$filePrefix = PATH_site . $extension['siteRelPath'];
 		if (!file_exists(($filePrefix . 'ext_tables.sql')) && !file_exists(($filePrefix . 'ext_tables_static+adt.sql'))) {
-			return '';
+			return '<span class="btn disabled">' . IconUtility::getSpriteIcon('empty-empty') . '</span>';
 		}
 		$uriBuilder = $this->controllerContext->getUriBuilder();
 		$uriBuilder->reset();
@@ -43,7 +45,7 @@ class DownloadExtensionDataViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\
 			'extension' => $extension['key']
 		), 'Action');
 		$this->tag->addAttribute('href', $uri);
-		$cssClass = 'downloadExtensionData';
+		$cssClass = 'downloadExtensionData btn';
 		$this->tag->addAttribute('class', $cssClass);
 		$this->tag->addAttribute('title', \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('extensionList.downloadsql', 'extensionmanager'));
 		$this->tag->setContent(\TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-system-extension-sqldump'));
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php
index a175221f1910120c21ddacf6d1a2affbfb06f3fb..f87a0a22de5dfa99b550cd2307e9d8f905f2d99a 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php
@@ -13,6 +13,8 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
  *
  * The TYPO3 project - inspiring people to share!
  */
+use TYPO3\CMS\Backend\Utility\IconUtility;
+
 /**
  * view helper for displaying a remove extension link
  *
@@ -34,13 +36,13 @@ class RemoveExtensionViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\Action
 	 */
 	public function render($extension) {
 		if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded($extension['key'])) {
-			return '';
+			return '<span class="btn disabled">' . IconUtility::getSpriteIcon('empty-empty') . '</span>';
 		}
 		if (
 			!in_array($extension['type'], \TYPO3\CMS\Extensionmanager\Domain\Model\Extension::returnAllowedInstallTypes()) ||
 			$extension['type'] === 'System'
 		) {
-			return '';
+			return '<span class="btn disabled">' . IconUtility::getSpriteIcon('empty-empty') . '</span>';
 		}
 		$uriBuilder = $this->controllerContext->getUriBuilder();
 		$action = 'removeExtension';
@@ -50,7 +52,7 @@ class RemoveExtensionViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\Action
 			'extension' => $extension['key']
 		), 'Action');
 		$this->tag->addAttribute('href', $uri);
-		$cssClass = 'removeExtension';
+		$cssClass = 'removeExtension btn';
 		$this->tag->addAttribute('class', $cssClass);
 		$this->tag->addAttribute('title', \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('extensionList.remove', 'extensionmanager'));
 		$this->tag->setContent(\TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-edit-delete'));
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/UpdateScriptViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/UpdateScriptViewHelper.php
index c21e79eaec6ec9def0554ad58937faea596f4482..78f0c8ae051af802bd12ce3ed41c27dce36cf8a3 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/UpdateScriptViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/UpdateScriptViewHelper.php
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
  *
  * The TYPO3 project - inspiring people to share!
  */
+use TYPO3\CMS\Backend\Utility\IconUtility;
 
 /**
  * View helper for update script link
@@ -57,6 +58,8 @@ class UpdateScriptViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\ActionVie
 			$this->tag->addAttribute('title', \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('extensionList.update.script', 'extensionmanager'));
 			$this->tag->setContent(\TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('extensions-extensionmanager-update-script'));
 			$tag = $this->tag->render();
+		} else {
+			return '<span class="btn disabled">' . IconUtility::getSpriteIcon('empty-empty') . '</span>';
 		}
 		return $tag;
 	}
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
index be7a798649c4bf6a9d031121f298348d442cae09..9fbbea1c72e900b2dec9acdeb27ade2b581acc23 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
@@ -87,13 +87,15 @@
 					{extension.version}
 				</td>
 				<td class="icons">
-					<em:processAvailableActions extension="{extension}">
-						<em:configureExtension extension="{extension}"><f:be.buttons.icon icon="actions-system-extension-configure" title="{f:translate(key:'extensionList.configure')}" /></em:configureExtension>
-						<em:updateScript extensionKey="{extension.key}" />
-						<em:removeExtension extension="{extension}" />
-						<f:be.buttons.icon uri="{f:uri.action(action:'downloadExtensionZip',controller:'Action',arguments:'{extension:extension.key}')}" icon="actions-system-extension-download" title="{f:translate(key:'extensionList.downloadzip')}"/>
-						<em:downloadExtensionData extension="{extension}" />
-					</em:processAvailableActions>
+					<div class="btn-group">
+						<em:processAvailableActions extension="{extension}">
+							<em:configureExtension class="btn" extension="{extension}"><f:be.buttons.icon icon="actions-system-extension-configure" title="{f:translate(key:'extensionList.configure')}" /></em:configureExtension>
+							<em:updateScript class="btn" extensionKey="{extension.key}" />
+							<em:removeExtension class="btn" extension="{extension}" />
+							<span class="btn"><f:be.buttons.icon uri="{f:uri.action(action:'downloadExtensionZip',controller:'Action',arguments:'{extension:extension.key}')}" icon="actions-system-extension-download" title="{f:translate(key:'extensionList.downloadzip')}"/></span>
+							<em:downloadExtensionData class="btn" extension="{extension}" />
+						</em:processAvailableActions>
+					</div>
 				</td>
 				<td class="state {extension.state}">
 					{extension.state}