diff --git a/LANCommander.Launcher/Views/MainWindow.axaml b/LANCommander.Launcher/Views/MainWindow.axaml
index f94a22f8..74886613 100644
--- a/LANCommander.Launcher/Views/MainWindow.axaml
+++ b/LANCommander.Launcher/Views/MainWindow.axaml
@@ -118,11 +118,29 @@
                              VerticalAlignment="Center" />
             </Border>
 
-            <!-- Profile button (visible only when shell is active) -->
+            <!-- Profile button + offline indicator (visible only when shell is active) -->
             <Border Grid.Column="4"
                     IsVisible="{Binding IsShellActive}"
                     Padding="0,0,4,0"
                     VerticalAlignment="Center">
+              <StackPanel Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
+
+                <!-- Offline Mode indicator: the whole button reconnects when clicked.
+                     Only shown while offline. -->
+                <Button Command="{Binding ShellViewModel.TryGoOnlineCommand}"
+                        IsEnabled="{Binding ShellViewModel.CanGoOnline}"
+                        IsVisible="{Binding ShellViewModel.IsOfflineMode}"
+                        Background="#4A2D00"
+                        BorderThickness="0"
+                        Padding="10,4"
+                        VerticalAlignment="Center"
+                        ToolTip.Tip="Offline Mode — click to reconnect">
+                    <StackPanel Orientation="Horizontal" Spacing="6">
+                        <TextBlock Text="⚠" Foreground="#FFA500" VerticalAlignment="Center" />
+                        <TextBlock Text="Offline Mode" Foreground="#FFA500" FontSize="12" FontWeight="SemiBold" VerticalAlignment="Center" />
+                    </StackPanel>
+                </Button>
+
                 <Button Classes="Primary"
                         Padding="8,4">
                     <Button.Flyout>
@@ -171,6 +189,8 @@
                                    FontSize="13" />
                     </StackPanel>
                 </Button>
+
+              </StackPanel>
             </Border>
 
             <!-- Window Controls (hidden in big screen mode) -->
diff --git a/LANCommander.Launcher/Views/ShellView.axaml b/LANCommander.Launcher/Views/ShellView.axaml
index 68256b62..3066b6ce 100644
--- a/LANCommander.Launcher/Views/ShellView.axaml
+++ b/LANCommander.Launcher/Views/ShellView.axaml
@@ -161,7 +161,7 @@
                         </Grid>
                     </Button>
 
-                    <!-- Idle: always-visible downloads button + optional offline badge -->
+                    <!-- Idle: always-visible downloads button -->
                     <StackPanel Orientation="Horizontal"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
@@ -183,23 +183,6 @@
                             </StackPanel>
                         </Button>
 
-                        <Border IsVisible="{Binding IsOfflineMode}"
-                                Padding="10,4"
-                                CornerRadius="4"
-                                Background="#4A2D00">
-                            <StackPanel Orientation="Horizontal" Spacing="6">
-                                <TextBlock Text="⚠" Foreground="#FFA500" />
-                                <TextBlock Text="Offline Mode" Foreground="#FFA500" FontSize="12" FontWeight="SemiBold" />
-                                <Button Content="Go Online"
-                                        Command="{Binding TryGoOnlineCommand}"
-                                        Background="#0E639C"
-                                        Foreground="White"
-                                        Padding="8,2"
-                                        FontSize="11"
-                                        IsVisible="{Binding CanGoOnline}" />
-                            </StackPanel>
-                        </Border>
-
                     </StackPanel>
                 </Panel>