diff --git a/app/src/main/res/color/main_top_bar_icon_color.xml b/app/src/main/res/color/main_top_bar_icon_color.xml
new file mode 100644
index 000000000..f3f3704e8
--- /dev/null
+++ b/app/src/main/res/color/main_top_bar_icon_color.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+        android:color="?attr/color_main2_600" />
+    <item android:state_hovered="true"
+        android:color="?attr/color_main2_600" />
+    <item
+        android:color="?attr/color_on_main"/>
+</selector>
diff --git a/app/src/main/res/layout-land/call_active_fragment.xml b/app/src/main/res/layout-land/call_active_fragment.xml
index b3e63784d..2eb8f0a6c 100644
--- a/app/src/main/res/layout-land/call_active_fragment.xml
+++ b/app/src/main/res/layout-land/call_active_fragment.xml
@@ -156,7 +156,7 @@
                 app:layout_constraintStart_toEndOf="@id/back"
                 app:layout_constraintEnd_toStartOf="@id/separator"
                 app:layout_constraintTop_toTopOf="@id/back"
-                app:layout_constraintBottom_toBottomOf="@id/back"/>
+                app:layout_constraintBottom_toTopOf="@id/call_media_encryption_info"/>
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/call_header_style"
@@ -254,6 +254,7 @@
                 bind:viewModel="@{viewModel}"
                 bind:callMediaEncryptionStatisticsClickListener="@{callMediaEncryptionStatisticsClickListener}"
                 app:layout_constraintTop_toBottomOf="@id/name"
+                app:layout_constraintBottom_toBottomOf="@id/back"
                 app:layout_constraintStart_toStartOf="@id/name"
                 app:layout_constraintEnd_toEndOf="parent"/>
 
diff --git a/app/src/main/res/layout-land/main_activity_top_bar.xml b/app/src/main/res/layout-land/main_activity_top_bar.xml
index cc52335a7..e025dc746 100644
--- a/app/src/main/res/layout-land/main_activity_top_bar.xml
+++ b/app/src/main/res/layout-land/main_activity_top_bar.xml
@@ -47,7 +47,7 @@
             app:barrierDirection="bottom" />
 
         <ImageView
-            style="@style/icon_top_bar_button_style"
+            style="@style/icon_main_top_bar_button_style"
             android:id="@+id/drawer_menu"
             android:onClick="@{() -> viewModel.openDrawerMenu()}"
             android:layout_width="wrap_content"
@@ -56,8 +56,7 @@
             android:contentDescription="@string/content_description_open_filter"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:tint="?attr/color_on_main" />
+            app:layout_constraintBottom_toBottomOf="parent" />
 
         <include
             android:id="@+id/avatar"
@@ -89,7 +88,7 @@
             app:layout_constraintBottom_toBottomOf="@id/avatar"/>
 
         <ImageView
-            style="@style/icon_top_bar_button_style"
+            style="@style/icon_main_top_bar_button_style"
             android:id="@+id/search_toggle"
             android:onClick="@{() -> viewModel.openSearchBar()}"
             android:layout_width="wrap_content"
@@ -98,11 +97,10 @@
             android:contentDescription="@string/content_description_open_filter"
             app:layout_constraintEnd_toStartOf="@id/extra_action"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:tint="?attr/color_on_main" />
+            app:layout_constraintBottom_toBottomOf="parent" />
 
         <ImageView
-            style="@style/icon_top_bar_button_style"
+            style="@style/icon_main_top_bar_button_style"
             android:id="@+id/extra_action"
             android:onClick="@{extraActionClickListener}"
             android:layout_width="wrap_content"
@@ -112,11 +110,10 @@
             android:visibility="@{!viewModel.searchBarVisible &amp;&amp; enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:tint="?attr/color_on_main" />
+            app:layout_constraintBottom_toBottomOf="parent" />
 
         <ImageView
-            style="@style/icon_top_bar_button_style"
+            style="@style/icon_main_top_bar_button_style"
             android:id="@+id/cancel_search"
             android:onClick="@{() -> viewModel.closeSearchBar()}"
             android:layout_width="wrap_content"
@@ -125,8 +122,7 @@
             android:contentDescription="@string/content_description_cancel_filter"
             app:layout_constraintBottom_toBottomOf="@id/search"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/search"
-            app:tint="?attr/color_on_main" />
+            app:layout_constraintTop_toTopOf="@id/search" />
 
         <com.google.android.material.textfield.TextInputLayout
             style="?attr/textInputFilledStyle"
@@ -161,7 +157,7 @@
         </com.google.android.material.textfield.TextInputLayout>
 
         <ImageView
-            style="@style/icon_top_bar_button_style"
+            style="@style/icon_main_top_bar_button_style"
             android:id="@+id/clear_field"
             android:onClick="@{() -> viewModel.clearFilter()}"
             android:layout_width="wrap_content"
@@ -170,8 +166,7 @@
             android:contentDescription="@string/content_description_clear_filter"
             app:layout_constraintBottom_toBottomOf="@id/search"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/search"
-            app:tint="?attr/color_on_main" />
+            app:layout_constraintTop_toTopOf="@id/search" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/account_advanced_settings.xml b/app/src/main/res/layout/account_advanced_settings.xml
index 6d7581f25..2ca3aa8a4 100644
--- a/app/src/main/res/layout/account_advanced_settings.xml
+++ b/app/src/main/res/layout/account_advanced_settings.xml
@@ -423,6 +423,8 @@
             android:text="@string/account_settings_update_password_title"
             android:maxLines="1"
             android:ellipsize="end"
+            android:drawableEnd="@drawable/pencil_simple"
+            android:background="@drawable/squircle_transparent_button_background"
             app:layout_constraintHorizontal_bias="1"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/call_active_conference_fragment.xml b/app/src/main/res/layout/call_active_conference_fragment.xml
index 4cef0dbd5..d9114b469 100644
--- a/app/src/main/res/layout/call_active_conference_fragment.xml
+++ b/app/src/main/res/layout/call_active_conference_fragment.xml
@@ -99,7 +99,7 @@
                 app:layout_constraintStart_toEndOf="@id/back"
                 app:layout_constraintEnd_toStartOf="@id/separator"
                 app:layout_constraintTop_toTopOf="@id/back"
-                app:layout_constraintBottom_toBottomOf="@id/back"/>
+                app:layout_constraintBottom_toTopOf="@id/call_media_encryption_info"/>
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/call_header_style"
@@ -194,6 +194,7 @@
                 bind:viewModel="@{viewModel}"
                 bind:callMediaEncryptionStatisticsClickListener="@{callMediaEncryptionStatisticsClickListener}"
                 app:layout_constraintTop_toBottomOf="@id/conference_subject"
+                app:layout_constraintBottom_toBottomOf="@id/back"
                 app:layout_constraintStart_toStartOf="@id/conference_subject"
                 app:layout_constraintEnd_toEndOf="parent"/>
 
diff --git a/app/src/main/res/layout/call_active_fragment.xml b/app/src/main/res/layout/call_active_fragment.xml
index 1c87530f4..e8a14c284 100644
--- a/app/src/main/res/layout/call_active_fragment.xml
+++ b/app/src/main/res/layout/call_active_fragment.xml
@@ -153,7 +153,7 @@
                 app:layout_constraintStart_toEndOf="@id/back"
                 app:layout_constraintEnd_toStartOf="@id/separator"
                 app:layout_constraintTop_toTopOf="@id/back"
-                app:layout_constraintBottom_toBottomOf="@id/back"/>
+                app:layout_constraintBottom_toTopOf="@id/call_media_encryption_info"/>
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/call_header_style"
@@ -251,6 +251,7 @@
                 bind:viewModel="@{viewModel}"
                 bind:callMediaEncryptionStatisticsClickListener="@{callMediaEncryptionStatisticsClickListener}"
                 app:layout_constraintTop_toBottomOf="@id/name"
+                app:layout_constraintBottom_toBottomOf="@id/back"
                 app:layout_constraintStart_toStartOf="@id/name"
                 app:layout_constraintEnd_toEndOf="parent"/>
 
diff --git a/app/src/main/res/layout/chat_conversation_send_area.xml b/app/src/main/res/layout/chat_conversation_send_area.xml
index cc315ee96..400930c0a 100644
--- a/app/src/main/res/layout/chat_conversation_send_area.xml
+++ b/app/src/main/res/layout/chat_conversation_send_area.xml
@@ -147,9 +147,9 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="12dp"
             android:layout_marginEnd="5dp"
-            android:layout_marginBottom="16dp"
+            android:layout_marginBottom="12dp"
             android:background="@color/transparent_color"
             android:hint="@string/conversation_text_field_hint"
             android:imeOptions="flagNoPersonalizedLearning"
diff --git a/app/src/main/res/layout/main_activity_top_bar.xml b/app/src/main/res/layout/main_activity_top_bar.xml
index 3b6df1a89..cd3eb9c31 100644
--- a/app/src/main/res/layout/main_activity_top_bar.xml
+++ b/app/src/main/res/layout/main_activity_top_bar.xml
@@ -47,7 +47,7 @@
             app:barrierDirection="bottom" />
 
         <ImageView
-            style="@style/icon_top_bar_button_style"
+            style="@style/icon_main_top_bar_button_style"
             android:id="@+id/drawer_menu"
             android:onClick="@{() -> viewModel.openDrawerMenu()}"
             android:layout_width="wrap_content"
@@ -56,8 +56,7 @@
             android:contentDescription="@string/content_description_open_filter"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:tint="?attr/color_on_main" />
+            app:layout_constraintBottom_toBottomOf="parent" />
 
         <include
             android:id="@+id/avatar"
@@ -89,7 +88,7 @@
             app:layout_constraintBottom_toBottomOf="@id/avatar"/>
 
         <ImageView
-            style="@style/icon_top_bar_button_style"
+            style="@style/icon_main_top_bar_button_style"
             android:id="@+id/search_toggle"
             android:onClick="@{() -> viewModel.openSearchBar()}"
             android:layout_width="wrap_content"
@@ -98,11 +97,10 @@
             android:contentDescription="@string/content_description_open_filter"
             app:layout_constraintEnd_toStartOf="@id/extra_action"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:tint="?attr/color_on_main" />
+            app:layout_constraintBottom_toBottomOf="parent" />
 
         <ImageView
-            style="@style/icon_top_bar_button_style"
+            style="@style/icon_main_top_bar_button_style"
             android:id="@+id/extra_action"
             android:onClick="@{extraActionClickListener}"
             android:layout_width="wrap_content"
@@ -112,11 +110,10 @@
             android:visibility="@{!viewModel.searchBarVisible &amp;&amp; enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:tint="?attr/color_on_main" />
+            app:layout_constraintBottom_toBottomOf="parent" />
 
         <ImageView
-            style="@style/icon_top_bar_button_style"
+            style="@style/icon_main_top_bar_button_style"
             android:id="@+id/cancel_search"
             android:onClick="@{() -> viewModel.closeSearchBar()}"
             android:layout_width="wrap_content"
@@ -125,8 +122,7 @@
             android:contentDescription="@string/content_description_cancel_filter"
             app:layout_constraintBottom_toBottomOf="@id/search"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/search"
-            app:tint="?attr/color_on_main" />
+            app:layout_constraintTop_toTopOf="@id/search" />
 
         <com.google.android.material.textfield.TextInputLayout
             style="?attr/textInputFilledStyle"
@@ -161,7 +157,7 @@
         </com.google.android.material.textfield.TextInputLayout>
 
         <ImageView
-            style="@style/icon_top_bar_button_style"
+            style="@style/icon_main_top_bar_button_style"
             android:id="@+id/clear_field"
             android:onClick="@{() -> viewModel.clearFilter()}"
             android:layout_width="wrap_content"
@@ -170,8 +166,7 @@
             android:contentDescription="@string/content_description_clear_filter"
             app:layout_constraintBottom_toBottomOf="@id/search"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/search"
-            app:tint="?attr/color_on_main" />
+            app:layout_constraintTop_toTopOf="@id/search" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7f262f272..aded44727 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -133,6 +133,16 @@
         <item name="android:maxLines">1</item>
         <item name="android:ellipsize">end</item>
     </style>
+    <style name="icon_main_top_bar_button_style">
+        <item name="android:layout_marginTop">2dp</item>
+        <item name="android:layout_marginBottom">2dp</item>
+        <item name="android:layout_marginStart">2dp</item>
+        <item name="android:layout_marginEnd">2dp</item>
+        <item name="android:padding">15dp</item>
+        <item name="android:adjustViewBounds">true</item>
+        <item name="android:background">@drawable/circle_transparent_button_background</item>
+        <item name="tint">@color/main_top_bar_icon_color</item>
+    </style>
     <style name="icon_top_bar_button_style">
         <item name="android:layout_marginTop">2dp</item>
         <item name="android:layout_marginBottom">2dp</item>