diff --git a/CMakeLists.txt b/CMakeLists.txt
index 574018350..9093b1af0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2547,6 +2547,7 @@ if(NOT DEV)
   install(FILES other/ddnet.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo COMPONENT client)
   foreach(SIZE 16 32 48 128 256 512)
     install(FILES other/icons/DDNet_${SIZE}x${SIZE}x32.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME ddnet.png COMPONENT client)
+    install(FILES other/icons/DDNet-Server_${SIZE}x${SIZE}x32.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME ddnet-server.png COMPONENT server)
   endforeach()
 endif()
 
diff --git a/other/icons/DDNet-Server.icns b/other/icons/DDNet-Server.icns
index 17819ef03..5762e3e8a 100644
Binary files a/other/icons/DDNet-Server.icns and b/other/icons/DDNet-Server.icns differ
diff --git a/other/icons/DDNet-Server.ico b/other/icons/DDNet-Server.ico
index f8bc71261..4a216aaea 100644
Binary files a/other/icons/DDNet-Server.ico and b/other/icons/DDNet-Server.ico differ
diff --git a/other/icons/DDNet-Server_16x16x32.png b/other/icons/DDNet-Server_16x16x32.png
new file mode 100644
index 000000000..1180d151b
Binary files /dev/null and b/other/icons/DDNet-Server_16x16x32.png differ
diff --git a/other/icons/DDNet-Server_256x256x32.png b/other/icons/DDNet-Server_256x256x32.png
new file mode 100644
index 000000000..7ce3abfbe
Binary files /dev/null and b/other/icons/DDNet-Server_256x256x32.png differ
diff --git a/other/icons/DDNet-Server_32x32x32.png b/other/icons/DDNet-Server_32x32x32.png
new file mode 100644
index 000000000..008d39db3
Binary files /dev/null and b/other/icons/DDNet-Server_32x32x32.png differ
diff --git a/other/icons/DDNet-Server_48x48x32.png b/other/icons/DDNet-Server_48x48x32.png
new file mode 100644
index 000000000..0e2069ffd
Binary files /dev/null and b/other/icons/DDNet-Server_48x48x32.png differ
diff --git a/other/icons/DDNet.icns b/other/icons/DDNet.icns
index bceebcadd..43d6321b0 100644
Binary files a/other/icons/DDNet.icns and b/other/icons/DDNet.icns differ
diff --git a/other/icons/DDNet.ico b/other/icons/DDNet.ico
index 305d12e3a..f4a461df5 100644
Binary files a/other/icons/DDNet.ico and b/other/icons/DDNet.ico differ
diff --git a/other/icons/DDNet_128x128x32.png b/other/icons/DDNet_128x128x32.png
deleted file mode 100644
index 760f41d78..000000000
Binary files a/other/icons/DDNet_128x128x32.png and /dev/null differ
diff --git a/other/icons/DDNet_16x16x32.png b/other/icons/DDNet_16x16x32.png
index f88034ed1..7658abc7c 100644
Binary files a/other/icons/DDNet_16x16x32.png and b/other/icons/DDNet_16x16x32.png differ
diff --git a/other/icons/DDNet_256x256x32.png b/other/icons/DDNet_256x256x32.png
index 0a6fc11f4..a0e8f2063 100644
Binary files a/other/icons/DDNet_256x256x32.png and b/other/icons/DDNet_256x256x32.png differ
diff --git a/other/icons/DDNet_32x32x32.png b/other/icons/DDNet_32x32x32.png
index 66f062b8c..e314cf2c6 100644
Binary files a/other/icons/DDNet_32x32x32.png and b/other/icons/DDNet_32x32x32.png differ
diff --git a/other/icons/DDNet_48x48x32.png b/other/icons/DDNet_48x48x32.png
index 87780dcea..11dc008e5 100644
Binary files a/other/icons/DDNet_48x48x32.png and b/other/icons/DDNet_48x48x32.png differ
diff --git a/other/icons/DDNet_512x512x32.png b/other/icons/DDNet_512x512x32.png
deleted file mode 100644
index 7954be2f9..000000000
Binary files a/other/icons/DDNet_512x512x32.png and /dev/null differ
diff --git a/other/icons/license.txt b/other/icons/license.txt
index ec332667a..cd7f8355f 100644
--- a/other/icons/license.txt
+++ b/other/icons/license.txt
@@ -1 +1 @@
-"DDNet-Server" icon is based on "Game Server" icon by Deepz from the Noun Project (Creative Commons CCBY)
\ No newline at end of file
+Icons by Ravie