diff --git a/src/components/header/Searchbar.vue b/src/components/header/Searchbar.vue
index 5e4646f6e..72f8775a4 100644
--- a/src/components/header/Searchbar.vue
+++ b/src/components/header/Searchbar.vue
@@ -220,17 +220,9 @@ export default defineComponent({
   header &,
   #mobile-header & {
     max-width: 100%;
+    // header is 50px; 5px gap on each side
     margin: 5px 0 !important;
-    > * {
-      margin: 0 !important;
-    }
-    :deep input {
-      // header is 50px; 5px gap on each side
-      height: 40px !important;
-    }
-    :deep .input-field__icon {
-      height: 46px !important; // hack to center the icon
-    }
+    --default-clickable-area: 40px;
   }
 
   // Styling for flat input
diff --git a/src/components/modal/AlbumPicker.vue b/src/components/modal/AlbumPicker.vue
index 5ebd8971f..e80e3e3bf 100644
--- a/src/components/modal/AlbumPicker.vue
+++ b/src/components/modal/AlbumPicker.vue
@@ -13,20 +13,21 @@
       </NcTextField>
     </div>
 
-    <ul class="albums-container">
+    <div class="albums-container">
       <AlbumsList ref="albumsList" :albums="filteredList" :link="false" @click="toggleAlbumSelection">
         <template #extra="{ album }">
           <div
-            class="check-circle-icon"
             :class="{
+              'check-circle-icon': true,
               'check-circle-icon--active': selection.has(album),
             }"
+            @click="toggleAlbumSelection(album)"
           >
             <CheckIcon :size="20" />
           </div>
         </template>
       </AlbumsList>
-    </ul>
+    </div>
 
     <div class="actions">
       <NcButton
@@ -269,6 +270,7 @@ export default defineComponent({
 
   .albums-container {
     height: 350px;
+    overflow-y: scroll;
 
     .check-circle-icon {
       border-radius: 50%;
@@ -282,7 +284,7 @@ export default defineComponent({
 
       &--active {
         border: 1px solid var(--color-primary);
-        background-color: var(--color-primary-default);
+        background-color: var(--color-primary);
         color: var(--color-primary-text);
       }
     }
diff --git a/src/components/modal/AlbumsList.vue b/src/components/modal/AlbumsList.vue
index b1aa1e112..95680ba3d 100644
--- a/src/components/modal/AlbumsList.vue
+++ b/src/components/modal/AlbumsList.vue
@@ -1,5 +1,5 @@
 <template>
-  <ul class="albums-container">
+  <ul class="albums-list">
     <NcListItem
       v-for="album in albums"
       class="album"
@@ -124,9 +124,8 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-.albums-container {
+.albums-list {
   overflow-x: hidden;
-  overflow-y: scroll;
   padding: 2px;
 
   .album {
diff --git a/src/components/modal/EditLocation.vue b/src/components/modal/EditLocation.vue
index 6981b2558..a70e38c1a 100644
--- a/src/components/modal/EditLocation.vue
+++ b/src/components/modal/EditLocation.vue
@@ -239,7 +239,7 @@ export default defineComponent({
   .lat-lon {
     display: flex;
     padding: 4px;
-    margin-bottom: -10px;
+    margin-bottom: -14px;
 
     > .coords {
       display: inline-block;
@@ -261,7 +261,7 @@ export default defineComponent({
   }
 
   .osm-attribution {
-    margin: -3px 4px;
+    margin: 0 4px;
     font-size: 0.65em;
     a {
       color: var(--color-primary);
diff --git a/src/components/modal/Modal.vue b/src/components/modal/Modal.vue
index d25fd1282..50739737a 100644
--- a/src/components/modal/Modal.vue
+++ b/src/components/modal/Modal.vue
@@ -2,6 +2,7 @@
   <NcModal
     class="memories-modal"
     ref="modal"
+    :name="t('memories', 'Modal')"
     :size="size"
     :outTransition="true"
     :style="{ width: isSidebarShown ? `calc(100% - ${sidebarWidth}px)` : null }"
diff --git a/src/components/viewer/Viewer.vue b/src/components/viewer/Viewer.vue
index 8eb448b2e..c06196784 100644
--- a/src/components/viewer/Viewer.vue
+++ b/src/components/viewer/Viewer.vue
@@ -1318,6 +1318,7 @@ export default defineComponent({
   :deep .button-vue--icon-only {
     color: white;
     background-color: transparent !important;
+    margin: 5px 2px; // NC 30
   }
 
   transition: opacity 0.2s ease-in-out;