diff --git a/Andromida/App/Views/Onboarding/RitualsOnboardingTags.swift b/Andromida/App/Views/Onboarding/RitualsOnboardingTags.swift
index 907ed9e..defb266 100644
--- a/Andromida/App/Views/Onboarding/RitualsOnboardingTags.swift
+++ b/Andromida/App/Views/Onboarding/RitualsOnboardingTags.swift
@@ -9,9 +9,9 @@ enum RitualsOnboardingTag: SherpaTags {
     func makeCallout() -> Callout {
         switch self {
         case .focusRitual:
-            return .text(String(localized: "Your focus ritual lives here"))
+            return .text(String(localized: "Your focus ritual lives here"), edge: .bottom)
         case .firstHabit:
-            return .text(String(localized: "Tap a habit to check in"), edge: .bottom)
+            return .text(String(localized: "Tap a habit to check in"), edge: .top)
         case .tabBar:
             return .text(String(localized: "Switch tabs to explore rituals and insights"), edge: .top)
         }
diff --git a/Andromida/App/Views/RootView.swift b/Andromida/App/Views/RootView.swift
index f948af9..cc28454 100644
--- a/Andromida/App/Views/RootView.swift
+++ b/Andromida/App/Views/RootView.swift
@@ -35,17 +35,13 @@ struct RootView: View {
         }
         .tint(AppAccent.primary)
         .background(AppSurface.primary.ignoresSafeArea())
+        .sherpaTabBarTag(RitualsOnboardingTag.tabBar)
         .sherpa(
             isActive: !hasCompletedOnboarding,
             tags: RitualsOnboardingTag.self,
             delegate: self,
             startDelay: Bedrock.Design.Animation.standard
         )
-        .sherpaExtensionTag(
-            RitualsOnboardingTag.tabBar,
-            edge: .bottom,
-            size: AppMetrics.Size.tabBarHighlightHeight
-        )
     }
 }
 
diff --git a/Andromida/Shared/AppMetrics.swift b/Andromida/Shared/AppMetrics.swift
index 04a6b4e..a726d4f 100644
--- a/Andromida/Shared/AppMetrics.swift
+++ b/Andromida/Shared/AppMetrics.swift
@@ -8,7 +8,6 @@ enum AppMetrics {
         static let progressRing: CGFloat = 72
         static let buttonHeight: CGFloat = 46
         static let insightCardMinWidth: CGFloat = 160
-        static let tabBarHighlightHeight: CGFloat = 120
     }
 
     enum Shadow {