diff --git a/mastodon/src/main/res/layout/edit_timeline.xml b/mastodon/src/main/res/layout/edit_timeline.xml
new file mode 100644
index 000000000..d754d28e5
--- /dev/null
+++ b/mastodon/src/main/res/layout/edit_timeline.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal">
+
+			<ImageButton
+				android:id="@+id/button"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:layout_marginTop="4dp"
+				android:layout_marginStart="24dp"
+				android:layout_marginEnd="6dp"
+				android:background="@drawable/bg_m3_outlined_text_field_nopad"
+				android:minHeight="48dp"
+				android:minWidth="48dp"
+				android:tint="?colorM3OnSurface"
+				android:tooltipText="@string/sk_timeline_icon"
+				android:contentDescription="@string/sk_timeline_icon" />
+
+			<EditText
+				android:id="@+id/input"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="4dp"
+				android:layout_marginStart="6dp"
+				android:layout_marginEnd="24dp"
+				android:layout_weight="1" />
+
+		</LinearLayout>
+
+		<View
+			android:id="@+id/divider"
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:layout_marginTop="24dp"
+			android:visibility="gone"
+			android:background="?colorM3Outline" />
+
+		<Button
+			android:id="@+id/advanced"
+			style="@style/Widget.Mastodon.M3.Button.Outlined"
+			android:background="@drawable/bg_button_m3_tonal_selector"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="24dp"
+			android:layout_marginTop="20dp"
+			android:fontFamily="sans-serif-medium"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="16sp"
+			android:text="@string/sk_advanced_options_show" />
+
+		<LinearLayout
+			android:id="@+id/tag_wrap"
+			android:orientation="vertical"
+			android:visibility="gone"
+			android:layout_marginTop="16dp"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/sk_edit_timeline_tag_main"
+				android:layout_marginStart="24dp"
+				android:layout_marginBottom="12dp"
+				android:layout_marginTop="8dp"
+				android:drawableStart="@drawable/ic_fluent_number_symbol_20_filled"
+				android:drawablePadding="12dp"
+				android:drawableTint="?android:textColorSecondary"
+				android:textColor="?android:textColorSecondary" />
+
+			<EditText
+				android:id="@+id/tag_main"
+				android:hint="@string/sk_edit_timeline_tag_hint"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="24dp"
+				android:layout_marginBottom="16dp" />
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/sk_edit_timeline_tag_any"
+				android:layout_marginStart="24dp"
+				android:layout_marginBottom="12dp"
+				android:drawableStart="@drawable/ic_fluent_shape_union_20_filled"
+				android:drawablePadding="12dp"
+				android:drawableTint="?android:textColorSecondary"
+				android:textColor="?android:textColorSecondary" />
+
+			<com.hootsuite.nachos.NachoTextView
+				style="@style/Widget.Mastodon.M3.EditText"
+				android:id="@+id/tags_any"
+				android:hint="@string/sk_edit_timeline_tags_hint"
+				android:paddingVertical="8sp"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="24dp"
+				android:layout_marginBottom="16dp"
+				app:chipBackground="?colorM3SecondaryContainer"
+				app:chipTextColor="?android:textColorPrimary" />
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/sk_edit_timeline_tag_all"
+				android:layout_marginStart="24dp"
+				android:layout_marginBottom="12dp"
+				android:drawableStart="@drawable/ic_fluent_shape_intersect_20_filled"
+				android:drawablePadding="12dp"
+				android:drawableTint="?android:textColorSecondary"
+				android:textColor="?android:textColorSecondary" />
+
+			<com.hootsuite.nachos.NachoTextView
+				style="@style/Widget.Mastodon.M3.EditText"
+				android:id="@+id/tags_all"
+				android:hint="@string/sk_edit_timeline_tags_hint"
+				android:paddingVertical="8sp"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="24dp"
+				android:layout_marginBottom="16dp"
+				app:chipBackground="?colorM3SecondaryContainer"
+				app:chipTextColor="?android:textColorPrimary" />
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/sk_edit_timeline_tag_none"
+				android:layout_marginStart="24dp"
+				android:layout_marginBottom="8dp"
+				android:drawableStart="@drawable/ic_fluent_shape_subtract_20_filled"
+				android:drawablePadding="16dp"
+				android:drawableTint="?android:textColorSecondary"
+				android:textColor="?android:textColorSecondary" />
+
+			<com.hootsuite.nachos.NachoTextView
+				style="@style/Widget.Mastodon.M3.EditText"
+				android:id="@+id/tags_none"
+				android:hint="@string/sk_edit_timeline_tags_hint"
+				android:paddingVertical="8sp"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="24dp"
+				android:layout_marginBottom="16dp"
+				app:chipBackground="?colorM3SecondaryContainer"
+				app:chipTextColor="?android:textColorPrimary" />
+
+			<TextView
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="24dp"
+				android:layout_marginBottom="8dp"
+				android:textColor="?android:textColorSecondary"
+				android:textSize="14sp"
+				android:text="@string/sk_edit_timeline_tags_explanation" />
+
+			<LinearLayout
+				android:id="@+id/local_only"
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="24dp"
+				android:minHeight="48dp"
+				android:gravity="center_vertical"
+				android:layoutDirection="locale">
+
+				<TextView
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_weight="1"
+					android:paddingVertical="8dp"
+					android:textSize="16sp"
+					android:textColor="?android:textColorPrimary"
+					android:drawableStart="@drawable/ic_fluent_eye_24_regular"
+					android:drawableTint="?android:textColorPrimary"
+					android:drawablePadding="16dp"
+					android:text="@string/sk_hashtag_timeline_local_only_switch" />
+
+				<org.joinmastodon.android.ui.views.M3Switch
+					android:id="@+id/local_only_switch"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginStart="16dp"
+					android:focusable="false"
+					android:clickable="false"/>
+
+			</LinearLayout>
+
+		</LinearLayout>
+	</LinearLayout>
+</ScrollView>
\ No newline at end of file