diff --git a/catapult/window.py b/catapult/window.py
index e42a3b0..37afa62 100644
--- a/catapult/window.py
+++ b/catapult/window.py
@@ -102,11 +102,12 @@ def _init_plugins(self):
                 logging.exception(f"Failed to initialize {name}")
 
     def _init_properties(self):
+        # XXX: Not needed anymore? (GTK 4.10.4)
         # We seem to need 'csd' and/or 'ssd' here, otherwise we get
         # graphical glitches with the transparent window background.
         # https://docs.gtk.org/gtk4/class.Window.html#css-nodes
-        self.add_css_class("csd")
-        self.add_css_class("ssd")
+        # self.add_css_class("csd")
+        # self.add_css_class("ssd")
         self.add_css_class("catapult-window")
         self.set_icon_name("io.otsaloma.catapult")
         Gtk.Window.set_default_icon_name("io.otsaloma.catapult")
diff --git a/data/themes/dark.css b/data/themes/dark.css
index 5ec3a7a..bc9d89c 100644
--- a/data/themes/dark.css
+++ b/data/themes/dark.css
@@ -30,12 +30,9 @@
 .catapult-body {
   background-color: alpha(@bg-color, 0.9);
   border-radius: 12px;
+  box-shadow: 0 0 6px rgba(0, 0, 0, 0.3);
+  margin: 12px;
   padding: 12px 0 15px 0;
-
-  /* XXX: Causes an unavoidable light gray outside border. */
-  /* box-shadow: 0 0 6px rgba(0, 0, 0, 0.3); */
-  /* margin: 12px; */
-
 }
 
 .catapult-input-box {