diff --git a/app/src/main/res/layout/fragment_client_certificate_dialog.xml b/app/src/main/res/layout/fragment_client_certificate_dialog.xml
index d3422053..bc52513f 100644
--- a/app/src/main/res/layout/fragment_client_certificate_dialog.xml
+++ b/app/src/main/res/layout/fragment_client_certificate_dialog.xml
@@ -234,7 +234,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
+                    android:baselineAligned="false" android:orientation="horizontal"
                     android:layout_marginTop="16dp">
 
                     <LinearLayout
diff --git a/app/src/main/res/layout/fragment_trusted_certificate_dialog.xml b/app/src/main/res/layout/fragment_trusted_certificate_dialog.xml
index bbdfe14f..a0e4f55c 100644
--- a/app/src/main/res/layout/fragment_trusted_certificate_dialog.xml
+++ b/app/src/main/res/layout/fragment_trusted_certificate_dialog.xml
@@ -254,7 +254,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
+                    android:baselineAligned="false" android:orientation="horizontal"
                     android:layout_marginTop="16dp">
 
                     <LinearLayout
diff --git a/app/src/main/res/layout/view_attachment_box.xml b/app/src/main/res/layout/view_attachment_box.xml
index 0e440694..d6d6d11a 100644
--- a/app/src/main/res/layout/view_attachment_box.xml
+++ b/app/src/main/res/layout/view_attachment_box.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
+    android:baselineAligned="false" android:orientation="horizontal"
     android:gravity="center_vertical">
 
     <!-- Icon and size stacked vertically on the left -->
diff --git a/gradle.properties b/gradle.properties
index 0fa33706..cc390b98 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,27 +1,8 @@
 # Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
+
 org.gradle.jvmargs=-Xmx1536m
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
 android.useAndroidX=true
-# Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 android.nonTransitiveRClass=false
-android.defaults.buildfeatures.resvalues=true
-android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
-android.enableAppCompileTimeRClass=false
-android.usesSdkInManifest.disallowed=false
-android.uniquePackageNames=false
-android.dependency.useConstraints=true
-android.r8.strictFullModeForKeepRules=false
-android.r8.optimizedResourceShrinking=false
 android.builtInKotlin=false
 android.newDsl=false