diff --git a/lib/widgets/article_openAlex_search_form.dart b/lib/widgets/article_openAlex_search_form.dart
index 8635cb76..f7cc61ae 100644
--- a/lib/widgets/article_openAlex_search_form.dart
+++ b/lib/widgets/article_openAlex_search_form.dart
@@ -475,6 +475,7 @@ class OpenAlexSearchFormState extends State<OpenAlexSearchForm> {
             ),
             SizedBox(height: 16),
             SwitchListTile(
+              contentPadding: EdgeInsets.zero,
               title: Text(
                 AppLocalizations.of(context)!.openAccessOnly,
                 style: TextStyle(fontWeight: FontWeight.w500),
@@ -622,9 +623,10 @@ class OpenAlexSearchFormState extends State<OpenAlexSearchForm> {
             ),*/
             SizedBox(height: 20),
             SwitchListTile(
+              contentPadding: EdgeInsets.zero,
               title: Text(
                 AppLocalizations.of(context)!.saveQuery,
-                style: TextStyle(fontWeight: FontWeight.w600),
+                style: TextStyle(fontWeight: FontWeight.w500),
               ),
               value: saveQuery,
               onChanged: (bool value) {
diff --git a/lib/widgets/article_query_search_form.dart b/lib/widgets/article_query_search_form.dart
index 9ff9a807..ebc63f12 100644
--- a/lib/widgets/article_query_search_form.dart
+++ b/lib/widgets/article_query_search_form.dart
@@ -696,15 +696,16 @@ class QuerySearchFormState extends State<QuerySearchForm> {
                     border: OutlineInputBorder(),
                   ),
                 ),
-                SizedBox(height: 16),
+                const SizedBox(height: 16),
               ],
             ),
-            SizedBox(height: 16),
-            Text(
-              AppLocalizations.of(context)!.saveQuery,
-              style: TextStyle(fontWeight: FontWeight.bold),
-            ),
-            Switch(
+            const SizedBox(height: 16),
+            SwitchListTile(
+              contentPadding: EdgeInsets.zero,
+              title: Text(
+                AppLocalizations.of(context)!.saveQuery,
+                style: const TextStyle(fontWeight: FontWeight.w500),
+              ),
               value: saveQuery,
               onChanged: (bool value) {
                 setState(() {
@@ -712,7 +713,6 @@ class QuerySearchFormState extends State<QuerySearchForm> {
                 });
               },
             ),
-            SizedBox(height: 8),
             if (saveQuery)
               TextFormField(
                 controller: queryNameController,
@@ -721,7 +721,7 @@ class QuerySearchFormState extends State<QuerySearchForm> {
                   border: OutlineInputBorder(),
                 ),
               ),
-            SizedBox(height: 70),
+            const SizedBox(height: 70),
           ],
         ),
       ),
diff --git a/lib/widgets/sync_auth_form.dart b/lib/widgets/sync_auth_form.dart
index 5d8d0381..bfca5f18 100644
--- a/lib/widgets/sync_auth_form.dart
+++ b/lib/widgets/sync_auth_form.dart
@@ -338,26 +338,35 @@ class _SyncAuthFormState extends State<SyncAuthForm> {
         SizedBox(height: 8),
         const Divider(),
         SizedBox(height: 8),
-        Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            FilledButton.tonalIcon(
+        SizedBox(
+          width: double.infinity,
+          child: Wrap(
+            alignment: WrapAlignment.spaceBetween,
+            crossAxisAlignment: WrapCrossAlignment.center,
+            runSpacing: 12,
+            children: [
+              FilledButton.tonalIcon(
                 onPressed: () {
                   launchUrl(
                     Uri.parse(
                         'https://github.com/Scriptbash/Wispar/blob/main/PRIVACY.md'),
                   );
                 },
-                label: Text(AppLocalizations.of(context)!.privacyPolicy)),
-            FilledButton.tonalIcon(
+                icon: const Icon(Icons.privacy_tip_outlined),
+                label: Text(AppLocalizations.of(context)!.privacyPolicy),
+              ),
+              FilledButton.tonalIcon(
                 onPressed: () {
                   launchUrl(
                     Uri.parse(
                         'https://wispar.app/docs/initial-setup/cloud-sync'),
                   );
                 },
-                label: Text(AppLocalizations.of(context)!.documentation))
-          ],
+                icon: const Icon(Icons.description_outlined),
+                label: Text(AppLocalizations.of(context)!.documentation),
+              ),
+            ],
+          ),
         ),
       ],
     );