diff --git a/bam.lua b/bam.lua
index fb03fe65b..0c953e849 100644
--- a/bam.lua
+++ b/bam.lua
@@ -110,6 +110,7 @@ nethash = CHash("src/game/generated/nethash.c", "src/engine/shared/protocol.h",
 
 client_link_other = {}
 client_depends = {}
+server_link_other = {}
 
 if family == "windows" then
 	table.insert(client_depends, CopyToDirectory(".", "other\\freetype\\lib\\freetype.dll"))
@@ -117,8 +118,10 @@ if family == "windows" then
 
 	if config.compiler.driver == "cl" then
 		client_link_other = {ResCompile("other/icons/teeworlds_cl.rc")}
+		server_link_other = {ResCompile("other/icons/teeworlds_srv_cl.rc")}
 	elseif config.compiler.driver == "gcc" then
 		client_link_other = {ResCompile("other/icons/teeworlds_gcc.rc")}
+		server_link_other = {ResCompile("other/icons/teeworlds_srv_gcc.rc")}
 	end
 end
 
@@ -240,7 +243,7 @@ function build(settings)
 		client_link_other, client_osxlaunch)
 
 	server_exe = Link(server_settings, "teeworlds_srv", engine, server,
-		game_shared, game_server, zlib)
+		game_shared, game_server, zlib, server_link_other)
 
 	serverlaunch = {}
 	if platform == "macosx" then
diff --git a/other/icons/Teeworlds_srv.ico b/other/icons/Teeworlds_srv.ico
new file mode 100644
index 000000000..ea41f39aa
Binary files /dev/null and b/other/icons/Teeworlds_srv.ico differ
diff --git a/other/icons/teeworlds_srv_cl.rc b/other/icons/teeworlds_srv_cl.rc
new file mode 100644
index 000000000..f7b046d92
--- /dev/null
+++ b/other/icons/teeworlds_srv_cl.rc
@@ -0,0 +1 @@
+50h ICON "Teeworlds_srv.ico"
diff --git a/other/icons/teeworlds_srv_gcc.rc b/other/icons/teeworlds_srv_gcc.rc
new file mode 100644
index 000000000..3b7c78a56
--- /dev/null
+++ b/other/icons/teeworlds_srv_gcc.rc
@@ -0,0 +1 @@
+ID ICON "Teeworlds_srv.ico"