diff --git a/WebContent/images/markers.pdf b/WebContent/images/markers.pdf
index 9fdaea66b..94c2def87 100644
Binary files a/WebContent/images/markers.pdf and b/WebContent/images/markers.pdf differ
diff --git a/WebContent/images/round-about-9.png b/WebContent/images/round-about-9.png
deleted file mode 100644
index ae5ee6fcb..000000000
Binary files a/WebContent/images/round-about-9.png and /dev/null differ
diff --git a/WebContent/images/round-about-big.png b/WebContent/images/round-about-big.png
new file mode 100644
index 000000000..e342a99cf
Binary files /dev/null and b/WebContent/images/round-about-big.png differ
diff --git a/WebContent/images/round-about.png b/WebContent/images/round-about.png
new file mode 100644
index 000000000..f18d9ad3d
Binary files /dev/null and b/WebContent/images/round-about.png differ
diff --git a/WebContent/main.html b/WebContent/main.html
index f16194161..3e48509c6 100644
--- a/WebContent/main.html
+++ b/WebContent/main.html
@@ -23,7 +23,7 @@
 
 <script src="OSRM.base.js"></script>
 <script src="OSRM.config.js"></script>
-<script defer="defer" src="OSRM.debug.js"></script>
+<!-- <script defer="defer" src="OSRM.debug.js"></script> -->
 
 <script src="OSRM.Browser.js"></script>
 <script src="OSRM.GUI.js"></script>
@@ -67,14 +67,14 @@
     <table class="full">
     <tr>
     <td id="gui-search-source-label">Start:</td>
-    <td><input id="input-source-name" class="input-box" type="text" value="Karlsruhe" title="Startposition eingeben" onkeypress="if(event.keyCode==13) {callGeocoder(OSRM.SOURCE_MARKER_ID, document.getElementById('input-source-name').value);}" /></td>
+    <td><input id="input-source-name" class="input-box" type="text" value="Karlsruhe" title="Startposition eingeben" onkeypress="if(event.keyCode==13) {callGeocoder(OSRM.SOURCE_MARKER_LABEL, document.getElementById('input-source-name').value);}" /></td>
     <!-- <td class="right"><a class="button not-selectable" id="gui-here-target" onclick="">i</a></td> -->
     <td class="right"><a class="button not-selectable" id="gui-search-source" onclick="callGeocoder(OSRM.SOURCE_MARKER_LABEL, document.getElementById('input-source-name').value);">Suchen</a></td>
     </tr>
     
     <tr>
     <td id="gui-search-target-label">Ende:</td>
-    <td><input id="input-target-name" class="input-box" type="text" value="Aalen" title="Zielposition eingeben" onkeypress="if(event.keyCode==13) {callGeocoder(OSRM.TARGET_MARKER_ID, document.getElementById('input-target-name').value);}" /></td>
+    <td><input id="input-target-name" class="input-box" type="text" value="Aalen" title="Zielposition eingeben" onkeypress="if(event.keyCode==13) {callGeocoder(OSRM.TARGET_MARKER_LABEL, document.getElementById('input-target-name').value);}" /></td>
     <!-- <td class="right"><a class="button not-selectable" id="gui-here-target" onclick="">i</a></td> -->
     <td class="right"><a class="button not-selectable" id="gui-search-target" onclick="callGeocoder(OSRM.TARGET_MARKER_LABEL, document.getElementById('input-target-name').value);">Suchen</a></td>
     </tr>
diff --git a/WebContent/routing.js b/WebContent/routing.js
index d4da9be89..fb6575898 100644
--- a/WebContent/routing.js
+++ b/WebContent/routing.js
@@ -380,17 +380,17 @@ function getDirectionIcon(name) {
 		"Turn slight right":"slight-right.png",
 		"Turn sharp left":"sharp-left.png",
 		"Turn sharp right":"sharp-right.png",
-		"Enter round-about and leave at first exit":"round-about-9.png",
-		"Enter round-about and leave at second exit":"round-about-9.png",
-		"Enter round-about and leave at third exit":"round-about-9.png",
-		"Enter round-about and leave at forth exit":"round-about-9.png",
-		"Enter round-about and leave at fifth exit":"round-about-9.png",
-		"Enter round-about and leave at sixth exit":"round-about-9.png",
-		"Enter round-about and leave at seventh exit":"round-about-9.png",
-		"Enter round-about and leave at eighth exit":"round-about-9.png",
-		"Enter round-about and leave at nineth exit":"round-about-9.png",
-		"Enter round-about and leave at tenth exit":"round-about-9.png",
-		"Enter round-about and leave at one of the too many exit":"round-about-9.png",
+		"Enter round-about and leave at first exit":"round-about.png",
+		"Enter round-about and leave at second exit":"round-about.png",
+		"Enter round-about and leave at third exit":"round-about.png",
+		"Enter round-about and leave at forth exit":"round-about.png",
+		"Enter round-about and leave at fifth exit":"round-about.png",
+		"Enter round-about and leave at sixth exit":"round-about.png",
+		"Enter round-about and leave at seventh exit":"round-about.png",
+		"Enter round-about and leave at eighth exit":"round-about.png",
+		"Enter round-about and leave at nineth exit":"round-about.png",
+		"Enter round-about and leave at tenth exit":"round-about.png",
+		"Enter round-about and leave at one of the too many exit":"round-about.png",
 	};
 	
 	if( directions[name] )