diff --git a/Adwaita/resource/layout/login_dialog.layout b/Adwaita/resource/layout/login_dialog.layout
new file mode 100755
index 00000000..4925fed3
--- /dev/null
+++ b/Adwaita/resource/layout/login_dialog.layout
@@ -0,0 +1,41 @@
+"resource/layout/login_dialog.layout"
+{
+	controls
+	{
+		LoginDialog { controlname="Frame" title="#Steam_Login_Title" style="LoginDialog" }
+		HTMLRoot { controlname=HTML style="HTMLRoot" }
+	}
+
+	styles
+	{
+		LoginDialog
+		{
+			bgcolor="window_bg"
+		}
+
+		HTML
+		{
+			inset="1 1 1 1"
+			render_bg
+			{
+				0="fill( x0, y0, x1, y1, window_bg )"
+		    }
+		}
+	}
+
+	layout
+	{
+		region { name="root" y=0 x=0 width=max height=max }
+
+		place
+		{
+			control=HTMLRoot
+			region=root
+			x=0
+			y=26
+			width=max
+			height=max
+		}
+	}
+}
+
diff --git a/web_themes/base/10_login.css b/web_themes/base/10_login.css
index 7a980291..7b637ca9 100644
--- a/web_themes/base/10_login.css
+++ b/web_themes/base/10_login.css
@@ -160,40 +160,6 @@
 	outline: none !important;
 }
 
-/* Window Controls */
-#root [class*="login_CloseButton_"]
-{
-	background-color: var(--button_bg) !important;
-	border-radius: 50% !important;
-	height: 24px !important;
-	margin-left: 14px !important;
-	transition: var(--focus_transition) !important;
-	width: 24px !important;
-}
-
-#root [class*="login_CloseButton_"]:hover
-{
-	background-color: var(--button_hover_bg) !important;
-}
-
-#root [class*="login_CloseButton_"]:active
-{
-	background-color: var(--button_active_bg) !important;
-}
-
-#root [class*="login_CloseButton_"] > svg
-{
-	height: 10px !important;
-	margin-left: 7px !important;
-	margin-top: 5px !important;
-	width: 10px !important;
-}
-
-#root [class*="login_CloseButton_"] > svg > *
-{
-	stroke: var(--headerbar_fg) !important;
-}
-
 #root [class*="login_Login_"]
 {
 	height: 100% !important;