diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/DescriptionFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/DescriptionFragment.java
index 92a571f37..9b1bf121b 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/DescriptionFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/DescriptionFragment.java
@@ -151,8 +151,6 @@ public class DescriptionFragment extends BaseFragment {
         addMetadataItem(inflater, layout, false,
                 R.string.metadata_category, streamInfo.getCategory());
 
-        addTagsMetadataItem(inflater, layout);
-
         addMetadataItem(inflater, layout, false,
                 R.string.metadata_licence, streamInfo.getLicence());
 
@@ -174,6 +172,8 @@ public class DescriptionFragment extends BaseFragment {
                 R.string.metadata_host, streamInfo.getHost());
         addMetadataItem(inflater, layout, true,
                 R.string.metadata_thumbnail_url, streamInfo.getThumbnailUrl());
+
+        addTagsMetadataItem(inflater, layout);
     }
 
     private void addMetadataItem(final LayoutInflater inflater,
diff --git a/app/src/main/res/layout/chip.xml b/app/src/main/res/layout/chip.xml
index f7a55fdf3..41e5223a9 100644
--- a/app/src/main/res/layout/chip.xml
+++ b/app/src/main/res/layout/chip.xml
@@ -2,8 +2,10 @@
 <!-- This is used to inflate a chip with a Material theme, otherwise it would crash -->
 <!-- Theme.MaterialComponents.DayNight is used to guarantee auto day/night switching -->
 <com.google.android.material.chip.Chip xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:theme="@style/Theme.MaterialComponents.DayNight.Bridge"
+    app:chipMinTouchTargetSize="40dp"
     tools:text="I'm a correctly themed chip!" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_metadata.xml b/app/src/main/res/layout/item_metadata.xml
index 43dce5cfb..31dedd880 100644
--- a/app/src/main/res/layout/item_metadata.xml
+++ b/app/src/main/res/layout/item_metadata.xml
@@ -4,26 +4,17 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="6dp"
-    android:paddingBottom="6dp">
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.30" />
+    android:paddingVertical="6dp">
 
     <TextView
         android:id="@+id/metadata_type_view"
-        android:layout_width="0dp"
+        android:layout_width="96dp"
         android:layout_height="wrap_content"
         android:gravity="center_vertical|end"
         android:textAllCaps="true"
         android:textColor="?android:attr/textColorPrimary"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/guideline"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Licence" />
@@ -35,7 +26,7 @@
         android:layout_marginStart="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/guideline"
+        app:layout_constraintStart_toEndOf="@+id/metadata_type_view"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Description Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum." />
 
diff --git a/app/src/main/res/layout/item_metadata_tags.xml b/app/src/main/res/layout/item_metadata_tags.xml
index 69225b353..febe3ff4a 100644
--- a/app/src/main/res/layout/item_metadata_tags.xml
+++ b/app/src/main/res/layout/item_metadata_tags.xml
@@ -2,45 +2,30 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.30" />
+    android:layout_height="match_parent"
+    android:fadeScrollbars="false">
 
     <TextView
+        android:id="@+id/metadata_type_view"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical|end"
+        android:layout_marginTop="8dp"
+        android:gravity="center"
         android:text="@string/metadata_tags"
         android:textAllCaps="true"
         android:textColor="?android:attr/textColorPrimary"
         android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/guideline"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <HorizontalScrollView
-        android:layout_width="0dp"
+    <com.google.android.material.chip.ChipGroup
+        android:id="@+id/metadata_tags_chips"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="-8dp"
-        android:layout_marginBottom="-8dp"
-        android:fadeScrollbars="false"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginTop="8dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/guideline"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/metadata_type_view" />
 
-        <com.google.android.material.chip.ChipGroup
-            android:id="@+id/metadata_tags_chips"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Chip"
-            app:singleLine="true" />
-    </HorizontalScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file