diff --git a/package-lock.json b/package-lock.json
index 119a4518..2eb42925 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,7 +30,7 @@
         "ts-node-iptc": "1.0.11",
         "typeconfig": "2.1.2",
         "typeorm": "0.3.12",
-        "xml2js": "0.4.23"
+        "xml2js": "0.6.2"
       },
       "bin": {
         "pigallery2": "src/backend/index.js"
@@ -81,7 +81,7 @@
         "@types/xml2js": "0.4.11",
         "@typescript-eslint/eslint-plugin": "5.54.1",
         "@typescript-eslint/parser": "5.54.1",
-        "bootstrap": "5.3.0-alpha1",
+        "bootstrap": "5.3.1",
         "chai": "4.3.7",
         "chai-http": "4.3.0",
         "codelyzer": "6.0.2",
@@ -105,12 +105,12 @@
         "leaflet": "1.9.3",
         "leaflet.markercluster": "1.5.3",
         "mocha": "10.2.0",
-        "ngx-bootstrap": "10.2.0",
+        "ngx-bootstrap": "10.3.0",
         "ngx-clipboard": "15.1.0",
         "ngx-cookie-service": "15.0.0",
         "ngx-device-detector": "5.0.1",
-        "ngx-markdown": "15.1.1",
-        "ngx-toastr": "16.1.0",
+        "ngx-markdown": "15.1.2",
+        "ngx-toastr": "15.2.2",
         "nyc": "15.1.0",
         "open-iconic": "1.1.1",
         "rxjs": "7.8.0",
@@ -4168,9 +4168,9 @@
       "dev": true
     },
     "node_modules/@popperjs/core": {
-      "version": "2.11.6",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
-      "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==",
+      "version": "2.11.8",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+      "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
       "dev": true,
       "peer": true,
       "funding": {
@@ -6556,9 +6556,9 @@
       "dev": true
     },
     "node_modules/bootstrap": {
-      "version": "5.3.0-alpha1",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.0-alpha1.tgz",
-      "integrity": "sha512-ABZpKK4ObS3kKlIqH+ZVDqoy5t/bhFG0oHTAzByUdon7YIom0lpCeTqRniDzJmbtcWkNe800VVPBiJgxSYTYew==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.1.tgz",
+      "integrity": "sha512-jzwza3Yagduci2x0rr9MeFSORjcHpt0lRZukZPZQJT1Dth5qzV7XcgGqYzi39KGAVYR8QEDVoO0ubFKOxzMG+g==",
       "dev": true,
       "funding": [
         {
@@ -6571,7 +6571,7 @@
         }
       ],
       "peerDependencies": {
-        "@popperjs/core": "^2.11.6"
+        "@popperjs/core": "^2.11.8"
       }
     },
     "node_modules/brace-expansion": {
@@ -16276,9 +16276,9 @@
       "dev": true
     },
     "node_modules/ngx-bootstrap": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-10.2.0.tgz",
-      "integrity": "sha512-bn5wdvH6QQ2JGu4TgUbozdULBFMxZNPNTgO7dRiosx9FRrFvKcgxkGSgU/xoj+4kP1vgh8zwzaiDfvH/Bfb+Aw==",
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-10.3.0.tgz",
+      "integrity": "sha512-Ok9umbq4tqJSXMy/5/+2VZJHcwj7hD3a3x2KkF1A+f0e70BARY8rfr9QKjGgvywWNyZMf0Z5PvE1WEeEiMvCkA==",
       "dev": true,
       "dependencies": {
         "tslib": "^2.3.0"
@@ -16332,9 +16332,9 @@
       }
     },
     "node_modules/ngx-markdown": {
-      "version": "15.1.1",
-      "resolved": "https://registry.npmjs.org/ngx-markdown/-/ngx-markdown-15.1.1.tgz",
-      "integrity": "sha512-HdiYJVBoZoKnTti3Yj+PR7Uh5LuP5xx97UyFjhgWV25HrT1NE5Lorcg0Xxi7x1wyuRr9V/CKsd5x45jQmY1CZw==",
+      "version": "15.1.2",
+      "resolved": "https://registry.npmjs.org/ngx-markdown/-/ngx-markdown-15.1.2.tgz",
+      "integrity": "sha512-mAUORpUnHCV4tnxEHV4oS5YEdIaolUclulCblUrvAEU3AEND8MMTxlwHujqVC2M398/aKH0SBSrjLzDbMUJCoQ==",
       "dev": true,
       "dependencies": {
         "tslib": "^2.3.0"
@@ -16353,13 +16353,13 @@
         "@types/marked": "^4.0.3",
         "marked": "^4.0.17",
         "rxjs": "^6.5.3 || ^7.4.0",
-        "zone.js": "~0.11.4 || ~0.12.0"
+        "zone.js": "~0.11.4 || ~0.12.0 || ~0.13.0"
       }
     },
     "node_modules/ngx-toastr": {
-      "version": "16.1.0",
-      "resolved": "https://registry.npmjs.org/ngx-toastr/-/ngx-toastr-16.1.0.tgz",
-      "integrity": "sha512-jMnkauggRE8264vR4NtOgK3QI7zmufO3Z7wrkg3j7A7ZVpkCKDXgklsAZM9aiHxDyttM2K+Na6a6L004uPeRKA==",
+      "version": "15.2.2",
+      "resolved": "https://registry.npmjs.org/ngx-toastr/-/ngx-toastr-15.2.2.tgz",
+      "integrity": "sha512-srdxKKf1+B/7z11M4Ty7bnkme2xjdUcnP/t7mNG/2gRM1h0P/7Lbz71FIQHuKZOCdnGdXjsT6OXU0dRvNyrkyg==",
       "dev": true,
       "dependencies": {
         "tslib": "^2.3.0"
@@ -21991,6 +21991,18 @@
         "uuid": "dist/bin/uuid"
       }
     },
+    "node_modules/typeorm/node_modules/xml2js": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "dependencies": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
     "node_modules/typescript": {
       "version": "4.8.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
@@ -23196,10 +23208,23 @@
         "minimist": "1.2.5"
       }
     },
-    "node_modules/xml2js": {
+    "node_modules/xlf-google-translate/node_modules/xml2js": {
       "version": "0.4.23",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
       "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "dev": true,
+      "dependencies": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/xml2js": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
+      "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==",
       "dependencies": {
         "sax": ">=0.6.0",
         "xmlbuilder": "~11.0.0"
@@ -26157,9 +26182,9 @@
       "dev": true
     },
     "@popperjs/core": {
-      "version": "2.11.6",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
-      "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==",
+      "version": "2.11.8",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+      "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
       "dev": true,
       "peer": true
     },
@@ -28043,9 +28068,9 @@
       "dev": true
     },
     "bootstrap": {
-      "version": "5.3.0-alpha1",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.0-alpha1.tgz",
-      "integrity": "sha512-ABZpKK4ObS3kKlIqH+ZVDqoy5t/bhFG0oHTAzByUdon7YIom0lpCeTqRniDzJmbtcWkNe800VVPBiJgxSYTYew==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.1.tgz",
+      "integrity": "sha512-jzwza3Yagduci2x0rr9MeFSORjcHpt0lRZukZPZQJT1Dth5qzV7XcgGqYzi39KGAVYR8QEDVoO0ubFKOxzMG+g==",
       "dev": true,
       "requires": {}
     },
@@ -35604,9 +35629,9 @@
       "dev": true
     },
     "ngx-bootstrap": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-10.2.0.tgz",
-      "integrity": "sha512-bn5wdvH6QQ2JGu4TgUbozdULBFMxZNPNTgO7dRiosx9FRrFvKcgxkGSgU/xoj+4kP1vgh8zwzaiDfvH/Bfb+Aw==",
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-10.3.0.tgz",
+      "integrity": "sha512-Ok9umbq4tqJSXMy/5/+2VZJHcwj7hD3a3x2KkF1A+f0e70BARY8rfr9QKjGgvywWNyZMf0Z5PvE1WEeEiMvCkA==",
       "dev": true,
       "requires": {
         "tslib": "^2.3.0"
@@ -35641,9 +35666,9 @@
       }
     },
     "ngx-markdown": {
-      "version": "15.1.1",
-      "resolved": "https://registry.npmjs.org/ngx-markdown/-/ngx-markdown-15.1.1.tgz",
-      "integrity": "sha512-HdiYJVBoZoKnTti3Yj+PR7Uh5LuP5xx97UyFjhgWV25HrT1NE5Lorcg0Xxi7x1wyuRr9V/CKsd5x45jQmY1CZw==",
+      "version": "15.1.2",
+      "resolved": "https://registry.npmjs.org/ngx-markdown/-/ngx-markdown-15.1.2.tgz",
+      "integrity": "sha512-mAUORpUnHCV4tnxEHV4oS5YEdIaolUclulCblUrvAEU3AEND8MMTxlwHujqVC2M398/aKH0SBSrjLzDbMUJCoQ==",
       "dev": true,
       "requires": {
         "clipboard": "^2.0.11",
@@ -35655,9 +35680,9 @@
       }
     },
     "ngx-toastr": {
-      "version": "16.1.0",
-      "resolved": "https://registry.npmjs.org/ngx-toastr/-/ngx-toastr-16.1.0.tgz",
-      "integrity": "sha512-jMnkauggRE8264vR4NtOgK3QI7zmufO3Z7wrkg3j7A7ZVpkCKDXgklsAZM9aiHxDyttM2K+Na6a6L004uPeRKA==",
+      "version": "15.2.2",
+      "resolved": "https://registry.npmjs.org/ngx-toastr/-/ngx-toastr-15.2.2.tgz",
+      "integrity": "sha512-srdxKKf1+B/7z11M4Ty7bnkme2xjdUcnP/t7mNG/2gRM1h0P/7Lbz71FIQHuKZOCdnGdXjsT6OXU0dRvNyrkyg==",
       "dev": true,
       "requires": {
         "tslib": "^2.3.0"
@@ -39928,6 +39953,15 @@
           "version": "9.0.0",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
           "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="
+        },
+        "xml2js": {
+          "version": "0.4.23",
+          "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+          "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+          "requires": {
+            "sax": ">=0.6.0",
+            "xmlbuilder": "~11.0.0"
+          }
         }
       }
     },
@@ -40812,13 +40846,23 @@
           "requires": {
             "minimist": "1.2.5"
           }
+        },
+        "xml2js": {
+          "version": "0.4.23",
+          "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+          "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+          "dev": true,
+          "requires": {
+            "sax": ">=0.6.0",
+            "xmlbuilder": "~11.0.0"
+          }
         }
       }
     },
     "xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
+      "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==",
       "requires": {
         "sax": ">=0.6.0",
         "xmlbuilder": "~11.0.0"
diff --git a/package.json b/package.json
index 997e9338..63baa523 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "ts-node-iptc": "1.0.11",
     "typeconfig": "2.1.2",
     "typeorm": "0.3.12",
-    "xml2js": "0.4.23"
+    "xml2js": "0.6.2"
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "15.0.0",
@@ -101,7 +101,7 @@
     "@types/xml2js": "0.4.11",
     "@typescript-eslint/eslint-plugin": "5.54.1",
     "@typescript-eslint/parser": "5.54.1",
-    "bootstrap": "5.3.0-alpha1",
+    "bootstrap": "5.3.1",
     "chai": "4.3.7",
     "chai-http": "4.3.0",
     "codelyzer": "6.0.2",
@@ -125,12 +125,12 @@
     "leaflet": "1.9.3",
     "leaflet.markercluster": "1.5.3",
     "mocha": "10.2.0",
-    "ngx-bootstrap": "10.2.0",
+    "ngx-bootstrap": "10.3.0",
     "ngx-clipboard": "15.1.0",
     "ngx-cookie-service": "15.0.0",
     "ngx-device-detector": "5.0.1",
-    "ngx-markdown": "15.1.1",
-    "ngx-toastr": "16.1.0",
+    "ngx-markdown": "15.1.2",
+    "ngx-toastr": "15.2.2",
     "nyc": "15.1.0",
     "open-iconic": "1.1.1",
     "rxjs": "7.8.0",
diff --git a/src/frontend/app/ui/gallery/search/search-field/search-field.gallery.component.html b/src/frontend/app/ui/gallery/search/search-field/search-field.gallery.component.html
index 346c0682..e65ca377 100644
--- a/src/frontend/app/ui/gallery/search/search-field/search-field.gallery.component.html
+++ b/src/frontend/app/ui/gallery/search/search-field/search-field.gallery.component.html
@@ -9,11 +9,9 @@
 
   </app-gallery-search-field-base>
 
-  <div class="input-group-btn col-auto pe-0" style="display: block">
-    <button class="btn btn-light" type="button" (click)="openSearchModal(searchModal)">
-      <span class="oi oi-chevron-bottom"></span>
-    </button>
-  </div>
+  <button class="btn btn-tertiary" type="button" (click)="openSearchModal(searchModal)">
+    <span class="oi oi-chevron-bottom"></span>
+  </button>
 </div>
 
 
@@ -21,7 +19,7 @@
   <!-- sharing Modal-->
   <div class="modal-header">
     <h5 class="modal-title">{{placeholder}}</h5>
-    <button type="button"  class="btn-close"  (click)="hideSearchModal()" data-dismiss="modal" aria-label="Close">
+    <button type="button" class="btn-close" (click)="hideSearchModal()" data-dismiss="modal" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/frontend/app/ui/gallery/search/search.gallery.component.html b/src/frontend/app/ui/gallery/search/search.gallery.component.html
index 7a9c2cee..d2406fae 100644
--- a/src/frontend/app/ui/gallery/search/search.gallery.component.html
+++ b/src/frontend/app/ui/gallery/search/search.gallery.component.html
@@ -9,11 +9,11 @@
 
     </app-gallery-search-field-base>
 
-    <button class="btn btn-light" type="button"
+    <button class="btn btn-tertiary" type="button"
             [routerLink]="['/search', HTMLSearchQuery]">
       <span class="oi oi-magnifying-glass"></span>
     </button>
-    <button class="btn btn-light" type="button" (click)="openSearchModal(searchModal)">
+    <button class="btn btn-tertiary" type="button" (click)="openSearchModal(searchModal)">
       <span class="oi oi-chevron-bottom"></span>
     </button>
   </div>
diff --git a/src/frontend/styles.css b/src/frontend/styles.css
index e07e2bf5..bdbe1023 100644
--- a/src/frontend/styles.css
+++ b/src/frontend/styles.css
@@ -16,10 +16,6 @@ bs-dropdown-container {
   z-index: 1;
 }
 
-/* TODO: remove popover in ngx-bootstrap, bootstrap 5.3-alpha is fixed */
-.bs-popover-top, .bs-popover-bottom {
-  position: absolute;
-}
 
 .slim-loading-bar-progress {
   transition: opacity 1s ease-in;
@@ -31,6 +27,40 @@ element.style {
   width: 100px;
 }
 
-[data-bs-theme=dark] .btn:not(.btn-secondary):not(.btn-danger):not(.btn-warning):not(.btn-primary):not(.btn-success) {
-  --bs-btn-color: var(--bs-body-color);
+
+.btn-tertiary, [data-bs-theme=light] .btn-tertiary   {
+  --bs-btn-color: #000;
+  --bs-btn-bg: #f8f9fa;
+  --bs-btn-border-color: #f8f9fa;
+  --bs-btn-hover-color: #000;
+  --bs-btn-hover-bg: #d3d4d5;
+  --bs-btn-hover-border-color: #c6c7c8;
+  --bs-btn-focus-shadow-rgb: 211, 212, 213;
+  --bs-btn-active-color: #000;
+  --bs-btn-active-bg: #c6c7c8;
+  --bs-btn-active-border-color: #babbbc;
+  --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+  --bs-btn-disabled-color: #000;
+  --bs-btn-disabled-bg: #f8f9fa;
+  --bs-btn-disabled-border-color: #f8f9fa;
 }
+
+[data-bs-theme=dark] .btn-tertiary   {
+  --bs-btn-color: #fff;
+  --bs-btn-bg: #212529;
+  --bs-btn-border-color: var(--bs-border-color);
+  --bs-btn-hover-color: #fff;
+  --bs-btn-hover-bg: #424649;
+  --bs-btn-hover-border-color: #373b3e;
+  --bs-btn-focus-shadow-rgb: 66, 70, 73;
+  --bs-btn-active-color: #fff;
+  --bs-btn-active-bg: #4d5154;
+  --bs-btn-active-border-color: #373b3e;
+  --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+  --bs-btn-disabled-color: #fff;
+  --bs-btn-disabled-bg: #212529;
+  --bs-btn-disabled-border-color: #212529;
+ /* border: var(--bs-border-width) solid var(--bs-border-color);*/
+}
+
+