diff --git a/frontend/src/component/photo/list.vue b/frontend/src/component/photo/list.vue
index 555d70080..8953b48a1 100644
--- a/frontend/src/component/photo/list.vue
+++ b/frontend/src/component/photo/list.vue
@@ -57,8 +57,8 @@
                    :ripple="false"
                    flat icon large absolute class="input-open"
                    @click.stop.prevent="openPhoto(props.index, true)">
-              <v-icon color="white" class="default-hidden action-live" :title="$gettext('Live')">$vuetify.icons.live_photo</v-icon>
-              <v-icon color="white" class="default-hidden action-play" :title="$gettext('Video')">movie</v-icon>
+              <v-icon color="white" class="default-hidden action-live" :title="$gettext('Live')">play_arrow</v-icon>
+              <v-icon color="white" class="default-hidden action-play" :title="$gettext('Video')">play_arrow</v-icon>
             </v-btn>
           </v-img>
         </td>
diff --git a/frontend/src/css/search.css b/frontend/src/css/search.css
index a37dc1054..dd9c60517 100644
--- a/frontend/src/css/search.css
+++ b/frontend/src/css/search.css
@@ -290,7 +290,6 @@
     margin: 0 !important;
 }
 
-#photoprism .search-results.cards-view .type-video.is-playable .input-play,
 #photoprism .search-results.list-view .type-video.is-playable .input-play,
 #photoprism .search-results.list-view .type-live.is-playable .input-play {
     display: inline-flex;
diff --git a/frontend/src/pages/album/photos.vue b/frontend/src/pages/album/photos.vue
index 48b1da39a..4451fa9e9 100644
--- a/frontend/src/pages/album/photos.vue
+++ b/frontend/src/pages/album/photos.vue
@@ -177,9 +177,9 @@ export default {
 
       const selected = this.results[index];
 
-      if (showMerged && (selected.Type === TypeVideo || selected.Type === TypeLive)) {
+      if (showMerged && selected.Type === TypeLive || selected.Type === TypeVideo) {
         if (this.results[index].isPlayable()) {
-          this.$modal.show('video', {video: selected, album: this.album});
+          this.$modal.show("video", {video: selected, album: this.album});
         } else {
           this.$viewer.show(Thumb.fromPhotos(this.results), index);
         }
diff --git a/frontend/src/pages/photos.vue b/frontend/src/pages/photos.vue
index bfddfcf80..47198eead 100644
--- a/frontend/src/pages/photos.vue
+++ b/frontend/src/pages/photos.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import Photo from "model/photo";
+import {Photo, TypeLive, TypeVideo} from "model/photo";
 import Thumb from "model/thumb";
 import Event from "pubsub-js";
 
@@ -217,9 +217,9 @@ export default {
 
       const selected = this.results[index];
 
-      if (showMerged && (selected.Type === 'video' || selected.Type === 'live')) {
+      if (showMerged && selected.Type === TypeLive || selected.Type === TypeVideo) {
         if (selected.isPlayable()) {
-          this.$modal.show('video', {video: selected, album: null});
+          this.$modal.show("video", {video: selected, album: null});
         } else {
           this.$viewer.show(Thumb.fromPhotos(this.results), index);
         }
diff --git a/frontend/src/share/photo/list.vue b/frontend/src/share/photo/list.vue
index 82e5b1560..9c56cc894 100644
--- a/frontend/src/share/photo/list.vue
+++ b/frontend/src/share/photo/list.vue
@@ -53,8 +53,8 @@
                    :ripple="false"
                    flat icon large absolute class="input-open"
                    @click.stop.prevent="openPhoto(props.index, true)">
-              <v-icon color="white" class="default-hidden action-live" :title="$gettext('Live')">$vuetify.icons.live_photo</v-icon>
-              <v-icon color="white" class="default-hidden action-play" :title="$gettext('Video')">movie</v-icon>
+              <v-icon color="white" class="default-hidden action-live" :title="$gettext('Live')">play_arrow</v-icon>
+              <v-icon color="white" class="default-hidden action-play" :title="$gettext('Video')">play_arrow</v-icon>
             </v-btn>
           </v-img>
         </td>
diff --git a/frontend/src/share/photo/mosaic.vue b/frontend/src/share/photo/mosaic.vue
index 7dd5e11b0..efb7abace 100644
--- a/frontend/src/share/photo/mosaic.vue
+++ b/frontend/src/share/photo/mosaic.vue
@@ -74,6 +74,7 @@
                    icon flat small absolute :title="$gettext('Play')"
                    @touchstart.stop.prevent="openPhoto(index, true)"
                    @touchend.stop.prevent
+                   @touchmove.stop.prevent
                    @click.stop.prevent="openPhoto(index, true)">
               <v-icon color="white" class="action-play">play_arrow</v-icon>
             </v-btn>
diff --git a/frontend/src/share/photos.vue b/frontend/src/share/photos.vue
index 5720ccd54..c5f442d75 100644
--- a/frontend/src/share/photos.vue
+++ b/frontend/src/share/photos.vue
@@ -232,9 +232,9 @@ export default {
 
       const selected = this.results[index];
 
-      if (showMerged && (selected.Type === TypeVideo || selected.Type === TypeLive)) {
+      if (showMerged && selected.Type === TypeLive || selected.Type === TypeVideo) {
         if (this.results[index].isPlayable()) {
-          this.$modal.show('video', {video: selected, album: this.album});
+          this.$modal.show("video", {video: selected, album: this.album});
         } else {
           this.$viewer.show(Thumb.fromPhotos(this.results), index);
         }