diff --git a/src/app/core/types/highlight.type.ts b/src/app/core/types/highlight.type.ts
index ba34213..345d53b 100644
--- a/src/app/core/types/highlight.type.ts
+++ b/src/app/core/types/highlight.type.ts
@@ -49,7 +49,7 @@ export enum PointHighlightType {
     terminus = 'terminus',
     laAqueduct = 'laAqueduct',
     devilsPostpile = 'devilsPostpile',
-    castleCrag = 'castleCrag',
+    castleCrags = 'castleCrags',
     fiveHundred = 'fiveHundred',
     oneThousand = 'oneThousand',
     fifteenHundred = 'fifteenHundred',
diff --git a/src/app/pages/hike/highlights-chain/point-highlight/point-highlight-summary/point-highlight-summary.component.html b/src/app/pages/hike/highlights-chain/point-highlight/point-highlight-summary/point-highlight-summary.component.html
index 8fc9c12..827cfc0 100644
--- a/src/app/pages/hike/highlights-chain/point-highlight/point-highlight-summary/point-highlight-summary.component.html
+++ b/src/app/pages/hike/highlights-chain/point-highlight/point-highlight-summary/point-highlight-summary.component.html
@@ -4,8 +4,8 @@
             <icon *ngSwitchCase="pointHighlightType.location" name="riesj"></icon>
             <icon *ngSwitchCase="pointHighlightType.photo" name="camera"></icon>
             <icon *ngSwitchCase="pointHighlightType.blog" name="blog"></icon>
-            <icon *ngSwitchCase="pointHighlightType.town" name="town"></icon>
-            <icon *ngSwitchCase="pointHighlightType.lodge" name="lodge"></icon>
+            <icon *ngSwitchCase="pointHighlightType.town" name="house"></icon>
+            <icon *ngSwitchCase="pointHighlightType.lodge" name="house"></icon>
             <icon *ngSwitchCase="pointHighlightType.lake" name="lake"></icon>
             <icon *ngSwitchCase="pointHighlightType.mountainPass" name="mountain-pass"></icon>
             <icon *ngSwitchCase="pointHighlightType.mountainSummit" name="mountain-summit"></icon>
@@ -15,6 +15,7 @@
             <icon *ngSwitchCase="pointHighlightType.terminus" name="terminus"></icon>
             <icon *ngSwitchCase="pointHighlightType.laAqueduct" name="aqueduct"></icon>
             <icon *ngSwitchCase="pointHighlightType.devilsPostpile" name="devils-postpile"></icon>
+            <icon *ngSwitchCase="pointHighlightType.castleCrags" name="cliff"></icon>
             <icon *ngSwitchCase="pointHighlightType.fiveHundred" name="party"></icon>
             <icon *ngSwitchCase="pointHighlightType.oneThousand" name="party"></icon>
             <icon *ngSwitchCase="pointHighlightType.fifteenHundred" name="party"></icon>
diff --git a/src/assets/icons/cliff.svg b/src/assets/icons/cliff.svg
new file mode 100644
index 0000000..006577a
--- /dev/null
+++ b/src/assets/icons/cliff.svg
@@ -0,0 +1,11 @@
+<svg version="1.1" id="cliff" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
+<polygon id="XMLID_11_" points="22.9,102.9 30.6,88.4 33.1,87.6 34.6,86 41.1,100 37.9,87.5 49.6,72.9 55.1,81 54.5,84.8 52.4,87.1 
+	60.5,83.6 61.6,87.9 63.4,86.8 68.9,97 68.9,102.9 "/>
+<polygon id="XMLID_10_" points="68.9,97 70.4,86.3 83.1,92.5 68.9,81.8 67.8,89.4 61.6,77.9 54.5,84.8 55.1,81 68,43.8 69.9,44.5 
+	72.6,49 81.4,30.6 83.1,30.2 81.6,32.8 83.9,32.8 85.8,34.1 87.1,32.8 87.9,37 88.9,35.9 90.6,39.1 93.5,92.6 90,91.3 84.1,98.5 
+	91.6,97 90.4,99.8 94.1,98.5 94.8,99.8 96.6,99.1 98.1,97 99.4,99.8 102.1,98.5 102.1,100.3 106.9,101.4 109.1,101.4 110.3,102.9 
+	68.9,102.9 "/>
+<polygon id="XMLID_4_" points="108.6,102.2 97.6,91.7 95.6,93.7 92.3,92.2 92.7,91.3 95.4,92.5 97.6,90.3 109.3,101.5 "/>
+<polygon id="XMLID_3_" points="89.7,40.9 89,27.9 84.8,25.8 83.1,30.2 81.3,30.8 84.4,24.5 90,27.3 90.7,40.8 "/>
+<polygon id="XMLID_2_" points="31.4,89 30.6,88.5 35.4,80.1 39.2,88.1 38.3,88.5 35.3,82.2 "/>
+</svg>
diff --git a/src/assets/icons/house.svg b/src/assets/icons/house.svg
new file mode 100644
index 0000000..788110e
--- /dev/null
+++ b/src/assets/icons/house.svg
@@ -0,0 +1,35 @@
+<svg version="1.1" id="house" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
+<path id="XMLID_13_" d="M76.5,70.1h1.2h4.9h5.9h4.9h1.2c0.8,0,1.5,0.7,1.5,1.5v6.6c0,0.8-0.7,1.5-1.5,1.5h-1.8h-4.3h-5.9h-4.3h-1.8
+	c-0.8,0-1.5-0.7-1.5-1.5v-6.6C75,70.8,75.7,70.1,76.5,70.1z"/>
+<path id="XMLID_11_" d="M76.5,82.2h1.2h4.9h5.9h4.9h1.2c0.8,0,1.5,0.7,1.5,1.5v6.6c0,0.8-0.7,1.5-1.5,1.5h-1.8h-4.3h-5.9h-4.3h-1.8
+	c-0.8,0-1.5-0.7-1.5-1.5v-6.6C75,82.9,75.7,82.2,76.5,82.2z"/>
+<path id="XMLID_4_" d="M76.5,94.5h1.2h4.9h5.9h4.9h1.2c0.8,0,1.5,0.7,1.5,1.5v6.6c0,0.8-0.7,1.5-1.5,1.5h-1.8h-4.3h-5.9h-4.3h-1.8
+	c-0.8,0-1.5-0.7-1.5-1.5V96C75,95.2,75.7,94.5,76.5,94.5z"/>
+<path id="XMLID_2_" d="M49.5,70.1h-1.2h-4.9h-5.9h-4.9h-1.2c-0.8,0-1.5,0.7-1.5,1.5v6.6c0,0.8,0.7,1.5,1.5,1.5h1.8h4.3h5.9h4.3h1.8
+	c0.8,0,1.5-0.7,1.5-1.5v-6.6C51,70.8,50.3,70.1,49.5,70.1z"/>
+<path id="XMLID_3_" d="M49.5,82.3h-1.2h-4.9h-5.9h-4.9h-1.2c-0.8,0-1.5,0.7-1.5,1.5v6.6c0,0.8,0.7,1.5,1.5,1.5h1.8h4.3h5.9h4.3h1.8
+	c0.8,0,1.5-0.7,1.5-1.5v-6.6C51,82.9,50.3,82.3,49.5,82.3z"/>
+<path id="XMLID_20_" d="M90.7,54.8c-1-0.8-11.2-8.2-11.2-8.2s-1-0.8-2.3-0.8c-1,0-8.6,0-12.7,0c0,0-1,0-2.5,0c-4.1,0-11.8,0-12.7,0
+	c-1.3,0-2.3,0.8-2.3,0.8s-10.2,7.4-11.2,8.2s0.5,0.9,0.5,0.9H62h2.5h25.7C90.2,55.8,91.7,55.6,90.7,54.8z"/>
+<path id="XMLID_21_" d="M74,42.7c-1.2-0.8-8.8-6.1-8.8-6.1s-0.1,0-0.1-0.1c-0.6-0.4-1.3-0.5-1.9-0.5c-0.6,0-1.3,0.1-1.9,0.5
+	c-0.1,0-0.1,0.1-0.1,0.1s-7.6,5.2-8.8,6.1s0.6,0.9,0.6,0.9h10.2h0.1h10.2C73.4,43.6,75.2,43.5,74,42.7z"/>
+<path id="XMLID_22_" d="M111.7,59.7c-3.1-1.1-6.5-1.9-8.1-3.1s-2.3-1.9-2.3-1.9s0.2-0.8,0.6-1.5s-0.4-1.2-1.7-1.7s-7.7-3.3-7.7-3.3
+	L90.2,47c0,0-0.9-1.1-0.4-2s0.1-1.6-1.9-2.3s-8.2-3.8-8.2-3.8l-1.3-0.9c0,0-0.9-0.9-0.6-1.4s0.6-1.3-1.4-2.1s-7.4-3.6-7.4-3.6
+	s-2.1-1.8-3.2-2.6c-0.7-0.5-1.7-0.9-2.8-0.8c-1.1-0.1-2.1,0.3-2.8,0.8c-1.1,0.8-3.2,2.6-3.2,2.6s-5.4,2.8-7.4,3.6s-1.8,1.6-1.4,2.1
+	s-0.6,1.4-0.6,1.4l-1.3,0.9c0,0-6.3,3.1-8.2,3.8s-2.4,1.3-1.9,2.3S36,47,36,47l-2.3,1.2c0,0-6.4,2.8-7.7,3.3s-2.1,1-1.7,1.7
+	s0.6,1.5,0.6,1.5s-0.7,0.7-2.3,1.9s-5,2.1-8.1,3.1s-1.4,3-1.4,3l2.9,3l47.2-34.3l47.2,34.3l2.9-3C113.2,62.7,114.9,60.8,111.7,59.7z
+	"/>
+<path id="XMLID_16_" d="M95.6,33.1H83.2c-0.8,0-1.5-0.7-1.5-1.5v-2.2c0-0.8,0.7-1.5,1.5-1.5h12.4c0.8,0,1.5,0.7,1.5,1.5v2.2
+	C97.1,32.4,96.5,33.1,95.6,33.1z"/>
+<path id="XMLID_18_" d="M83.1,37.1l6.8,3.5c0,0,2.9,1.8,3.1,3.9l3.1,1.7V36h-13V37.1z"/>
+<path id="XMLID_17_" d="M71.8,104.1H54.4c-0.8,0-1.5-0.7-1.5-1.5V71.5c0-0.8,0.7-1.5,1.5-1.5h17.4c0.8,0,1.5,0.7,1.5,1.5v31.1
+	C73.3,103.4,72.6,104.1,71.8,104.1z"/>
+<polygon id="XMLID_12_" points="25.6,61.2 22.8,69.6 22.8,72.4 25.5,72.4 22.8,80.6 22.8,83.4 25.6,83.4 22.8,91.8 22.8,94.5 
+	25.6,94.5 22.8,103 22.8,105.7 27.1,105.7 27.1,94.5 27.1,83.4 27.1,72.4 27.1,72.2 27.1,61.2 "/>
+<path id="XMLID_23_" d="M49.5,94.6h-1.2h-4.9h-5.9h-4.9h-1.2c-0.8,0-1.5,0.7-1.5,1.5v6.6c0,0.8,0.7,1.5,1.5,1.5h1.8h4.3h5.9h4.3h1.8
+	c0.8,0,1.5-0.7,1.5-1.5v-6.6C51,95.2,50.3,94.6,49.5,94.6z"/>
+<path id="XMLID_1_" d="M91.4,57.9h-3.8H72.3H53.7H38.4h-3.8c-2.6,0-4.7,0.7-4.7,1.5V66c0,0.8,2.1,1.5,4.7,1.5h5.6h13.5h18.6h13.5
+	h5.6c2.6,0,4.7-0.7,4.7-1.5v-6.6C96.1,58.6,94,57.9,91.4,57.9z"/>
+<polygon id="XMLID_8_" points="100.4,61.2 103.2,69.6 103.2,72.4 100.5,72.4 103.2,80.6 103.2,83.4 100.4,83.4 103.2,91.8 
+	103.2,94.5 100.4,94.5 103.2,103 103.2,105.7 98.9,105.7 98.9,94.5 98.9,83.4 98.9,72.4 98.9,72.2 98.9,61.2 "/>
+</svg>
diff --git a/src/assets/icons/mountain-bypass.svg b/src/assets/icons/mountain-bypass.svg
index d65bb1e..e9f377b 100644
--- a/src/assets/icons/mountain-bypass.svg
+++ b/src/assets/icons/mountain-bypass.svg
@@ -1,13 +1,16 @@
-<svg id="mountain-bypass" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 128 128">
-<polygon id="XMLID_4_" points="59.8,91.7 79.9,91.7 78.4,89.6 76.9,88.3 75.6,90 73.6,90 72.8,87 69.8,83 68.9,84.6 66.8,85.8 
-	63.4,85.8 61.9,87.3 60.9,89.3 "/>
-<polygon id="XMLID_1_" points="87.7,91.7 82.8,87.3 81.9,81.5 79,75.8 77.8,68.8 84.7,73.8 88.8,78.8 93.8,83 93.8,89.9 92.1,91.7 
+<svg version="1.1" id="mountain-bypass" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
+<polygon id="XMLID_4_" points="61.9,91.7 82,91.7 80.5,89.6 79,88.3 77.7,90 75.7,90 74.9,87 71.9,83 71,84.6 68.9,85.8 65.5,85.8 
+	64,87.3 63,89.3 "/>
+<polygon id="XMLID_1_" points="89.8,91.7 84.9,87.3 84,81.5 81.1,75.8 79.9,68.8 86.8,73.8 90.9,78.8 95.9,83 95.9,89.9 94.2,91.7 
 	"/>
-<polygon id="XMLID_8_" points="44.7,92.7 41.7,92.3 37.6,90.9 33.1,88.7 28.9,86.3 25,83 22.2,79.6 20,75.5 19.2,71.4 18.7,67.5 
-	19.2,65.7 20.8,62.9 23.7,64.3 28.1,64.9 26,60.6 25,56.4 24.8,53 25.1,50.1 20.8,53 17.5,55.4 13.7,58.6 11,61 13.7,61.7 
-	16.1,61.7 14.6,64 13.7,67.3 14,74.3 16.9,81.8 21.8,90 25.2,94.8 28.9,98.6 33.4,102.7 35.2,104 "/>
-<polygon id="XMLID_9_" points="16.7,86.8 19.8,91.7 13,91.7 "/>
-<polygon id="XMLID_7_" points="55.2,91.7 48.8,91.7 42.8,89.9 37.8,88 32.8,85.4 28.9,82.4 26,79.2 24,77.1 64,24 71.1,31.2 
-	80.4,41.7 90.8,53.1 101,69.4 114.4,88.9 117,91.7 112.2,91.7 67.4,36 65.2,38.4 64.3,42.8 66.8,46.9 66.8,49.7 63,47.2 60.8,48.6 
-	60.6,50.8 54.8,51.7 54.8,56.7 56,60.9 54.8,62.8 56,67.4 60.9,75.5 57.8,78.8 56,79.3 "/>
+<polygon id="XMLID_9_" points="18.8,86.8 21.9,91.7 15.2,91.7 "/>
+<polygon id="XMLID_7_" points="57.3,91.7 50.9,91.7 44.9,89.9 39.9,88 34.9,85.4 31,82.4 28.1,79.2 26.1,77.1 66.1,24 73.2,31.2 
+	82.5,41.7 92.9,53.1 103.1,69.4 116.5,88.9 119.1,91.7 114.3,91.7 69.5,36 67.3,38.4 66.4,42.8 68.9,46.9 68.9,49.7 65.1,47.2 
+	62.9,48.6 62.7,50.8 56.9,51.7 56.9,56.7 58.1,60.9 56.9,62.8 58.1,67.4 63,75.5 60,78.8 58.1,79.3 "/>
+<g id="XMLID_2_">
+	<path id="XMLID_6_" d="M43.8,92.3l-4-1.4l-4.6-2.1L31,86.3L27.1,83l-2.9-3.4c0,0-0.8-1.6-3.5-5.9c-2.7-4.4-4-6.9-4-6.9l6.9-1.9
+		c0,0-2-1-6.4-4c-3.4-2.3-4-2.9-4.1-3c0.1,0.1,0.2,0.8-0.8,2.5c-1.1,2-3.5,10.3-3.5,10.3s1.1-1.4,4.9-2.9c0,0,0.4,2.5,2.4,6.5
+		l2.9,7.6l4.9,8.2l3.5,4.8l3.7,3.8l4.5,4.1l1.8,1.3l9.5-11.3L43.8,92.3z"/>
+	<path id="XMLID_8_" d="M13.1,57.9C13.1,57.8,13.1,57.8,13.1,57.9C13.1,57.8,13.1,57.8,13.1,57.9z"/>
+</g>
 </svg>