diff --git a/app/src/main/res/drawable/ic_comment_white.xml b/app/src/main/res/drawable/ic_comment_white.xml
deleted file mode 100644
index 74f759c9e..000000000
--- a/app/src/main/res/drawable/ic_comment_white.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-  ~ Nextcloud Talk application
-  ~  
-  ~ @author Mario Danic
-  ~ Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com>
-  ~  
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ at your option) any later version.
-  ~  
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~  
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M6.667,4C4.089,4 2,6.105 2,8.7v11.282c0,2.597 2.09,4.701 4.667,4.701 1.716,0.01 12.083,0.003 17.057,0 1.115,0.842 1.807,1.748 3.057,3.206a0.93,0.93 0,0 0,0.561 0.103,0.969 0.969,0 0,0 0.445,-0.187c0.302,-0.223 0.466,-0.603 0.427,-0.988l-0.314,-2.912a4.699,4.699 0,0 0,2.1 -3.923L30,8.701C30,6.105 27.91,4 25.333,4zM10.4,12.461c1.03,0 1.867,0.842 1.867,1.88 0,1.676 -2.01,2.514 -3.187,1.33 -1.176,-1.184 -0.343,-3.21 1.32,-3.21zM16,12.461c1.03,0 1.867,0.842 1.867,1.88 0,1.676 -2.01,2.514 -3.187,1.33 -1.176,-1.184 -0.343,-3.21 1.32,-3.21zM21.6,12.461c1.03,0 1.867,0.842 1.867,1.88 0,1.676 -2.01,2.514 -3.187,1.33 -1.176,-1.184 -0.343,-3.21 1.32,-3.21z"/>
-</vector>
diff --git a/app/src/main/res/layout/dialog_poll_create.xml b/app/src/main/res/layout/dialog_poll_create.xml
index 46c6cb9b9..78f35ba50 100644
--- a/app/src/main/res/layout/dialog_poll_create.xml
+++ b/app/src/main/res/layout/dialog_poll_create.xml
@@ -37,7 +37,7 @@
         android:layout_height="wrap_content"
         android:textColor="@color/colorPrimary"
         android:textStyle="bold"
-        android:text="Question" />
+        android:text="@string/polls_question" />
 
     <com.nextcloud.talk.utils.EmojiTextInputEditText
         android:id="@+id/poll_create_question"
@@ -51,7 +51,7 @@
         android:textColor="@color/colorPrimary"
         android:textStyle="bold"
         android:layout_marginTop="@dimen/standard_margin"
-        android:text="Options" />
+        android:text="@string/polls_options" />
 
     <LinearLayout
         android:id="@+id/poll_create_options_list_wrapper"
@@ -86,19 +86,19 @@
         android:layout_marginTop="@dimen/standard_margin"
         android:layout_marginBottom="@dimen/standard_half_margin"
 
-        android:text="Settings" />
+        android:text="@string/polls_settings" />
 
     <CheckBox
         android:id="@+id/poll_private_poll_checkbox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Private poll" />
+        android:text="@string/polls_private_poll" />
 
     <CheckBox
         android:id="@+id/poll_multiple_answers_checkbox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Multiple answers" />
+        android:text="@string/polls_multiple_answers" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/poll_create_options_item.xml b/app/src/main/res/layout/poll_create_options_item.xml
index 44ba09ebb..2ae9e0fcf 100644
--- a/app/src/main/res/layout/poll_create_options_item.xml
+++ b/app/src/main/res/layout/poll_create_options_item.xml
@@ -31,7 +31,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:singleLine="true" />
+        android:singleLine="true"
+        android:inputType="text"
+        tools:ignore="Autofill,LabelFor" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/poll_option_delete"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 79b644bc3..e12eafb77 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -544,6 +544,11 @@
     <string name="polls_end_poll_confirm">Do you really want to end this poll? This can\'t be undone.</string>
     <string name="polls_max_votes_reached">You can\'t vote with more options for this poll.</string>
     <string name="polls_results_subtitle">Results</string>
+    <string name="polls_question">Question</string>
+    <string name="polls_options">Options</string>
+    <string name="polls_settings">Settings</string>
+    <string name="polls_private_poll">Private poll</string>
+    <string name="polls_multiple_answers">Multiple answers</string>
 
     <string name="title_attachments">Attachments</string>