diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
index b18cead98a808ef75a92644a1b03276561d422d1..d85159848f1291ec85029cef773aa9b6602910c5 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
@@ -46,21 +46,27 @@
 				</f:if>
 				<td>
 					<f:if condition="{extension.updateAvailable}">
-						<f:if condition="{extension.state} == 'excludeFromUpdates'">
-							<f:then>
-								<f:be.buttons.icon
-									icon="actions-system-extension-update-disabled"
-									title="{f:translate(key:'extensionList.updateDisabled')}"
-								/>
-							</f:then>
-							<f:else>
-								<f:be.buttons.icon
-									uri="{f:uri.action(action:'updateCommentForUpdatableVersions',controller:'Download',arguments:{extension:extension.key, integerVersion: extension.terObject.integerVersion},format:'json')}"
-									icon="actions-system-extension-update"
-									title="{f:translate(key:'extensionList.updateToVersion', arguments:{0:extension.updateToVersion.version})}"
-								/>
-							</f:else>
-						</f:if>
+						<div class="btn-group">
+							<f:if condition="{extension.state} == 'excludeFromUpdates'">
+								<f:then>
+									<span class="btn btn-default disabled">
+										<f:be.buttons.icon
+											icon="actions-system-extension-update"
+											title="{f:translate(key:'extensionList.updateDisabled')}"
+										/>
+									</span>
+								</f:then>
+								<f:else>
+									<span class="btn btn-default">
+										<f:be.buttons.icon
+											uri="{f:uri.action(action:'updateCommentForUpdatableVersions',controller:'Download',arguments:{extension:extension.key, integerVersion: extension.terObject.integerVersion},format:'json')}"
+											icon="actions-system-extension-update"
+											title="{f:translate(key:'extensionList.updateToVersion', arguments:{0:extension.updateToVersion.version})}"
+										/>
+									</span>
+								</f:else>
+							</f:if>
+						</div>
 					</f:if>
 				</td>
 				<td>
diff --git a/typo3/sysext/extensionmanager/Resources/Public/Images/Icons/ExtensionUpdateScript.png b/typo3/sysext/extensionmanager/Resources/Public/Images/Icons/ExtensionUpdateScript.png
deleted file mode 100644
index 0e1a712d5da7bbde78907b0ab9a8df73fed45065..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/extensionmanager/Resources/Public/Images/Icons/ExtensionUpdateScript.png and /dev/null differ
diff --git a/typo3/sysext/t3skin/Classes/Slot/IconStyleModifier.php b/typo3/sysext/t3skin/Classes/Slot/IconStyleModifier.php
index 91c21e40a656349c4f8d0375b47389fec772c53a..0ecb47117f94e55222e6ca899b63b8850bcea55e 100644
--- a/typo3/sysext/t3skin/Classes/Slot/IconStyleModifier.php
+++ b/typo3/sysext/t3skin/Classes/Slot/IconStyleModifier.php
@@ -77,6 +77,7 @@ class IconStyleModifier {
 		't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-download' => 'fa-download',
 		't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-install' => 'fa-plus-circle',
 		't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-sqldump' => 'fa-database',
+		't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-update' => 'fa-refresh',
 		't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-uninstall' => 'fa-minus-square',
 		't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-help-open' => 'fa-question-circle',
 		't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-list-open' => 'fa-list-alt',