diff --git a/assets/element-icon-codepoints.json b/assets/element-icon-codepoints.json
index beb9e3f..2f40e4f 100644
--- a/assets/element-icon-codepoints.json
+++ b/assets/element-icon-codepoints.json
@@ -1,6 +1,6 @@
 {
   "#comment": "AUTO-GENERATED. Run `yarn codepoints` to update",
-  "#nextCodepoint": 61001,
+  "#nextCodepoint": 61004,
   "3d-back": 60861,
   "3d-bottom": 60847,
   "3d-fit": 60848,
@@ -435,6 +435,7 @@
   "garden": 60227,
   "gas": 60988,
   "gas-bottles": 60228,
+  "gas-meter": 61001,
   "generate": 60726,
   "generator": 60736,
   "geofence": 60229,
@@ -730,6 +731,8 @@
   "prolongation": 60477,
   "prolongation-filled": 60478,
   "protection": 60479,
+  "puzzle": 61002,
+  "puzzle-filled": 61003,
   "qr-code": 60480,
   "quality": 60772,
   "queue": 60481,
diff --git a/assets/icons/gas-meter.svg b/assets/icons/gas-meter.svg
new file mode 100644
index 0000000..851baba
--- /dev/null
+++ b/assets/icons/gas-meter.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M416,256c0-54.9-27.79-103.42-70.04-132.25v-59.75c0-8.84-7.16-16-16-16h-147.91c-8.84,0-16,7.16-16,16v59.75c-42.25,28.83-70.04,77.35-70.04,132.25s27.79,103.42,70.04,132.25v59.75c0,8.84,7.16,16,16,16h147.91c4.24,0,8.31-1.69,11.31-4.69,3-3,4.69-7.07,4.69-11.31v-59.75c42.25-28.83,70.04-77.35,70.04-132.25ZM198.04,80h115.91v26.87c-17.98-7.01-37.52-10.87-57.96-10.87s-39.98,3.86-57.96,10.87v-26.87ZM313.96,432h-115.91v-26.87c17.98,7.01,37.52,10.87,57.96,10.87s39.98-3.86,57.96-10.87v26.87ZM256,384c-70.58,0-128-57.42-128-128s57.42-128,128-128,128,57.42,128,128-57.42,128-128,128Z"/><path d="M256,288c-8.84,0-16,7.16-16,16v16c0,8.84,7.16,16,16,16s16-7.16,16-16v-16c0-8.84-7.16-16-16-16Z"/><path d="M320,288c-8.84,0-16,7.16-16,16v16c0,8.84,7.16,16,16,16s16-7.16,16-16v-16c0-8.84-7.16-16-16-16Z"/><path d="M192,288c-8.84,0-16,7.16-16,16v16c0,8.84,7.16,16,16,16s16-7.16,16-16v-16c0-8.84-7.16-16-16-16Z"/><path d="M320,176.4h-128c-8.84,0-16,7.16-16,16v64c0,8.84,7.16,16,16,16h128c8.84,0,16-7.16,16-16v-64c0-8.84-7.16-16-16-16ZM304,240.4h-96v-32h96v32Z"/></svg>
\ No newline at end of file
diff --git a/assets/icons/puzzle-filled.svg b/assets/icons/puzzle-filled.svg
new file mode 100644
index 0000000..8cbdff7
--- /dev/null
+++ b/assets/icons/puzzle-filled.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M261.87,64.28h0,0ZM128.03,199.71h0,0ZM244.9,39.31c-2.05,0-4.09.78-5.66,2.34l-55.42,55.42c-17.59,17.59-18.68,33.93-6.32,43.92,2.74,2.22,5.44,3.53,7.61,4.25,3.98,1.41,7.8,3.81,11.02,7.03,11.75,11.75,11.75,30.81-.01,42.58-5.88,5.87-13.58,8.8-21.28,8.8s-15.41-2.94-21.29-8.81c-3.22-3.23-5.62-7.05-7.09-11.24l-.61-1.6c-.75-1.72-1.9-3.74-3.57-5.8-4.37-5.41-9.96-8.24-16.33-8.24-8.19,0-17.69,4.68-27.59,14.57l-56.69,56.7c-3.12,3.12-3.12,8.19,0,11.31l69.39,69.41c7.74,8.02,7.67,10.1,4.9,12.16-7.32,2.6-13.75,6.63-19.15,12.03-19.76,19.78-19.76,51.83,0,71.61l3.29,3.01c9.39,7.89,20.96,11.83,32.54,11.83,12.96,0,25.93-4.95,35.81-14.85,5.39-5.36,9.44-11.82,11.94-18.9l.14-.33.64-1c.45-.56.97-.94,1.72-.94,1.78,0,4.91,2.1,11.69,8.88l66.87,66.87c1.56,1.56,3.61,2.34,5.66,2.34s4.1-.78,5.66-2.34l56.68-56.69c17.58-17.59,18.68-33.93,6.34-43.92-2.74-2.22-5.43-3.54-7.6-4.25-4.02-1.44-7.83-3.82-10.99-7.01-11.78-11.78-11.79-30.84-.04-42.59l-1.55,1.27c6.84-6.69,15.18-9.95,23.27-9.95,7.68,0,15.13,2.94,20.86,8.66,3.22,3.21,5.61,7.04,7.1,11.23l.61,1.59c.74,1.71,1.9,3.74,3.56,5.8,4.37,5.41,9.96,8.24,16.34,8.24,8.19,0,17.69-4.67,27.58-14.56l55.43-55.43c3.12-3.12,3.12-8.19,0-11.31l-66.96-66.95c-9.55-9.59-9.7-11.81-6.73-14.02,7.28-2.56,13.73-6.61,19.13-12.02,19.78-19.78,19.78-51.84,0-71.63l-3.3-3.01c-9.38-7.89-20.95-11.83-32.53-11.83-12.96,0-25.92,4.95-35.83,14.84-5.38,5.39-9.41,11.81-11.94,18.88-.09.26-.37.84-.79,1.36l-.36.39c-.37.33-.79.54-1.35.54-1.38,0-3.57-1.27-7.66-5.01l-3.93-3.78-67.55-67.54c-1.56-1.56-3.61-2.34-5.66-2.34h0ZM317.15,315.88h0,0Z"/></svg>
\ No newline at end of file
diff --git a/assets/icons/puzzle.svg b/assets/icons/puzzle.svg
new file mode 100644
index 0000000..a7bc38d
--- /dev/null
+++ b/assets/icons/puzzle.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M261.87,64.28h0,0ZM244.9,81.25l50.58,50.57c.15.15.3.3.45.44l3.93,3.78c.19.18.38.36.57.54,4.76,4.35,14.65,13.41,29.27,13.41,8.49,0,16.63-3.16,22.93-8.91.66-.6,1.3-1.24,1.91-1.89l.36-.39c.48-.52.95-1.06,1.39-1.61,2.61-3.23,4.7-6.94,6.06-10.74.96-2.66,2.45-5.02,4.42-6.99,3.54-3.53,8.23-5.48,13.21-5.48,4.21,0,8.3,1.42,11.56,4.02l2.03,1.85c3.28,3.47,5.08,7.99,5.08,12.79,0,4.98-1.94,9.66-5.48,13.2-2.01,2.01-4.33,3.47-7.1,4.44-3.05,1.07-5.92,2.6-8.51,4.53-11.59,8.64-14.05,19.86-14.49,25.77-1.29,17.46,10.58,29.37,17.66,36.49.02.02.03.03.05.05l49.99,49.98-38.45,38.45c-.08.08-.16.16-.24.24-2.66-4.55-5.9-8.74-9.7-12.54-11.63-11.63-27.07-18.04-43.49-18.04-16.87,0-33.08,6.78-45.65,19.08-2.01,1.97-3.7,4.13-5.08,6.44-7.66,10.53-11.79,23.18-11.78,36.46.01,16.58,6.48,32.18,18.22,43.91,3.73,3.74,7.95,7,12.5,9.67-.08.08-.17.17-.25.26l-39.71,39.72-49.9-49.9c-7.27-7.26-18.25-18.24-34.31-18.24h0c-10.32,0-20.02,4.67-26.6,12.81-.74.91-1.43,1.87-2.06,2.86l-.64,1c-.93,1.44-1.73,2.96-2.42,4.53l-.14.33c-.29.68-.56,1.37-.81,2.06-.93,2.62-2.39,4.94-4.34,6.88-.03.03-.05.05-.08.08-3.51,3.52-8.19,5.46-13.16,5.46-4.21,0-8.29-1.42-11.56-4.01l-2.01-1.84c-6.89-7.3-6.77-18.84.39-26,2-2,4.35-3.46,7.19-4.47,3.02-1.07,5.86-2.59,8.43-4.51,11.47-8.56,13.99-19.65,14.46-25.51,1.39-17.06-9.99-28.86-15.46-34.53-.13-.14-.26-.27-.4-.4l-52.43-52.44,39.72-39.72c.08-.08.16-.16.24-.24,2.66,4.54,5.9,8.74,9.71,12.55,11.73,11.72,27.32,18.18,43.91,18.18s32.16-6.45,43.91-18.18c11.73-11.73,18.19-27.33,18.2-43.92,0-16.59-6.46-32.19-18.19-43.92-3.76-3.76-8-7.03-12.54-9.7.08-.08.16-.16.24-.24l38.46-38.46h0ZM128.03,199.71h0,0ZM244.9,39.31c-2.05,0-4.09.78-5.66,2.34l-55.42,55.42c-17.59,17.59-18.68,33.93-6.32,43.92,2.74,2.22,5.44,3.53,7.61,4.25,3.98,1.41,7.8,3.81,11.02,7.03,11.75,11.75,11.75,30.81-.01,42.58-5.88,5.87-13.58,8.8-21.28,8.8s-15.41-2.94-21.29-8.81c-3.22-3.23-5.62-7.05-7.09-11.24l-.61-1.6c-.75-1.72-1.9-3.74-3.57-5.8-4.37-5.41-9.96-8.24-16.33-8.24-8.19,0-17.69,4.68-27.59,14.57l-56.69,56.7c-3.12,3.12-3.12,8.19,0,11.31l69.39,69.41c7.74,8.02,7.67,10.1,4.9,12.16-7.32,2.6-13.75,6.63-19.15,12.03-19.76,19.78-19.76,51.83,0,71.61l3.29,3.01c9.39,7.89,20.96,11.83,32.54,11.83,12.96,0,25.93-4.95,35.81-14.85,5.39-5.36,9.44-11.82,11.94-18.9l.14-.33.64-1c.45-.56.97-.94,1.72-.94,1.78,0,4.91,2.1,11.69,8.88l66.87,66.87c1.56,1.56,3.61,2.34,5.66,2.34s4.1-.78,5.66-2.34l56.68-56.69c17.58-17.59,18.68-33.93,6.34-43.92-2.74-2.22-5.43-3.54-7.6-4.25-4.02-1.44-7.83-3.82-10.99-7.01-11.78-11.78-11.79-30.84-.04-42.59l-1.55,1.27c6.84-6.69,15.18-9.95,23.27-9.95,7.68,0,15.13,2.94,20.86,8.66,3.22,3.21,5.61,7.04,7.1,11.23l.61,1.59c.74,1.71,1.9,3.74,3.56,5.8,4.37,5.41,9.96,8.24,16.34,8.24,8.19,0,17.69-4.67,27.58-14.56l55.43-55.43c3.12-3.12,3.12-8.19,0-11.31l-66.96-66.95c-9.55-9.59-9.7-11.81-6.73-14.02,7.28-2.56,13.73-6.61,19.13-12.02,19.78-19.78,19.78-51.84,0-71.63l-3.3-3.01c-9.38-7.89-20.95-11.83-32.53-11.83-12.96,0-25.92,4.95-35.83,14.84-5.38,5.39-9.41,11.81-11.94,18.88-.09.26-.37.84-.79,1.36l-.36.39c-.37.33-.79.54-1.35.54-1.38,0-3.57-1.27-7.66-5.01l-3.93-3.78-67.55-67.54c-1.56-1.56-3.61-2.34-5.66-2.34h0ZM317.15,315.88h0,0Z"/></svg>
\ No newline at end of file
diff --git a/src/element-icon-metadata.json b/src/element-icon-metadata.json
index cbc8a9b..0497ba8 100644
--- a/src/element-icon-metadata.json
+++ b/src/element-icon-metadata.json
@@ -526,6 +526,7 @@
   { "name": "hexagon-vertical-bars-database", "category": "General" },
   { "name": "cloud-project-linked", "category": "General" },
   { "name": "cloud-project-unlinked", "category": "General" },
+  { "name": "puzzle", "category": "General" },
   { "name": "home-filled", "terms": ["house"], "category": "General" },
   {
     "name": "parameter-filled",
@@ -592,6 +593,7 @@
   },
   { "name": "hexagon-vertical-bars-filled", "category": "General" },
   { "name": "hexagon-vertical-bars-database-filled", "category": "General" },
+  { "name": "puzzle-filled", "category": "General" },
   { "name": "clock", "terms": ["time"], "tags": ["auto"], "category": "Operating mode" },
   { "name": "sun", "terms": ["light", "day"], "tags": ["comfort"], "category": "Operating mode" },
   { "name": "precomfort", "category": "Operating mode" },
@@ -1593,6 +1595,11 @@
     "category": "Building Technologies"
   },
   { "name": "gas", "terms": ["natural gas", "propane"], "category": "Building Technologies" },
+  {
+    "name": "gas-meter",
+    "terms": ["natural gas", "propane", "meter"],
+    "category": "Building Technologies"
+  },
   {
     "name": "bank",
     "terms": ["financial institution", "credit union", "savings bank"],