diff --git a/firebase/functions/src/index.ts b/firebase/functions/src/index.ts
index 7cae58ad..819d2646 100644
--- a/firebase/functions/src/index.ts
+++ b/firebase/functions/src/index.ts
@@ -28,20 +28,19 @@ exports.commentsNotification = functions.database
     <p>Delete comment: TODO</p>`,
     };
 
-    console.log("Send mail")
-      return new Promise<void>((resolve, reject) => {
-          mg.messages().send(data, function (error) {
-              if (error) {
-                  reject(error)
-                  console.error(JSON.stringify(error));
-              } else {
-                  resolve()
-                  console.log("Mail sent with success:", JSON.stringify(data));
-              }
-          });
-
-      })
+    console.log("Send mail");
 
+    return new Promise<void>((resolve, reject) => {
+      mg.messages().send(data, function (error) {
+        if (error) {
+          reject(error);
+          console.error(JSON.stringify(error));
+        } else {
+          resolve();
+          console.log("Mail sent with success:", JSON.stringify(data));
+        }
+      });
+    });
   });
 
 exports.contact = functions.https.onRequest(contactApp);
diff --git a/src/components/images/asia/japan/tokyo/ueno-park.tsx b/src/components/images/asia/japan/tokyo/ueno-park.tsx
index f2f27877..98787488 100644
--- a/src/components/images/asia/japan/tokyo/ueno-park.tsx
+++ b/src/components/images/asia/japan/tokyo/ueno-park.tsx
@@ -17,7 +17,6 @@ const alt = {
   park10: "Ueno Park",
   park11: "Ueno Park",
   park12: "Ueno Park",
-  park13: "Ueno Park",
   park14: "Ueno Park",
   park15: "Ueno Park",
   park16: "Ueno Park",
@@ -129,13 +128,6 @@ export const UenoParkImages: React.FunctionComponent<ExtraImageProps & { image:
           }
         }
       }
-      park13: file(relativePath: { eq: "asia/japan/tokyo/ueno-park/ueno-park13.jpg" }) {
-        childImageSharp {
-          fluid(maxWidth: 1200, quality: 60, srcSetBreakpoints: [600]) {
-            ...GatsbyImageSharpFluid
-          }
-        }
-      }
       park14: file(relativePath: { eq: "asia/japan/tokyo/ueno-park/ueno-park14.jpg" }) {
         childImageSharp {
           fluid(maxWidth: 1200, quality: 80, srcSetBreakpoints: [600]) {
diff --git a/src/components/images/asia/japan/transports-in-japan.tsx b/src/components/images/asia/japan/transports-in-japan.tsx
index 17b49efa..5ca5a55b 100644
--- a/src/components/images/asia/japan/transports-in-japan.tsx
+++ b/src/components/images/asia/japan/transports-in-japan.tsx
@@ -30,7 +30,7 @@ export const TransportsInJapanImages: React.FunctionComponent<ExtraImageProps &
     query {
       taxi: file(relativePath: { eq: "asia/japan/transports-in-japan/transports-in-japan-taxi.jpg" }) {
         childImageSharp {
-          fluid(maxWidth: 1200, quality: 80, srcSetBreakpoints: [600]) {
+          fluid(maxWidth: 1200, quality: 60, srcSetBreakpoints: [600]) {
             ...GatsbyImageSharpFluid
           }
         }
@@ -51,7 +51,7 @@ export const TransportsInJapanImages: React.FunctionComponent<ExtraImageProps &
       }
       boat: file(relativePath: { eq: "asia/japan/transports-in-japan/transports-in-japan-boat.jpg" }) {
         childImageSharp {
-          fluid(maxWidth: 1200, quality: 80, srcSetBreakpoints: [600]) {
+          fluid(maxWidth: 1200, quality: 60, srcSetBreakpoints: [600]) {
             ...GatsbyImageSharpFluid
           }
         }
diff --git a/src/images/asia/japan/kyoto/fushimi/jing-ting-wu-yu-wu-song.jpg b/src/images/asia/japan/kyoto/fushimi/jing-ting-wu-yu-wu-song.jpg
deleted file mode 100644
index 63897ebb..00000000
Binary files a/src/images/asia/japan/kyoto/fushimi/jing-ting-wu-yu-wu-song.jpg and /dev/null differ
diff --git a/src/images/asia/japan/tokyo/shibuya-district/shibuya-district-main.jpg b/src/images/asia/japan/tokyo/shibuya-district/shibuya-district-main.jpg
index 4680bb81..dd128130 100644
Binary files a/src/images/asia/japan/tokyo/shibuya-district/shibuya-district-main.jpg and b/src/images/asia/japan/tokyo/shibuya-district/shibuya-district-main.jpg differ
diff --git a/src/images/asia/japan/tokyo/shibuya-district/shibuya-district-takeshita-street10.jpg b/src/images/asia/japan/tokyo/shibuya-district/shibuya-district-takeshita-street10.jpg
index fa4baee4..2e9fbbdc 100644
Binary files a/src/images/asia/japan/tokyo/shibuya-district/shibuya-district-takeshita-street10.jpg and b/src/images/asia/japan/tokyo/shibuya-district/shibuya-district-takeshita-street10.jpg differ
diff --git a/src/images/asia/japan/tokyo/ueno-park/ueno-park12.jpg b/src/images/asia/japan/tokyo/ueno-park/ueno-park12.jpg
index b8bff166..194c21ce 100644
Binary files a/src/images/asia/japan/tokyo/ueno-park/ueno-park12.jpg and b/src/images/asia/japan/tokyo/ueno-park/ueno-park12.jpg differ
diff --git a/src/images/asia/japan/tokyo/yasukuni-dori/yasukuni-dori-main.jpg b/src/images/asia/japan/tokyo/yasukuni-dori/yasukuni-dori-main.jpg
index 020fa841..cbb729a4 100644
Binary files a/src/images/asia/japan/tokyo/yasukuni-dori/yasukuni-dori-main.jpg and b/src/images/asia/japan/tokyo/yasukuni-dori/yasukuni-dori-main.jpg differ
diff --git a/src/images/asia/japan/transports-in-japan/transports-in-japan-bike.jpg b/src/images/asia/japan/transports-in-japan/transports-in-japan-bike.jpg
index 977cbe65..2ca9cd98 100644
Binary files a/src/images/asia/japan/transports-in-japan/transports-in-japan-bike.jpg and b/src/images/asia/japan/transports-in-japan/transports-in-japan-bike.jpg differ
diff --git a/src/images/asia/japan/transports-in-japan/transports-in-japan-boat.jpg b/src/images/asia/japan/transports-in-japan/transports-in-japan-boat.jpg
index 9a63ea10..2507d79b 100644
Binary files a/src/images/asia/japan/transports-in-japan/transports-in-japan-boat.jpg and b/src/images/asia/japan/transports-in-japan/transports-in-japan-boat.jpg differ
diff --git a/src/images/asia/japan/transports-in-japan/transports-in-japan-main.jpg b/src/images/asia/japan/transports-in-japan/transports-in-japan-main.jpg
index ec22b5ea..214bc310 100644
Binary files a/src/images/asia/japan/transports-in-japan/transports-in-japan-main.jpg and b/src/images/asia/japan/transports-in-japan/transports-in-japan-main.jpg differ
diff --git a/src/images/asia/japan/transports-in-japan/transports-in-japan-taxi.jpg b/src/images/asia/japan/transports-in-japan/transports-in-japan-taxi.jpg
index 7fbdde68..3a37ec4a 100644
Binary files a/src/images/asia/japan/transports-in-japan/transports-in-japan-taxi.jpg and b/src/images/asia/japan/transports-in-japan/transports-in-japan-taxi.jpg differ
diff --git a/src/locales/en/asia/japan/transports-in-japan.json b/src/locales/en/asia/japan/transports-in-japan.json
index ffe4a36b..104caf5a 100644
--- a/src/locales/en/asia/japan/transports-in-japan.json
+++ b/src/locales/en/asia/japan/transports-in-japan.json
@@ -77,7 +77,7 @@
       "part11": "The times shown are estimations. They are likely to vary according to the days, the months, the weather conditions, and anything else. Prices may change as well. We give you an estimation, so it's better to check the information beforehand.",
       "part12": "For cruises:",
       "part13": "Biwa Lake ↠ [Website link](https://www.biwakokisen.co.jp/en/index.html)",
-      "part14": "Towada Lake ↠ [PDF link](http://www.toutetsu.co.jp/ship/pamphlet/english.pdf) - Website in japanese",
+      "part14": "Towada Lake ↠ [PDF link](https://www.toutetsu.co.jp/ship/leaflet/lake_towada_cruise_english.pdf) - Website in japanese",
       "part15": "Ashinoko Lake ↠ [Website link](https://www.hakone-kankosen.co.jp/foreign/en/)",
       "part16": "Fujigoko (the region of the 5 Great Lakes) ↠ [Website link](https://www.fujigokokisen.jp/contents/en/)"
     },
diff --git a/src/locales/fr/asia/japan/transports-in-japan.json b/src/locales/fr/asia/japan/transports-in-japan.json
index dc1097d2..17e9fd18 100644
--- a/src/locales/fr/asia/japan/transports-in-japan.json
+++ b/src/locales/fr/asia/japan/transports-in-japan.json
@@ -77,7 +77,7 @@
       "part11": "Les durées indiquées sont des estimations. Elles sont susceptibles de varier en fonction des jours, des mois, des conditions météorologiques et de tout autre élément. Les prix peuvent être amenés à changer également, nous vous donnons ici un ordre d’idée, il est donc nécessaire de vérifier à l’avance ces informations.",
       "part12": "Pour les croisières :",
       "part13": "Lac Biwa ↠ [Lien du site](https://www.biwakokisen.co.jp/en/index.html)",
-      "part14": "Lac Towada ↠ [Lien du PDF](http://www.toutetsu.co.jp/ship/pamphlet/english.pdf) - site en japonais",
+      "part14": "Lac Towada ↠ [Lien du PDF](https://www.toutetsu.co.jp/ship/leaflet/lake_towada_cruise_english.pdf) - site en japonais",
       "part15": "Lake Ashinoko ↠ [Lien du site](https://www.hakone-kankosen.co.jp/foreign/en/)",
       "part16": "Fujigoko (le territoire des 5 lacs) ↠ [Lien du site](https://www.fujigokokisen.jp/contents/en/)"
     },
diff --git a/src/pages/asia/japan/kyoto/fushimi-inari-taisha.tsx b/src/pages/asia/japan/kyoto/fushimi-inari-taisha.tsx
index 17fd9f0c..2fe1b4b9 100644
--- a/src/pages/asia/japan/kyoto/fushimi-inari-taisha.tsx
+++ b/src/pages/asia/japan/kyoto/fushimi-inari-taisha.tsx
@@ -39,7 +39,6 @@ import { FushimiInariTaishaImages } from "../../../../components/images/asia/jap
 import { BookingCard, BookingWarning } from "../../../../components/core/booking"
 import urbanKyoto from "../../../../images/asia/japan/kyoto/fushimi/urban-kyoto-kyoto.jpg"
 import yamashinaHotel from "../../../../images/asia/japan/kyoto/fushimi/kyoto-yamashina-hotel-sanraku.jpg"
-import jingTing from "../../../../images/asia/japan/kyoto/fushimi/jing-ting-wu-yu-wu-song.jpg"
 import { BookingGygCardContainer } from "../../../../components/layout/layout"
 
 const namespace = "asia/japan/kyoto/fushimi-inari-taisha"
@@ -123,15 +122,6 @@ const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
               people={2}
               kind="hotel"
             />
-            <BookingCard
-              hotel="jp/jing-ting-wu-yu-wu-song"
-              title="京町屋 御屋・松"
-              image={jingTing}
-              note="9,4"
-              price={230}
-              people={2}
-              kind="flat"
-            />
           </BookingGygCardContainer>
           <BookingWarning>{t("where-to-stay.part4")}</BookingWarning>
           <p>{t("where-to-stay.part5")}</p>
diff --git a/src/pages/asia/japan/kyoto/kinkakuji.tsx b/src/pages/asia/japan/kyoto/kinkakuji.tsx
index 1203ca8b..6765d9a6 100644
--- a/src/pages/asia/japan/kyoto/kinkakuji.tsx
+++ b/src/pages/asia/japan/kyoto/kinkakuji.tsx
@@ -114,7 +114,7 @@ const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
               kind="hotel"
             />
             <BookingCard
-              hotel="jp/mitsui-garden-kyoto-sanjo"
+              hotel="jp/san-jing-gadenhoterujing-du-san-tiao-puremia"
               title="Mitsui Garden Hotel Kyoto Sanjo"
               image={mitsuiGarden}
               note="8,5"
diff --git a/src/pages/asia/japan/tokyo/shibuya-district.tsx b/src/pages/asia/japan/tokyo/shibuya-district.tsx
index f792887e..a654bded 100644
--- a/src/pages/asia/japan/tokyo/shibuya-district.tsx
+++ b/src/pages/asia/japan/tokyo/shibuya-district.tsx
@@ -35,8 +35,6 @@ import shibuyaExcelTokyo from "../../../../images/asia/japan/tokyo/shibuya-distr
 import ceruleanTowerTokyo from "../../../../images/asia/japan/tokyo/shibuya-district/cerulean-tower-tokyu.jpg"
 import { BookingGygCardContainer } from "../../../../components/layout/layout"
 import { ShibuyaDistrictImages } from "../../../../components/images/asia/japan/tokyo/shibuya-district"
-import { ExternalLinkNotUnderlined } from "../../../../components/core/links/link"
-import { buildPixabayUrl } from "../../../../utils"
 
 const namespace = "asia/japan/tokyo/shibuya-district"
 const id = "shibuya-district"
@@ -226,13 +224,7 @@ const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
                 <ImageAsPortrait>
                   <ShibuyaDistrictImages image="takeshitaStreet9" />
                 </ImageAsPortrait>
-                <ImageAsLandscape
-                  credit={
-                    <ExternalLinkNotUnderlined href={buildPixabayUrl(i18n.languageCode)("users/kirahoffmann-1855684")}>
-                      kirahoffmann
-                    </ExternalLinkNotUnderlined>
-                  }
-                >
+                <ImageAsLandscape>
                   <ShibuyaDistrictImages image="takeshitaStreet10" />
                 </ImageAsLandscape>
                 <ImageAsPortrait>
diff --git a/src/pages/asia/japan/tokyo/ueno-park.tsx b/src/pages/asia/japan/tokyo/ueno-park.tsx
index 9f22e03a..69fe6cb6 100644
--- a/src/pages/asia/japan/tokyo/ueno-park.tsx
+++ b/src/pages/asia/japan/tokyo/ueno-park.tsx
@@ -35,8 +35,6 @@ import {
 } from "../../../../components/images/layout"
 import { SharedCardJapanImages } from "../../../../components/images/asia/japan/shared-card-japan-images"
 import { UenoParkImages } from "../../../../components/images/asia/japan/tokyo/ueno-park"
-import { ExternalLinkNotUnderlined } from "../../../../components/core/links/link"
-import { buildPixabayUrl } from "../../../../utils"
 import { BookingCard, BookingWarning } from "../../../../components/core/booking"
 import { BookingGygCardContainer } from "../../../../components/layout/layout"
 import keiseiHotel from "../../../../images/asia/japan/tokyo/ueno-park/apa-hotel-keisei-ueno-ekimae.jpg"
@@ -186,26 +184,9 @@ const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
               </GroupOfImages>
               <p>{t("visit.part9")}</p>
               <p>{t("visit.part10")}</p>
-              <GroupOfImages>
-                <ImageAsLandscape
-                  credit={
-                    <ExternalLinkNotUnderlined href={buildPixabayUrl(i18n.languageCode)("users/yui_ma-406082")}>
-                      yui_ma
-                    </ExternalLinkNotUnderlined>
-                  }
-                >
-                  <UenoParkImages image="park12" />
-                </ImageAsLandscape>
-                <ImageAsLandscape
-                  credit={
-                    <ExternalLinkNotUnderlined href={buildPixabayUrl(i18n.languageCode)("users/yui_ma-406082")}>
-                      yui_ma
-                    </ExternalLinkNotUnderlined>
-                  }
-                >
-                  <UenoParkImages image="park13" />
-                </ImageAsLandscape>
-              </GroupOfImages>
+              <ImageAsLandscape>
+                <UenoParkImages image="park12" />
+              </ImageAsLandscape>
               <p>{t("visit.part11")}</p>
               <GroupOfImages>
                 <ImageAsLandscape>
diff --git a/src/pages/asia/japan/transports-in-japan.tsx b/src/pages/asia/japan/transports-in-japan.tsx
index c0d75967..7470711b 100644
--- a/src/pages/asia/japan/transports-in-japan.tsx
+++ b/src/pages/asia/japan/transports-in-japan.tsx
@@ -31,7 +31,7 @@ import {
 } from "../../../components/images/layout"
 import { SharedCardJapanImages } from "../../../components/images/asia/japan/shared-card-japan-images"
 import { ExternalLinkNotUnderlined } from "../../../components/core/links/link"
-import { buildPixabayUrl, price } from "../../../utils"
+import { price } from "../../../utils"
 import { TransportsInJapanImages } from "../../../components/images/asia/japan/transports-in-japan"
 import TokyoIslands from "../../../images/asia/japan/transports-in-japan/transports-in-japan-tokyo-islands.jpg"
 import OkinawaMap from "../../../images/asia/japan/transports-in-japan/transports-in-japan-okinawa-map.jpg"
@@ -163,13 +163,7 @@ const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
         <section>
           <JapanHeadline>{buildTitle(t("boat.title"))}</JapanHeadline>
           <Divider />
-          <ImageAsLandscape
-            credit={
-              <ExternalLinkNotUnderlined href={buildPixabayUrl(i18n.languageCode)("nick115-10240673")}>
-                Nick115
-              </ExternalLinkNotUnderlined>
-            }
-          >
+          <ImageAsLandscape>
             <TransportsInJapanImages image="boat" />
           </ImageAsLandscape>
           <Information title={t("plane.information.title")}>
@@ -420,13 +414,7 @@ const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
         <section>
           <JapanHeadline>{buildTitle(t("taxi.title"))}</JapanHeadline>
           <Divider />
-          <ImageAsLandscape
-            credit={
-              <ExternalLinkNotUnderlined href={buildPixabayUrl(i18n.languageCode)("rmsep4-12979322")}>
-                rmsep4
-              </ExternalLinkNotUnderlined>
-            }
-          >
+          <ImageAsLandscape>
             <TransportsInJapanImages image="taxi" />
           </ImageAsLandscape>
           <Information title={t("taxi.information.title")}>
@@ -546,13 +534,7 @@ const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
         <section>
           <JapanHeadline>{buildTitle(t("bike.title"))}</JapanHeadline>
           <Divider />
-          <ImageAsLandscape
-            credit={
-              <ExternalLinkNotUnderlined href={buildPixabayUrl(i18n.languageCode)("michelleraponi-165491")}>
-                michelleraponi
-              </ExternalLinkNotUnderlined>
-            }
-          >
+          <ImageAsLandscape>
             <TransportsInJapanImages image="bike" />
           </ImageAsLandscape>
           <Information title={t("bike.information.title")}>