diff --git a/src/view/components/clue/__snapshots__/Clue.spec.tsx.snap b/src/view/components/clue/__snapshots__/Clue.spec.tsx.snap
index 812c851c8..40de21d57 100644
--- a/src/view/components/clue/__snapshots__/Clue.spec.tsx.snap
+++ b/src/view/components/clue/__snapshots__/Clue.spec.tsx.snap
@@ -1680,7 +1680,7 @@ Array [
             <svg
               height="16px"
               version="1.1"
-              viewBox="0 35 181 181"
+              viewBox="35 35 160 181"
               width="16px"
               x="0px"
               xmlns="http://www.w3.org/2000/svg"
@@ -1691,88 +1691,56 @@ Array [
                 className="button-icon"
                 fill="none"
                 fill-rule="evenodd"
-                id="humidity"
+                id="pressure"
               >
                 <g>
                   <path
-                    d="M176.78,102.9c-2.55-38.41-35.41-70.19-73.01-72c-40.85-1.97-77.96,28.39-81.79,71.31c-3.09,34.66,20.9,78.17,71.32,83.79
-			c0,0,3.15,0.22,4.72,0.22c2.59,0,7.34-0.37,7.34-0.37C152.16,180.7,179.37,141.84,176.78,102.9z M98.69,174.27
-			c-36.41-0.23-66.06-30.97-65.19-67.6c0.84-35.08,30.52-64.44,66.07-64.27c36.37,0.18,65.79,30,65.54,66.43
-			C164.85,145.38,135.28,174.5,98.69,174.27z"
-                  />
-                </g>
-                <circle
-                  cx="98.66"
-                  cy="108.96"
-                  r="9.81"
-                />
-                <g>
-                  <path
-                    d="M87.09,162.9c0.25-2.81,0.49-5.63,0.76-8.44c0.87-9.19,1.76-18.37,2.63-27.55c0.59-6.18,1.11-12.36,1.75-18.53
-			c0.42-4,3.84-6.51,7.66-5.77c3.9,0.76,6.18,4.44,4.93,8.34c-2.78,8.68-5.7,17.33-8.55,25.99c-2.58,7.84-5.16,15.68-7.75,23.52
-			c-0.28,0.86-0.6,1.7-0.91,2.55C87.44,162.97,87.27,162.94,87.09,162.9z M96.12,108.52c-0.23,1.34,0.78,2.76,2.12,2.97
-			c1.36,0.22,2.77-0.77,3-2.1c0.24-1.37-0.73-2.7-2.13-2.94C97.72,106.21,96.36,107.16,96.12,108.52z"
+                    d="M187.33,103.15c-2.55-38.41-35.41-70.19-73.01-72c-40.85-1.97-77.96,28.39-81.79,71.31    c-3.09,34.66,20.9,78.17,71.32,83.79c0,0,3.15,0.22,4.72,0.22c2.59,0,7.34-0.37,7.34-0.37    C162.71,180.95,189.92,142.09,187.33,103.15z M109.24,174.51c-36.41-0.23-66.06-30.97-65.19-67.6    c0.84-35.08,30.52-64.44,66.07-64.27c36.37,0.18,65.79,30,65.54,66.43C175.4,145.63,145.83,174.75,109.24,174.51z"
                   />
                 </g>
-                <circle
-                  cx="98.66"
-                  cy="108.96"
-                  r="6.05"
-                />
-                <circle
-                  cx="99.33"
-                  cy="108.52"
-                  r="9.81"
-                />
                 <path
-                  d="M103.09,56.49c0,1.22,0.04,2.44-0.01,3.66c-0.08,2.22-1.68,3.78-3.82,3.77c-2.11-0.01-3.72-1.63-3.75-3.84
-		c-0.03-2.44-0.03-4.88,0-7.31c0.03-2.25,1.6-3.83,3.74-3.84c2.15-0.02,3.75,1.53,3.83,3.76C103.13,53.96,103.09,55.23,103.09,56.49
-		C103.09,56.49,103.09,56.49,103.09,56.49z"
+                  d="M114.58,61.2c0,1.52,0.04,3.05-0.01,4.57c-0.1,2.77-2.1,4.72-4.78,4.72c-2.64-0.01-4.65-2.04-4.69-4.8   c-0.04-3.05-0.04-6.1,0.01-9.14c0.04-2.81,2-4.78,4.68-4.8c2.69-0.02,4.69,1.92,4.79,4.7c0.06,1.58,0.01,3.17,0.01,4.75   C114.59,61.2,114.59,61.2,114.58,61.2z"
                 />
                 <path
-                  d="M76.57,61.59c0.61,1.06,1.25,2.09,1.82,3.17c1.04,1.96,0.43,4.11-1.42,5.18c-1.83,1.05-4.04,0.45-5.17-1.45
-		c-1.24-2.1-2.47-4.21-3.65-6.34c-1.1-1.97-0.53-4.11,1.32-5.2c1.85-1.09,4.02-0.55,5.2,1.34C75.34,59.37,75.94,60.48,76.57,61.59
-		C76.57,61.58,76.57,61.58,76.57,61.59z"
+                  d="M141.24,72.73c-0.87,1.25-1.71,2.52-2.63,3.74c-1.67,2.22-4.43,2.66-6.62,1.12c-2.16-1.52-2.64-4.34-1.09-6.62   c1.72-2.52,3.46-5.02,5.25-7.49c1.65-2.28,4.38-2.77,6.58-1.25c2.21,1.52,2.74,4.26,1.23,6.6   C143.11,70.17,142.16,71.44,141.24,72.73C141.25,72.74,141.25,72.73,141.24,72.73z"
                 />
                 <path
-                  d="M56.15,79.25c1.06,0.61,2.13,1.19,3.16,1.84c1.88,1.18,2.43,3.35,1.36,5.2c-1.06,1.82-3.27,2.41-5.2,1.33
-		c-2.13-1.19-4.24-2.41-6.33-3.66c-1.93-1.15-2.51-3.3-1.46-5.16c1.06-1.87,3.21-2.48,5.17-1.44
-		C53.97,77.95,55.05,78.61,56.15,79.25C56.15,79.25,56.15,79.25,56.15,79.25z"
+                  d="M156.47,97.47c-1.43,0.52-2.85,1.08-4.3,1.55c-2.64,0.86-5.16-0.36-6.07-2.87c-0.89-2.48,0.32-5.07,2.91-6.04   c2.85-1.08,5.71-2.12,8.59-3.12c2.66-0.92,5.18,0.25,6.11,2.75c0.94,2.52-0.2,5.06-2.78,6.11   C159.46,96.44,157.96,96.94,156.47,97.47C156.47,97.48,156.47,97.48,156.47,97.47z"
                 />
                 <path
-                  d="M47.3,104.76c1.22,0,2.44-0.04,3.66,0.01c2.22,0.08,3.78,1.68,3.77,3.82c-0.01,2.11-1.63,3.72-3.84,3.75
-		c-2.44,0.03-4.88,0.03-7.31,0c-2.25-0.03-3.83-1.6-3.84-3.74c-0.02-2.15,1.53-3.75,3.76-3.83
-		C44.76,104.72,46.03,104.76,47.3,104.76C47.3,104.76,47.3,104.76,47.3,104.76z"
+                  d="M154.74,126.47c-1.47-0.39-2.96-0.75-4.41-1.19c-2.65-0.81-4.02-3.25-3.32-5.83c0.69-2.54,3.17-3.97,5.85-3.28   c2.95,0.75,5.9,1.54,8.83,2.37c2.71,0.77,4.1,3.17,3.43,5.76c-0.68,2.6-3.07,4.03-5.78,3.41   C157.79,127.35,156.27,126.89,154.74,126.47C154.74,126.48,154.74,126.48,154.74,126.47z"
                 />
                 <path
-                  d="M52.39,131.28c1.06-0.61,2.09-1.25,3.17-1.82c1.96-1.04,4.11-0.43,5.18,1.42c1.05,1.83,0.45,4.04-1.45,5.17
-		c-2.1,1.24-4.21,2.47-6.34,3.65c-1.97,1.1-4.11,0.53-5.2-1.32c-1.09-1.85-0.55-4.02,1.34-5.2
-		C50.17,132.51,51.29,131.91,52.39,131.28C52.38,131.28,52.39,131.28,52.39,131.28z"
+                  d="M86.13,67.04c0.87,1.25,1.79,2.47,2.61,3.75c1.51,2.33,0.99,5.08-1.21,6.6c-2.16,1.51-4.98,1-6.59-1.24   c-1.78-2.48-3.53-4.97-5.24-7.49c-1.58-2.33-1.1-5.06,1.08-6.62c2.19-1.56,4.94-1.12,6.62,1.1C84.35,64.41,85.23,65.74,86.13,67.04   C86.13,67.04,86.13,67.04,86.13,67.04z"
                 />
                 <path
-                  d="M70.05,151.7c0.61-1.06,1.19-2.13,1.84-3.16c1.18-1.88,3.35-2.43,5.2-1.36c1.82,1.06,2.41,3.27,1.33,5.2
-		c-1.19,2.13-2.41,4.24-3.66,6.33c-1.15,1.93-3.3,2.51-5.16,1.46c-1.87-1.06-2.48-3.21-1.44-5.17
-		C68.75,153.88,69.41,152.8,70.05,151.7C70.05,151.7,70.05,151.7,70.05,151.7z"
+                  d="M66.17,88.15c1.43,0.52,2.88,1,4.29,1.57c2.57,1.04,3.72,3.59,2.8,6.1c-0.91,2.47-3.5,3.68-6.11,2.76   c-2.88-1.01-5.74-2.05-8.59-3.13c-2.63-1-3.81-3.52-2.91-6.04c0.9-2.53,3.41-3.75,6.05-2.89C63.21,87.01,64.68,87.6,66.17,88.15   C66.17,88.14,66.17,88.14,66.17,88.15z"
                 />
                 <path
-                  d="M142.5,137.79c-1.06-0.61-2.13-1.19-3.16-1.84c-1.88-1.18-2.43-3.35-1.36-5.2c1.06-1.82,3.27-2.41,5.2-1.33
-		c2.13,1.19,4.24,2.41,6.33,3.66c1.93,1.15,2.51,3.3,1.46,5.16c-1.06,1.87-3.21,2.48-5.17,1.44
-		C144.68,139.1,143.6,138.43,142.5,137.79C142.5,137.8,142.5,137.8,142.5,137.79z"
+                  d="M61.93,116.89c1.47-0.39,2.93-0.83,4.42-1.17c2.7-0.62,5.11,0.81,5.79,3.39c0.68,2.55-0.76,5.02-3.42,5.77   c-2.93,0.82-5.88,1.62-8.83,2.36c-2.73,0.69-5.14-0.7-5.85-3.27c-0.71-2.59,0.64-5.03,3.3-5.84   C58.85,117.65,60.39,117.29,61.93,116.89C61.93,116.88,61.93,116.88,61.93,116.89z"
                 />
                 <path
-                  d="M151.35,112.28c-1.22,0-2.44,0.04-3.66-0.01c-2.22-0.08-3.78-1.68-3.77-3.82c0.01-2.11,1.63-3.72,3.84-3.75
-		c2.44-0.03,4.88-0.03,7.31,0c2.25,0.03,3.83,1.6,3.84,3.74c0.02,2.15-1.53,3.75-3.76,3.83
-		C153.89,112.33,152.62,112.29,151.35,112.28C151.35,112.29,151.35,112.29,151.35,112.28z"
+                  d="M74.94,142.86c0.98-1.17,1.93-2.36,2.95-3.5c1.86-2.06,4.65-2.27,6.69-0.54c2.01,1.7,2.26,4.55,0.5,6.69   c-1.93,2.36-3.89,4.69-5.88,7c-1.84,2.13-4.61,2.38-6.67,0.67c-2.07-1.71-2.36-4.48-0.65-6.68   C72.86,145.25,73.91,144.07,74.94,142.86C74.93,142.85,74.93,142.86,74.94,142.86z"
                 />
-                <path
-                  d="M146.26,85.77c-1.06,0.61-2.09,1.25-3.17,1.82c-1.96,1.04-4.11,0.43-5.18-1.42c-1.05-1.83-0.45-4.04,1.45-5.17
-		c2.1-1.24,4.21-2.47,6.34-3.65c1.97-1.1,4.11-0.53,5.2,1.32c1.09,1.85,0.55,4.02-1.34,5.2C148.48,84.54,147.37,85.14,146.26,85.77
-		C146.27,85.77,146.26,85.77,146.26,85.77z"
+                <circle
+                  cx="109.19"
+                  cy="108.89"
+                  r="11.18"
                 />
-                <path
-                  d="M128.6,65.35c-0.61,1.06-1.19,2.13-1.84,3.16c-1.18,1.88-3.35,2.43-5.2,1.36c-1.82-1.06-2.41-3.27-1.33-5.2
-		c1.19-2.13,2.41-4.24,3.66-6.33c1.15-1.93,3.3-2.51,5.16-1.46c1.87,1.06,2.48,3.21,1.44,5.17C129.9,63.17,129.24,64.25,128.6,65.35
-		C128.6,65.35,128.6,65.35,128.6,65.35z"
+                <g>
+                  <path
+                    d="M96.02,170.32c0.29-3.2,0.56-6.41,0.87-9.61c0.99-10.46,2.01-20.92,3-31.38c0.67-7.04,1.26-14.08,1.99-21.11    c0.47-4.56,4.37-7.42,8.72-6.57c4.44,0.86,7.04,5.06,5.62,9.49c-3.17,9.89-6.49,19.73-9.74,29.6c-2.94,8.93-5.88,17.86-8.82,26.79    c-0.32,0.98-0.69,1.94-1.03,2.91C96.42,170.4,96.22,170.36,96.02,170.32z M106.3,108.38c-0.27,1.53,0.88,3.14,2.42,3.38    c1.55,0.25,3.16-0.88,3.42-2.39c0.27-1.56-0.83-3.08-2.42-3.35C108.12,105.75,106.57,106.83,106.3,108.38z"
+                  />
+                </g>
+                <circle
+                  cx="109.19"
+                  cy="108.89"
+                  r="6.89"
+                />
+                <circle
+                  cx="109.95"
+                  cy="108.38"
+                  r="11.18"
                 />
               </g>
             </svg>
@@ -1802,7 +1770,7 @@ Array [
             <svg
               height="16px"
               version="1.1"
-              viewBox="0 35 200 181"
+              viewBox="0 45 200 170"
               width="16px"
               x="0px"
               xmlns="http://www.w3.org/2000/svg"
@@ -1817,30 +1785,31 @@ Array [
               >
                 <g>
                   <path
-                    d="M151.32,127.13v-13.95H90.06V96.47h61.26V82.53l22.31,22.3L151.32,127.13z"
+                    d="M106.98,74l18.61-18.61l13.52,13.52L120.5,87.52l18.61,18.61l-13.52,13.52l-18.61-18.61l-18.61,18.61l-13.52-13.52    l18.61-18.61L74.86,68.91L88.37,55.4L106.98,74z"
                   />
                 </g>
                 <g>
-                  <path
-                    d="M61.6,82.52v13.95h61.26v16.71H61.6v13.95l-22.31-22.3L61.6,82.52z"
+                  <g>
+                    <g>
+                      <path
+                        d="M168.29,159.6L144,158.45l18.01-16.38l0.81-17.2l-16.37-18l24.29,1.15l24.57,27.01L168.29,159.6z"
+                      />
+                    </g>
+                  </g>
+                  <rect
+                    height="20.81"
+                    width="115.25"
+                    x="48.41"
+                    y="122.83"
                   />
+                  <g>
+                    <g>
+                      <path
+                        d="M47.06,105.41l24.29,1.15l-18.01,16.38l-0.81,17.2l16.37,18l-24.29-1.15l-24.57-27.01L47.06,105.41z"
+                      />
+                    </g>
+                  </g>
                 </g>
-                <line
-                  stroke="white"
-                  strokeWidth={10}
-                  x1="22.34"
-                  x2="22.34"
-                  y1="76.17"
-                  y2="132.65"
-                />
-                <line
-                  stroke="white"
-                  strokeWidth={10}
-                  x1="190.6"
-                  x2="190.6"
-                  y1="76.17"
-                  y2="132.65"
-                />
               </g>
             </svg>
           </button>
@@ -1882,36 +1851,33 @@ Array [
                 fill-rule="evenodd"
                 id="gesture"
               >
-                <path
-                  d="M28.49,97.73c0.35-2.53,0.64-5.06,1.06-7.58c2.04-12.22,6.79-23.29,14.3-33.16c0.15-0.2,0.29-0.41,0.57-0.8
-			c-0.56-0.05-0.98-0.12-1.4-0.12c-2.11-0.01-4.21,0.04-6.32-0.02c-2.12-0.06-3.58-1.46-3.54-3.28c0.04-1.8,1.43-3.13,3.49-3.15
-			c5.09-0.04,10.17-0.05,15.26,0.01c2.12,0.02,3.38,1.28,3.4,3.39c0.05,5.14,0.05,10.27-0.01,15.41c-0.02,1.96-1.4,3.32-3.12,3.36
-			c-1.77,0.03-3.22-1.39-3.28-3.38c-0.07-2.34-0.02-4.68-0.02-7.23c-18.8,23.48-18.57,60.54,0,83.65c0-2.09-0.02-3.97,0.01-5.84
-			c0.01-0.61,0.04-1.24,0.2-1.82c0.43-1.56,1.85-2.54,3.34-2.37c1.58,0.17,2.84,1.46,2.85,3.12c0.04,5.29,0.04,10.58,0,15.87
-			c-0.02,1.82-1.33,3.08-3.16,3.1c-5.24,0.03-10.48,0.03-15.72,0c-1.78-0.01-3.18-1.4-3.23-3.07c-0.06-1.73,1.31-3.2,3.2-3.26
-			c2.26-0.08,4.52-0.02,6.78-0.02c0.49,0,0.99,0,1.72,0c-1.47-2.1-2.82-3.95-4.08-5.86c-6.46-9.82-10.34-20.57-11.71-32.24
-			c-0.17-1.41-0.39-2.82-0.59-4.23C28.49,104.72,28.49,101.23,28.49,97.73z"
-                />
-                <path
-                  d="M93.58,126.65c-1.83-3.89-3.52-7.5-5.21-11.11c-7.75-16.53-15.38-33.12-23.32-49.56c-3.73-7.71,0.45-16.33,8.2-18.31
-			c5.42-1.38,11.28,0.9,13.9,5.94c2.62,5.05,4.91,10.27,7.34,15.42c1.5,3.19,3.01,6.38,4.53,9.6c6.93-5.98,10.61-6.56,17.8-2.9
-			c5.29-8.78,16.36-8.59,21.86-1.48c1.89-2.38,4.21-4.12,7.19-4.91c5.85-1.54,11.9,1.03,14.5,6.48c6.47,13.62,12.8,27.3,19.24,40.94
-			c2.26,4.78,4.67,9.51,5.35,14.84c0.33,2.57,0.89,5.22,0.59,7.75c-0.85,7.23-2.92,14.14-6.83,20.38c-0.19,0.3-0.38,0.61-0.55,0.92
-			c-2.63,4.69-6.21,8.08-11.36,10.23c-8.52,3.55-16.83,7.6-25.09,11.72c-5.61,2.8-11.12,2.72-16.81,0.66
-			c-7.39-2.67-13.83-6.99-19.91-11.82c-8.65-6.86-17.08-13.98-25.67-20.92c-2.15-1.73-4.49-3.25-6.82-4.74
-			c-3.56-2.29-6.21-5.24-7.01-9.5c-1.75-9.26,7.27-17.1,16.2-14.05c3.59,1.22,7.11,2.65,10.66,3.99
-			C92.63,126.34,92.93,126.43,93.58,126.65z M178.96,138.8c0.03-5.74-0.79-9.84-2.59-13.71c-7.16-15.34-14.34-30.67-21.55-45.99
-			c-1.63-3.46-5.23-4.77-8.48-3.22c-2.74,1.31-4.72,4.94-2.8,8.6c1.83,3.49,3.39,7.13,5.04,10.72c0.92,2,0.4,3.79-1.28,4.63
-			c-1.73,0.86-3.46,0.11-4.49-1.96c-0.09-0.18-0.17-0.37-0.26-0.56c-2.86-6.08-5.71-12.16-8.58-18.23c-1.25-2.65-3.68-3.97-6.3-3.74
-			c-4.22,0.39-7.17,5.01-5.04,9.09c2.27,4.36,4.2,8.9,6.27,13.37c0.66,1.43,0.4,2.74-0.74,3.78c-1.04,0.96-2.36,1.19-3.55,0.42
-			c-0.72-0.47-1.34-1.27-1.72-2.07c-2.66-5.55-5.2-11.15-7.87-16.7c-1.49-3.09-5.15-4.22-8.29-2.76c-2.68,1.24-4.59,4.89-3.03,8.05
-			c1.85,3.72,3.54,7.52,5.27,11.3c0.91,1.98,0.37,3.75-1.34,4.58c-1.73,0.84-3.49,0.15-4.43-1.81c-1.89-3.93-3.75-7.87-5.6-11.82
-			c-5.2-11.1-10.37-22.22-15.59-33.31c-1.64-3.49-5.11-4.77-8.44-3.22c-2.82,1.31-4.6,5.05-2.91,8.62
-			c7.28,15.34,14.45,30.73,21.66,46.1c3.38,7.2,6.76,14.39,10.13,21.58c0.94,2,0.71,3.32-0.69,4.41c-1.15,0.9-2.37,0.77-3.64,0.29
-			c-6.09-2.31-12.18-4.63-18.29-6.88c-3.29-1.21-6.77,0.53-7.92,3.85c-0.96,2.78,0.49,5.73,3.56,7.94
-			c4.79,3.44,9.54,6.94,14.18,10.59c7.62,6.01,15.04,12.27,22.72,18.2c4.8,3.71,9.99,6.86,15.84,8.72c3.16,1,6.29,1.26,9.43-0.23
-			c9.97-4.72,19.96-9.38,29.94-14.08c0.54-0.26,1.12-0.59,1.49-1.04C174.96,155.02,178.7,146.86,178.96,138.8z"
-                />
+                <g
+                  id="Layer_1"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <g>
+                    <path
+                      d="M77.36,36.04c2.42,0.38,4.58,1.24,5.79,4.15c1.26,3.04,0.46,6-2.09,7.49c-7.49,4.36-13.84,10.24-18.59,18.01    c-11.07,18.11-13.21,38.68-6.26,61.66c0.22,0.74,0.43,1.48,0.68,2.21c1.23,3.47,0.16,6.51-2.67,7.58    c-2.63,0.99-5.66-0.69-6.92-4.13c-3-8.21-4.83-16.63-5.33-25.14c-1.63-28.22,7.07-50.22,26.03-65.91c2.01-1.67,4.21-3.07,6.32-4.6    C75.34,36.92,76.35,36.48,77.36,36.04z"
+                    />
+                    <g>
+                      <path
+                        d="M92.68,53.69l-13.51,9.14l3.09-16.03l-6.47-9.56l-16.03-3.09l13.51-9.14l24.05,4.64L92.68,53.69z"
+                      />
+                    </g>
+                    <g>
+                      <path
+                        d="M38.48,141.9l-5.94-15.19l14.96,6.54l10.75-4.21l6.54-14.95l5.94,15.19l-9.81,22.44L38.48,141.9z"
+                      />
+                    </g>
+                  </g>
+                </g>
+                <g
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M110.93,146.76c-0.25-1.57-0.33-2.41-0.52-3.23c-2.88-12.45-5.85-24.89-8.65-37.36c-2.9-12.93-5.67-25.89-8.42-38.86   c-1.61-7.61,4.82-14.88,12.55-14.3c4.3,0.32,7.45,3.08,8.61,7.65c3.58,14.17,7.13,28.34,10.69,42.51c0.22,0.89,0.45,1.78,0.87,3.44   c2.58-4.13,5.47-6.81,9.64-7.73c4.24-0.94,7.82,0.26,10.85,3.52c2.75-2.49,5.66-4.2,9.38-4.37c3.39-0.15,6.12,0.88,8.04,3.64   c1,1.45,1.76,1.5,3.25,0.61c5.77-3.43,11.61-1.54,14.4,4.55c0.72,1.58,1.29,3.25,1.72,4.94c3.45,13.55,6.84,27.11,10.26,40.66   c2.26,8.94,1.26,17.42-3.33,25.5c-2.46,4.34-5.99,7.47-10.55,9.17c-8.8,3.28-17.82,5.75-27.34,5.61c-6.75-0.1-13.13-1.78-19.27-4.6   c-3.89-1.79-8.19-2.77-11.86-4.9c-6.7-3.9-13.13-8.27-19.54-12.65c-4.38-3-8.4-6.56-12.82-9.49c-2.93-1.94-6.29-3.24-9.49-4.76   c-0.85-0.4-1.82-0.55-2.72-0.86c-4.93-1.72-6.52-3.64-6.36-7.63c0.21-5.19,3.29-9.88,7.44-10.76c8.58-1.83,16.7-0.39,24.25,4.07   C104.83,142.79,107.56,144.63,110.93,146.76z"
+                  />
+                </g>
               </g>
             </svg>
           </button>
diff --git a/src/view/components/microbit/Microbit.tsx b/src/view/components/microbit/Microbit.tsx
index c1380ec99..b85565e67 100644
--- a/src/view/components/microbit/Microbit.tsx
+++ b/src/view/components/microbit/Microbit.tsx
@@ -116,7 +116,7 @@ const MICROBIT_TOOLBAR_BUTTONS: Array<{ label: string; image: JSX.Element }> = [
         label: MICROBIT_TOOLBAR_ICON_ID.GPIO,
     },
     {
-        image: TOOLBAR_SVG.GYROSCOPE_SVG,
+        image: TOOLBAR_SVG.COMPASS_SVG,
         label: MICROBIT_TOOLBAR_ICON_ID.COMPASS,
     },
     {
diff --git a/src/view/components/microbit/__snapshots__/Microbit.spec.tsx.snap b/src/view/components/microbit/__snapshots__/Microbit.spec.tsx.snap
index 7a5bf878a..8dc222774 100644
--- a/src/view/components/microbit/__snapshots__/Microbit.spec.tsx.snap
+++ b/src/view/components/microbit/__snapshots__/Microbit.spec.tsx.snap
@@ -3005,36 +3005,33 @@ Array [
                 fill-rule="evenodd"
                 id="gesture"
               >
-                <path
-                  d="M28.49,97.73c0.35-2.53,0.64-5.06,1.06-7.58c2.04-12.22,6.79-23.29,14.3-33.16c0.15-0.2,0.29-0.41,0.57-0.8
-			c-0.56-0.05-0.98-0.12-1.4-0.12c-2.11-0.01-4.21,0.04-6.32-0.02c-2.12-0.06-3.58-1.46-3.54-3.28c0.04-1.8,1.43-3.13,3.49-3.15
-			c5.09-0.04,10.17-0.05,15.26,0.01c2.12,0.02,3.38,1.28,3.4,3.39c0.05,5.14,0.05,10.27-0.01,15.41c-0.02,1.96-1.4,3.32-3.12,3.36
-			c-1.77,0.03-3.22-1.39-3.28-3.38c-0.07-2.34-0.02-4.68-0.02-7.23c-18.8,23.48-18.57,60.54,0,83.65c0-2.09-0.02-3.97,0.01-5.84
-			c0.01-0.61,0.04-1.24,0.2-1.82c0.43-1.56,1.85-2.54,3.34-2.37c1.58,0.17,2.84,1.46,2.85,3.12c0.04,5.29,0.04,10.58,0,15.87
-			c-0.02,1.82-1.33,3.08-3.16,3.1c-5.24,0.03-10.48,0.03-15.72,0c-1.78-0.01-3.18-1.4-3.23-3.07c-0.06-1.73,1.31-3.2,3.2-3.26
-			c2.26-0.08,4.52-0.02,6.78-0.02c0.49,0,0.99,0,1.72,0c-1.47-2.1-2.82-3.95-4.08-5.86c-6.46-9.82-10.34-20.57-11.71-32.24
-			c-0.17-1.41-0.39-2.82-0.59-4.23C28.49,104.72,28.49,101.23,28.49,97.73z"
-                />
-                <path
-                  d="M93.58,126.65c-1.83-3.89-3.52-7.5-5.21-11.11c-7.75-16.53-15.38-33.12-23.32-49.56c-3.73-7.71,0.45-16.33,8.2-18.31
-			c5.42-1.38,11.28,0.9,13.9,5.94c2.62,5.05,4.91,10.27,7.34,15.42c1.5,3.19,3.01,6.38,4.53,9.6c6.93-5.98,10.61-6.56,17.8-2.9
-			c5.29-8.78,16.36-8.59,21.86-1.48c1.89-2.38,4.21-4.12,7.19-4.91c5.85-1.54,11.9,1.03,14.5,6.48c6.47,13.62,12.8,27.3,19.24,40.94
-			c2.26,4.78,4.67,9.51,5.35,14.84c0.33,2.57,0.89,5.22,0.59,7.75c-0.85,7.23-2.92,14.14-6.83,20.38c-0.19,0.3-0.38,0.61-0.55,0.92
-			c-2.63,4.69-6.21,8.08-11.36,10.23c-8.52,3.55-16.83,7.6-25.09,11.72c-5.61,2.8-11.12,2.72-16.81,0.66
-			c-7.39-2.67-13.83-6.99-19.91-11.82c-8.65-6.86-17.08-13.98-25.67-20.92c-2.15-1.73-4.49-3.25-6.82-4.74
-			c-3.56-2.29-6.21-5.24-7.01-9.5c-1.75-9.26,7.27-17.1,16.2-14.05c3.59,1.22,7.11,2.65,10.66,3.99
-			C92.63,126.34,92.93,126.43,93.58,126.65z M178.96,138.8c0.03-5.74-0.79-9.84-2.59-13.71c-7.16-15.34-14.34-30.67-21.55-45.99
-			c-1.63-3.46-5.23-4.77-8.48-3.22c-2.74,1.31-4.72,4.94-2.8,8.6c1.83,3.49,3.39,7.13,5.04,10.72c0.92,2,0.4,3.79-1.28,4.63
-			c-1.73,0.86-3.46,0.11-4.49-1.96c-0.09-0.18-0.17-0.37-0.26-0.56c-2.86-6.08-5.71-12.16-8.58-18.23c-1.25-2.65-3.68-3.97-6.3-3.74
-			c-4.22,0.39-7.17,5.01-5.04,9.09c2.27,4.36,4.2,8.9,6.27,13.37c0.66,1.43,0.4,2.74-0.74,3.78c-1.04,0.96-2.36,1.19-3.55,0.42
-			c-0.72-0.47-1.34-1.27-1.72-2.07c-2.66-5.55-5.2-11.15-7.87-16.7c-1.49-3.09-5.15-4.22-8.29-2.76c-2.68,1.24-4.59,4.89-3.03,8.05
-			c1.85,3.72,3.54,7.52,5.27,11.3c0.91,1.98,0.37,3.75-1.34,4.58c-1.73,0.84-3.49,0.15-4.43-1.81c-1.89-3.93-3.75-7.87-5.6-11.82
-			c-5.2-11.1-10.37-22.22-15.59-33.31c-1.64-3.49-5.11-4.77-8.44-3.22c-2.82,1.31-4.6,5.05-2.91,8.62
-			c7.28,15.34,14.45,30.73,21.66,46.1c3.38,7.2,6.76,14.39,10.13,21.58c0.94,2,0.71,3.32-0.69,4.41c-1.15,0.9-2.37,0.77-3.64,0.29
-			c-6.09-2.31-12.18-4.63-18.29-6.88c-3.29-1.21-6.77,0.53-7.92,3.85c-0.96,2.78,0.49,5.73,3.56,7.94
-			c4.79,3.44,9.54,6.94,14.18,10.59c7.62,6.01,15.04,12.27,22.72,18.2c4.8,3.71,9.99,6.86,15.84,8.72c3.16,1,6.29,1.26,9.43-0.23
-			c9.97-4.72,19.96-9.38,29.94-14.08c0.54-0.26,1.12-0.59,1.49-1.04C174.96,155.02,178.7,146.86,178.96,138.8z"
-                />
+                <g
+                  id="Layer_1"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <g>
+                    <path
+                      d="M77.36,36.04c2.42,0.38,4.58,1.24,5.79,4.15c1.26,3.04,0.46,6-2.09,7.49c-7.49,4.36-13.84,10.24-18.59,18.01    c-11.07,18.11-13.21,38.68-6.26,61.66c0.22,0.74,0.43,1.48,0.68,2.21c1.23,3.47,0.16,6.51-2.67,7.58    c-2.63,0.99-5.66-0.69-6.92-4.13c-3-8.21-4.83-16.63-5.33-25.14c-1.63-28.22,7.07-50.22,26.03-65.91c2.01-1.67,4.21-3.07,6.32-4.6    C75.34,36.92,76.35,36.48,77.36,36.04z"
+                    />
+                    <g>
+                      <path
+                        d="M92.68,53.69l-13.51,9.14l3.09-16.03l-6.47-9.56l-16.03-3.09l13.51-9.14l24.05,4.64L92.68,53.69z"
+                      />
+                    </g>
+                    <g>
+                      <path
+                        d="M38.48,141.9l-5.94-15.19l14.96,6.54l10.75-4.21l6.54-14.95l5.94,15.19l-9.81,22.44L38.48,141.9z"
+                      />
+                    </g>
+                  </g>
+                </g>
+                <g
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M110.93,146.76c-0.25-1.57-0.33-2.41-0.52-3.23c-2.88-12.45-5.85-24.89-8.65-37.36c-2.9-12.93-5.67-25.89-8.42-38.86   c-1.61-7.61,4.82-14.88,12.55-14.3c4.3,0.32,7.45,3.08,8.61,7.65c3.58,14.17,7.13,28.34,10.69,42.51c0.22,0.89,0.45,1.78,0.87,3.44   c2.58-4.13,5.47-6.81,9.64-7.73c4.24-0.94,7.82,0.26,10.85,3.52c2.75-2.49,5.66-4.2,9.38-4.37c3.39-0.15,6.12,0.88,8.04,3.64   c1,1.45,1.76,1.5,3.25,0.61c5.77-3.43,11.61-1.54,14.4,4.55c0.72,1.58,1.29,3.25,1.72,4.94c3.45,13.55,6.84,27.11,10.26,40.66   c2.26,8.94,1.26,17.42-3.33,25.5c-2.46,4.34-5.99,7.47-10.55,9.17c-8.8,3.28-17.82,5.75-27.34,5.61c-6.75-0.1-13.13-1.78-19.27-4.6   c-3.89-1.79-8.19-2.77-11.86-4.9c-6.7-3.9-13.13-8.27-19.54-12.65c-4.38-3-8.4-6.56-12.82-9.49c-2.93-1.94-6.29-3.24-9.49-4.76   c-0.85-0.4-1.82-0.55-2.72-0.86c-4.93-1.72-6.52-3.64-6.36-7.63c0.21-5.19,3.29-9.88,7.44-10.76c8.58-1.83,16.7-0.39,24.25,4.07   C104.83,142.79,107.56,144.63,110.93,146.76z"
+                  />
+                </g>
               </g>
             </svg>
           </button>
@@ -3129,64 +3126,10 @@ Array [
               <g
                 className="button-icon"
                 fill-rule="evenodd"
-                id="gyro"
+                id="compass"
               >
-                <ellipse
-                  cx="109.59"
-                  cy="104.27"
-                  fill="none"
-                  rx="24.32"
-                  ry="51.56"
-                  stroke="var(--vscode-badgeForegroundOverride)"
-                  stroke-width="10"
-                  transform="matrix(0.7071 -0.7071 0.7071 0.7071 -41.6346 108.0341)"
-                />
-                <ellipse
-                  cx="107.83"
-                  cy="104.27"
-                  fill="none"
-                  rx="53.89"
-                  ry="21.99"
-                  stroke="var(--vscode-badgeForegroundOverride)"
-                  stroke-width="10"
-                  transform="matrix(0.7071 -0.7071 0.7071 0.7071 -42.151 106.7874)"
-                />
-                <circle
-                  cx="109.59"
-                  cy="104.27"
-                  fill="none"
-                  r="64.41"
-                  stroke="var(--vscode-badgeForegroundOverride)"
-                  stroke-width="10"
-                />
-                <circle
-                  cx="109.59"
-                  cy="102.51"
-                  r="13.01"
-                />
-                <circle
-                  cx="44.44"
-                  cy="169.43"
-                  r="8.76"
-                />
-                <rect
-                  height="6.97"
-                  transform="matrix(0.7071 -0.7071 0.7071 0.7071 -94.262 86.2351)"
-                  width="24.1"
-                  x="44.92"
-                  y="153.42"
-                />
-                <circle
-                  cx="174"
-                  cy="40.42"
-                  r="8.76"
-                />
-                <rect
-                  height="6.97"
-                  transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 314.2302 -26.5262)"
-                  width="24.1"
-                  x="150.56"
-                  y="48.33"
+                <path
+                  d="M105.5,192.63c-0.42-1.99-0.84-3.99-1.26-5.98c-2.54-12.22-5.1-24.43-7.61-36.65c-0.16-0.77-0.67-0.82-1.21-0.96    c-9.23-2.35-16.83-7.23-22.74-14.7c-3.62-4.57-6.14-9.69-7.57-15.35c-0.17-0.68-0.42-1.01-1.16-1.16    c-12.38-2.49-24.76-5.02-37.13-7.55c-1.54-0.31-3.07-0.64-4.63-1.16c1.74-0.38,3.48-0.78,5.23-1.15c8.8-1.87,17.6-3.74,26.39-5.61    c3.14-0.67,6.28-1.39,9.44-1.97c1.12-0.2,1.54-0.72,1.83-1.77c4.42-15.89,14.63-26,30.54-30.33c0.66-0.18,1.01-0.42,1.15-1.15    c1.62-8.5,3.28-16.98,4.93-25.47c1.26-6.5,2.52-13,3.99-19.53c0.28,1.39,0.57,2.78,0.83,4.17c2.56,13.57,5.11,27.15,7.65,40.73    c0.14,0.76,0.45,1.14,1.26,1.35c4.2,1.09,8.22,2.68,11.87,5.03c9.44,6.06,15.64,14.5,18.36,25.42c0.24,0.98,0.66,1.35,1.6,1.53    c14.16,2.6,28.31,5.22,42.46,7.84c1.35,0.25,2.7,0.51,4.1,0.94c-1,0.21-1.99,0.43-2.99,0.62c-14.41,2.68-28.81,5.38-43.23,7.97    c-1.39,0.25-1.9,0.74-2.29,2.07c-3.93,13.38-12.46,22.61-25.41,27.76c-1.45,0.58-2.96,1.01-4.48,1.37    c-0.84,0.2-1.1,0.72-1.24,1.41c-1.1,5.59-2.17,11.19-3.28,16.78c-1.66,8.33-3.36,16.66-5.04,24.99c-0.03,0.17-0.09,0.33-0.13,0.5    C105.64,192.63,105.57,192.63,105.5,192.63z M78.37,108.66c0.03,15.02,12,27.02,26.93,27c15.12-0.02,27.04-12.05,27.02-27.29    c-0.02-14.72-12.25-26.72-27.19-26.68C90.36,81.73,78.34,93.84,78.37,108.66z"
                 />
               </g>
             </svg>
diff --git a/src/view/container/device/__snapshots__/Device.spec.tsx.snap b/src/view/container/device/__snapshots__/Device.spec.tsx.snap
index 2e9d20d09..bce966d43 100644
--- a/src/view/container/device/__snapshots__/Device.spec.tsx.snap
+++ b/src/view/container/device/__snapshots__/Device.spec.tsx.snap
@@ -3007,36 +3007,33 @@ exports[`Device component  should render correctly 1`] = `
                 fill-rule="evenodd"
                 id="gesture"
               >
-                <path
-                  d="M28.49,97.73c0.35-2.53,0.64-5.06,1.06-7.58c2.04-12.22,6.79-23.29,14.3-33.16c0.15-0.2,0.29-0.41,0.57-0.8
-			c-0.56-0.05-0.98-0.12-1.4-0.12c-2.11-0.01-4.21,0.04-6.32-0.02c-2.12-0.06-3.58-1.46-3.54-3.28c0.04-1.8,1.43-3.13,3.49-3.15
-			c5.09-0.04,10.17-0.05,15.26,0.01c2.12,0.02,3.38,1.28,3.4,3.39c0.05,5.14,0.05,10.27-0.01,15.41c-0.02,1.96-1.4,3.32-3.12,3.36
-			c-1.77,0.03-3.22-1.39-3.28-3.38c-0.07-2.34-0.02-4.68-0.02-7.23c-18.8,23.48-18.57,60.54,0,83.65c0-2.09-0.02-3.97,0.01-5.84
-			c0.01-0.61,0.04-1.24,0.2-1.82c0.43-1.56,1.85-2.54,3.34-2.37c1.58,0.17,2.84,1.46,2.85,3.12c0.04,5.29,0.04,10.58,0,15.87
-			c-0.02,1.82-1.33,3.08-3.16,3.1c-5.24,0.03-10.48,0.03-15.72,0c-1.78-0.01-3.18-1.4-3.23-3.07c-0.06-1.73,1.31-3.2,3.2-3.26
-			c2.26-0.08,4.52-0.02,6.78-0.02c0.49,0,0.99,0,1.72,0c-1.47-2.1-2.82-3.95-4.08-5.86c-6.46-9.82-10.34-20.57-11.71-32.24
-			c-0.17-1.41-0.39-2.82-0.59-4.23C28.49,104.72,28.49,101.23,28.49,97.73z"
-                />
-                <path
-                  d="M93.58,126.65c-1.83-3.89-3.52-7.5-5.21-11.11c-7.75-16.53-15.38-33.12-23.32-49.56c-3.73-7.71,0.45-16.33,8.2-18.31
-			c5.42-1.38,11.28,0.9,13.9,5.94c2.62,5.05,4.91,10.27,7.34,15.42c1.5,3.19,3.01,6.38,4.53,9.6c6.93-5.98,10.61-6.56,17.8-2.9
-			c5.29-8.78,16.36-8.59,21.86-1.48c1.89-2.38,4.21-4.12,7.19-4.91c5.85-1.54,11.9,1.03,14.5,6.48c6.47,13.62,12.8,27.3,19.24,40.94
-			c2.26,4.78,4.67,9.51,5.35,14.84c0.33,2.57,0.89,5.22,0.59,7.75c-0.85,7.23-2.92,14.14-6.83,20.38c-0.19,0.3-0.38,0.61-0.55,0.92
-			c-2.63,4.69-6.21,8.08-11.36,10.23c-8.52,3.55-16.83,7.6-25.09,11.72c-5.61,2.8-11.12,2.72-16.81,0.66
-			c-7.39-2.67-13.83-6.99-19.91-11.82c-8.65-6.86-17.08-13.98-25.67-20.92c-2.15-1.73-4.49-3.25-6.82-4.74
-			c-3.56-2.29-6.21-5.24-7.01-9.5c-1.75-9.26,7.27-17.1,16.2-14.05c3.59,1.22,7.11,2.65,10.66,3.99
-			C92.63,126.34,92.93,126.43,93.58,126.65z M178.96,138.8c0.03-5.74-0.79-9.84-2.59-13.71c-7.16-15.34-14.34-30.67-21.55-45.99
-			c-1.63-3.46-5.23-4.77-8.48-3.22c-2.74,1.31-4.72,4.94-2.8,8.6c1.83,3.49,3.39,7.13,5.04,10.72c0.92,2,0.4,3.79-1.28,4.63
-			c-1.73,0.86-3.46,0.11-4.49-1.96c-0.09-0.18-0.17-0.37-0.26-0.56c-2.86-6.08-5.71-12.16-8.58-18.23c-1.25-2.65-3.68-3.97-6.3-3.74
-			c-4.22,0.39-7.17,5.01-5.04,9.09c2.27,4.36,4.2,8.9,6.27,13.37c0.66,1.43,0.4,2.74-0.74,3.78c-1.04,0.96-2.36,1.19-3.55,0.42
-			c-0.72-0.47-1.34-1.27-1.72-2.07c-2.66-5.55-5.2-11.15-7.87-16.7c-1.49-3.09-5.15-4.22-8.29-2.76c-2.68,1.24-4.59,4.89-3.03,8.05
-			c1.85,3.72,3.54,7.52,5.27,11.3c0.91,1.98,0.37,3.75-1.34,4.58c-1.73,0.84-3.49,0.15-4.43-1.81c-1.89-3.93-3.75-7.87-5.6-11.82
-			c-5.2-11.1-10.37-22.22-15.59-33.31c-1.64-3.49-5.11-4.77-8.44-3.22c-2.82,1.31-4.6,5.05-2.91,8.62
-			c7.28,15.34,14.45,30.73,21.66,46.1c3.38,7.2,6.76,14.39,10.13,21.58c0.94,2,0.71,3.32-0.69,4.41c-1.15,0.9-2.37,0.77-3.64,0.29
-			c-6.09-2.31-12.18-4.63-18.29-6.88c-3.29-1.21-6.77,0.53-7.92,3.85c-0.96,2.78,0.49,5.73,3.56,7.94
-			c4.79,3.44,9.54,6.94,14.18,10.59c7.62,6.01,15.04,12.27,22.72,18.2c4.8,3.71,9.99,6.86,15.84,8.72c3.16,1,6.29,1.26,9.43-0.23
-			c9.97-4.72,19.96-9.38,29.94-14.08c0.54-0.26,1.12-0.59,1.49-1.04C174.96,155.02,178.7,146.86,178.96,138.8z"
-                />
+                <g
+                  id="Layer_1"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <g>
+                    <path
+                      d="M77.36,36.04c2.42,0.38,4.58,1.24,5.79,4.15c1.26,3.04,0.46,6-2.09,7.49c-7.49,4.36-13.84,10.24-18.59,18.01    c-11.07,18.11-13.21,38.68-6.26,61.66c0.22,0.74,0.43,1.48,0.68,2.21c1.23,3.47,0.16,6.51-2.67,7.58    c-2.63,0.99-5.66-0.69-6.92-4.13c-3-8.21-4.83-16.63-5.33-25.14c-1.63-28.22,7.07-50.22,26.03-65.91c2.01-1.67,4.21-3.07,6.32-4.6    C75.34,36.92,76.35,36.48,77.36,36.04z"
+                    />
+                    <g>
+                      <path
+                        d="M92.68,53.69l-13.51,9.14l3.09-16.03l-6.47-9.56l-16.03-3.09l13.51-9.14l24.05,4.64L92.68,53.69z"
+                      />
+                    </g>
+                    <g>
+                      <path
+                        d="M38.48,141.9l-5.94-15.19l14.96,6.54l10.75-4.21l6.54-14.95l5.94,15.19l-9.81,22.44L38.48,141.9z"
+                      />
+                    </g>
+                  </g>
+                </g>
+                <g
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M110.93,146.76c-0.25-1.57-0.33-2.41-0.52-3.23c-2.88-12.45-5.85-24.89-8.65-37.36c-2.9-12.93-5.67-25.89-8.42-38.86   c-1.61-7.61,4.82-14.88,12.55-14.3c4.3,0.32,7.45,3.08,8.61,7.65c3.58,14.17,7.13,28.34,10.69,42.51c0.22,0.89,0.45,1.78,0.87,3.44   c2.58-4.13,5.47-6.81,9.64-7.73c4.24-0.94,7.82,0.26,10.85,3.52c2.75-2.49,5.66-4.2,9.38-4.37c3.39-0.15,6.12,0.88,8.04,3.64   c1,1.45,1.76,1.5,3.25,0.61c5.77-3.43,11.61-1.54,14.4,4.55c0.72,1.58,1.29,3.25,1.72,4.94c3.45,13.55,6.84,27.11,10.26,40.66   c2.26,8.94,1.26,17.42-3.33,25.5c-2.46,4.34-5.99,7.47-10.55,9.17c-8.8,3.28-17.82,5.75-27.34,5.61c-6.75-0.1-13.13-1.78-19.27-4.6   c-3.89-1.79-8.19-2.77-11.86-4.9c-6.7-3.9-13.13-8.27-19.54-12.65c-4.38-3-8.4-6.56-12.82-9.49c-2.93-1.94-6.29-3.24-9.49-4.76   c-0.85-0.4-1.82-0.55-2.72-0.86c-4.93-1.72-6.52-3.64-6.36-7.63c0.21-5.19,3.29-9.88,7.44-10.76c8.58-1.83,16.7-0.39,24.25,4.07   C104.83,142.79,107.56,144.63,110.93,146.76z"
+                  />
+                </g>
               </g>
             </svg>
           </button>
@@ -3131,64 +3128,10 @@ exports[`Device component  should render correctly 1`] = `
               <g
                 className="button-icon"
                 fill-rule="evenodd"
-                id="gyro"
+                id="compass"
               >
-                <ellipse
-                  cx="109.59"
-                  cy="104.27"
-                  fill="none"
-                  rx="24.32"
-                  ry="51.56"
-                  stroke="var(--vscode-badgeForegroundOverride)"
-                  stroke-width="10"
-                  transform="matrix(0.7071 -0.7071 0.7071 0.7071 -41.6346 108.0341)"
-                />
-                <ellipse
-                  cx="107.83"
-                  cy="104.27"
-                  fill="none"
-                  rx="53.89"
-                  ry="21.99"
-                  stroke="var(--vscode-badgeForegroundOverride)"
-                  stroke-width="10"
-                  transform="matrix(0.7071 -0.7071 0.7071 0.7071 -42.151 106.7874)"
-                />
-                <circle
-                  cx="109.59"
-                  cy="104.27"
-                  fill="none"
-                  r="64.41"
-                  stroke="var(--vscode-badgeForegroundOverride)"
-                  stroke-width="10"
-                />
-                <circle
-                  cx="109.59"
-                  cy="102.51"
-                  r="13.01"
-                />
-                <circle
-                  cx="44.44"
-                  cy="169.43"
-                  r="8.76"
-                />
-                <rect
-                  height="6.97"
-                  transform="matrix(0.7071 -0.7071 0.7071 0.7071 -94.262 86.2351)"
-                  width="24.1"
-                  x="44.92"
-                  y="153.42"
-                />
-                <circle
-                  cx="174"
-                  cy="40.42"
-                  r="8.76"
-                />
-                <rect
-                  height="6.97"
-                  transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 314.2302 -26.5262)"
-                  width="24.1"
-                  x="150.56"
-                  y="48.33"
+                <path
+                  d="M105.5,192.63c-0.42-1.99-0.84-3.99-1.26-5.98c-2.54-12.22-5.1-24.43-7.61-36.65c-0.16-0.77-0.67-0.82-1.21-0.96    c-9.23-2.35-16.83-7.23-22.74-14.7c-3.62-4.57-6.14-9.69-7.57-15.35c-0.17-0.68-0.42-1.01-1.16-1.16    c-12.38-2.49-24.76-5.02-37.13-7.55c-1.54-0.31-3.07-0.64-4.63-1.16c1.74-0.38,3.48-0.78,5.23-1.15c8.8-1.87,17.6-3.74,26.39-5.61    c3.14-0.67,6.28-1.39,9.44-1.97c1.12-0.2,1.54-0.72,1.83-1.77c4.42-15.89,14.63-26,30.54-30.33c0.66-0.18,1.01-0.42,1.15-1.15    c1.62-8.5,3.28-16.98,4.93-25.47c1.26-6.5,2.52-13,3.99-19.53c0.28,1.39,0.57,2.78,0.83,4.17c2.56,13.57,5.11,27.15,7.65,40.73    c0.14,0.76,0.45,1.14,1.26,1.35c4.2,1.09,8.22,2.68,11.87,5.03c9.44,6.06,15.64,14.5,18.36,25.42c0.24,0.98,0.66,1.35,1.6,1.53    c14.16,2.6,28.31,5.22,42.46,7.84c1.35,0.25,2.7,0.51,4.1,0.94c-1,0.21-1.99,0.43-2.99,0.62c-14.41,2.68-28.81,5.38-43.23,7.97    c-1.39,0.25-1.9,0.74-2.29,2.07c-3.93,13.38-12.46,22.61-25.41,27.76c-1.45,0.58-2.96,1.01-4.48,1.37    c-0.84,0.2-1.1,0.72-1.24,1.41c-1.1,5.59-2.17,11.19-3.28,16.78c-1.66,8.33-3.36,16.66-5.04,24.99c-0.03,0.17-0.09,0.33-0.13,0.5    C105.64,192.63,105.57,192.63,105.5,192.63z M78.37,108.66c0.03,15.02,12,27.02,26.93,27c15.12-0.02,27.04-12.05,27.02-27.29    c-0.02-14.72-12.25-26.72-27.19-26.68C90.36,81.73,78.34,93.84,78.37,108.66z"
                 />
               </g>
             </svg>
diff --git a/src/view/svgs/toolbar_svg.tsx b/src/view/svgs/toolbar_svg.tsx
index 568f13a17..22c4ee285 100644
--- a/src/view/svgs/toolbar_svg.tsx
+++ b/src/view/svgs/toolbar_svg.tsx
@@ -516,36 +516,20 @@ export const GESTURE_SVG = (
         viewBox="25 35 165 165"
     >
         <g id="gesture" fill="none" fill-rule="evenodd" className="button-icon">
-            <path
-                d="M28.49,97.73c0.35-2.53,0.64-5.06,1.06-7.58c2.04-12.22,6.79-23.29,14.3-33.16c0.15-0.2,0.29-0.41,0.57-0.8
-			c-0.56-0.05-0.98-0.12-1.4-0.12c-2.11-0.01-4.21,0.04-6.32-0.02c-2.12-0.06-3.58-1.46-3.54-3.28c0.04-1.8,1.43-3.13,3.49-3.15
-			c5.09-0.04,10.17-0.05,15.26,0.01c2.12,0.02,3.38,1.28,3.4,3.39c0.05,5.14,0.05,10.27-0.01,15.41c-0.02,1.96-1.4,3.32-3.12,3.36
-			c-1.77,0.03-3.22-1.39-3.28-3.38c-0.07-2.34-0.02-4.68-0.02-7.23c-18.8,23.48-18.57,60.54,0,83.65c0-2.09-0.02-3.97,0.01-5.84
-			c0.01-0.61,0.04-1.24,0.2-1.82c0.43-1.56,1.85-2.54,3.34-2.37c1.58,0.17,2.84,1.46,2.85,3.12c0.04,5.29,0.04,10.58,0,15.87
-			c-0.02,1.82-1.33,3.08-3.16,3.1c-5.24,0.03-10.48,0.03-15.72,0c-1.78-0.01-3.18-1.4-3.23-3.07c-0.06-1.73,1.31-3.2,3.2-3.26
-			c2.26-0.08,4.52-0.02,6.78-0.02c0.49,0,0.99,0,1.72,0c-1.47-2.1-2.82-3.95-4.08-5.86c-6.46-9.82-10.34-20.57-11.71-32.24
-			c-0.17-1.41-0.39-2.82-0.59-4.23C28.49,104.72,28.49,101.23,28.49,97.73z"
-            />
-            <path
-                d="M93.58,126.65c-1.83-3.89-3.52-7.5-5.21-11.11c-7.75-16.53-15.38-33.12-23.32-49.56c-3.73-7.71,0.45-16.33,8.2-18.31
-			c5.42-1.38,11.28,0.9,13.9,5.94c2.62,5.05,4.91,10.27,7.34,15.42c1.5,3.19,3.01,6.38,4.53,9.6c6.93-5.98,10.61-6.56,17.8-2.9
-			c5.29-8.78,16.36-8.59,21.86-1.48c1.89-2.38,4.21-4.12,7.19-4.91c5.85-1.54,11.9,1.03,14.5,6.48c6.47,13.62,12.8,27.3,19.24,40.94
-			c2.26,4.78,4.67,9.51,5.35,14.84c0.33,2.57,0.89,5.22,0.59,7.75c-0.85,7.23-2.92,14.14-6.83,20.38c-0.19,0.3-0.38,0.61-0.55,0.92
-			c-2.63,4.69-6.21,8.08-11.36,10.23c-8.52,3.55-16.83,7.6-25.09,11.72c-5.61,2.8-11.12,2.72-16.81,0.66
-			c-7.39-2.67-13.83-6.99-19.91-11.82c-8.65-6.86-17.08-13.98-25.67-20.92c-2.15-1.73-4.49-3.25-6.82-4.74
-			c-3.56-2.29-6.21-5.24-7.01-9.5c-1.75-9.26,7.27-17.1,16.2-14.05c3.59,1.22,7.11,2.65,10.66,3.99
-			C92.63,126.34,92.93,126.43,93.58,126.65z M178.96,138.8c0.03-5.74-0.79-9.84-2.59-13.71c-7.16-15.34-14.34-30.67-21.55-45.99
-			c-1.63-3.46-5.23-4.77-8.48-3.22c-2.74,1.31-4.72,4.94-2.8,8.6c1.83,3.49,3.39,7.13,5.04,10.72c0.92,2,0.4,3.79-1.28,4.63
-			c-1.73,0.86-3.46,0.11-4.49-1.96c-0.09-0.18-0.17-0.37-0.26-0.56c-2.86-6.08-5.71-12.16-8.58-18.23c-1.25-2.65-3.68-3.97-6.3-3.74
-			c-4.22,0.39-7.17,5.01-5.04,9.09c2.27,4.36,4.2,8.9,6.27,13.37c0.66,1.43,0.4,2.74-0.74,3.78c-1.04,0.96-2.36,1.19-3.55,0.42
-			c-0.72-0.47-1.34-1.27-1.72-2.07c-2.66-5.55-5.2-11.15-7.87-16.7c-1.49-3.09-5.15-4.22-8.29-2.76c-2.68,1.24-4.59,4.89-3.03,8.05
-			c1.85,3.72,3.54,7.52,5.27,11.3c0.91,1.98,0.37,3.75-1.34,4.58c-1.73,0.84-3.49,0.15-4.43-1.81c-1.89-3.93-3.75-7.87-5.6-11.82
-			c-5.2-11.1-10.37-22.22-15.59-33.31c-1.64-3.49-5.11-4.77-8.44-3.22c-2.82,1.31-4.6,5.05-2.91,8.62
-			c7.28,15.34,14.45,30.73,21.66,46.1c3.38,7.2,6.76,14.39,10.13,21.58c0.94,2,0.71,3.32-0.69,4.41c-1.15,0.9-2.37,0.77-3.64,0.29
-			c-6.09-2.31-12.18-4.63-18.29-6.88c-3.29-1.21-6.77,0.53-7.92,3.85c-0.96,2.78,0.49,5.73,3.56,7.94
-			c4.79,3.44,9.54,6.94,14.18,10.59c7.62,6.01,15.04,12.27,22.72,18.2c4.8,3.71,9.99,6.86,15.84,8.72c3.16,1,6.29,1.26,9.43-0.23
-			c9.97-4.72,19.96-9.38,29.94-14.08c0.54-0.26,1.12-0.59,1.49-1.04C174.96,155.02,178.7,146.86,178.96,138.8z"
-            />
+            <g xmlns="http://www.w3.org/2000/svg" id="Layer_1">
+                <g>
+                    <path d="M77.36,36.04c2.42,0.38,4.58,1.24,5.79,4.15c1.26,3.04,0.46,6-2.09,7.49c-7.49,4.36-13.84,10.24-18.59,18.01    c-11.07,18.11-13.21,38.68-6.26,61.66c0.22,0.74,0.43,1.48,0.68,2.21c1.23,3.47,0.16,6.51-2.67,7.58    c-2.63,0.99-5.66-0.69-6.92-4.13c-3-8.21-4.83-16.63-5.33-25.14c-1.63-28.22,7.07-50.22,26.03-65.91c2.01-1.67,4.21-3.07,6.32-4.6    C75.34,36.92,76.35,36.48,77.36,36.04z" />
+                    <g>
+                        <path d="M92.68,53.69l-13.51,9.14l3.09-16.03l-6.47-9.56l-16.03-3.09l13.51-9.14l24.05,4.64L92.68,53.69z" />
+                    </g>
+                    <g>
+                        <path d="M38.48,141.9l-5.94-15.19l14.96,6.54l10.75-4.21l6.54-14.95l5.94,15.19l-9.81,22.44L38.48,141.9z" />
+                    </g>
+                </g>
+            </g>
+            <g xmlns="http://www.w3.org/2000/svg">
+                <path d="M110.93,146.76c-0.25-1.57-0.33-2.41-0.52-3.23c-2.88-12.45-5.85-24.89-8.65-37.36c-2.9-12.93-5.67-25.89-8.42-38.86   c-1.61-7.61,4.82-14.88,12.55-14.3c4.3,0.32,7.45,3.08,8.61,7.65c3.58,14.17,7.13,28.34,10.69,42.51c0.22,0.89,0.45,1.78,0.87,3.44   c2.58-4.13,5.47-6.81,9.64-7.73c4.24-0.94,7.82,0.26,10.85,3.52c2.75-2.49,5.66-4.2,9.38-4.37c3.39-0.15,6.12,0.88,8.04,3.64   c1,1.45,1.76,1.5,3.25,0.61c5.77-3.43,11.61-1.54,14.4,4.55c0.72,1.58,1.29,3.25,1.72,4.94c3.45,13.55,6.84,27.11,10.26,40.66   c2.26,8.94,1.26,17.42-3.33,25.5c-2.46,4.34-5.99,7.47-10.55,9.17c-8.8,3.28-17.82,5.75-27.34,5.61c-6.75-0.1-13.13-1.78-19.27-4.6   c-3.89-1.79-8.19-2.77-11.86-4.9c-6.7-3.9-13.13-8.27-19.54-12.65c-4.38-3-8.4-6.56-12.82-9.49c-2.93-1.94-6.29-3.24-9.49-4.76   c-0.85-0.4-1.82-0.55-2.72-0.86c-4.93-1.72-6.52-3.64-6.36-7.63c0.21-5.19,3.29-9.88,7.44-10.76c8.58-1.83,16.7-0.39,24.25,4.07   C104.83,142.79,107.56,144.63,110.93,146.76z" />
+            </g>
         </g>
     </svg>
 );
@@ -608,83 +592,31 @@ export const PRESSURE_SVG = (
         y="0px"
         width="16px"
         height="16px"
-        viewBox="0 35 181 181"
+        viewBox="35 35 160 181"
     >
         <g
-            id="humidity"
+            id="pressure"
             fill="none"
             fill-rule="evenodd"
             className="button-icon"
         >
             <g>
-                <path
-                    d="M176.78,102.9c-2.55-38.41-35.41-70.19-73.01-72c-40.85-1.97-77.96,28.39-81.79,71.31c-3.09,34.66,20.9,78.17,71.32,83.79
-			c0,0,3.15,0.22,4.72,0.22c2.59,0,7.34-0.37,7.34-0.37C152.16,180.7,179.37,141.84,176.78,102.9z M98.69,174.27
-			c-36.41-0.23-66.06-30.97-65.19-67.6c0.84-35.08,30.52-64.44,66.07-64.27c36.37,0.18,65.79,30,65.54,66.43
-			C164.85,145.38,135.28,174.5,98.69,174.27z"
-                />
+                <path d="M187.33,103.15c-2.55-38.41-35.41-70.19-73.01-72c-40.85-1.97-77.96,28.39-81.79,71.31    c-3.09,34.66,20.9,78.17,71.32,83.79c0,0,3.15,0.22,4.72,0.22c2.59,0,7.34-0.37,7.34-0.37    C162.71,180.95,189.92,142.09,187.33,103.15z M109.24,174.51c-36.41-0.23-66.06-30.97-65.19-67.6    c0.84-35.08,30.52-64.44,66.07-64.27c36.37,0.18,65.79,30,65.54,66.43C175.4,145.63,145.83,174.75,109.24,174.51z" />
             </g>
-            <circle cx="98.66" cy="108.96" r="9.81" />
+            <path d="M114.58,61.2c0,1.52,0.04,3.05-0.01,4.57c-0.1,2.77-2.1,4.72-4.78,4.72c-2.64-0.01-4.65-2.04-4.69-4.8   c-0.04-3.05-0.04-6.1,0.01-9.14c0.04-2.81,2-4.78,4.68-4.8c2.69-0.02,4.69,1.92,4.79,4.7c0.06,1.58,0.01,3.17,0.01,4.75   C114.59,61.2,114.59,61.2,114.58,61.2z" />
+            <path d="M141.24,72.73c-0.87,1.25-1.71,2.52-2.63,3.74c-1.67,2.22-4.43,2.66-6.62,1.12c-2.16-1.52-2.64-4.34-1.09-6.62   c1.72-2.52,3.46-5.02,5.25-7.49c1.65-2.28,4.38-2.77,6.58-1.25c2.21,1.52,2.74,4.26,1.23,6.6   C143.11,70.17,142.16,71.44,141.24,72.73C141.25,72.74,141.25,72.73,141.24,72.73z" />
+            <path d="M156.47,97.47c-1.43,0.52-2.85,1.08-4.3,1.55c-2.64,0.86-5.16-0.36-6.07-2.87c-0.89-2.48,0.32-5.07,2.91-6.04   c2.85-1.08,5.71-2.12,8.59-3.12c2.66-0.92,5.18,0.25,6.11,2.75c0.94,2.52-0.2,5.06-2.78,6.11   C159.46,96.44,157.96,96.94,156.47,97.47C156.47,97.48,156.47,97.48,156.47,97.47z" />
+            <path d="M154.74,126.47c-1.47-0.39-2.96-0.75-4.41-1.19c-2.65-0.81-4.02-3.25-3.32-5.83c0.69-2.54,3.17-3.97,5.85-3.28   c2.95,0.75,5.9,1.54,8.83,2.37c2.71,0.77,4.1,3.17,3.43,5.76c-0.68,2.6-3.07,4.03-5.78,3.41   C157.79,127.35,156.27,126.89,154.74,126.47C154.74,126.48,154.74,126.48,154.74,126.47z" />
+            <path d="M86.13,67.04c0.87,1.25,1.79,2.47,2.61,3.75c1.51,2.33,0.99,5.08-1.21,6.6c-2.16,1.51-4.98,1-6.59-1.24   c-1.78-2.48-3.53-4.97-5.24-7.49c-1.58-2.33-1.1-5.06,1.08-6.62c2.19-1.56,4.94-1.12,6.62,1.1C84.35,64.41,85.23,65.74,86.13,67.04   C86.13,67.04,86.13,67.04,86.13,67.04z" />
+            <path d="M66.17,88.15c1.43,0.52,2.88,1,4.29,1.57c2.57,1.04,3.72,3.59,2.8,6.1c-0.91,2.47-3.5,3.68-6.11,2.76   c-2.88-1.01-5.74-2.05-8.59-3.13c-2.63-1-3.81-3.52-2.91-6.04c0.9-2.53,3.41-3.75,6.05-2.89C63.21,87.01,64.68,87.6,66.17,88.15   C66.17,88.14,66.17,88.14,66.17,88.15z" />
+            <path d="M61.93,116.89c1.47-0.39,2.93-0.83,4.42-1.17c2.7-0.62,5.11,0.81,5.79,3.39c0.68,2.55-0.76,5.02-3.42,5.77   c-2.93,0.82-5.88,1.62-8.83,2.36c-2.73,0.69-5.14-0.7-5.85-3.27c-0.71-2.59,0.64-5.03,3.3-5.84   C58.85,117.65,60.39,117.29,61.93,116.89C61.93,116.88,61.93,116.88,61.93,116.89z" />
+            <path d="M74.94,142.86c0.98-1.17,1.93-2.36,2.95-3.5c1.86-2.06,4.65-2.27,6.69-0.54c2.01,1.7,2.26,4.55,0.5,6.69   c-1.93,2.36-3.89,4.69-5.88,7c-1.84,2.13-4.61,2.38-6.67,0.67c-2.07-1.71-2.36-4.48-0.65-6.68   C72.86,145.25,73.91,144.07,74.94,142.86C74.93,142.85,74.93,142.86,74.94,142.86z" />
+            <circle cx="109.19" cy="108.89" r="11.18" />
             <g>
-                <path
-                    d="M87.09,162.9c0.25-2.81,0.49-5.63,0.76-8.44c0.87-9.19,1.76-18.37,2.63-27.55c0.59-6.18,1.11-12.36,1.75-18.53
-			c0.42-4,3.84-6.51,7.66-5.77c3.9,0.76,6.18,4.44,4.93,8.34c-2.78,8.68-5.7,17.33-8.55,25.99c-2.58,7.84-5.16,15.68-7.75,23.52
-			c-0.28,0.86-0.6,1.7-0.91,2.55C87.44,162.97,87.27,162.94,87.09,162.9z M96.12,108.52c-0.23,1.34,0.78,2.76,2.12,2.97
-			c1.36,0.22,2.77-0.77,3-2.1c0.24-1.37-0.73-2.7-2.13-2.94C97.72,106.21,96.36,107.16,96.12,108.52z"
-                />
+                <path d="M96.02,170.32c0.29-3.2,0.56-6.41,0.87-9.61c0.99-10.46,2.01-20.92,3-31.38c0.67-7.04,1.26-14.08,1.99-21.11    c0.47-4.56,4.37-7.42,8.72-6.57c4.44,0.86,7.04,5.06,5.62,9.49c-3.17,9.89-6.49,19.73-9.74,29.6c-2.94,8.93-5.88,17.86-8.82,26.79    c-0.32,0.98-0.69,1.94-1.03,2.91C96.42,170.4,96.22,170.36,96.02,170.32z M106.3,108.38c-0.27,1.53,0.88,3.14,2.42,3.38    c1.55,0.25,3.16-0.88,3.42-2.39c0.27-1.56-0.83-3.08-2.42-3.35C108.12,105.75,106.57,106.83,106.3,108.38z" />
             </g>
-            <circle cx="98.66" cy="108.96" r="6.05" />
-            <circle cx="99.33" cy="108.52" r="9.81" />
-            <path
-                d="M103.09,56.49c0,1.22,0.04,2.44-0.01,3.66c-0.08,2.22-1.68,3.78-3.82,3.77c-2.11-0.01-3.72-1.63-3.75-3.84
-		c-0.03-2.44-0.03-4.88,0-7.31c0.03-2.25,1.6-3.83,3.74-3.84c2.15-0.02,3.75,1.53,3.83,3.76C103.13,53.96,103.09,55.23,103.09,56.49
-		C103.09,56.49,103.09,56.49,103.09,56.49z"
-            />
-            <path
-                d="M76.57,61.59c0.61,1.06,1.25,2.09,1.82,3.17c1.04,1.96,0.43,4.11-1.42,5.18c-1.83,1.05-4.04,0.45-5.17-1.45
-		c-1.24-2.1-2.47-4.21-3.65-6.34c-1.1-1.97-0.53-4.11,1.32-5.2c1.85-1.09,4.02-0.55,5.2,1.34C75.34,59.37,75.94,60.48,76.57,61.59
-		C76.57,61.58,76.57,61.58,76.57,61.59z"
-            />
-            <path
-                d="M56.15,79.25c1.06,0.61,2.13,1.19,3.16,1.84c1.88,1.18,2.43,3.35,1.36,5.2c-1.06,1.82-3.27,2.41-5.2,1.33
-		c-2.13-1.19-4.24-2.41-6.33-3.66c-1.93-1.15-2.51-3.3-1.46-5.16c1.06-1.87,3.21-2.48,5.17-1.44
-		C53.97,77.95,55.05,78.61,56.15,79.25C56.15,79.25,56.15,79.25,56.15,79.25z"
-            />
-            <path
-                d="M47.3,104.76c1.22,0,2.44-0.04,3.66,0.01c2.22,0.08,3.78,1.68,3.77,3.82c-0.01,2.11-1.63,3.72-3.84,3.75
-		c-2.44,0.03-4.88,0.03-7.31,0c-2.25-0.03-3.83-1.6-3.84-3.74c-0.02-2.15,1.53-3.75,3.76-3.83
-		C44.76,104.72,46.03,104.76,47.3,104.76C47.3,104.76,47.3,104.76,47.3,104.76z"
-            />
-            <path
-                d="M52.39,131.28c1.06-0.61,2.09-1.25,3.17-1.82c1.96-1.04,4.11-0.43,5.18,1.42c1.05,1.83,0.45,4.04-1.45,5.17
-		c-2.1,1.24-4.21,2.47-6.34,3.65c-1.97,1.1-4.11,0.53-5.2-1.32c-1.09-1.85-0.55-4.02,1.34-5.2
-		C50.17,132.51,51.29,131.91,52.39,131.28C52.38,131.28,52.39,131.28,52.39,131.28z"
-            />
-            <path
-                d="M70.05,151.7c0.61-1.06,1.19-2.13,1.84-3.16c1.18-1.88,3.35-2.43,5.2-1.36c1.82,1.06,2.41,3.27,1.33,5.2
-		c-1.19,2.13-2.41,4.24-3.66,6.33c-1.15,1.93-3.3,2.51-5.16,1.46c-1.87-1.06-2.48-3.21-1.44-5.17
-		C68.75,153.88,69.41,152.8,70.05,151.7C70.05,151.7,70.05,151.7,70.05,151.7z"
-            />
-            <path
-                d="M142.5,137.79c-1.06-0.61-2.13-1.19-3.16-1.84c-1.88-1.18-2.43-3.35-1.36-5.2c1.06-1.82,3.27-2.41,5.2-1.33
-		c2.13,1.19,4.24,2.41,6.33,3.66c1.93,1.15,2.51,3.3,1.46,5.16c-1.06,1.87-3.21,2.48-5.17,1.44
-		C144.68,139.1,143.6,138.43,142.5,137.79C142.5,137.8,142.5,137.8,142.5,137.79z"
-            />
-            <path
-                d="M151.35,112.28c-1.22,0-2.44,0.04-3.66-0.01c-2.22-0.08-3.78-1.68-3.77-3.82c0.01-2.11,1.63-3.72,3.84-3.75
-		c2.44-0.03,4.88-0.03,7.31,0c2.25,0.03,3.83,1.6,3.84,3.74c0.02,2.15-1.53,3.75-3.76,3.83
-		C153.89,112.33,152.62,112.29,151.35,112.28C151.35,112.29,151.35,112.29,151.35,112.28z"
-            />
-            <path
-                d="M146.26,85.77c-1.06,0.61-2.09,1.25-3.17,1.82c-1.96,1.04-4.11,0.43-5.18-1.42c-1.05-1.83-0.45-4.04,1.45-5.17
-		c2.1-1.24,4.21-2.47,6.34-3.65c1.97-1.1,4.11-0.53,5.2,1.32c1.09,1.85,0.55,4.02-1.34,5.2C148.48,84.54,147.37,85.14,146.26,85.77
-		C146.27,85.77,146.26,85.77,146.26,85.77z"
-            />
-            <path
-                d="M128.6,65.35c-0.61,1.06-1.19,2.13-1.84,3.16c-1.18,1.88-3.35,2.43-5.2,1.36c-1.82-1.06-2.41-3.27-1.33-5.2
-		c1.19-2.13,2.41-4.24,3.66-6.33c1.15-1.93,3.3-2.51,5.16-1.46c1.87,1.06,2.48,3.21,1.44,5.17C129.9,63.17,129.24,64.25,128.6,65.35
-		C128.6,65.35,128.6,65.35,128.6,65.35z"
-            />
+            <circle cx="109.19" cy="108.89" r="6.89" />
+            <circle cx="109.95" cy="108.38" r="11.18" />
         </g>
     </svg>
 );
@@ -697,7 +629,7 @@ export const PROXIMITY_SVG = (
         y="0px"
         width="16px"
         height="16px"
-        viewBox="0 35 200 181"
+        viewBox="0 45 200 170"
     >
         <g
             id="humidity"
@@ -706,27 +638,21 @@ export const PROXIMITY_SVG = (
             className="button-icon"
         >
             <g>
-                <path d="M151.32,127.13v-13.95H90.06V96.47h61.26V82.53l22.31,22.3L151.32,127.13z" />
+                <path d="M106.98,74l18.61-18.61l13.52,13.52L120.5,87.52l18.61,18.61l-13.52,13.52l-18.61-18.61l-18.61,18.61l-13.52-13.52    l18.61-18.61L74.86,68.91L88.37,55.4L106.98,74z" />
             </g>
             <g>
-                <path d="M61.6,82.52v13.95h61.26v16.71H61.6v13.95l-22.31-22.3L61.6,82.52z" />
+                <g>
+                    <g>
+                        <path d="M168.29,159.6L144,158.45l18.01-16.38l0.81-17.2l-16.37-18l24.29,1.15l24.57,27.01L168.29,159.6z" />
+                    </g>
+                </g>
+                <rect x="48.41" y="122.83" width="115.25" height="20.81" />
+                <g>
+                    <g>
+                        <path d="M47.06,105.41l24.29,1.15l-18.01,16.38l-0.81,17.2l16.37,18l-24.29-1.15l-24.57-27.01L47.06,105.41z" />
+                    </g>
+                </g>
             </g>
-            <line
-                x1="22.34"
-                y1="76.17"
-                x2="22.34"
-                y2="132.65"
-                stroke="white"
-                strokeWidth={10}
-            />
-            <line
-                x1="190.6"
-                y1="76.17"
-                x2="190.6"
-                y2="132.65"
-                stroke="white"
-                strokeWidth={10}
-            />
         </g>
     </svg>
 );
@@ -810,3 +736,19 @@ export const GYROSCOPE_SVG = (
         </g>
     </svg>
 );
+export const COMPASS_SVG = (
+    <svg
+        version="1.1"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlnsXlink="http://www.w3.org/1999/xlink"
+        x="0px"
+        y="0px"
+        width="18px"
+        height="18px"
+        viewBox="0 0 200 165"
+    >
+        <g id="compass" fill-rule="evenodd" className="button-icon">
+            <path d="M105.5,192.63c-0.42-1.99-0.84-3.99-1.26-5.98c-2.54-12.22-5.1-24.43-7.61-36.65c-0.16-0.77-0.67-0.82-1.21-0.96    c-9.23-2.35-16.83-7.23-22.74-14.7c-3.62-4.57-6.14-9.69-7.57-15.35c-0.17-0.68-0.42-1.01-1.16-1.16    c-12.38-2.49-24.76-5.02-37.13-7.55c-1.54-0.31-3.07-0.64-4.63-1.16c1.74-0.38,3.48-0.78,5.23-1.15c8.8-1.87,17.6-3.74,26.39-5.61    c3.14-0.67,6.28-1.39,9.44-1.97c1.12-0.2,1.54-0.72,1.83-1.77c4.42-15.89,14.63-26,30.54-30.33c0.66-0.18,1.01-0.42,1.15-1.15    c1.62-8.5,3.28-16.98,4.93-25.47c1.26-6.5,2.52-13,3.99-19.53c0.28,1.39,0.57,2.78,0.83,4.17c2.56,13.57,5.11,27.15,7.65,40.73    c0.14,0.76,0.45,1.14,1.26,1.35c4.2,1.09,8.22,2.68,11.87,5.03c9.44,6.06,15.64,14.5,18.36,25.42c0.24,0.98,0.66,1.35,1.6,1.53    c14.16,2.6,28.31,5.22,42.46,7.84c1.35,0.25,2.7,0.51,4.1,0.94c-1,0.21-1.99,0.43-2.99,0.62c-14.41,2.68-28.81,5.38-43.23,7.97    c-1.39,0.25-1.9,0.74-2.29,2.07c-3.93,13.38-12.46,22.61-25.41,27.76c-1.45,0.58-2.96,1.01-4.48,1.37    c-0.84,0.2-1.1,0.72-1.24,1.41c-1.1,5.59-2.17,11.19-3.28,16.78c-1.66,8.33-3.36,16.66-5.04,24.99c-0.03,0.17-0.09,0.33-0.13,0.5    C105.64,192.63,105.57,192.63,105.5,192.63z M78.37,108.66c0.03,15.02,12,27.02,26.93,27c15.12-0.02,27.04-12.05,27.02-27.29    c-0.02-14.72-12.25-26.72-27.19-26.68C90.36,81.73,78.34,93.84,78.37,108.66z" />
+        </g>
+    </svg>
+);