diff --git a/apps/theming/lib/IconBuilder.php b/apps/theming/lib/IconBuilder.php
index fac8cad430..3819a2be4c 100644
--- a/apps/theming/lib/IconBuilder.php
+++ b/apps/theming/lib/IconBuilder.php
@@ -104,13 +104,20 @@ class IconBuilder {
 			$res = $tmp->getImageResolution();
 			$tmp->destroy();
 
+			if($x>$y) {
+				$max = $x;
+			} else {
+				$max = $y;
+			}
+
 			// convert svg to resized image
 			$appIconFile = new Imagick();
-			$resX = (int)(512 * $res['x'] / $x * 2.53);
-			$resY = (int)(512 * $res['y'] / $y * 2.53);
+			$resX = (int)(512 * $res['x'] / $max * 2.53);
+			$resY = (int)(512 * $res['y'] / $max * 2.53);
 			$appIconFile->setResolution($resX, $resY);
 			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
 			$appIconFile->readImageBlob($svg);
+			$appIconFile->scaleImage(512, 512, true);
 		} else {
 			$appIconFile = new Imagick();
 			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php
index e10870685a..2c34417212 100644
--- a/apps/theming/lib/ThemingDefaults.php
+++ b/apps/theming/lib/ThemingDefaults.php
@@ -157,8 +157,8 @@ class ThemingDefaults extends \OC_Defaults {
 	 */
 	public function shouldReplaceIcons() {
 		$cache = $this->cacheFactory->create('theming');
-		if($cache->hasKey('shouldReplaceIcons')) {
-			return (bool)$cache->get('shouldReplaceIcons');
+		if($value = $cache->get('shouldReplaceIcons')) {
+			return (bool)$value;
 		}
 		$value = false;
 		if(extension_loaded('imagick')) {