diff --git a/Yattee/Views/Settings/AcknowledgementsView.swift b/Yattee/Views/Settings/AcknowledgementsView.swift
index 0a853962..de988cea 100644
--- a/Yattee/Views/Settings/AcknowledgementsView.swift
+++ b/Yattee/Views/Settings/AcknowledgementsView.swift
@@ -11,13 +11,11 @@ struct AcknowledgementsView: View {
     @Environment(\.openURL) private var openURL
 
     var body: some View {
-        Form {
-            Section {
+        SettingsFormContainer {
+            SettingsFormSection("settings.acknowledgements.dependencies.header") {
                 dependencyLink("mpv", url: "https://github.com/mpv-player/mpv")
                 dependencyLink("MPVKit", url: "https://github.com/mpvkit/MPVKit")
                 dependencyLink("Nuke", url: "https://github.com/kean/Nuke")
-            } header: {
-                Text(String(localized: "settings.acknowledgements.dependencies.header"))
             }
         }
         .navigationTitle(String(localized: "settings.acknowledgements.title"))
@@ -42,7 +40,11 @@ struct AcknowledgementsView: View {
                 Image(systemName: "arrow.up.right")
                     .foregroundStyle(.secondary)
             }
+            .contentShape(Rectangle())
         }
+        #if os(macOS)
+        .buttonStyle(.plain)
+        #endif
         #endif
     }
 }
diff --git a/Yattee/Views/Settings/ContributorsView.swift b/Yattee/Views/Settings/ContributorsView.swift
index 6cacf0d4..34b2c78c 100644
--- a/Yattee/Views/Settings/ContributorsView.swift
+++ b/Yattee/Views/Settings/ContributorsView.swift
@@ -54,13 +54,11 @@ struct ContributorsView: View {
     }
 
     private var contributorsList: some View {
-        Form {
-            Section {
+        SettingsFormContainer {
+            SettingsFormSection(footer: "settings.contributors.section.footer") {
                 ForEach(contributors) { contributor in
                     contributorRow(contributor)
                 }
-            } footer: {
-                Text(String(localized: "settings.contributors.section.footer"))
             }
         }
     }
@@ -112,7 +110,11 @@ struct ContributorsView: View {
                 Image(systemName: "arrow.up.right")
                     .foregroundStyle(.secondary)
             }
+            .contentShape(Rectangle())
         }
+        #if os(macOS)
+        .buttonStyle(.plain)
+        #endif
     }
 
     // MARK: - Data Loading
diff --git a/Yattee/Views/Settings/TranslationContributorsView.swift b/Yattee/Views/Settings/TranslationContributorsView.swift
index 99da98ad..b4b2f730 100644
--- a/Yattee/Views/Settings/TranslationContributorsView.swift
+++ b/Yattee/Views/Settings/TranslationContributorsView.swift
@@ -37,13 +37,11 @@ struct TranslationContributorsView: View {
     }
 
     private var contributorsList: some View {
-        Form {
-            Section {
+        SettingsFormContainer {
+            SettingsFormSection(footer: "settings.translators.section.footer") {
                 ForEach(contributors) { contributor in
                     contributorRow(contributor)
                 }
-            } footer: {
-                Text(String(localized: "settings.translators.section.footer"))
             }
         }
     }