diff --git a/beautified_icons.mapping b/beautified_icons.mapping
index 598f84e2..be173653 100644
--- a/beautified_icons.mapping
+++ b/beautified_icons.mapping
@@ -382,6 +382,11 @@ tourist_information_terminal=${ICONPATH}tourist_information_terminal_20008.${ICO
 tourist_information_audioguide=${ICONPATH}tourist_information_audioguide_20001.${ICONTYPE}
 tourist_other_information_point=${ICONPATH}tourist_information.${ICONTYPE}
 tourist_marker=${ICONPATH}tourist_marker.${ICONTYPE}
+tourist_regional_cycle_network_junction=${ICONPATH}tourist_cycle_network_junction.${ICONTYPE}
+tourist_local_cycle_network_junction=${ICONPATH}tourist_cycle_network_junction.${ICONTYPE}
+tourist_regional_walking_network_junction=${ICONPATH}tourist_walking_network_junction.${ICONTYPE}
+tourist_local_walking_network_junction=${ICONPATH}tourist_walking_network_junction.${ICONTYPE}
+tourist_regional_hiking_network_junction=${ICONPATH}tourist_hiking_network_junction.${ICONTYPE}
 leisure=${ICONPATH}tourist_theme_park.${ICONTYPE}
 leisure_cinema=${ICONPATH}tourist_cinema2.${ICONTYPE}
 leisure_bandstand=${ICONPATH}tourist_empty.${ICONTYPE}
diff --git a/icons/png/tourist_cycle_network_junction.png b/icons/png/tourist_cycle_network_junction.png
new file mode 100644
index 00000000..c151e643
Binary files /dev/null and b/icons/png/tourist_cycle_network_junction.png differ
diff --git a/icons/png/tourist_hiking_network_junction.png b/icons/png/tourist_hiking_network_junction.png
new file mode 100644
index 00000000..09a2b9ad
Binary files /dev/null and b/icons/png/tourist_hiking_network_junction.png differ
diff --git a/icons/png/tourist_walking_network_junction.png b/icons/png/tourist_walking_network_junction.png
new file mode 100644
index 00000000..2264d325
Binary files /dev/null and b/icons/png/tourist_walking_network_junction.png differ
diff --git a/icons/svg-osm-icons/tourist/cycle_network_junction.svg b/icons/svg-osm-icons/tourist/cycle_network_junction.svg
new file mode 100644
index 00000000..e3ea1539
--- /dev/null
+++ b/icons/svg-osm-icons/tourist/cycle_network_junction.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="580px"
+   height="580px"
+   viewBox="0 0 580 580"
+   enable-background="new 0 0 580 580"
+   xml:space="preserve"
+   id="svg4578"
+   sodipodi:docname="cycle_network_junction.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+   id="metadata4584"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs4582">
+	
+	
+	
+
+		
+		
+	</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1725"
+   inkscape:window-height="973"
+   id="namedview4580"
+   showgrid="false"
+   inkscape:zoom="0.97035431"
+   inkscape:cx="290"
+   inkscape:cy="290"
+   inkscape:window-x="156"
+   inkscape:window-y="-2"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg4578" />
+<g
+   id="Layer_2">
+	<g
+   id="g1327">
+		<path
+   id="path1329"
+   d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.923,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+   inkscape:connector-curvature="0"
+   style="fill:#111111;stroke:#eeeeee;stroke-width:3.40799999" />
+	</g>
+</g>
+<path
+   style="fill:#ffffff"
+   inkscape:connector-curvature="0"
+   id="path4575"
+   d="m 407.2135,150.6362 c -8.643,0 -16.892,1.728 -24.42,4.85 -0.696,-2.409 -1.404,-4.853 -2.113,-7.307 -2.959,-10.226 -5.974,-20.607 -8.513,-29.089 -2.499,-8.356 -4.814,-13.502 -5.571,-17.206 -0.591,-2.886004 3.065,-2.638004 6.918,-5.849004 2.91,-2.424 5.378,-6.52 6.133,-10.689 0.629,-3.666 -0.151,-7.349 -1.855,-10.365 -5.922,-9.049 -11.7,-8.878 -19.347,-8.878 -10.052,0 -26.645,0 -26.645,0 l 0.063,16.327 25.563,0.052 c 3.05,0.006 4.631,4.295 -1.332,5.962 -2.609,0.724 -5.521,3.835 -6.495,7.689 -0.973,3.854 -0.245,7.700004 1.179,11.260004 0.327,0.819 0.968,3.334 1.908,6.857 l -116.053,0.585 -6.852,-16.774004 c 7.737,-1.77 25.49,-6.027 27.949,-8.368 2.919,-2.659 0,-6.66 -2.263,-6.66 h -60.566 c 0.748,13.36 11.219,16.265 16.886,17.145004 l 6.695,16.391 c -0.72,0.592 -1.335,1.321 -1.791,2.169 l -20.23,37.569 c -7.367,-2.968 -15.406,-4.604 -23.822,-4.604 -35.271,0 -63.966,28.695 -63.966,63.966 0,35.27 28.695,63.964 63.966,63.964 33.17,0 60.523,-25.38 63.66,-57.742 h 6.345 c 2.108,6.54 7.048,11.945 13.485,14.979 l -3.11,7.242 -11.474,0.105 c -2.459,0.022 -4.435,2.034 -4.412,4.492 0.023,2.445 2.011,4.411 4.452,4.411 0.013,0 0.027,0 0.042,0 l 25.753,-0.236 c 2.457,-0.023 4.433,-2.034 4.411,-4.493 -0.024,-2.444 -2.012,-4.411 -4.451,-4.411 -0.015,0 -0.027,0 -0.042,0 l -7.317,0.067 2.21,-5.143 c 1.892,0.4 3.856,0.618 5.877,0.618 14.639,0 26.547,-11.1 26.547,-24.744 0,-2.814 -0.516,-5.517 -1.446,-8.04 l 72.129,-48.944 c 0.671,2.324 1.335,4.624 1.984,6.876 -14.641,11.733 -24.033,29.754 -24.033,49.93 0,35.271 28.694,63.965 63.964,63.965 35.271,0 63.966,-28.694 63.966,-63.965 0,-35.271 -28.695,-63.964 -63.966,-63.964 z m -50.363,-21.83 c 1.317,4.453 2.735,9.291 4.184,14.267 l -76.789,52.105 c -0.82,-0.588 -1.675,-1.136 -2.566,-1.634 l 3.184,-7.407 11.524,-0.105 c 2.457,-0.022 4.433,-2.034 4.41,-4.493 -0.023,-2.459 -2.063,-4.421 -4.492,-4.411 l -25.755,0.236 c -2.458,0.022 -4.433,2.034 -4.409,4.493 0.021,2.445 2.01,4.411 4.449,4.411 0.014,0 0.028,0 0.041,0 l 7.269,-0.066 -2.108,4.905 c -2.444,-0.694 -5.036,-1.071 -7.723,-1.071 -0.238,0 -0.473,0.011 -0.707,0.016 l -24.786,-60.667 z m -131.495,4.587 25.547,62.533 c -3.758,2.977 -6.617,6.907 -8.144,11.388 h -6.7 c -2.383,-18.184 -12.432,-33.986 -26.787,-44.052 z m -7.994,73.921 h -31.809 l 14.881,-27.636 c 8.662,6.704 14.843,16.455 16.928,27.636 z m -44.722,53.857 c -25.091,0 -45.504,-20.413 -45.504,-45.502 0,-25.091 20.413,-45.504 45.504,-45.504 5.25,0 10.291,0.904 14.987,2.548 l -20.694,38.435 c -1.216,2.258 -1.155,4.991 0.16,7.193 1.316,2.202 3.692,3.551 6.257,3.551 h 44.356 c -3.043,22.154 -22.087,39.279 -45.066,39.279 z m 234.574,-1.066 c -25.091,0 -45.502,-20.413 -45.502,-45.503 0,-11.498 4.294,-22.005 11.354,-30.024 0.756,2.555 1.437,4.812 2.006,6.678 0.808,2.644 1.217,4.125 1.898,5.805 l 0.284,0.698 0.415,0.632 c 0.296,0.475 3.21,8.673 11.086,15.429 l 0.065,0.043 0.043,0.066 c 5.66,4.688 10.541,6.369 13.625,7.348 3.247,0.999 7.688,0.486 9.842,-2.851 1.706,-2.449 0.204,-7.405 -3.028,-9.753 -1.272,-0.89 -4.939,-3.802 -9.445,-7.744 -4.018,-3.586 -4.343,-6.333 -6.738,-10.546 0.062,0.136 -0.603,-1.774 -1.354,-4.234 -0.771,-2.524 -1.773,-5.895 -2.923,-9.82 -0.278,-0.952 -0.567,-1.938 -0.862,-2.952 5.846,-2.74 12.363,-4.28 19.234,-4.28 25.092,0 45.505,20.414 45.505,45.504 0,25.092 -20.414,45.504 -45.505,45.504 z" />
+<circle
+   style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:15.06000042;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+   id="path4612"
+   cx="289.92651"
+   cy="413.06195"
+   r="70.07299" /></svg>
\ No newline at end of file
diff --git a/icons/svg-osm-icons/tourist/hiking_network_junction.svg b/icons/svg-osm-icons/tourist/hiking_network_junction.svg
new file mode 100644
index 00000000..5e95b74a
--- /dev/null
+++ b/icons/svg-osm-icons/tourist/hiking_network_junction.svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="580px"
+   height="580px"
+   viewBox="0 0 580 580"
+   enable-background="new 0 0 580 580"
+   xml:space="preserve"
+   id="svg4578"
+   sodipodi:docname="hiking_network_junction.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+   id="metadata4584"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs4582">
+	
+	
+	
+
+		
+		
+	</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1725"
+   inkscape:window-height="973"
+   id="namedview4580"
+   showgrid="false"
+   inkscape:zoom="0.97035431"
+   inkscape:cx="290"
+   inkscape:cy="290"
+   inkscape:window-x="156"
+   inkscape:window-y="-2"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg4578" />
+<g
+   id="Layer_2">
+	<g
+   id="g1327">
+		<path
+   id="path1329"
+   d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.923,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+   inkscape:connector-curvature="0"
+   style="fill:#111111;stroke:#eeeeee;stroke-width:3.40799999" />
+	</g>
+</g>
+
+<circle
+   style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:15.06000042;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+   id="path4612"
+   cx="289.92651"
+   cy="413.06195"
+   r="70.07299" /><g
+   transform="matrix(0.53637891,0,0,0.53637891,134.3767,22.395888)"
+   id="Layer_2_1_"><g
+     id="g5276"><path
+       d="m 254.54,294.732 16.169,-60.584 25.812,66.143 94.146,21.473 c 1.438,0.328 2.874,0.484 4.289,0.484 8.762,0 16.68,-6.037 18.711,-14.941 2.358,-10.344 -4.114,-20.64 -14.457,-22.999 l -74.3,-16.946 -38.777,-99.365 c -0.684,-5.954 -3.084,-11.546 -6.82,-16.12 -1.715,-2.528 -3.968,-4.569 -6.55,-6.003 -2.812,-1.913 -5.982,-3.398 -9.454,-4.325 -14.12,-3.771 -28.556,2.834 -35.245,15.126 -2.024,2.501 -3.581,5.447 -4.465,8.757 L 135.07,497.135 c -3.367,12.615 4.13,25.572 16.746,28.939 2.043,0.545 4.093,0.805 6.111,0.805 10.447,0 20.005,-6.979 22.827,-17.551 l 35.27,-132.15 c 3.046,-0.768 5.941,-2.01 8.603,-3.637 l 29.922,126.236 c 2.577,10.873 12.277,18.195 22.984,18.195 1.805,0 3.639,-0.207 5.473,-0.643 12.704,-3.012 20.563,-15.752 17.551,-28.457 z"
+       id="path5268"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /><circle
+       cx="285.59601"
+       cy="90.999001"
+       r="43.589001"
+       id="circle5270"
+       style="fill:#ffffff" /><path
+       d="m 439.436,223.479 c -4.034,-0.601 -7.795,2.18 -8.397,6.217 l -43.964,294.411 c -0.604,4.039 2.178,7.795 6.215,8.4 4.035,0.602 7.795,-2.18 8.399,-6.217 l 43.964,-294.414 c 0.603,-4.034 -2.18,-7.794 -6.217,-8.397 z"
+       id="path5272"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /><path
+       d="m 147.735,285.093 14.229,3.982 c 9.427,2.641 19.214,-2.866 21.854,-12.298 l 29.074,-103.871 c 2.64,-9.429 -2.866,-19.215 -12.297,-21.854 l -14.228,-3.983 c -9.431,-2.638 -19.214,2.866 -21.855,12.296 l -29.073,103.872 c -2.641,9.431 2.865,19.215 12.296,21.856 z"
+       id="path5274"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /></g></g></svg>
\ No newline at end of file
diff --git a/icons/svg-osm-icons/tourist/walking_network_junction.svg b/icons/svg-osm-icons/tourist/walking_network_junction.svg
new file mode 100644
index 00000000..e0cd8151
--- /dev/null
+++ b/icons/svg-osm-icons/tourist/walking_network_junction.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="580px"
+   height="580px"
+   viewBox="0 0 580 580"
+   enable-background="new 0 0 580 580"
+   xml:space="preserve"
+   id="svg4578"
+   sodipodi:docname="walking_network_junction.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+   id="metadata4584"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs4582">
+	
+	
+	
+
+		
+		
+	</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1725"
+   inkscape:window-height="973"
+   id="namedview4580"
+   showgrid="false"
+   inkscape:zoom="0.97035431"
+   inkscape:cx="290"
+   inkscape:cy="290"
+   inkscape:window-x="156"
+   inkscape:window-y="-2"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg4578" />
+<g
+   id="Layer_2">
+	<g
+   id="g1327">
+		<path
+   id="path1329"
+   d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.923,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+   inkscape:connector-curvature="0"
+   style="fill:#111111;stroke:#eeeeee;stroke-width:3.40799999" />
+	</g>
+</g>
+
+<circle
+   style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:15.06000042;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+   id="path4612"
+   cx="289.92651"
+   cy="413.06195"
+   r="70.07299" /><g
+   transform="matrix(0.55163295,0,0,0.55163295,129.95288,15.032478)"
+   id="g5907"><path
+     style="fill:#ffffff"
+     inkscape:connector-curvature="0"
+     id="path5901"
+     d="m 161.466,189.385 c -3.186,47.518 15.344,94.145 19.742,127.576 4.478,34.014 3.548,85.937 16.707,103.274 19.661,25.905 63.669,13.33 72.901,-3.036 8.973,-15.913 3.863,-52.936 0,-72.901 -4.875,-25.199 -12.118,-49.571 -10.632,-71.381 1.873,-27.481 24.083,-57.049 24.301,-94.164 0.285,-48.585 -18.935,-114.95 -62.269,-106.312 -35.685,7.113 -57.645,70.637 -60.75,116.944 z m 135.169,69.863 c 1.014,27.644 21.761,62.27 18.225,100.237 -2.903,31.166 -33.092,87.481 -16.706,126.057 6.898,16.243 33.612,26.89 54.676,21.263 32.335,-8.637 31.235,-57.233 37.968,-104.793 5.737,-40.533 18.853,-61.711 25.82,-98.72 6.449,-34.269 -2.104,-81.985 -9.114,-103.276 -8.88,-26.977 -29.473,-56.715 -56.192,-54.675 -37.811,2.886 -56.195,72.573 -54.677,113.907 z" /><path
+     style="fill:#ffffff"
+     inkscape:connector-curvature="0"
+     id="path5903"
+     d="m 222.216,72.441 c 43.333,-8.638 62.554,57.727 62.269,106.312 -0.217,37.114 -22.428,66.683 -24.301,94.164 -1.485,21.81 5.757,46.182 10.632,71.381 3.863,19.966 8.973,56.988 0,72.901 -9.232,16.366 -53.24,28.941 -72.901,3.036 C 184.757,402.897 185.686,350.974 181.208,316.961 176.81,283.53 158.28,236.902 161.466,189.385 164.571,143.078 186.531,79.554 222.216,72.441 Z" /><path
+     style="fill:#ffffff"
+     inkscape:connector-curvature="0"
+     id="path5905"
+     d="m 351.31,145.341 c 26.72,-2.04 47.313,27.698 56.192,54.675 7.01,21.291 15.563,69.007 9.114,103.276 -6.968,37.009 -20.083,58.187 -25.82,98.72 -6.732,47.56 -5.633,96.156 -37.968,104.793 -21.063,5.627 -47.777,-5.02 -54.676,-21.263 -16.386,-38.575 13.803,-94.891 16.706,-126.057 3.536,-37.968 -17.211,-72.593 -18.225,-100.237 -1.516,-41.334 16.868,-111.021 54.677,-113.907 z" /></g></svg>
\ No newline at end of file
diff --git a/josm_icons.mapping b/josm_icons.mapping
index c8f42f6b..9f24436f 100644
--- a/josm_icons.mapping
+++ b/josm_icons.mapping
@@ -387,6 +387,11 @@ tourist_information_terminal=presets/misc/information/information.svg
 tourist_information_audioguide=presets/misc/information/audioguide.svg
 tourist_other_information_point=presets/misc/information/information.svg
 tourist_marker=presets/misc/information/route_marker.svg
+tourist_regional_cycle_network_junction=
+tourist_local_cycle_network_junction=
+tourist_regional_walking_network_junction=
+tourist_local_walking_network_junction=
+tourist_regional_hiking_network_junction=
 leisure=presets/leisure/theme_park.svg
 leisure_cinema=presets/leisure/cinema.svg
 leisure_bandstand=presets/leisure/bandstand.svg
diff --git a/master_preset.xml b/master_preset.xml
index ffaebb03..7e0a8aec 100644
--- a/master_preset.xml
+++ b/master_preset.xml
@@ -7019,6 +7019,48 @@
                 </checkgroup>
             </optional>
         </item> <!-- Route marker -->
+        <group name="Node network junctions" > 
+            <item name="Regional cycle network junction" icon="${tourist_regional_cycle_network_junction}" type="node" preset_name_label="true">
+                <link wiki="Tag:network:type=node_network"/>
+                <key key="network:type" value="node_network" object="true"/>
+                <text key="rcn_ref" match="key"/>
+                <optional>
+                    <text key="expected_rcn_route_relations" match="none" value_type="integer"/>
+                </optional>
+            </item>
+            <item name="Local cycle network junction" icon="${tourist_local_cycle_network_junction}" type="node" preset_name_label="true">
+                <link wiki="Tag:network:type=node_network"/>
+                <key key="network:type" value="node_network" object="true"/>
+                <text key="lcn_ref" match="key"/>
+                <optional>
+                    <text key="expected_lcn_route_relations" match="none" value_type="integer"/>
+                </optional>
+            </item>
+            <item name="Regional walking network junction" icon="${tourist_regional_walking_network_junction}" type="node" preset_name_label="true">
+                <link wiki="Tag:network:type=node_network"/>
+                <key key="network:type" value="node_network" object="true"/>
+                <text key="rwn_ref" match="key"/>
+                <optional>
+                    <text key="expected_rwn_route_relations" match="none" value_type="integer"/>
+                </optional>
+            </item>
+            <item name="Local walking network junction" icon="${tourist_regional_walking_network_junction}" type="node" preset_name_label="true">
+                <link wiki="Tag:network:type=node_network"/>
+                <key key="network:type" value="node_network" object="true"/>
+                <text key="lwn_ref" match="key"/>
+                <optional>
+                    <text key="expected_lwn_route_relations" match="none" value_type="integer"/>
+                </optional>
+            </item>
+            <item name="Regional hiking network junction" icon="${tourist_regional_hiking_network_junction}" type="node" preset_name_label="true">
+                <link wiki="Tag:network:type=node_network"/>
+                <key key="network:type" value="node_network" object="true"/>
+                <text key="rhn_ref" match="key"/>
+                <optional>
+                    <text key="expected_rhn_route_relations" match="none" value_type="integer"/>
+                </optional>
+            </item>
+        </group> <!-- Node network junctions -->
     </group> <!-- Tourism -->
     <group name="Leisure" icon="${leisure}">
         <item name="Movie Theater/Cinema" icon="${leisure_cinema}" type="node,closedway,multipolygon" preset_name_label="true">
@@ -14735,6 +14777,7 @@
                 <combo key="network" text="Network" values="icn,ncn,rcn,lcn" match="keyvalue!" display_values="International,National,Regional,Local" values_context="network" values_sort="false"/>
                 <optional>
                     <reference ref="route_hikebike_optionals"/>
+                    <text key="cycle_network" text="Cycle network"/>
                 </optional>
                 <roles>
                     <reference ref="route_segment_roles" />
@@ -14973,16 +15016,17 @@
                 <role key="" text="member" requisite="required" type="relation"/>
             </roles>
         </item> <!-- Route Network -->
-         <item name="Node Network" icon="${relation_route_group}" type="relation" preset_name_label="true">
+        <item name="Node Network" icon="${relation_route_group}" type="relation" preset_name_label="true">
             <link wiki="Cycle_Node_Network_Tagging#(C)_Network_tagging" />
             <space />
             <key key="type" value="network" />
             <key key="network:type" value="node_network" />
-            <combo key="network" text="Network" values="icn,ncn,rcn,lcn,ihn,nhn,rhn,lhn,iwn,nwn,rwn,lwn" 
-                display_values="International cycling,National cycling,Regional cycling,Local cycling,International riding,National riding,Regional riding,Local riding,International walking,National walking,Regional walking,Local walking" values_context="network" values_sort="false"/>
+            <combo key="network" text="Network" values="icn,ncn,rcn,lcn,ihn,nhn,rhn,lhn,iwn,nwn,rwn,lwn,rpn,lpn" 
+                display_values="International cycling,National cycling,Regional cycling,Local cycling,International riding,National riding,Regional riding,Local riding,International walking,National walking,Regional walking,Local walking,Regional canoe,Local canoe" values_context="network" values_sort="false"/>
             <optional>
                 <text key="name" text="Name" />
                 <text key="operator" text="Operator" />
+                <text key="cycle_network" text="Cycle network"/>
             </optional>
             <roles>
                 <role key="" text="route" requisite="required" type="relation" member_expression="&quot;network:type&quot;=node_network (type=route|type=network)" />