diff --git a/DataExtractionOSM/src/net/osmand/render/default.render.xml b/DataExtractionOSM/src/net/osmand/render/default.render.xml
index 33e74e01a4..52928a68e7 100644
--- a/DataExtractionOSM/src/net/osmand/render/default.render.xml
+++ b/DataExtractionOSM/src/net/osmand/render/default.render.xml
@@ -852,34 +852,49 @@
 		<switch>
 			<case tag="highway" value="tertiary" />
 			<case tag="highway" value="tertiary_link" />
-			<filter color="#fefeb3" shadowColor="#bababa" shadowRadius="1">
+			<filter color="#fefeb3" color_2="#fefeb3" shadowColor="#bababa" shadowRadius="1">
 				<filter minzoom="10" maxzoom="10" strokeWidth="3" />
 				<filter minzoom="11" maxzoom="11" strokeWidth="4" />
 				<filter minzoom="12" maxzoom="12" strokeWidth="5" />
 				<filter minzoom="13" maxzoom="13" strokeWidth="6" />
+				<switch>
+					<case layer="-1" pathEffect="4_4" />
+					<case /> <!-- all other cases -->
+					<filter>
+					<filter minzoom="14" maxzoom="14" strokeWidth="6" shadowRadius="1"/>
+					<filter minzoom="15" maxzoom="15" strokeWidth="8" shadowRadius="1"/>
+					<filter minzoom="16" maxzoom="16" strokeWidth="10" />
+					<!-- radius 0 to avoid showing many black lines -->
+					<filter minzoom="17" maxzoom="17" strokeWidth="13" />
+					<filter minzoom="18" strokeWidth="18" />
+					</filter>
+				</switch>
+				<!-- bridge -->
+				<switch>
+	              			<case nightMode="false" color="#000000" />
+	              			<case nightMode="true" color="#ffffff" />
+					<filter layer="1" cap_2="SQUARE" >
+						<filter minzoom="13" maxzoom="14" strokeWidth="8" strokeWidth_2="6" />
+						<filter minzoom="15" maxzoom="15" strokeWidth="10" strokeWidth_2="8" />
+						<filter minzoom="16" maxzoom="16" strokeWidth="12" strokeWidth_2="10" />
+						<filter minzoom="17" maxzoom="17" strokeWidth="15" strokeWidth_2="13" />
+						<filter minzoom="18" strokeWidth="20" strokeWidth_2="18" />
+			 		</filter>
+				</switch>   
 			</filter>
 		</switch>
 
-        		<switch>
-			<case nightMode="true" color="#9F9F9F" color_2="#9F9F9F" shadowColor="#666666"/>
-			<case nightMode="false" color="#ffffff" color_2="#ffffff" shadowColor="#464646"/>
+		<switch>
+			<case tag="highway" value="road" />
+			<case tag="highway" value="unclassified" />
+			<case tag="highway" value="residential" />
+			<filter>
 	  		<switch>
-				<case tag="highway" value="road" />
-				<case tag="highway" value="unclassified" />
-				<case tag="highway" value="residential" />
-					<filter shadowRadius="1">
-					<!-- ZM <filter minzoom="12" maxzoom="12" strokeWidth="3" /> -->
-					<filter minzoom="13" maxzoom="13" strokeWidth="4" />
-				</filter>
-			</switch>
-  			<switch>
-				<case tag="highway" value="tertiary" color="#fefeb3" color_2="#fefeb3" shadowColor="#bababa" />
-				<case tag="highway" value="tertiary_link" color="#fefeb3" color_2="#fefeb3" shadowColor="#bababa" />
-				<case tag="highway" value="road"/>
-				<case tag="highway" value="unclassified" />
-				<case tag="highway" value="residential" />
-				<filter>
-					<switch>
+				<case nightMode="true" color="#9F9F9F" color_2="#9F9F9F" shadowColor="#666666"/>
+				<case nightMode="false" color="#ffffff" color_2="#ffffff" shadowColor="#464646"/>
+				<filter shadowRadius="1">
+					<!-- ZM <filter minzoom="12" maxzoom="12" strokeWidth="3" /> -->						<filter minzoom="13" maxzoom="13" strokeWidth="4" />
+				<switch>
 					<case layer="-1" pathEffect="4_4" />
 					<case /> <!-- all other cases -->
 					<filter>
@@ -890,11 +905,13 @@
 						<filter minzoom="17" maxzoom="17" strokeWidth="13" />
 						<filter minzoom="18" strokeWidth="18" />
 					</filter>
-					</switch>
-				<!-- bridge -->
-				<switch>
-	              			<case nightMode="false" color="#000000" />
-	              			<case nightMode="true" color="#ffffff" />
+				</switch>
+				</filter>
+			</switch>
+			<!-- bridge -->
+			<switch>
+	              		<case nightMode="false" color="#000000" color_2="#ffffff" shadowColor="#464646" />
+              			<case nightMode="true" color="#ffffff" color_2="#9F9F9F" shadowColor="#666666" />
 		   	  	  	<filter layer="1" cap_2="SQUARE" >
 					<filter minzoom="13" maxzoom="14" strokeWidth="8" strokeWidth_2="6" />
 					<filter minzoom="15" maxzoom="15" strokeWidth="10" strokeWidth_2="8" />
@@ -902,9 +919,8 @@
 					<filter minzoom="17" maxzoom="17" strokeWidth="15" strokeWidth_2="13" />
 					<filter minzoom="18" strokeWidth="20" strokeWidth_2="18" />
 				 	</filter>
-				</switch>   
-				</filter>
-		  	</switch>
+			</switch>   
+			</filter>
 		</switch>
 
 		<switch>