diff --git a/oAI/Views/Screens/SettingsView.swift b/oAI/Views/Screens/SettingsView.swift
index 4686e9e..6266425 100644
--- a/oAI/Views/Screens/SettingsView.swift
+++ b/oAI/Views/Screens/SettingsView.swift
@@ -637,21 +637,11 @@ It's better to admit "I need more information" or "I cannot do that" than to fak
     @ViewBuilder
     private func mcpSidebarRow(_ section: MCPSubsection) -> some View {
         Button(action: { selectedMCPSubsection = section }) {
-            HStack(spacing: 10) {
-                Image(systemName: section.icon)
-                    .font(.system(size: 14))
-                    .frame(width: 18)
-                Text(section.label)
-                    .font(.system(size: 13))
-                Spacer()
-            }
-            .padding(.horizontal, 10)
-            .padding(.vertical, 7)
-            .background {
+            Group {
                 if selectedMCPSubsection == section {
-                    Color.clear.glassEffect(.regular.tint(.blue), in: .rect(cornerRadius: 8))
+                    mcpSidebarRowLabel(section).glassEffect(.regular.tint(.blue), in: .rect(cornerRadius: 8))
                 } else {
-                    Color.clear
+                    mcpSidebarRowLabel(section)
                 }
             }
         }
@@ -659,6 +649,20 @@ It's better to admit "I need more information" or "I cannot do that" than to fak
         .foregroundStyle(selectedMCPSubsection == section ? .blue : .primary)
     }
 
+    @ViewBuilder
+    private func mcpSidebarRowLabel(_ section: MCPSubsection) -> some View {
+        HStack(spacing: 10) {
+            Image(systemName: section.icon)
+                .font(.system(size: 14))
+                .frame(width: 18)
+            Text(section.label)
+                .font(.system(size: 13))
+            Spacer()
+        }
+        .padding(.horizontal, 10)
+        .padding(.vertical, 7)
+    }
+
     @ViewBuilder
     private var mcpTabWithSidebar: some View {
         HStack(alignment: .top, spacing: 0) {
@@ -3313,41 +3317,50 @@ It's better to admit "I need more information" or "I cannot do that" than to fak
 
     // MARK: - Tab Navigation
 
+    @ViewBuilder
     private func tabButton(_ tag: Int, icon: String, label: LocalizedStringKey, beta: Bool = false) -> some View {
-        Button(action: { selectedTab = tag }) {
-            VStack(spacing: 3) {
-                ZStack(alignment: .topTrailing) {
-                    Image(systemName: icon)
-                        .font(.system(size: 22))
-                        .frame(height: 28)
-                        .foregroundStyle(selectedTab == tag ? .blue : .secondary)
-                    if beta {
-                        Text("β")
-                            .font(.system(size: 9, weight: .heavy))
-                            .foregroundStyle(.white)
-                            .padding(.horizontal, 4)
-                            .padding(.vertical, 2)
-                            .background(Color.orange)
-                            .clipShape(Capsule())
-                            .offset(x: 8, y: -3)
-                    }
+        let selected = selectedTab == tag
+        Group {
+            if selected {
+                Button(action: { selectedTab = tag }) {
+                    tabButtonLabel(icon: icon, label: label, beta: beta, selected: true)
                 }
-                Text(label)
-                    .font(.system(size: 11))
-                    .foregroundStyle(selectedTab == tag ? .blue : .secondary)
-            }
-            .frame(minWidth: 55)
-            .padding(.vertical, 6)
-            .padding(.horizontal, 4)
-            .background {
-                if selectedTab == tag {
-                    Color.clear.glassEffect(.regular.tint(.blue), in: .rect(cornerRadius: 8))
-                } else {
-                    Color.clear
+                .buttonStyle(.glassProminent)
+                .tint(.blue)
+            } else {
+                Button(action: { selectedTab = tag }) {
+                    tabButtonLabel(icon: icon, label: label, beta: beta, selected: false)
                 }
+                .buttonStyle(.glass)
             }
         }
-        .buttonStyle(.plain)
+        .buttonBorderShape(.roundedRectangle(radius: 8))
+    }
+
+    @ViewBuilder
+    private func tabButtonLabel(icon: String, label: LocalizedStringKey, beta: Bool, selected: Bool) -> some View {
+        VStack(spacing: 3) {
+            ZStack(alignment: .topTrailing) {
+                Image(systemName: icon)
+                    .font(.system(size: 22))
+                    .frame(height: 28)
+                    .foregroundStyle(selected ? .blue : .secondary)
+                if beta {
+                    Text("β")
+                        .font(.system(size: 9, weight: .heavy))
+                        .foregroundStyle(.white)
+                        .padding(.horizontal, 4)
+                        .padding(.vertical, 2)
+                        .background(Color.orange)
+                        .clipShape(Capsule())
+                        .offset(x: 8, y: -3)
+                }
+            }
+            Text(label)
+                .font(.system(size: 11))
+                .foregroundStyle(selected ? .blue : .secondary)
+        }
+        .frame(minWidth: 55)
     }
 
     private func tabTitle(_ tag: Int) -> LocalizedStringKey {