diff --git a/src/assets/css/chat.scss b/src/assets/css/chat.scss
index 7a6bca8..5ea2af3 100644
--- a/src/assets/css/chat.scss
+++ b/src/assets/css/chat.scss
@@ -350,9 +350,9 @@ body {
     display: inline-block;
     vertical-align: top !important;
     .v-icon {
-      color: #eeeeee;
+      color: #595959;
       &:hover {
-        color: #888888;
+        color: #000000;
       }
     }
   }
@@ -754,6 +754,7 @@ body {
   height: 34px;
   border-radius: 22px;
   box-shadow: 4px 4px 8px rgba(0, 0, 0, 0.15);
+  white-space: nowrap;
 }
 
 .avatar-operations {
diff --git a/src/components/Chat.vue b/src/components/Chat.vue
index e212cab..bc7d028 100644
--- a/src/components/Chat.vue
+++ b/src/components/Chat.vue
@@ -70,15 +70,22 @@
               touchStart(e, event);
             }
           " v-on:touchend="touchEnd" v-on:touchcancel="touchCancel" v-on:touchmove="touchMove">
+            <!-- Note: For threaded media messages, IF there is only one item we show that media item as a single component.
+              We might therefore get calls to v-on:context-menu that has the event set to that single media item, not the top level thread event
+              that is really displayed in the flow. Therefore, we rewrite these events with "{event: event, anchor: $event.anchor}",
+              see below. Otherwise things like context menus won't work as designed.
+            -->
             <component :is="componentForEvent(event)" :room="room" :originalEvent="event" :nextEvent="filteredEvents[index + 1]"
               :timelineSet="timelineSet" v-on:send-quick-reaction.stop="sendQuickReaction"
               :componentFn="componentForEvent"
-              v-on:context-menu="showContextMenuForEvent($event)" v-on:own-avatar-clicked="viewProfile"
-              v-on:other-avatar-clicked="showAvatarMenuForEvent($event)" v-on:download="download(event)"
+              v-on:context-menu="showContextMenuForEvent({event: event, anchor: $event.anchor})" 
+              v-on:own-avatar-clicked="viewProfile"
+              v-on:other-avatar-clicked="showAvatarMenuForEvent({event: event, anchor: $event.anchor})" 
+              v-on:download="download(event)"
               v-on:poll-closed="pollWasClosed(event)"
               v-on:more="
                 isEmojiQuickReaction = true
-                showMoreMessageOperations($event)
+                showMoreMessageOperations({event: event, anchor: $event.anchor})
                 "
               />
             <!-- <div v-if="debugging" style="user-select:text">EventID: {{ event.getId() }}</div> -->
@@ -862,8 +869,10 @@ export default {
               var rectOps = this.$refs.messageOperations.$el.getBoundingClientRect();
               top = rectAnchor.top - rectChat.top - 50;
               left = rectAnchor.left - rectChat.left - 75;
-              if (left + rectOps.width >= rectChat.right) {
+              if (left + rectOps.width + 10 >= rectChat.right) {
                 left = rectChat.right - rectOps.width - 10; // No overflow
+              } else if (left < 0) {
+                left = 0;
               }
             }
           }