Index: styles/standard/elemstyles.xml
===================================================================
--- styles/standard/elemstyles.xml	(revision 5247)
+++ styles/standard/elemstyles.xml	(working copy)
@@ -691,7 +691,6 @@
     
 	<rule>
 		<condition k="highway" v="turning_circle"/>
-		<area colour="turningcircle#c0c0c0"/>
 		<icon annotate="true" src="vehicle/turning_circle.png"/>
 	</rule>
 
@@ -739,8 +738,7 @@
 	<rule>
 		<condition k="junction" v="roundabout"/>
 		<line width="2" colour="roundabout#eeeeee"/>
-		<!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-		<icon annotate="true" src="misc/deprecated.png"/>
+		<icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
 	</rule>
 
 <!-- cycleway tags -->
Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml	(revision 5245)
+++ data/defaultpresets.xml	(working copy)
@@ -571,7 +571,7 @@
             <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" match="key" />
         </item>
         <separator/>
-        <item name="Roundabout" icon="presets/roundabout.png" type="closedway">
+        <item name="Roundabout" icon="presets/roundabout.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=roundabout"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:junction=roundabout"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:junction=roundabout"
Index: data/tagchecker.cfg
===================================================================
--- data/tagchecker.cfg	(revision 5245)
+++ data/tagchecker.cfg	(working copy)
@@ -88,7 +88,7 @@
 # see ticket #5017
 # Taginfo query: select keypairs.key1, keypairs.key2, keypairs.count_all, keys.count_all, cast(keypairs.count_all as real)/keys.count_all as from_fraction_all from keys, keypairs where key1='waterway' and keys.key=keypairs.key2 and (key1<>'highway' or keypairs.count_all>12000) and (key1<>'railway' or keypairs.count_all>3000) and (key1<>'waterway' or keypairs.count_all>800) and key2 not like '%:%' and from_fraction_all>0.97 and 1 union select keypairs.key2, keypairs.key1, keypairs.count_all, keys.count_all, cast(keypairs.count_all as real)/keys.count_all as from_fraction_all from keys, keypairs where key2='waterway' and keys.key=keypairs.key1 and (key2<>'highway' or keypairs.count_all>12000) and (key2<>'railway' or keypairs.count_all>3000) and (key2<>'waterway' or keypairs.count_all>800) and key1 not like '%:%' and from_fraction_all>0.97 and 1 order by keypairs.count_all desc limit 1000;
 *    : W : incline              == * && highway != *                                   # incline without highway
-*    : W : junction             == * && highway != *                                   # junction without highway
+way  : W : junction             == * && highway != *                                   # junction without highway
 *    : W : lanes                == * && highway != *                                   # lanes without highway
 *    : W : lcn                  == * && highway != *                                   # lcn without highway
 *    : W : lit                  == * && highway != * && public_transport != platform   # lit without highway