diff --git a/app/src/main/res/layout/dialog_poll.xml b/app/src/main/res/layout/dialog_poll.xml
index d5e2aa73..7c16c89f 100644
--- a/app/src/main/res/layout/dialog_poll.xml
+++ b/app/src/main/res/layout/dialog_poll.xml
@@ -42,7 +42,14 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
-		android:gravity="center_vertical">
+		android:gravity="center_vertical"
+		android:layout_marginTop="@dimen/dialog_poll_layout_margins">
+
+		<com.kyleduo.switchbutton.SwitchButton
+			android:id="@+id/dialog_poll_mul_choice"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginEnd="@dimen/dialog_poll_layout_margins"/>
 
 		<TextView
 			android:id="@+id/dialog_poll_mul_choice_label"
@@ -51,12 +58,20 @@
 			android:layout_weight="2"
 			android:text="@string/dialog_poll_mc"
 			android:lines="1"
-			android:gravity="end"
 			android:textSize="@dimen/dialog_poll_textsize_small"
 			android:layout_marginEnd="@dimen/dialog_poll_layout_margins"/>
 
+	</LinearLayout>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:gravity="center_vertical"
+		android:layout_marginTop="@dimen/dialog_poll_layout_margins">
+
 		<com.kyleduo.switchbutton.SwitchButton
-			android:id="@+id/dialog_poll_mul_choice"
+			android:id="@+id/dialog_poll_hide_total"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginEnd="@dimen/dialog_poll_layout_margins"/>
@@ -68,27 +83,16 @@
 			android:layout_weight="1"
 			android:text="@string/dialog_poll_hide"
 			android:lines="1"
-			android:gravity="end"
 			android:textSize="@dimen/dialog_poll_textsize_small" />
 
-		<com.kyleduo.switchbutton.SwitchButton
-			android:id="@+id/dialog_poll_hide_total"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="@dimen/dialog_poll_layout_margins"/>
-
-		<View
-			android:id="@+id/dialog_poll_switch_placeholder"
-			android:layout_width="0dp"
-			android:layout_height="match_parent"
-			android:layout_weight="1"/>
 	</LinearLayout>
 
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
-		android:gravity="center_vertical">
+		android:gravity="center_vertical"
+		android:layout_marginTop="@dimen/dialog_poll_layout_margins">
 
 		<EditText
 			android:id="@+id/dialog_poll_duration_input"
diff --git a/app/src/main/res/layout/dialog_status.xml b/app/src/main/res/layout/dialog_status.xml
index fb50e1fd..474ccb08 100644
--- a/app/src/main/res/layout/dialog_status.xml
+++ b/app/src/main/res/layout/dialog_status.xml
@@ -64,7 +64,7 @@
 			android:layout_height="wrap_content"
 			android:text="@string/dialog_status_visibility"
 			android:layout_marginEnd="@dimen/dialog_status_layout_margins"
-			android:layout_weight="1"
+			android:layout_weight="2"
 			android:gravity="end"
 			android:lines="1"/>
 
@@ -72,7 +72,7 @@
 			android:id="@+id/dialog_status_visibility"
 			android:layout_width="0dp"
 			android:layout_height="@dimen/dialog_status_dropdown_height"
-			android:layout_weight="2"/>
+			android:layout_weight="3"/>
 
 	</LinearLayout>
 
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 870470ff..f2ea80e2 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -288,7 +288,7 @@
 	<string name="settings_description_local_timeline">nur lokale Timeline zeigen</string>
 	<string name="dialog_poll_close">Dialogfenster schließen</string>
 	<string name="dialog_status_title">Statuseinstellungen</string>
-	<string name="dialog_status_sensitive">sensibel</string>
-	<string name="dialog_status_spoiler">Spoiler</string>
+	<string name="dialog_status_sensitive">Inhalt als sensibel markieren</string>
+	<string name="dialog_status_spoiler">Inhalt als Spoiler markieren</string>
 	<string name="dialog_status_visibility">Sichtbarkeit</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d6baf7fd..cc78b927 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -315,7 +315,7 @@
 	<string name="poll_option_edit_button">add/remove</string>
 	<string name="dialog_poll_close">close dialog</string>
 	<string name="dialog_status_title">Status preferences</string>
-	<string name="dialog_status_sensitive">sensitive</string>
-	<string name="dialog_status_spoiler">Spoiler</string>
+	<string name="dialog_status_sensitive">mark content as sensitive</string>
+	<string name="dialog_status_spoiler">mark content as spoiler</string>
 	<string name="dialog_status_visibility">Visibility</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2c5897ca..f2981758 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -55,7 +55,7 @@
 	</style>
 
 	<style name="StatusDialog" parent="Theme.AppCompat.Dialog">
-		<item name="android:windowMinWidthMinor">50%</item>
+		<item name="android:windowMinWidthMinor">80%</item>
 	</style>
 
 	<!-- activity enter/exit animations -->