diff --git a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
index 96d1bdda1..6a92b1ea3 100644
--- a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
@@ -245,6 +245,7 @@
                     app:layout_constraintStart_toStartOf="@id/transport"/>
 
                 <androidx.appcompat.widget.AppCompatSpinner
+                    style="@style/default_text_style"
                     android:id="@+id/transport"
                     android:layout_width="0dp"
                     android:layout_height="50dp"
@@ -392,7 +393,6 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="18dp"
                     android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
                     android:labelFor="@id/outbound_proxy"
                     android:text="@string/account_settings_outbound_proxy_title"
                     app:layout_constraintTop_toBottomOf="@id/proxy"
@@ -403,7 +403,7 @@
                     android:onClick="@{outboundProxyTooltipClickListener}"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="16dp"
                     android:src="@drawable/info"
                     android:contentDescription="@string/content_description_click_for_more_info"
                     app:tint="?attr/color_main2_600"
diff --git a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
index c992cd2c6..773b37767 100644
--- a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
+++ b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
@@ -215,6 +215,7 @@
                     app:layout_constraintStart_toStartOf="@id/transport"/>
 
                 <androidx.appcompat.widget.AppCompatSpinner
+                    style="@style/default_text_style"
                     android:id="@+id/transport"
                     android:layout_width="0dp"
                     android:layout_height="50dp"
@@ -341,7 +342,6 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="18dp"
                     android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
                     android:labelFor="@id/outbound_proxy"
                     android:text="@string/account_settings_outbound_proxy_title"
                     app:layout_constraintTop_toBottomOf="@id/proxy"
@@ -352,7 +352,7 @@
                     android:onClick="@{outboundProxyTooltipClickListener}"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="16dp"
                     android:src="@drawable/info"
                     android:contentDescription="@string/content_description_click_for_more_info"
                     app:tint="?attr/color_main2_600"
diff --git a/app/src/main/res/layout/meeting_edit_fragment.xml b/app/src/main/res/layout/meeting_edit_fragment.xml
index 88818606f..3b4044fec 100644
--- a/app/src/main/res/layout/meeting_edit_fragment.xml
+++ b/app/src/main/res/layout/meeting_edit_fragment.xml
@@ -200,7 +200,6 @@
                             android:popupBackground="@drawable/shape_squircle_white_background"
                             android:background="@drawable/edit_text_background"
                             app:layout_constraintHorizontal_bias="0"
-                            app:layout_constraintWidth_max="@dimen/text_input_max_width"
                             app:layout_constraintTop_toBottomOf="@id/timezone_label"
                             app:layout_constraintStart_toStartOf="@id/timezone_label"
                             app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/meeting_schedule_fragment.xml b/app/src/main/res/layout/meeting_schedule_fragment.xml
index 6797243bd..85c6e05a3 100644
--- a/app/src/main/res/layout/meeting_schedule_fragment.xml
+++ b/app/src/main/res/layout/meeting_schedule_fragment.xml
@@ -338,7 +338,6 @@
                             android:popupBackground="@drawable/shape_squircle_white_background"
                             android:background="@drawable/edit_text_background"
                             app:layout_constraintHorizontal_bias="0"
-                            app:layout_constraintWidth_max="@dimen/text_input_max_width"
                             app:layout_constraintTop_toBottomOf="@id/timezone_label"
                             app:layout_constraintStart_toStartOf="@id/timezone_label"
                             app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/settings_advanced_calls_auto_answer.xml b/app/src/main/res/layout/settings_advanced_calls_auto_answer.xml
index f43c45000..215325f44 100644
--- a/app/src/main/res/layout/settings_advanced_calls_auto_answer.xml
+++ b/app/src/main/res/layout/settings_advanced_calls_auto_answer.xml
@@ -73,7 +73,6 @@
             android:inputType="number"
             android:hint="@string/settings_advanced_enable_auto_answer_incoming_calls_after_delay_hint"
             app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintTop_toBottomOf="@id/auto_answer_incoming_calls_delay_title"
             app:layout_constraintStart_toStartOf="@id/auto_answer_incoming_calls_delay_title"
             app:layout_constraintEnd_toEndOf="parent"/>
diff --git a/app/src/main/res/layout/settings_advanced_calls_fragment.xml b/app/src/main/res/layout/settings_advanced_calls_fragment.xml
index 0a59850e2..e8c1bc348 100644
--- a/app/src/main/res/layout/settings_advanced_calls_fragment.xml
+++ b/app/src/main/res/layout/settings_advanced_calls_fragment.xml
@@ -174,7 +174,6 @@
                         android:popupBackground="@drawable/shape_squircle_white_background"
                         android:background="@drawable/edit_text_background"
                         app:layout_constraintHorizontal_bias="0"
-                        app:layout_constraintWidth_max="@dimen/text_input_max_width"
                         app:layout_constraintTop_toBottomOf="@id/media_encryption_label"
                         app:layout_constraintStart_toStartOf="@id/media_encryption_label"
                         app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/settings_advanced_fragment.xml b/app/src/main/res/layout/settings_advanced_fragment.xml
index 13bea8c06..f223468dc 100644
--- a/app/src/main/res/layout/settings_advanced_fragment.xml
+++ b/app/src/main/res/layout/settings_advanced_fragment.xml
@@ -186,7 +186,6 @@
                         android:inputType="text|textUri"
                         android:hint="@string/settings_advanced_device_id_hint"
                         app:layout_constraintHorizontal_bias="0"
-                        app:layout_constraintWidth_max="@dimen/text_input_max_width"
                         app:layout_constraintTop_toBottomOf="@id/device_id_label"
                         app:layout_constraintStart_toStartOf="@id/device_id_label"
                         app:layout_constraintEnd_toEndOf="parent"/>
@@ -218,7 +217,6 @@
                         android:inputType="text|textUri"
                         android:hint="@string/settings_advanced_remote_provisioning_url"
                         app:layout_constraintHorizontal_bias="0"
-                        app:layout_constraintWidth_max="@dimen/text_input_max_width"
                         app:layout_constraintTop_toBottomOf="@id/remote_provisioning_label"
                         app:layout_constraintStart_toStartOf="@id/remote_provisioning_label"
                         app:layout_constraintEnd_toEndOf="parent"/>
@@ -314,7 +312,6 @@
                         android:background="@drawable/edit_text_background"
                         android:visibility="@{viewModel.expandAudioDevices ? View.VISIBLE : View.GONE}"
                         app:layout_constraintHorizontal_bias="0"
-                        app:layout_constraintWidth_max="@dimen/text_input_max_width"
                         app:layout_constraintTop_toBottomOf="@id/input_audio_device_label"
                         app:layout_constraintStart_toStartOf="@id/input_audio_device_label"
                         app:layout_constraintEnd_toEndOf="parent" />
@@ -363,7 +360,6 @@
                         android:background="@drawable/edit_text_background"
                         android:visibility="@{viewModel.expandAudioDevices ? View.VISIBLE : View.GONE}"
                         app:layout_constraintHorizontal_bias="0"
-                        app:layout_constraintWidth_max="@dimen/text_input_max_width"
                         app:layout_constraintTop_toBottomOf="@id/output_audio_device_label"
                         app:layout_constraintStart_toStartOf="@id/output_audio_device_label"
                         app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/settings_contacts.xml b/app/src/main/res/layout/settings_contacts.xml
index 83c367768..99996f6ad 100644
--- a/app/src/main/res/layout/settings_contacts.xml
+++ b/app/src/main/res/layout/settings_contacts.xml
@@ -32,7 +32,7 @@
             app:layout_constraintEnd_toEndOf="parent"/>
 
         <androidx.appcompat.widget.AppCompatSpinner
-            style="@style/material_switch_style"
+            style="@style/default_text_style"
             android:id="@+id/sort_contacts_by_first_name_spinner"
             android:layout_width="0dp"
             android:layout_height="50dp"
@@ -44,7 +44,6 @@
             android:spinnerMode="dropdown"
             android:popupBackground="@drawable/shape_squircle_white_background"
             app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintTop_toBottomOf="@id/sort_contacts_by_first_name_title"
             app:layout_constraintStart_toStartOf="@id/sort_contacts_by_first_name_title"
             app:layout_constraintEnd_toEndOf="@id/sort_contacts_by_first_name_title" />
diff --git a/app/src/main/res/layout/settings_developer_fragment.xml b/app/src/main/res/layout/settings_developer_fragment.xml
index 441e91f63..86ba8256d 100644
--- a/app/src/main/res/layout/settings_developer_fragment.xml
+++ b/app/src/main/res/layout/settings_developer_fragment.xml
@@ -157,7 +157,6 @@
                         android:inputType="text|textUri"
                         android:hint="@string/settings_advanced_upload_server_url"
                         app:layout_constraintHorizontal_bias="0"
-                        app:layout_constraintWidth_max="@dimen/text_input_max_width"
                         app:layout_constraintTop_toBottomOf="@id/upload_server_url_label"
                         app:layout_constraintStart_toStartOf="@id/upload_server_url_label"
                         app:layout_constraintEnd_toEndOf="parent"/>
@@ -189,7 +188,6 @@
                         android:inputType="text|textUri"
                         android:hint="@string/settings_advanced_logs_upload_server_url"
                         app:layout_constraintHorizontal_bias="0"
-                        app:layout_constraintWidth_max="@dimen/text_input_max_width"
                         app:layout_constraintTop_toBottomOf="@id/logs_upload_server_url_label"
                         app:layout_constraintStart_toStartOf="@id/logs_upload_server_url_label"
                         app:layout_constraintEnd_toEndOf="parent"/>
@@ -310,7 +308,6 @@
                         android:inputType="text|textNoSuggestions"
                         android:hint="@string/settings_developer_push_compatible_domains_list_title"
                         app:layout_constraintHorizontal_bias="0"
-                        app:layout_constraintWidth_max="@dimen/text_input_max_width"
                         app:layout_constraintTop_toBottomOf="@id/push_compatible_domains_list_label"
                         app:layout_constraintStart_toStartOf="@id/push_compatible_domains_list_label"
                         app:layout_constraintEnd_toEndOf="parent"/>
diff --git a/app/src/main/res/layout/settings_meetings.xml b/app/src/main/res/layout/settings_meetings.xml
index e9697f846..e3cee2fb0 100644
--- a/app/src/main/res/layout/settings_meetings.xml
+++ b/app/src/main/res/layout/settings_meetings.xml
@@ -62,7 +62,7 @@
             app:layout_constraintEnd_toEndOf="parent"/>
 
         <androidx.appcompat.widget.AppCompatSpinner
-            style="@style/material_switch_style"
+            style="@style/default_text_style"
             android:id="@+id/layout_spinner"
             android:layout_width="0dp"
             android:layout_height="50dp"
@@ -74,7 +74,6 @@
             android:spinnerMode="dropdown"
             android:popupBackground="@drawable/shape_squircle_white_background"
             app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintTop_toBottomOf="@id/layout_title"
             app:layout_constraintStart_toStartOf="@id/layout_title"
             app:layout_constraintEnd_toEndOf="@id/layout_title" />
diff --git a/app/src/main/res/layout/settings_tunnel.xml b/app/src/main/res/layout/settings_tunnel.xml
index 175042ec0..ca29376aa 100644
--- a/app/src/main/res/layout/settings_tunnel.xml
+++ b/app/src/main/res/layout/settings_tunnel.xml
@@ -210,7 +210,6 @@
             android:popupBackground="@drawable/shape_squircle_white_background"
             android:background="@drawable/edit_text_background"
             app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintTop_toBottomOf="@id/tunnel_mode_label"
             app:layout_constraintStart_toStartOf="@id/tunnel_mode_label"
             app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/settings_user_interface.xml b/app/src/main/res/layout/settings_user_interface.xml
index 5f1d3c000..df55a03ee 100644
--- a/app/src/main/res/layout/settings_user_interface.xml
+++ b/app/src/main/res/layout/settings_user_interface.xml
@@ -74,7 +74,7 @@
             app:layout_constraintEnd_toEndOf="parent"/>
 
         <androidx.appcompat.widget.AppCompatSpinner
-            style="@style/material_switch_style"
+            style="@style/default_text_style"
             android:id="@+id/theme_spinner"
             android:layout_width="0dp"
             android:layout_height="50dp"
@@ -86,7 +86,6 @@
             android:spinnerMode="dropdown"
             android:popupBackground="@drawable/shape_squircle_white_background"
             app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintTop_toBottomOf="@id/theme_title"
             app:layout_constraintStart_toStartOf="@id/theme_title"
             app:layout_constraintEnd_toEndOf="@id/theme_title" />
@@ -120,7 +119,7 @@
             app:layout_constraintEnd_toEndOf="parent"/>
 
         <androidx.appcompat.widget.AppCompatSpinner
-            style="@style/material_switch_style"
+            style="@style/default_text_style"
             android:id="@+id/color_spinner"
             android:layout_width="0dp"
             android:layout_height="50dp"
@@ -132,7 +131,6 @@
             android:spinnerMode="dropdown"
             android:popupBackground="@drawable/shape_squircle_white_background"
             app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintTop_toBottomOf="@id/color_title"
             app:layout_constraintStart_toStartOf="@id/color_title"
             app:layout_constraintEnd_toEndOf="@id/color_title" />