diff --git a/data/index.html b/data/index.html
index 26177cb..aede861 100644
--- a/data/index.html
+++ b/data/index.html
@@ -40,17 +40,32 @@
                     <span>PSRAM: <span class="psram-percentage"></span> %</span>
                     <span>Uptime: <span class="uptime"></span></span>
 
-                    <button type="button" class="expand-status">Mehr</button>
+                    <button type="button" class="expand-status icon-button">
+                        <img src="/icons/open.svg" alt="Mehr" />
+                    </button>
                 </div>
 
                 <dialog class="dialog-status">
-                    <h2 class="model"></h2>
+                    <div class="dialog-header">
+                        <h2 class="model"></h2>
+                        <form method="dialog">
+                            <button type="submit" class="icon-button">
+                                <img src="/icons/close.svg" alt="Schließen" />
+                            </button>
+                        </form>
+                    </div>
 
                     <div class="dialog-status-content">
                         <div class="card">
                             <span>Signalstärke</span>
-                            <!-- placeholder for wifi icon -->
-                            <span><span class="rssi"></span> dBm</span>
+                            <span class="centered-vertical">
+                                <img
+                                    class="connection-icon small"
+                                    src=""
+                                    alt=""
+                                />
+                                <span><span class="rssi"></span> dBm</span>
+                            </span>
                         </div>
 
                         <div class="card">
@@ -108,10 +123,6 @@
                             <span class="sdk-version"></span>
                         </div>
                     </div>
-
-                    <form method="dialog">
-                        <button type="submit">Schließen</button>
-                    </form>
                 </dialog>
 
                 <form class="config">
diff --git a/data/style.css b/data/style.css
index c18fca5..365f982 100644
--- a/data/style.css
+++ b/data/style.css
@@ -168,6 +168,17 @@ dialog::backdrop {
     background-color: #000a;
 }
 
+.dialog-header {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+
+    & button {
+        margin: 0;
+    }
+}
+
 .card {
     background-color: var(--color-surface);
     padding: 8px;
@@ -297,14 +308,20 @@ div:has(.range-value) {
     gap: 8px;
 }
 
-.dialog-status button {
-    display: block;
-    margin: 0 auto;
-    margin-top: 32px;
-}
-
 .connection-icon {
     width: 24px;
     height: 24px;
     padding: 8px;
 }
+
+.connection-icon.small {
+    padding: 0;
+    height: 1em;
+}
+
+.centered-vertical {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 8px;
+}