diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86863577d..fa53f3bf1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -295,7 +295,11 @@ if(CLIENT)
   )
 
   if(TARGET_OS STREQUAL "windows")
-    set(CLIENT_ICON "other/icons/DDNet.rc")
+    if(MSVC)
+      set(CLIENT_ICON "other/icons/DDNet_cl.rc")
+    else()
+      set(CLIENT_ICON "other/icons/DDNet_gcc.rc")
+    endif()
   else()
     set(CLIENT_ICON)
   endif()
@@ -333,7 +337,11 @@ file(GLOB_RECURSE GAME_SERVER "src/game/server/*.cpp" "src/game/server/*.h")
 set(GAME_GENERATED_SERVER "src/game/generated/server_data.cpp" "src/game/generated/server_data.h")
 set(SERVER_SRC ${ENGINE_SERVER} ${GAME_SERVER} ${GAME_GENERATED_SERVER})
 if(TARGET_OS STREQUAL "windows")
-  set(SERVER_ICON "other/icons/DDNet-Server.rc")
+  if(MSVC)
+    set(CLIENT_ICON "other/icons/DDNet-Server_cl.rc")
+  else()
+    set(CLIENT_ICON "other/icons/DDNet-Server_gcc.rc")
+  endif()
 else()
   set(SERVER_ICON)
 endif()
diff --git a/bam.lua b/bam.lua
index 5fcc72b55..01c55ca59 100644
--- a/bam.lua
+++ b/bam.lua
@@ -164,10 +164,10 @@ if family == "windows" then
 
 	if config.compiler.driver == "cl" then
 		client_link_other = {ResCompile("other/icons/DDNet_cl.rc")}
-		server_link_other = {ResCompile("other/icons/DDNet_srv_cl.rc")}
+		server_link_other = {ResCompile("other/icons/DDNet-Server_cl.rc")}
 	elseif config.compiler.driver == "gcc" then
 		client_link_other = {ResCompile("other/icons/DDNet_gcc.rc")}
-		server_link_other = {ResCompile("other/icons/DDNet_srv_gcc.rc")}
+		server_link_other = {ResCompile("other/icons/DDNet-Server_gcc.rc")}
 	end
 end
 
diff --git a/other/icons/DDNet_srv_cl.rc b/other/icons/DDNet-Server_cl.rc
similarity index 100%
rename from other/icons/DDNet_srv_cl.rc
rename to other/icons/DDNet-Server_cl.rc
diff --git a/other/icons/DDNet_srv_gcc.rc b/other/icons/DDNet-Server_gcc.rc
similarity index 100%
rename from other/icons/DDNet_srv_gcc.rc
rename to other/icons/DDNet-Server_gcc.rc