5 files changed, 13 insertions, 6 deletions
diff --git a/resources/styles/nheko-dark.qss b/resources/styles/nheko-dark.qss
index 2729343c..d1a3eab2 100644
--- a/resources/styles/nheko-dark.qss
+++ b/resources/styles/nheko-dark.qss
@@ -17,6 +17,11 @@ QLabel {
 TimelineView,
 TimelineView > * {
     background-color: #202228;
+    border: none;
+}
+
+#scroll_widget {
+    background-color: #202228;
 }
 
 QuickSwitcher {
diff --git a/resources/styles/nheko.qss b/resources/styles/nheko.qss
index 163832bd..a446d1da 100644
--- a/resources/styles/nheko.qss
+++ b/resources/styles/nheko.qss
@@ -17,6 +17,11 @@ QLabel {
 TimelineView,
 TimelineView > * {
     background-color: white;
+    border: none;
+}
+
+#scroll_widget {
+    background-color: white;
 }
 
 QuickSwitcher {
diff --git a/resources/styles/system.qss b/resources/styles/system.qss
index 986d2874..5f29a733 100644
--- a/resources/styles/system.qss
+++ b/resources/styles/system.qss
@@ -19,6 +19,7 @@ TimelineView > *,
 TimelineItem,
 TimelineItem > * {
     background-color: palette(window);
+    border: none;
 }
 
 QuickSwitcher {
diff --git a/src/timeline/TimelineView.cpp b/src/timeline/TimelineView.cpp
index 23c8deda..3a4193a0 100644
--- a/src/timeline/TimelineView.cpp
+++ b/src/timeline/TimelineView.cpp
@@ -506,10 +506,8 @@ TimelineView::init()
         scroll_area_->setWidgetResizable(true);
         scroll_area_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
-        scrollbar_ = new ScrollBar(scroll_area_);
-        scroll_area_->setVerticalScrollBar(scrollbar_);
-
         scroll_widget_ = new QWidget(this);
+        scroll_widget_->setObjectName("scroll_widget");
 
         scroll_layout_ = new QVBoxLayout(scroll_widget_);
         scroll_layout_->setContentsMargins(4, 0, 15, 15);
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index 1bbb4def..feab46a3 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -32,9 +32,7 @@
 
 TimelineViewManager::TimelineViewManager(QWidget *parent)
   : QStackedWidget(parent)
-{
-        setStyleSheet("border: none;");
-}
+{}
 
 void
 TimelineViewManager::updateReadReceipts(const QString &room_id,