diff --git a/core/css/icons.scss b/core/css/icons.scss
index e450097e3f9..27863f017f4 100644
--- a/core/css/icons.scss
+++ b/core/css/icons.scss
@@ -396,7 +396,7 @@ img, object, video, button, textarea, input, select, div[contenteditable='true']
 }
 
 .icon-star-dark {
-	@include icon-color('star-dark', 'actions', $color-black, 1, true);
+	@include icon-color('star', 'actions', $color-black, 1, true);
 }
 
 .icon-starred {
diff --git a/lib/private/Template/IconsCacher.php b/lib/private/Template/IconsCacher.php
index a8dacfcfbc0..5e5e0fda50b 100644
--- a/lib/private/Template/IconsCacher.php
+++ b/lib/private/Template/IconsCacher.php
@@ -46,7 +46,7 @@ class IconsCacher {
 	protected $urlGenerator;
 
 	/** @var string */
-	private $iconVarRE = '/--(icon-[a-z0-9-]+): url\(["\']([a-z0-9-\/]+)[^;]+;/m';
+	private $iconVarRE = '/--(icon-[a-z0-9-]+): url\(["\']([a-z0-9-_\~\/\?\&\=\.]+)[^;]+;/m';
 
 	/** @var string */
 	private $fileName = 'icons-vars.css';