diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml
index 4bbb8a65a..b9cfabef3 100644
--- a/app/src/main/res/layout/activity_account.xml
+++ b/app/src/main/res/layout/activity_account.xml
@@ -312,7 +312,7 @@
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/accountToolbar"
                     android:layout_width="match_parent"
-                    android:layout_height="?attr/actionBarSize"
+                    android:layout_height="wrap_content"
                     android:layout_gravity="top"
                     android:background="@android:color/transparent"
                     app:contentInsetStartWithNavigation="0dp"
diff --git a/app/src/main/res/layout/activity_compose.xml b/app/src/main/res/layout/activity_compose.xml
index d25b2b094..abff95023 100644
--- a/app/src/main/res/layout/activity_compose.xml
+++ b/app/src/main/res/layout/activity_compose.xml
@@ -9,7 +9,7 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
         android:background="@android:color/transparent">
 
@@ -26,7 +26,7 @@
             android:id="@+id/atButton"
             style="@style/TuskyImageButton"
             android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:padding="8dp"
             android:text="@string/at_symbol"
@@ -38,7 +38,7 @@
             android:id="@+id/hashButton"
             style="@style/TuskyImageButton"
             android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:padding="8dp"
             android:text="@string/hash_symbol"