diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index 3cbc1cc40..f0e18d0d4 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -102,10 +102,10 @@
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="?attr/status_text_medium"
         android:paddingStart="@dimen/status_display_name_padding_end"
         android:paddingEnd="@dimen/status_display_name_padding_end"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="?attr/status_text_medium"
         app:layout_constraintEnd_toStartOf="@id/status_meta_info"
         app:layout_constraintStart_toEndOf="@id/status_display_name"
         app:layout_constraintTop_toTopOf="@id/status_display_name"
@@ -216,42 +216,48 @@
         app:layout_constraintStart_toStartOf="@id/status_display_name"
         app:layout_constraintTop_toBottomOf="@id/status_media_preview_container" />
 
-    <Button
-        android:id="@+id/status_poll_button"
-        style="@style/TuskyButton.Outlined"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:id="@+id/status_poll_button_container"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:gravity="center"
-        android:minWidth="150dp"
-        android:minHeight="0dp"
-        android:paddingLeft="16dp"
-        android:paddingTop="4dp"
-        android:paddingRight="16dp"
-        android:paddingBottom="4dp"
-        android:text="@string/poll_vote"
-        android:textSize="?attr/status_text_medium"
+        android:layout_marginTop="2dp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/status_display_name"
-        app:layout_constraintTop_toBottomOf="@id/status_poll_options" />
+        app:layout_constraintTop_toBottomOf="@id/status_poll_options">
 
-    <Button
-        android:id="@+id/status_poll_results_button"
-        style="@style/TuskyButton.Outlined"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:gravity="center"
-        android:minWidth="150dp"
-        android:minHeight="0dp"
-        android:paddingLeft="16dp"
-        android:paddingTop="4dp"
-        android:paddingRight="16dp"
-        android:paddingBottom="4dp"
-        android:layout_marginStart="4dp"
-        android:text="@string/poll_show_results"
-        android:textSize="?attr/status_text_medium"
-        app:layout_constraintStart_toEndOf="@id/status_poll_button"
-        app:layout_constraintTop_toBottomOf="@id/status_poll_options" />
+        <Button
+            android:id="@+id/status_poll_button"
+            style="@style/TuskyButton.Outlined"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:minHeight="0dp"
+            android:paddingLeft="16dp"
+            android:paddingTop="4dp"
+            android:paddingRight="16dp"
+            android:paddingBottom="4dp"
+            android:text="@string/poll_vote"
+            android:textSize="?attr/status_text_medium" />
+
+        <Button
+            android:id="@+id/status_poll_results_button"
+            style="@style/TuskyButton.Outlined"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginStart="6dp"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:minHeight="0dp"
+            android:paddingLeft="16dp"
+            android:paddingTop="4dp"
+            android:paddingRight="16dp"
+            android:paddingBottom="4dp"
+            android:text="@string/poll_show_results"
+            android:textSize="?attr/status_text_medium" />
+
+    </LinearLayout>
 
     <TextView
         android:id="@+id/status_poll_description"
@@ -260,7 +266,7 @@
         android:layout_marginTop="6dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/status_display_name"
-        app:layout_constraintTop_toBottomOf="@id/status_poll_button"
+        app:layout_constraintTop_toBottomOf="@id/status_poll_button_container"
         tools:text="7 votes • 7 hours remaining" />
 
     <ImageButton
diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml
index 17f123a1d..5f38ccd44 100644
--- a/app/src/main/res/layout/item_status.xml
+++ b/app/src/main/res/layout/item_status.xml
@@ -253,43 +253,49 @@
         app:layout_constraintStart_toStartOf="@id/status_display_name"
         app:layout_constraintTop_toBottomOf="@id/status_media_preview_container" />
 
-    <Button
-        android:id="@+id/status_poll_button"
-        style="@style/TuskyButton.Outlined"
+    <LinearLayout
+        android:id="@+id/status_poll_button_container"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
-        android:gravity="center"
-        android:paddingLeft="16dp"
-        android:paddingTop="4dp"
-        android:minHeight="0dp"
-        android:paddingRight="16dp"
-        android:paddingBottom="4dp"
-        android:text="@string/poll_vote"
-        android:textSize="?attr/status_text_medium"
-        app:layout_constraintEnd_toStartOf="@id/status_poll_results_button"
-        app:layout_constraintStart_toStartOf="@id/status_display_name"
-        app:layout_constraintTop_toBottomOf="@id/status_poll_options" />
-
-    <Button
-        android:id="@+id/status_poll_results_button"
-        style="@style/TuskyButton.Outlined"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
-        android:layout_marginTop="2dp"
         android:layout_marginEnd="14dp"
-        android:gravity="center"
-        android:paddingLeft="16dp"
-        android:paddingTop="4dp"
-        android:minHeight="0dp"
-        android:paddingRight="16dp"
-        android:paddingBottom="4dp"
-        android:text="@string/poll_show_results"
-        android:textSize="?attr/status_text_medium"
+        android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/status_poll_button"
-        app:layout_constraintTop_toBottomOf="@id/status_poll_options" />
+        app:layout_constraintStart_toStartOf="@id/status_display_name"
+        app:layout_constraintTop_toBottomOf="@id/status_poll_options">
+
+        <Button
+            android:id="@+id/status_poll_button"
+            style="@style/TuskyButton.Outlined"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:minHeight="0dp"
+            android:paddingLeft="16dp"
+            android:paddingTop="4dp"
+            android:paddingRight="16dp"
+            android:paddingBottom="4dp"
+            android:text="@string/poll_vote"
+            android:textSize="?attr/status_text_medium" />
+
+        <Button
+            android:id="@+id/status_poll_results_button"
+            style="@style/TuskyButton.Outlined"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginStart="6dp"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:minHeight="0dp"
+            android:paddingLeft="16dp"
+            android:paddingTop="4dp"
+            android:paddingRight="16dp"
+            android:paddingBottom="4dp"
+            android:text="@string/poll_show_results"
+            android:textSize="?attr/status_text_medium" />
+
+    </LinearLayout>
 
     <TextView
         android:id="@+id/status_poll_description"
@@ -300,7 +306,7 @@
         android:textSize="?attr/status_text_medium"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/status_display_name"
-        app:layout_constraintTop_toBottomOf="@id/status_poll_button"
+        app:layout_constraintTop_toBottomOf="@id/status_poll_button_container"
         tools:text="7 votes • 7 hours remaining" />
 
     <com.keylesspalace.tusky.view.ClickableSpanTextView
diff --git a/app/src/main/res/layout/item_status_detailed.xml b/app/src/main/res/layout/item_status_detailed.xml
index 579bace63..80177d9fc 100644
--- a/app/src/main/res/layout/item_status_detailed.xml
+++ b/app/src/main/res/layout/item_status_detailed.xml
@@ -204,43 +204,50 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/status_media_preview_container" />
 
-    <Button
-        android:id="@+id/status_poll_button"
-        style="@style/TuskyButton.Outlined"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:id="@+id/status_poll_button_container"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="14dp"
-        android:layout_marginTop="4dp"
-        android:gravity="center"
-        android:minWidth="150dp"
-        android:minHeight="0dp"
-        android:paddingLeft="16dp"
-        android:paddingTop="4dp"
-        android:paddingRight="16dp"
-        android:paddingBottom="4dp"
-        android:text="@string/poll_vote"
-        android:textSize="?attr/status_text_medium"
+        android:layout_marginTop="2dp"
+        android:layout_marginEnd="14dp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_poll_options" />
+        app:layout_constraintTop_toBottomOf="@id/status_poll_options">
 
-    <Button
-        android:id="@+id/status_poll_results_button"
-        style="@style/TuskyButton.Outlined"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:gravity="center"
-        android:minWidth="150dp"
-        android:minHeight="0dp"
-        android:paddingLeft="16dp"
-        android:paddingTop="4dp"
-        android:paddingRight="16dp"
-        android:paddingBottom="4dp"
-        android:layout_marginStart="4dp"
-        android:text="@string/poll_show_results"
-        android:textSize="?attr/status_text_medium"
-        app:layout_constraintStart_toEndOf="@id/status_poll_button"
-        app:layout_constraintTop_toBottomOf="@id/status_poll_options" />
+        <Button
+            android:id="@+id/status_poll_button"
+            style="@style/TuskyButton.Outlined"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:minHeight="0dp"
+            android:paddingLeft="16dp"
+            android:paddingTop="4dp"
+            android:paddingRight="16dp"
+            android:paddingBottom="4dp"
+            android:text="@string/poll_vote"
+            android:textSize="?attr/status_text_medium" />
+
+        <Button
+            android:id="@+id/status_poll_results_button"
+            style="@style/TuskyButton.Outlined"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginStart="6dp"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:minHeight="0dp"
+            android:paddingLeft="16dp"
+            android:paddingTop="4dp"
+            android:paddingRight="16dp"
+            android:paddingBottom="4dp"
+            android:text="@string/poll_show_results"
+            android:textSize="?attr/status_text_medium" />
+
+    </LinearLayout>
 
     <TextView
         android:id="@+id/status_poll_description"
@@ -252,7 +259,7 @@
         android:textSize="?attr/status_text_medium"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_poll_button"
+        app:layout_constraintTop_toBottomOf="@id/status_poll_button_container"
         tools:text="7 votes • 7 hours remaining" />
 
     <com.keylesspalace.tusky.view.ClickableSpanTextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 92900628e..fadc47a61 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -642,9 +642,8 @@
     <string name="notification_clear_text">Are you sure you want to permanently clear all your notifications?</string>
     <string name="compose_preview_image_description">Actions for image %1$s</string>
 
-    <string name="poll_info_format">
-        <!-- 15 votes • 1 hour left -->
-        %1$s • %2$s</string>
+    <!-- 15 votes • 1 hour left -->
+    <string name="poll_info_format">%1$s • %2$s</string>
     <plurals name="poll_info_votes">
         <item quantity="one">%1$s vote</item>
         <item quantity="other">%1$s votes</item>