diff --git a/SelfieCam/Features/Onboarding/Components/OnboardingComponents.swift b/SelfieCam/Features/Onboarding/Components/OnboardingComponents.swift
index 3f55e39..a2796fb 100644
--- a/SelfieCam/Features/Onboarding/Components/OnboardingComponents.swift
+++ b/SelfieCam/Features/Onboarding/Components/OnboardingComponents.swift
@@ -232,6 +232,8 @@ struct OnboardingFeatureRow: View {
     let icon: String
     let title: String
     let subtitle: String
+    var showBorder: Bool = false
+    var debug: Bool = false
     
     var body: some View {
         HStack(spacing: Design.Spacing.medium) {
@@ -245,9 +247,13 @@ struct OnboardingFeatureRow: View {
                 Text(subtitle)
                     .styled(.caption, emphasis: .tertiary)
             }
-            
-            Spacer()
         }
+        .padding(Design.Spacing.medium)
+        .background(
+            RoundedRectangle(cornerRadius: Design.CornerRadius.medium)
+                .stroke(showBorder ? AppBorder.subtle : Color.clear, lineWidth: 1)
+        )
+        .debugBorder(debug, color: .blue, label: "FeatureRow")
     }
 }
 
diff --git a/SelfieCam/Features/Onboarding/Views/OnboardingWelcomeView.swift b/SelfieCam/Features/Onboarding/Views/OnboardingWelcomeView.swift
index e04108a..4c63a5b 100644
--- a/SelfieCam/Features/Onboarding/Views/OnboardingWelcomeView.swift
+++ b/SelfieCam/Features/Onboarding/Views/OnboardingWelcomeView.swift
@@ -35,23 +35,26 @@ struct OnboardingWelcomeView: View {
                 Spacer()
                 
                 // Feature highlights (centered within container)
-                VStack(spacing: Design.Spacing.medium) {
+                VStack(alignment: .leading, spacing: Design.Spacing.medium) {
                     OnboardingFeatureRow(
                         icon: "light.max",
                         title: String(localized: "Ring Light"),
-                        subtitle: String(localized: "Perfect lighting for every shot")
+                        subtitle: String(localized: "Perfect lighting for every shot"),
+                        showBorder: false
                     )
                     
                     OnboardingFeatureRow(
                         icon: "camera.filters",
                         title: String(localized: "Pro Features"),
-                        subtitle: String(localized: "HDR, skin smoothing, and more")
+                        subtitle: String(localized: "HDR, skin smoothing, and more"),
+                        showBorder: false
                     )
                     
                     OnboardingFeatureRow(
                         icon: "hand.tap.fill",
                         title: String(localized: "Easy Capture"),
-                        subtitle: String(localized: "Volume buttons, timers, gestures")
+                        subtitle: String(localized: "Volume buttons, timers, gestures"),
+                        showBorder: false
                     )
                 }
                 .frame(maxWidth: .infinity, alignment: .center)