diff --git a/Multiplatform/Shared/Timeline/TimelineContainerView.swift b/Multiplatform/Shared/Timeline/TimelineContainerView.swift
index 306119ac1..a258638b5 100644
--- a/Multiplatform/Shared/Timeline/TimelineContainerView.swift
+++ b/Multiplatform/Shared/Timeline/TimelineContainerView.swift
@@ -24,11 +24,37 @@ struct TimelineContainerView: View {
 					timelineModel.delegate = sceneModel
 					timelineModel.rebuildTimelineItems(feed)
 				}
-				.overlay(Group {
+				.toolbar {
 					#if os(iOS)
-					TimelineToolbar()
+					ToolbarItem {
+						Button(action: {
+						}, label: {
+							AppAssets.markAllAsReadImage
+								.foregroundColor(.accentColor)
+						}).help("Mark All As Read")
+					}
+					ToolbarItem {
+						Spacer()
+					}
+					ToolbarItem {
+						Text("Last updated")
+							.font(.caption)
+							.foregroundColor(.secondary)
+					}
+					ToolbarItem {
+						Spacer()
+					}
+					ToolbarItem {
+						Button(action: {
+						}, label: {
+							AppAssets.nextUnreadArticleImage
+								.resizable()
+								.scaledToFit()
+								.frame(width: 22, height: 22, alignment: .center)
+						})
+					}
 					#endif
-				},alignment: .bottom)
+				}
 		} else {
 			EmptyView()
 		}
diff --git a/Multiplatform/Shared/Timeline/TimelineToolbar.swift b/Multiplatform/Shared/Timeline/TimelineToolbar.swift
deleted file mode 100644
index 5344fbd02..000000000
--- a/Multiplatform/Shared/Timeline/TimelineToolbar.swift
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-//  TimelineToolbar.swift
-//  NetNewsWire
-//
-//  Created by Maurice Parker on 7/3/20.
-//  Copyright © 2020 Ranchero Software. All rights reserved.
-//
-
-import SwiftUI
-
-struct TimelineToolbar: View {
-	
-	var body: some View {
-		VStack {
-			Divider()
-			HStack(alignment: .center) {
-				Button(action: {
-				}, label: {
-					AppAssets.markAllAsReadImage
-						.resizable()
-						.scaledToFit()
-						.frame(width: 24, height: 24, alignment: .center)
-						.foregroundColor(.accentColor)
-				}).help("Mark All As Read")
-				
-				Spacer()
-				
-				Text("Last updated")
-					.font(.caption)
-					.foregroundColor(.secondary)
-				
-				Spacer()
-				
-				Button(action: {
-				}, label: {
-					AppAssets.nextUnreadArticleImage
-						.font(.title3)
-						.foregroundColor(.accentColor)
-				})
-				.help("Next Unread")
-			}
-			.padding(.horizontal, 16)
-			.padding(.bottom, 12)
-			.padding(.top, 4)
-		}
-		.background(VisualEffectBlur(blurStyle: .systemChromeMaterial).edgesIgnoringSafeArea(.bottom))
-	
-	}
-}
-
-
-struct TimelineToolbar_Previews: PreviewProvider {
-    static var previews: some View {
-        TimelineToolbar()
-    }
-}
diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj
index 59c2857e6..bdb2dc841 100644
--- a/NetNewsWire.xcodeproj/project.pbxproj
+++ b/NetNewsWire.xcodeproj/project.pbxproj
@@ -222,8 +222,6 @@
 		517A757C24451C1500B553B9 /* OAuthSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 517A755324451BD500B553B9 /* OAuthSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		5181C5AD24AF89B1002E0F70 /* PreferredColorSchemeModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5181C5AC24AF89B1002E0F70 /* PreferredColorSchemeModifier.swift */; };
 		5181C5AE24AF89B1002E0F70 /* PreferredColorSchemeModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5181C5AC24AF89B1002E0F70 /* PreferredColorSchemeModifier.swift */; };
-		5181C64C24B024B4002E0F70 /* TimelineToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5181C64B24B024B4002E0F70 /* TimelineToolbar.swift */; };
-		5181C64D24B024B4002E0F70 /* TimelineToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5181C64B24B024B4002E0F70 /* TimelineToolbar.swift */; };
 		5183CCD0226E1E880010922C /* NonIntrinsicLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCCF226E1E880010922C /* NonIntrinsicLabel.swift */; };
 		5183CCDA226E31A50010922C /* NonIntrinsicImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCD9226E31A50010922C /* NonIntrinsicImageView.swift */; };
 		5183CCE5226F4DFA0010922C /* RefreshInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCE4226F4DFA0010922C /* RefreshInterval.swift */; };
@@ -1850,7 +1848,6 @@
 		517A745A2443665000B553B9 /* UIPageViewController-Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIPageViewController-Extensions.swift"; sourceTree = "<group>"; };
 		517A754424451BD500B553B9 /* OAuthSwift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OAuthSwift.xcodeproj; path = submodules/OAuthSwift/OAuthSwift.xcodeproj; sourceTree = "<group>"; };
 		5181C5AC24AF89B1002E0F70 /* PreferredColorSchemeModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferredColorSchemeModifier.swift; sourceTree = "<group>"; };
-		5181C64B24B024B4002E0F70 /* TimelineToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineToolbar.swift; sourceTree = "<group>"; };
 		5183CCCF226E1E880010922C /* NonIntrinsicLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NonIntrinsicLabel.swift; sourceTree = "<group>"; };
 		5183CCD9226E31A50010922C /* NonIntrinsicImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NonIntrinsicImageView.swift; sourceTree = "<group>"; };
 		5183CCE4226F4DFA0010922C /* RefreshInterval.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RefreshInterval.swift; sourceTree = "<group>"; };
@@ -2694,7 +2691,6 @@
 				514E6C0124AD29A300AC6F6E /* TimelineItemStatusView.swift */,
 				514E6BD924ACEA0400AC6F6E /* TimelineItemView.swift */,
 				51919FF024AB864A00541E64 /* TimelineModel.swift */,
-				5181C64B24B024B4002E0F70 /* TimelineToolbar.swift */,
 				51919FF624AB8B7700541E64 /* TimelineView.swift */,
 			);
 			path = Timeline;
@@ -4815,7 +4811,6 @@
 				514E6BDA24ACEA0400AC6F6E /* TimelineItemView.swift in Sources */,
 				51E4990D24A808C500B667CB /* RSHTMLMetadata+Extension.swift in Sources */,
 				51919FF424AB869C00541E64 /* TimelineItem.swift in Sources */,
-				5181C64C24B024B4002E0F70 /* TimelineToolbar.swift in Sources */,
 				514E6C0224AD29A300AC6F6E /* TimelineItemStatusView.swift in Sources */,
 				51E49A0024A91FC100B667CB /* RegularSidebarContainerView.swift in Sources */,
 				51E4995C24A875F300B667CB /* ArticleRenderer.swift in Sources */,
@@ -4928,7 +4923,6 @@
 				17D232A924AFF10A0005F075 /* AddWebFeedModel.swift in Sources */,
 				51E4993324A867E700B667CB /* AppNotifications.swift in Sources */,
 				51E4990624A808C300B667CB /* ImageDownloader.swift in Sources */,
-				5181C64D24B024B4002E0F70 /* TimelineToolbar.swift in Sources */,
 				51E4994F24A8734C00B667CB /* TwitterFeedProvider-Extensions.swift in Sources */,
 				51E498CA24A8085D00B667CB /* SmartFeedDelegate.swift in Sources */,
 				51E4990524A808C300B667CB /* FeaturedImageDownloader.swift in Sources */,