Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 8058)
+++ trunk/data/defaultpresets.xml	(revision 8059)
@@ -181,15 +181,4 @@
         </optional>
     </chunk>
-    <chunk id="payment_base">
-        <check key="payment:coins" text="Coins" />
-        <check key="payment:notes" text="Notes" text_context="payment" />
-        <check key="payment:electronic_purses" text="Electronic purses and Charge cards" />
-        <check key="payment:debit_cards" text="Debit cards" />
-        <check key="payment:credit_cards" text="Credit cards" />
-    </chunk>
-    <chunk id="payment_account">
-        <reference ref="payment_base" />
-        <check key="payment:account_cards" text="Account or loyalty cards" />
-    </chunk>
     <chunk id="fee">
         <combo key="fee" text="Fee" values="yes,no" />
@@ -2834,5 +2823,5 @@
             <reference ref="name_operator" />
             <text key="ref" text="Reference Number" />
-            <reference ref="payment_account" />
+            <preset_link preset_name="Payment Methods" />
         </item> <!-- Ticket Machine -->
     </group> <!-- Public Transport -->
@@ -4350,6 +4339,9 @@
             <key key="amenity" value="telephone" />
             <text key="operator" text="Operator" />
-            <reference ref="payment_base" />
+            <space />
+            <check key="payment:coins" text="Coins" />
+            <check key="payment:notes" text="Notes" text_context="payment" />
             <check key="payment:telephone_cards" text="Telephone cards" />
+            <preset_link preset_name="Payment Methods" />
         </item> <!-- Telephone -->
         <item name="Emergency Phone" icon="styles/standard/vehicle/emergency_phone.png" type="node" preset_name_label="true">
@@ -6355,5 +6347,5 @@
         </item> <!-- Music -->
     </group> <!-- Electronic -->
-    <group name="Cash" icon="presets/dollar.png">
+    <group name="Cash" icon="styles/standard/money/dollar.svg">
         <item name="Bank" icon="styles/standard/money/bank.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank"
@@ -6850,6 +6842,79 @@
         <text key="operator" text="Operator" />
         <text key="ref" text="Reference number" />
-        <reference ref="payment_account" />
+        <preset_link preset_name="Payment Methods" />
     </item> <!-- Vending Machine -->
+    <item name="Payment Methods" icon="styles/standard/money/dollar.svg" type="node,way,closedway,relation" preset_name_label="true">
+        <link href="http://wiki.openstreetmap.org/wiki/Key:payment" />
+        <space />
+        <combo key="payment:cash" text="Cash" values="yes,no" />
+        <checkgroup columns="4">
+            <check key="payment:coins" text="Coins" />
+            <check key="payment:notes" text="Notes" text_context="payment" />
+        </checkgroup>
+        <space />
+        <combo key="payment:debit_cards" text="Debit cards" values="no" />
+        <checkgroup columns="4">
+            <check key="payment:bankaxess" text="BankAxess" />
+            <check key="payment:bancomat" text="Bancomat" />
+            <check key="payment:girocard" text="Girocard" />
+            <check key="payment:laser" text="Laser" />
+            <check key="payment:maestro" text="Maestro" />
+            <check key="payment:visa_debit" text="Visa Debit" />
+            <check key="payment:visa_electron" text="Visa Electron" />
+        </checkgroup>
+        <space />
+        <combo key="payment:credit_cards" text="Credit cards" values="no" />
+        <checkgroup columns="4">
+            <check key="payment:american_express" text="American Express" />
+            <check key="payment:diners_club" text="Diners Club" />
+            <check key="payment:discover_card" text="Discover Card" />
+            <check key="payment:jcb" text="JCB" />
+            <check key="payment:mastercard" text="Mastercard" />
+            <check key="payment:visa" text="Visa" />
+        </checkgroup>
+        <space />
+        <combo key="payment:electronic_purses" text="Electronic purses and Charge cards" values="no" />
+        <checkgroup columns="4">
+            <check key="payment:ep_avant" text="Avant (fi)" />
+            <check key="payment:ep_cash" text="Cash (ch)" />
+            <check key="payment:ep_chipknip" text="Chipknip (nl)" />
+            <check key="payment:ep_geldkarte" text="Geldkarte (de)" />
+            <check key="payment:ep_mep" text="Mep (pt)" />
+            <check key="payment:ep_minicash" text="Minicash (lu)" />
+            <check key="payment:ep_minipay" text="Minipay (it)" />
+            <check key="payment:ep_monedero" text="Mondero (ar)" />
+            <check key="payment:ep_monedero4b" text="Mondero 4b (es)" />
+            <check key="payment:ep_moneo" text="Moneo (fr)" />
+            <check key="payment:ep_proton" text="Proton (be)" />
+            <check key="payment:ep_quick" text="Quick (au)" />
+        </checkgroup>
+        <space />
+        <combo key="payment:cryptocurrencies" text="Cryptocurrencies" values="no" />
+        <checkgroup columns="4">
+            <check key="payment:bitcoin" text="Bitcoin" />
+            <check key="payment:dogecoin" text="Dogecoin" />
+            <check key="payment:litecoin" text="Litecoin" />
+        </checkgroup>
+        <space />
+        <label text="Public transport:" />
+        <checkgroup columns="4">
+            <check key="payment:bob" text="Bob" />
+            <check key="payment:icsf" text="IC Stored Fare" />
+            <check key="payment:oyster" text="Oyster" />
+            <check key="payment:prepaid_ticket" text="Prepaid ticket" />
+            <check key="payment:sube" text="Sube" />
+        </checkgroup>
+        <space />
+        <label text="Others:" />
+        <checkgroup columns="4">
+            <check key="payment:cheque" text="Cheque" />
+            <check key="payment:contactless" text="Contactless" />
+            <check key="payment:meal_voucher" text="Meal voucher" />
+            <check key="payment:paypal" text="Paypal" />
+            <check key="payment:telephone_cards" text="Telephone cards" />
+            <check key="payment:u-key" text="U-Key" />
+            <check key="payment:wire_transfer" text="Wire transfer" />
+        </checkgroup>
+    </item> <!-- Payment Methods -->
   </group> <!-- Shops -->
   <group name="Geography" icon="presets/peak.svg">