diff --git a/imports/Spectral/Component/Timeline/FileDelegate.qml b/imports/Spectral/Component/Timeline/FileDelegate.qml
index b1f26dd..46120d5 100644
--- a/imports/Spectral/Component/Timeline/FileDelegate.qml
+++ b/imports/Spectral/Component/Timeline/FileDelegate.qml
@@ -96,60 +96,8 @@ RowLayout {
         }
 
         background: Rectangle {
-            color: MPalette.background
-            radius: 18
-
-            Rectangle {
-                anchors.top: parent.top
-                anchors.left: parent.left
-
-                width: parent.width / 2
-                height: parent.height / 2
-
-                visible: true
-
-                color: sentByMe ? MPalette.background : eventType === "notice" ? MPalette.primary : MPalette.accent
-                radius: 5
-            }
-
-            Rectangle {
-                anchors.top: parent.top
-                anchors.right: parent.right
-
-                width: parent.width / 2
-                height: parent.height / 2
-
-                visible: true
-
-                color: sentByMe ? MPalette.background : eventType === "notice" ? MPalette.primary : MPalette.accent
-                radius: 5
-            }
-
-            Rectangle {
-                anchors.bottom: parent.bottom
-                anchors.left: parent.left
-
-                width: parent.width / 2
-                height: parent.height / 2
-
-                visible: true
-
-                color: sentByMe ? MPalette.background : eventType === "notice" ? MPalette.primary : MPalette.accent
-                radius: 5
-            }
-
-            Rectangle {
-                anchors.bottom: parent.bottom
-                anchors.right: parent.right
-
-                width: parent.width / 2
-                height: parent.height / 2
-
-                visible: true
-
-                color: sentByMe ? MPalette.background : eventType === "notice" ? MPalette.primary : MPalette.accent
-                radius: 5
-            }
+            color: sentByMe ? MPalette.background : eventType === "notice" ? MPalette.primary : MPalette.accent
+            radius: 2
 
             AutoMouseArea {
                 anchors.fill: parent
diff --git a/imports/Spectral/Component/Timeline/ImageDelegate.qml b/imports/Spectral/Component/Timeline/ImageDelegate.qml
index 3ee9713..e33181b 100644
--- a/imports/Spectral/Component/Timeline/ImageDelegate.qml
+++ b/imports/Spectral/Component/Timeline/ImageDelegate.qml
@@ -91,7 +91,7 @@ RowLayout {
             maskSource: Rectangle {
                 width: img.width
                 height: img.height
-                radius: 5
+                radius: 2
             }
         }
 
diff --git a/imports/Spectral/Component/Timeline/MessageDelegate.qml b/imports/Spectral/Component/Timeline/MessageDelegate.qml
index 1566ae1..edf8a9f 100644
--- a/imports/Spectral/Component/Timeline/MessageDelegate.qml
+++ b/imports/Spectral/Component/Timeline/MessageDelegate.qml
@@ -131,11 +131,11 @@ ColumnLayout {
                 Control {
                     Layout.fillWidth: true
 
-                    Layout.topMargin: 8
-                    Layout.leftMargin: 8
-                    Layout.rightMargin: 8
+                    Layout.topMargin: 4
+                    Layout.leftMargin: 4
+                    Layout.rightMargin: 4
 
-                    padding: 4
+                    padding: 8
                     rightPadding: 12
 
                     visible: replyVisible
@@ -171,7 +171,7 @@ ColumnLayout {
 
                     background: Rectangle {
                         color: sentByMe ? MPalette.accent : MPalette.background
-                        radius: 18
+                        radius: 0
 
                         AutoMouseArea {
                             anchors.fill: parent