diff --git a/frontend/src/component/navigation.vue b/frontend/src/component/navigation.vue
index 4cafc2676..e359d7955 100644
--- a/frontend/src/component/navigation.vue
+++ b/frontend/src/component/navigation.vue
@@ -83,7 +83,7 @@
             </v-list-tile>
           </template>
 
-          <v-list-tile :to="{name: 'browse', query: { q: 'mono:true quality:3 photo:true' }}" :exact="true" @click.stop="">
+          <v-list-tile :to="{name: 'browse', query: { q: 'mono:true quality:3 photo:true' }}" :exact="true" class="nav-monochrome" @click.stop="">
             <v-list-tile-content>
               <v-list-tile-title>
                 <translate>Monochrome</translate>
diff --git a/frontend/tests/acceptance/photos.js b/frontend/tests/acceptance/photos.js
index 7d22db3fc..8b5487e0f 100644
--- a/frontend/tests/acceptance/photos.js
+++ b/frontend/tests/acceptance/photos.js
@@ -10,7 +10,7 @@ fixture`Test photos`.page`${testcafeconfig.url}`;
 
 const page = new Page();
 
-/*test.meta("testID", "photos-001")("Scroll to top", async (t) => {
+test.meta("testID", "photos-001")("Scroll to top", async (t) => {
   await page.openNav();
   await t.click(Selector(".nav-browse"));
   await page.setFilter("view", "Cards");
@@ -129,7 +129,7 @@ test.meta("testID", "photos-003")(
       .expect(Selector("div").withAttribute("data-uid", ThirdPhoto).visible)
       .ok();
   }
-);*/
+);
 
 test.meta("testID", "photos-004")("Like/dislike photo/video", async (t) => {
   const FirstPhoto = await Selector("div.is-photo.type-image").nth(0).getAttribute("data-uid");
@@ -372,7 +372,7 @@ test.meta("testID", "photos-005")(
   }
 );
 
-/*test.meta("testID", "photos-006")(
+test.meta("testID", "photos-006")(
   "Archive/restore video, photos, private photos and review photos using clipboard",
   async (t) => {
     await page.openNav();
@@ -951,4 +951,87 @@ test.meta("testID", "photos-011")("Delete non primary file", async (t) => {
     timeout: 5000,
   }).count;
   await t.expect(FileCountAfterDeletion).eql(1);
-});*/
+});
+
+test.meta("testID", "photos-012")("Mark photos/videos as panorama/scan", async (t) => {
+    await page.openNav();
+    await page.search("photo:true");
+    const FirstPhoto = await Selector("div.is-photo.type-image").nth(0).getAttribute("data-uid");
+    await page.search("video:true");
+    const FirstVideo = await Selector("div.is-photo").nth(1).getAttribute("data-uid");
+    await page.openNav();
+    await t.click(Selector(".nav-browse + div"))
+        .click(Selector(".nav-scans"))
+        .expect(Selector("div").withAttribute("data-uid", FirstPhoto).exists, { timeout: 5000 })
+        .notOk()
+        .expect(Selector("div").withAttribute("data-uid", FirstVideo).exists, { timeout: 5000 })
+        .notOk();
+    if (t.browser.platform === "mobile") {
+        await page.openNav();
+    }
+    await t
+        .click(Selector(".nav-panoramas"))
+        .expect(Selector("div").withAttribute("data-uid", FirstPhoto).exists, { timeout: 5000 })
+        .notOk()
+        .expect(Selector("div").withAttribute("data-uid", FirstVideo).exists, { timeout: 5000 })
+        .notOk();
+    await page.openNav();
+    await t.click(Selector(".nav-browse"));
+    await page.selectPhotoFromUID(FirstPhoto);
+    await page.editSelected();
+    await page.turnSwitchOn("scan");
+    await page.turnSwitchOn("panorama");
+    await t.click(Selector(".action-close"));
+    await page.clearSelection();
+    await page.selectPhotoFromUID(FirstVideo);
+    await page.editSelected();
+    await page.turnSwitchOn("panorama");
+    await t.click(Selector(".action-close"));
+    await page.clearSelection();
+    await t.expect(Selector("div").withAttribute("data-uid", FirstPhoto).exists, { timeout: 5000 })
+        .ok()
+        .expect(Selector("div").withAttribute("data-uid", FirstVideo).exists, { timeout: 5000 })
+        .ok();
+    if (t.browser.platform === "mobile") {
+        await page.openNav();
+    }
+    await t
+        .click(Selector(".nav-scans"))
+        .expect(Selector("div").withAttribute("data-uid", FirstPhoto).exists, { timeout: 5000 })
+        .ok();
+    if (t.browser.platform === "mobile") {
+        await page.openNav();
+    }
+    await t
+        .click(Selector(".nav-panoramas"))
+    await page.selectPhotoFromUID(FirstPhoto);
+    await page.editSelected();
+    await page.turnSwitchOff("panorama");
+    await page.turnSwitchOff("scan");
+    await t.click(Selector(".action-close"));
+    await page.clearSelection();
+    await page.selectPhotoFromUID(FirstVideo);
+    await page.editSelected();
+    await page.turnSwitchOff("panorama");
+    await t.click(Selector(".action-close"));
+    await page.clearSelection();
+    if (t.browser.platform === "mobile") {
+        await t.eval(() => location.reload());
+    } else {
+        await t.click(Selector("button.action-reload"));
+    }
+    await t.expect(Selector("div").withAttribute("data-uid", FirstPhoto).exists, { timeout: 5000 })
+        .notOk()
+        .expect(Selector("div").withAttribute("data-uid", FirstVideo).exists, { timeout: 5000 })
+        .notOk();
+    if (t.browser.platform === "mobile") {
+        await page.openNav();
+        await t.click(Selector(".nav-browse + div"));
+    }
+    await t
+        .click(Selector(".nav-scans"))
+        .expect(Selector("div").withAttribute("data-uid", FirstPhoto).exists, { timeout: 5000 })
+        .notOk()
+        .expect(Selector("div").withAttribute("data-uid", FirstVideo).exists, { timeout: 5000 })
+        .notOk();
+});