diff --git a/assets/layers/atm/atm.json b/assets/layers/atm/atm.json
index 807d65718f..47200d6787 100644
--- a/assets/layers/atm/atm.json
+++ b/assets/layers/atm/atm.json
@@ -32,17 +32,7 @@
     ]
   },
   "source": {
-    "osmTags": {
-      "or": [
-        "amenity=atm",
-        {
-          "and": [
-            "amenity=bank",
-            "atm=yes"
-          ]
-        }
-      ]
-    }
+    "osmTags": "amenity=atm"
   },
   "minzoom": 13,
   "presets": [
@@ -59,25 +49,7 @@
     }
   ],
   "tagRenderings": [
-    {
-      "builtin": "images",
-      "override": {
-        "condition": "amenity!=bank"
-      }
-    },
-    {
-      "id": "bank-images",
-      "render": "{image_carousel()}",
-      "condition": "amenity=bank"
-    },
-    {
-      "id": "atm-in-bank-notice",
-      "condition": "amenity=bank",
-      "render": {
-        "en": "This ATM is located in or near a bank",
-        "de": "Dieser Geldautomat befindet sich in oder in der Nähe einer Bank"
-      }
-    },
+    "images",
     {
       "id": "name",
       "render": {
@@ -139,12 +111,7 @@
         "nl": "Deze geldautomaat wordt beheerd door {operator}"
       }
     },
-    {
-      "builtin": "opening_hours",
-      "override": {
-        "condition": "amenity!=bank"
-      }
-    },
+    "opening_hours",
     {
       "id": "cash_out",
       "question": {
@@ -262,6 +229,18 @@
       ]
     }
   ],
+  "allowMove": {
+    "enableImproveAccuracy": true,
+    "enableRelocation": false
+  },
+  "deletion": {
+    "softDeletionTags": {
+      "and": [
+        "disused:amenity=atm",
+        "amenity="
+      ]
+    }
+  },
   "filter": [
     "open_now",
     {
@@ -277,4 +256,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/assets/layers/bank/bank.json b/assets/layers/bank/bank.json
new file mode 100644
index 0000000000..0d589629b7
--- /dev/null
+++ b/assets/layers/bank/bank.json
@@ -0,0 +1,70 @@
+{
+  "id": "bank",
+  "description": {
+    "en": "A financial institution to deposit money"
+  },
+  "name": {
+    "en": "Banks"
+  },
+  "title": {
+    "render": "Bank",
+    "mappings": [
+      {
+        "if": "name~*",
+        "then": "{name}"
+      }
+    ]
+  },
+  "source": {
+    "osmTags": "amenity=bank"
+  },
+  "mapRendering": [
+    {
+      "icon": "circle:white;./assets/layers/bank/bank.svg",
+      "location": [
+        "point",
+        "centroid"
+      ]
+    }
+  ],
+  "tagRenderings": [
+    {
+      "id": "has_atm",
+      "question": {
+        "en": "Does this bank have an ATM?"
+      },
+      "mappings": [
+        {
+          "if": "atm=yes",
+          "then": {
+            "en": "This bank has an ATM"
+          }
+        },
+        {
+          "if": "atm=no",
+          "then": {
+            "en": "This bank does <b>not</b> have an ATM"
+          }
+        },
+        {
+          "if": "atm=separate",
+          "then": {
+            "en": "This bank does have an ATM, but it is mapped as a different icon"
+          }
+        }
+      ]
+    }
+  ],
+  "filter": [
+    "open_now",
+    {
+      "id": "has_atm",
+      "options": [{
+        "question": {
+          "en": "With an ATM"
+        },
+        "osmTags": "atm=yes"
+      }]
+    }
+  ]
+}
diff --git a/assets/layers/bank/bank.svg b/assets/layers/bank/bank.svg
new file mode 100644
index 0000000000..b4145b19d8
--- /dev/null
+++ b/assets/layers/bank/bank.svg
@@ -0,0 +1,22 @@
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" 
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
+   xmlns:svg="http://www.w3.org/2000/svg" 
+   xmlns="http://www.w3.org/2000/svg" 
+   version="1.1" 
+   width="16"
+   height="16"
+   viewBox="0 0 16 16" 
+   id="svg2">  <metadata id="metadata8">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs6"/>
+  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="m 0,2 0,7 c 0,0.627119 0.423729,1 1,1 l 12,0 c 0.576271,0 1,-0.423729 1,-1 L 14,2 0,2 z m 3,1 8,0 c 0,1 1,2 2,2 l 0,2 C 12,7 11,8 11,9 L 3,9 C 3,8 2,7 1,7 L 1,5 C 2,5 3,4 3,3 z M 7,4 C 5.343146,4 4,4.8954305 4,6 4,7.10457 5.343146,8 7,8 8.656855,8 10,7.10457 10,6 10,4.8954305 8.656855,4 7,4 z M 0,10.5 C 0,11.626577 0.448696,12 1,12 l 12,0 c 0.551304,0 1,-0.445333 1,-1.5 -0.288136,0.271186 -0.559322,0.5 -1,0.5 L 1,11 C 0.559322,11 0.271186,10.754237 0,10.5 z" id="bank" style="fill:#734a08;fill-opacity:1;stroke:none" transform="translate(1,1)"/>
+</svg>
diff --git a/assets/layers/bank/license_info.json b/assets/layers/bank/license_info.json
new file mode 100644
index 0000000000..e2c96540fc
--- /dev/null
+++ b/assets/layers/bank/license_info.json
@@ -0,0 +1,12 @@
+[
+  {
+    "path": "bank.svg",
+    "license": "CC0",
+    "authors": [
+      "nebulon42"
+    ],
+    "sources": [
+      "https://github.com/gmgeo/osmic/blob/master/money/bank-14.svg"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/themes/atm/atm.json b/assets/themes/atm/atm.json
index 859a83a8fc..2e7c30f7dd 100644
--- a/assets/themes/atm/atm.json
+++ b/assets/themes/atm/atm.json
@@ -15,6 +15,32 @@
   "startLon": 0,
   "startZoom": 0,
   "layers": [
-    "atm"
+    "atm",
+    {
+      "builtin": "bank",
+      "override": {
+        "id": "banks_with_atm",
+        "name": null,
+        "source": {
+          "osmTags": {
+            "and+": [
+              "atm=yes"
+            ]
+          }
+        },
+        "filter": [
+          "open_now"
+        ]
+      }
+    },
+    {
+      "builtin": "bank",
+      "override": {
+        "minzoom": 18,
+        "filter": {
+          "sameAs": "bank"
+        }
+      }
+    }
   ]
-}
\ No newline at end of file
+}