diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/SvgTree.js b/typo3/sysext/backend/Resources/Public/JavaScript/SvgTree.js
index 22425bd225346b981358aaf240ab2fc1fad23703..bc8bd7cbffa05d67adbeafba7fa620f7fa6a6786 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/SvgTree.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/SvgTree.js
@@ -608,11 +608,6 @@ define(
           Icons.getIcon(iconName, Icons.sizes.small, null, null, 'inline').then(function(icon) {
             var result = icon.match(/<svg[\s\S]*<\/svg>/i);
 
-            // Check if the icon is from the Bitmap Icon Provider (see PHP class for the inline rendering)
-            if (!result) {
-              result = icon.match(/<image[\s\S]*\/>/i);
-            }
-
             if (result) {
               _this.data.icons[iconName].icon = result[0];
             }
diff --git a/typo3/sysext/core/Classes/Imaging/IconProvider/BitmapIconProvider.php b/typo3/sysext/core/Classes/Imaging/IconProvider/BitmapIconProvider.php
index e018ba2295756d94f2b6a7b9dd9ab4723014d5b0..8600ead6e0bb3135ccf8d92f1de23268a4ee23a6 100644
--- a/typo3/sysext/core/Classes/Imaging/IconProvider/BitmapIconProvider.php
+++ b/typo3/sysext/core/Classes/Imaging/IconProvider/BitmapIconProvider.php
@@ -81,7 +81,11 @@ class BitmapIconProvider implements IconProviderInterface
             return '';
         }
 
-        return '<image width="' . $icon->getDimension()->getWidth() . '" height="'
-            . $icon->getDimension()->getHeight() . '" xlink:href="' . PathUtility::getAbsoluteWebPath($source) . '"/>';
+        return sprintf(
+            '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 %1$d %2$d" width="%1$d" height="%2$d"><image width="%1$d" height="%1$d" xlink:href="%3$s"/></svg>',
+            $icon->getDimension()->getWidth(),
+            $icon->getDimension()->getHeight(),
+            PathUtility::getAbsoluteWebPath($source)
+        );
     }
 }