diff --git a/assets/img/icon.icns b/assets/img/icon.icns
index 2f9b7cf..8f52da4 100644
Binary files a/assets/img/icon.icns and b/assets/img/icon.icns differ
diff --git a/assets/img/icon.png b/assets/img/icon.png
index cb4756b..9df2799 100644
Binary files a/assets/img/icon.png and b/assets/img/icon.png differ
diff --git a/src/messageeventmodel.cpp b/src/messageeventmodel.cpp
index c4cf7a6..ac8d2d7 100644
--- a/src/messageeventmodel.cpp
+++ b/src/messageeventmodel.cpp
@@ -108,7 +108,7 @@ void MessageEventModel::setRoom(SpectralRoom* room) {
       }
       refreshRow(timelineBaseIndex());        // Refresh the looks
       if (m_currentRoom->timelineSize() > 1)  // Refresh above
-        refreshEventRoles(timelineBaseIndex() + 1, {ReadMarkerRole});
+        refreshEventRoles(timelineBaseIndex() + 1);
       if (timelineBaseIndex() > 0)  // Refresh below, see #312
         refreshEventRoles(timelineBaseIndex() - 1,
                           {AboveEventTypeRole, AboveAuthorRole,
@@ -126,6 +126,9 @@ void MessageEventModel::setRoom(SpectralRoom* room) {
           {ReadMarkerRole});
       refreshEventRoles(lastReadEventId, {ReadMarkerRole});
     });
+    connect(
+        m_currentRoom, &Room::replacedEvent, this,
+        [this](const RoomEvent* newEvent) { refreshEvent(newEvent->id()); });
     connect(m_currentRoom, &Room::fileTransferProgress, this,
             &MessageEventModel::refreshEvent);
     connect(m_currentRoom, &Room::fileTransferCompleted, this,