diff --git a/library/ui-styles/src/main/res/color/form_edit_text_hint_color_selector.xml b/library/ui-styles/src/main/res/color/form_edit_text_hint_color_selector.xml
new file mode 100644
index 0000000000..343c42ebf3
--- /dev/null
+++ b/library/ui-styles/src/main/res/color/form_edit_text_hint_color_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?vctr_content_tertiary" android:state_enabled="false" />
+    <item android:color="?vctr_content_tertiary" android:state_focused="false" />
+    <item android:color="?colorPrimary" />
+</selector>
diff --git a/library/ui-styles/src/main/res/color/form_edit_text_stroke_color_selector.xml b/library/ui-styles/src/main/res/color/form_edit_text_stroke_color_selector.xml
new file mode 100644
index 0000000000..7079cc271b
--- /dev/null
+++ b/library/ui-styles/src/main/res/color/form_edit_text_stroke_color_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?colorPrimary" android:state_focused="true"/>
+    <item android:color="?colorPrimary" android:state_hovered="true"/>
+    <item android:color="?colorPrimary" android:state_enabled="false"/>
+    <item android:color="?vctr_content_quinary"/>
+</selector>
diff --git a/library/ui-styles/src/main/res/values/styles_edit_text.xml b/library/ui-styles/src/main/res/values/styles_edit_text.xml
index cc1041a2ce..a1a9f6a7e8 100644
--- a/library/ui-styles/src/main/res/values/styles_edit_text.xml
+++ b/library/ui-styles/src/main/res/values/styles_edit_text.xml
@@ -19,4 +19,9 @@
         <item name="android:textColor">?vctr_message_text_color</item>
     </style>
 
+    <style name="Widget.Vector.EditText.Form" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+        <item name="boxStrokeColor">@color/form_edit_text_stroke_color_selector</item>
+        <item name="android:textColorHint">@color/form_edit_text_hint_color_selector</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/styles_polls.xml b/library/ui-styles/src/main/res/values/styles_polls.xml
new file mode 100644
index 0000000000..ac99a6514b
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/styles_polls.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+   <style name="Widget.Vector.Button.CreatePoll" parent="Widget.Vector.Button">
+       <item name="android:backgroundTint">@color/button_background_tint_selector</item>
+       <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
+       <item name="android:textColor">@android:color/white</item>
+   </style>
+
+</resources>
diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditTextWithDeleteItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextWithDeleteItem.kt
index a4e378a5b9..19c94a1742 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormEditTextWithDeleteItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextWithDeleteItem.kt
@@ -44,6 +44,12 @@ abstract class FormEditTextWithDeleteItem : VectorEpoxyModel<FormEditTextWithDel
     @EpoxyAttribute
     var enabled: Boolean = true
 
+    @EpoxyAttribute
+    var singleLine: Boolean = true
+
+    @EpoxyAttribute
+    var imeOptions: Int? = null
+
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
     var onTextChange: TextListener? = null
 
@@ -64,6 +70,12 @@ abstract class FormEditTextWithDeleteItem : VectorEpoxyModel<FormEditTextWithDel
         holder.textInputEditText.setTextIfDifferent(value)
 
         holder.textInputEditText.isEnabled = enabled
+        if (singleLine) {
+            holder.textInputEditText.setSingleLine()
+        }
+        imeOptions?.let {
+            holder.textInputEditText.imeOptions = it
+        }
 
         holder.textInputEditText.addTextChangedListenerOnce(onTextChangeListener)
 
diff --git a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt
index ee7bcd345e..274532e63f 100644
--- a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt
+++ b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.poll.create
 
 import android.view.Gravity
+import android.view.inputmethod.EditorInfo
 import com.airbnb.epoxy.EpoxyController
 import im.vector.app.R
 import im.vector.app.core.resources.ColorProvider
@@ -69,10 +70,13 @@ class CreatePollController @Inject constructor(
         }
 
         currentState.options.forEachIndexed { index, option ->
+            val imeOptions = if (index == currentState.options.size -1) EditorInfo.IME_ACTION_DONE else EditorInfo.IME_ACTION_NEXT
             formEditTextWithDeleteItem {
                 id("option_$index")
                 value(option)
                 hint(host.stringProvider.getString(R.string.create_poll_options_hint, (index + 1)))
+                singleLine(true)
+                imeOptions(imeOptions)
                 onTextChange {
                     host.callback?.onOptionChanged(index, it)
                 }
diff --git a/vector/src/main/res/layout/fragment_create_poll.xml b/vector/src/main/res/layout/fragment_create_poll.xml
index 841f52f2d8..1911aaefc9 100644
--- a/vector/src/main/res/layout/fragment_create_poll.xml
+++ b/vector/src/main/res/layout/fragment_create_poll.xml
@@ -14,7 +14,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/createPollToolbar"
             android:layout_width="match_parent"
-            android:layout_height="?actionBarSize">
+            android:layout_height="?actionBarSize"
+            app:contentInsetStart="0dp">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
@@ -72,11 +73,13 @@
 
     <Button
         android:id="@+id/createPollButton"
+        style="@style/Widget.Vector.Button.CreatePoll"
         android:layout_width="match_parent"
         android:layout_height="56dp"
         android:layout_margin="16dp"
         android:text="@string/create_poll_button"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:enabled="false" />
 
     <TextView
         android:id="@+id/createPollToast"
@@ -84,8 +87,8 @@
         android:layout_width="wrap_content"
         android:layout_height="48dp"
         android:layout_marginBottom="84dp"
-        android:visibility="gone"
         android:accessibilityLiveRegion="polite"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/item_form_text_input.xml b/vector/src/main/res/layout/item_form_text_input.xml
index adc599f314..a9e76bd68d 100644
--- a/vector/src/main/res/layout/item_form_text_input.xml
+++ b/vector/src/main/res/layout/item_form_text_input.xml
@@ -9,6 +9,7 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/formTextInputTextInputLayout"
+        style="@style/Widget.Vector.EditText.Form"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_form_text_input_with_delete.xml b/vector/src/main/res/layout/item_form_text_input_with_delete.xml
index adf526eab5..e41dbbf50b 100644
--- a/vector/src/main/res/layout/item_form_text_input_with_delete.xml
+++ b/vector/src/main/res/layout/item_form_text_input_with_delete.xml
@@ -9,6 +9,7 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/formTextInputTextInputLayout"
+        style="@style/Widget.Vector.EditText.Form"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"