diff --git a/ui/EventView.qml b/ui/EventView.qml
index b479ed7187e8f903f44d22832ae161d80a8472ea..f3c7d7444ee5ad5adb5100baf19028ad94daa7b6 100644
--- a/ui/EventView.qml
+++ b/ui/EventView.qml
@@ -280,11 +280,14 @@ Cras nec ante sit amet augue sodales iaculis. Aliquam erat volutpat. Nam aliquet
                     font.bold: true
                     verticalAlignment: Text.AlignTop
                     Layout.alignment: Qt.AlignTop
+                    Layout.topMargin: 8
                 }
                 Label {
                     id: address
                     Layout.fillWidth: true
-                    Layout.preferredWidth: address.implicitWidth
+                    Layout.maximumWidth: address.implicitWidth
+                    Layout.minimumWidth: 24
+                    Layout.topMargin: 8
                     wrapMode: TextEdit.Wrap
                     text: root.locationAddress
                     font.underline: true
@@ -298,16 +301,21 @@ Cras nec ante sit amet augue sodales iaculis. Aliquam erat volutpat. Nam aliquet
                     verticalAlignment: Text.AlignTop
                     Layout.alignment: Qt.AlignTop
                 }
-                ToolButton {
-                    Layout.fillWidth: true
+                RoundButton {
+                    Layout.fillWidth: false
                     Layout.alignment: Qt.AlignTop | Qt.AlignLeft
-                    Layout.minimumWidth: implicitWidth
+                    Layout.preferredWidth: implicitWidth
                     Layout.rightMargin: 6
 
                     padding: 8
                     topInset: 0
                     bottomInset: 0
+                    leftInset: 0
+                    rightInset: 0
 
+                    flat: true
+                    highlighted: true
+                    Material.accent: Material.DeepPurple
 
                     font.family: "Material Design Icons"
                     font.pointSize: (fontPointSize || 16) * 1.5
@@ -359,6 +367,8 @@ Cras nec ante sit amet augue sodales iaculis. Aliquam erat volutpat. Nam aliquet
                         RoundButton {
                             id: addToCalendar
 
+                            padding: 8
+
                             font.family: "Material Design Icons"
                             font.pixelSize: 24
                             text: MdiFont.Icon.calendarPlus
@@ -383,6 +393,8 @@ Cras nec ante sit amet augue sodales iaculis. Aliquam erat volutpat. Nam aliquet
                             id: show
                             visible: root.urlProvided
 
+                            padding: 8
+
                             font.family: "Material Design Icons"
                             font.pixelSize: 24
                             text: MdiFont.Icon.web
@@ -406,6 +418,9 @@ Cras nec ante sit amet augue sodales iaculis. Aliquam erat volutpat. Nam aliquet
                         RoundButton {
                             id: share
                             visible: root.urlProvided
+
+                            padding: 8
+
                             font.family: "Material Design Icons"
                             font.pixelSize: 24
                             text: MdiFont.Icon.shareVariant