diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php
index ca10fca57..bdd485087 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php
@@ -112,7 +112,9 @@ trait Themes
 				. "themes/{$sTheme}/";
 
 		if (\is_file($sThemeCSSFile)) {
-			$aResult[] = \preg_replace('/(url\(["\']?)(\\.)?([a-z])/', "\$1{$sBase}\$3", \str_replace('@{base}', $sBase, \file_get_contents($sThemeCSSFile)));
+			$aResult[] = \preg_replace('@(url\(["\']?)(\\./)?([a-z]+[^:a-z])@',
+				"\$1{$sBase}\$3",
+				\str_replace('@{base}', $sBase, \file_get_contents($sThemeCSSFile)));
 		} else if (\is_file($sThemeLessFile)) {
 			$aResult[] = "@base: \"{$sBase}\";";
 			$aResult[] = \file_get_contents($sThemeLessFile);
diff --git a/snappymail/v/0.0.0/themes/SquaresDark/styles.css b/snappymail/v/0.0.0/themes/SquaresDark/styles.css
index ece5e9d0b..1dc3b2370 100644
--- a/snappymail/v/0.0.0/themes/SquaresDark/styles.css
+++ b/snappymail/v/0.0.0/themes/SquaresDark/styles.css
@@ -147,3 +147,9 @@
 .tabs [id^="tab"]:checked + label {
 	color: #000;
 }
+
+.select, select {
+    background: #000 url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' height='10px' width='15px'><text x='0' y='10' fill='rgb(255,255,255)'>▾</text></svg>") right center/1em no-repeat border-box;
+    border: 1px solid #ccc;
+    color: #fff;
+}