diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php
index b7e783b9cd..241f88dde6 100644
--- a/apps/theming/lib/Controller/ThemingController.php
+++ b/apps/theming/lib/Controller/ThemingController.php
@@ -285,13 +285,17 @@ class ThemingController extends Controller {
 			// either to big or are not progressive rendering.
 			$newImage = @imagecreatefromstring(file_get_contents($image['tmp_name'], 'r'));
 
+			// Preserve transparency
+			imagesavealpha($newImage, true);
+			imagealphablending($newImage, true);
+
 			$tmpFile = $this->tempManager->getTemporaryFile();
 			$newWidth = imagesx($newImage) < 4096 ? imagesx($newImage) : 4096;
 			$newHeight = imagesy($newImage) / (imagesx($newImage) / $newWidth);
 			$outputImage = imagescale($newImage, $newWidth, $newHeight);
 
 			imageinterlace($outputImage, 1);
-			imagejpeg($outputImage, $tmpFile, 75);
+			imagepng($outputImage, $tmpFile, 8);
 			imagedestroy($outputImage);
 
 			$target->putContent(file_get_contents($tmpFile, 'r'));