diff --git a/app/src/main/res/layout/account_advanced_settings.xml b/app/src/main/res/layout/account_advanced_settings.xml
index fb08a6e7b..556c6a644 100644
--- a/app/src/main/res/layout/account_advanced_settings.xml
+++ b/app/src/main/res/layout/account_advanced_settings.xml
@@ -397,15 +397,11 @@
             android:layout_marginEnd="16dp"
             android:layout_marginTop="20dp"
             android:layout_marginBottom="@dimen/screen_bottom_margin"
-            android:paddingStart="12dp"
-            android:paddingEnd="12dp"
             android:paddingTop="6dp"
             android:paddingBottom="6dp"
             android:text="@string/account_settings_update_password_title"
             android:maxLines="1"
             android:ellipsize="end"
-            android:drawableEnd="@drawable/caret_right"
-            android:drawableTint="?attr/color_main2_600"
             app:layout_constraintHorizontal_bias="1"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/account_settings_fragment.xml b/app/src/main/res/layout/account_settings_fragment.xml
index 70fc66770..8c38150d9 100644
--- a/app/src/main/res/layout/account_settings_fragment.xml
+++ b/app/src/main/res/layout/account_settings_fragment.xml
@@ -200,7 +200,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         style="@style/section_header_style"
-                        android:id="@+id/tunnel"
+                        android:id="@+id/advanced_settings_header"
                         android:onClick="@{() -> viewModel.toggleAdvancedSettingsExpand()}"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"