diff --git a/include/SideBarActions.h b/include/SideBarActions.h
index f9b9bb1c..5d3c6170 100644
--- a/include/SideBarActions.h
+++ b/include/SideBarActions.h
@@ -28,6 +28,7 @@ signals:
 
 protected:
         void resizeEvent(QResizeEvent *event) override;
+        void paintEvent(QPaintEvent *event) override;
 
 private:
         QHBoxLayout *layout_;
diff --git a/resources/styles/nheko-dark.qss b/resources/styles/nheko-dark.qss
index 88631858..584b2389 100644
--- a/resources/styles/nheko-dark.qss
+++ b/resources/styles/nheko-dark.qss
@@ -7,6 +7,11 @@ QLabel {
     background-color: #383c4a;
 }
 
+#sideBar {
+    border: none;
+    border-right: 1px solid #414A59;
+}
+
 TimelineView,
 TimelineView > * {
     background-color: #383c4a;
@@ -73,6 +78,11 @@ UserInfoWidget, UserInfoWidget > * {
     color: #b0b3ba;
 }
 
+UserInfoWidget {
+    border: none;
+    border-bottom: 1px solid #414A59;
+}
+
 UserSettingsPage {
     background-color: #383c4a;
 }
@@ -142,3 +152,13 @@ ScrollBar {
     qproperty-handleColor: #caccd1;
     qproperty-backgroundColor: #383c4e;
 }
+
+SideBarActions {
+    border: none;
+    border-top: 1px solid #414A59;
+}
+
+TopRoomBar {
+    border: none;
+    border-bottom: 1px solid #414A59;
+}
diff --git a/resources/styles/nheko.qss b/resources/styles/nheko.qss
index a5f99353..1e300494 100644
--- a/resources/styles/nheko.qss
+++ b/resources/styles/nheko.qss
@@ -7,6 +7,11 @@ QLabel {
     background-color: white;
 }
 
+#sideBar {
+    border: none;
+    border-right: 1px solid #dcdcdc;
+}
+
 TimelineView,
 TimelineView > * {
     background-color: white;
@@ -76,6 +81,11 @@ UserInfoWidget, UserInfoWidget > * {
     color: #ebebeb;
 }
 
+UserInfoWidget {
+    border: none;
+    border-bottom: 1px solid #dcdcdc;
+}
+
 UserSettingsPage {
     background-color: white;
 }
@@ -139,3 +149,13 @@ ScrollBar {
     qproperty-handleColor: #ccc;
     qproperty-backgroundColor: #efefef;
 }
+
+SideBarActions {
+    border: none;
+    border-top: 1px solid #dcdcdc;
+}
+
+TopRoomBar {
+    border: none;
+    border-bottom: 1px solid #dcdcdc;
+}
diff --git a/resources/styles/system.qss b/resources/styles/system.qss
index 42aba09d..ab9dcd8e 100644
--- a/resources/styles/system.qss
+++ b/resources/styles/system.qss
@@ -8,6 +8,11 @@ OverlayWidget > * {
     background-color: palette(window);
 }
 
+#sideBar {
+    border: none;
+    border-right: 1px solid palette(text);
+}
+
 TimelineView,
 TimelineView > *,
 TimelineItem,
@@ -79,6 +84,11 @@ UserInfoWidget > * {
     background-color: palette(window);
 }
 
+UserInfoWidget {
+    border: none;
+    border-bottom: 1px solid palette(text);
+}
+
 emoji--Category,
 emoji--Category > * {
     background-color: palette(window);
@@ -108,3 +118,13 @@ QListWidget {
     background-color: palette(window);
     color: palette(text);
 }
+
+SideBarActions {
+    border: none;
+    border-top: 1px solid palette(text);
+}
+
+TopRoomBar {
+    border: none;
+    border-bottom: 1px solid palette(text);
+}
diff --git a/src/ChatPage.cc b/src/ChatPage.cc
index b2ffdfa7..71552bcf 100644
--- a/src/ChatPage.cc
+++ b/src/ChatPage.cc
@@ -78,6 +78,7 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client,
 
         // SideBar
         sideBar_ = new QFrame(this);
+        sideBar_->setObjectName("sideBar");
         sideBar_->setMinimumWidth(ui::sidebar::NormalSize);
         sideBarLayout_ = new QVBoxLayout(sideBar_);
         sideBarLayout_->setSpacing(0);
diff --git a/src/SideBarActions.cc b/src/SideBarActions.cc
index c09821ff..7c4cebbd 100644
--- a/src/SideBarActions.cc
+++ b/src/SideBarActions.cc
@@ -131,3 +131,12 @@ SideBarActions::resizeEvent(QResizeEvent *event)
                 createRoomBtn_->show();
         }
 }
+
+void
+SideBarActions::paintEvent(QPaintEvent *)
+{
+        QStyleOption opt;
+        opt.init(this);
+        QPainter p(this);
+        style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
+}