diff --git a/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist b/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
index ecde1bcc5..2fe360475 100644
--- a/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -12,7 +12,7 @@
 		<key>CoreDataStack.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>20</integer>
+			<integer>27</integer>
 		</dict>
 		<key>Mastodon - ASDK.xcscheme_^#shared#^_</key>
 		<dict>
@@ -37,7 +37,7 @@
 		<key>NotificationService.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>21</integer>
+			<integer>26</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
diff --git a/Mastodon/Scene/Share/View/Decoration/SawToothView.swift b/Mastodon/Scene/Share/View/Decoration/SawToothView.swift
index 8f41abbb3..94dab47fa 100644
--- a/Mastodon/Scene/Share/View/Decoration/SawToothView.swift
+++ b/Mastodon/Scene/Share/View/Decoration/SawToothView.swift
@@ -7,10 +7,13 @@
 
 import Foundation
 import UIKit
+import Combine
 
 final class SawToothView: UIView {
     static let widthUint = 8
 
+    var disposeBag = Set<AnyCancellable>()
+
     override init(frame: CGRect) {
         super.init(frame: frame)
         _init()
@@ -22,7 +25,19 @@ final class SawToothView: UIView {
     }
 
     func _init() {
-        backgroundColor = Asset.Colors.Background.secondarySystemBackground.color
+        setupBackgroundColor(theme: ThemeService.shared.currentTheme.value)
+        ThemeService.shared.currentTheme
+            .receive(on: RunLoop.main)
+            .sink { [weak self] theme in
+                guard let self = self else { return }
+                self.setupBackgroundColor(theme: theme)
+            }
+            .store(in: &disposeBag)
+    }
+
+    private func setupBackgroundColor(theme: Theme) {
+        backgroundColor = theme.secondarySystemBackgroundColor
+        setNeedsDisplay()
     }
 
     override func draw(_ rect: CGRect) {
@@ -37,7 +52,7 @@ final class SawToothView: UIView {
         }
         bezierPath.addLine(to: CGPoint(x: 0, y: bottomY))
         bezierPath.close()
-        Asset.Colors.Background.systemBackground.color.setFill()
+        ThemeService.shared.currentTheme.value.systemBackgroundColor.setFill()
         bezierPath.fill()
         bezierPath.lineWidth = 0
         bezierPath.stroke()
diff --git a/Mastodon/Scene/Share/View/TableviewCell/TimelineLoaderTableViewCell.swift b/Mastodon/Scene/Share/View/TableviewCell/TimelineLoaderTableViewCell.swift
index 271a08a61..b18314df2 100644
--- a/Mastodon/Scene/Share/View/TableviewCell/TimelineLoaderTableViewCell.swift
+++ b/Mastodon/Scene/Share/View/TableviewCell/TimelineLoaderTableViewCell.swift
@@ -16,13 +16,14 @@ class TimelineLoaderTableViewCell: UITableViewCell {
     static let labelFont = UIFontMetrics(forTextStyle: .body).scaledFont(for: .systemFont(ofSize: 17, weight: .medium))
     
     var disposeBag = Set<AnyCancellable>()
+
+    private var _disposeBag = Set<AnyCancellable>()
         
     let stackView = UIStackView()
 
     let loadMoreButton: UIButton = {
         let button = HighlightDimmableButton()
         button.titleLabel?.font = TimelineLoaderTableViewCell.labelFont
-        button.backgroundColor = Asset.Colors.Background.systemBackground.color
         button.setTitleColor(Asset.Colors.brandBlue.color, for: .normal)
         button.setTitle(L10n.Common.Controls.Timeline.Loader.loadMissingPosts, for: .normal)
         button.setTitle("", for: .disabled)
@@ -114,6 +115,19 @@ class TimelineLoaderTableViewCell: UITableViewCell {
         loadMoreButton.isHidden = true
         loadMoreLabel.isHidden = true
         activityIndicatorView.isHidden = true
+
+        setupBackgroundColor(theme: ThemeService.shared.currentTheme.value)
+        ThemeService.shared.currentTheme
+            .receive(on: RunLoop.main)
+            .sink { [weak self] theme in
+                guard let self = self else { return }
+                self.setupBackgroundColor(theme: theme)
+            }
+            .store(in: &_disposeBag)
+    }
+
+    private func setupBackgroundColor(theme: Theme) {
+        loadMoreButton.backgroundColor = theme.systemBackgroundColor
     }
     
 }