diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index 89fd85876..4cf82ab98 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -445,7 +445,7 @@
         {
           "if": "toilets:paper_supplied=yes",
           "then": {
-            "en": "Toilet paper is equipped with toilet paper",
+            "en": "This toilet is equipped with toilet paper",
             "nl": "Deze toilet is voorzien van toiletpapier"
           }
         },
diff --git a/langs/layers/de.json b/langs/layers/de.json
index a4ee6ca39..23a65f1da 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -112,7 +112,7 @@
             "then": "Einfach, nur zwei Barrieren mit einem Zwischenraum <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>"
           },
           "1": {
-            "then": "Doppelt, zwei Barrieren hintereinander <img src='./assets/themes/cycle_infra/Cycle_barrier_double.png' style='width:8em'>"
+            "then": "Doppelt, zwei Barrieren hintereinander <img src='./assets/themes/cycle_infra/Cycle_barrier_double.svg' style='width:8em'>"
           },
           "2": {
             "then": "Dreifach, drei Barrieren hintereinander <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>"
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 55e053248..a9f7cc457 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -112,7 +112,7 @@
             "then": "Single, just two barriers with a space inbetween <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>"
           },
           "1": {
-            "then": "Double, two barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_double.png' style='width:8em'>"
+            "then": "Double, two barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_double.svg' style='width:8em'>"
           },
           "2": {
             "then": "Triple, three barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>"
@@ -3121,7 +3121,7 @@
       "toilet-has-paper": {
         "mappings": {
           "0": {
-            "then": "Toilet paper is equipped with toilet paper"
+            "then": "This toilet is equipped with toilet paper"
           },
           "1": {
             "then": "You have to bring your own toilet paper to this toilet"
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 16c62a00a..5a5355a95 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -112,7 +112,7 @@
             "then": "Enkelvoudig, slechts twee hekjes met ruimte ertussen <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>"
           },
           "1": {
-            "then": "Dubbel, twee hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_double.png' style='width:8em'>"
+            "then": "Dubbel, twee hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_double.svg' style='width:8em'>"
           },
           "2": {
             "then": "Drievoudig, drie hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>"