diff --git a/ports/winit/build.rs b/ports/winit/build.rs
index 9da6e9e53bd..5c173598eaf 100644
--- a/ports/winit/build.rs
+++ b/ports/winit/build.rs
@@ -12,7 +12,7 @@ fn main() {
     #[cfg(windows)]
     {
         let mut res = winres::WindowsResource::new();
-        res.set_icon("../../resources/Servo.ico");
+        res.set_icon("../../resources/servo.ico");
         res.set_manifest_file("platform/windows/servo.exe.manifest");
         res.compile().unwrap();
     }
diff --git a/ports/winit/headed_window.rs b/ports/winit/headed_window.rs
index c4174551db7..4d306a79ad8 100644
--- a/ports/winit/headed_window.rs
+++ b/ports/winit/headed_window.rs
@@ -129,7 +129,7 @@ impl Window {
 
         #[cfg(any(target_os = "linux", target_os = "windows"))]
         {
-            let icon_bytes = include_bytes!("../../resources/servo64.png");
+            let icon_bytes = include_bytes!("../../resources/servo_64.png");
             winit_window.set_window_icon(Some(load_icon(icon_bytes)));
         }
 
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index e152c02683e..58ef42e68a1 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -739,7 +739,7 @@ class MachCommands(CommandBase):
                 # like Instruments.app.
                 try:
                     import Cocoa
-                    icon_path = path.join(self.get_top_dir(), "resources", "servo.png")
+                    icon_path = path.join(self.get_top_dir(), "resources", "servo_1024.png")
                     icon = Cocoa.NSImage.alloc().initWithContentsOfFile_(icon_path)
                     if icon is not None:
                         Cocoa.NSWorkspace.sharedWorkspace().setIcon_forFile_options_(icon,
diff --git a/resources/Servo.ico b/resources/Servo.ico
index 91df0b77c12..9272954736b 100644
Binary files a/resources/Servo.ico and b/resources/Servo.ico differ
diff --git a/resources/servo-100.png b/resources/servo-100.png
deleted file mode 100644
index 5ae47e5ddd6..00000000000
Binary files a/resources/servo-100.png and /dev/null differ
diff --git a/resources/servo-1000.png b/resources/servo-1000.png
deleted file mode 100644
index c0118ad5404..00000000000
Binary files a/resources/servo-1000.png and /dev/null differ
diff --git a/resources/servo-500.png b/resources/servo-500.png
deleted file mode 100644
index b86bc6338e0..00000000000
Binary files a/resources/servo-500.png and /dev/null differ
diff --git a/resources/servo-500-icon.ico b/resources/servo.ico
similarity index 100%
rename from resources/servo-500-icon.ico
rename to resources/servo.ico
diff --git a/resources/servo.png b/resources/servo.png
deleted file mode 100644
index e2e9b673d6b..00000000000
Binary files a/resources/servo.png and /dev/null differ
diff --git a/resources/servo64.png b/resources/servo64.png
deleted file mode 100644
index 3511b723c4f..00000000000
Binary files a/resources/servo64.png and /dev/null differ
diff --git a/resources/servo-1024.png b/resources/servo_1024.png
similarity index 100%
rename from resources/servo-1024.png
rename to resources/servo_1024.png
diff --git a/resources/servo-64.png b/resources/servo_64.png
similarity index 100%
rename from resources/servo-64.png
rename to resources/servo_64.png