diff --git a/app/src/main/res/drawable/icon_spinner_background.xml b/app/src/main/res/drawable/icon_spinner_background.xml
index de81ede9d..f50b58b1b 100644
--- a/app/src/main/res/drawable/icon_spinner_background.xml
+++ b/app/src/main/res/drawable/icon_spinner_background.xml
@@ -9,7 +9,7 @@
                         android:endColor="?attr/voipFormBackgroundColor"
                         android:startColor="?attr/voipFormBackgroundColor"
                         android:type="linear" />
-                    <stroke android:width="0.33dp" android:color="?attr/voipFormFieldBackgroundColor" />
+                    <stroke android:width="@dimen/conference_schedule_form_field_border_thickness" android:color="?attr/voipFormFieldBackgroundColor" />
                     <corners android:radius="0dp" />
                     <padding android:bottom="3dp" android:left="3dp" android:right="3dp" android:top="3dp" />
                 </shape>
diff --git a/app/src/main/res/drawable/shape_edittext_background.xml b/app/src/main/res/drawable/shape_edittext_background.xml
index 7738c0b77..825ef744b 100644
--- a/app/src/main/res/drawable/shape_edittext_background.xml
+++ b/app/src/main/res/drawable/shape_edittext_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <stroke android:width="0.33dp" android:color="?attr/voipFormFieldBackgroundColor" />
+    <stroke android:width="@dimen/conference_schedule_form_field_border_thickness" android:color="?attr/voipFormFieldBackgroundColor" />
     <corners android:radius="0dp" />
     <padding android:bottom="3dp" android:left="3dp" android:right="3dp" android:top="3dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/conference_scheduling_summary_fragment.xml b/app/src/main/res/layout/conference_scheduling_summary_fragment.xml
index 5059918a4..988920fda 100644
--- a/app/src/main/res/layout/conference_scheduling_summary_fragment.xml
+++ b/app/src/main/res/layout/conference_scheduling_summary_fragment.xml
@@ -275,7 +275,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="20dp"
-                        android:background="?attr/voipFormBackgroundColor">
+                        android:background="?attr/voipFormDisabledFieldBackgroundColor">
 
                         <TextView
                             android:layout_width="match_parent"
@@ -317,7 +317,7 @@
 
         <include
             layout="@layout/wait_layout"
-            bind:visibility="@{viewModel.conferenceCreationInProgress}" />
+            bind:visibility="@{viewModel.conferenceCreationInProgress, default=gone}" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/history_conf_detail_fragment.xml b/app/src/main/res/layout/history_conf_detail_fragment.xml
index 28eee7057..851a12b1c 100644
--- a/app/src/main/res/layout/history_conf_detail_fragment.xml
+++ b/app/src/main/res/layout/history_conf_detail_fragment.xml
@@ -130,7 +130,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dp"
-                android:background="?attr/voipFormBackgroundColor">
+                android:background="?attr/voipFormDisabledFieldBackgroundColor">
 
                 <TextView
                     style="@style/calls_list_header_font"
@@ -149,7 +149,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?attr/voipFormBackgroundColor">
+                android:background="?attr/voipFormDisabledFieldBackgroundColor">
 
                 <TextView
                     style="@style/calls_list_header_font"
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index b64064459..aa9a7b291 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -57,8 +57,8 @@
         <item name="voipDrawableDisabledColor">@color/voip_dark_color4</item>
         <item name="voipTextColor">@color/white_color</item>
         <item name="voipTextColor2">@color/voip_text_dark_color</item>
-        <item name="voipFormBackgroundColor">@color/voip_dark_color4</item>
-        <item name="voipFormFieldBackgroundColor">@color/voip_dark_color4</item>
+        <item name="voipFormBackgroundColor">@color/voip_dark_color</item>
+        <item name="voipFormFieldBackgroundColor">@color/voip_dark_color5</item>
         <item name="voipFormDisabledFieldBackgroundColor">@color/voip_dark_color4</item>
     </style>
 
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index d9148e09b..03488b7a5 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -63,4 +63,5 @@
     <dimen name="voip_numpad_button_max_size">60dp</dimen>
     <dimen name="voip_conference_audio_only_participant_cell_height">60dp</dimen>
     <dimen name="voip_conference_audio_only_participant_avatar_size">40dp</dimen>
+    <dimen name="conference_schedule_form_field_border_thickness">1dp</dimen>
 </resources>
\ No newline at end of file