diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java b/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java
index fc1f47b7..a658e6bd 100644
--- a/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java
+++ b/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java
@@ -919,10 +919,7 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
 			spoiler.setVisibility(View.GONE);
 			spoiler_hint.setVisibility(View.INVISIBLE);
 		}
-		if (status.getVisibility() == Status.VISIBLE_PUBLIC) {
-			visibility.setText(R.string.status_visibility_public);
-			visibility.setVisibility(View.VISIBLE);
-		} else if (status.getVisibility() == Status.VISIBLE_UNLISTED) {
+		if (status.getVisibility() == Status.VISIBLE_UNLISTED) {
 			visibility.setText(R.string.status_visibility_unlisted);
 			visibility.setVisibility(View.VISIBLE);
 		} else if (status.getVisibility() == Status.VISIBLE_PRIVATE) {
diff --git a/app/src/main/res/layout/page_status.xml b/app/src/main/res/layout/page_status.xml
index 0da23646..4e524a99 100644
--- a/app/src/main/res/layout/page_status.xml
+++ b/app/src/main/res/layout/page_status.xml
@@ -241,6 +241,13 @@
 					app:layout_constraintTop_toBottomOf="@id/page_status_cards_container"
 					app:layout_constraintHorizontal_bias="0.0" />
 
+				<androidx.constraintlayout.widget.Barrier
+					android:id="@+id/page_status_location_barrier"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					app:constraint_referenced_ids="page_status_visibility,page_status_sensitive,page_status_spoiler"
+					app:barrierDirection="bottom" />
+
 				<TextView
 					android:id="@+id/page_status_location_name"
 					android:layout_width="0dp"
@@ -253,7 +260,7 @@
 					android:lines="1"
 					android:textSize="@dimen/page_status_textsize_locale"
 					app:layout_constraintStart_toStartOf="parent"
-					app:layout_constraintTop_toBottomOf="@id/page_status_sensitive"
+					app:layout_constraintTop_toBottomOf="@id/page_status_location_barrier"
 					app:layout_constraintEnd_toEndOf="parent"
 					app:layout_constraintHorizontal_bias="0.0"
 					app:layout_constraintHorizontal_chainStyle="packed" />
@@ -262,6 +269,7 @@
 					android:id="@+id/page_status_api"
 					android:layout_width="0dp"
 					android:layout_height="wrap_content"
+					android:visibility="invisible"
 					android:layout_marginStart="@dimen/page_status_textview_margin"
 					android:layout_marginEnd="@dimen/page_status_textview_margin"
 					android:linksClickable="false"
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index b94b3d2a..7440cec6 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -143,7 +143,6 @@
 	<string name="error_wrong_connection_settings">Falsche Proxykonfiguration! Änderung verwerfen?</string>
 	<string name="error_open_link">Link konnte nicht geöffnet werden!</string>
 	<string name="status_sensitive_media">sensible Inhalte</string>
-	<string name="status_visibility_public">öffentlich</string>
 	<string name="status_visibility_unlisted">ungelistet</string>
 	<string name="status_visibility_private">privat</string>
 	<string name="status_visibility_direct">direkt</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6dc0600e..87c9ec4a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -299,7 +299,6 @@
 	<string name="settings_enable_proxy_auth">enable proxy authentication</string>
 	<string name="status_sensitive_media">sensitive content</string>
 	<string name="status_contains_spoiler">Spoiler</string>
-	<string name="status_visibility_public">public</string>
 	<string name="status_visibility_unlisted">unlisted</string>
 	<string name="status_visibility_private">private</string>
 	<string name="status_visibility_direct">direct</string>