diff --git a/app/src/main/res/layout/dialog_poll_results.xml b/app/src/main/res/layout/dialog_poll_results.xml
index e76662d56..43afda4ee 100644
--- a/app/src/main/res/layout/dialog_poll_results.xml
+++ b/app/src/main/res/layout/dialog_poll_results.xml
@@ -42,26 +42,27 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/standard_margin"
-        android:gravity="end">
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/poll_results_end_poll_button"
-            style="@style/Button.Borderless"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/standard_margin"
-            android:minHeight="@dimen/min_size_clickable_area"
-            android:text="@string/polls_end_poll"
-            app:cornerRadius="@dimen/button_corner_radius" />
+        android:orientation="vertical"
+        android:gravity="center">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/edit_vote_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:minHeight="@dimen/min_size_clickable_area"
+            android:minWidth="@dimen/poll_buttons_min_width"
             android:text="@string/polls_edit_vote"
             android:theme="@style/Button.Primary"
             app:cornerRadius="@dimen/button_corner_radius" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/poll_results_end_poll_button"
+            style="@style/Button.Borderless"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minHeight="@dimen/min_size_clickable_area"
+            android:text="@string/polls_end_poll"
+            app:cornerRadius="@dimen/button_corner_radius" />
     </LinearLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_poll_vote.xml b/app/src/main/res/layout/dialog_poll_vote.xml
index 2ce6d32e3..966fb1409 100644
--- a/app/src/main/res/layout/dialog_poll_vote.xml
+++ b/app/src/main/res/layout/dialog_poll_vote.xml
@@ -56,16 +56,17 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/standard_margin"
         android:layout_marginEnd="4dp"
-        android:gravity="end">
+        android:orientation="vertical"
+        android:gravity="center">
 
         <com.google.android.material.button.MaterialButton
-            android:id="@+id/poll_vote_end_poll_button"
-            style="@style/Button.Borderless"
+            android:id="@+id/poll_vote_submit_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/standard_margin"
             android:minHeight="@dimen/min_size_clickable_area"
-            android:text="@string/polls_end_poll"
+            android:minWidth="@dimen/poll_buttons_min_width"
+            android:text="@string/polls_submit_vote"
+            android:theme="@style/Button.Primary"
             app:cornerRadius="@dimen/button_corner_radius" />
 
         <com.google.android.material.button.MaterialButton
@@ -73,20 +74,20 @@
             style="@style/OutlinedButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/standard_margin"
             android:minHeight="@dimen/min_size_clickable_area"
+            android:minWidth="@dimen/poll_buttons_min_width"
             android:text="@string/nc_common_dismiss"
             android:visibility="gone"
             app:cornerRadius="@dimen/button_corner_radius"
             tools:visibility="visible" />
 
         <com.google.android.material.button.MaterialButton
-            android:id="@+id/poll_vote_submit_button"
+            android:id="@+id/poll_vote_end_poll_button"
+            style="@style/Button.Borderless"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:minHeight="@dimen/min_size_clickable_area"
-            android:text="@string/polls_submit_vote"
-            android:theme="@style/Button.Primary"
+            android:text="@string/polls_end_poll"
             app:cornerRadius="@dimen/button_corner_radius" />
     </LinearLayout>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 444cd0df9..b65ccdce3 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -82,4 +82,8 @@
     <dimen name="default_checkbox_dialog_start_margin">18dp</dimen>
 
     <dimen name="mediatab_file_icon_size">50dp</dimen>
+
+    <dimen name="poll_buttons_min_width">150dp</dimen>
+
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0823b6b61..613e13d1c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -272,7 +272,6 @@
         <item name="android:textAllCaps">false</item>
         <item name="android:typeface">sans</item>
         <item name="android:textStyle">bold</item>
-        <item name="android:layout_gravity">center_vertical</item>
     </style>
 
     <style name="TextAppearanceTab" parent="TextAppearance.Design.Tab">