diff --git a/SportsTime/Features/Home/Views/Variants/Classic/HomeContent_Classic.swift b/SportsTime/Features/Home/Views/Variants/Classic/HomeContent_Classic.swift
index 7211c77..2f8cfcc 100644
--- a/SportsTime/Features/Home/Views/Variants/Classic/HomeContent_Classic.swift
+++ b/SportsTime/Features/Home/Views/Variants/Classic/HomeContent_Classic.swift
@@ -147,6 +147,7 @@ struct HomeContent_Classic: View {
                                                 selectedSuggestedTrip = suggestedTrip
                                             } label: {
                                                 SuggestedTripCard(suggestedTrip: suggestedTrip)
+                                                    .contentShape(Rectangle())
                                             }
                                             .buttonStyle(.plain)
                                         }
@@ -233,6 +234,7 @@ struct HomeContent_Classic: View {
                         TripDetailView(trip: trip)
                     } label: {
                         classicTripCard(savedTrip: savedTrip, trip: trip)
+                            .contentShape(Rectangle())
                     }
                     .buttonStyle(.plain)
                     .staggeredAnimation(index: index, delay: 0.05)
diff --git a/SportsTime/Features/Polls/Views/PollDetailView.swift b/SportsTime/Features/Polls/Views/PollDetailView.swift
index 3d47bf9..b1280c0 100644
--- a/SportsTime/Features/Polls/Views/PollDetailView.swift
+++ b/SportsTime/Features/Polls/Views/PollDetailView.swift
@@ -318,6 +318,7 @@ struct PollDetailView: View {
                     selectedTrip = trip
                 } label: {
                     TripPreviewCard(trip: trip, index: index + 1)
+                        .contentShape(Rectangle())
                 }
                 .buttonStyle(.plain)
             }
diff --git a/SportsTime/Features/Polls/Views/PollsListView.swift b/SportsTime/Features/Polls/Views/PollsListView.swift
index 444e2cf..f4448c3 100644
--- a/SportsTime/Features/Polls/Views/PollsListView.swift
+++ b/SportsTime/Features/Polls/Views/PollsListView.swift
@@ -87,6 +87,7 @@ struct PollsListView: View {
             ForEach(polls) { poll in
                 NavigationLink(value: poll) {
                     PollRowView(poll: poll)
+                        .contentShape(Rectangle())
                 }
             }
         }
diff --git a/SportsTime/Features/Progress/Views/AchievementsListView.swift b/SportsTime/Features/Progress/Views/AchievementsListView.swift
index fdea5a1..1a4c272 100644
--- a/SportsTime/Features/Progress/Views/AchievementsListView.swift
+++ b/SportsTime/Features/Progress/Views/AchievementsListView.swift
@@ -209,6 +209,7 @@ struct AchievementsListView: View {
         ) {
             ForEach(filtered) { achievement in
                 AchievementCard(achievement: achievement)
+                    .contentShape(Rectangle())
                     .onTapGesture {
                         selectedAchievement = achievement
                     }
@@ -283,6 +284,7 @@ struct SportFilterButton: View {
             .background(isSelected ? color : Theme.cardBackground(colorScheme))
             .foregroundStyle(isSelected ? .white : Theme.textPrimary(colorScheme))
             .clipShape(Capsule())
+            .contentShape(Capsule())
             .overlay {
                 Capsule()
                     .stroke(isSelected ? Color.clear : color.opacity(0.3), lineWidth: 1)
diff --git a/SportsTime/Features/Progress/Views/GamesHistoryView.swift b/SportsTime/Features/Progress/Views/GamesHistoryView.swift
index 2713d5c..419aafd 100644
--- a/SportsTime/Features/Progress/Views/GamesHistoryView.swift
+++ b/SportsTime/Features/Progress/Views/GamesHistoryView.swift
@@ -135,6 +135,7 @@ private struct SportChip: View {
                 Capsule()
                     .fill(isSelected ? sport.themeColor : Theme.cardBackgroundElevated(colorScheme))
             )
+            .contentShape(Capsule())
         }
         .buttonStyle(.plain)
         .accessibilityValue(isSelected ? "Selected" : "Not selected")
@@ -173,6 +174,7 @@ private struct GamesListByYear: View {
                                         visit: visit,
                                         stadium: AppDataProvider.shared.stadium(for: visit.stadiumId)
                                     )
+                                    .contentShape(Rectangle())
                                 }
                                 .buttonStyle(.plain)
                             }
diff --git a/SportsTime/Features/Schedule/Views/ScheduleListView.swift b/SportsTime/Features/Schedule/Views/ScheduleListView.swift
index b8bef4b..92c95fa 100644
--- a/SportsTime/Features/Schedule/Views/ScheduleListView.swift
+++ b/SportsTime/Features/Schedule/Views/ScheduleListView.swift
@@ -236,6 +236,7 @@ struct SportFilterChip: View {
             .background(isSelected ? Color.blue : Color(.secondarySystemBackground))
             .foregroundStyle(isSelected ? .white : .primary)
             .clipShape(Capsule())
+            .contentShape(Capsule())
         }
         .buttonStyle(.plain)
         .accessibilityIdentifier("schedule.sport.\(sport.rawValue.lowercased())")
diff --git a/SportsTime/Features/Trip/Views/TripOptionsView.swift b/SportsTime/Features/Trip/Views/TripOptionsView.swift
index 16eb7ca..3c6e0cc 100644
--- a/SportsTime/Features/Trip/Views/TripOptionsView.swift
+++ b/SportsTime/Features/Trip/Views/TripOptionsView.swift
@@ -609,6 +609,7 @@ struct TripOptionCard: View {
             .padding(Theme.Spacing.md)
             .background(Theme.cardBackground(colorScheme))
             .clipShape(RoundedRectangle(cornerRadius: Theme.CornerRadius.medium))
+            .contentShape(RoundedRectangle(cornerRadius: Theme.CornerRadius.medium))
             .overlay {
                 RoundedRectangle(cornerRadius: Theme.CornerRadius.medium)
                     .stroke(Theme.surfaceGlow(colorScheme), lineWidth: 1)
diff --git a/SportsTime/Features/Trip/Views/Wizard/Steps/TeamPickerStep.swift b/SportsTime/Features/Trip/Views/Wizard/Steps/TeamPickerStep.swift
index 1c1638c..9bc11d5 100644
--- a/SportsTime/Features/Trip/Views/Wizard/Steps/TeamPickerStep.swift
+++ b/SportsTime/Features/Trip/Views/Wizard/Steps/TeamPickerStep.swift
@@ -97,6 +97,7 @@ struct TeamPickerStep: View {
                     .padding(Theme.Spacing.md)
                     .background(Theme.cardBackgroundElevated(colorScheme))
                     .clipShape(RoundedRectangle(cornerRadius: Theme.CornerRadius.medium))
+                    .contentShape(RoundedRectangle(cornerRadius: Theme.CornerRadius.medium))
                     .overlay(
                         RoundedRectangle(cornerRadius: Theme.CornerRadius.medium)
                             .stroke(Theme.textMuted(colorScheme).opacity(0.3), lineWidth: 1)