Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 714)
+++ trunk/presets/presets.xml	(revision 715)
@@ -751,4 +751,5 @@
 		<key key="waterway" value="river" />
 		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
 	</item>
 
@@ -765,4 +766,5 @@
 		<key key="waterway" value="canal" />
 		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
 	</item>
 
@@ -772,4 +774,5 @@
 		<key key="waterway" value="drain" />
 		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
 	</item>
 
@@ -779,4 +782,5 @@
 		<key key="waterway" value="stream" />
 		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
 	</item>
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 714)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 715)
@@ -147,5 +147,5 @@
 			String name = a.getValue(a.NAME).toString();
 			if(!name.equals(" "))
-				us.put(a.getValue(a.NAME).toString(), a);
+				us.put(a.getValue(a.NAME).toString()+a.toString(), a);
 		}
 		for (String a : us.keySet())
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 714)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 715)
@@ -349,5 +349,5 @@
 	public void setDisplayName(String name) {
 		putValue(Action.NAME, tr(name));
-		String tooltip = tr("Use presets ''{0}''", tr(name));
+		String tooltip = tr("Use preset ''{0}''", tr(name));
 		putValue(SHORT_DESCRIPTION, "<html>"+tooltip+"</html>");
 	}
