diff --git a/app/src/main/res/layout/layout_source_settings.xml b/app/src/main/res/layout/layout_source_settings.xml
deleted file mode 100644
index 7c5405542fb79b232fc5be6aeec798fbb5273440..0000000000000000000000000000000000000000
--- a/app/src/main/res/layout/layout_source_settings.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~  Copyright (C) 2022  ECORP
-  ~
-  ~   This program is free software: you can redistribute it and/or modify
-  ~   it under the terms of the GNU General Public License as published by
-  ~   the Free Software Foundation, either version 3 of the License, or
-  ~   (at your option) any later version.
-  ~
-  ~   This program is distributed in the hope that it will be useful,
-  ~   but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~   GNU General Public License for more details.
-  ~
-  ~   You should have received a copy of the GNU General Public License
-  ~   along with this program.  If not, see <https://www.gnu.org/licenses/>.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-android:layout_width="match_parent" android:layout_height="wrap_content"
-android:minHeight="?android:attr/listPreferredItemHeight"
-android:gravity="center_vertical" android:paddingRight="?android:attr/scrollbarSize">
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="?android:attr/listPreferredItemHeight"
-        android:gravity="center_vertical"
-        android:paddingRight="?android:attr/scrollbarSize">
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:minWidth="@dimen/preference_icon_minWidth"
-            android:orientation="horizontal">
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:minWidth="48dp"
-                />
-        </LinearLayout>
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="22dp"
-            android:layout_marginRight="8dip"
-            android:layout_marginTop="6dip"
-            android:layout_marginBottom="6dip"
-            android:layout_weight="1">
-
-            <TextView android:id="@android:id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="false"
-                android:textColor="@android:color/black"
-                android:textAppearance="?android:attr/textAppearanceMediumInverse"
-                android:textSize="16sp"
-                android:layout_marginTop="12dp"
-                android:fadingEdge="horizontal" />
-
-            <TextView android:id="@+id/summary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@android:id/title"
-                android:layout_alignLeft="@android:id/title"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondary"
-                android:maxLines="4" />
-        </RelativeLayout>
-        <!-- Preference should place its actual preference widget here. -->
-        <LinearLayout android:id="@android:id/widget_frame"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:orientation="vertical" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 01884f499bb099b62d2c34418a71d78fc89b18d0..8d6eebf7e2219e756d72cd45e3f58a85b02b97b4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -24,7 +24,7 @@
     <string name="preference_update_notify_available_description">Benachrichtige, wenn App-Aktualisierungen verfügbar sind</string>
     <string name="Show_applications">Zeige Anwendungen:</string>
     <string name="show_only_open_source_apps">Zeige nur quelloffene Apps an</string>
-    <string name="Show_commercial_apps">Zeige alle Apps an</string>
+    <string name="Show_common_apps">Zeige alle Apps an</string>
     <string name="show_only_pwa_apps">Zeige nur PWAs an</string>
     <string name="account">Konto</string>
     <string name="terms_services">Nutzungsbedingungen</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index e3322571c7e9f4131f1ac50e2abbbec8c761ac2f..fd9cada01790f17b6015ea4e99074c9f34e59c77 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -36,7 +36,7 @@
     <string name="preference_update_install_automatically_description">Descargar e instalar actualizaciones de aplicaciones en segundo plano</string>
     <string name="preference_update_notify_available_title">Mostrar aplicaciones disponibles</string>
     <string name="Show_applications">Mostrar aplicaciones:</string>
-    <string name="Show_commercial_apps">Mostrar todas las aplicaciones</string>
+    <string name="Show_common_apps">Mostrar todas las aplicaciones</string>
     <string name="show_only_open_source_apps">Mostrar solo aplicaciones de código abierto</string>
     <string name="show_only_pwa_apps">Mostrar solo las PWA</string>
     <string name="account">Cuenta</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index bbfff2eeec7806e0868ec77b18a4ab38fff75cb7..603ce31b16bc4fc21dd79d3802c92068e658a217 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -43,7 +43,7 @@
     <string name="account">Tili</string>
     <string name="show_only_pwa_apps">Näytä vain PWAt</string>
     <string name="show_only_open_source_apps">Näytä vain avoimen lähdekoodin sovellukset</string>
-    <string name="Show_commercial_apps">Näytä kaikki sovellukset</string>
+    <string name="Show_common_apps">Näytä kaikki sovellukset</string>
     <string name="Show_applications">Näytä sovellukset:</string>
     <string name="preference_update_notify_available_description">Näytä ilmoitus kun sovelluspäivityksiä on saatavilla</string>
     <string name="preference_update_notify_available_title">Näytä saatavilla olevat päivitykset</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 488796282632c33065b932c34851d2ea2ae3d1c7..e98fcef44d3fd41983334809f458d8f04f5a2dd0 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -17,7 +17,7 @@
     <string name="preference_update_notify_available_title">Afficher les mises à jour disponibles</string>
     <string name="preference_update_notify_available_description">Afficher une notification lorsque des mises à jour d\'applications sont disponibles</string>
     <string name="Show_applications">Afficher les applications :</string>
-    <string name="Show_commercial_apps">Afficher toutes les applications</string>
+    <string name="Show_common_apps">Afficher toutes les applications</string>
     <string name="show_only_pwa_apps">Afficher les PWA uniquement</string>
     <string name="account">Compte</string>
     <string name="terms_services">Conditions de Service</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 73b2157e6d97d5118e1fd02074fe5eaf755367ea..97818808396d0731af3b71361d1558ce75786665 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -36,7 +36,7 @@
     <string name="preference_update_install_automatically_description">Scarica ed installa gli aggiornamenti App in background</string>
     <string name="preference_update_notify_available_title">Mostra gli aggiornamenti disponibili</string>
     <string name="Show_applications">Mostra App:</string>
-    <string name="Show_commercial_apps">Mostra tutte le App</string>
+    <string name="Show_common_apps">Mostra tutte le App</string>
     <string name="show_only_open_source_apps">Mostra solo le App open-source</string>
     <string name="show_only_pwa_apps">Mostra solo le PWA</string>
     <string name="account">Account</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0c4f999c3902efdcea03d6bb519d19d20c2a42e3..dc6227637de300b681ab533aa9aba343504dc79a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -61,7 +61,7 @@
     <string name="preference_update_notify_available_title">Show available updates</string>
     <string name="preference_update_notify_available_description">Show a notification when app updates are available</string>
     <string name="Show_applications">Show applications:</string>
-    <string name="Show_commercial_apps">Show commercial apps</string>
+    <string name="Show_common_apps">Show common apps</string>
     <string name="show_only_open_source_apps">Show open source apps</string>
     <string name="show_only_pwa_apps">Show PWAs</string>
     <string name="about">About</string>
diff --git a/app/src/main/res/xml/settings_preferences.xml b/app/src/main/res/xml/settings_preferences.xml
index 2b1086e6d711fafd27f58f87d9a4291e5a2a5f0d..4c12f9d72d0db41332c33891e5b8e209d4a86546 100644
--- a/app/src/main/res/xml/settings_preferences.xml
+++ b/app/src/main/res/xml/settings_preferences.xml
@@ -18,6 +18,7 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <PreferenceCategory android:title="@string/preference_updates_title">
@@ -54,20 +55,20 @@
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="showFOSSApplications"
-            android:layout="@layout/layout_source_settings"
+            app:singleLineTitle="false"
             android:title="@string/show_only_open_source_apps" />
 
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="showPWAApplications"
-            android:layout="@layout/layout_source_settings"
+            app:singleLineTitle="false"
             android:title="@string/show_only_pwa_apps" />
 
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="showAllApplications"
-            android:layout="@layout/layout_source_settings"
-            android:title="@string/Show_commercial_apps" />
+            app:singleLineTitle="false"
+            android:title="@string/Show_common_apps" />
 
     </PreferenceCategory>