diff --git a/changelog/unreleased/bugfix-remove-click-event-oc-icon b/changelog/unreleased/bugfix-remove-click-event-oc-icon
new file mode 100644
index 000000000..d15e89648
--- /dev/null
+++ b/changelog/unreleased/bugfix-remove-click-event-oc-icon
@@ -0,0 +1,5 @@
+Bugfix: Remove click event on OcIcon
+
+We have removed an unnecessary default click handler on the OcIcon component, expecting it to increase performance of the UI.
+
+https://github.com/owncloud/owncloud-design-system/pull/2216
diff --git a/changelog/unreleased/enhancement-redesign-notifications b/changelog/unreleased/enhancement-redesign-notifications
index 67512efc9..230056883 100644
--- a/changelog/unreleased/enhancement-redesign-notifications
+++ b/changelog/unreleased/enhancement-redesign-notifications
@@ -4,4 +4,5 @@ We have redesigned the notifications component to fit the overal new look of the
 It can now also be rendered "unpositioned" instead of having it always stick to the top of the screen.
 
 https://github.com/owncloud/owncloud-design-system/pull/2210
+https://github.com/owncloud/owncloud-design-system/pull/2216
 https://github.com/owncloud/web/issues/7082
diff --git a/src/components/atoms/OcIcon/OcIcon.vue b/src/components/atoms/OcIcon/OcIcon.vue
index 9aedbf9c6..ec39483b8 100644
--- a/src/components/atoms/OcIcon/OcIcon.vue
+++ b/src/components/atoms/OcIcon/OcIcon.vue
@@ -7,7 +7,6 @@
       sizeClass(size),
       variationClass(variation),
     ]"
-    @click="onClick"
   >
     <inline-svg
       :src="nameWithFillType"
@@ -169,9 +168,6 @@ export default {
     prefix(string) {
       if (string !== null) return `oc-icon-${string}`
     },
-    onClick() {
-      this.$emit("click")
-    },
     transformSvgElement(svg) {
       if (this.accessibleLabel !== "") {
         const title = document.createElement("title")
diff --git a/src/components/atoms/OcNotifications/OcNotifications.vue b/src/components/atoms/OcNotifications/OcNotifications.vue
index f819dad9a..873ceb6b6 100644
--- a/src/components/atoms/OcNotifications/OcNotifications.vue
+++ b/src/components/atoms/OcNotifications/OcNotifications.vue
@@ -44,6 +44,7 @@ export default {
 <style lang="scss">
 .oc-notification {
   box-sizing: border-box;
+  max-width: 100%;
   width: 400px;
   z-index: 1040;
 
diff --git a/src/components/organisms/OcResource/OcResource.vue b/src/components/organisms/OcResource/OcResource.vue
index 21ed32421..ad4204d0a 100644
--- a/src/components/organisms/OcResource/OcResource.vue
+++ b/src/components/organisms/OcResource/OcResource.vue
@@ -61,7 +61,6 @@
 <script>
 import OcButton from "../../atoms/OcButton/OcButton.vue"
 import OcImg from "../../atoms/OcImage/OcImage.vue"
-import OcStatusIndicators from "../../molecules/OcStatusIndicators/OcStatusIndicators.vue"
 import OcIcon from "../../atoms/OcIcon/OcIcon.vue"
 import OcResourceName from "../../atoms/OcResourceName/OcResourceName.vue"
 import OcResourceIcon from "../../atoms/OcResourceIcon/OcResourceIcon.vue"
@@ -78,7 +77,6 @@ export default {
   components: {
     OcButton,
     OcImg,
-    OcStatusIndicators,
     OcIcon,
     OcResourceName,
     OcResourceIcon,