diff --git a/scripts/inno/setup.iss b/scripts/inno/setup.iss
index a28be34..7848a73 100644
--- a/scripts/inno/setup.iss
+++ b/scripts/inno/setup.iss
@@ -4,6 +4,7 @@
 #define AppName "OpenStarbound"
 #define AppVersion "1.0"
 #define AppExeName "starbound.exe"
+#define AppServerExeName "starbound_server.exe"
 
 [Setup]
 SourceDir={#SourcePath}\..\..\
@@ -42,8 +43,12 @@ Source: "windows\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs creat
 Name: "{app}"; Permissions: users-modify
 
 [Icons]
-Name: "{autoprograms}\{#AppName}"; Filename: "{app}\{#AppExeName}"
-Name: "{autodesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Tasks: desktopicon
+; Client
+Name: "{autoprograms}\{#AppName}"; Filename: "{app}\win\{#AppExeName}"
+Name: "{autodesktop}\{#AppName}"; Filename: "{app}\win\{#AppExeName}"; Tasks: desktopicon
+; Server
+Name: "{autoprograms}\{#AppName} Server"; Filename: "{app}\win\{#AppServerExeName}"
+Name: "{autodesktop}\{#AppName} Server"; Filename: "{app}\win\{#AppServerExeName}"; Tasks: desktopicon
 
 [Run]
 Filename: "{app}\win\{#AppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(AppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
diff --git a/source/client/starbound-circle.ico b/source/client/starbound-circle.ico
new file mode 100644
index 0000000..113ddfa
Binary files /dev/null and b/source/client/starbound-circle.ico differ
diff --git a/source/client/starbound-largelogo.ico b/source/client/starbound-largelogo.ico
deleted file mode 100644
index 999d921..0000000
Binary files a/source/client/starbound-largelogo.ico and /dev/null differ
diff --git a/source/client/starbound.ico b/source/client/starbound.ico
index 999d921..68a0ee5 100644
Binary files a/source/client/starbound.ico and b/source/client/starbound.ico differ
diff --git a/source/client/starbound.rc b/source/client/starbound.rc
index 1295f41..1a7229e 100644
--- a/source/client/starbound.rc
+++ b/source/client/starbound.rc
@@ -1,19 +1,19 @@
 1 VERSIONINFO
-FILEVERSION     0,9,0,0
-PRODUCTVERSION  0,9,0,0
+FILEVERSION     1,0,0,0
+PRODUCTVERSION  1,0,0,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
     BLOCK "040904E4"
     BEGIN
       VALUE "CompanyName", "Chucklefish LTD"
-      VALUE "FileDescription", "Starbound"
-      VALUE "FileVersion", "0.9beta"
+      VALUE "FileDescription", "OpenStarbound"
+      VALUE "FileVersion", "1.0"
       VALUE "InternalName", "starbound"
       VALUE "LegalCopyright", "Chucklefish LTD"
       VALUE "OriginalFilename", "starbound.exe"
-      VALUE "ProductName", "Starbound"
-      VALUE "ProductVersion", "0.9beta"
+      VALUE "ProductName", "OpenStarbound"
+      VALUE "ProductVersion", "1.0"
     END
   END
 
@@ -22,4 +22,4 @@ BEGIN
     VALUE "Translation", 0x409, 1252
   END
 END
-icon ICON "starbound-largelogo.ico"
+icon ICON "starbound.ico"
diff --git a/source/server/CMakeLists.txt b/source/server/CMakeLists.txt
index 697aca3..b2ab4d1 100644
--- a/source/server/CMakeLists.txt
+++ b/source/server/CMakeLists.txt
@@ -19,9 +19,15 @@ SET (star_server_SOURCES
     main.cpp
   )
 
+IF (STAR_SYSTEM_WINDOWS)
+  SET (star_server_RESOURCES
+      starbound_server.rc
+    )
+ENDIF ()
+
 ADD_EXECUTABLE (starbound_server
   $<TARGET_OBJECTS:star_extern> $<TARGET_OBJECTS:star_core> $<TARGET_OBJECTS:star_base> $<TARGET_OBJECTS:star_game>
-  ${star_server_HEADERS} ${star_server_SOURCES})
+  ${star_server_HEADERS} ${star_server_SOURCES} ${star_server_RESOURCES})
 
 IF(STAR_PRECOMPILED_HEADERS)
   TARGET_PRECOMPILE_HEADERS (starbound_server REUSE_FROM star_core)
diff --git a/source/server/starbound_server.ico b/source/server/starbound_server.ico
new file mode 100644
index 0000000..74205c2
Binary files /dev/null and b/source/server/starbound_server.ico differ
diff --git a/source/server/starbound_server.rc b/source/server/starbound_server.rc
new file mode 100644
index 0000000..c6eb4f2
--- /dev/null
+++ b/source/server/starbound_server.rc
@@ -0,0 +1,25 @@
+1 VERSIONINFO
+FILEVERSION     1,0,0,0
+PRODUCTVERSION  1,0,0,0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    BEGIN
+      VALUE "CompanyName", "Chucklefish LTD"
+      VALUE "FileDescription", "OpenStarbound Server"
+      VALUE "FileVersion", "1.0"
+      VALUE "InternalName", "starbound_server"
+      VALUE "LegalCopyright", "Chucklefish LTD"
+      VALUE "OriginalFilename", "starbound_server.exe"
+      VALUE "ProductName", "OpenStarbound Server"
+      VALUE "ProductVersion", "1.0"
+    END
+  END
+
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x409, 1252
+  END
+END
+icon ICON "starbound_server.ico"