diff --git a/app/src/main/res/layout/application_list_item.xml b/app/src/main/res/layout/application_list_item.xml
index e88d128b19a31f0bc2d6ccce77fe644176f0a281..874abbe4db4ecb602d45c97e94ae0c50a0e3dcc1 100644
--- a/app/src/main/res/layout/application_list_item.xml
+++ b/app/src/main/res/layout/application_list_item.xml
@@ -18,7 +18,7 @@
   ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/applicationList"
@@ -29,159 +29,156 @@
     android:clickable="true"
     android:focusable="true">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <androidx.cardview.widget.CardView
-            android:id="@+id/app_icon_card"
-            android:layout_width="75dp"
-            android:layout_height="75dp"
-            app:cardCornerRadius="12dp"
-            app:cardElevation="0dp"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:id="@+id/app_icon"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/app_icon"
-                android:scaleType="fitXY" />
-        </androidx.cardview.widget.CardView>
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/app_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="2dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="16sp"
-            android:layout_marginEnd="4dp"
-            app:layout_constraintLeft_toRightOf="@+id/app_icon_card"
-            app:layout_constraintRight_toLeftOf="@+id/installButton"
-            app:layout_constraintTop_toTopOf="@+id/app_icon_card"
-            tools:text="App title" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/app_author"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="14sp"
-            app:layout_constraintLeft_toLeftOf="@+id/app_title"
-            app:layout_constraintRight_toLeftOf="@+id/installButton"
-            app:layout_constraintTop_toBottomOf="@+id/app_title"
-            app:layout_constraintBottom_toTopOf="@+id/app_rating_bar"
-            tools:text="App author" />
-
-        <RatingBar
-            android:id="@+id/app_rating_bar"
-            style="?android:attr/ratingBarStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:isIndicator="true"
-            android:numStars="5"
-            android:progressBackgroundTint="@color/colorAccent"
-            android:progressTint="@color/colorAccent"
-            android:stepSize="0.1"
-            app:layout_constraintBottom_toBottomOf="@id/app_icon_card"
-            app:layout_constraintLeft_toLeftOf="@+id/app_title" />
+    <androidx.cardview.widget.CardView
+        android:id="@+id/app_icon_card"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        app:cardCornerRadius="12dp"
+        app:cardElevation="0dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/app_icon"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:contentDescription="@string/app_icon"
+            android:scaleType="fitXY" />
+    </androidx.cardview.widget.CardView>
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/app_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="2dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="16sp"
+        android:layout_marginEnd="4dp"
+        app:layout_constraintLeft_toRightOf="@+id/app_icon_card"
+        app:layout_constraintRight_toLeftOf="@+id/installButton"
+        app:layout_constraintTop_toTopOf="@+id/app_icon_card"
+        tools:text="App title" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/app_author"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="14sp"
+        app:layout_constraintLeft_toLeftOf="@+id/app_title"
+        app:layout_constraintRight_toLeftOf="@+id/installButton"
+        app:layout_constraintTop_toBottomOf="@+id/app_title"
+        app:layout_constraintBottom_toTopOf="@+id/app_rating_bar"
+        tools:text="App author" />
+
+    <RatingBar
+        android:id="@+id/app_rating_bar"
+        style="?android:attr/ratingBarStyleSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:isIndicator="true"
+        android:numStars="5"
+        android:progressBackgroundTint="@color/colorAccent"
+        android:progressTint="@color/colorAccent"
+        android:stepSize="0.1"
+        app:layout_constraintBottom_toBottomOf="@id/app_icon_card"
+        app:layout_constraintLeft_toLeftOf="@+id/app_title" />
+
+    <TextView
+        android:id="@+id/app_rating"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:text="@string/not_available"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="14sp"
+        app:layout_constraintTop_toTopOf="@+id/app_rating_bar"
+        app:layout_constraintBottom_toBottomOf="@+id/app_rating_bar"
+        app:layout_constraintLeft_toRightOf="@+id/app_rating_bar" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/installButton"
+        style="@style/InstallButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="43dp"
+        android:minWidth="120dp"
+        android:text="@string/install"
+        android:textAllCaps="false"
+        app:autoSizeTextType="uniform"
+        app:cornerRadius="4dp"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/app_title" />
+
+    <LinearLayout
+        android:id="@+id/appPrivacyScoreLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:layout_marginEnd="4dp"
+        android:orientation="horizontal"
+        app:layout_constraintTop_toTopOf="@+id/app_rating_bar"
+        app:layout_constraintBottom_toBottomOf="@+id/app_rating_bar"
+        app:layout_constraintRight_toRightOf="parent">
+
+        <ImageView
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:layout_gravity="center_vertical"
+            android:src="@drawable/ic_lock" />
 
         <TextView
-            android:id="@+id/app_rating"
+            android:id="@+id/app_privacy_score"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
             android:ellipsize="end"
             android:maxLines="1"
+            android:layout_gravity="center_vertical"
             android:text="@string/not_available"
             android:textColor="?android:textColorPrimary"
             android:textSize="14sp"
-            app:layout_constraintTop_toTopOf="@+id/app_rating_bar"
-            app:layout_constraintBottom_toBottomOf="@+id/app_rating_bar"
-            app:layout_constraintLeft_toRightOf="@+id/app_rating_bar" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/installButton"
-            style="@style/InstallButtonStyle"
-            android:layout_width="120dp"
-            android:layout_height="43dp"
-            android:text="@string/install"
-            android:textAllCaps="false"
-            android:textSize="18sp"
-            app:autoSizeTextType="uniform"
-            app:cornerRadius="4dp"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/app_title" />
-
-        <LinearLayout
-            android:id="@+id/appPrivacyScoreLayout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginEnd="4dp"
-            android:orientation="horizontal"
-            app:layout_constraintTop_toTopOf="@+id/app_rating_bar"
-            app:layout_constraintBottom_toBottomOf="@+id/app_rating_bar"
-            app:layout_constraintRight_toRightOf="parent">
-
-            <ImageView
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:src="@drawable/ic_lock" />
-
-            <TextView
-                android:id="@+id/app_privacy_score"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginStart="4dp"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:text="@string/not_available"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="14sp"
-                android:visibility="gone"/>
-
-            <ProgressBar
-                android:id="@+id/progressBar"
-                style="?android:attr/progressBarStyle"
-                android:visibility="gone"
-                android:layout_width="16dp"
-                android:layout_height="16dp"/>
-
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/sourceTag"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/bg_tag_rounded"
-            android:paddingStart="6dp"
-            android:paddingTop="2dp"
-            android:paddingEnd="6dp"
-            android:paddingBottom="2dp"
-            android:text="Open Source"
-            android:textAllCaps="false"
-            android:textColor="#626262"
-            android:textSize="14sp"
-            app:layout_constraintBottom_toBottomOf="@id/app_rating"
-            app:layout_constraintLeft_toRightOf="@+id/app_rating"
-            app:layout_constraintRight_toLeftOf="@+id/appPrivacyScoreLayout"
-            app:layout_constraintTop_toTopOf="@id/app_rating" />
-
-        <View
-            android:id="@+id/divider"
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginTop="12dp"
-            android:background="@color/colorGrey"
-            app:layout_constraintTop_toBottomOf="@+id/app_rating_bar" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            android:visibility="gone"/>
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyle"
+            android:visibility="gone"
+            android:layout_width="16dp"
+            android:layout_height="16dp"/>
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/sourceTag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_tag_rounded"
+        android:paddingStart="6dp"
+        android:paddingTop="2dp"
+        android:paddingEnd="6dp"
+        android:paddingBottom="2dp"
+        android:text="Open Source"
+        android:textAllCaps="false"
+        android:textColor="#626262"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toBottomOf="@id/app_rating"
+        app:layout_constraintLeft_toRightOf="@+id/app_rating"
+        app:layout_constraintRight_toLeftOf="@+id/appPrivacyScoreLayout"
+        app:layout_constraintTop_toTopOf="@id/app_rating" />
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:layout_marginTop="12dp"
+        android:background="@color/colorGrey"
+        app:layout_constraintTop_toBottomOf="@+id/app_rating_bar" />
 
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/home_child_list_item.xml b/app/src/main/res/layout/home_child_list_item.xml
index 8a288d592b1d7096660bc523f1dfa54d6aea000a..4472644222a080a0f5bf68a9a4e1376a7122c0d3 100644
--- a/app/src/main/res/layout/home_child_list_item.xml
+++ b/app/src/main/res/layout/home_child_list_item.xml
@@ -48,11 +48,11 @@
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/appName"
         android:layout_width="96dp"
-        android:layout_height="30dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
         android:layout_marginEnd="5dp"
         android:ellipsize="end"
-        android:maxLines="2"
+        android:lines="2"
         android:textAlignment="center"
         android:textColor="?android:textColorPrimary"
         android:textSize="12sp" />
@@ -60,12 +60,12 @@
     <com.google.android.material.button.MaterialButton
         android:id="@+id/installButton"
         style="@style/InstallButtonStyle"
-        android:layout_width="96dp"
+        android:layout_width="wrap_content"
+        android:minWidth="102dp"
         android:layout_height="43dp"
         android:layout_marginStart="1dp"
         android:text="@string/install"
         android:textAllCaps="false"
-        android:textSize="18sp"
         app:autoSizeTextType="uniform"
         app:cornerRadius="4dp" />
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 9713fc497d724952140a8f4d3c14ff499d2d70f1..1e6723b29c856b158095134f86b4375aa4f3b6c4 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -61,6 +61,8 @@
     <style name="InstallButtonStyle" parent="Widget.MaterialComponents.Button.OutlinedButton">
         <item name="android:textColor">@color/install_button_background</item>
         <item name="strokeColor">@color/install_button_background</item>
+        <item name="android:paddingStart">4dp</item>
+        <item name="android:paddingEnd">4dp</item>
     </style>
 
     <style name="UpdateButtonStyle" parent="Widget.MaterialComponents.Button.TextButton">