diff --git a/client/cypress/integration/frontend/rooms/rooms-page.spec.js b/client/cypress/integration/frontend/rooms/rooms-page.spec.js
index a14c7f86..3ebbe6a5 100644
--- a/client/cypress/integration/frontend/rooms/rooms-page.spec.js
+++ b/client/cypress/integration/frontend/rooms/rooms-page.spec.js
@@ -11,7 +11,6 @@ describe('The Rooms Page', () => {
               schoolClass: {
                 id: btoa('SchoolClassNode:selectedClassId'),
               },
-
             },
           },
         ],
diff --git a/client/src/components/rooms/MoreActions.vue b/client/src/components/rooms/MoreActions.vue
new file mode 100644
index 00000000..7ad12c3a
--- /dev/null
+++ b/client/src/components/rooms/MoreActions.vue
@@ -0,0 +1,52 @@
+<template>
+  <div class="more-actions">
+    <a
+      class="room-actions__more-link"
+      data-cy="toggle-more-actions-menu"
+      @click="toggleMenu">
+      <ellipses/>
+    </a>
+    <widget-popover
+      class="room-actions__popover"
+      v-if="showMenu"
+      @hide-me="showMenu = false">
+      <slot/>
+    </widget-popover>
+  </div>
+</template>
+
+<script>
+  import Ellipses from '@/components/icons/Ellipses';
+  import WidgetPopover from '@/components/ui/WidgetPopover';
+
+  export default {
+
+    components: {
+      Ellipses,
+      WidgetPopover,
+    },
+    data() {
+      return {
+        showMenu: false,
+      };
+    },
+
+    methods: {
+      toggleMenu: function () {
+        this.showMenu = !this.showMenu;
+      },
+    },
+  };
+</script>
+
+<style scoped lang="scss">
+  @import '~styles/helpers';
+
+  .more-actions {
+    svg {
+      width: 30px;
+      fill: $color-charcoal-dark;
+      margin-right: 15px;
+    }
+  }
+</style>
diff --git a/client/src/components/rooms/RoomActions.vue b/client/src/components/rooms/RoomActions.vue
index bd218098..d4d60ce9 100644
--- a/client/src/components/rooms/RoomActions.vue
+++ b/client/src/components/rooms/RoomActions.vue
@@ -1,54 +1,31 @@
 <template>
-  <div
-    class="room-actions"
-    data-cy="room-actions">
-    <a
-      class="room-actions__more-link"
-      data-cy="toggle-room-actions-menu"
-      @click="toggleMenu">
-      <ellipses/>
-    </a>
-    <widget-popover
-      class="room-actions__popover"
-      v-if="showMenu"
-      @hide-me="showMenu = false">
-      <li class="popover-links__link">
-        <popover-link
-          icon="pen-icon"
-          text="Bearbeiten"
-          @link-action="editRoom()"/>
-      </li>
-      <li class="popover-links__link">
-        <popover-link
-          icon="eye-icon"
-          data-cy="change-visibility"
-          text="Sichtbarkeit anpassen"
-          @link-action="changeVisibility()"/>
-      </li>
-      <li class="popover-links__link">
-        <popover-link
-          icon="trash-icon"
-          text="Löschen"
-          data-cy="delete-room"
-          @link-action="deleteRoom()"/>
-      </li>
-    </widget-popover>
-  </div>
+  <more-actions data-cy="room-actions">
+    <popover-link
+      icon="pen-icon"
+      text="Bearbeiten"
+      @link-action="editRoom()"/>
+    <popover-link
+      icon="eye-icon"
+      data-cy="change-visibility"
+      text="Sichtbarkeit anpassen"
+      @link-action="changeVisibility()"/>
+    <popover-link
+      icon="trash-icon"
+      text="Löschen"
+      data-cy="delete-room"
+      @link-action="deleteRoom()"/>
+  </more-actions>
 </template>
 
 <script>
-  import Ellipses from '@/components/icons/Ellipses.vue';
-  import WidgetPopover from '@/components/ui/WidgetPopover';
 
   import DELETE_ROOM_MUTATION from 'gql/mutations/rooms/deleteRoom.gql';
   import UPDATE_ROOM_VISIBILITY_MUTATION from 'gql/mutations/rooms/updateRoomVisibility.gql';
 
   import ROOMS_QUERY from '@/graphql/gql/queries/roomsQuery.gql';
-  import PenIcon from '@/components/icons/PenIcon';
-  import TrashIcon from '@/components/icons/TrashIcon';
-  import EyeIcon from '@/components/icons/EyeIcon';
   import PopoverLink from '@/components/ui/PopoverLink';
   import {ROOMS_PAGE} from '@/router/room.names';
+  import MoreActions from '@/components/rooms/MoreActions';
 
   export default {
     props: {
@@ -58,29 +35,17 @@
       },
       restricted: {
         type: Boolean,
-        default: false
-      }
+        default: false,
+      },
     },
 
     components: {
+      MoreActions,
       PopoverLink,
-      EyeIcon,
-      TrashIcon,
-      PenIcon,
-      Ellipses,
-      WidgetPopover,
-    },
 
-    data() {
-      return {
-        showMenu: false,
-      };
     },
 
     methods: {
-      toggleMenu: function () {
-        this.showMenu = !this.showMenu;
-      },
       deleteRoom() {
         this.$apollo.mutate({
           mutation: DELETE_ROOM_MUTATION,
@@ -98,7 +63,7 @@
               }
             }
             this.$router.push({
-              name: ROOMS_PAGE
+              name: ROOMS_PAGE,
             });
           },
         });
@@ -115,15 +80,15 @@
               variables: {
                 input: {
                   id: this.id,
-                  restricted
-                }
-              }
+                  restricted,
+                },
+              },
             });
           })
           .catch(() => {
 
           });
-      }
+      },
     },
   };
 </script>
@@ -145,11 +110,5 @@
       display: flex;
       width: max-content;
     }
-
-    svg {
-      width: 30px;
-      fill: $color-charcoal-dark;
-      margin-right: 15px;
-    }
   }
 </style>
diff --git a/client/src/components/rooms/RoomEntry.vue b/client/src/components/rooms/RoomEntry.vue
index 2263755b..7fa2a0bd 100644
--- a/client/src/components/rooms/RoomEntry.vue
+++ b/client/src/components/rooms/RoomEntry.vue
@@ -1,18 +1,9 @@
 <template>
   <div class="room-entry">
-    <more-options-widget
-      class="room-entry__more"
-      data-cy="room-entry-actions"
-      v-if="myEntry">
-      <li class="popover-links__link"><a @click="deleteRoomEntry(id)">Eintrag löschen</a></li>
-      <li class="popover-links__link"><a
-        data-cy="edit-room-entry"
-        @click="editRoomEntry(id)">Eintrag bearbeiten</a></li>
-    </more-options-widget>
     <router-link
       :to="{name: 'article', params: { slug: slug }}"
-      tag="div"
-      class="room-entry__router-link">
+      class="room-entry__router-link"
+      tag="div">
       <div
         class="room-entry__header"
         v-if="image">
@@ -31,25 +22,34 @@
           class="room-entry__author"/>
       </div>
     </router-link>
+
+    <room-entry-actions
+      :id="id"
+      data-cy="room-entry-actions"
+      class="room-entry__more"
+      v-if="myEntry"/>
+
   </div>
 
 </template>
 
 <script>
-  import DELETE_ROOM_ENTRY_MUTATION from 'gql/mutations/rooms/deleteRoomEntry.gql';
-  import ROOM_ENTRIES_QUERY from '@/graphql/gql/queries/roomEntriesQuery.gql';
   import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
 
   import UserMetaWidget from '@/components/UserMetaWidget';
   import MoreOptionsWidget from '@/components/MoreOptionsWidget';
   import teaser from '@/helpers/teaser';
+  import WidgetFooter from '@/components/ui/WidgetFooter';
+  import RoomEntryActions from '@/components/rooms/RoomEntryActions';
 
   export default {
     props: ['title', 'author', 'contents', 'slug', 'id'],
 
     components: {
+      RoomEntryActions,
+      WidgetFooter,
       MoreOptionsWidget,
-      UserMetaWidget
+      UserMetaWidget,
     },
 
     computed: {
@@ -67,54 +67,26 @@
         const authorId = atob(this.author.id).split(':')[1];
         const userId = atob(this.me.id).split(':')[1];
         return authorId === userId;
-      }
-    },
-
-    methods: {
-      deleteRoomEntry(id) {
-        this.$apollo.mutate({
-          mutation: DELETE_ROOM_ENTRY_MUTATION,
-          variables: {
-            input: {
-              id
-            }
-          },
-          update(store, {data: {deleteRoomEntry: {success, roomSlug}}}) {
-            if (success) {
-              const query = ROOM_ENTRIES_QUERY;
-              const variables = {slug: roomSlug};
-              const data = store.readQuery({query, variables});
-              if (data) {
-                data.room.roomEntries.edges.splice(data.room.roomEntries.edges.findIndex(edge => edge.node.id === id), 1);
-                store.writeQuery({query, data, variables});
-              }
-            }
-          }
-        });
       },
-      editRoomEntry(id) {
-        this.$store.dispatch('editRoomEntry', id);
-      }
     },
 
     apollo: {
       me() {
         return {
-          query: ME_QUERY
+          query: ME_QUERY,
         };
-      }
+      },
     },
   };
 </script>
 
 <style scoped lang="scss">
-  @import "@/styles/_functions.scss";
-  @import "@/styles/_variables.scss";
+  @import "~styles/helpers";
 
   .room-entry {
     border-radius: 12px;
-    overflow: hidden;
     background-color: $color-white;
+    overflow: hidden;
     -webkit-column-break-inside: avoid; /* Chrome, Safari, Opera */
     page-break-inside: avoid; /* Firefox */
     break-inside: avoid; /* IE 10+ */
@@ -143,8 +115,8 @@
 
     &__more {
       position: absolute;
-      top: 10px;
-      right: 10px;
+      top: 0;
+      right: 0;
     }
 
   }
diff --git a/client/src/components/rooms/RoomEntryActions.vue b/client/src/components/rooms/RoomEntryActions.vue
new file mode 100644
index 00000000..c1e4b965
--- /dev/null
+++ b/client/src/components/rooms/RoomEntryActions.vue
@@ -0,0 +1,93 @@
+<template>
+  <more-actions data-cy="room-entry-actions">
+    <popover-link
+      icon="trash-icon"
+      text="Eintrag löschen"
+      @link-action="deleteRoomEntry(id)"/>
+    <popover-link
+      icon="pen-icon"
+      data-cy="edit-room-entry"
+      text="Eintrag bearbeiten"
+      @link-action="editRoomEntry(id)"/>
+  </more-actions>
+</template>
+
+<script>
+  import PopoverLink from '@/components/ui/PopoverLink';
+  import MoreActions from '@/components/rooms/MoreActions';
+  import DELETE_ROOM_ENTRY_MUTATION from 'gql/mutations/rooms/deleteRoomEntry';
+  import ROOM_ENTRIES_QUERY from 'gql/queries/roomEntriesQuery';
+
+  export default {
+    props: {
+      id: {
+        type: String,
+        default: '',
+      },
+    },
+
+    components: {
+      MoreActions,
+      PopoverLink,
+    },
+
+    data() {
+      return {
+        showMenu: false,
+      };
+    },
+
+    methods: {
+      deleteRoomEntry(id) {
+        this.$apollo.mutate({
+          mutation: DELETE_ROOM_ENTRY_MUTATION,
+          variables: {
+            input: {
+              id,
+            },
+          },
+          update(store, {data: {deleteRoomEntry: {success, roomSlug}}}) {
+            if (success) {
+              const query = ROOM_ENTRIES_QUERY;
+              const variables = {slug: roomSlug};
+              const data = store.readQuery({query, variables});
+              if (data) {
+                data.room.roomEntries.edges.splice(data.room.roomEntries.edges.findIndex(edge => edge.node.id === id), 1);
+                store.writeQuery({query, data, variables});
+              }
+            }
+          },
+        });
+      },
+      editRoomEntry(id) {
+        this.$store.dispatch('editRoomEntry', id);
+      },
+    },
+  };
+</script>
+
+<style scoped lang="scss">
+  @import "~styles/helpers";
+
+  $height: 30px;
+
+  .room-entry-actions {
+    height: $height;
+
+    &__more-link {
+      cursor: pointer;
+      height: $height;
+    }
+
+    &__popover {
+      display: flex;
+      width: max-content;
+    }
+
+    svg {
+      width: 30px;
+      fill: $color-charcoal-dark;
+      margin-right: 15px;
+    }
+  }
+</style>
diff --git a/client/src/components/rooms/RoomWidget.vue b/client/src/components/rooms/RoomWidget.vue
index 80b57a4e..1b928fe3 100644
--- a/client/src/components/rooms/RoomWidget.vue
+++ b/client/src/components/rooms/RoomWidget.vue
@@ -64,8 +64,7 @@
 </script>
 
 <style scoped lang="scss">
-  @import "@/styles/_variables.scss";
-  @import "@/styles/_mixins.scss";
+  @import "~styles/helpers";
 
   .room-widget {
     display: -ms-grid;
diff --git a/client/src/components/ui/PopoverLink.vue b/client/src/components/ui/PopoverLink.vue
index f1832227..61cfac8f 100644
--- a/client/src/components/ui/PopoverLink.vue
+++ b/client/src/components/ui/PopoverLink.vue
@@ -1,12 +1,14 @@
 <template>
-  <a
-    class="popover-link"
-    @click="$emit('link-action')">
-    <component
-      :is="icon"
-      class="popover-link__icon"/>
-    <span class="popover-link__text">{{ text }}</span>
-  </a>
+  <li class="popover-links__link">
+    <a
+      class="popover-link"
+      @click="$emit('link-action')">
+      <component
+        :is="icon"
+        class="popover-link__icon"/>
+      <span class="popover-link__text">{{ text }}</span>
+    </a>
+  </li>
 </template>
 
 <script>
diff --git a/client/src/styles/_widget-popover.scss b/client/src/styles/_widget-popover.scss
index 364fcc15..f24e8c2b 100644
--- a/client/src/styles/_widget-popover.scss
+++ b/client/src/styles/_widget-popover.scss
@@ -10,6 +10,7 @@
   padding: 0;
   z-index: 100;
   @include widget-shadow;
+  width: max-content;
 
   &--mobile {
     left: 0;