diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4182775..4efb03ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - On macOS, there's a ToggleSimpleFullscreen action which allows switching to
     fullscreen without occupying another space
 - A new window option `startup_mode` which controls how the window is created
+- `_NET_WM_ICON` property is set on X11 now, allowing for WMs to show icons in titlebars
 
 ### Changed
 
diff --git a/alacritty_terminal/Cargo.toml b/alacritty_terminal/Cargo.toml
index cda79c1b..8d9ca639 100644
--- a/alacritty_terminal/Cargo.toml
+++ b/alacritty_terminal/Cargo.toml
@@ -52,6 +52,8 @@ winapi = { version = "0.3.7", features = ["impl-default", "winuser", "synchapi",
 dirs = "1.0"
 widestring = "0.4"
 mio-anonymous-pipes = "0.1"
+
+[target.'cfg(not(target_os = "macos"))'.dependencies]
 image = "0.21.0"
 
 [target.'cfg(target_os = "macos")'.dependencies]
diff --git a/alacritty_terminal/src/window.rs b/alacritty_terminal/src/window.rs
index 89e455dc..a929a1b7 100644
--- a/alacritty_terminal/src/window.rs
+++ b/alacritty_terminal/src/window.rs
@@ -18,19 +18,20 @@ use crate::gl;
 use glutin::dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize};
 #[cfg(not(any(target_os = "macos", windows)))]
 use glutin::os::unix::EventsLoopExt;
-#[cfg(windows)]
+#[cfg(not(target_os = "macos"))]
 use glutin::Icon;
 use glutin::{
     self, ContextBuilder, ControlFlow, Event, EventsLoop, MouseCursor, PossiblyCurrent,
     WindowBuilder,
 };
-#[cfg(windows)]
+#[cfg(not(target_os = "macos"))]
 use image::ImageFormat;
 
 use crate::cli::Options;
 use crate::config::{Decorations, StartupMode, WindowConfig};
 
-#[cfg(windows)]
+// It's required to be in this directory due to the `windows.rc` file
+#[cfg(not(target_os = "macos"))]
 static WINDOW_ICON: &'static [u8] = include_bytes!("../../extra/windows/alacritty.ico");
 
 /// Default Alacritty name, used for window title and class.
@@ -288,12 +289,15 @@ impl Window {
             _ => true,
         };
 
+        let icon = Icon::from_bytes_with_format(WINDOW_ICON, ImageFormat::ICO);
+
         WindowBuilder::new()
             .with_title(title)
             .with_visibility(false)
             .with_transparency(true)
             .with_decorations(decorations)
             .with_maximized(window_config.startup_mode() == StartupMode::Maximized)
+            .with_window_icon(icon.ok())
             // X11
             .with_class(class.into(), DEFAULT_NAME.into())
             // Wayland
@@ -306,20 +310,20 @@ impl Window {
         _class: &str,
         window_config: &WindowConfig,
     ) -> WindowBuilder {
-        let icon = Icon::from_bytes_with_format(WINDOW_ICON, ImageFormat::ICO).unwrap();
-
         let decorations = match window_config.decorations() {
             Decorations::None => false,
             _ => true,
         };
 
+        let icon = Icon::from_bytes_with_format(WINDOW_ICON, ImageFormat::ICO);
+
         WindowBuilder::new()
             .with_title(title)
             .with_visibility(cfg!(windows))
             .with_decorations(decorations)
             .with_transparency(true)
             .with_maximized(window_config.startup_mode() == StartupMode::Maximized)
-            .with_window_icon(Some(icon))
+            .with_window_icon(icon.ok())
     }
 
     #[cfg(target_os = "macos")]