diff --git a/src/controller/admin/management/settingController.ts b/src/controller/admin/management/settingController.ts
index 10d5dea..1a82b9a 100644
--- a/src/controller/admin/management/settingController.ts
+++ b/src/controller/admin/management/settingController.ts
@@ -70,13 +70,13 @@ export async function setSettings<K extends SettingString>(req: Request, res: Re
 export async function setImages(req: Request, res: Response): Promise<any> {
   if (req.files && !Array.isArray(req.files) && req.files.icon) {
     await SettingHelper.setSetting("club.icon", "configured");
-  } else {
+  } else if (req.body["club.icon"] != "keep") {
     await SettingHelper.resetSetting("club.icon");
   }
 
   if (req.files && !Array.isArray(req.files) && req.files.logo) {
     await SettingHelper.setSetting("club.logo", "configured");
-  } else {
+  } else if (req.body["club.logo"] != "keep") {
     await SettingHelper.resetSetting("club.logo");
   }
 
diff --git a/src/controller/publicController.ts b/src/controller/publicController.ts
index b608b3b..e48c008 100644
--- a/src/controller/publicController.ts
+++ b/src/controller/publicController.ts
@@ -130,10 +130,10 @@ export async function getApplicationLogo(req: Request, res: Response): Promise<a
     "Timing-Allow-Origin": "*",
   });
 
-  if (setLogo == "") {
-    res.sendFile(FileSystemHelper.readAssetFile("admin-logo.png", true));
-  } else {
+  if (setLogo != "" && FileSystemHelper.getFilesInDirectory("/app", ".png").includes("admin-icon.png")) {
     res.sendFile(FileSystemHelper.formatPath("/app/admin-logo.png"));
+  } else {
+    res.sendFile(FileSystemHelper.readAssetFile("admin-logo.png", true));
   }
 }
 
@@ -147,8 +147,8 @@ export async function getApplicationFavicon(req: Request, res: Response): Promis
   let icon = FileSystemHelper.readAssetFile("icon.png", true);
   let setLogo = SettingHelper.getSetting("club.icon");
 
-  if (setLogo != "") {
-    icon = FileSystemHelper.formatPath("/app/icon.png");
+  if (setLogo != "" && FileSystemHelper.getFilesInDirectory("/app", ".png").includes("admin-icon.png")) {
+    icon = FileSystemHelper.formatPath("/app/admin-icon.png");
   }
 
   let image = await sharp(icon)
@@ -184,8 +184,8 @@ export async function getApplicationIcon(req: Request, res: Response): Promise<a
   let icon = FileSystemHelper.readAssetFile("icon.png", true);
   let setLogo = SettingHelper.getSetting("club.icon");
 
-  if (setLogo != "") {
-    icon = FileSystemHelper.formatPath("/app/icon.png");
+  if (setLogo != "" && FileSystemHelper.getFilesInDirectory("/app", ".png").includes("admin-icon.png")) {
+    icon = FileSystemHelper.formatPath("/app/admin-icon.png");
   }
 
   let image = await sharp(icon)
diff --git a/src/middleware/multer.ts b/src/middleware/multer.ts
index c9bad44..ebcec4e 100644
--- a/src/middleware/multer.ts
+++ b/src/middleware/multer.ts
@@ -1,6 +1,7 @@
 import multer from "multer";
 import { FileSystemHelper } from "../helpers/fileSystemHelper";
 import path from "path";
+import BadRequestException from "../exceptions/badRequestException";
 
 export const clubImageStorage = multer.diskStorage({
   destination: FileSystemHelper.formatPath("/app"),
@@ -19,6 +20,13 @@ export const clubImageStorage = multer.diskStorage({
 
 export const clubImageMulter = multer({
   storage: clubImageStorage,
+  fileFilter(req, file, cb) {
+    if (file.mimetype.startsWith("image/png")) {
+      cb(null, true);
+    } else {
+      cb(new BadRequestException("Wrong file format"));
+    }
+  },
 });
 
 export const clubImageUpload = clubImageMulter.fields([