diff --git a/app/src/main/res/layout/settings_codec_list_cell.xml b/app/src/main/res/layout/settings_codec_list_cell.xml
index e6f3d0f0e..2b5942991 100644
--- a/app/src/main/res/layout/settings_codec_list_cell.xml
+++ b/app/src/main/res/layout/settings_codec_list_cell.xml
@@ -40,6 +40,8 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="10dp"
             android:text="@{model.subtitle, default=`48000 Hz`}"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:visibility="@{model.subtitle.isEmpty() ? View.GONE : View.VISIBLE}"
             app:layout_constraintTop_toBottomOf="@id/codec_title"
             app:layout_constraintBottom_toBottomOf="@id/codec_switch"
diff --git a/app/src/main/res/layout/settings_security.xml b/app/src/main/res/layout/settings_security.xml
index 1fc31c692..42b086a89 100644
--- a/app/src/main/res/layout/settings_security.xml
+++ b/app/src/main/res/layout/settings_security.xml
@@ -67,7 +67,7 @@
             android:layout_marginEnd="16dp"
             android:checked="@{viewModel.isUiSecureModeEnabled}"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/enable_vfs_switch" />
+            app:layout_constraintTop_toBottomOf="@id/enable_vfs_subtitle" />
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/settings_title_style"