diff --git a/README.md b/README.md
index f941cf8c99..e5271cf53a 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ give a broad perspective on the subject.
 
 ## Contact
 
-If you want to contact the dashboard team, feel free to open an issue for 
+If you want to contact the dashboard team, feel free to open an issue for
 technical questions, bug reports or security findings. If you have a generic question or remark about the
 corona policy of the Dutch government, please consult the [frequently asked questions](https://coronadashboard.rijksoverheid.nl/veelgestelde-vragen) or [contact page](https://coronadashboard.rijksoverheid.nl/contact) on the dashboard.
 
@@ -31,7 +31,7 @@ multiple packages.
 - `common`: Commonly shared code that multiple packages are using, like types
   and utils.
 - `e2e`: End-to-end tests using Cypress
-- `icons`: A React icon component library, used by the CMS and by app
+- `icons`: A React icon component library, used by the CMS and by app. [README](/packages/icons/README.md)
 
 ## Getting started (quickly)
 
diff --git a/packages/app/schema/topical/__index.json b/packages/app/schema/topical/__index.json
new file mode 100644
index 0000000000..f82c3183b1
--- /dev/null
+++ b/packages/app/schema/topical/__index.json
@@ -0,0 +1,33 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "title": "topical",
+  "additionalProperties": false,
+  "required": ["version", "title", "dynamicDescription", "themes", "measures"],
+  "properties": {
+    "version": {
+      "type": "string"
+    },
+    "title": {
+      "$ref": "multilanguage_string.json"
+    },
+    "dynamicDescription": {
+      "type": "array",
+      "minItems": 1,
+      "items": {
+        "$ref": "dynamic_description.json"
+      }
+    },
+    "themes": {
+      "type": "array",
+      "minItems": 1,
+      "maxItems": 2,
+      "items": {
+        "$ref": "theme.json"
+      }
+    },
+    "measures": {
+      "$ref": "measures.json"
+    }
+  }
+}
diff --git a/packages/app/schema/topical/dynamic_description.json b/packages/app/schema/topical/dynamic_description.json
new file mode 100644
index 0000000000..3725e287d3
--- /dev/null
+++ b/packages/app/schema/topical/dynamic_description.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "topical_dynamic_description",
+  "type": "object",
+  "additionalProperties": false,
+  "required": ["index", "content"],
+  "properties": {
+    "index": {
+      "type": "number"
+    },
+    "content": {
+      "$ref": "multilanguage_string.json"
+    }
+  }
+}
diff --git a/packages/app/schema/topical/icon.json b/packages/app/schema/topical/icon.json
new file mode 100644
index 0000000000..52fe670437
--- /dev/null
+++ b/packages/app/schema/topical/icon.json
@@ -0,0 +1,135 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "topical_icon",
+  "type": "string",
+  "enum": [
+    "AfstandSporten",
+    "AlcoholVerkoop",
+    "Arrow",
+    "Arts",
+    "Avondklok",
+    "BarChart",
+    "BasisregelsAfstand",
+    "BasisregelsDrukte",
+    "BasisregelsElleboog",
+    "BasisregelsGeenBezoek",
+    "BasisregelsHandenwassen",
+    "BasisregelsMondkapje",
+    "BasisregelsTesten",
+    "Bevolking",
+    "Bezoek",
+    "Bibliotheek",
+    "BinnenMetZitplaats",
+    "BinnenZonderZitplaats",
+    "Binnensporten",
+    "Binnensportlocaties",
+    "Boosterprik",
+    "Calendar",
+    "Check",
+    "Checked",
+    "ChevronDown",
+    "ChevronRight",
+    "Clock",
+    "Close",
+    "CloseThick",
+    "ContactBeroepen",
+    "Coronavirus",
+    "Cross",
+    "Database",
+    "DoorstroomEvenementen",
+    "Dot",
+    "Down",
+    "Download",
+    "EenPersoonDoorgestreept",
+    "Elderly",
+    "Expand",
+    "Experimenteel",
+    "External",
+    "Eye",
+    "FrisseLucht",
+    "GedeeltelijkOpenRugzak",
+    "GeenEntertainment",
+    "GeenMaxAantalBezoekers",
+    "GeenWedstrijden",
+    "Gehandicaptenzorg",
+    "GeorganiseerdeKunstEnCultuurbeoefening",
+    "GgdTesten",
+    "Groepen",
+    "HealthCare",
+    "HomeAndVisits",
+    "HorecaEnEvenementenBestellen",
+    "HorecaEnEvenementenEtendrinken",
+    "HorecaEnEvenementenEvenementen",
+    "HorecaEvenementen",
+    "Hospitality",
+    "Information",
+    "IntensiveCareOpnames",
+    "Klachten",
+    "Klok210001",
+    "KunstCultuur",
+    "KunstcultuurMusea",
+    "Line",
+    "Locaties",
+    "Location",
+    "Lopend",
+    "Maatregelen",
+    "MaxAantalBezoekers",
+    "MaxVisitors",
+    "MedischeScreening",
+    "MeerInformatie",
+    "MeerdaagseEvenementen",
+    "Menu",
+    "Mondkapje",
+    "Nederland",
+    "Notification",
+    "OnderwijsEnKinderopvangNoodopvang",
+    "OnderwijsEnKinderopvangOpAfstand",
+    "OntmoetingenBezoek",
+    "OpenbaarVervoer",
+    "Openingstijden",
+    "Other",
+    "Overige",
+    "Phone",
+    "Recreatie",
+    "Reizen",
+    "ReproductieGraf",
+    "Reproductiegetal",
+    "Rioolvirus",
+    "SearchIcon",
+    "SearchIconBold",
+    "SportBuiten",
+    "SportMetZweetband",
+    "SportWedstrijden",
+    "Stap1HorecaMax",
+    "Stap1HorecaPertafel",
+    "Stap1HorecaVerplaatsen",
+    "Stap1OnderwijsBibliotheek",
+    "Stap1OnderwijsOpen",
+    "Stap1Theorie",
+    "Stap1Thuisbezoek",
+    "Stap1Uitvaarten",
+    "Stap1WinkelsAlleen",
+    "Stap1WinkelsMarkten",
+    "Stap1WinkelsOpen",
+    "Stopwatch",
+    "Taxi",
+    "Testbewijs",
+    "Toegangsbewijzen",
+    "Travel",
+    "Unchecked",
+    "Up",
+    "Vaccinaties",
+    "Varianten",
+    "Verpleeghuis",
+    "VervoerEnReizenBuitenland",
+    "VervoerEnReizenOv",
+    "Vliegen",
+    "Warn",
+    "Warning",
+    "WinkelenEnBoodschappenAlcohol",
+    "WinkelenEnBoodschappenOpen",
+    "Work",
+    "Ziekenhuis",
+    "Ziektegolf"
+  ]
+}
diff --git a/packages/app/schema/topical/link.json b/packages/app/schema/topical/link.json
new file mode 100644
index 0000000000..a91796a1d7
--- /dev/null
+++ b/packages/app/schema/topical/link.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "topical_theme_link",
+  "type": "object",
+  "additionalProperties": false,
+  "required": ["index", "label", "href"],
+  "properties": {
+    "index": {
+      "type": "number"
+    },
+    "label": {
+      "$ref": "multilanguage_string.json"
+    },
+    "href": {
+      "$ref": "multilanguage_string.json"
+    }
+  }
+}
diff --git a/packages/app/schema/topical/measure_tile.json b/packages/app/schema/topical/measure_tile.json
new file mode 100644
index 0000000000..c0ceaa1b5d
--- /dev/null
+++ b/packages/app/schema/topical/measure_tile.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "topical_measures_tile",
+  "type": "object",
+  "additionalProperties": false,
+  "required": ["index", "title", "icon"],
+  "properties": {
+    "index": {
+      "type": "number"
+    },
+    "title": {
+      "$ref": "multilanguage_string.json"
+    },
+    "icon": {
+      "$ref": "icon.json"
+    }
+  }
+}
diff --git a/packages/app/schema/topical/measures.json b/packages/app/schema/topical/measures.json
new file mode 100644
index 0000000000..7480fdc015
--- /dev/null
+++ b/packages/app/schema/topical/measures.json
@@ -0,0 +1,25 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "title": "topical_measures",
+  "additionalProperties": false,
+  "required": ["title", "dynamicSubtitle", "icon", "measureTiles"],
+  "properties": {
+    "title": {
+      "$ref": "multilanguage_string.json"
+    },
+    "dynamicSubtitle": {
+      "$ref": "multilanguage_string.json"
+    },
+    "icon": {
+      "$ref": "icon.json"
+    },
+    "measureTiles": {
+      "type": "array",
+      "minItems": 1,
+      "items": {
+        "$ref": "measure_tile.json"
+      }
+    }
+  }
+}
diff --git a/packages/app/schema/topical/multilanguage_string.json b/packages/app/schema/topical/multilanguage_string.json
new file mode 100644
index 0000000000..bf6db3b7c2
--- /dev/null
+++ b/packages/app/schema/topical/multilanguage_string.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "title": "multilanguage_string",
+  "additionalProperties": false,
+  "required": ["NL", "EN"],
+  "properties": {
+    "NL": {
+      "type": "string"
+    },
+    "EN": {
+      "type": "string"
+    }
+  }
+}
diff --git a/packages/app/schema/topical/theme.json b/packages/app/schema/topical/theme.json
new file mode 100644
index 0000000000..aa1a823c0e
--- /dev/null
+++ b/packages/app/schema/topical/theme.json
@@ -0,0 +1,63 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "topical_theme",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "index",
+    "title",
+    "dynamicSubtitle",
+    "icon",
+    "themeTiles",
+    "moreLinks"
+  ],
+  "properties": {
+    "index": {
+      "type": "number"
+    },
+    "title": {
+      "$ref": "multilanguage_string.json"
+    },
+    "dynamicSubtitle": {
+      "$ref": "multilanguage_string.json"
+    },
+    "icon": {
+      "$ref": "icon.json"
+    },
+    "themeTiles": {
+      "type": "array",
+      "minItems": 1,
+      "maxItems": 3,
+      "items": {
+        "$ref": "theme_tile.json"
+      }
+    },
+    "moreLinks": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["label", "links"],
+      "properties": {
+        "label": {
+          "type": "object",
+          "additionalProperties": false,
+          "required": ["DESKTOP", "MOBILE"],
+          "properties": {
+            "DESKTOP": {
+              "$ref": "multilanguage_string.json"
+            },
+            "MOBILE": {
+              "$ref": "multilanguage_string.json"
+            }
+          }
+        },
+        "links": {
+          "type": "array",
+          "minItems": 1,
+          "items": {
+            "$ref": "link.json"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/packages/app/schema/topical/theme_tile.json b/packages/app/schema/topical/theme_tile.json
new file mode 100644
index 0000000000..23f39c3b4d
--- /dev/null
+++ b/packages/app/schema/topical/theme_tile.json
@@ -0,0 +1,56 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "topical_theme_tile",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "index",
+    "title",
+    "dynamicDescription",
+    "trendIcon",
+    "tileIcon",
+    "cta"
+  ],
+  "properties": {
+    "index": {
+      "type": "number"
+    },
+    "title": {
+      "$ref": "multilanguage_string.json"
+    },
+    "dynamicDescription": {
+      "$ref": "multilanguage_string.json"
+    },
+    "trendIcon": {
+      "type": ["object", "null"],
+      "required": ["direction", "color"],
+      "additionalProperties": false,
+      "properties": {
+        "direction": {
+          "type": "string",
+          "enum": ["UP", "DOWN"]
+        },
+        "color": {
+          "type": "string",
+          "enum": ["GREEN", "RED"]
+        }
+      }
+    },
+    "tileIcon": {
+      "$ref": "icon.json"
+    },
+    "cta": {
+      "type": ["object", "null"],
+      "required": ["label", "href"],
+      "additionalProperties": false,
+      "properties": {
+        "label": {
+          "$ref": "multilanguage_string.json"
+        },
+        "href": {
+          "$ref": "multilanguage_string.json"
+        }
+      }
+    }
+  }
+}
diff --git a/packages/app/src/components/get-icon-by-name.tsx b/packages/app/src/components/get-icon-by-name.tsx
new file mode 100644
index 0000000000..cd5801502d
--- /dev/null
+++ b/packages/app/src/components/get-icon-by-name.tsx
@@ -0,0 +1,38 @@
+import * as allIcons from '@corona-dashboard/icons';
+import { iconName2filename, IconProps } from '@corona-dashboard/icons';
+import React from 'react';
+import { isDefined } from 'ts-is-present';
+import { assert } from '~/utils/assert';
+
+type IconName = keyof typeof iconName2filename;
+type IconCollection = Record<IconName, React.ComponentType>;
+
+interface DynamicIconProps extends IconProps {
+  name: IconName;
+}
+
+/**
+ * Returns an icon component by the name of the icon
+ * Throws when requested component was not found
+ */
+function getIconByName(name: IconName) {
+  const icons: IconCollection = allIcons;
+  const DynamicIcon = icons[name];
+
+  assert(
+    isDefined(DynamicIcon),
+    `[${getIconByName.name}] Icon with name "${name}" does not exist`
+  );
+
+  return DynamicIcon;
+}
+
+/**
+ * Renders an icon component by the name of the icon
+ */
+function DynamicIcon({ name, ...otherProps }: DynamicIconProps) {
+  const Icon = getIconByName(name);
+  return <Icon {...otherProps} />;
+}
+
+export default DynamicIcon;
diff --git a/packages/app/src/components/layout/app-footer.tsx b/packages/app/src/components/layout/app-footer.tsx
index caac0bc9ba..3d2ad56112 100644
--- a/packages/app/src/components/layout/app-footer.tsx
+++ b/packages/app/src/components/layout/app-footer.tsx
@@ -40,7 +40,7 @@ export function AppFooter() {
             </Heading>
             <nav aria-label={text.aria_labels.pagina_keuze} role="navigation">
               <Box as="ul" spacing={2}>
-                <Item href="/">{text.nav.links.actueel}</Item>
+                <Item href="/">{text.nav.links.samenvatting}</Item>
                 <Item href={reverseRouter.nl.index()}>
                   {text.nav.links.index}
                 </Item>
diff --git a/packages/app/src/components/layout/components/top-navigation.tsx b/packages/app/src/components/layout/components/top-navigation.tsx
index 82a08a7537..63336b7fbb 100644
--- a/packages/app/src/components/layout/components/top-navigation.tsx
+++ b/packages/app/src/components/layout/components/top-navigation.tsx
@@ -32,9 +32,11 @@ export function TopNavigation() {
       >
         {collapsible.button(
           <NavToggle>
-            {collapsible.isOpen
-              ? <CloseThick heigth="36px" width="36px"/>
-              : <Menu  heigth="36px" width="36px"/>}
+            {collapsible.isOpen ? (
+              <CloseThick heigth="24px" width="24px" />
+            ) : (
+              <Menu heigth="24px" width="24px" />
+            )}
             <VisuallyHidden>
               {collapsible.isOpen
                 ? commonTexts.nav.menu.close_menu
@@ -63,7 +65,7 @@ export function TopNavigation() {
                   router.pathname.startsWith('/actueel')
                 }
               >
-                {commonTexts.nav.links.actueel}
+                {commonTexts.nav.links.samenvatting}
               </NavItem>
               <NavItem
                 href={reverseRouter.nl.index()}
@@ -119,7 +121,7 @@ const NavToggle = styled.button(
     ml: 'auto',
     color: 'white',
     bg: 'transparent',
-    p: 0,
+    p: '6px',
     m: 0,
     border: 'none',
     '&:focus': {
diff --git a/packages/app/src/components/link-with-icon.tsx b/packages/app/src/components/link-with-icon.tsx
index bfab305042..72d2acf5b4 100644
--- a/packages/app/src/components/link-with-icon.tsx
+++ b/packages/app/src/components/link-with-icon.tsx
@@ -1,3 +1,5 @@
+import { colors } from '@corona-dashboard/common';
+import { space } from '~/style/theme';
 import css from '@styled-system/css';
 import { ReactNode } from 'react';
 import styled from 'styled-components';
@@ -5,6 +7,7 @@ import { UrlObject } from 'url';
 import { Link } from '~/utils/link';
 import { Box } from './base';
 import { Anchor } from './typography';
+import { asResponsiveArray } from '~/style/utils';
 
 interface LinkWithIconProps {
   href: UrlObject | string;
@@ -13,6 +16,7 @@ interface LinkWithIconProps {
   iconPlacement?: 'left' | 'right';
   underline?: boolean;
   fontWeight?: 'normal' | 'bold';
+  showAsButton?: boolean;
 }
 
 interface IconProps {
@@ -23,18 +27,23 @@ interface IconProps {
   mr?: number | string;
 }
 
+interface buttonBoxProps {
+  showAsButton: boolean;
+}
+
 export function LinkWithIcon({
   href,
   icon,
   children,
   iconPlacement = 'left',
   fontWeight,
+  showAsButton = false,
 }: LinkWithIconProps) {
   const words = children.split(' ');
   const firstWords = `${words.slice(0, -1).join(' ')} `;
 
   return (
-    <Box as="span" display="inline-block" position="relative">
+    <ButtonBox showAsButton={showAsButton}>
       <Link href={href} passHref locale={false}>
         <Anchor
           underline="hover"
@@ -59,7 +68,7 @@ export function LinkWithIcon({
           )}
         </Anchor>
       </Link>
-    </Box>
+    </ButtonBox>
   );
 }
 
@@ -136,3 +145,33 @@ const IconWrapper = styled.span(
     textDecoration: 'inherit',
   })
 );
+
+const ButtonBox = styled.span((x: buttonBoxProps) =>
+  css({
+    display: 'inline-block',
+    position: 'relative',
+    a: x.showAsButton
+      ? asResponsiveArray({
+          _: {
+            color: colors.blue,
+          },
+          sm: {
+            backgroundColor: colors.lightBlue,
+            color: colors.blue,
+            px: 12,
+            py: space[3],
+            '&:hover': {
+              backgroundColor: colors.blue,
+              color: colors.offWhite,
+            },
+            '&:focus': {
+              outline: '#000000 dotted 2px',
+            },
+            '&:hover, &:focus': {
+              textDecoration: 'underline',
+            },
+          },
+        })
+      : {},
+  })
+);
diff --git a/packages/app/src/components/notification-banner.tsx b/packages/app/src/components/notification-banner.tsx
index abe74c3758..c356179120 100644
--- a/packages/app/src/components/notification-banner.tsx
+++ b/packages/app/src/components/notification-banner.tsx
@@ -5,6 +5,7 @@ import { Markdown } from '~/components/markdown';
 import { MaxWidth } from '~/components/max-width';
 import { useCollapsible } from '~/utils/use-collapsible';
 import { InlineText, BoldText } from './typography';
+import { colors } from '@corona-dashboard/common';
 
 interface NotificationBannerProps {
   title: string;
@@ -22,14 +23,14 @@ export function NotificationBanner({
   const hasDescription = description.length !== 0;
 
   return (
-    <Box width="100%" backgroundColor="warningYellow">
+    <Box width="100%" backgroundColor={colors.lightGray}>
       <MaxWidth
         px={{ _: 3, sm: 4 }}
         py={3}
         display="flex"
         spacingHorizontal={3}
       >
-        <Box display="flex" minWidth="1.6rem">
+        <Box display="flex" width="1.6rem">
           <Warning />
         </Box>
 
diff --git a/packages/app/src/domain/topical/components/article-list.tsx b/packages/app/src/domain/topical/components/article-list.tsx
new file mode 100644
index 0000000000..7845a260b4
--- /dev/null
+++ b/packages/app/src/domain/topical/components/article-list.tsx
@@ -0,0 +1,37 @@
+import css from '@styled-system/css';
+import { ArticleSummary } from '~/components/article-teaser';
+import { Box } from '~/components/base';
+import { ContentTeaser } from '~/components/content-teaser';
+import { SiteText } from '~/locale';
+import { asResponsiveArray } from '~/style/utils';
+interface ArticleListProps {
+  articles: ArticleSummary[];
+  text: SiteText['pages']['topical_page']['shared'];
+}
+
+export function ArticleList({ articles, text }: ArticleListProps) {
+  return (
+    <Box
+      display="grid"
+      gridTemplateColumns={{ sm: 'repeat(1, 1fr)', md: 'repeat(3, 1fr)' }}
+      css={css({
+        // Same value to be aligned with the footer grid
+        columnGap: asResponsiveArray({ md: '48px' }),
+      })}
+      spacing={{ _: 3, md: 0 }}
+    >
+      {articles.map((item) => (
+        <ContentTeaser
+          key={item.slug.current}
+          title={item.title}
+          slug={item.slug.current}
+          cover={item.cover}
+          category={item.category}
+          variant="small"
+          isArticle
+          text={text}
+        />
+      ))}
+    </Box>
+  );
+}
diff --git a/packages/app/src/domain/topical/components/measurement-tile.tsx b/packages/app/src/domain/topical/components/measurement-tile.tsx
new file mode 100644
index 0000000000..bb5a218ee2
--- /dev/null
+++ b/packages/app/src/domain/topical/components/measurement-tile.tsx
@@ -0,0 +1,58 @@
+import { Box } from '~/components/base';
+import css from '@styled-system/css';
+import styled from 'styled-components';
+import { colors } from '@corona-dashboard/common';
+import DynamicIcon from '~/components/get-icon-by-name';
+import { Markdown } from '~/components/markdown';
+import { TopicalIcon } from '@corona-dashboard/common/src/types';
+
+interface MeasurementTileProps {
+  icon: TopicalIcon;
+  title: string;
+}
+
+export function MeasurementTile({ icon, title }: MeasurementTileProps) {
+  return (
+    <Box
+      spacing={3}
+      borderColor={colors.gray}
+      borderWidth="1px"
+      borderStyle="solid"
+      position="relative"
+      display="flex"
+      flexDirection={{ _: 'column', xs: 'row' }}
+      justifyContent={'space-between'}
+    >
+      <Box
+        display="flex"
+        justifyContent={'flex-start'}
+        alignItems="center"
+        textAlign={'left'}
+        p={'1.5rem'}
+      >
+        <KpiIcon>
+          <DynamicIcon name={icon} />
+        </KpiIcon>
+
+        <Box
+          display="flex"
+          justifyContent={'flex-start'}
+          textAlign={'left'}
+          pr={{ _: 0, xs: 4 }}
+        >
+          <Markdown content={title} />
+        </Box>
+      </Box>
+    </Box>
+  );
+}
+
+const KpiIcon = styled.div(
+  css({
+    color: colors.blue,
+    display: 'flex',
+    width: 40,
+    height: 40,
+    marginRight: 3,
+  })
+);
diff --git a/packages/app/src/domain/topical/components/search/search.tsx b/packages/app/src/domain/topical/components/search/search.tsx
index bc8b12d2c0..1ecae62f5d 100644
--- a/packages/app/src/domain/topical/components/search/search.tsx
+++ b/packages/app/src/domain/topical/components/search/search.tsx
@@ -1,4 +1,3 @@
-import { colors } from '@corona-dashboard/common';
 import css from '@styled-system/css';
 import { forwardRef, ReactNode, useRef } from 'react';
 import styled from 'styled-components';
@@ -54,7 +53,6 @@ export function Search({
                 sm: '42rem',
               }}
               px={{ sm: 4 }}
-              bg={colors.white}
               position="relative"
               zIndex={1}
             >
diff --git a/packages/app/src/domain/topical/components/search/use-search-results.ts b/packages/app/src/domain/topical/components/search/use-search-results.ts
index 2f3749a929..8c3df30f17 100644
--- a/packages/app/src/domain/topical/components/search/use-search-results.ts
+++ b/packages/app/src/domain/topical/components/search/use-search-results.ts
@@ -39,8 +39,8 @@ export function useSearchResults(term: string, activeResult?: string) {
     const hits: Hit<Option>[] = search(termTrimmed).map((x) => {
       const link =
         x.data.type === 'gm'
-          ? reverseRouter.actueel.gm(x.data.code)
-          : reverseRouter.actueel.vr(x.data.code);
+          ? reverseRouter.gm.index(x.data.code)
+          : reverseRouter.vr.index(x.data.code);
 
       return {
         ...x,
diff --git a/packages/app/src/domain/topical/components/subjects-list.tsx b/packages/app/src/domain/topical/components/subjects-list.tsx
new file mode 100644
index 0000000000..70088ed940
--- /dev/null
+++ b/packages/app/src/domain/topical/components/subjects-list.tsx
@@ -0,0 +1,86 @@
+import { css } from '@styled-system/css';
+import { Box } from '~/components/base';
+import { space } from '~/style/theme';
+import { ChevronRight } from '@corona-dashboard/icons';
+import { useBreakpointsAsync } from '~/utils/use-breakpoints';
+import { LinkWithIcon } from '~/components/link-with-icon';
+import { Text } from '~/components/typography';
+import { asResponsiveArray } from '~/style/utils';
+import { v4 as uuidv4 } from 'uuid';
+
+type TopicalThemeLink = {
+  index: number;
+  label: string;
+  href: string;
+};
+
+type MoreLinks = {
+  label: {
+    DESKTOP: string;
+    MOBILE: string;
+  };
+  links: TopicalThemeLink[];
+};
+
+interface SubjectsListProps {
+  moreLinks: MoreLinks;
+}
+
+export const SubjectsList = ({ moreLinks }: SubjectsListProps) => {
+  const breakpoints = useBreakpointsAsync();
+
+  // Prevents flickering; don't show anything until breakpoints are loaded
+  if (!breakpoints) {
+    return null;
+  }
+
+  const labelledById = uuidv4();
+
+  return (
+    <Box
+      display="flex"
+      flexDirection={{ _: 'column', sm: 'row' }}
+      alignItems="flex-start"
+      spacing={{ _: 3, sm: 0 }}
+      width="100%"
+    >
+      <Text
+        id={labelledById}
+        css={css({
+          flex: '0 0 auto',
+          marginRight: asResponsiveArray({ _: 0, sm: 4 }),
+        })}
+      >
+        {breakpoints.sm ? moreLinks.label.DESKTOP : moreLinks.label.MOBILE}
+      </Text>
+      <ul
+        aria-labelledby={labelledById}
+        tabIndex={0}
+        css={css({
+          display: 'flex',
+          flexDirection: asResponsiveArray({ _: 'column', sm: 'row' }),
+          flexWrap: 'wrap',
+          listStyle: 'none',
+          gap: space[3],
+          margin: 0,
+          padding: 0,
+        })}
+      >
+        {moreLinks.links
+          .sort((a, b) => a.index - b.index)
+          .map((link) => (
+            <li key={link.label}>
+              <LinkWithIcon
+                href={link.href}
+                icon={<ChevronRight />}
+                iconPlacement="right"
+                showAsButton={true}
+              >
+                {link.label}
+              </LinkWithIcon>
+            </li>
+          ))}
+      </ul>
+    </Box>
+  );
+};
diff --git a/packages/app/src/domain/topical/components/theme-header.tsx b/packages/app/src/domain/topical/components/theme-header.tsx
new file mode 100644
index 0000000000..894bab7451
--- /dev/null
+++ b/packages/app/src/domain/topical/components/theme-header.tsx
@@ -0,0 +1,44 @@
+import { Box } from '~/components/base';
+import css from '@styled-system/css';
+import styled from 'styled-components';
+import { Heading } from '~/components/typography';
+import { Markdown } from '~/components/markdown';
+import { TopicalIcon } from '@corona-dashboard/common/src/types';
+import DynamicIcon from '~/components/get-icon-by-name';
+import { asResponsiveArray } from '~/style/utils';
+
+interface TopicalHeaderProps {
+  title: string;
+  dynamicSubtitle: string;
+  icon: TopicalIcon;
+}
+
+export function ThemeHeader({
+  title,
+  dynamicSubtitle,
+  icon,
+}: TopicalHeaderProps) {
+  return (
+    <Box spacing={3}>
+      <Box display="flex" justifyContent="start" alignItems="center">
+        {icon !== null && (
+          <ThemaIcon>
+            <DynamicIcon name={icon} />
+          </ThemaIcon>
+        )}
+        <Heading level={2}>{title}</Heading>
+      </Box>
+      <Markdown content={dynamicSubtitle} />
+    </Box>
+  );
+}
+
+const ThemaIcon = styled.span(
+  css({
+    display: 'block',
+    width: asResponsiveArray({ _: '25px', sm: '30px' }),
+    minWidth: asResponsiveArray({ _: '25px', sm: '30px' }),
+    height: asResponsiveArray({ _: '25px', sm: '30px' }),
+    marginRight: asResponsiveArray({ _: '10px', sm: '15px' }),
+  })
+);
diff --git a/packages/app/src/domain/topical/components/topical-header.tsx b/packages/app/src/domain/topical/components/topical-header.tsx
new file mode 100644
index 0000000000..9bb3361787
--- /dev/null
+++ b/packages/app/src/domain/topical/components/topical-header.tsx
@@ -0,0 +1,29 @@
+import { Box } from '~/components/base';
+import { Heading } from '~/components/typography';
+import { Markdown } from '~/components/markdown';
+
+type TopicalDynamicDescription = {
+  index: number;
+  content: string;
+};
+
+interface TopicalHeaderProps {
+  title: string;
+  dynamicDescription: TopicalDynamicDescription[];
+}
+
+export function TopicalHeader({
+  title,
+  dynamicDescription,
+}: TopicalHeaderProps) {
+  return (
+    <Box spacing={4}>
+      <Heading level={1}>{title}</Heading>
+      <Box spacing={3} fontSize={{ _: 2, sm: 5 }}>
+        {dynamicDescription.map((description) => (
+          <Markdown key={description.index} content={description.content} />
+        ))}
+      </Box>
+    </Box>
+  );
+}
diff --git a/packages/app/src/domain/topical/components/topical-section-header.tsx b/packages/app/src/domain/topical/components/topical-section-header.tsx
new file mode 100644
index 0000000000..52f8ced5fd
--- /dev/null
+++ b/packages/app/src/domain/topical/components/topical-section-header.tsx
@@ -0,0 +1,103 @@
+import { ChevronRight } from '@corona-dashboard/icons';
+import { isEmpty } from 'lodash';
+import { ReactNode } from 'react';
+import { ArrowIconLeft } from '~/components/arrow-icon';
+import { Box } from '~/components/base';
+import { LinkWithIcon } from '~/components/link-with-icon';
+import { RelativeDate } from '~/components/relative-date';
+import {
+  Heading,
+  HeadingLevel,
+  InlineText,
+  Text,
+} from '~/components/typography';
+import { useIntl } from '~/intl';
+import { SiteText } from '~/locale';
+import { replaceComponentsInText } from '~/utils/replace-components-in-text';
+
+interface TopicalSectionHeaderProps {
+  title: ReactNode;
+  description?: string;
+  lastGenerated?: number;
+  showBackLink?: boolean;
+  headingLevel?: HeadingLevel;
+  headerVariant?: 'h1' | 'h2';
+  link?: {
+    href: string;
+    text: string;
+  };
+  text: SiteText['pages']['topical_page']['shared'];
+}
+
+export function TopicalSectionHeader({
+  title,
+  lastGenerated,
+  showBackLink,
+  link,
+  description,
+  headingLevel = 2,
+  headerVariant = 'h1',
+  text,
+}: TopicalSectionHeaderProps) {
+  const { formatDateFromSeconds } = useIntl();
+
+  return (
+    <Box spacing={3}>
+      {showBackLink && (
+        <Box py={3} borderBottom={'solid 1px'} borderColor={'border'}>
+          <LinkWithIcon href="/" icon={<ArrowIconLeft />}>
+            {text.terug_naar_landelijk}
+          </LinkWithIcon>
+        </Box>
+      )}
+
+      <Box spacing={{ _: 1, lg: 2 }}>
+        <Box
+          display="flex"
+          flexDirection={{ _: 'column', lg: 'row' }}
+          alignItems="baseline"
+          spacing={2}
+          spacingHorizontal={{ _: 0, lg: 4 }}
+          flexWrap="wrap"
+        >
+          <Heading level={headingLevel} variant={headerVariant}>
+            {title}
+          </Heading>
+
+          {
+            /**
+             * Check also for empty link text, so that clearing it in Lokalize
+             * actually removes the link altogether
+             */
+            link && !isEmpty(link.text) ? (
+              <Box mb={'2px'}>
+                <LinkWithIcon
+                  href={link.href}
+                  icon={<ChevronRight />}
+                  iconPlacement="right"
+                >
+                  {link.text}
+                </LinkWithIcon>
+              </Box>
+            ) : null
+          }
+        </Box>
+
+        {lastGenerated && (
+          <InlineText variant="label1" color="bodyLight">
+            {replaceComponentsInText(text.laatst_bijgewerkt, {
+              date: <RelativeDate dateInSeconds={lastGenerated} />,
+              time: formatDateFromSeconds(lastGenerated, 'time'),
+            })}
+          </InlineText>
+        )}
+
+        {description && (
+          <Box maxWidth={'30em'}>
+            <Text>{description}</Text>
+          </Box>
+        )}
+      </Box>
+    </Box>
+  );
+}
diff --git a/packages/app/src/domain/topical/components/topical-tile.tsx b/packages/app/src/domain/topical/components/topical-tile.tsx
new file mode 100644
index 0000000000..077d0898fe
--- /dev/null
+++ b/packages/app/src/domain/topical/components/topical-tile.tsx
@@ -0,0 +1,162 @@
+import { Box } from '~/components/base';
+import { space } from '~/style/theme';
+import css from '@styled-system/css';
+import styled from 'styled-components';
+import { Heading } from '~/components/typography';
+import { LinkWithIcon } from '~/components/link-with-icon';
+import { asResponsiveArray } from '~/style/utils';
+import { colors } from '@corona-dashboard/common';
+import DynamicIcon from '~/components/get-icon-by-name';
+import { ChevronRight, Down, Up } from '@corona-dashboard/icons';
+import { Markdown } from '~/components/markdown';
+import { TopicalIcon } from '@corona-dashboard/common/src/types';
+
+interface IconWrapperProps {
+  iconColor: string;
+}
+
+type TrendIcon = {
+  direction: 'UP' | 'DOWN';
+  color: string;
+} | null;
+
+type Cta = {
+  label: string;
+  href: string;
+} | null;
+
+interface TopicalTileProps {
+  title: string;
+  tileIcon: TopicalIcon;
+  trendIcon?: TrendIcon;
+  dynamicDescription: string;
+  cta?: Cta;
+}
+
+export function TopicalTile({
+  title,
+  tileIcon,
+  trendIcon,
+  dynamicDescription,
+  cta,
+}: TopicalTileProps) {
+  return (
+    <Box
+      as="a"
+      href={cta?.href}
+      borderColor={colors.gray}
+      borderWidth="1px"
+      borderStyle="solid"
+      position="relative"
+      display="flex"
+      flexDirection={'column'}
+      justifyContent={'space-between'}
+      color="#000000"
+      css={css({
+        '&:hover .topical-tile-cta': {
+          bg: colors.blue,
+        },
+        '&:hover .topical-tile-cta a': {
+          textDecoration: 'underline',
+          color: colors.white,
+        },
+      })}
+    >
+      <>
+        <Box display="flex" flexDirection={'column'} justifyContent={'start'}>
+          <Box
+            display="flex"
+            justifyContent={'space-between'}
+            css={css({
+              gap: 2,
+            })}
+          >
+            <Box display="block" fontSize={{ _: 6, xs: 7 }}>
+              <Heading
+                level={3}
+                color={colors.blue}
+                css={css({
+                  display: 'flex',
+                  justifyContent: 'start',
+                  paddingLeft: asResponsiveArray({ _: 3, xs: 4 }),
+                  paddingRight: 0,
+                  paddingTop: asResponsiveArray({ _: 3, xs: 4 }),
+                  overflowWrap: 'break-word',
+                  wordWrap: 'break-word',
+                  hyphens: 'auto',
+                })}
+              >
+                {title}
+                {trendIcon && (
+                  <IconWrapper iconColor={trendIcon.color}>
+                    {trendIcon.direction === 'DOWN' && <Down />}
+                    {trendIcon.direction === 'UP' && <Up />}
+                  </IconWrapper>
+                )}
+              </Heading>
+            </Box>
+
+            <KpiIcon>
+              <DynamicIcon name={tileIcon} />
+            </KpiIcon>
+          </Box>
+          <Box
+            display="flex"
+            flexDirection={'column'}
+            justifyContent={'start'}
+            textAlign={'left'}
+            p={{ _: 3, xs: 4 }}
+          >
+            <Box display="flex" alignItems={'center'}>
+              <Markdown content={dynamicDescription} />
+            </Box>
+          </Box>
+        </Box>
+
+        {cta ? (
+          <Box
+            display="flex"
+            justifyContent={'center'}
+            bg={colors.lightBlue}
+            color={colors.blue}
+            padding={3}
+            className="topical-tile-cta"
+            css={css({
+              transition: 'background .1s ease-in-out',
+            })}
+          >
+            <LinkWithIcon
+              href={cta.href}
+              icon={<ChevronRight />}
+              iconPlacement="right"
+            >
+              {cta.label}
+            </LinkWithIcon>
+          </Box>
+        ) : null}
+      </>
+    </Box>
+  );
+}
+
+const IconWrapper = styled.span<IconWrapperProps>((x) =>
+  css({
+    color: x.iconColor,
+    display: 'inline-flex',
+    width: '20px',
+    minWidth: '20px',
+    marginLeft: 2,
+  })
+);
+
+const KpiIcon = styled.span(
+  css({
+    color: colors.white,
+    backgroundColor: colors.blue,
+    width: asResponsiveArray({ _: 40, sm: 50 }),
+    minWidth: asResponsiveArray({ _: 40, sm: 50 }),
+    height: asResponsiveArray({ _: 40, sm: 50 }),
+    padding: 2,
+    borderBottomLeftRadius: space[1],
+  })
+);
diff --git a/packages/app/src/domain/topical/index.ts b/packages/app/src/domain/topical/index.ts
index 8dd09b299e..8f14cc130d 100644
--- a/packages/app/src/domain/topical/index.ts
+++ b/packages/app/src/domain/topical/index.ts
@@ -1,3 +1,9 @@
+export *  from './components/topical-tile';
+export *  from './components/topical-header';
+export *  from './components/theme-header';
+export *  from './components/subjects-list';
+export *  from './components/measurement-tile';
+export *  from './components/search';
 export * from './mini-tile-selector-layout';
 export { ArticleList } from './article-list';
 export { HighlightsTile } from './highlights-tile';
diff --git a/packages/app/src/next-config/redirects/redirects.js b/packages/app/src/next-config/redirects/redirects.js
index 67dbcba3ce..d36bd9f650 100644
--- a/packages/app/src/next-config/redirects/redirects.js
+++ b/packages/app/src/next-config/redirects/redirects.js
@@ -63,6 +63,19 @@ async function redirects() {
       destination: '/veiligheidsregio/:code',
       permanent: true,
     },
+    
+    // Redirects for former topical pages GM/VR -> dedicated GM/VR page
+    {
+      source: '/actueel/gemeente/:gm(gm|GM|gM|Gm):nr(\\d{4}):slash(/{0,1}):page*',
+      destination: '/gemeente/GM:nr',
+      permanent: false,
+    },
+    {
+      source: '/actueel/veiligheidsregio/:vr(vr|VR|vR|Vr):nr(\\d{2}):slash(/{0,1}):page*',
+      destination: '/veiligheidsregio/VR:nr',
+      permanent: false,
+    },
+    // Redirects for municipal reorganizations
     ...gmRedirects.map(({ from, to }) => ({
       source: `/gemeente/:gm(gm|GM|gM|Gm):nr(${from.join('|')})/:page*`,
       destination: `/gemeente/GM${to}/:page*`,
diff --git a/packages/app/src/pages/actueel/gemeente/[code].tsx b/packages/app/src/pages/actueel/gemeente/[code].tsx
deleted file mode 100644
index 455c97e1be..0000000000
--- a/packages/app/src/pages/actueel/gemeente/[code].tsx
+++ /dev/null
@@ -1,555 +0,0 @@
-import {
-  colors,
-  DAY_IN_SECONDS,
-  GmCollectionVaccineCoveragePerAgeGroup,
-  GmHospitalNiceValue,
-  GmSewerValue,
-  GmVaccineCoveragePerAgeGroupValue,
-  TimeframeOption,
-  WEEK_IN_SECONDS,
-} from '@corona-dashboard/common';
-import {
-  ChevronRight,
-  Vaccinaties,
-  Ziekenhuis,
-  Rioolvirus,
-} from '@corona-dashboard/icons';
-import { useRouter } from 'next/router';
-import { isDefined, isPresent } from 'ts-is-present';
-import { Box, Spacer } from '~/components/base';
-import { CollapsibleButton } from '~/components/collapsible';
-import { DataDrivenText } from '~/components/data-driven-text';
-import { Sitemap, useDataSitemap } from '~/components/sitemap';
-import { Text } from '~/components/typography';
-import { LinkWithIcon, Markdown, MaxWidth } from '~/components';
-import { gmCodesByVrCode, vrCodeByGmCode } from '~/data';
-import {
-  VaccinationCoverageChoropleth,
-  ArticleList,
-  MiniTileSelectorItem,
-  MiniTileSelectorLayout,
-  MiniTrendTile,
-  MiniVaccinationCoverageTile,
-  TopicalSectionHeader,
-} from '~/domain/topical';
-import { Search } from '~/domain/topical/components/search';
-import { Layout } from '~/domain/layout';
-import { selectVaccineCoverageData } from '~/domain/vaccine/data-selection/select-vaccine-coverage-data';
-import { useAgegroupLabels } from '~/domain/vaccine/logic/use-agegroup-labels';
-import { useIntl } from '~/intl';
-import { getWarning } from '~/queries/get-elements-query';
-import { getTopicalPageData } from '~/queries/get-topical-page-data';
-import { Languages, SiteText } from '~/locale';
-import {
-  createGetStaticProps,
-  StaticProps,
-} from '~/static-props/create-get-static-props';
-import {
-  createGetChoroplethData,
-  getLastGeneratedDate,
-  selectGmData,
-  getLokalizeTexts,
-} from '~/static-props/get-data';
-import {
-  assert,
-  useReverseRouter,
-  trimNullValues,
-  replaceVariablesInText,
-  countTrailingNullValues,
-  cutValuesFromTimeframe,
-  getBoundaryDateStartUnix,
-  getVrForMunicipalityCode,
-  replaceComponentsInText,
-  getAverageSplitPoints,
-} from '~/utils';
-import { useDynamicLokalizeTexts } from '~/utils/cms/use-dynamic-lokalize-texts';
-
-export { getStaticPaths } from '~/static-paths/gm';
-
-const selectLokalizeTexts = (siteText: SiteText) => ({
-  hospitalText: siteText.pages.hospital_page.nl,
-  positiveTestsText: siteText.pages.positive_tests_page.shared,
-  textGm: siteText.pages.topical_page.gm,
-  textShared: siteText.pages.topical_page.shared,
-  sewerText: siteText.pages.sewer_page.shared,
-});
-
-type LokalizeTexts = ReturnType<typeof selectLokalizeTexts>;
-
-export const getStaticProps = createGetStaticProps(
-  ({ locale }: { locale: keyof Languages }) =>
-    getLokalizeTexts(selectLokalizeTexts, locale),
-  getLastGeneratedDate,
-  (context) => {
-    const data = selectGmData(
-      'hospital_nice',
-      'sewer',
-      'difference',
-      'vaccine_coverage_per_age_group',
-      'tested_overall'
-    )(context);
-
-    return {
-      ...data,
-      selectedGmData: {
-        ...data.selectedGmData,
-        hospital_nice: {
-          ...data.selectedGmData.hospital_nice,
-          values: cutValuesFromTimeframe(
-            data.selectedGmData.hospital_nice.values,
-            TimeframeOption.FIVE_WEEKS
-          ),
-        },
-        tested_overall: {
-          ...data.selectedGmData.tested_overall,
-          values: cutValuesFromTimeframe(
-            data.selectedGmData.tested_overall.values,
-            TimeframeOption.FIVE_WEEKS
-          ),
-        },
-        sewer: {
-          ...data.selectedGmData.sewer,
-          values: cutValuesFromTimeframe(
-            data.selectedGmData.sewer.values,
-            TimeframeOption.FIVE_WEEKS
-          ),
-        },
-      },
-    };
-  },
-  createGetChoroplethData({
-    gm: ({ vaccine_coverage_per_age_group }, ctx) => {
-      if (!isDefined(vaccine_coverage_per_age_group)) {
-        return {
-          vaccine_coverage_per_age_group:
-            null as unknown as GmCollectionVaccineCoveragePerAgeGroup[],
-        };
-      }
-      const vrCode = isPresent(ctx.params?.code)
-        ? vrCodeByGmCode[ctx.params?.code as 'string']
-        : undefined;
-
-      return {
-        vaccine_coverage_per_age_group: selectVaccineCoverageData(
-          isDefined(vrCode)
-            ? vaccine_coverage_per_age_group.filter((el) =>
-                gmCodesByVrCode[vrCode].includes(el.gmcode)
-              )
-            : vaccine_coverage_per_age_group
-        ),
-      };
-    },
-  }),
-  getTopicalPageData('gm', [
-    'hospital_nice',
-    'vaccine_coverage_per_age_group',
-    'tested_overall',
-  ])
-);
-
-const TopicalMunicipality = (props: StaticProps<typeof getStaticProps>) => {
-  const {
-    pageText,
-    municipalityName,
-    choropleth,
-    selectedGmData: data,
-    content,
-    lastGenerated,
-  } = props;
-
-  const router = useRouter();
-  const reverseRouter = useReverseRouter();
-  const { commonTexts, ...formatters } = useIntl();
-  const { hospitalText, textGm, sewerText, textShared } =
-    useDynamicLokalizeTexts<LokalizeTexts>(pageText, selectLokalizeTexts);
-
-  const gmCode = router.query.code as string;
-
-  const vrForMunicipality = getVrForMunicipalityCode(gmCode);
-
-  assert(
-    vrForMunicipality,
-    `[${TopicalMunicipality.name}] Unable to get safety region for gm code "${gmCode}"`
-  );
-
-  const dataHospitalIntake = data.hospital_nice;
-  const dataSewerTotal = data.sewer;
-
-  const filteredAgeGroup18Plus =
-    data.vaccine_coverage_per_age_group.values.find(
-      (item) => item.age_group_range === '18+'
-    );
-  const renderedAgeGroup18Pluslabels = useAgegroupLabels(
-    filteredAgeGroup18Plus,
-    true
-  );
-
-  const dataSitemap = useDataSitemap('gm', gmCode, data);
-
-  const metadata = {
-    title: replaceVariablesInText(textGm.metadata.title, {
-      municipalityName,
-    }),
-    description: replaceVariablesInText(textGm.metadata.description, {
-      municipalityName,
-    }),
-  };
-
-  const underReportedRangeHospital = getBoundaryDateStartUnix(
-    data.hospital_nice.values,
-    countTrailingNullValues(
-      data.hospital_nice.values,
-      'admissions_on_date_of_admission_moving_average_rounded'
-    )
-  );
-
-  const sevenDayAverageDatesHospital: [number, number] = [
-    underReportedRangeHospital - WEEK_IN_SECONDS,
-    underReportedRangeHospital - DAY_IN_SECONDS,
-  ];
-
-  const averageSplitPoints = getAverageSplitPoints(sewerText.split_labels);
-
-  return (
-    <Layout {...metadata} lastGenerated={lastGenerated}>
-      <Box bg="white">
-        <MaxWidth id="content">
-          <Box spacing={{ _: 4, md: 5 }} px={{ _: 3, sm: 4 }}>
-            <Box spacing={3}>
-              <TopicalSectionHeader
-                showBackLink
-                lastGenerated={Number(props.lastGenerated)}
-                title={replaceComponentsInText(textGm.title, {
-                  municipalityName: municipalityName,
-                })}
-                headingLevel={1}
-                text={textShared}
-              />
-
-              <MiniTileSelectorLayout
-                text={textShared}
-                link={{
-                  text: replaceVariablesInText(textGm.title_link, {
-                    municipalityName: municipalityName,
-                  }),
-                  href: reverseRouter.gm.index(gmCode),
-                }}
-                menuItems={[
-                  {
-                    label:
-                      textGm.mini_trend_tiles.ziekenhuis_opnames
-                        .menu_item_label,
-                    data: trimNullValues(
-                      dataHospitalIntake.values,
-                      'admissions_on_date_of_admission_moving_average_rounded'
-                    ),
-                    dataProperty:
-                      'admissions_on_date_of_admission_moving_average_rounded',
-                    value:
-                      dataHospitalIntake.last_value
-                        ?.admissions_on_date_of_admission_moving_average_rounded ??
-                      0,
-                    warning: getWarning(
-                      content.elements.warning,
-                      'hospital_nice'
-                    ),
-                  } as MiniTileSelectorItem<GmHospitalNiceValue>,
-                  {
-                    label: textGm.mini_trend_tiles.sewer.menu_item_label,
-                    data: dataSewerTotal.values.filter(
-                      (x) => typeof x.average === 'number'
-                    ),
-                    dataProperty: 'average',
-                    value: dataSewerTotal.last_value?.average ?? 0,
-                    warning: getWarning(content.elements.warning, 'sewer'),
-                  } as MiniTileSelectorItem<GmSewerValue>,
-                  {
-                    label:
-                      textGm.mini_trend_tiles.vaccinatiegraad.menu_item_label,
-                    data: data.vaccine_coverage_per_age_group.values,
-                    dataProperty: 'fully_vaccinated_percentage',
-                    value:
-                      renderedAgeGroup18Pluslabels.fully_vaccinated_percentage,
-                    valueIsPercentage: true,
-                    warning: getWarning(
-                      content.elements.warning,
-                      'vaccine_coverage_per_age_group'
-                    ),
-                    percentageBar: {
-                      value:
-                        filteredAgeGroup18Plus?.fully_vaccinated_percentage ??
-                        null,
-                      label:
-                        filteredAgeGroup18Plus?.fully_vaccinated_percentage_label,
-                    },
-                  } as MiniTileSelectorItem<GmVaccineCoveragePerAgeGroupValue>,
-                ].filter((x) => x !== undefined)}
-              >
-                <MiniTrendTile
-                  title={textGm.mini_trend_tiles.ziekenhuis_opnames.title}
-                  text={
-                    <>
-                      <DataDrivenText
-                        data={data}
-                        content={[
-                          {
-                            type: 'metric',
-                            text: textGm.data_driven_texts.intake_hospital_ma
-                              .value,
-                            metricName: 'hospital_nice',
-                            metricProperty:
-                              'admissions_on_date_of_admission_moving_average_rounded',
-                            differenceKey:
-                              'hospital_nice__admissions_on_date_of_reporting_moving_average',
-                            additionalData: {
-                              dateStart: formatters.formatDateFromSeconds(
-                                sevenDayAverageDatesHospital[0]
-                              ),
-                              dateEnd: formatters.formatDateFromSeconds(
-                                sevenDayAverageDatesHospital[1]
-                              ),
-                            },
-                          },
-                        ]}
-                      />
-                      <LinkWithIcon
-                        href={reverseRouter.gm.ziekenhuisopnames(gmCode)}
-                        icon={<ChevronRight />}
-                        iconPlacement="right"
-                      >
-                        {
-                          textGm.mini_trend_tiles.ziekenhuis_opnames
-                            .read_more_link
-                        }
-                      </LinkWithIcon>
-                    </>
-                  }
-                  icon={<Ziekenhuis />}
-                  values={dataHospitalIntake.values}
-                  seriesConfig={[
-                    {
-                      type: 'line',
-                      metricProperty:
-                        'admissions_on_date_of_admission_moving_average',
-                      label: hospitalText.linechart_legend_titel_moving_average,
-                      color: colors.data.primary,
-                    },
-                    {
-                      type: 'bar',
-                      metricProperty: 'admissions_on_date_of_reporting',
-                      label: hospitalText.linechart_legend_titel_trend_label,
-                      color: colors.data.primary,
-                    },
-                  ]}
-                  dataOptions={{
-                    timespanAnnotations: [
-                      {
-                        start: underReportedRangeHospital,
-                        end: Infinity,
-                        label: textShared.data_incomplete,
-                        shortLabel: commonTexts.common.incomplete,
-                        cutValuesForMetricProperties: [
-                          'admissions_on_date_of_admission_moving_average',
-                        ],
-                      },
-                    ],
-                  }}
-                  accessibility={{ key: 'topical_hospital_nice' }}
-                  warning={getWarning(
-                    content.elements.warning,
-                    'hospital_nice'
-                  )}
-                />
-                <MiniTrendTile
-                  title={textGm.mini_trend_tiles.sewer.title}
-                  text={
-                    <>
-                      <DataDrivenText
-                        data={data}
-                        content={[
-                          {
-                            type: 'metric',
-                            text: textGm.data_driven_texts.sewer.value,
-                            metricName: 'sewer',
-                            metricProperty: 'average',
-                            additionalData: {
-                              dateStart: formatters.formatDateFromSeconds(
-                                data.sewer.last_value.date_start_unix
-                              ),
-                              dateEnd: formatters.formatDateFromSeconds(
-                                data.sewer.last_value.date_end_unix
-                              ),
-                            },
-                          },
-                        ]}
-                      />
-                      <LinkWithIcon
-                        href={reverseRouter.gm.rioolwater(gmCode)}
-                        icon={<ChevronRight />}
-                        iconPlacement="right"
-                      >
-                        {textGm.mini_trend_tiles.sewer.read_more_link}
-                      </LinkWithIcon>
-                    </>
-                  }
-                  icon={<Rioolvirus />}
-                  values={dataSewerTotal.values}
-                  seriesConfig={[
-                    {
-                      type: 'split-area',
-                      metricProperty: 'average',
-                      label: commonTexts.common.weekgemiddelde,
-                      splitPoints: averageSplitPoints,
-                    },
-                  ]}
-                  dataOptions={{
-                    valueAnnotation:
-                      commonTexts.waarde_annotaties.riool_normalized,
-                  }}
-                  accessibility={{ key: 'topical_sewer' }}
-                  warning={getWarning(content.elements.warning, 'sewer')}
-                />
-                {isDefined(filteredAgeGroup18Plus) && (
-                  <MiniVaccinationCoverageTile
-                    title={textGm.mini_trend_tiles.vaccinatiegraad.title}
-                    oneShotBarLabel={
-                      textGm.mini_trend_tiles.vaccinatiegraad.one_shot_bar_label
-                    }
-                    fullyVaccinatedBarLabel={
-                      textGm.mini_trend_tiles.vaccinatiegraad
-                        .fully_vaccinated_bar_label
-                    }
-                    icon={<Vaccinaties />}
-                    text={
-                      <>
-                        <Text variant="datadriven" as="div">
-                          <Markdown
-                            content={replaceVariablesInText(
-                              textGm.mini_trend_tiles.vaccinatiegraad.text,
-                              renderedAgeGroup18Pluslabels,
-                              formatters
-                            )}
-                          />
-                        </Text>
-                        <LinkWithIcon
-                          href={reverseRouter.gm.vaccinaties(gmCode)}
-                          icon={<ChevronRight />}
-                          iconPlacement="right"
-                        >
-                          {
-                            textGm.mini_trend_tiles.vaccinatiegraad
-                              .read_more_link
-                          }
-                        </LinkWithIcon>
-                      </>
-                    }
-                    oneShotPercentage={
-                      filteredAgeGroup18Plus.has_one_shot_percentage
-                    }
-                    fullyVaccinatedPercentage={
-                      filteredAgeGroup18Plus.fully_vaccinated_percentage
-                    }
-                    oneShotPercentageLabel={
-                      filteredAgeGroup18Plus.has_one_shot_percentage_label
-                    }
-                    fullyVaccinatedPercentageLabel={
-                      filteredAgeGroup18Plus.fully_vaccinated_percentage_label
-                    }
-                    warning={getWarning(
-                      content.elements.warning,
-                      'vaccine_coverage_per_age_group'
-                    )}
-                  />
-                )}
-              </MiniTileSelectorLayout>
-            </Box>
-
-            <Box pt={4}>
-              <Search
-                title={textShared.secties.search.title.gm}
-                activeResult={gmCode}
-              />
-            </Box>
-
-            <VaccinationCoverageChoropleth
-              text={textShared}
-              title={replaceVariablesInText(
-                textShared.secties.vaccination_coverage_choropleth.title.gm,
-                { municipalityName: municipalityName }
-              )}
-              content={replaceVariablesInText(
-                textShared.secties.vaccination_coverage_choropleth.content.gm,
-                { municipalityName: municipalityName }
-              )}
-              gmCode={gmCode}
-              data={{ gm: choropleth.gm.vaccine_coverage_per_age_group }}
-              link={{
-                href: reverseRouter.gm.vaccinaties(gmCode),
-                text: replaceVariablesInText(
-                  textShared.secties.vaccination_coverage_choropleth.link_text
-                    .gm,
-                  { municipalityName: municipalityName }
-                ),
-              }}
-            />
-
-            <CollapsibleButton label={textShared.overview_links_header}>
-              <Sitemap
-                quickLinksHeader={textGm.quick_links.header}
-                quickLinks={[
-                  {
-                    href: reverseRouter.nl.index(),
-                    text: textGm.quick_links.links.nationaal,
-                  },
-                  {
-                    href: reverseRouter.vr.index(vrForMunicipality.code),
-                    text: replaceVariablesInText(
-                      textGm.quick_links.links.veiligheidsregio,
-                      { safetyRegionName: vrForMunicipality.name }
-                    ),
-                  },
-                  {
-                    href: reverseRouter.gm.index(gmCode),
-                    text: replaceVariablesInText(
-                      textGm.quick_links.links.gemeente,
-                      { municipalityName: municipalityName }
-                    ),
-                  },
-                ].filter(isDefined)}
-                dataSitemapHeader={replaceVariablesInText(
-                  textGm.data_sitemap_title,
-                  { municipalityName: municipalityName }
-                )}
-                dataSitemap={dataSitemap}
-              />
-            </CollapsibleButton>
-          </Box>
-        </MaxWidth>
-
-        <Spacer mb={5} />
-
-        <Box width="100%" backgroundColor="offWhite" pb={5}>
-          <MaxWidth
-            spacing={4}
-            pt={{ _: 3, md: 5 }}
-            px={{ _: 3, sm: 4, md: 3, lg: 4 }}
-          >
-            <TopicalSectionHeader
-              title={textShared.secties.meer_lezen.titel}
-              description={textShared.secties.meer_lezen.omschrijving}
-              link={textShared.secties.meer_lezen.link}
-              headerVariant="h2"
-              text={textShared}
-            />
-
-            {isPresent(content.articles) && (
-              <ArticleList articles={content.articles} text={textShared} />
-            )}
-          </MaxWidth>
-        </Box>
-      </Box>
-    </Layout>
-  );
-};
-
-export default TopicalMunicipality;
diff --git a/packages/app/src/pages/actueel/gemeente/index.tsx b/packages/app/src/pages/actueel/gemeente/index.tsx
deleted file mode 100644
index 51046ce959..0000000000
--- a/packages/app/src/pages/actueel/gemeente/index.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import {
-  colors,
-  GmCollectionHospitalNice,
-  gmData,
-} from '@corona-dashboard/common';
-import { useRouter } from 'next/router';
-import { useMemo } from 'react';
-import { Box } from '~/components/base';
-import { DynamicChoropleth } from '~/components/choropleth';
-import { TooltipContent } from '~/components/choropleth/tooltips';
-import { ErrorBoundary } from '~/components/error-boundary';
-import { Markdown } from '~/components/markdown';
-import { Heading } from '~/components/typography';
-import { GmComboBox } from '~/domain/layout/components/gm-combo-box';
-import { GmLayout } from '~/domain/layout/gm-layout';
-import { Layout } from '~/domain/layout/layout';
-import { Languages, SiteText } from '~/locale';
-import {
-  createGetStaticProps,
-  StaticProps,
-} from '~/static-props/create-get-static-props';
-import {
-  getLastGeneratedDate,
-  getLokalizeTexts,
-} from '~/static-props/get-data';
-import { useBreakpoints } from '~/utils/use-breakpoints';
-import { useReverseRouter } from '~/utils/use-reverse-router';
-import { useDynamicLokalizeTexts } from '~/utils/cms/use-dynamic-lokalize-texts';
-
-const selectLokalizeTexts = (siteText: SiteText) => ({
-  textGm: siteText.pages.topical_page.gm,
-});
-
-type LokalizeTexts = ReturnType<typeof selectLokalizeTexts>;
-
-export const getStaticProps = createGetStaticProps(
-  ({ locale }: { locale: keyof Languages }) =>
-    getLokalizeTexts(selectLokalizeTexts, locale),
-  getLastGeneratedDate
-);
-
-const Municipality = (props: StaticProps<typeof getStaticProps>) => {
-  const { pageText, lastGenerated } = props;
-  const reverseRouter = useReverseRouter();
-  const router = useRouter();
-  const code = router.query.code as string;
-
-  const breakpoints = useBreakpoints();
-
-  const { textGm } = useDynamicLokalizeTexts<LokalizeTexts>(
-    pageText,
-    selectLokalizeTexts
-  );
-
-  const metadata = {
-    ...textGm.index.metadata,
-  };
-
-  const data = useMemo(() => {
-    return gmData.map<GmCollectionHospitalNice>(
-      (x) =>
-        ({
-          gmcode: x.gemcode,
-          admissions_on_date_of_admission: null,
-        } as unknown as GmCollectionHospitalNice)
-    );
-  }, []);
-
-  return (
-    <Layout {...metadata} lastGenerated={lastGenerated}>
-      <GmLayout isLandingPage code={code} getLink={reverseRouter.actueel.gm}>
-        {!breakpoints.md && (
-          <Box bg="white">
-            <GmComboBox
-              getLink={reverseRouter.actueel.gm}
-              selectedGmCode={code}
-            />
-          </Box>
-        )}
-
-        <Box as="article" p={4}>
-          <Heading level={2} as="h1">
-            {textGm.index.title}
-          </Heading>
-
-          <Markdown content={textGm.index.description} />
-
-          <Box
-            display="flex"
-            flex="1"
-            justifyContent="center"
-            height="75vh"
-            maxWidth={750}
-            maxHeight={960}
-            flexDirection="column"
-            spacing={3}
-          >
-            <ErrorBoundary>
-              <DynamicChoropleth
-                accessibility={{
-                  key: 'municipality_navigation_map',
-                  features: ['keyboard_choropleth'],
-                }}
-                map="gm"
-                data={data}
-                minHeight={650}
-                dataConfig={{
-                  metricName: 'gemeente' as any,
-                  metricProperty: 'admissions_on_date_of_admission',
-                  areaStroke: colors.white,
-                  areaStrokeWidth: 1,
-                  hoverFill: colors.white,
-                  hoverStrokeWidth: 3,
-                  noDataFillColor: colors.lightGray,
-                }}
-                dataOptions={{
-                  getLink: reverseRouter.actueel.gm,
-                }}
-                formatTooltip={(context) => (
-                  <TooltipContent
-                    title={context.featureName}
-                    link={reverseRouter.actueel.gm(context.dataItem.gmcode)}
-                  />
-                )}
-              />
-            </ErrorBoundary>
-          </Box>
-        </Box>
-      </GmLayout>
-    </Layout>
-  );
-};
-
-export default Municipality;
diff --git a/packages/app/src/pages/actueel/veiligheidsregio/[code].tsx b/packages/app/src/pages/actueel/veiligheidsregio/[code].tsx
deleted file mode 100644
index 47df33ab6b..0000000000
--- a/packages/app/src/pages/actueel/veiligheidsregio/[code].tsx
+++ /dev/null
@@ -1,555 +0,0 @@
-import {
-  colors,
-  DAY_IN_SECONDS,
-  GmCollectionVaccineCoveragePerAgeGroup,
-  TimeframeOption,
-  VrHospitalNiceValue,
-  VrSewerValue,
-  VrVaccineCoveragePerAgeGroupValue,
-  WEEK_IN_SECONDS,
-} from '@corona-dashboard/common';
-import {
-  ChevronRight,
-  Vaccinaties,
-  Ziekenhuis,
-  Rioolvirus,
-} from '@corona-dashboard/icons';
-import { useRouter } from 'next/router';
-import { isDefined, isPresent } from 'ts-is-present';
-import { Box, Spacer } from '~/components/base';
-import { CollapsibleButton } from '~/components/collapsible';
-import { DataDrivenText } from '~/components/data-driven-text';
-import { LinkWithIcon, Markdown, MaxWidth } from '~/components';
-import { Sitemap, useDataSitemap } from '~/components/sitemap';
-import { Text } from '~/components/typography';
-import { gmCodesByVrCode } from '~/data';
-import { Layout } from '~/domain/layout';
-import { Search } from '~/domain/topical/components/search';
-import {
-  MiniTileSelectorItem,
-  MiniTileSelectorLayout,
-  VaccinationCoverageChoropleth,
-  ArticleList,
-  MiniTrendTile,
-  MiniVaccinationCoverageTile,
-  TopicalSectionHeader,
-} from '~/domain/topical';
-import { selectVaccineCoverageData } from '~/domain/vaccine/data-selection/select-vaccine-coverage-data';
-import { useAgegroupLabels } from '~/domain/vaccine/logic/use-agegroup-labels';
-import { useIntl } from '~/intl';
-import { getWarning } from '~/queries/get-elements-query';
-import { getTopicalPageData } from '~/queries/get-topical-page-data';
-import { Languages, SiteText } from '~/locale';
-import {
-  createGetStaticProps,
-  StaticProps,
-} from '~/static-props/create-get-static-props';
-import {
-  createGetChoroplethData,
-  getLastGeneratedDate,
-  selectVrData,
-  getLokalizeTexts,
-} from '~/static-props/get-data';
-import {
-  useReverseRouter,
-  countTrailingNullValues,
-  cutValuesFromTimeframe,
-  getBoundaryDateStartUnix,
-  replaceComponentsInText,
-  replaceVariablesInText,
-  trimNullValues,
-  getAverageSplitPoints,
-} from '~/utils';
-import { useDynamicLokalizeTexts } from '~/utils/cms/use-dynamic-lokalize-texts';
-
-export { getStaticPaths } from '~/static-paths/vr';
-
-const selectLokalizeTexts = (siteText: SiteText) => ({
-  hospitalText: siteText.pages.hospital_page.nl,
-  positiveTestsText: siteText.pages.positive_tests_page.shared,
-  textVr: siteText.pages.topical_page.vr,
-  textShared: siteText.pages.topical_page.shared,
-  sewerText: siteText.pages.sewer_page.shared,
-});
-
-type LokalizeTexts = ReturnType<typeof selectLokalizeTexts>;
-
-export const getStaticProps = createGetStaticProps(
-  ({ locale }: { locale: keyof Languages }) =>
-    getLokalizeTexts(selectLokalizeTexts, locale),
-  getLastGeneratedDate,
-  (context) => {
-    const data = selectVrData(
-      'vaccine_coverage_per_age_group',
-      'hospital_nice',
-      'code',
-      'sewer',
-      'difference',
-      'tested_overall',
-      'tested_ggd'
-    )(context);
-
-    data.selectedVrData.hospital_nice.values = cutValuesFromTimeframe(
-      data.selectedVrData.hospital_nice.values,
-      TimeframeOption.FIVE_WEEKS
-    );
-
-    data.selectedVrData.tested_overall.values = cutValuesFromTimeframe(
-      data.selectedVrData.tested_overall.values,
-      TimeframeOption.FIVE_WEEKS
-    );
-
-    data.selectedVrData.sewer.values = cutValuesFromTimeframe(
-      data.selectedVrData.sewer.values,
-      TimeframeOption.FIVE_WEEKS
-    );
-
-    return {
-      ...data,
-      selectedVrData: {
-        ...data.selectedVrData,
-        hospital_nice: {
-          ...data.selectedVrData.hospital_nice,
-          values: cutValuesFromTimeframe(
-            data.selectedVrData.hospital_nice.values,
-            TimeframeOption.FIVE_WEEKS
-          ),
-        },
-        tested_overall: {
-          ...data.selectedVrData.tested_overall,
-          values: cutValuesFromTimeframe(
-            data.selectedVrData.tested_overall.values,
-            TimeframeOption.FIVE_WEEKS
-          ),
-        },
-        sewer: {
-          ...data.selectedVrData.sewer,
-          values: cutValuesFromTimeframe(
-            data.selectedVrData.sewer.values,
-            TimeframeOption.FIVE_WEEKS
-          ),
-        },
-      },
-    };
-  },
-
-  createGetChoroplethData({
-    gm: ({ vaccine_coverage_per_age_group }, ctx) => {
-      if (!isDefined(vaccine_coverage_per_age_group)) {
-        return {
-          vaccine_coverage_per_age_group:
-            null as unknown as GmCollectionVaccineCoveragePerAgeGroup[],
-        };
-      }
-
-      return {
-        vaccine_coverage_per_age_group: selectVaccineCoverageData(
-          isPresent(ctx.params?.code)
-            ? vaccine_coverage_per_age_group.filter((el) =>
-                gmCodesByVrCode[ctx.params?.code as string].includes(el.gmcode)
-              )
-            : vaccine_coverage_per_age_group
-        ),
-      };
-    },
-  }),
-  getTopicalPageData('vr', [
-    'hospital_nice',
-    'vaccine_coverage_per_age_group',
-    'tested_overall',
-  ])
-);
-
-const TopicalVr = (props: StaticProps<typeof getStaticProps>) => {
-  const {
-    pageText,
-    choropleth,
-    selectedVrData: data,
-    content,
-    lastGenerated,
-    vrName,
-  } = props;
-  const router = useRouter();
-  const reverseRouter = useReverseRouter();
-  const vrCode = router.query.code as string;
-  const { commonTexts, ...formatters } = useIntl();
-  const { hospitalText, textVr, sewerText, textShared } =
-    useDynamicLokalizeTexts<LokalizeTexts>(pageText, selectLokalizeTexts);
-
-  const dataHospitalIntake = data.hospital_nice;
-  const dataSewerTotal = data.sewer;
-  const dataSitemap = useDataSitemap('vr', vrCode);
-
-  const filteredAgeGroup18Plus =
-    data.vaccine_coverage_per_age_group.values.find(
-      (item) => item.age_group_range === '18+'
-    );
-  const renderedAgeGroup18Pluslabels = useAgegroupLabels(
-    filteredAgeGroup18Plus,
-    true
-  );
-
-  const metadata = {
-    title: replaceVariablesInText(textVr.metadata.title, {
-      safetyRegionName: vrName,
-    }),
-    description: replaceVariablesInText(textVr.metadata.description, {
-      safetyRegionName: vrName,
-    }),
-  };
-
-  const underReportedRangeHospital = getBoundaryDateStartUnix(
-    data.hospital_nice.values,
-    countTrailingNullValues(
-      data.hospital_nice.values,
-      'admissions_on_date_of_admission_moving_average_rounded'
-    )
-  );
-
-  const sevenDayAverageDatesHospital: [number, number] = [
-    underReportedRangeHospital - WEEK_IN_SECONDS,
-    underReportedRangeHospital - DAY_IN_SECONDS,
-  ];
-
-  const averageSplitPoints = getAverageSplitPoints(sewerText.split_labels);
-
-  return (
-    <Layout {...metadata} lastGenerated={lastGenerated}>
-      <Box bg="white">
-        <MaxWidth id="content">
-          <Box spacing={{ _: 4, md: 5 }} px={{ _: 3, sm: 4 }}>
-            <Box spacing={3}>
-              <TopicalSectionHeader
-                showBackLink
-                lastGenerated={Number(props.lastGenerated)}
-                title={replaceComponentsInText(
-                  textVr.secties.actuele_situatie.titel,
-                  {
-                    safetyRegionName: vrName,
-                  }
-                )}
-                headingLevel={1}
-                text={textShared}
-              />
-
-              <MiniTileSelectorLayout
-                text={textShared}
-                link={{
-                  text: replaceVariablesInText(textVr.title_link, {
-                    safetyRegionName: vrName,
-                  }),
-                  href: reverseRouter.vr.index(vrCode),
-                }}
-                menuItems={[
-                  {
-                    label:
-                      textVr.mini_trend_tiles.ziekenhuis_opnames
-                        .menu_item_label,
-                    data: trimNullValues(
-                      dataHospitalIntake.values,
-                      'admissions_on_date_of_admission_moving_average_rounded'
-                    ),
-                    dataProperty:
-                      'admissions_on_date_of_admission_moving_average_rounded',
-                    value:
-                      dataHospitalIntake.last_value
-                        ?.admissions_on_date_of_admission_moving_average_rounded ??
-                      0,
-                    warning: getWarning(
-                      content.elements.warning,
-                      'hospital_nice'
-                    ),
-                  } as MiniTileSelectorItem<VrHospitalNiceValue>,
-                  {
-                    label: textVr.mini_trend_tiles.sewer.menu_item_label,
-                    data: dataSewerTotal.values.filter(
-                      (x) => typeof x.average === 'number'
-                    ),
-                    dataProperty: 'average',
-                    value: dataSewerTotal.last_value?.average ?? 0,
-                    warning: getWarning(content.elements.warning, 'sewer'),
-                  } as MiniTileSelectorItem<VrSewerValue>,
-                  {
-                    label:
-                      textVr.mini_trend_tiles.vaccinatiegraad.menu_item_label,
-                    data: data.vaccine_coverage_per_age_group.values,
-                    dataProperty: 'fully_vaccinated_percentage',
-                    value:
-                      renderedAgeGroup18Pluslabels.fully_vaccinated_percentage,
-                    valueIsPercentage: true,
-                    warning: getWarning(
-                      content.elements.warning,
-                      'vaccine_coverage_per_age_group'
-                    ),
-                    percentageBar: {
-                      value:
-                        filteredAgeGroup18Plus?.fully_vaccinated_percentage ??
-                        null,
-                      label:
-                        filteredAgeGroup18Plus?.fully_vaccinated_percentage_label,
-                    },
-                  } as MiniTileSelectorItem<VrVaccineCoveragePerAgeGroupValue>,
-                ].filter((x) => x !== undefined)}
-              >
-                <MiniTrendTile
-                  title={textVr.mini_trend_tiles.ziekenhuis_opnames.title}
-                  text={
-                    <>
-                      <DataDrivenText
-                        data={data}
-                        content={[
-                          {
-                            type: 'metric',
-                            text: textVr.data_driven_texts.intake_hospital_ma
-                              .value,
-                            metricName: 'hospital_nice',
-                            metricProperty:
-                              'admissions_on_date_of_admission_moving_average_rounded',
-                            differenceKey:
-                              'hospital_nice__admissions_on_date_of_reporting_moving_average',
-                            additionalData: {
-                              dateStart: formatters.formatDateFromSeconds(
-                                sevenDayAverageDatesHospital[0]
-                              ),
-                              dateEnd: formatters.formatDateFromSeconds(
-                                sevenDayAverageDatesHospital[1]
-                              ),
-                            },
-                          },
-                        ]}
-                      />
-                      <LinkWithIcon
-                        href={reverseRouter.vr.ziekenhuisopnames(vrCode)}
-                        icon={<ChevronRight />}
-                        iconPlacement="right"
-                      >
-                        {
-                          textVr.mini_trend_tiles.ziekenhuis_opnames
-                            .read_more_link
-                        }
-                      </LinkWithIcon>
-                    </>
-                  }
-                  icon={<Ziekenhuis />}
-                  values={dataHospitalIntake.values}
-                  seriesConfig={[
-                    {
-                      type: 'line',
-                      metricProperty:
-                        'admissions_on_date_of_admission_moving_average',
-                      label: hospitalText.linechart_legend_titel_moving_average,
-                      color: colors.data.primary,
-                    },
-                    {
-                      type: 'bar',
-                      metricProperty: 'admissions_on_date_of_reporting',
-                      label: hospitalText.linechart_legend_titel_trend_label,
-                      color: colors.data.primary,
-                    },
-                  ]}
-                  dataOptions={{
-                    timespanAnnotations: [
-                      {
-                        start: underReportedRangeHospital,
-                        end: Infinity,
-                        label: textShared.data_incomplete,
-                        shortLabel: commonTexts.common.incomplete,
-                        cutValuesForMetricProperties: [
-                          'admissions_on_date_of_admission_moving_average',
-                        ],
-                      },
-                    ],
-                  }}
-                  accessibility={{ key: 'topical_hospital_nice' }}
-                  warning={getWarning(
-                    content.elements.warning,
-                    'hospital_nice'
-                  )}
-                />
-                <MiniTrendTile
-                  title={textVr.mini_trend_tiles.sewer.title}
-                  text={
-                    <>
-                      <DataDrivenText
-                        data={data}
-                        content={[
-                          {
-                            type: 'metric',
-                            text: textVr.data_driven_texts.sewer.value,
-                            metricName: 'sewer',
-                            metricProperty: 'average',
-                            additionalData: {
-                              newDate: formatters.formatDateFromSeconds(
-                                data.sewer.last_value.date_unix
-                              ),
-                            },
-                          },
-                        ]}
-                      />
-                      <LinkWithIcon
-                        href={reverseRouter.vr.rioolwater(vrCode)}
-                        icon={<ChevronRight />}
-                        iconPlacement="right"
-                      >
-                        {textVr.mini_trend_tiles.sewer.read_more_link}
-                      </LinkWithIcon>
-                    </>
-                  }
-                  icon={<Rioolvirus />}
-                  values={dataSewerTotal.values}
-                  seriesConfig={[
-                    {
-                      type: 'split-area',
-                      metricProperty: 'average',
-                      label: commonTexts.common.daggemiddelde,
-                      splitPoints: averageSplitPoints,
-                    },
-                  ]}
-                  dataOptions={{
-                    valueAnnotation:
-                      commonTexts.waarde_annotaties.riool_normalized,
-                  }}
-                  accessibility={{ key: 'topical_sewer' }}
-                  warning={getWarning(content.elements.warning, 'sewer')}
-                />
-                {isDefined(filteredAgeGroup18Plus) && (
-                  <MiniVaccinationCoverageTile
-                    title={textVr.mini_trend_tiles.vaccinatiegraad.title}
-                    oneShotBarLabel={
-                      textVr.mini_trend_tiles.vaccinatiegraad.one_shot_bar_label
-                    }
-                    fullyVaccinatedBarLabel={
-                      textVr.mini_trend_tiles.vaccinatiegraad
-                        .fully_vaccinated_bar_label
-                    }
-                    icon={<Vaccinaties />}
-                    text={
-                      <>
-                        <Text variant="datadriven" as="div">
-                          <Markdown
-                            content={replaceVariablesInText(
-                              textVr.mini_trend_tiles.vaccinatiegraad.text,
-                              renderedAgeGroup18Pluslabels,
-                              formatters
-                            )}
-                          />
-                        </Text>
-                        <LinkWithIcon
-                          href={reverseRouter.vr.vaccinaties(vrCode)}
-                          icon={<ChevronRight />}
-                          iconPlacement="right"
-                        >
-                          {
-                            textVr.mini_trend_tiles.vaccinatiegraad
-                              .read_more_link
-                          }
-                        </LinkWithIcon>
-                      </>
-                    }
-                    oneShotPercentage={
-                      filteredAgeGroup18Plus.has_one_shot_percentage
-                    }
-                    fullyVaccinatedPercentage={
-                      filteredAgeGroup18Plus.fully_vaccinated_percentage
-                    }
-                    oneShotPercentageLabel={
-                      filteredAgeGroup18Plus.has_one_shot_percentage_label
-                    }
-                    fullyVaccinatedPercentageLabel={
-                      filteredAgeGroup18Plus.fully_vaccinated_percentage_label
-                    }
-                    warning={getWarning(
-                      content.elements.warning,
-                      'vaccine_coverage_per_age_group'
-                    )}
-                  />
-                )}
-              </MiniTileSelectorLayout>
-            </Box>
-
-            <Box pt={4}>
-              <Search
-                title={textShared.secties.search.title.vr}
-                activeResult={vrCode}
-              />
-            </Box>
-
-            <VaccinationCoverageChoropleth
-              title={replaceVariablesInText(
-                textShared.secties.vaccination_coverage_choropleth.title.vr,
-                { safetyRegion: vrName }
-              )}
-              content={replaceVariablesInText(
-                textShared.secties.vaccination_coverage_choropleth.content.vr,
-                { safetyRegion: vrName }
-              )}
-              vrCode={vrCode}
-              data={{ gm: choropleth.gm.vaccine_coverage_per_age_group }}
-              text={textShared}
-              link={{
-                href: reverseRouter.vr.vaccinaties(vrCode),
-                text: replaceVariablesInText(
-                  textShared.secties.vaccination_coverage_choropleth.link_text
-                    .vr,
-                  { safetyRegion: vrName }
-                ),
-              }}
-            />
-
-            <CollapsibleButton label={textShared.overview_links_header}>
-              <Sitemap
-                quickLinksHeader={textVr.quick_links.header}
-                quickLinks={[
-                  {
-                    href: reverseRouter.nl.index(),
-                    text: textVr.quick_links.links.nationaal,
-                  },
-                  {
-                    href: reverseRouter.vr.index(router.query.code as string),
-                    text: replaceVariablesInText(
-                      textVr.quick_links.links.veiligheidsregio,
-                      { safetyRegionName: vrName }
-                    ),
-                  },
-                  {
-                    href: reverseRouter.gm.index(),
-                    text: textVr.quick_links.links.gemeente,
-                  },
-                ].filter(isDefined)}
-                dataSitemapHeader={replaceVariablesInText(
-                  textVr.data_sitemap_title,
-                  { safetyRegionName: vrName }
-                )}
-                dataSitemap={dataSitemap}
-              />
-            </CollapsibleButton>
-          </Box>
-        </MaxWidth>
-
-        <Spacer mb={5} />
-
-        <Box width="100%" backgroundColor="offWhite" pb={5}>
-          <MaxWidth
-            spacing={4}
-            pt={{ _: 3, md: 5 }}
-            px={{ _: 3, sm: 4, md: 3, lg: 4 }}
-          >
-            <TopicalSectionHeader
-              title={textShared.secties.meer_lezen.titel}
-              description={textShared.secties.meer_lezen.omschrijving}
-              link={textShared.secties.meer_lezen.link}
-              headerVariant="h2"
-              text={textShared}
-            />
-
-            {isPresent(content.articles) && (
-              <ArticleList articles={content.articles} text={textShared} />
-            )}
-          </MaxWidth>
-        </Box>
-      </Box>
-    </Layout>
-  );
-};
-
-export default TopicalVr;
diff --git a/packages/app/src/pages/actueel/veiligheidsregio/index.tsx b/packages/app/src/pages/actueel/veiligheidsregio/index.tsx
deleted file mode 100644
index e70a2b0909..0000000000
--- a/packages/app/src/pages/actueel/veiligheidsregio/index.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-import {
-  colors,
-  VrCollectionHospitalNice,
-  vrData,
-} from '@corona-dashboard/common';
-import { useRouter } from 'next/router';
-import { useMemo } from 'react';
-import { Box } from '~/components/base';
-import { DynamicChoropleth } from '~/components/choropleth';
-import { TooltipContent } from '~/components/choropleth/tooltips';
-import { ErrorBoundary } from '~/components/error-boundary';
-import { Markdown } from '~/components/markdown';
-import { Heading } from '~/components/typography';
-import { WarningTile } from '~/components/warning-tile';
-import { VrComboBox } from '~/domain/layout/components/vr-combo-box';
-import { Layout } from '~/domain/layout/layout';
-import { VrLayout } from '~/domain/layout/vr-layout';
-import { useIntl } from '~/intl';
-import { Languages, SiteText } from '~/locale';
-import {
-  createGetStaticProps,
-  StaticProps,
-} from '~/static-props/create-get-static-props';
-import {
-  getLastGeneratedDate,
-  getLokalizeTexts,
-} from '~/static-props/get-data';
-import { useBreakpoints } from '~/utils/use-breakpoints';
-import { useReverseRouter } from '~/utils/use-reverse-router';
-import { useDynamicLokalizeTexts } from '~/utils/cms/use-dynamic-lokalize-texts';
-
-const selectLokalizeTexts = (siteText: SiteText) => ({
-  textVr: siteText.pages.topical_page.vr,
-});
-
-type LokalizeTexts = ReturnType<typeof selectLokalizeTexts>;
-
-export const getStaticProps = createGetStaticProps(
-  ({ locale }: { locale: keyof Languages }) =>
-    getLokalizeTexts(selectLokalizeTexts, locale),
-  getLastGeneratedDate
-);
-
-const VrIndexPage = (props: StaticProps<typeof getStaticProps>) => {
-  const breakpoints = useBreakpoints();
-  const reverseRouter = useReverseRouter();
-  const router = useRouter();
-  const { commonTexts } = useIntl();
-
-  const { pageText, lastGenerated } = props;
-
-  const { textVr } = useDynamicLokalizeTexts<LokalizeTexts>(
-    pageText,
-    selectLokalizeTexts
-  );
-  const code = router.query.code as string;
-
-  const metadata = {
-    ...textVr.index.metadata,
-  };
-
-  const data = useMemo(() => {
-    return vrData.map<VrCollectionHospitalNice>(
-      (x) =>
-        ({
-          vrcode: x.code,
-          admissions_on_date_of_admission: null,
-        } as unknown as VrCollectionHospitalNice)
-    );
-  }, []);
-
-  return (
-    <Layout {...metadata} lastGenerated={lastGenerated}>
-      <VrLayout isLandingPage getLink={reverseRouter.actueel.vr}>
-        {!breakpoints.md && (
-          <Box bg="white">
-            <VrComboBox
-              getLink={reverseRouter.actueel.vr}
-              selectedVrCode={code}
-            />
-          </Box>
-        )}
-
-        <Box as="article" p={4} spacing={3}>
-          {commonTexts.regionaal_index.belangrijk_bericht && (
-            <WarningTile
-              message={commonTexts.regionaal_index.belangrijk_bericht}
-              variant="emphasis"
-            />
-          )}
-
-          <Heading level={2} as="h1">
-            {textVr.index.title}
-          </Heading>
-
-          <Markdown content={textVr.index.description} />
-
-          <Box
-            display="flex"
-            flex="1"
-            justifyContent="center"
-            height="75vh"
-            maxWidth={750}
-            maxHeight={960}
-            flexDirection="column"
-            spacing={3}
-          >
-            <ErrorBoundary>
-              <DynamicChoropleth
-                accessibility={{
-                  key: 'municipality_navigation_map',
-                  features: ['keyboard_choropleth'],
-                }}
-                map="vr"
-                data={data}
-                minHeight={650}
-                dataConfig={{
-                  metricName: 'veiligheidsregio' as any,
-                  metricProperty: 'admissions_on_date_of_admission',
-                  areaStroke: colors.white,
-                  areaStrokeWidth: 1,
-                  hoverFill: colors.white,
-                  hoverStrokeWidth: 3,
-                  noDataFillColor: colors.lightGray,
-                }}
-                dataOptions={{
-                  getLink: reverseRouter.actueel.vr,
-                }}
-                formatTooltip={(context) => (
-                  <TooltipContent
-                    title={context.featureName}
-                    link={reverseRouter.actueel.vr(context.dataItem.vrcode)}
-                  />
-                )}
-              />
-            </ErrorBoundary>
-          </Box>
-        </Box>
-      </VrLayout>
-    </Layout>
-  );
-};
-
-export default VrIndexPage;
diff --git a/packages/app/src/pages/index.tsx b/packages/app/src/pages/index.tsx
index f9d4dfda20..3d85c26946 100644
--- a/packages/app/src/pages/index.tsx
+++ b/packages/app/src/pages/index.tsx
@@ -1,67 +1,29 @@
-import {
-  colors,
-  DAY_IN_SECONDS,
-  NlHospitalNiceValue,
-  NlIntensiveCareNiceValue,
-  NlSewerValue,
-  NlVaccineCoveragePerAgeGroupEstimated,
-  TimeframeOption,
-  WEEK_IN_SECONDS,
-} from '@corona-dashboard/common';
-import {
-  Arts,
-  BarChart,
-  ChevronRight,
-  Vaccinaties,
-  Ziekenhuis,
-  Rioolvirus,
-} from '@corona-dashboard/icons';
-import { isDefined, isPresent } from 'ts-is-present';
 import { Box, Spacer } from '~/components/base';
-import { LinkWithIcon, Markdown, MaxWidth } from '~/components';
-import { CollapsibleButton } from '~/components/collapsible';
-import { DataDrivenText } from '~/components/data-driven-text';
-import { Sitemap, useDataSitemap } from '~/components/sitemap';
-import { Text } from '~/components/typography';
+import { MaxWidth } from '~/components';
 import { Layout } from '~/domain/layout';
+import { ArticleList, TopicalSectionHeader } from '~/domain/topical';
 import {
-  ArticleList,
-  HighlightsTile,
-  MiniTileSelectorItem,
-  MiniTileSelectorLayout,
-  MiniTrendTile,
-  MiniVaccinationCoverageTile,
-  TopicalSectionHeader,
-  VaccinationCoverageChoropleth,
+  Search,
+  TopicalTile,
+  TopicalHeader,
+  ThemeHeader,
+  MeasurementTile,
+  SubjectsList,
 } from '~/domain/topical';
-import { Search } from '~/domain/topical/components/search';
-import { selectVaccineCoverageData } from '~/domain/vaccine/data-selection/select-vaccine-coverage-data';
-import { useIntl } from '~/intl';
-import { getWarning } from '~/queries/get-elements-query';
-import { getTopicalPageData } from '~/queries/get-topical-page-data';
+import { isPresent } from 'ts-is-present';
 import { Languages, SiteText } from '~/locale';
 import {
   createGetStaticProps,
   StaticProps,
 } from '~/static-props/create-get-static-props';
+import { getTopicalPageData } from '~/queries/get-topical-page-data';
 import {
-  createGetChoroplethData,
   getLastGeneratedDate,
-  selectNlData,
   getLokalizeTexts,
+  selectTopicalData,
 } from '~/static-props/get-data';
-import {
-  assert,
-  countTrailingNullValues,
-  useFormatLokalizePercentage,
-  cutValuesFromTimeframe,
-  useReverseRouter,
-  getBoundaryDateStartUnix,
-  replaceComponentsInText,
-  trimNullValues,
-  replaceVariablesInText,
-} from '~/utils';
 import { useDynamicLokalizeTexts } from '~/utils/cms/use-dynamic-lokalize-texts';
+import { colors } from '@corona-dashboard/common';
 
 const selectLokalizeTexts = (siteText: SiteText) => ({
   hospitalText: siteText.pages.hospital_page.nl,
@@ -78,119 +40,19 @@ export const getStaticProps = createGetStaticProps(
   ({ locale }: { locale: keyof Languages }) =>
     getLokalizeTexts(selectLokalizeTexts, locale),
   getLastGeneratedDate,
-  createGetChoroplethData({
-    vr: ({ tested_overall, vaccine_coverage_per_age_group }) => ({
-      tested_overall,
-      vaccine_coverage_per_age_group: isDefined(vaccine_coverage_per_age_group)
-        ? selectVaccineCoverageData(vaccine_coverage_per_age_group)
-        : vaccine_coverage_per_age_group ?? null,
-    }),
-    gm: ({ tested_overall, vaccine_coverage_per_age_group }) => ({
-      tested_overall,
-      vaccine_coverage_per_age_group: isDefined(vaccine_coverage_per_age_group)
-        ? selectVaccineCoverageData(vaccine_coverage_per_age_group)
-        : vaccine_coverage_per_age_group ?? null,
-    }),
-  }),
-  getTopicalPageData('nl', [
-    'intensive_care_nice',
-    'hospital_nice',
-    'tested_overall',
-    'vaccine_administered_total',
-    'vaccine_coverage_per_age_group_estimated',
-  ]),
-  () => {
-    const { selectedNlData: data } = selectNlData(
-      'intensive_care_nice',
-      'intensive_care_lcps',
-      'hospital_nice',
-      'tested_overall',
-      'tested_ggd',
-      'hospital_lcps',
-      'difference',
-      'vaccine_administered_total',
-      'vaccine_coverage_per_age_group_estimated',
-      'booster_coverage',
-      'sewer'
-    )();
-
-    data.hospital_nice.values = cutValuesFromTimeframe(
-      data.hospital_nice.values,
-      TimeframeOption.FIVE_WEEKS
-    );
-
-    data.tested_overall.values = cutValuesFromTimeframe(
-      data.tested_overall.values,
-      TimeframeOption.FIVE_WEEKS
-    );
-
-    data.intensive_care_nice.values = cutValuesFromTimeframe(
-      data.intensive_care_nice.values,
-      TimeframeOption.FIVE_WEEKS
-    );
-
-    data.sewer.values = cutValuesFromTimeframe(
-      data.sewer.values,
-      TimeframeOption.FIVE_WEEKS
-    );
-
-    return {
-      selectedNlData: {
-        ...data,
-        hospital_nice: {
-          ...data.hospital_nice,
-          values: cutValuesFromTimeframe(
-            data.hospital_nice.values,
-            TimeframeOption.FIVE_WEEKS
-          ),
-        },
-        tested_overall: {
-          ...data.tested_overall,
-          values: cutValuesFromTimeframe(
-            data.tested_overall.values,
-            TimeframeOption.FIVE_WEEKS
-          ),
-        },
-        intensive_care_nice: {
-          ...data.intensive_care_nice,
-          values: cutValuesFromTimeframe(
-            data.intensive_care_nice.values,
-            TimeframeOption.FIVE_WEEKS
-          ),
-        },
-        sewer: {
-          ...data.sewer,
-          values: cutValuesFromTimeframe(
-            data.sewer.values,
-            TimeframeOption.FIVE_WEEKS
-          ),
-        },
-      },
-    };
-  }
+  getTopicalPageData('nl', []),
+  ({ locale }: { locale: keyof Languages }) => ({
+    selectedTopicalData: selectTopicalData(locale),
+  })
 );
 
 const Home = (props: StaticProps<typeof getStaticProps>) => {
-  const {
-    pageText,
-    selectedNlData: data,
-    choropleth,
-    content,
-    lastGenerated,
-  } = props;
-
-  const dataSewerTotal = data.sewer;
-  const dataICTotal = data.intensive_care_nice;
-  const dataHospitalIntake = data.hospital_nice;
-  const dataSitemap = useDataSitemap('nl');
+  const { pageText, content, lastGenerated, selectedTopicalData } = props;
 
-  const { commonTexts, ...formatters } = useIntl();
-  const reverseRouter = useReverseRouter();
-
-  const { hospitalText, intensiveCareText, textNl, textShared } =
-    useDynamicLokalizeTexts<LokalizeTexts>(pageText, selectLokalizeTexts);
-
-  const { formatPercentageAsNumber } = useFormatLokalizePercentage();
+  const { textNl, textShared } = useDynamicLokalizeTexts<LokalizeTexts>(
+    pageText,
+    selectLokalizeTexts
+  );
 
   const metadata = {
     ...textNl.nationaal_metadata,
@@ -198,475 +60,108 @@ const Home = (props: StaticProps<typeof getStaticProps>) => {
     description: textNl.metadata.description,
   };
 
-  const vaccineCoverageEstimatedLastValue =
-    data.vaccine_coverage_per_age_group_estimated.last_value;
-
-  const boosterCoverage18PlusValue = data.booster_coverage.values.find(
-    (v) => v.age_group === '18+'
-  );
-
-  assert(
-    boosterCoverage18PlusValue,
-    `[${Home.name}] Missing value for booster_coverage 18+`
-  );
-
-  const underReportedRangeIntensiveCare = getBoundaryDateStartUnix(
-    data.intensive_care_nice.values,
-    countTrailingNullValues(
-      data.intensive_care_nice.values,
-      'admissions_on_date_of_admission_moving_average_rounded'
-    )
-  );
-
-  const underReportedRangeHospital = getBoundaryDateStartUnix(
-    data.hospital_nice.values,
-    countTrailingNullValues(
-      data.hospital_nice.values,
-      'admissions_on_date_of_admission_moving_average_rounded'
-    )
-  );
-
-  const sevenDayAverageDatesIntensiveCare: [number, number] = [
-    underReportedRangeIntensiveCare - WEEK_IN_SECONDS,
-    underReportedRangeIntensiveCare - DAY_IN_SECONDS,
-  ];
-
-  const sevenDayAverageDatesHospital: [number, number] = [
-    underReportedRangeHospital - WEEK_IN_SECONDS,
-    underReportedRangeHospital - DAY_IN_SECONDS,
-  ];
+  const tileGridTemplate = {
+    _: `repeat(1, 1fr)`,
+    sm: `repeat(2, 1fr)`,
+    md: `repeat(3, 1fr)`,
+  };
 
   return (
     <Layout {...metadata} lastGenerated={lastGenerated}>
-      <Box bg="white">
+      <Box bg={colors.white}>
         <MaxWidth id="content">
           <Box
-            spacing={{ _: 4, md: 5 }}
+            marginBottom={{ _: 4, md: 5 }}
             pt={{ _: 3, md: 5 }}
             px={{ _: 3, sm: 4 }}
           >
-            <Box spacing={3}>
-              <TopicalSectionHeader
-                lastGenerated={Number(lastGenerated)}
-                title={replaceComponentsInText(
-                  textNl.secties.actuele_situatie.titel,
-                  {
-                    the_netherlands: textNl.the_netherlands,
-                  }
-                )}
-                headingLevel={1}
-                text={textShared}
-              />
-
-              <MiniTileSelectorLayout
-                text={textShared}
-                link={{
-                  text: textNl.quick_links.header,
-                  href: reverseRouter.nl.index(),
-                }}
-                menuItems={[
-                  {
-                    label: textNl.mini_trend_tiles.ic_opnames.menu_item_label,
-                    data: trimNullValues(
-                      dataICTotal.values,
-                      'admissions_on_date_of_admission_moving_average_rounded'
-                    ),
-                    dataProperty:
-                      'admissions_on_date_of_admission_moving_average_rounded',
-                    value:
-                      dataICTotal.last_value
-                        ?.admissions_on_date_of_admission_moving_average_rounded ??
-                      0,
-                    warning: getWarning(
-                      content.elements.warning,
-                      'intensive_care_nice'
-                    ),
-                  } as MiniTileSelectorItem<NlIntensiveCareNiceValue>,
-                  {
-                    label:
-                      textNl.mini_trend_tiles.ziekenhuis_opnames
-                        .menu_item_label,
-                    data: trimNullValues(
-                      dataHospitalIntake.values,
-                      'admissions_on_date_of_admission_moving_average_rounded'
-                    ),
-                    dataProperty:
-                      'admissions_on_date_of_admission_moving_average_rounded',
-                    value:
-                      dataHospitalIntake.last_value
-                        ?.admissions_on_date_of_admission_moving_average_rounded ??
-                      0,
-                    warning: getWarning(
-                      content.elements.warning,
-                      'hospital_nice'
-                    ),
-                  } as MiniTileSelectorItem<NlHospitalNiceValue>,
-                  {
-                    label: textNl.mini_trend_tiles.sewer.menu_item_label,
-                    data: dataSewerTotal.values.filter(
-                      (x) => typeof x.average === 'number'
-                    ),
-                    dataProperty: 'average',
-                    value: dataSewerTotal.last_value?.average ?? 0,
-                    warning: getWarning(content.elements.warning, 'sewer'),
-                  } as MiniTileSelectorItem<NlSewerValue>,
-                  {
-                    label:
-                      textNl.mini_trend_tiles.vaccinatiegraad.menu_item_label,
-                    data: data.vaccine_coverage_per_age_group_estimated.values,
-                    dataProperty: 'age_18_plus_fully_vaccinated',
-                    value:
-                      data.vaccine_coverage_per_age_group_estimated.last_value
-                        ?.age_18_plus_fully_vaccinated,
-                    valueIsPercentage: true,
-                    warning: getWarning(
-                      content.elements.warning,
-                      'vaccine_coverage_per_age_group_estimated'
-                    ),
-                    percentageBar: {
-                      value:
-                        data.vaccine_coverage_per_age_group_estimated.last_value
-                          ?.age_18_plus_fully_vaccinated,
-                    },
-                  } as MiniTileSelectorItem<NlVaccineCoveragePerAgeGroupEstimated>,
-                ].filter((x) => x !== undefined)}
-              >
-                <MiniTrendTile
-                  title={textNl.mini_trend_tiles.ic_opnames.title}
-                  text={
-                    <>
-                      <DataDrivenText
-                        data={data}
-                        content={[
-                          {
-                            type: 'metric',
-                            text: textNl.data_driven_texts.intensive_care_nice
-                              .value,
-                            metricName: 'intensive_care_nice',
-                            metricProperty:
-                              'admissions_on_date_of_admission_moving_average_rounded',
-                            differenceKey:
-                              'intensive_care_nice__admissions_on_date_of_reporting_moving_average',
-                            additionalData: {
-                              dateStart: formatters.formatDateFromSeconds(
-                                sevenDayAverageDatesIntensiveCare[0]
-                              ),
-                              dateEnd: formatters.formatDateFromSeconds(
-                                sevenDayAverageDatesIntensiveCare[1]
-                              ),
-                            },
-                          },
-                          {
-                            type: 'metric',
-                            text: textShared.secties.kpi.ic_admissions,
-                            metricName: 'intensive_care_lcps',
-                            metricProperty: 'beds_occupied_covid',
-                            differenceKey:
-                              'intensive_care_lcps__beds_occupied_covid',
-                          },
-                        ]}
-                      />
-                      <LinkWithIcon
-                        href={reverseRouter.nl.intensiveCareOpnames()}
-                        icon={<ChevronRight />}
-                        iconPlacement="right"
-                      >
-                        {textNl.mini_trend_tiles.ic_opnames.read_more_link}
-                      </LinkWithIcon>
-                    </>
-                  }
-                  icon={<Arts />}
-                  values={dataICTotal.values}
-                  seriesConfig={[
-                    {
-                      type: 'line',
-                      metricProperty:
-                        'admissions_on_date_of_admission_moving_average',
-                      label:
-                        intensiveCareText.linechart_legend_trend_label_moving_average,
-                      color: colors.data.primary,
-                    },
-                    {
-                      type: 'bar',
-                      metricProperty: 'admissions_on_date_of_admission',
-                      label: intensiveCareText.linechart_legend_trend_label,
-                      color: colors.data.primary,
-                    },
-                  ]}
-                  dataOptions={{
-                    timespanAnnotations: [
-                      {
-                        start: underReportedRangeIntensiveCare,
-                        end: Infinity,
-                        label: textShared.data_incomplete,
-                        shortLabel: commonTexts.common.incomplete,
-                        cutValuesForMetricProperties: [
-                          'admissions_on_date_of_admission_moving_average',
-                        ],
-                      },
-                    ],
-                  }}
-                  accessibility={{ key: 'topical_intensive_care_nice' }}
-                  warning={getWarning(
-                    content.elements.warning,
-                    'intensive_care_nice'
-                  )}
-                />
-                <MiniTrendTile
-                  title={textNl.mini_trend_tiles.ziekenhuis_opnames.title}
-                  text={
-                    <>
-                      <DataDrivenText
-                        data={data}
-                        content={[
-                          {
-                            type: 'metric',
-                            text: textNl.data_driven_texts
-                              .intake_hospital_ma_nieuw.value,
-                            metricName: 'hospital_nice',
-                            metricProperty:
-                              'admissions_on_date_of_admission_moving_average_rounded',
-                            differenceKey:
-                              'hospital_nice__admissions_on_date_of_reporting_moving_average',
-                            additionalData: {
-                              dateStart: formatters.formatDateFromSeconds(
-                                sevenDayAverageDatesHospital[0]
-                              ),
-                              dateEnd: formatters.formatDateFromSeconds(
-                                sevenDayAverageDatesHospital[1]
-                              ),
-                            },
-                          },
-                          {
-                            type: 'metric',
-                            text: textShared.secties.kpi.hospital_admissions,
-                            metricName: 'hospital_lcps',
-                            metricProperty: 'beds_occupied_covid',
-                            differenceKey: 'hospital_lcps__beds_occupied_covid',
-                          },
-                        ]}
+            <TopicalHeader
+              title={selectedTopicalData.title}
+              dynamicDescription={selectedTopicalData.dynamicDescription}
+            />
+          </Box>
+          <Box spacing={{ _: 5, md: 6 }} px={{ _: 3, sm: 4 }}>
+            {selectedTopicalData.themes
+              .sort((a, b) => a.index - b.index)
+              .map((theme) => {
+                return (
+                  <Box key={theme.index}>
+                    <Box marginBottom={4}>
+                      <ThemeHeader
+                        title={theme.title}
+                        dynamicSubtitle={theme.dynamicSubtitle}
+                        icon={theme.icon}
                       />
-                      <LinkWithIcon
-                        href={reverseRouter.nl.ziekenhuisopnames()}
-                        icon={<ChevronRight />}
-                        iconPlacement="right"
-                      >
-                        {
-                          textNl.mini_trend_tiles.ziekenhuis_opnames
-                            .read_more_link
-                        }
-                      </LinkWithIcon>
-                    </>
-                  }
-                  icon={<Ziekenhuis />}
-                  values={dataHospitalIntake.values}
-                  seriesConfig={[
-                    {
-                      type: 'line',
-                      metricProperty:
-                        'admissions_on_date_of_admission_moving_average',
-                      label: hospitalText.linechart_legend_titel_moving_average,
-                      color: colors.data.primary,
-                    },
-                    {
-                      type: 'bar',
-                      metricProperty: 'admissions_on_date_of_admission',
-                      label: hospitalText.linechart_legend_titel_trend_label,
-                      color: colors.data.primary,
-                    },
-                  ]}
-                  dataOptions={{
-                    timespanAnnotations: [
-                      {
-                        start: underReportedRangeHospital,
-                        end: Infinity,
-                        label: textShared.data_incomplete,
-                        shortLabel: commonTexts.common.incomplete,
-                        cutValuesForMetricProperties: [
-                          'admissions_on_date_of_admission_moving_average',
-                        ],
-                      },
-                    ],
-                  }}
-                  accessibility={{ key: 'topical_hospital_nice' }}
-                  warning={getWarning(
-                    content.elements.warning,
-                    'hospital_nice'
-                  )}
+                    </Box>
+                    <Box
+                      display="grid"
+                      gridTemplateColumns={tileGridTemplate}
+                      gridColumnGap={{ _: 4, md: 5 }}
+                      gridRowGap={{ _: 4, md: 5 }}
+                      marginBottom={{ _: 4, sm: 5 }}
+                    >
+                      {theme.themeTiles
+                        .sort((a, b) => a.index - b.index)
+                        .map((themeTile) => {
+                          return (
+                            <TopicalTile
+                              trendIcon={themeTile.trendIcon}
+                              title={themeTile.title}
+                              tileIcon={themeTile.tileIcon}
+                              dynamicDescription={themeTile.dynamicDescription}
+                              cta={themeTile.cta}
+                              key={themeTile.index}
+                            />
+                          );
+                        })}
+                    </Box>
+                    <SubjectsList moreLinks={theme.moreLinks} />
+                  </Box>
+                );
+              })}
+
+            <Box>
+              <Box marginBottom={4}>
+                <ThemeHeader
+                  title={selectedTopicalData.measures.title}
+                  dynamicSubtitle={selectedTopicalData.measures.dynamicSubtitle}
+                  icon={selectedTopicalData.measures.icon}
                 />
-                <MiniTrendTile
-                  title={textNl.mini_trend_tiles.sewer.title}
-                  text={
-                    <>
-                      <DataDrivenText
-                        data={data}
-                        content={[
-                          {
-                            type: 'metric',
-                            text: textNl.data_driven_texts.sewer_text.value,
-                            metricName: 'sewer',
-                            metricProperty: 'average',
-                            additionalData: {
-                              newDate: formatters.formatDateFromSeconds(
-                                data.sewer.last_value.date_unix
-                              ),
-                            },
-                          },
-                        ]}
+              </Box>
+              <Box
+                display="grid"
+                gridTemplateColumns={tileGridTemplate}
+                gridColumnGap={{ _: 4, md: 5 }}
+                gridRowGap={{ _: 4, md: 5 }}
+                marginBottom={5}
+              >
+                {selectedTopicalData.measures.measureTiles
+                  .sort((a, b) => a.index - b.index)
+                  .map((measureTile) => {
+                    return (
+                      <MeasurementTile
+                        icon={measureTile.icon}
+                        title={measureTile.title}
+                        key={measureTile.index}
                       />
-                      <LinkWithIcon
-                        href={reverseRouter.nl.rioolwater()}
-                        icon={<ChevronRight />}
-                        iconPlacement="right"
-                      >
-                        {textNl.mini_trend_tiles.sewer.read_more_link}
-                      </LinkWithIcon>
-                    </>
-                  }
-                  icon={<Rioolvirus />}
-                  values={dataSewerTotal.values}
-                  seriesConfig={[
-                    {
-                      type: 'area',
-                      metricProperty: 'average',
-                      label: commonTexts.common.daggemiddelde,
-                      color: colors.data.scale.blue[3],
-                    },
-                  ]}
-                  dataOptions={{
-                    valueAnnotation:
-                      commonTexts.waarde_annotaties.riool_normalized,
-                  }}
-                  accessibility={{ key: 'topical_sewer' }}
-                  warning={getWarning(content.elements.warning, 'sewer')}
-                />
-                <MiniVaccinationCoverageTile
-                  title={textNl.mini_trend_tiles.vaccinatiegraad.title}
-                  oneShotBarLabel={
-                    textNl.mini_trend_tiles.vaccinatiegraad.one_shot_bar_label
-                  }
-                  fullyVaccinatedBarLabel={
-                    textNl.mini_trend_tiles.vaccinatiegraad
-                      .fully_vaccinated_bar_label
-                  }
-                  boosterShotAdministeredBarLabel={
-                    textNl.mini_trend_tiles.vaccinatiegraad
-                      .booster_shots_administered_bar_label
-                  }
-                  icon={<Vaccinaties />}
-                  text={
-                    <>
-                      <Text variant="datadriven" as="div">
-                        <Markdown
-                          content={replaceVariablesInText(
-                            textNl.mini_trend_tiles.vaccinatiegraad.text,
-                            vaccineCoverageEstimatedLastValue as unknown as Record<
-                              string,
-                              number
-                            >,
-                            formatters
-                          )}
-                        />
-                        <Markdown
-                          content={replaceVariablesInText(
-                            textShared.booster_shots_administered_data_drive_text,
-                            {
-                              percentage: formatters.formatPercentage(
-                                boosterCoverage18PlusValue.percentage
-                              ),
-                            }
-                          )}
-                        />
-                      </Text>
-                      <LinkWithIcon
-                        href={reverseRouter.nl.vaccinaties()}
-                        icon={<ChevronRight />}
-                        iconPlacement="right"
-                      >
-                        {textNl.mini_trend_tiles.vaccinatiegraad.read_more_link}
-                      </LinkWithIcon>
-                    </>
-                  }
-                  oneShotPercentage={
-                    vaccineCoverageEstimatedLastValue.age_18_plus_has_one_shot
-                  }
-                  fullyVaccinatedPercentage={
-                    vaccineCoverageEstimatedLastValue.age_18_plus_fully_vaccinated
-                  }
-                  boosterShotAdministered={formatPercentageAsNumber(
-                    `${boosterCoverage18PlusValue.percentage}`
-                  )}
-                  warning={getWarning(
-                    content.elements.warning,
-                    'vaccine_coverage_per_age_group_estimated'
-                  )}
-                />
-              </MiniTileSelectorLayout>
+                    );
+                  })}
+              </Box>
             </Box>
+          </Box>
+        </MaxWidth>
 
-            <Box py={4}>
-              <Search title={textShared.secties.search.title.nl} />
-            </Box>
-
-            <CollapsibleButton
-              label={textShared.overview_links_header}
-              icon={<BarChart />}
-            >
-              <Sitemap
-                quickLinksHeader={textNl.quick_links.header}
-                quickLinks={[
-                  {
-                    href: reverseRouter.nl.index(),
-                    text: textNl.quick_links.links.nationaal,
-                  },
-                  {
-                    href: reverseRouter.vr.index(),
-                    text: textNl.quick_links.links.veiligheidsregio,
-                  },
-                  {
-                    href: reverseRouter.gm.index(),
-                    text: textNl.quick_links.links.gemeente,
-                  },
-                ].filter(isDefined)}
-                dataSitemapHeader={textNl.data_sitemap_titel}
-                dataSitemap={dataSitemap}
-              />
-            </CollapsibleButton>
-
-            {isPresent(content.highlights) && (
-              <HighlightsTile
-                hiddenTitle={textNl.highlighted_items.title}
-                weeklyHighlight={content.weeklyHighlight}
-                highlights={content.highlights}
-                showWeeklyHighlight={content.showWeeklyHighlight}
-                text={textShared}
-              />
-            )}
+        <Spacer mb={5} />
 
-            <VaccinationCoverageChoropleth
-              title={
-                textShared.secties.vaccination_coverage_choropleth.title.nl
-              }
-              content={
-                textShared.secties.vaccination_coverage_choropleth.content.nl
-              }
-              data={{
-                gm: choropleth.gm.vaccine_coverage_per_age_group,
-                vr: choropleth.vr.vaccine_coverage_per_age_group,
-              }}
-              link={{
-                href: reverseRouter.nl.vaccinaties(),
-                text: textShared.secties.vaccination_coverage_choropleth
-                  .link_text.nl,
-              }}
-              text={textShared}
-            />
+        <Box width="100%" backgroundColor="offWhite" py={5}>
+          <Box py={4} px={{ _: 3, sm: 4 }}>
+            <Search title={textShared.secties.search.title.nl} />
           </Box>
-        </MaxWidth>
+        </Box>
 
         <Spacer mb={5} />
 
-        <Box width="100%" backgroundColor="offWhite" pb={5}>
+        <Box width="100%" pb={5}>
           <MaxWidth
             spacing={4}
             pt={{ _: 3, md: 5 }}
diff --git a/packages/app/src/static-props/get-data.ts b/packages/app/src/static-props/get-data.ts
index 433096e9ae..559a561c7f 100644
--- a/packages/app/src/static-props/get-data.ts
+++ b/packages/app/src/static-props/get-data.ts
@@ -5,6 +5,7 @@ import {
   gmData,
   Nl,
   sortTimeSeriesInDataInPlace,
+  Topical,
   Vr,
   VrCollection,
   vrData,
@@ -26,6 +27,7 @@ import { initializeFeatureFlaggedData } from './feature-flags/initialize-feature
 import { loadJsonFromDataFile } from './utils/load-json-from-data-file';
 import { getCoveragePerAgeGroupLatestValues } from './vaccinations/get-coverage-per-age-group-latest-values';
 import { languages } from '~/locale';
+import { colors } from '@corona-dashboard/common';
 
 // This type takes an object and merges unions that sit at its keys into a single object.
 // Only has support for one level deep.
@@ -70,6 +72,10 @@ const json = {
     loadJsonFromDataFile<GmCollection>('GM_COLLECTION.json'),
     'gm_collection'
   ),
+  topical: initializeFeatureFlaggedData<Topical>(
+    loadJsonFromDataFile<Topical>('TOPICAL.json'),
+    'topical'
+  ),
 };
 
 export function getLastGeneratedDate() {
@@ -202,6 +208,76 @@ export function getNlData() {
   return { data };
 }
 
+export function getTopicalData() {
+  // clone data to prevent mutation of the original
+  const data = JSON.parse(JSON.stringify(json.topical)) as Topical;
+
+  sortTimeSeriesInDataInPlace(data, { setDatesToMiddleOfDay: true });
+
+  return { data };
+}
+
+export function selectTopicalData(locale: keyof Languages) {
+  const topicalData = getTopicalData().data;
+  const localeKey = locale === 'nl' ? 'NL' : 'EN';
+
+  return {
+    version: topicalData.version,
+    title: topicalData.title[localeKey],
+    dynamicDescription: topicalData.dynamicDescription.map(
+      (description) => {
+        return {
+          index: description.index,
+          content: description.content[localeKey] }}
+    ),
+    themes: topicalData.themes.map((theme) => ({
+      index: theme.index,
+      title: theme.title[localeKey],
+      dynamicSubtitle: theme.dynamicSubtitle[localeKey],
+      icon: theme.icon,
+      themeTiles: theme.themeTiles.map((tile) => ({
+        index: tile.index,
+        title: tile.title[localeKey],
+        dynamicDescription: tile.dynamicDescription[localeKey],
+        trendIcon: tile.trendIcon && {
+          direction: tile.trendIcon.direction,
+          color: tile.trendIcon.color === 'GREEN' ? colors.data.multiseries.turquoise : tile.trendIcon.color === 'RED' ? colors.data.gradient.red : 'currentColor'
+        },
+        tileIcon: tile.tileIcon,
+        cta: tile.cta
+          ? {
+              label: tile.cta.label[localeKey],
+              href: tile.cta.href[localeKey],
+            }
+          : null,
+      })),
+      moreLinks: {
+        label: {
+          DESKTOP: theme.moreLinks.label.DESKTOP[localeKey],
+          MOBILE: theme.moreLinks.label.MOBILE[localeKey],
+        },
+        links: theme.moreLinks.links.map((link) => ({
+          index: link.index,
+          label: link.label[localeKey],
+          href: link.href[localeKey],
+        })),
+      },
+    })),
+    measures: {
+      title: topicalData.measures.title[localeKey],
+      dynamicSubtitle: topicalData.measures.dynamicSubtitle[localeKey],
+      icon: topicalData.measures.icon,
+      measureTiles: topicalData.measures.measureTiles.map((tile) => ({
+        index: tile.index,
+        title: tile.title[localeKey],
+        icon: tile.icon,
+      })),
+    },
+  };
+}
+
+export type TopicalData = ReturnType<typeof selectTopicalData>;
+
 /**
  * This method selects the specified metric properties from the region data
  *
diff --git a/packages/cli/src/schema/schema-info.ts b/packages/cli/src/schema/schema-info.ts
index 61bbb3932d..ba08e8fad9 100644
--- a/packages/cli/src/schema/schema-info.ts
+++ b/packages/cli/src/schema/schema-info.ts
@@ -26,6 +26,10 @@ export function getSchemaInfo(
   const fileList = fs.readdirSync(jsonDirectory);
 
   return {
+    topical: {
+      files: ['TOPICAL.json'],
+      basePath: jsonDirectory,
+    },
     nl: {
       files: ['NL.json'],
       basePath: jsonDirectory,
diff --git a/packages/cms/src/components/portable-text/kpi-configuration/kpi-icon-input.tsx b/packages/cms/src/components/portable-text/kpi-configuration/kpi-icon-input.tsx
index f888fd0619..cd817ba51a 100644
--- a/packages/cms/src/components/portable-text/kpi-configuration/kpi-icon-input.tsx
+++ b/packages/cms/src/components/portable-text/kpi-configuration/kpi-icon-input.tsx
@@ -18,10 +18,15 @@ import { PatchEvent, set, unset } from 'part:@sanity/form-builder/patch-event';
 import React, { forwardRef, useCallback, useState } from 'react';
 import { isDefined } from 'ts-is-present';
 
-const filename2IconName = Object.keys(iconName2filename).reduce((aggr, key) => {
-  aggr[iconName2filename[key]] = key;
-  return aggr;
-}, {} as Record<string, string>);
+const allIconsToFilename: Record<string, string> = iconName2filename;
+
+const filename2IconName = Object.keys(allIconsToFilename).reduce(
+  (aggr, key) => {
+    aggr[allIconsToFilename[key]] = key;
+    return aggr;
+  },
+  {} as Record<string, string>
+);
 
 export type KpiIconKey = keyof typeof allIcons;
 
@@ -83,11 +88,14 @@ export const KpiIconInput = forwardRef((props: any, ref: any) => {
                     key={id}
                     direction="column"
                     align="center"
-                    onClick={() => onChangeIcon(iconName2filename[id])}
+                    onClick={() => onChangeIcon(allIconsToFilename[id])}
                     title={id}
                   >
                     <GridIcon width="35" height="35" color="black" />
-                    <Radio checked={value === iconName2filename[id]} readOnly />
+                    <Radio
+                      checked={value === allIconsToFilename[id]}
+                      readOnly
+                    />
                   </Flex>
                 ))}
 
diff --git a/packages/cms/src/lokalize/key-mutations.csv b/packages/cms/src/lokalize/key-mutations.csv
index a7c6419a8a..b27da082fb 100755
--- a/packages/cms/src/lokalize/key-mutations.csv
+++ b/packages/cms/src/lokalize/key-mutations.csv
@@ -1 +1,3 @@
 timestamp,action,key,document_id,move_to
+2022-08-22T15:52:53.607Z,add,common.nav.links.maatregelen,vLW56y4Lep4YEw1swAHFjH,__
+2022-08-23T11:59:52.631Z,move,common.nav.links.maatregelen,vLW56y4Lep4YEw1swAHFjH,common.nav.links.samenvatting
diff --git a/packages/common/src/types/data.ts b/packages/common/src/types/data.ts
index a47f20c70c..cef3a84232 100644
--- a/packages/common/src/types/data.ts
+++ b/packages/common/src/types/data.ts
@@ -1028,6 +1028,196 @@ export interface NlVariantsVariantValue {
   date_of_report_unix: number;
 }
 
+export type TopicalIcon =
+  | "AfstandSporten"
+  | "AlcoholVerkoop"
+  | "Arrow"
+  | "Arts"
+  | "Avondklok"
+  | "BarChart"
+  | "BasisregelsAfstand"
+  | "BasisregelsDrukte"
+  | "BasisregelsElleboog"
+  | "BasisregelsGeenBezoek"
+  | "BasisregelsHandenwassen"
+  | "BasisregelsMondkapje"
+  | "BasisregelsTesten"
+  | "Bevolking"
+  | "Bezoek"
+  | "Bibliotheek"
+  | "BinnenMetZitplaats"
+  | "BinnenZonderZitplaats"
+  | "Binnensporten"
+  | "Binnensportlocaties"
+  | "Boosterprik"
+  | "Calendar"
+  | "Check"
+  | "Checked"
+  | "ChevronDown"
+  | "ChevronRight"
+  | "Clock"
+  | "Close"
+  | "CloseThick"
+  | "ContactBeroepen"
+  | "Coronavirus"
+  | "Cross"
+  | "Database"
+  | "DoorstroomEvenementen"
+  | "Dot"
+  | "Down"
+  | "Download"
+  | "EenPersoonDoorgestreept"
+  | "Elderly"
+  | "Expand"
+  | "Experimenteel"
+  | "External"
+  | "Eye"
+  | "FrisseLucht"
+  | "GedeeltelijkOpenRugzak"
+  | "GeenEntertainment"
+  | "GeenMaxAantalBezoekers"
+  | "GeenWedstrijden"
+  | "Gehandicaptenzorg"
+  | "GeorganiseerdeKunstEnCultuurbeoefening"
+  | "GgdTesten"
+  | "Groepen"
+  | "HealthCare"
+  | "HomeAndVisits"
+  | "HorecaEnEvenementenBestellen"
+  | "HorecaEnEvenementenEtendrinken"
+  | "HorecaEnEvenementenEvenementen"
+  | "HorecaEvenementen"
+  | "Hospitality"
+  | "Information"
+  | "IntensiveCareOpnames"
+  | "Klachten"
+  | "Klok210001"
+  | "KunstCultuur"
+  | "KunstcultuurMusea"
+  | "Line"
+  | "Locaties"
+  | "Location"
+  | "Lopend"
+  | "Maatregelen"
+  | "MaxAantalBezoekers"
+  | "MaxVisitors"
+  | "MedischeScreening"
+  | "MeerInformatie"
+  | "MeerdaagseEvenementen"
+  | "Menu"
+  | "Mondkapje"
+  | "Nederland"
+  | "Notification"
+  | "OnderwijsEnKinderopvangNoodopvang"
+  | "OnderwijsEnKinderopvangOpAfstand"
+  | "OntmoetingenBezoek"
+  | "OpenbaarVervoer"
+  | "Openingstijden"
+  | "Other"
+  | "Overige"
+  | "Phone"
+  | "Recreatie"
+  | "Reizen"
+  | "ReproductieGraf"
+  | "Reproductiegetal"
+  | "Rioolvirus"
+  | "SearchIcon"
+  | "SearchIconBold"
+  | "SportBuiten"
+  | "SportMetZweetband"
+  | "SportWedstrijden"
+  | "Stap1HorecaMax"
+  | "Stap1HorecaPertafel"
+  | "Stap1HorecaVerplaatsen"
+  | "Stap1OnderwijsBibliotheek"
+  | "Stap1OnderwijsOpen"
+  | "Stap1Theorie"
+  | "Stap1Thuisbezoek"
+  | "Stap1Uitvaarten"
+  | "Stap1WinkelsAlleen"
+  | "Stap1WinkelsMarkten"
+  | "Stap1WinkelsOpen"
+  | "Stopwatch"
+  | "Taxi"
+  | "Testbewijs"
+  | "Toegangsbewijzen"
+  | "Travel"
+  | "Unchecked"
+  | "Up"
+  | "Vaccinaties"
+  | "Varianten"
+  | "Verpleeghuis"
+  | "VervoerEnReizenBuitenland"
+  | "VervoerEnReizenOv"
+  | "Vliegen"
+  | "Warn"
+  | "Warning"
+  | "WinkelenEnBoodschappenAlcohol"
+  | "WinkelenEnBoodschappenOpen"
+  | "Work"
+  | "Ziekenhuis"
+  | "Ziektegolf";
+
+export interface Topical {
+  version: string;
+  title: MultilanguageString;
+  dynamicDescription: TopicalDynamicDescription[];
+  themes: TopicalTheme[];
+  measures: TopicalMeasures;
+}
+export interface MultilanguageString {
+  NL: string;
+  EN: string;
+}
+export interface TopicalDynamicDescription {
+  index: number;
+  content: MultilanguageString;
+}
+export interface TopicalTheme {
+  index: number;
+  title: MultilanguageString;
+  dynamicSubtitle: MultilanguageString;
+  icon: TopicalIcon;
+  themeTiles: TopicalThemeTile[];
+  moreLinks: {
+    label: {
+      DESKTOP: MultilanguageString;
+      MOBILE: MultilanguageString;
+    };
+    links: TopicalThemeLink[];
+  };
+}
+export interface TopicalThemeTile {
+  index: number;
+  title: MultilanguageString;
+  dynamicDescription: MultilanguageString;
+  trendIcon: {
+    direction: "UP" | "DOWN";
+    color: "GREEN" | "RED";
+  } | null;
+  tileIcon: TopicalIcon;
+  cta: {
+    label: MultilanguageString;
+    href: MultilanguageString;
+  } | null;
+}
+export interface TopicalThemeLink {
+  index: number;
+  label: MultilanguageString;
+  href: MultilanguageString;
+}
+export interface TopicalMeasures {
+  title: MultilanguageString;
+  dynamicSubtitle: MultilanguageString;
+  icon: TopicalIcon;
+  measureTiles: TopicalMeasuresTile[];
+}
+export interface TopicalMeasuresTile {
+  index: number;
+  title: MultilanguageString;
+  icon: TopicalIcon;
+}
+
 export type VrCode = string;
 
 export interface Vr {
diff --git a/packages/common/src/types/feature-flags.ts b/packages/common/src/types/feature-flags.ts
index 8e3d1c984d..b6d1534a1e 100644
--- a/packages/common/src/types/feature-flags.ts
+++ b/packages/common/src/types/feature-flags.ts
@@ -39,4 +39,8 @@ export type VerboseFeature = {
   metricProperties?: string[];
 } & SimpleFeature;
 
-export type JsonDataScope = DataScopeKey | 'vr_collection' | 'gm_collection';
+export type JsonDataScope =
+  | DataScopeKey
+  | 'vr_collection'
+  | 'gm_collection'
+  | 'topical';
diff --git a/packages/icons/README.md b/packages/icons/README.md
index ab97487c2e..35430d7fb5 100644
--- a/packages/icons/README.md
+++ b/packages/icons/README.md
@@ -4,6 +4,10 @@ This package contains all of the icons used in the Corona Dashboard.
 
 We forked [react-feather](https://github.com/feathericons/react-feather) and adapted it to our needs. Carmelo Pullara and other contributors, thanks for the inspiration and open-sourcing your codebase!
 
+
+### Preview
+A complete (auto-generated) list of all the available icon names and icon preview is available here: [icons.md](./icons.md).
+
 ### Usage
 
 ```javascript
diff --git a/packages/icons/bin/generate.js b/packages/icons/bin/generate.js
index e8fa4101d0..20120b2281 100644
--- a/packages/icons/bin/generate.js
+++ b/packages/icons/bin/generate.js
@@ -84,8 +84,15 @@ const attrsToString = (attrs) => {
 
 const lookup = icons.sort().map((x) => `${pascalcase(x)}: '${x}.svg'`);
 
+/**
+ * Generate mapping Icon name -> filename
+ * Outputs icon-name2filename.ts
+ */
+const iconNames = icons.sort().map((x) => `'${pascalcase(x)}'`);
 const iconName2filename = [
-  'export const iconName2filename: Record<string, string> = {',
+  `export type IconName = ${iconNames.join(' | ')};`,
+  '',
+  'export const iconName2filename: Record<IconName, string> = {',
 ]
   .concat(lookup.join(','))
   .concat(['}', '']);
@@ -100,6 +107,37 @@ fs.writeFileSync(
   { encoding: 'utf-8' }
 );
 
+/**
+ * Generate documentation of all the icons
+ * Outputs icons.md
+ */
+const iconsMd = [
+  '### Icons',
+  'See below an overview of all the available icons in this package. This file is generated by using the `build` script.',
+  '',
+  '| Icon name | Icon',
+  '|---|---|',
+].concat(
+  lookup.map((entry) => {
+    const [iconName, fileName] = entry.split(':');
+    const path = `./src/svg/${fileName.replace(/'/g, '').trim()}`;
+    return `| ${iconName} | <div style="background-color: white;"><img src="${path}" alt="${iconName}" /></div>`;
+  })
+);
+
+fs.writeFileSync(
+  path.join(rootDir, 'icons.md'),
+  format({
+    text: iconsMd.join('\n'),
+    eslintConfig,
+    prettierOptions: {
+      ...prettierOptions,
+      parser: 'markdown',
+    },
+  }),
+  { encoding: 'utf-8' }
+);
+
 icons.forEach((i) => {
   const location = path.join(rootDir, 'src/icons', `${i}.tsx`);
   const ComponentName = pascalcase(i);
diff --git a/packages/icons/icons.md b/packages/icons/icons.md
new file mode 100644
index 0000000000..be6d36cfe7
--- /dev/null
+++ b/packages/icons/icons.md
@@ -0,0 +1,134 @@
+### Icons
+
+See below an overview of all the available icons in this package. This file is generated by using the `build` script.
+
+| Icon name                              | Icon                                                                                                                                                           |
+| -------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| AfstandSporten                         | <div style="background-color: white;"><img src="./src/svg/afstand_sporten.svg" alt="AfstandSporten" /></div>                                                   |
+| AlcoholVerkoop                         | <div style="background-color: white;"><img src="./src/svg/alcohol_verkoop.svg" alt="AlcoholVerkoop" /></div>                                                   |
+| Arrow                                  | <div style="background-color: white;"><img src="./src/svg/arrow.svg" alt="Arrow" /></div>                                                                      |
+| Arts                                   | <div style="background-color: white;"><img src="./src/svg/arts.svg" alt="Arts" /></div>                                                                        |
+| Avondklok                              | <div style="background-color: white;"><img src="./src/svg/avondklok.svg" alt="Avondklok" /></div>                                                              |
+| BarChart                               | <div style="background-color: white;"><img src="./src/svg/bar_chart.svg" alt="BarChart" /></div>                                                               |
+| BasisregelsAfstand                     | <div style="background-color: white;"><img src="./src/svg/basisregels_afstand.svg" alt="BasisregelsAfstand" /></div>                                           |
+| BasisregelsDrukte                      | <div style="background-color: white;"><img src="./src/svg/basisregels_drukte.svg" alt="BasisregelsDrukte" /></div>                                             |
+| BasisregelsElleboog                    | <div style="background-color: white;"><img src="./src/svg/basisregels_elleboog.svg" alt="BasisregelsElleboog" /></div>                                         |
+| BasisregelsGeenBezoek                  | <div style="background-color: white;"><img src="./src/svg/basisregels_geen_bezoek.svg" alt="BasisregelsGeenBezoek" /></div>                                    |
+| BasisregelsHandenwassen                | <div style="background-color: white;"><img src="./src/svg/basisregels_handenwassen.svg" alt="BasisregelsHandenwassen" /></div>                                 |
+| BasisregelsMondkapje                   | <div style="background-color: white;"><img src="./src/svg/basisregels_mondkapje.svg" alt="BasisregelsMondkapje" /></div>                                       |
+| BasisregelsTesten                      | <div style="background-color: white;"><img src="./src/svg/basisregels_testen.svg" alt="BasisregelsTesten" /></div>                                             |
+| Bevolking                              | <div style="background-color: white;"><img src="./src/svg/bevolking.svg" alt="Bevolking" /></div>                                                              |
+| Bezoek                                 | <div style="background-color: white;"><img src="./src/svg/bezoek.svg" alt="Bezoek" /></div>                                                                    |
+| Bibliotheek                            | <div style="background-color: white;"><img src="./src/svg/bibliotheek.svg" alt="Bibliotheek" /></div>                                                          |
+| BinnenMetZitplaats                     | <div style="background-color: white;"><img src="./src/svg/binnen_met_zitplaats.svg" alt="BinnenMetZitplaats" /></div>                                          |
+| BinnenZonderZitplaats                  | <div style="background-color: white;"><img src="./src/svg/binnen_zonder_zitplaats.svg" alt="BinnenZonderZitplaats" /></div>                                    |
+| Binnensporten                          | <div style="background-color: white;"><img src="./src/svg/binnensporten.svg" alt="Binnensporten" /></div>                                                      |
+| Binnensportlocaties                    | <div style="background-color: white;"><img src="./src/svg/binnensportlocaties.svg" alt="Binnensportlocaties" /></div>                                          |
+| Boosterprik                            | <div style="background-color: white;"><img src="./src/svg/boosterprik.svg" alt="Boosterprik" /></div>                                                          |
+| Calendar                               | <div style="background-color: white;"><img src="./src/svg/calendar.svg" alt="Calendar" /></div>                                                                |
+| Check                                  | <div style="background-color: white;"><img src="./src/svg/check.svg" alt="Check" /></div>                                                                      |
+| Checked                                | <div style="background-color: white;"><img src="./src/svg/checked.svg" alt="Checked" /></div>                                                                  |
+| ChevronDown                            | <div style="background-color: white;"><img src="./src/svg/chevron_down.svg" alt="ChevronDown" /></div>                                                         |
+| ChevronRight                           | <div style="background-color: white;"><img src="./src/svg/chevron_right.svg" alt="ChevronRight" /></div>                                                       |
+| Clock                                  | <div style="background-color: white;"><img src="./src/svg/clock.svg" alt="Clock" /></div>                                                                      |
+| Close                                  | <div style="background-color: white;"><img src="./src/svg/close.svg" alt="Close" /></div>                                                                      |
+| CloseThick                             | <div style="background-color: white;"><img src="./src/svg/close_thick.svg" alt="CloseThick" /></div>                                                           |
+| ContactBeroepen                        | <div style="background-color: white;"><img src="./src/svg/contact_beroepen.svg" alt="ContactBeroepen" /></div>                                                 |
+| Coronavirus                            | <div style="background-color: white;"><img src="./src/svg/coronavirus.svg" alt="Coronavirus" /></div>                                                          |
+| Cross                                  | <div style="background-color: white;"><img src="./src/svg/cross.svg" alt="Cross" /></div>                                                                      |
+| Database                               | <div style="background-color: white;"><img src="./src/svg/database.svg" alt="Database" /></div>                                                                |
+| DoorstroomEvenementen                  | <div style="background-color: white;"><img src="./src/svg/doorstroom_evenementen.svg" alt="DoorstroomEvenementen" /></div>                                     |
+| Dot                                    | <div style="background-color: white;"><img src="./src/svg/dot.svg" alt="Dot" /></div>                                                                          |
+| Down                                   | <div style="background-color: white;"><img src="./src/svg/down.svg" alt="Down" /></div>                                                                        |
+| Download                               | <div style="background-color: white;"><img src="./src/svg/download.svg" alt="Download" /></div>                                                                |
+| EenPersoonDoorgestreept                | <div style="background-color: white;"><img src="./src/svg/een_persoon_doorgestreept.svg" alt="EenPersoonDoorgestreept" /></div>                                |
+| Elderly                                | <div style="background-color: white;"><img src="./src/svg/elderly.svg" alt="Elderly" /></div>                                                                  |
+| Expand                                 | <div style="background-color: white;"><img src="./src/svg/expand.svg" alt="Expand" /></div>                                                                    |
+| Experimenteel                          | <div style="background-color: white;"><img src="./src/svg/experimenteel.svg" alt="Experimenteel" /></div>                                                      |
+| External                               | <div style="background-color: white;"><img src="./src/svg/external.svg" alt="External" /></div>                                                                |
+| Eye                                    | <div style="background-color: white;"><img src="./src/svg/eye.svg" alt="Eye" /></div>                                                                          |
+| FrisseLucht                            | <div style="background-color: white;"><img src="./src/svg/frisse_lucht.svg" alt="FrisseLucht" /></div>                                                         |
+| GedeeltelijkOpenRugzak                 | <div style="background-color: white;"><img src="./src/svg/gedeeltelijk_open_rugzak.svg" alt="GedeeltelijkOpenRugzak" /></div>                                  |
+| GeenEntertainment                      | <div style="background-color: white;"><img src="./src/svg/geen_entertainment.svg" alt="GeenEntertainment" /></div>                                             |
+| GeenMaxAantalBezoekers                 | <div style="background-color: white;"><img src="./src/svg/geen_max_aantal_bezoekers.svg" alt="GeenMaxAantalBezoekers" /></div>                                 |
+| GeenWedstrijden                        | <div style="background-color: white;"><img src="./src/svg/geen_wedstrijden.svg" alt="GeenWedstrijden" /></div>                                                 |
+| Gehandicaptenzorg                      | <div style="background-color: white;"><img src="./src/svg/gehandicaptenzorg.svg" alt="Gehandicaptenzorg" /></div>                                              |
+| GeorganiseerdeKunstEnCultuurbeoefening | <div style="background-color: white;"><img src="./src/svg/georganiseerde_kunst_en_cultuurbeoefening.svg" alt="GeorganiseerdeKunstEnCultuurbeoefening" /></div> |
+| GgdTesten                              | <div style="background-color: white;"><img src="./src/svg/ggd_testen.svg" alt="GgdTesten" /></div>                                                             |
+| Groepen                                | <div style="background-color: white;"><img src="./src/svg/groepen.svg" alt="Groepen" /></div>                                                                  |
+| HealthCare                             | <div style="background-color: white;"><img src="./src/svg/health_care.svg" alt="HealthCare" /></div>                                                           |
+| HomeAndVisits                          | <div style="background-color: white;"><img src="./src/svg/home_and_visits.svg" alt="HomeAndVisits" /></div>                                                    |
+| HorecaEnEvenementenBestellen           | <div style="background-color: white;"><img src="./src/svg/horeca_en_evenementen_bestellen.svg" alt="HorecaEnEvenementenBestellen" /></div>                     |
+| HorecaEnEvenementenEtendrinken         | <div style="background-color: white;"><img src="./src/svg/horeca_en_evenementen_etendrinken.svg" alt="HorecaEnEvenementenEtendrinken" /></div>                 |
+| HorecaEnEvenementenEvenementen         | <div style="background-color: white;"><img src="./src/svg/horeca_en_evenementen_evenementen.svg" alt="HorecaEnEvenementenEvenementen" /></div>                 |
+| HorecaEvenementen                      | <div style="background-color: white;"><img src="./src/svg/horeca_evenementen.svg" alt="HorecaEvenementen" /></div>                                             |
+| Hospitality                            | <div style="background-color: white;"><img src="./src/svg/hospitality.svg" alt="Hospitality" /></div>                                                          |
+| Information                            | <div style="background-color: white;"><img src="./src/svg/information.svg" alt="Information" /></div>                                                          |
+| IntensiveCareOpnames                   | <div style="background-color: white;"><img src="./src/svg/intensive_care_opnames.svg" alt="IntensiveCareOpnames" /></div>                                      |
+| Klachten                               | <div style="background-color: white;"><img src="./src/svg/klachten.svg" alt="Klachten" /></div>                                                                |
+| Klok210001                             | <div style="background-color: white;"><img src="./src/svg/klok_2100-01.svg" alt="Klok210001" /></div>                                                          |
+| KunstCultuur                           | <div style="background-color: white;"><img src="./src/svg/kunst_cultuur.svg" alt="KunstCultuur" /></div>                                                       |
+| KunstcultuurMusea                      | <div style="background-color: white;"><img src="./src/svg/kunstcultuur_musea.svg" alt="KunstcultuurMusea" /></div>                                             |
+| Line                                   | <div style="background-color: white;"><img src="./src/svg/line.svg" alt="Line" /></div>                                                                        |
+| Locaties                               | <div style="background-color: white;"><img src="./src/svg/locaties.svg" alt="Locaties" /></div>                                                                |
+| Location                               | <div style="background-color: white;"><img src="./src/svg/location.svg" alt="Location" /></div>                                                                |
+| Lopend                                 | <div style="background-color: white;"><img src="./src/svg/lopend.svg" alt="Lopend" /></div>                                                                    |
+| Maatregelen                            | <div style="background-color: white;"><img src="./src/svg/maatregelen.svg" alt="Maatregelen" /></div>                                                          |
+| MaxAantalBezoekers                     | <div style="background-color: white;"><img src="./src/svg/max_aantal_bezoekers.svg" alt="MaxAantalBezoekers" /></div>                                          |
+| MaxVisitors                            | <div style="background-color: white;"><img src="./src/svg/max_visitors.svg" alt="MaxVisitors" /></div>                                                         |
+| MedischeScreening                      | <div style="background-color: white;"><img src="./src/svg/medische_screening.svg" alt="MedischeScreening" /></div>                                             |
+| MeerInformatie                         | <div style="background-color: white;"><img src="./src/svg/meer_informatie.svg" alt="MeerInformatie" /></div>                                                   |
+| MeerdaagseEvenementen                  | <div style="background-color: white;"><img src="./src/svg/meerdaagse_evenementen.svg" alt="MeerdaagseEvenementen" /></div>                                     |
+| Menu                                   | <div style="background-color: white;"><img src="./src/svg/menu.svg" alt="Menu" /></div>                                                                        |
+| Mondkapje                              | <div style="background-color: white;"><img src="./src/svg/mondkapje.svg" alt="Mondkapje" /></div>                                                              |
+| Nederland                              | <div style="background-color: white;"><img src="./src/svg/nederland.svg" alt="Nederland" /></div>                                                              |
+| Notification                           | <div style="background-color: white;"><img src="./src/svg/notification.svg" alt="Notification" /></div>                                                        |
+| OnderwijsEnKinderopvangNoodopvang      | <div style="background-color: white;"><img src="./src/svg/onderwijs_en_kinderopvang_noodopvang.svg" alt="OnderwijsEnKinderopvangNoodopvang" /></div>           |
+| OnderwijsEnKinderopvangOpAfstand       | <div style="background-color: white;"><img src="./src/svg/onderwijs_en_kinderopvang_op_afstand.svg" alt="OnderwijsEnKinderopvangOpAfstand" /></div>            |
+| OntmoetingenBezoek                     | <div style="background-color: white;"><img src="./src/svg/ontmoetingen_bezoek.svg" alt="OntmoetingenBezoek" /></div>                                           |
+| OpenbaarVervoer                        | <div style="background-color: white;"><img src="./src/svg/openbaar_vervoer.svg" alt="OpenbaarVervoer" /></div>                                                 |
+| Openingstijden                         | <div style="background-color: white;"><img src="./src/svg/openingstijden.svg" alt="Openingstijden" /></div>                                                    |
+| Other                                  | <div style="background-color: white;"><img src="./src/svg/other.svg" alt="Other" /></div>                                                                      |
+| Overige                                | <div style="background-color: white;"><img src="./src/svg/overige.svg" alt="Overige" /></div>                                                                  |
+| Phone                                  | <div style="background-color: white;"><img src="./src/svg/phone.svg" alt="Phone" /></div>                                                                      |
+| Recreatie                              | <div style="background-color: white;"><img src="./src/svg/recreatie.svg" alt="Recreatie" /></div>                                                              |
+| Reizen                                 | <div style="background-color: white;"><img src="./src/svg/reizen.svg" alt="Reizen" /></div>                                                                    |
+| ReproductieGraf                        | <div style="background-color: white;"><img src="./src/svg/reproductie_graf.svg" alt="ReproductieGraf" /></div>                                                 |
+| Reproductiegetal                       | <div style="background-color: white;"><img src="./src/svg/reproductiegetal.svg" alt="Reproductiegetal" /></div>                                                |
+| Rioolvirus                             | <div style="background-color: white;"><img src="./src/svg/rioolvirus.svg" alt="Rioolvirus" /></div>                                                            |
+| SearchIcon                             | <div style="background-color: white;"><img src="./src/svg/search-icon.svg" alt="SearchIcon" /></div>                                                           |
+| SearchIconBold                         | <div style="background-color: white;"><img src="./src/svg/search_icon_bold.svg" alt="SearchIconBold" /></div>                                                  |
+| SportBuiten                            | <div style="background-color: white;"><img src="./src/svg/sport_buiten.svg" alt="SportBuiten" /></div>                                                         |
+| SportMetZweetband                      | <div style="background-color: white;"><img src="./src/svg/sport_met_zweetband.svg" alt="SportMetZweetband" /></div>                                            |
+| SportWedstrijden                       | <div style="background-color: white;"><img src="./src/svg/sport_wedstrijden.svg" alt="SportWedstrijden" /></div>                                               |
+| Stap1HorecaMax                         | <div style="background-color: white;"><img src="./src/svg/stap_1_horeca_max.svg" alt="Stap1HorecaMax" /></div>                                                 |
+| Stap1HorecaPertafel                    | <div style="background-color: white;"><img src="./src/svg/stap_1_horeca_pertafel.svg" alt="Stap1HorecaPertafel" /></div>                                       |
+| Stap1HorecaVerplaatsen                 | <div style="background-color: white;"><img src="./src/svg/stap_1_horeca_verplaatsen.svg" alt="Stap1HorecaVerplaatsen" /></div>                                 |
+| Stap1OnderwijsBibliotheek              | <div style="background-color: white;"><img src="./src/svg/stap_1_onderwijs_bibliotheek.svg" alt="Stap1OnderwijsBibliotheek" /></div>                           |
+| Stap1OnderwijsOpen                     | <div style="background-color: white;"><img src="./src/svg/stap_1_onderwijs_open.svg" alt="Stap1OnderwijsOpen" /></div>                                         |
+| Stap1Theorie                           | <div style="background-color: white;"><img src="./src/svg/stap_1_theorie.svg" alt="Stap1Theorie" /></div>                                                      |
+| Stap1Thuisbezoek                       | <div style="background-color: white;"><img src="./src/svg/stap_1_thuisbezoek.svg" alt="Stap1Thuisbezoek" /></div>                                              |
+| Stap1Uitvaarten                        | <div style="background-color: white;"><img src="./src/svg/stap_1_uitvaarten.svg" alt="Stap1Uitvaarten" /></div>                                                |
+| Stap1WinkelsAlleen                     | <div style="background-color: white;"><img src="./src/svg/stap_1_winkels_alleen.svg" alt="Stap1WinkelsAlleen" /></div>                                         |
+| Stap1WinkelsMarkten                    | <div style="background-color: white;"><img src="./src/svg/stap_1_winkels_markten.svg" alt="Stap1WinkelsMarkten" /></div>                                       |
+| Stap1WinkelsOpen                       | <div style="background-color: white;"><img src="./src/svg/stap_1_winkels_open.svg" alt="Stap1WinkelsOpen" /></div>                                             |
+| Stopwatch                              | <div style="background-color: white;"><img src="./src/svg/stopwatch.svg" alt="Stopwatch" /></div>                                                              |
+| Taxi                                   | <div style="background-color: white;"><img src="./src/svg/taxi.svg" alt="Taxi" /></div>                                                                        |
+| Testbewijs                             | <div style="background-color: white;"><img src="./src/svg/testbewijs.svg" alt="Testbewijs" /></div>                                                            |
+| Toegangsbewijzen                       | <div style="background-color: white;"><img src="./src/svg/toegangsbewijzen.svg" alt="Toegangsbewijzen" /></div>                                                |
+| Travel                                 | <div style="background-color: white;"><img src="./src/svg/travel.svg" alt="Travel" /></div>                                                                    |
+| Unchecked                              | <div style="background-color: white;"><img src="./src/svg/unchecked.svg" alt="Unchecked" /></div>                                                              |
+| Up                                     | <div style="background-color: white;"><img src="./src/svg/up.svg" alt="Up" /></div>                                                                            |
+| Vaccinaties                            | <div style="background-color: white;"><img src="./src/svg/vaccinaties.svg" alt="Vaccinaties" /></div>                                                          |
+| Varianten                              | <div style="background-color: white;"><img src="./src/svg/varianten.svg" alt="Varianten" /></div>                                                              |
+| Verpleeghuis                           | <div style="background-color: white;"><img src="./src/svg/verpleeghuis.svg" alt="Verpleeghuis" /></div>                                                        |
+| VervoerEnReizenBuitenland              | <div style="background-color: white;"><img src="./src/svg/vervoer_en_reizen_buitenland.svg" alt="VervoerEnReizenBuitenland" /></div>                           |
+| VervoerEnReizenOv                      | <div style="background-color: white;"><img src="./src/svg/vervoer_en_reizen_ov.svg" alt="VervoerEnReizenOv" /></div>                                           |
+| Vliegen                                | <div style="background-color: white;"><img src="./src/svg/vliegen.svg" alt="Vliegen" /></div>                                                                  |
+| Warn                                   | <div style="background-color: white;"><img src="./src/svg/warn.svg" alt="Warn" /></div>                                                                        |
+| Warning                                | <div style="background-color: white;"><img src="./src/svg/warning.svg" alt="Warning" /></div>                                                                  |
+| WinkelenEnBoodschappenAlcohol          | <div style="background-color: white;"><img src="./src/svg/winkelen_en_boodschappen_alcohol.svg" alt="WinkelenEnBoodschappenAlcohol" /></div>                   |
+| WinkelenEnBoodschappenOpen             | <div style="background-color: white;"><img src="./src/svg/winkelen_en_boodschappen_open.svg" alt="WinkelenEnBoodschappenOpen" /></div>                         |
+| Work                                   | <div style="background-color: white;"><img src="./src/svg/work.svg" alt="Work" /></div>                                                                        |
+| Ziekenhuis                             | <div style="background-color: white;"><img src="./src/svg/ziekenhuis.svg" alt="Ziekenhuis" /></div>                                                            |
+| Ziektegolf                             | <div style="background-color: white;"><img src="./src/svg/ziektegolf.svg" alt="Ziektegolf" /></div>                                                            |
diff --git a/packages/icons/src/icon-name2filename.ts b/packages/icons/src/icon-name2filename.ts
index 890bf4c840..2e253f6752 100644
--- a/packages/icons/src/icon-name2filename.ts
+++ b/packages/icons/src/icon-name2filename.ts
@@ -1,4 +1,134 @@
-export const iconName2filename: Record<string, string> = {
+export type IconName =
+  | 'AfstandSporten'
+  | 'AlcoholVerkoop'
+  | 'Arrow'
+  | 'Arts'
+  | 'Avondklok'
+  | 'BarChart'
+  | 'BasisregelsAfstand'
+  | 'BasisregelsDrukte'
+  | 'BasisregelsElleboog'
+  | 'BasisregelsGeenBezoek'
+  | 'BasisregelsHandenwassen'
+  | 'BasisregelsMondkapje'
+  | 'BasisregelsTesten'
+  | 'Bevolking'
+  | 'Bezoek'
+  | 'Bibliotheek'
+  | 'BinnenMetZitplaats'
+  | 'BinnenZonderZitplaats'
+  | 'Binnensporten'
+  | 'Binnensportlocaties'
+  | 'Boosterprik'
+  | 'Calendar'
+  | 'Check'
+  | 'Checked'
+  | 'ChevronDown'
+  | 'ChevronRight'
+  | 'Clock'
+  | 'Close'
+  | 'CloseThick'
+  | 'ContactBeroepen'
+  | 'Coronavirus'
+  | 'Cross'
+  | 'Database'
+  | 'DoorstroomEvenementen'
+  | 'Dot'
+  | 'Down'
+  | 'Download'
+  | 'EenPersoonDoorgestreept'
+  | 'Elderly'
+  | 'Expand'
+  | 'Experimenteel'
+  | 'External'
+  | 'Eye'
+  | 'FrisseLucht'
+  | 'GedeeltelijkOpenRugzak'
+  | 'GeenEntertainment'
+  | 'GeenMaxAantalBezoekers'
+  | 'GeenWedstrijden'
+  | 'Gehandicaptenzorg'
+  | 'GeorganiseerdeKunstEnCultuurbeoefening'
+  | 'GgdTesten'
+  | 'Groepen'
+  | 'HealthCare'
+  | 'HomeAndVisits'
+  | 'HorecaEnEvenementenBestellen'
+  | 'HorecaEnEvenementenEtendrinken'
+  | 'HorecaEnEvenementenEvenementen'
+  | 'HorecaEvenementen'
+  | 'Hospitality'
+  | 'Information'
+  | 'IntensiveCareOpnames'
+  | 'Klachten'
+  | 'Klok210001'
+  | 'KunstCultuur'
+  | 'KunstcultuurMusea'
+  | 'Line'
+  | 'Locaties'
+  | 'Location'
+  | 'Lopend'
+  | 'Maatregelen'
+  | 'MaxAantalBezoekers'
+  | 'MaxVisitors'
+  | 'MedischeScreening'
+  | 'MeerInformatie'
+  | 'MeerdaagseEvenementen'
+  | 'Menu'
+  | 'Mondkapje'
+  | 'Nederland'
+  | 'Notification'
+  | 'OnderwijsEnKinderopvangNoodopvang'
+  | 'OnderwijsEnKinderopvangOpAfstand'
+  | 'OntmoetingenBezoek'
+  | 'OpenbaarVervoer'
+  | 'Openingstijden'
+  | 'Other'
+  | 'Overige'
+  | 'Phone'
+  | 'Recreatie'
+  | 'Reizen'
+  | 'ReproductieGraf'
+  | 'Reproductiegetal'
+  | 'Rioolvirus'
+  | 'SearchIcon'
+  | 'SearchIconBold'
+  | 'SportBuiten'
+  | 'SportMetZweetband'
+  | 'SportWedstrijden'
+  | 'Stap1HorecaMax'
+  | 'Stap1HorecaPertafel'
+  | 'Stap1HorecaVerplaatsen'
+  | 'Stap1OnderwijsBibliotheek'
+  | 'Stap1OnderwijsOpen'
+  | 'Stap1Theorie'
+  | 'Stap1Thuisbezoek'
+  | 'Stap1Uitvaarten'
+  | 'Stap1WinkelsAlleen'
+  | 'Stap1WinkelsMarkten'
+  | 'Stap1WinkelsOpen'
+  | 'Stopwatch'
+  | 'Taxi'
+  | 'Testbewijs'
+  | 'Toegangsbewijzen'
+  | 'Travel'
+  | 'Unchecked'
+  | 'Up'
+  | 'Vaccinaties'
+  | 'Varianten'
+  | 'Verpleeghuis'
+  | 'VervoerEnReizenBuitenland'
+  | 'VervoerEnReizenOv'
+  | 'Vliegen'
+  | 'Warn'
+  | 'Warning'
+  | 'WinkelenEnBoodschappenAlcohol'
+  | 'WinkelenEnBoodschappenOpen'
+  | 'Work'
+  | 'Ziekenhuis'
+  | 'Ziektegolf';
+
+export const iconName2filename: Record<IconName, string> = {
   AfstandSporten: 'afstand_sporten.svg',
   AlcoholVerkoop: 'alcohol_verkoop.svg',
   Arrow: 'arrow.svg',
@@ -41,6 +171,7 @@ export const iconName2filename: Record<string, string> = {
   Expand: 'expand.svg',
   Experimenteel: 'experimenteel.svg',
   External: 'external.svg',
+  Eye: 'eye.svg',
   FrisseLucht: 'frisse_lucht.svg',
   GedeeltelijkOpenRugzak: 'gedeeltelijk_open_rugzak.svg',
   GeenEntertainment: 'geen_entertainment.svg',
@@ -59,6 +190,7 @@ export const iconName2filename: Record<string, string> = {
   HorecaEvenementen: 'horeca_evenementen.svg',
   Hospitality: 'hospitality.svg',
   Information: 'information.svg',
+  IntensiveCareOpnames: 'intensive_care_opnames.svg',
   Klachten: 'klachten.svg',
   Klok210001: 'klok_2100-01.svg',
   KunstCultuur: 'kunst_cultuur.svg',
diff --git a/packages/icons/src/svg/afstand_sporten.svg b/packages/icons/src/svg/afstand_sporten.svg
index b6a824c1b9..e594b4d6d6 100644
--- a/packages/icons/src/svg/afstand_sporten.svg
+++ b/packages/icons/src/svg/afstand_sporten.svg
@@ -1 +1 @@
-<svg id="afstand_sporten" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><path d="M35.24,6.14l.09.05.06,0,.2,0a.73.73,0,0,0,.36,0l.15,0a.69.69,0,0,0,.19-.1l.08-.06a.87.87,0,0,0,.17-.21l0-.07s0-.08,0-.13l0-.14c.13-.61,0-1-.64-1.14a.78.78,0,0,0-.37,0,1,1,0,0,0-.35.15A.84.84,0,0,0,35,4.8l0,0a1.34,1.34,0,0,0-.07.18s0,.08,0,.13a.87.87,0,0,0-.05.36.8.8,0,0,0,.11.35A.84.84,0,0,0,35.24,6.14Z"/><path d="M40.51,12.72a1.66,1.66,0,0,0,.48.51,1.48,1.48,0,0,0,.64.25,1.61,1.61,0,0,0,.69,0,1.51,1.51,0,0,0,.64-.27,1.6,1.6,0,0,0,.47-.5,1.66,1.66,0,0,0,.15-.33l.06-.21v-.11a1.67,1.67,0,0,0,.12-.7,1.73,1.73,0,0,0-.2-.68,1.62,1.62,0,0,0-.48-.53,1.59,1.59,0,0,0-.66-.27l-.11,0h-.09a1.46,1.46,0,0,0-.51,0l-.25.07a1.53,1.53,0,0,0-.4.21,1.71,1.71,0,0,0-.47.53,1.55,1.55,0,0,0-.21.67,1.89,1.89,0,0,0-.09.34s0,.09,0,.14a1.48,1.48,0,0,0,0,.21A1.59,1.59,0,0,0,40.51,12.72Z"/><path d="M21.92,21.08l.07.09.06,0a1,1,0,0,0,.18.18,1.83,1.83,0,0,0,.31.24,2.7,2.7,0,0,0,1.14.41,3.19,3.19,0,0,0,2.16-.59A3.16,3.16,0,0,0,25,15.92a3.4,3.4,0,0,0-.57-.08,2.68,2.68,0,0,0-.63.05,2.82,2.82,0,0,0-1.91,1.37,2.67,2.67,0,0,0-.36,1.16,2.66,2.66,0,0,0,.17,2.35A3.46,3.46,0,0,0,21.92,21.08Z"/><path d="M34.42,31l-1.26-.13a38.24,38.24,0,0,1-4-.48,18.32,18.32,0,0,1-2.28-3.61,5.27,5.27,0,0,0-2-2.82,5.44,5.44,0,0,0-2.59-1L22,23h-.44A13.78,13.78,0,0,0,14,24.7,17,17,0,0,0,11.37,29,2.67,2.67,0,0,0,12,32.16a24.48,24.48,0,0,1,3.77-5.31,8.9,8.9,0,0,1,3.13-.74c-.72,2.78-1.35,6.68-1.54,8-.37,2.46,1,3.28,2.6,4.23l.37.22h-.21l-2-.32c-.5,1.12-1.64,3.61-2.25,4.62a31,31,0,0,1-5.07-.93,2.26,2.26,0,0,0-.45,0,2.42,2.42,0,0,0-.47.06,2.49,2.49,0,0,0-.87.37A2.66,2.66,0,0,0,8,43.77a30.13,30.13,0,0,0,4.13,1.44,30.56,30.56,0,0,0,4.46.87,2.29,2.29,0,0,0,1-.19A4.32,4.32,0,0,0,19,44.36c.87-1.22,2.2-3.45,3-4.78l.52.26c.87.42,1.92.95,2.66,1.39.06.41.11.83.17,1.25l.06.51.06.51c0,.33.07.66.1,1,.13,1.39.22,2.77.27,4.16A3.58,3.58,0,0,0,26.41,50a3.39,3.39,0,0,0,.41.51,3.69,3.69,0,0,0,1.84,1l0-.33v-.11l0-.33.07-1.13,0-.71c0-.58.07-1.15.09-1.74S29,46,29,45.31V41.39a5.41,5.41,0,0,0-.4-2.18c-.29-.64-1-1.35-5-4.24.4-2,.95-4.3,1.4-6.18a9.91,9.91,0,0,0,3,3.79,11.85,11.85,0,0,0,4.14.32,2.91,2.91,0,0,0,.82-.21,2.69,2.69,0,0,0,1.51-1.81Z"/><polygon points="47.9 18.68 47.87 18.76 47.92 18.76 47.9 18.68"/><path d="M44.82,18.39a11,11,0,0,1-1.33-2.1,2.88,2.88,0,0,0-.57-1.08,3.11,3.11,0,0,0-2.56-1.14,7.74,7.74,0,0,0-3.1.42v-2.1a1.83,1.83,0,0,0,0-.66c0-.1-.1-.22-.4-.46s-.61-.46-1.17-.86c.08-.35.17-.74.26-1.11L36,9l.1-.45c.19.34.56,1,.93,1.16a3.07,3.07,0,0,0,1.28,0,.72.72,0,0,0,.46-.18.73.73,0,0,0,.25-.43l-.08,0a5.26,5.26,0,0,1-1.64-.19,5.1,5.1,0,0,1-.69-1.14A1.63,1.63,0,0,0,35,6.59a4.57,4.57,0,0,0-1,0,4.2,4.2,0,0,0-1.33.5,4.92,4.92,0,0,0-.82,1.3.72.72,0,0,0-.09.2.77.77,0,0,0,0,.15,1.09,1.09,0,0,0,0,.18.85.85,0,0,0,.28.46A7.37,7.37,0,0,1,33.2,7.78a3,3,0,0,1,.48-.16l.21,0,.29,0c-.2.82-.36,1.66-.48,2.5s.38,1,.93,1.37H34l-.14.31-.1.2c-.16.34-.36.72-.47.93a10.36,10.36,0,0,1-1.57-.3.94.94,0,0,0-.87.59,9,9,0,0,0,2.65.71c.34,0,.48-.15.77-.53l.93-1.48a8.5,8.5,0,0,1,1,.53,22,22,0,0,1,.21,2.28,1.16,1.16,0,0,0,0,.18l-.46.24a11,11,0,0,0-1.6,2.5,1.48,1.48,0,0,0-.12.29,1.39,1.39,0,0,0,0,.7,1.18,1.18,0,0,0,.12.36,1.31,1.31,0,0,0,.41.5,13.43,13.43,0,0,1,2.2-3.1c.18-.08.36-.14.54-.2a5.33,5.33,0,0,1,.66-.17l.22,0,.41-.05c-.25,1-.48,2.17-.65,3.14l-.15.93-.1.6c-.22,1.51.71,2,1.75,2.65h-.14L38.35,23c-.23.53-.48,1.05-.74,1.56s-.38.74-.59,1.1a19.55,19.55,0,0,1-2.94-.56,1.51,1.51,0,0,0-1.7,1.09c.44.19.89.36,1.34.52l.87.27a18,18,0,0,0,2.8.56c.69,0,1-.29,1.46-1l.12-.17.14-.21.36-.56c.25-.39.5-.81.73-1.19l.4-.65c.53.26,1.33.66,1.86,1,.11.78.21,1.56.27,2.34l0,.34,0,.4c0,.42.05.83.07,1.24a2,2,0,0,0,.56,1.1,2,2,0,0,0,.35.3,2.13,2.13,0,0,0,.73.3c0-.82,0-1.47.1-2.15,0-.47.06-1,.09-1.51V24.81a3.41,3.41,0,0,0-.24-1.27,1,1,0,0,0-.11-.2,3,3,0,0,0-.37-.4,28.7,28.7,0,0,0-2.44-1.87c.08-.41.18-.86.28-1.31.18-.84.37-1.68.54-2.3a6.35,6.35,0,0,0,.84,1.33l.12.13.27.29.18.16c.11.1.22.2.34.29a6.81,6.81,0,0,0,2.42.19,1.58,1.58,0,0,0,.87-.37,1.5,1.5,0,0,0,.48-.72c-.45,0-.91-.07-1.36-.12S45.38,18.49,44.82,18.39Z"/><path d="M36.78,41a2.34,2.34,0,1,0,2.33,2.34A2.33,2.33,0,0,0,36.78,41Z"/></svg>
\ No newline at end of file
+<svg id="afstand_sporten" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><path d="M35.24,6.14l.09.05.06,0,.2,0a.73.73,0,0,0,.36,0l.15,0a.69.69,0,0,0,.19-.1l.08-.06a.87.87,0,0,0,.17-.21l0-.07s0-.08,0-.13l0-.14c.13-.61,0-1-.64-1.14a.78.78,0,0,0-.37,0,1,1,0,0,0-.35.15A.84.84,0,0,0,35,4.8l0,0a1.34,1.34,0,0,0-.07.18s0,.08,0,.13a.87.87,0,0,0-.05.36.8.8,0,0,0,.11.35A.84.84,0,0,0,35.24,6.14Z"/><path d="M40.51,12.72a1.66,1.66,0,0,0,.48.51,1.48,1.48,0,0,0,.64.25,1.61,1.61,0,0,0,.69,0,1.51,1.51,0,0,0,.64-.27,1.6,1.6,0,0,0,.47-.5,1.66,1.66,0,0,0,.15-.33l.06-.21v-.11a1.67,1.67,0,0,0,.12-.7,1.73,1.73,0,0,0-.2-.68,1.62,1.62,0,0,0-.48-.53,1.59,1.59,0,0,0-.66-.27l-.11,0h-.09a1.46,1.46,0,0,0-.51,0l-.25.07a1.53,1.53,0,0,0-.4.21,1.71,1.71,0,0,0-.47.53,1.55,1.55,0,0,0-.21.67,1.89,1.89,0,0,0-.09.34s0,.09,0,.14a1.48,1.48,0,0,0,0,.21A1.59,1.59,0,0,0,40.51,12.72Z"/><path d="M21.92,21.08l.07.09.06,0a1,1,0,0,0,.18.18,1.83,1.83,0,0,0,.31.24,2.7,2.7,0,0,0,1.14.41,3.19,3.19,0,0,0,2.16-.59A3.16,3.16,0,0,0,25,15.92a3.4,3.4,0,0,0-.57-.08,2.68,2.68,0,0,0-.63.05,2.82,2.82,0,0,0-1.91,1.37,2.67,2.67,0,0,0-.36,1.16,2.66,2.66,0,0,0,.17,2.35A3.46,3.46,0,0,0,21.92,21.08Z"/><path d="M34.42,31l-1.26-.13a38.24,38.24,0,0,1-4-.48,18.32,18.32,0,0,1-2.28-3.61,5.27,5.27,0,0,0-2-2.82,5.44,5.44,0,0,0-2.59-1L22,23h-.44A13.78,13.78,0,0,0,14,24.7,17,17,0,0,0,11.37,29,2.67,2.67,0,0,0,12,32.16a24.48,24.48,0,0,1,3.77-5.31,8.9,8.9,0,0,1,3.13-.74c-.72,2.78-1.35,6.68-1.54,8-.37,2.46,1,3.28,2.6,4.23l.37.22h-.21l-2-.32c-.5,1.12-1.64,3.61-2.25,4.62a31,31,0,0,1-5.07-.93,2.26,2.26,0,0,0-.45,0,2.42,2.42,0,0,0-.47.06,2.49,2.49,0,0,0-.87.37A2.66,2.66,0,0,0,8,43.77a30.13,30.13,0,0,0,4.13,1.44,30.56,30.56,0,0,0,4.46.87,2.29,2.29,0,0,0,1-.19A4.32,4.32,0,0,0,19,44.36c.87-1.22,2.2-3.45,3-4.78l.52.26c.87.42,1.92.95,2.66,1.39.06.41.11.83.17,1.25l.06.51.06.51c0,.33.07.66.1,1,.13,1.39.22,2.77.27,4.16A3.58,3.58,0,0,0,26.41,50a3.39,3.39,0,0,0,.41.51,3.69,3.69,0,0,0,1.84,1l0-.33v-.11l0-.33.07-1.13,0-.71c0-.58.07-1.15.09-1.74S29,46,29,45.31V41.39a5.41,5.41,0,0,0-.4-2.18c-.29-.64-1-1.35-5-4.24.4-2,.95-4.3,1.4-6.18a9.91,9.91,0,0,0,3,3.79,11.85,11.85,0,0,0,4.14.32,2.91,2.91,0,0,0,.82-.21,2.69,2.69,0,0,0,1.51-1.81Z"/><polygon points="47.9 18.68 47.87 18.76 47.92 18.76 47.9 18.68"/><path d="M44.82,18.39a11,11,0,0,1-1.33-2.1,2.88,2.88,0,0,0-.57-1.08,3.11,3.11,0,0,0-2.56-1.14,7.74,7.74,0,0,0-3.1.42v-2.1a1.83,1.83,0,0,0,0-.66c0-.1-.1-.22-.4-.46s-.61-.46-1.17-.86c.08-.35.17-.74.26-1.11L36,9l.1-.45c.19.34.56,1,.93,1.16a3.07,3.07,0,0,0,1.28,0,.72.72,0,0,0,.46-.18.73.73,0,0,0,.25-.43l-.08,0a5.26,5.26,0,0,1-1.64-.19,5.1,5.1,0,0,1-.69-1.14A1.63,1.63,0,0,0,35,6.59a4.57,4.57,0,0,0-1,0,4.2,4.2,0,0,0-1.33.5,4.92,4.92,0,0,0-.82,1.3.72.72,0,0,0-.09.2.77.77,0,0,0,0,.15,1.09,1.09,0,0,0,0,.18.85.85,0,0,0,.28.46A7.37,7.37,0,0,1,33.2,7.78a3,3,0,0,1,.48-.16l.21,0,.29,0c-.2.82-.36,1.66-.48,2.5s.38,1,.93,1.37H34l-.14.31-.1.2c-.16.34-.36.72-.47.93a10.36,10.36,0,0,1-1.57-.3.94.94,0,0,0-.87.59,9,9,0,0,0,2.65.71c.34,0,.48-.15.77-.53l.93-1.48a8.5,8.5,0,0,1,1,.53,22,22,0,0,1,.21,2.28,1.16,1.16,0,0,0,0,.18l-.46.24a11,11,0,0,0-1.6,2.5,1.48,1.48,0,0,0-.12.29,1.39,1.39,0,0,0,0,.7,1.18,1.18,0,0,0,.12.36,1.31,1.31,0,0,0,.41.5,13.43,13.43,0,0,1,2.2-3.1c.18-.08.36-.14.54-.2a5.33,5.33,0,0,1,.66-.17l.22,0,.41-.05c-.25,1-.48,2.17-.65,3.14l-.15.93-.1.6c-.22,1.51.71,2,1.75,2.65h-.14L38.35,23c-.23.53-.48,1.05-.74,1.56s-.38.74-.59,1.1a19.55,19.55,0,0,1-2.94-.56,1.51,1.51,0,0,0-1.7,1.09c.44.19.89.36,1.34.52l.87.27a18,18,0,0,0,2.8.56c.69,0,1-.29,1.46-1l.12-.17.14-.21.36-.56c.25-.39.5-.81.73-1.19l.4-.65c.53.26,1.33.66,1.86,1,.11.78.21,1.56.27,2.34l0,.34,0,.4c0,.42.05.83.07,1.24a2,2,0,0,0,.56,1.1,2,2,0,0,0,.35.3,2.13,2.13,0,0,0,.73.3c0-.82,0-1.47.1-2.15,0-.47.06-1,.09-1.51V24.81a3.41,3.41,0,0,0-.24-1.27,1,1,0,0,0-.11-.2,3,3,0,0,0-.37-.4,28.7,28.7,0,0,0-2.44-1.87c.08-.41.18-.86.28-1.31.18-.84.37-1.68.54-2.3a6.35,6.35,0,0,0,.84,1.33l.12.13.27.29.18.16c.11.1.22.2.34.29a6.81,6.81,0,0,0,2.42.19,1.58,1.58,0,0,0,.87-.37,1.5,1.5,0,0,0,.48-.72c-.45,0-.91-.07-1.36-.12S45.38,18.49,44.82,18.39Z"/><path d="M36.78,41a2.34,2.34,0,1,0,2.33,2.34A2.33,2.33,0,0,0,36.78,41Z"/></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/alcohol_verkoop.svg b/packages/icons/src/svg/alcohol_verkoop.svg
index 6a4e4accde..16bf4dedf3 100644
--- a/packages/icons/src/svg/alcohol_verkoop.svg
+++ b/packages/icons/src/svg/alcohol_verkoop.svg
@@ -1 +1 @@
-<svg id="alcohol_verkoop" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><path d="M40.64,25.18A31.36,31.36,0,0,0,39,6.31a1.72,1.72,0,0,0-.52-.7,1.77,1.77,0,0,0-.79-.35,50.47,50.47,0,0,0-18.34,0,1.77,1.77,0,0,0-.79.35,1.81,1.81,0,0,0-.52.7,31.67,31.67,0,0,0-1.64,18.87A12.73,12.73,0,0,0,26,34.11V48.38c-1.48.17-5.14.54-6.28.84s-1.21,2.35,0,2.35H37.28a1.18,1.18,0,1,0,0-2.35c-1.18-.3-4.8-.67-6.31-.84V34.11a12.83,12.83,0,0,0,9.7-8.93Zm-19.45-11A17.93,17.93,0,0,0,22.6,26.92a10.63,10.63,0,0,0,2.93,3.36s0,.47-1,0a9.12,9.12,0,0,1-3.23-2.37,9.24,9.24,0,0,1-1.91-3.54A28,28,0,0,1,20.66,8.19a48.71,48.71,0,0,1,15.71,0,33.66,33.66,0,0,1,1.58,6Z"/></svg>
\ No newline at end of file
+<svg id="alcohol_verkoop" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><path d="M40.64,25.18A31.36,31.36,0,0,0,39,6.31a1.72,1.72,0,0,0-.52-.7,1.77,1.77,0,0,0-.79-.35,50.47,50.47,0,0,0-18.34,0,1.77,1.77,0,0,0-.79.35,1.81,1.81,0,0,0-.52.7,31.67,31.67,0,0,0-1.64,18.87A12.73,12.73,0,0,0,26,34.11V48.38c-1.48.17-5.14.54-6.28.84s-1.21,2.35,0,2.35H37.28a1.18,1.18,0,1,0,0-2.35c-1.18-.3-4.8-.67-6.31-.84V34.11a12.83,12.83,0,0,0,9.7-8.93Zm-19.45-11A17.93,17.93,0,0,0,22.6,26.92a10.63,10.63,0,0,0,2.93,3.36s0,.47-1,0a9.12,9.12,0,0,1-3.23-2.37,9.24,9.24,0,0,1-1.91-3.54A28,28,0,0,1,20.66,8.19a48.71,48.71,0,0,1,15.71,0,33.66,33.66,0,0,1,1.58,6Z"/></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/arrow.svg b/packages/icons/src/svg/arrow.svg
index a5aea31ed6..ac4ef86dbe 100644
--- a/packages/icons/src/svg/arrow.svg
+++ b/packages/icons/src/svg/arrow.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="arrow"><path d="M28,42.62,5.57,20.19a3.93,3.93,0,0,1,5.56-5.55L28,31.5,44.87,14.64a3.93,3.93,0,1,1,5.56,5.55Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="arrow"><path d="M28,42.62,5.57,20.19a3.93,3.93,0,0,1,5.56-5.55L28,31.5,44.87,14.64a3.93,3.93,0,1,1,5.56,5.55Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/arts.svg b/packages/icons/src/svg/arts.svg
index c8ab34e4af..4511a091e2 100644
--- a/packages/icons/src/svg/arts.svg
+++ b/packages/icons/src/svg/arts.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="arts"><path d="M14.24,38.59a7.13,7.13,0,0,1,.18-2.4,11.94,11.94,0,0,0-4,2.49C7.93,41.34,6.63,51.57,6.63,51.57h6.88S9.55,41.6,14.24,38.59Z"/><path d="M17.36,51.49l-.26.08H49.35c0-.17-1.28-10.21-3.76-12.87h0A15.3,15.3,0,0,0,41.16,36a8.48,8.48,0,0,1-.25,5,3.9,3.9,0,0,1,1.7,3.26,3.93,3.93,0,1,1-3.92-4h.25a5.45,5.45,0,0,0,.09-4A4.31,4.31,0,0,0,36,34.24c-.17-1-.34-2.06-.43-3a11.45,11.45,0,0,0,2.73-5.75,6.49,6.49,0,0,0,1.79-4.81,5.16,5.16,0,0,0-1-3.43c.26-2.83.43-7.29-.68-9.1-1.37-2.22-3-3.26-6.23-2.57-2-1-3.5-1.63-7.17-.69-2.56.61-5.29,1.63-6.74,3.35s-1.28,6.18-1.11,9.1a5,5,0,0,0-1,3.43,6,6,0,0,0,1.79,4.72A12.44,12.44,0,0,0,21,31.75c-.09.69-.18,1.46-.35,2.32-.42.17-1.1.34-1.87.6A3.31,3.31,0,0,0,16.33,38a4.54,4.54,0,0,1,2.56.43c3.93,1.8,5.8,8.5,5.89,8.75a.92.92,0,0,1-.09.69V48c0,.08-.08.08-.08.17l-.17.17A8.72,8.72,0,0,1,22,49.68c-.93.35-1.28-.17-1.45-.85s-.17-1.12.69-1.64c.34-.17.76-.43,1.19-.6-.77-2.06-2.3-5.32-4.35-6.26a2.54,2.54,0,0,0-2.22,0c-3,1.37-1.62,6.86-.85,9.27a6.88,6.88,0,0,1,1.28-.43c.94-.26,1.36,0,1.62.69S18.3,51.06,17.36,51.49Zm5.71-16.05c.18-1.63,0-.43.69-4.63-2-1.89-3.5-4.21-3.5-6.95-1.37-.43-1.71-2.15-1.71-3.27s.26-1.71.69-1.88a1,1,0,0,1,.85.08,4.24,4.24,0,0,0,.25,1.12.79.79,0,0,0,.86.68V14.85a25.42,25.42,0,0,0,9.13-2.66l4.52,3v5.4a.78.78,0,0,0,.85-.68A4.8,4.8,0,0,1,36,18.79a1,1,0,0,1,.85-.08c.43.17.68.77.68,1.88s-.34,2.84-1.7,3.27c0,3.17-2.14,5.57-4.52,7.63a5,5,0,0,1-3.16.94,6.94,6.94,0,0,1-2.47-.51,5.26,5.26,0,0,0,3.07,2.23,5.88,5.88,0,0,0,4.69-.77s.25,1.63.25,2.06c.09,2.92-3.49,6.18-5.62,7.72h0C26.06,41.62,22.73,38.44,23.07,35.44Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="arts"><path d="M14.24,38.59a7.13,7.13,0,0,1,.18-2.4,11.94,11.94,0,0,0-4,2.49C7.93,41.34,6.63,51.57,6.63,51.57h6.88S9.55,41.6,14.24,38.59Z"/><path d="M17.36,51.49l-.26.08H49.35c0-.17-1.28-10.21-3.76-12.87h0A15.3,15.3,0,0,0,41.16,36a8.48,8.48,0,0,1-.25,5,3.9,3.9,0,0,1,1.7,3.26,3.93,3.93,0,1,1-3.92-4h.25a5.45,5.45,0,0,0,.09-4A4.31,4.31,0,0,0,36,34.24c-.17-1-.34-2.06-.43-3a11.45,11.45,0,0,0,2.73-5.75,6.49,6.49,0,0,0,1.79-4.81,5.16,5.16,0,0,0-1-3.43c.26-2.83.43-7.29-.68-9.1-1.37-2.22-3-3.26-6.23-2.57-2-1-3.5-1.63-7.17-.69-2.56.61-5.29,1.63-6.74,3.35s-1.28,6.18-1.11,9.1a5,5,0,0,0-1,3.43,6,6,0,0,0,1.79,4.72A12.44,12.44,0,0,0,21,31.75c-.09.69-.18,1.46-.35,2.32-.42.17-1.1.34-1.87.6A3.31,3.31,0,0,0,16.33,38a4.54,4.54,0,0,1,2.56.43c3.93,1.8,5.8,8.5,5.89,8.75a.92.92,0,0,1-.09.69V48c0,.08-.08.08-.08.17l-.17.17A8.72,8.72,0,0,1,22,49.68c-.93.35-1.28-.17-1.45-.85s-.17-1.12.69-1.64c.34-.17.76-.43,1.19-.6-.77-2.06-2.3-5.32-4.35-6.26a2.54,2.54,0,0,0-2.22,0c-3,1.37-1.62,6.86-.85,9.27a6.88,6.88,0,0,1,1.28-.43c.94-.26,1.36,0,1.62.69S18.3,51.06,17.36,51.49Zm5.71-16.05c.18-1.63,0-.43.69-4.63-2-1.89-3.5-4.21-3.5-6.95-1.37-.43-1.71-2.15-1.71-3.27s.26-1.71.69-1.88a1,1,0,0,1,.85.08,4.24,4.24,0,0,0,.25,1.12.79.79,0,0,0,.86.68V14.85a25.42,25.42,0,0,0,9.13-2.66l4.52,3v5.4a.78.78,0,0,0,.85-.68A4.8,4.8,0,0,1,36,18.79a1,1,0,0,1,.85-.08c.43.17.68.77.68,1.88s-.34,2.84-1.7,3.27c0,3.17-2.14,5.57-4.52,7.63a5,5,0,0,1-3.16.94,6.94,6.94,0,0,1-2.47-.51,5.26,5.26,0,0,0,3.07,2.23,5.88,5.88,0,0,0,4.69-.77s.25,1.63.25,2.06c.09,2.92-3.49,6.18-5.62,7.72h0C26.06,41.62,22.73,38.44,23.07,35.44Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/avondklok.svg b/packages/icons/src/svg/avondklok.svg
index d8dcb359d5..2809b5af93 100644
--- a/packages/icons/src/svg/avondklok.svg
+++ b/packages/icons/src/svg/avondklok.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="avondklok"><path d="M34.14,20.21a14.18,14.18,0,0,0-18.53,5.51l12.18,7,9.92,10a13.37,13.37,0,0,0,2.69-3.55A14.29,14.29,0,0,0,34.14,20.21Z" fill-opacity="0.2" /><path d="M14.65,9.64c0,.45,0,.89,0,1.31v.73a.28.28,0,0,0,.45.18,13.18,13.18,0,0,0,1.62-1.3,12.9,12.9,0,0,0,2,.58A.27.27,0,0,0,19,10.8c-.25-.57-.52-1.21-.81-1.88.4-.59.78-1.2,1.1-1.74a.29.29,0,0,0-.23-.44,17.76,17.76,0,0,0-2,.07l-.5-.65-.69-.9a.22.22,0,0,0-.24-.1.22.22,0,0,0-.19.18c-.09.34-.18.66-.26,1l-.24.89c-.65.21-1.34.47-1.91.72a.3.3,0,0,0,0,.5C13.47,8.82,14.06,9.24,14.65,9.64Z"/><path d="M46.81,6.91a6.35,6.35,0,0,0-2.67,0,5.71,5.71,0,0,1-1.92,10.32,6.12,6.12,0,0,0,2,.88,5.91,5.91,0,0,0,7.2-4.24A5.89,5.89,0,0,0,46.81,6.91Z" /><path d="M7.56,18.16l-.41-1.32a.18.18,0,0,0-.32-.05l-.48.7-.3.43c-.48,0-1,0-1.44,0a.22.22,0,0,0-.16.32c.25.37.54.79.84,1.2l-.48,1.25,0,.1A.2.2,0,0,0,5,21a9,9,0,0,0,1.38-.48,9.06,9.06,0,0,0,1.19.87.19.19,0,0,0,.31-.14c0-.44-.06-.93-.09-1.44.41-.3.81-.62,1.15-.89a.22.22,0,0,0,0-.36A12.94,12.94,0,0,0,7.56,18.16Z" /><path d="M29,22h0a1.19,1.19,0,0,0-2.37,0l-.51,7.64-5.73-2.36a1,1,0,0,0-1.25.37,1,1,0,0,0,.28,1.43h0l7.46,5A1.92,1.92,0,0,0,28,34.4a1.87,1.87,0,0,0,1.72-2v-.06Z"/><path d="M31.59,15a18.2,18.2,0,1,0,14,21.61A18.19,18.19,0,0,0,31.59,15Zm9.73,20.7A13.85,13.85,0,1,1,30.68,19.2,13.88,13.88,0,0,1,41.32,35.65Z" /></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="avondklok"><path d="M34.14,20.21a14.18,14.18,0,0,0-18.53,5.51l12.18,7,9.92,10a13.37,13.37,0,0,0,2.69-3.55A14.29,14.29,0,0,0,34.14,20.21Z" fill-opacity="0.2" /><path d="M14.65,9.64c0,.45,0,.89,0,1.31v.73a.28.28,0,0,0,.45.18,13.18,13.18,0,0,0,1.62-1.3,12.9,12.9,0,0,0,2,.58A.27.27,0,0,0,19,10.8c-.25-.57-.52-1.21-.81-1.88.4-.59.78-1.2,1.1-1.74a.29.29,0,0,0-.23-.44,17.76,17.76,0,0,0-2,.07l-.5-.65-.69-.9a.22.22,0,0,0-.24-.1.22.22,0,0,0-.19.18c-.09.34-.18.66-.26,1l-.24.89c-.65.21-1.34.47-1.91.72a.3.3,0,0,0,0,.5C13.47,8.82,14.06,9.24,14.65,9.64Z"/><path d="M46.81,6.91a6.35,6.35,0,0,0-2.67,0,5.71,5.71,0,0,1-1.92,10.32,6.12,6.12,0,0,0,2,.88,5.91,5.91,0,0,0,7.2-4.24A5.89,5.89,0,0,0,46.81,6.91Z" /><path d="M7.56,18.16l-.41-1.32a.18.18,0,0,0-.32-.05l-.48.7-.3.43c-.48,0-1,0-1.44,0a.22.22,0,0,0-.16.32c.25.37.54.79.84,1.2l-.48,1.25,0,.1A.2.2,0,0,0,5,21a9,9,0,0,0,1.38-.48,9.06,9.06,0,0,0,1.19.87.19.19,0,0,0,.31-.14c0-.44-.06-.93-.09-1.44.41-.3.81-.62,1.15-.89a.22.22,0,0,0,0-.36A12.94,12.94,0,0,0,7.56,18.16Z" /><path d="M29,22h0a1.19,1.19,0,0,0-2.37,0l-.51,7.64-5.73-2.36a1,1,0,0,0-1.25.37,1,1,0,0,0,.28,1.43h0l7.46,5A1.92,1.92,0,0,0,28,34.4a1.87,1.87,0,0,0,1.72-2v-.06Z"/><path d="M31.59,15a18.2,18.2,0,1,0,14,21.61A18.19,18.19,0,0,0,31.59,15Zm9.73,20.7A13.85,13.85,0,1,1,30.68,19.2,13.88,13.88,0,0,1,41.32,35.65Z" /></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/bar_chart.svg b/packages/icons/src/svg/bar_chart.svg
index 9e2e18115b..e4fdaabe23 100644
--- a/packages/icons/src/svg/bar_chart.svg
+++ b/packages/icons/src/svg/bar_chart.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="bar_chart"><path d="M51.28,42.68h-3V18.93a2.06,2.06,0,0,0-1.8-2.26H43.63a2.07,2.07,0,0,0-1.81,2.26V42.68H36.94V27.06a2.07,2.07,0,0,0-1.8-2.26H32.25a2.07,2.07,0,0,0-1.81,2.26V42.68H25.56V12.42a2.07,2.07,0,0,0-1.81-2.25H20.86a2.07,2.07,0,0,0-1.8,2.25V42.68H14.18V18.93a2.07,2.07,0,0,0-1.81-2.26H9.48a2.06,2.06,0,0,0-1.8,2.26V42.68h-3a.3.3,0,0,0-.3.3v2.66a.29.29,0,0,0,.3.3H51.28a.29.29,0,0,0,.3-.3V43A.3.3,0,0,0,51.28,42.68Z" /></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="bar_chart"><path d="M51.28,42.68h-3V18.93a2.06,2.06,0,0,0-1.8-2.26H43.63a2.07,2.07,0,0,0-1.81,2.26V42.68H36.94V27.06a2.07,2.07,0,0,0-1.8-2.26H32.25a2.07,2.07,0,0,0-1.81,2.26V42.68H25.56V12.42a2.07,2.07,0,0,0-1.81-2.25H20.86a2.07,2.07,0,0,0-1.8,2.25V42.68H14.18V18.93a2.07,2.07,0,0,0-1.81-2.26H9.48a2.06,2.06,0,0,0-1.8,2.26V42.68h-3a.3.3,0,0,0-.3.3v2.66a.29.29,0,0,0,.3.3H51.28a.29.29,0,0,0,.3-.3V43A.3.3,0,0,0,51.28,42.68Z" /></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/basisregels_afstand.svg b/packages/icons/src/svg/basisregels_afstand.svg
index f326748a20..f6309417ff 100644
--- a/packages/icons/src/svg/basisregels_afstand.svg
+++ b/packages/icons/src/svg/basisregels_afstand.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="basisregel_afstand"><path d="M10.66,17.08a2.46,2.46,0,0,0,2.57-2.75c0-1.84-.92-2.94-2.57-2.94s-2.57,1.1-2.57,2.94S9,17.08,10.66,17.08Z"/><path d="M13.6,18.55a15.65,15.65,0,0,0-5.87,0c-3.32.7-3.31,5.89-3.31,10.35v.66a2,2,0,0,0,2,2V27.35a25.06,25.06,0,0,1,.55-5h.37V44.6a2.67,2.67,0,0,0,2.57-2.75s.37-10.28.37-10.46,0-.37.36-.37.37.19.37.37.37,10.28.37,10.28a2.78,2.78,0,0,0,2.75,2.75v-22a.18.18,0,0,1,.18.18,22.2,22.2,0,0,1,.55,4.77v4.22a2,2,0,0,0,2-2V28.9C16.91,24.44,16.92,19.25,13.6,18.55Z"/><path d="M45.34,17.08a2.46,2.46,0,0,0,2.57-2.75c0-1.84-.92-2.94-2.57-2.94s-2.57,1.1-2.57,2.94S43.69,17.08,45.34,17.08Z"/><path d="M48.27,18.55a15.65,15.65,0,0,0-5.87,0c-3.32.7-3.31,5.89-3.3,10.51v.68a2,2,0,0,0,2,2V27.35a24.31,24.31,0,0,1,.55-5H42V44.6a2.89,2.89,0,0,0,2.75-2.75s.36-10.28.36-10.46,0-.37.37-.37a.41.41,0,0,1,.37.37c0,.18.36,10.28.36,10.28a2.67,2.67,0,0,0,2.57,2.75v-22s.19,0,.19.18a22.87,22.87,0,0,1,.55,4.77v4.22a2,2,0,0,0,2-2V28.9C51.58,24.44,51.59,19.25,48.27,18.55Z"/><path d="M21.49,28.27h2.75v-2H21.49l1.1-1.65a.56.56,0,0,0,0-.73c-.19-.18-.37-.18-.74,0L18.18,26.8a.53.53,0,0,0,0,.92l3.67,2.94c.13.13.35.07.53,0l.21,0a.67.67,0,0,0,.18-.37.59.59,0,0,0-.18-.37Z"/><rect x="25.71" y="26.25" width="4.59" height="2.02"/><path d="M37.82,26.62l-3.67-2.75a.57.57,0,0,0-.74,0,.56.56,0,0,0,0,.73l1.1,1.47H31.76v2.2h2.75l-1.1,1.47a.57.57,0,0,0-.18.37c0,.18,0,.36.18.36a.55.55,0,0,0,.74,0l3.67-2.93A.53.53,0,0,0,37.82,26.62Z"/><path d="M20.2,36v.55h.92v3.3H22v-4h-.37A3.92,3.92,0,0,0,20.2,36Z"/><path d="M23.87,38.55a.81.81,0,0,0-.6.39l-.13.16c0,.36.18.55.37.55l-.37,1.1h.37a2.28,2.28,0,0,0,.91-1.47C24.42,38.73,24.24,38.55,23.87,38.55Z"/><path d="M26.81,37.26h-.37v-.73h1.65v-.92H25.71v2.2h.73c.55,0,.92.19.92.55,0,.55-.37.74-1.29.74h-.55v.73h.55c1.47,0,2.21-.55,2.21-1.47C28.28,37.63,27.91,37.26,26.81,37.26Z"/><polygon points="33.41 35.79 32.68 38.18 31.95 35.79 30.48 35.79 30.29 39.83 31.21 39.83 31.21 36.71 32.13 39.1 33.23 39.1 33.96 36.71 34.15 39.83 35.06 39.83 34.88 35.79 33.41 35.79"/><path d="M36.84,38.3a.42.42,0,0,0-.34.13.49.49,0,0,0,0,.62.45.45,0,0,0,.34.12.46.46,0,0,0,.35-.12.49.49,0,0,0,0-.62A.43.43,0,0,0,36.84,38.3Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="basisregel_afstand"><path d="M10.66,17.08a2.46,2.46,0,0,0,2.57-2.75c0-1.84-.92-2.94-2.57-2.94s-2.57,1.1-2.57,2.94S9,17.08,10.66,17.08Z"/><path d="M13.6,18.55a15.65,15.65,0,0,0-5.87,0c-3.32.7-3.31,5.89-3.31,10.35v.66a2,2,0,0,0,2,2V27.35a25.06,25.06,0,0,1,.55-5h.37V44.6a2.67,2.67,0,0,0,2.57-2.75s.37-10.28.37-10.46,0-.37.36-.37.37.19.37.37.37,10.28.37,10.28a2.78,2.78,0,0,0,2.75,2.75v-22a.18.18,0,0,1,.18.18,22.2,22.2,0,0,1,.55,4.77v4.22a2,2,0,0,0,2-2V28.9C16.91,24.44,16.92,19.25,13.6,18.55Z"/><path d="M45.34,17.08a2.46,2.46,0,0,0,2.57-2.75c0-1.84-.92-2.94-2.57-2.94s-2.57,1.1-2.57,2.94S43.69,17.08,45.34,17.08Z"/><path d="M48.27,18.55a15.65,15.65,0,0,0-5.87,0c-3.32.7-3.31,5.89-3.3,10.51v.68a2,2,0,0,0,2,2V27.35a24.31,24.31,0,0,1,.55-5H42V44.6a2.89,2.89,0,0,0,2.75-2.75s.36-10.28.36-10.46,0-.37.37-.37a.41.41,0,0,1,.37.37c0,.18.36,10.28.36,10.28a2.67,2.67,0,0,0,2.57,2.75v-22s.19,0,.19.18a22.87,22.87,0,0,1,.55,4.77v4.22a2,2,0,0,0,2-2V28.9C51.58,24.44,51.59,19.25,48.27,18.55Z"/><path d="M21.49,28.27h2.75v-2H21.49l1.1-1.65a.56.56,0,0,0,0-.73c-.19-.18-.37-.18-.74,0L18.18,26.8a.53.53,0,0,0,0,.92l3.67,2.94c.13.13.35.07.53,0l.21,0a.67.67,0,0,0,.18-.37.59.59,0,0,0-.18-.37Z"/><rect x="25.71" y="26.25" width="4.59" height="2.02"/><path d="M37.82,26.62l-3.67-2.75a.57.57,0,0,0-.74,0,.56.56,0,0,0,0,.73l1.1,1.47H31.76v2.2h2.75l-1.1,1.47a.57.57,0,0,0-.18.37c0,.18,0,.36.18.36a.55.55,0,0,0,.74,0l3.67-2.93A.53.53,0,0,0,37.82,26.62Z"/><path d="M20.2,36v.55h.92v3.3H22v-4h-.37A3.92,3.92,0,0,0,20.2,36Z"/><path d="M23.87,38.55a.81.81,0,0,0-.6.39l-.13.16c0,.36.18.55.37.55l-.37,1.1h.37a2.28,2.28,0,0,0,.91-1.47C24.42,38.73,24.24,38.55,23.87,38.55Z"/><path d="M26.81,37.26h-.37v-.73h1.65v-.92H25.71v2.2h.73c.55,0,.92.19.92.55,0,.55-.37.74-1.29.74h-.55v.73h.55c1.47,0,2.21-.55,2.21-1.47C28.28,37.63,27.91,37.26,26.81,37.26Z"/><polygon points="33.41 35.79 32.68 38.18 31.95 35.79 30.48 35.79 30.29 39.83 31.21 39.83 31.21 36.71 32.13 39.1 33.23 39.1 33.96 36.71 34.15 39.83 35.06 39.83 34.88 35.79 33.41 35.79"/><path d="M36.84,38.3a.42.42,0,0,0-.34.13.49.49,0,0,0,0,.62.45.45,0,0,0,.34.12.46.46,0,0,0,.35-.12.49.49,0,0,0,0-.62A.43.43,0,0,0,36.84,38.3Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/basisregels_drukte.svg b/packages/icons/src/svg/basisregels_drukte.svg
index 62ac73031f..2780f93654 100644
--- a/packages/icons/src/svg/basisregels_drukte.svg
+++ b/packages/icons/src/svg/basisregels_drukte.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="basisregels_drukte"><path d="M8.25,4.42,6.47,6.21l6.78,6.9c-1.16.44-2.08,1-2.08,1.36s.71.57,1.43.69a1.41,1.41,0,0,0,0,.41c0,2,1,3,2.79,3a2.66,2.66,0,0,0,1.3-.28,2.62,2.62,0,0,0,1-.88l3.66,3.72C18.39,23.32,18.77,29.92,19,34v.1a2.43,2.43,0,0,0,.68,1.83,2.46,2.46,0,0,0,.81.58,2.73,2.73,0,0,0,1,.21v-5.5A20.08,20.08,0,0,1,22.17,25a.21.21,0,0,1,.3-.21V51.56a3.45,3.45,0,0,0,1.35-.15A3.64,3.64,0,0,0,25,50.74a3.48,3.48,0,0,0,.82-1.08,3.53,3.53,0,0,0,.34-1.31l.5-11.9a.38.38,0,0,1,.36-.33.34.34,0,0,1,.14,0,.37.37,0,0,1,.12.07.24.24,0,0,1,.09.11.5.5,0,0,1,0,.13l.5,11.9a3.35,3.35,0,0,0,.34,1.31,3.48,3.48,0,0,0,.82,1.08,3.54,3.54,0,0,0,1.18.67,3.41,3.41,0,0,0,1.35.15V31.22l.86.86v4.64a2.49,2.49,0,0,0,1.64-.65,2.46,2.46,0,0,0,.77-1.58l.86.89A3.56,3.56,0,0,1,35,36.65a3.51,3.51,0,0,1-1.21.84v1.19a14.1,14.1,0,0,0,2,.21v9.9a2.92,2.92,0,0,0,1.62-.88,3,3,0,0,0,.79-1.68s.21-4.93.3-7.46h.32l.3.27c0,2.56.27,7.19.27,7.19a3,3,0,0,0,.77,1.71,3,3,0,0,0,1.64.91v-7l7.73,7.71,1.78-1.79Z"/><path d="M21.31,12.24a2.18,2.18,0,0,0,1-.21,2.42,2.42,0,0,0,.84-.61,2.51,2.51,0,0,0,.59-1.94c0-1.87-.92-3-2.44-3s-2.47,1.19-2.47,3S19.73,12.24,21.31,12.24Z"/><path d="M23.83,16.43a2.92,2.92,0,0,0,.66,1.16,3,3,0,0,0,1.09.76,3.12,3.12,0,0,0,1.32.2,2.92,2.92,0,0,0,2.43-.95A2.94,2.94,0,0,0,30,16.44a5.13,5.13,0,0,0,.16-1.34c0-2.12-1.3-3.57-3.26-3.57a3.17,3.17,0,0,0-1.32.26,3.27,3.27,0,0,0-1.08.8,3.07,3.07,0,0,0-.65,1.17,5.2,5.2,0,0,0-.18,1.32A4.14,4.14,0,0,0,23.83,16.43Z"/><path d="M32.52,12.24a2.45,2.45,0,0,0,1.87-.81A2.48,2.48,0,0,0,35,9.48c0-1.87-1-3-2.47-3s-2.44,1.19-2.44,3S31.09,12.24,32.52,12.24Z"/><path d="M36.33,17.75a2.81,2.81,0,0,0,1,.64,3,3,0,0,0,1.18.16,2.65,2.65,0,0,0,2.79-3c0-1.84-1-3.21-2.79-3.21s-3,1.1-3,3.21a2.8,2.8,0,0,0,.17,1.18A2.67,2.67,0,0,0,36.33,17.75Z"/><path d="M17.89,33.69c-.18-4-.47-10.27,2.17-13a3.25,3.25,0,0,0-.86-.3,17.57,17.57,0,0,0-8,0A3.83,3.83,0,0,0,8.82,22.5C7.51,25.27,4.66,33.74,4.66,33.74a1.19,1.19,0,0,0,.83,0c.06.66.17,1.81.31,3.2h0C6.23,41.39,6.9,48.23,7,48.61s1.42.27,1.36-.18c0-.23-.25-3.4-.49-6.9-.23-3.25-.48-6.79-.61-8.47a2.44,2.44,0,0,0,.63-.83c.56-1.34,1.19-2.83,1.57-4s.9-2.55,1.34-3.54c0-.17.18-.32.27-.23V48.79a3,3,0,0,0,3-3s.48-10.8.48-10.92a.28.28,0,0,1,0-.12.25.25,0,0,1,.08-.1.24.24,0,0,1,.11-.06.28.28,0,0,1,.13,0,.35.35,0,0,1,.22.08.3.3,0,0,1,.1.21l.66,10.92A2.76,2.76,0,0,0,16,47a2.81,2.81,0,0,0,1.63,1.63,2.76,2.76,0,0,0,1.17.17V36.6a4,4,0,0,1-.86-2.35Z"/><path d="M35.76,20.27a3.76,3.76,0,0,0-1.69,1,8.15,8.15,0,0,1,1.1,2.35,16.67,16.67,0,0,1,.89,4.85l8,8a26.27,26.27,0,0,0-1.76-6.81,5.77,5.77,0,0,1,0-2.74,5.69,5.69,0,0,0,0-3.27,3.64,3.64,0,0,1,.3.63,80.6,80.6,0,0,0,2.26,10.05c.83,0,1.87-1.13,1.52-3-.15-.77-.34-1.5-.52-2.21a20.73,20.73,0,0,1-.61-2.91c-.42-3.51-1.49-5.2-3.51-5.95a10.28,10.28,0,0,0-6,0Z"/><path d="M31.21,20.48a16,16,0,0,0-3.72-.5l7.41,7.4C34.63,24.14,33.74,21.17,31.21,20.48Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="basisregels_drukte"><path d="M8.25,4.42,6.47,6.21l6.78,6.9c-1.16.44-2.08,1-2.08,1.36s.71.57,1.43.69a1.41,1.41,0,0,0,0,.41c0,2,1,3,2.79,3a2.66,2.66,0,0,0,1.3-.28,2.62,2.62,0,0,0,1-.88l3.66,3.72C18.39,23.32,18.77,29.92,19,34v.1a2.43,2.43,0,0,0,.68,1.83,2.46,2.46,0,0,0,.81.58,2.73,2.73,0,0,0,1,.21v-5.5A20.08,20.08,0,0,1,22.17,25a.21.21,0,0,1,.3-.21V51.56a3.45,3.45,0,0,0,1.35-.15A3.64,3.64,0,0,0,25,50.74a3.48,3.48,0,0,0,.82-1.08,3.53,3.53,0,0,0,.34-1.31l.5-11.9a.38.38,0,0,1,.36-.33.34.34,0,0,1,.14,0,.37.37,0,0,1,.12.07.24.24,0,0,1,.09.11.5.5,0,0,1,0,.13l.5,11.9a3.35,3.35,0,0,0,.34,1.31,3.48,3.48,0,0,0,.82,1.08,3.54,3.54,0,0,0,1.18.67,3.41,3.41,0,0,0,1.35.15V31.22l.86.86v4.64a2.49,2.49,0,0,0,1.64-.65,2.46,2.46,0,0,0,.77-1.58l.86.89A3.56,3.56,0,0,1,35,36.65a3.51,3.51,0,0,1-1.21.84v1.19a14.1,14.1,0,0,0,2,.21v9.9a2.92,2.92,0,0,0,1.62-.88,3,3,0,0,0,.79-1.68s.21-4.93.3-7.46h.32l.3.27c0,2.56.27,7.19.27,7.19a3,3,0,0,0,.77,1.71,3,3,0,0,0,1.64.91v-7l7.73,7.71,1.78-1.79Z"/><path d="M21.31,12.24a2.18,2.18,0,0,0,1-.21,2.42,2.42,0,0,0,.84-.61,2.51,2.51,0,0,0,.59-1.94c0-1.87-.92-3-2.44-3s-2.47,1.19-2.47,3S19.73,12.24,21.31,12.24Z"/><path d="M23.83,16.43a2.92,2.92,0,0,0,.66,1.16,3,3,0,0,0,1.09.76,3.12,3.12,0,0,0,1.32.2,2.92,2.92,0,0,0,2.43-.95A2.94,2.94,0,0,0,30,16.44a5.13,5.13,0,0,0,.16-1.34c0-2.12-1.3-3.57-3.26-3.57a3.17,3.17,0,0,0-1.32.26,3.27,3.27,0,0,0-1.08.8,3.07,3.07,0,0,0-.65,1.17,5.2,5.2,0,0,0-.18,1.32A4.14,4.14,0,0,0,23.83,16.43Z"/><path d="M32.52,12.24a2.45,2.45,0,0,0,1.87-.81A2.48,2.48,0,0,0,35,9.48c0-1.87-1-3-2.47-3s-2.44,1.19-2.44,3S31.09,12.24,32.52,12.24Z"/><path d="M36.33,17.75a2.81,2.81,0,0,0,1,.64,3,3,0,0,0,1.18.16,2.65,2.65,0,0,0,2.79-3c0-1.84-1-3.21-2.79-3.21s-3,1.1-3,3.21a2.8,2.8,0,0,0,.17,1.18A2.67,2.67,0,0,0,36.33,17.75Z"/><path d="M17.89,33.69c-.18-4-.47-10.27,2.17-13a3.25,3.25,0,0,0-.86-.3,17.57,17.57,0,0,0-8,0A3.83,3.83,0,0,0,8.82,22.5C7.51,25.27,4.66,33.74,4.66,33.74a1.19,1.19,0,0,0,.83,0c.06.66.17,1.81.31,3.2h0C6.23,41.39,6.9,48.23,7,48.61s1.42.27,1.36-.18c0-.23-.25-3.4-.49-6.9-.23-3.25-.48-6.79-.61-8.47a2.44,2.44,0,0,0,.63-.83c.56-1.34,1.19-2.83,1.57-4s.9-2.55,1.34-3.54c0-.17.18-.32.27-.23V48.79a3,3,0,0,0,3-3s.48-10.8.48-10.92a.28.28,0,0,1,0-.12.25.25,0,0,1,.08-.1.24.24,0,0,1,.11-.06.28.28,0,0,1,.13,0,.35.35,0,0,1,.22.08.3.3,0,0,1,.1.21l.66,10.92A2.76,2.76,0,0,0,16,47a2.81,2.81,0,0,0,1.63,1.63,2.76,2.76,0,0,0,1.17.17V36.6a4,4,0,0,1-.86-2.35Z"/><path d="M35.76,20.27a3.76,3.76,0,0,0-1.69,1,8.15,8.15,0,0,1,1.1,2.35,16.67,16.67,0,0,1,.89,4.85l8,8a26.27,26.27,0,0,0-1.76-6.81,5.77,5.77,0,0,1,0-2.74,5.69,5.69,0,0,0,0-3.27,3.64,3.64,0,0,1,.3.63,80.6,80.6,0,0,0,2.26,10.05c.83,0,1.87-1.13,1.52-3-.15-.77-.34-1.5-.52-2.21a20.73,20.73,0,0,1-.61-2.91c-.42-3.51-1.49-5.2-3.51-5.95a10.28,10.28,0,0,0-6,0Z"/><path d="M31.21,20.48a16,16,0,0,0-3.72-.5l7.41,7.4C34.63,24.14,33.74,21.17,31.21,20.48Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/basisregels_elleboog.svg b/packages/icons/src/svg/basisregels_elleboog.svg
index a795046a5b..02e4204b5a 100644
--- a/packages/icons/src/svg/basisregels_elleboog.svg
+++ b/packages/icons/src/svg/basisregels_elleboog.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="basisregels_elleboog"><path d="M33.23,19.23a1,1,0,0,0-.66-.14.92.92,0,0,0-.58.32.93.93,0,0,0-.15.65,1,1,0,0,0,.33.59l.62.53h-1a.8.8,0,0,0-.8,1,.88.88,0,0,0,.89.8H32l3.36-.26a.93.93,0,0,0,.51-.18.88.88,0,0,0,.29-.44.86.86,0,0,0,0-.55.93.93,0,0,0-.33-.43l-2.57-1.86Z"/><path d="M49.62,28.18C49,26,47.05,24.9,44.92,24.64c2.22-4.08,7.54-14.89.62-16-2.21-2.48-3.63-4.34-9.12-4.17-5.14.18-11.08.27-13.38,8.78-1.06,4-.44,6,.18,10.36-2.31-1.06-4.52-2.12-5.94-2.74L17,20a5.83,5.83,0,0,0-1.51-2.57A3.37,3.37,0,0,0,13,16.84,3.8,3.8,0,0,0,9.75,16,4.27,4.27,0,0,0,7,18.35c-2.12,4.43-.44,6.64,1.33,7.7A10,10,0,0,0,13,27.47c2.21,2,12.67,10.9,15.68,11.78,2.13.62,7.35-.17,11.78-1.32.09.17-.08.35-.35.44-4,1.86-9.66,3.19-12.23,2.48-1.77-.53-6.2-3.81-10.19-7a15.64,15.64,0,0,0-4.6,2.75c-2.4,2.74-3.73,15-3.73,15h35.8S46,40.94,49,34.2c.8-1.86,1.42-3.45.62-6ZM13.2,25.7a8.2,8.2,0,0,1-4-1.15c-1.06-.62-2.31-1.95-.62-5.41a2.1,2.1,0,0,1,1.59-1.42,2.56,2.56,0,0,1,2,.8l.35.36.54-.18a1.52,1.52,0,0,1,1.33.18,4.53,4.53,0,0,1,1,1.86c0,.09.09.17.09.26l-2.3,4.7Zm12.5-1a8.5,8.5,0,0,1,.53-3.27,3.36,3.36,0,0,1-1.06-4.08c.44-1.06,1.5-2,2.83-.88-.09.62-.18,1-.18,1.15-.08.79,1.07,1.06,1.07,1.06l1.86-4.78c1.77.53,8.86,1.94,13.38,1.59l.44,4.16a20.49,20.49,0,0,1-1.24,2.48c-.8.09-1.86.27-2.21.36a1,1,0,0,0-.46.25,1,1,0,0,0-.25.46.79.79,0,0,0,0,.5.77.77,0,0,0,.31.38l1,.62a61.45,61.45,0,0,0-10,2.75c-1.59-.62-3.81-1.68-6-2.75Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="basisregels_elleboog"><path d="M33.23,19.23a1,1,0,0,0-.66-.14.92.92,0,0,0-.58.32.93.93,0,0,0-.15.65,1,1,0,0,0,.33.59l.62.53h-1a.8.8,0,0,0-.8,1,.88.88,0,0,0,.89.8H32l3.36-.26a.93.93,0,0,0,.51-.18.88.88,0,0,0,.29-.44.86.86,0,0,0,0-.55.93.93,0,0,0-.33-.43l-2.57-1.86Z"/><path d="M49.62,28.18C49,26,47.05,24.9,44.92,24.64c2.22-4.08,7.54-14.89.62-16-2.21-2.48-3.63-4.34-9.12-4.17-5.14.18-11.08.27-13.38,8.78-1.06,4-.44,6,.18,10.36-2.31-1.06-4.52-2.12-5.94-2.74L17,20a5.83,5.83,0,0,0-1.51-2.57A3.37,3.37,0,0,0,13,16.84,3.8,3.8,0,0,0,9.75,16,4.27,4.27,0,0,0,7,18.35c-2.12,4.43-.44,6.64,1.33,7.7A10,10,0,0,0,13,27.47c2.21,2,12.67,10.9,15.68,11.78,2.13.62,7.35-.17,11.78-1.32.09.17-.08.35-.35.44-4,1.86-9.66,3.19-12.23,2.48-1.77-.53-6.2-3.81-10.19-7a15.64,15.64,0,0,0-4.6,2.75c-2.4,2.74-3.73,15-3.73,15h35.8S46,40.94,49,34.2c.8-1.86,1.42-3.45.62-6ZM13.2,25.7a8.2,8.2,0,0,1-4-1.15c-1.06-.62-2.31-1.95-.62-5.41a2.1,2.1,0,0,1,1.59-1.42,2.56,2.56,0,0,1,2,.8l.35.36.54-.18a1.52,1.52,0,0,1,1.33.18,4.53,4.53,0,0,1,1,1.86c0,.09.09.17.09.26l-2.3,4.7Zm12.5-1a8.5,8.5,0,0,1,.53-3.27,3.36,3.36,0,0,1-1.06-4.08c.44-1.06,1.5-2,2.83-.88-.09.62-.18,1-.18,1.15-.08.79,1.07,1.06,1.07,1.06l1.86-4.78c1.77.53,8.86,1.94,13.38,1.59l.44,4.16a20.49,20.49,0,0,1-1.24,2.48c-.8.09-1.86.27-2.21.36a1,1,0,0,0-.46.25,1,1,0,0,0-.25.46.79.79,0,0,0,0,.5.77.77,0,0,0,.31.38l1,.62a61.45,61.45,0,0,0-10,2.75c-1.59-.62-3.81-1.68-6-2.75Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/basisregels_geen_bezoek.svg b/packages/icons/src/svg/basisregels_geen_bezoek.svg
index 12d4784c7a..5f4e661467 100644
--- a/packages/icons/src/svg/basisregels_geen_bezoek.svg
+++ b/packages/icons/src/svg/basisregels_geen_bezoek.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="basisregels_geen_bezoek"><path d="M23.13,12.35c2.34,0,3.51-1.58,3.51-4,0-2.78-1.56-4-3.51-4-2.34,0-3.51,1.58-3.51,4C19.62,11.16,21.18,12.35,23.13,12.35Z"/><path d="M36.39,12.35c2,0,3.12-1.19,3.12-3.57,0-2-1.17-3.56-3.12-3.56s-3.12,1.19-3.12,3.56S34.44,12.35,36.39,12.35Z"/><path d="M28.59,19.88c.78,2,.78,4.36.78,7.13v3.17l2.34,2.38a3.06,3.06,0,0,0,.78-2c.39-5.16.78-14.27-3.9-15.85a20.33,20.33,0,0,0-9.75,0c-1.56.39-2.34.79-2.73,1.58L28.59,29Z"/><path d="M33.27,30.58a3.63,3.63,0,0,1-1.17,2.77l3.9,4a47.89,47.89,0,0,1,.39-5.94.39.39,0,0,1,.39-.4c.39,0,.39,0,.39.4,0,0,0,3.56.39,7.13l3.51,3.57V19.48a.39.39,0,0,1,.39.4A21.23,21.23,0,0,1,41.85,25v7.13a3.21,3.21,0,0,0,2.72-2.77c.39-4.36.78-13.08-3.89-14.27a17.27,17.27,0,0,0-9,0,1.35,1.35,0,0,0-.78.4C34.05,18.29,33.66,25.82,33.27,30.58Z"/><path d="M7.92,11.16,5.58,13.54l8.58,8.72a31.87,31.87,0,0,0-.08,5.86c0,.87.08,1.7.08,2.46,0,2.37,1.56,3.16,2.73,3.16V25.42l.78.8V51.57A3.94,3.94,0,0,0,22,48s.39-14.27.78-14.66a.39.39,0,1,1,.78,0L24.3,48c0,2.38,1.95,3.56,4.29,3.56v-15l3.9,4V48A3.3,3.3,0,0,0,36,44.44v-.39l7.41,7.52,2.33-2Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="basisregels_geen_bezoek"><path d="M23.13,12.35c2.34,0,3.51-1.58,3.51-4,0-2.78-1.56-4-3.51-4-2.34,0-3.51,1.58-3.51,4C19.62,11.16,21.18,12.35,23.13,12.35Z"/><path d="M36.39,12.35c2,0,3.12-1.19,3.12-3.57,0-2-1.17-3.56-3.12-3.56s-3.12,1.19-3.12,3.56S34.44,12.35,36.39,12.35Z"/><path d="M28.59,19.88c.78,2,.78,4.36.78,7.13v3.17l2.34,2.38a3.06,3.06,0,0,0,.78-2c.39-5.16.78-14.27-3.9-15.85a20.33,20.33,0,0,0-9.75,0c-1.56.39-2.34.79-2.73,1.58L28.59,29Z"/><path d="M33.27,30.58a3.63,3.63,0,0,1-1.17,2.77l3.9,4a47.89,47.89,0,0,1,.39-5.94.39.39,0,0,1,.39-.4c.39,0,.39,0,.39.4,0,0,0,3.56.39,7.13l3.51,3.57V19.48a.39.39,0,0,1,.39.4A21.23,21.23,0,0,1,41.85,25v7.13a3.21,3.21,0,0,0,2.72-2.77c.39-4.36.78-13.08-3.89-14.27a17.27,17.27,0,0,0-9,0,1.35,1.35,0,0,0-.78.4C34.05,18.29,33.66,25.82,33.27,30.58Z"/><path d="M7.92,11.16,5.58,13.54l8.58,8.72a31.87,31.87,0,0,0-.08,5.86c0,.87.08,1.7.08,2.46,0,2.37,1.56,3.16,2.73,3.16V25.42l.78.8V51.57A3.94,3.94,0,0,0,22,48s.39-14.27.78-14.66a.39.39,0,1,1,.78,0L24.3,48c0,2.38,1.95,3.56,4.29,3.56v-15l3.9,4V48A3.3,3.3,0,0,0,36,44.44v-.39l7.41,7.52,2.33-2Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/basisregels_handenwassen.svg b/packages/icons/src/svg/basisregels_handenwassen.svg
index dc2824adfe..71f26bee2a 100644
--- a/packages/icons/src/svg/basisregels_handenwassen.svg
+++ b/packages/icons/src/svg/basisregels_handenwassen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="basisregels_handenwassen"><path d="M17.85,11.48a2.22,2.22,0,0,0,2.24-2.62,5.2,5.2,0,0,0-.94-2A8.32,8.32,0,0,1,18,4.62a.19.19,0,0,0-.19-.2c-.09,0-.14,0-.16,0s0,.07,0,.17a10.59,10.59,0,0,1-1.08,2,4.93,4.93,0,0,0-1,2.09A2.3,2.3,0,0,0,17.85,11.48Z"/><path d="M16.55,16.52a6.31,6.31,0,0,0-.92-1.81,8.08,8.08,0,0,1-1.13-2.22.19.19,0,0,0-.19-.2c-.09,0-.14,0-.16,0s0,.07,0,.18a10.58,10.58,0,0,1-1.2,2.09,6,6,0,0,0-1,1.94,2.31,2.31,0,0,0,2.23,2.62A2.46,2.46,0,0,0,16.55,16.52Z"/><path d="M19.16,16.52a2.31,2.31,0,0,0,2.23,2.62,2.22,2.22,0,0,0,2.24-2.62,4.89,4.89,0,0,0-.85-2,8.68,8.68,0,0,1-1-2.07.18.18,0,0,0-.18-.2c-.19-.21-.37,0-.37.2a7.61,7.61,0,0,1-1.13,2.11A4.33,4.33,0,0,0,19.16,16.52Z"/><path d="M43.2,29.42c.64-6.45-4.56-9.13-8.27-11-.59-.3-1.13-.58-1.61-.85a48.26,48.26,0,0,1-4.47-3.15l-.38-.28c-.74-.61-1.3-.61-1.67-.2-.38.6-.38,1.61.56,2.82A20.28,20.28,0,0,0,31.08,20a1.13,1.13,0,0,1-.37,2H16.92a1.65,1.65,0,0,0,0,3.23h1.3a2.51,2.51,0,0,1,1.87-1A2.71,2.71,0,0,1,22,25a5,5,0,0,1,2.42-.81,3.9,3.9,0,0,1,3.73,4v.4a1.58,1.58,0,0,1,.93-.2,1.34,1.34,0,0,1,.94.2,2.68,2.68,0,0,1-.19-1.21,3.55,3.55,0,1,1,7.08,0v.41a4.78,4.78,0,0,1,2.43,4,6.1,6.1,0,0,1-.75,2.62c-.26-.47-.57-.9-.85-1.31a8.09,8.09,0,0,1-.83-1.31,45.36,45.36,0,0,1-2.79-5.44c-.38-.81-.94-1.21-1.49-.81-.56.2-.94,1.21-.56,2.62a15.17,15.17,0,0,0,2,4.84c.56.81-.38,2-1.12,1.41-.84-.4-1.31-.66-1.77-.91s-.93-.5-1.77-.9l-8.76-4.84a1.33,1.33,0,0,0-1.87.8,1.64,1.64,0,0,0,.56,2s8.76,4.84,8.76,5c.19,0,.19.2.19.4s-.19.61-.56.61a.54.54,0,0,1-.37-.2L16.92,31a1.33,1.33,0,0,0-1.87.81,1.65,1.65,0,0,0,.56,2L25.87,39.5a.83.83,0,0,1,.37.81c-.19.2-.37.4-.75.2l-8.94-4.84a1.33,1.33,0,0,0-1.87.81,1.63,1.63,0,0,0,.56,2l9.69,5.44a.58.58,0,0,1,.38.61c0,.2-.38.4-.56.2l-6.53-3.43a1.33,1.33,0,0,0-1.11,2.42s6,3.43,7.82,4.44a27.37,27.37,0,0,0,8,3.22c3,.41,5-.2,7.45-3.83,2.61-4.23.94-8.06-.93-11.29C41.52,34.86,42.64,33.25,43.2,29.42Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="basisregels_handenwassen"><path d="M17.85,11.48a2.22,2.22,0,0,0,2.24-2.62,5.2,5.2,0,0,0-.94-2A8.32,8.32,0,0,1,18,4.62a.19.19,0,0,0-.19-.2c-.09,0-.14,0-.16,0s0,.07,0,.17a10.59,10.59,0,0,1-1.08,2,4.93,4.93,0,0,0-1,2.09A2.3,2.3,0,0,0,17.85,11.48Z"/><path d="M16.55,16.52a6.31,6.31,0,0,0-.92-1.81,8.08,8.08,0,0,1-1.13-2.22.19.19,0,0,0-.19-.2c-.09,0-.14,0-.16,0s0,.07,0,.18a10.58,10.58,0,0,1-1.2,2.09,6,6,0,0,0-1,1.94,2.31,2.31,0,0,0,2.23,2.62A2.46,2.46,0,0,0,16.55,16.52Z"/><path d="M19.16,16.52a2.31,2.31,0,0,0,2.23,2.62,2.22,2.22,0,0,0,2.24-2.62,4.89,4.89,0,0,0-.85-2,8.68,8.68,0,0,1-1-2.07.18.18,0,0,0-.18-.2c-.19-.21-.37,0-.37.2a7.61,7.61,0,0,1-1.13,2.11A4.33,4.33,0,0,0,19.16,16.52Z"/><path d="M43.2,29.42c.64-6.45-4.56-9.13-8.27-11-.59-.3-1.13-.58-1.61-.85a48.26,48.26,0,0,1-4.47-3.15l-.38-.28c-.74-.61-1.3-.61-1.67-.2-.38.6-.38,1.61.56,2.82A20.28,20.28,0,0,0,31.08,20a1.13,1.13,0,0,1-.37,2H16.92a1.65,1.65,0,0,0,0,3.23h1.3a2.51,2.51,0,0,1,1.87-1A2.71,2.71,0,0,1,22,25a5,5,0,0,1,2.42-.81,3.9,3.9,0,0,1,3.73,4v.4a1.58,1.58,0,0,1,.93-.2,1.34,1.34,0,0,1,.94.2,2.68,2.68,0,0,1-.19-1.21,3.55,3.55,0,1,1,7.08,0v.41a4.78,4.78,0,0,1,2.43,4,6.1,6.1,0,0,1-.75,2.62c-.26-.47-.57-.9-.85-1.31a8.09,8.09,0,0,1-.83-1.31,45.36,45.36,0,0,1-2.79-5.44c-.38-.81-.94-1.21-1.49-.81-.56.2-.94,1.21-.56,2.62a15.17,15.17,0,0,0,2,4.84c.56.81-.38,2-1.12,1.41-.84-.4-1.31-.66-1.77-.91s-.93-.5-1.77-.9l-8.76-4.84a1.33,1.33,0,0,0-1.87.8,1.64,1.64,0,0,0,.56,2s8.76,4.84,8.76,5c.19,0,.19.2.19.4s-.19.61-.56.61a.54.54,0,0,1-.37-.2L16.92,31a1.33,1.33,0,0,0-1.87.81,1.65,1.65,0,0,0,.56,2L25.87,39.5a.83.83,0,0,1,.37.81c-.19.2-.37.4-.75.2l-8.94-4.84a1.33,1.33,0,0,0-1.87.81,1.63,1.63,0,0,0,.56,2l9.69,5.44a.58.58,0,0,1,.38.61c0,.2-.38.4-.56.2l-6.53-3.43a1.33,1.33,0,0,0-1.11,2.42s6,3.43,7.82,4.44a27.37,27.37,0,0,0,8,3.22c3,.41,5-.2,7.45-3.83,2.61-4.23.94-8.06-.93-11.29C41.52,34.86,42.64,33.25,43.2,29.42Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/basisregels_mondkapje.svg b/packages/icons/src/svg/basisregels_mondkapje.svg
index b11944bbb0..7474dd683a 100644
--- a/packages/icons/src/svg/basisregels_mondkapje.svg
+++ b/packages/icons/src/svg/basisregels_mondkapje.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="basisregels_mondkapje"><path d="M43.32,42.57a11.93,11.93,0,0,0-4.07-2.36c-1.28-.64-4.5-1.93-4.93-2.14,0-.64-.21-1.29-.21-1.93,1.07-.86,1.93-1.71,3.43-3,.43-.21.43-.64.21-1.07L37.32,31a8.79,8.79,0,0,1,.22-1.07v-.65a6.35,6.35,0,0,0,1.07-3.85,4.31,4.31,0,0,0-.86-3A9.44,9.44,0,0,0,31.11,11.5a3.54,3.54,0,0,0-2.36-.86c0-.22.21-.22.43-.22a10.41,10.41,0,0,1,3.64.22,9.42,9.42,0,0,0,.64-2.36,4,4,0,0,0-4.07-3.86,5,5,0,0,0-3.64,2.15c-1.29,1.71-2.14.64-1.29-.65,0,0-2.57.22-2.57,2.36,0,1.5,1.5,2.79,2.36,3.22A9.58,9.58,0,0,0,18,22.21a5,5,0,0,0-.85,3,7.43,7.43,0,0,0,1.07,3.86v.64a9.16,9.16,0,0,0,.21,1.07l-.21,1.07a1,1,0,0,0,.21,1.08c1.5,1.28,2.36,2.14,3.43,3,0,.64-.21,1.28-.21,1.92-.22,0-4.5,1.93-4.93,2.15a11.77,11.77,0,0,0-4.07,2.36c-1.5,1.71-2.57,6.64-3,9.21H46.32C45.89,49,44.82,44.07,43.32,42.57ZM19.53,25.21c0-.43,0-1.5.43-1.71a2,2,0,0,1,1.08.21,13.46,13.46,0,0,1,.64-4.29,10.09,10.09,0,0,1,6.43-2.57,9.67,9.67,0,0,1,6.43,2.57v.43a3.72,3.72,0,0,1,.21,1.5A11.83,11.83,0,0,1,35,23.71,1,1,0,0,1,36,23.5c.43.21.43.64.43,1.71v.64c-3,0-4.72-.21-5.36-.64-.86-.64-1.5-1.71-3.22-1.71-1.5,0-2.35,1.07-3.21,1.71-.43.43-2.14.64-5.15.64Zm.65,6.86a1.49,1.49,0,0,1,.43-.64l4.5,1.28a.3.3,0,0,0,0-.43L20.39,29.5c0-.65-.21-1.07-.21-1.72,3.86,0,5.14-.43,6-1.07.86-.86,1.07-1.28,1.71-1.28.86,0,1.07.42,1.93,1.28.86.64,2.14,1.07,6,1.07a4.27,4.27,0,0,1-.21,1.72l-4.5,2.78c-.22.22-.22.22,0,.43l4.5-1.28c0,.21.21.21.21.64-.86.64-1.28,1.28-1.93,1.71a7.43,7.43,0,0,1-5.78,2.36c-2.57,0-3.65-.64-5.57-2.14C21.89,33.57,21,32.71,20.18,32.07Zm7.71,14.14s-7.28-.21-9-4.5c2.79-1.28,4.72-1.71,4.93-3A2.28,2.28,0,0,1,24,37.64a10.16,10.16,0,0,0,3.85.86,6.89,6.89,0,0,0,3.86-.86v1.07c.21,1.5,2.14,1.93,4.93,3C35.39,46,27.89,46.21,27.89,46.21Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="basisregels_mondkapje"><path d="M43.32,42.57a11.93,11.93,0,0,0-4.07-2.36c-1.28-.64-4.5-1.93-4.93-2.14,0-.64-.21-1.29-.21-1.93,1.07-.86,1.93-1.71,3.43-3,.43-.21.43-.64.21-1.07L37.32,31a8.79,8.79,0,0,1,.22-1.07v-.65a6.35,6.35,0,0,0,1.07-3.85,4.31,4.31,0,0,0-.86-3A9.44,9.44,0,0,0,31.11,11.5a3.54,3.54,0,0,0-2.36-.86c0-.22.21-.22.43-.22a10.41,10.41,0,0,1,3.64.22,9.42,9.42,0,0,0,.64-2.36,4,4,0,0,0-4.07-3.86,5,5,0,0,0-3.64,2.15c-1.29,1.71-2.14.64-1.29-.65,0,0-2.57.22-2.57,2.36,0,1.5,1.5,2.79,2.36,3.22A9.58,9.58,0,0,0,18,22.21a5,5,0,0,0-.85,3,7.43,7.43,0,0,0,1.07,3.86v.64a9.16,9.16,0,0,0,.21,1.07l-.21,1.07a1,1,0,0,0,.21,1.08c1.5,1.28,2.36,2.14,3.43,3,0,.64-.21,1.28-.21,1.92-.22,0-4.5,1.93-4.93,2.15a11.77,11.77,0,0,0-4.07,2.36c-1.5,1.71-2.57,6.64-3,9.21H46.32C45.89,49,44.82,44.07,43.32,42.57ZM19.53,25.21c0-.43,0-1.5.43-1.71a2,2,0,0,1,1.08.21,13.46,13.46,0,0,1,.64-4.29,10.09,10.09,0,0,1,6.43-2.57,9.67,9.67,0,0,1,6.43,2.57v.43a3.72,3.72,0,0,1,.21,1.5A11.83,11.83,0,0,1,35,23.71,1,1,0,0,1,36,23.5c.43.21.43.64.43,1.71v.64c-3,0-4.72-.21-5.36-.64-.86-.64-1.5-1.71-3.22-1.71-1.5,0-2.35,1.07-3.21,1.71-.43.43-2.14.64-5.15.64Zm.65,6.86a1.49,1.49,0,0,1,.43-.64l4.5,1.28a.3.3,0,0,0,0-.43L20.39,29.5c0-.65-.21-1.07-.21-1.72,3.86,0,5.14-.43,6-1.07.86-.86,1.07-1.28,1.71-1.28.86,0,1.07.42,1.93,1.28.86.64,2.14,1.07,6,1.07a4.27,4.27,0,0,1-.21,1.72l-4.5,2.78c-.22.22-.22.22,0,.43l4.5-1.28c0,.21.21.21.21.64-.86.64-1.28,1.28-1.93,1.71a7.43,7.43,0,0,1-5.78,2.36c-2.57,0-3.65-.64-5.57-2.14C21.89,33.57,21,32.71,20.18,32.07Zm7.71,14.14s-7.28-.21-9-4.5c2.79-1.28,4.72-1.71,4.93-3A2.28,2.28,0,0,1,24,37.64a10.16,10.16,0,0,0,3.85.86,6.89,6.89,0,0,0,3.86-.86v1.07c.21,1.5,2.14,1.93,4.93,3C35.39,46,27.89,46.21,27.89,46.21Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/basisregels_testen.svg b/packages/icons/src/svg/basisregels_testen.svg
index 2bfedba0dd..476035db7b 100644
--- a/packages/icons/src/svg/basisregels_testen.svg
+++ b/packages/icons/src/svg/basisregels_testen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="basisregels_testen"><path d="M33.32,23.41c-.15-.66.09-1.89,0-2.45a31.65,31.65,0,0,0-1.83-6C33,12,32.28,9.4,30,7.9,27.29,6.19,17.69,6,10.63,9.85,3.18,13.9,4,21.45,5.24,25.24c1.45,4.42,5.74,10.67,6,15.37.14,2.07-1.38,8.65-1.38,8.65H26.58V44.6s-4.22-2-4.42-2.18a.26.26,0,0,1-.11-.34s6.06,1.27,8.4,1.63a4.75,4.75,0,0,0,4.18-1.06c1.59-1.73.22-3.16.41-4.06s1.43-.85,1.27-2.08a1,1,0,0,0-.85-.81,1.71,1.71,0,0,0,.83-1.12,1,1,0,0,0-.33-1,1.85,1.85,0,0,1-.88-1.5l2.46-1.3A1.5,1.5,0,0,0,38,28.66Z"/><path d="M51.31,44.84c-.38-.37-5.82-5.85-5.82-5.85-.1.16-.16.21-.27.24S45,39.08,45,39a2.16,2.16,0,0,0,.23-.44c0-.31.21-.28-.62-1.17-.38-.41-3.6-3.64-4-4s-1-1-1.6-.33-.17,1.21.31,1.69,3.58,3.59,4,4c.93.87.91.67,1.3.52l6.07,6.1c.46.46.62.23.72.13S51.67,45.2,51.31,44.84Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="basisregels_testen"><path d="M33.32,23.41c-.15-.66.09-1.89,0-2.45a31.65,31.65,0,0,0-1.83-6C33,12,32.28,9.4,30,7.9,27.29,6.19,17.69,6,10.63,9.85,3.18,13.9,4,21.45,5.24,25.24c1.45,4.42,5.74,10.67,6,15.37.14,2.07-1.38,8.65-1.38,8.65H26.58V44.6s-4.22-2-4.42-2.18a.26.26,0,0,1-.11-.34s6.06,1.27,8.4,1.63a4.75,4.75,0,0,0,4.18-1.06c1.59-1.73.22-3.16.41-4.06s1.43-.85,1.27-2.08a1,1,0,0,0-.85-.81,1.71,1.71,0,0,0,.83-1.12,1,1,0,0,0-.33-1,1.85,1.85,0,0,1-.88-1.5l2.46-1.3A1.5,1.5,0,0,0,38,28.66Z"/><path d="M51.31,44.84c-.38-.37-5.82-5.85-5.82-5.85-.1.16-.16.21-.27.24S45,39.08,45,39a2.16,2.16,0,0,0,.23-.44c0-.31.21-.28-.62-1.17-.38-.41-3.6-3.64-4-4s-1-1-1.6-.33-.17,1.21.31,1.69,3.58,3.59,4,4c.93.87.91.67,1.3.52l6.07,6.1c.46.46.62.23.72.13S51.67,45.2,51.31,44.84Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/bevolking.svg b/packages/icons/src/svg/bevolking.svg
index 58791572c8..d43ce52282 100644
--- a/packages/icons/src/svg/bevolking.svg
+++ b/packages/icons/src/svg/bevolking.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="bevolking"><path d="M29,17c1.91,0,3-1.49,3-3.63,0-2.43-1.16-3.74-3-3.74s-3,1.54-3,3.74S27.07,17,29,17Z"/><path d="M47.63,30.35c-.41-2.39-.91-3.71-1.09-5.37-.41-3.69-1.44-5.46-3.35-6.11a8.63,8.63,0,0,0-2.76-.45h0a8.29,8.29,0,0,0-2.77.45A3.72,3.72,0,0,0,36,19.94a8.87,8.87,0,0,1,1.06,2.46l.06-.13,0,.2c.9,3.32.65,7.7.47,10.82a3.85,3.85,0,0,1-2.12,3.56c0,.39,0,.79,0,1.23a12.44,12.44,0,0,0,2,.23l.14,10.32A2.87,2.87,0,0,0,39.83,46s.18-5.19.26-7.83l.33-.06.29-.05c.08,2.59.27,7.87.27,7.87a2.86,2.86,0,0,0,2.31,2.75L43.43,38c1,.11,2,.29,2,.29,0-5.64-1.36-7.89-1.79-9.66a6.28,6.28,0,0,1,0-2.86,6.62,6.62,0,0,0,.05-3.46,5.1,5.1,0,0,1,.29.66c.45,1.43.32,4.19,2.17,10.56C47,33.37,48,32.31,47.63,30.35Z"/><path d="M34.36,10.32c1.49,0,2.35-1.19,2.35-2.9,0-1.95-.9-3-2.35-3S32,5.66,32,7.42,32.87,10.32,34.36,10.32Z"/><path d="M40.07,17h0c1.7,0,2.69-1.18,2.69-3.26s-.94-3.37-2.69-3.37-2.69,1.17-2.69,3.37C37.38,15.61,38.37,17,40.07,17Z"/><path d="M36.54,33.28c.26-4.67.75-13.07-3.43-14.3a15.6,15.6,0,0,0-8.25,0c-4.19,1.19-3.69,9.63-3.43,14.3C21.55,35.41,22.9,36,23.8,36V30.26a23.2,23.2,0,0,1,.54-6.46c.09-.26.22-.29.28-.22v28a3.35,3.35,0,0,0,3.52-3.39l.49-12.56a.36.36,0,0,1,.36-.34.37.37,0,0,1,.35.34l.49,12.57a3.35,3.35,0,0,0,3.52,3.38v-28c.09-.08.21-.06.28.22a28.57,28.57,0,0,1,.54,6.46V36C35.07,36,36.42,35.41,36.54,33.28Z"/><path d="M23.61,10.32c1.49,0,2.35-1.19,2.35-2.9,0-1.95-.9-3-2.35-3s-2.35,1.24-2.35,3S22.12,10.32,23.61,10.32Z"/><path d="M22.42,19.22h0a3.86,3.86,0,0,0-.72-.32,15.76,15.76,0,0,0-7.66,0,3.72,3.72,0,0,0-2.26,2.19c-1.27,2.9-4,11.8-4,11.8a1.08,1.08,0,0,0,.79.11C8.84,35.87,9.92,48.09,10,48.54s1.37.29,1.32-.17-.8-12.35-1-16.17a2.33,2.33,0,0,0,.61-.87c.53-1.39,1.11-3,1.5-4.18.51-1.56.84-2.69,1.27-3.7.09-.21.18-.35.27-.25V48.63c1.58,0,2.75-1.05,2.89-3.12l.46-11.45a.29.29,0,0,1,.1-.22.32.32,0,0,1,.55.22l.45,11.47c.11,2,1.12,3.1,2.92,3.1V35.82a4.41,4.41,0,0,1-.83-2.45C20.19,29.21,19.77,22.18,22.42,19.22Z"/><path d="M15.24,13.25c0,.14,0,.28,0,.44,0,2.08,1,3.26,2.69,3.26s2.69-1.34,2.69-3.26c0-1.13-.11-2.9-1.08-3.29a4.36,4.36,0,0,0-2.22.2h0c-1.66.46-3.39,1.38-3.4,2S14.57,13.12,15.24,13.25Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="bevolking"><path d="M29,17c1.91,0,3-1.49,3-3.63,0-2.43-1.16-3.74-3-3.74s-3,1.54-3,3.74S27.07,17,29,17Z"/><path d="M47.63,30.35c-.41-2.39-.91-3.71-1.09-5.37-.41-3.69-1.44-5.46-3.35-6.11a8.63,8.63,0,0,0-2.76-.45h0a8.29,8.29,0,0,0-2.77.45A3.72,3.72,0,0,0,36,19.94a8.87,8.87,0,0,1,1.06,2.46l.06-.13,0,.2c.9,3.32.65,7.7.47,10.82a3.85,3.85,0,0,1-2.12,3.56c0,.39,0,.79,0,1.23a12.44,12.44,0,0,0,2,.23l.14,10.32A2.87,2.87,0,0,0,39.83,46s.18-5.19.26-7.83l.33-.06.29-.05c.08,2.59.27,7.87.27,7.87a2.86,2.86,0,0,0,2.31,2.75L43.43,38c1,.11,2,.29,2,.29,0-5.64-1.36-7.89-1.79-9.66a6.28,6.28,0,0,1,0-2.86,6.62,6.62,0,0,0,.05-3.46,5.1,5.1,0,0,1,.29.66c.45,1.43.32,4.19,2.17,10.56C47,33.37,48,32.31,47.63,30.35Z"/><path d="M34.36,10.32c1.49,0,2.35-1.19,2.35-2.9,0-1.95-.9-3-2.35-3S32,5.66,32,7.42,32.87,10.32,34.36,10.32Z"/><path d="M40.07,17h0c1.7,0,2.69-1.18,2.69-3.26s-.94-3.37-2.69-3.37-2.69,1.17-2.69,3.37C37.38,15.61,38.37,17,40.07,17Z"/><path d="M36.54,33.28c.26-4.67.75-13.07-3.43-14.3a15.6,15.6,0,0,0-8.25,0c-4.19,1.19-3.69,9.63-3.43,14.3C21.55,35.41,22.9,36,23.8,36V30.26a23.2,23.2,0,0,1,.54-6.46c.09-.26.22-.29.28-.22v28a3.35,3.35,0,0,0,3.52-3.39l.49-12.56a.36.36,0,0,1,.36-.34.37.37,0,0,1,.35.34l.49,12.57a3.35,3.35,0,0,0,3.52,3.38v-28c.09-.08.21-.06.28.22a28.57,28.57,0,0,1,.54,6.46V36C35.07,36,36.42,35.41,36.54,33.28Z"/><path d="M23.61,10.32c1.49,0,2.35-1.19,2.35-2.9,0-1.95-.9-3-2.35-3s-2.35,1.24-2.35,3S22.12,10.32,23.61,10.32Z"/><path d="M22.42,19.22h0a3.86,3.86,0,0,0-.72-.32,15.76,15.76,0,0,0-7.66,0,3.72,3.72,0,0,0-2.26,2.19c-1.27,2.9-4,11.8-4,11.8a1.08,1.08,0,0,0,.79.11C8.84,35.87,9.92,48.09,10,48.54s1.37.29,1.32-.17-.8-12.35-1-16.17a2.33,2.33,0,0,0,.61-.87c.53-1.39,1.11-3,1.5-4.18.51-1.56.84-2.69,1.27-3.7.09-.21.18-.35.27-.25V48.63c1.58,0,2.75-1.05,2.89-3.12l.46-11.45a.29.29,0,0,1,.1-.22.32.32,0,0,1,.55.22l.45,11.47c.11,2,1.12,3.1,2.92,3.1V35.82a4.41,4.41,0,0,1-.83-2.45C20.19,29.21,19.77,22.18,22.42,19.22Z"/><path d="M15.24,13.25c0,.14,0,.28,0,.44,0,2.08,1,3.26,2.69,3.26s2.69-1.34,2.69-3.26c0-1.13-.11-2.9-1.08-3.29a4.36,4.36,0,0,0-2.22.2h0c-1.66.46-3.39,1.38-3.4,2S14.57,13.12,15.24,13.25Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/bezoek.svg b/packages/icons/src/svg/bezoek.svg
index 5aabac8f42..e804c643b3 100644
--- a/packages/icons/src/svg/bezoek.svg
+++ b/packages/icons/src/svg/bezoek.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="bezoek"><path d="M50.94,27,28.63,5.91a.92.92,0,0,0-1.26,0L5.06,27a1.9,1.9,0,0,0-.47.65,2.06,2.06,0,0,0-.17.78v1.39a1,1,0,0,0,1,1H9.15V50.44h37.7V30.82h3.76a1,1,0,0,0,1-1V28.46A2,2,0,0,0,50.94,27ZM21.74,27V24c1-.27,2-.49,3.16-.68a19.59,19.59,0,0,1,3-.28h2.23v20.3H26.1V26.55c-.61,0-1.33,0-2.13.12A18.73,18.73,0,0,0,21.74,27Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="bezoek"><path d="M50.94,27,28.63,5.91a.92.92,0,0,0-1.26,0L5.06,27a1.9,1.9,0,0,0-.47.65,2.06,2.06,0,0,0-.17.78v1.39a1,1,0,0,0,1,1H9.15V50.44h37.7V30.82h3.76a1,1,0,0,0,1-1V28.46A2,2,0,0,0,50.94,27ZM21.74,27V24c1-.27,2-.49,3.16-.68a19.59,19.59,0,0,1,3-.28h2.23v20.3H26.1V26.55c-.61,0-1.33,0-2.13.12A18.73,18.73,0,0,0,21.74,27Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/bibliotheek.svg b/packages/icons/src/svg/bibliotheek.svg
index 98bd613276..3e43a111ff 100644
--- a/packages/icons/src/svg/bibliotheek.svg
+++ b/packages/icons/src/svg/bibliotheek.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="bibliotheek"><path d="M47.2,4.42H18.68C13,4.42,6.9,6.7,6.9,12.79V45.87c0,3.42,1.9,5.7,4.94,5.7H40.36a1.8,1.8,0,0,0,1.9-1.9v-35a1.8,1.8,0,0,0-1.9-1.9H12.6c-.76,0-1.14-.76-.76-1.52C12.6,9,17.16,8.61,18.68,8.61H44.92V44h2.66a1.63,1.63,0,0,0,1.52-1.52V6.32A1.8,1.8,0,0,0,47.2,4.42Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="bibliotheek"><path d="M47.2,4.42H18.68C13,4.42,6.9,6.7,6.9,12.79V45.87c0,3.42,1.9,5.7,4.94,5.7H40.36a1.8,1.8,0,0,0,1.9-1.9v-35a1.8,1.8,0,0,0-1.9-1.9H12.6c-.76,0-1.14-.76-.76-1.52C12.6,9,17.16,8.61,18.68,8.61H44.92V44h2.66a1.63,1.63,0,0,0,1.52-1.52V6.32A1.8,1.8,0,0,0,47.2,4.42Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/binnen_met_zitplaats.svg b/packages/icons/src/svg/binnen_met_zitplaats.svg
index 72387f08ab..d408f29963 100644
--- a/packages/icons/src/svg/binnen_met_zitplaats.svg
+++ b/packages/icons/src/svg/binnen_met_zitplaats.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="binnen_met_zitplaats"><path d="M28.64,5.73,51,26.86a1.91,1.91,0,0,1,.61,1.41v1.41a1,1,0,0,1-.95.95H46.86V50.51H9.14V30.63H5.37a1,1,0,0,1-1-.95V28.27A1.91,1.91,0,0,1,5,26.86L27.36,5.73A1,1,0,0,1,28.64,5.73ZM24.11,22.16a2.66,2.66,0,0,1-2.28,3.33A2.63,2.63,0,0,1,18.61,23c-.28-1.77.48-3.15,2.27-3.42S23.8,20.21,24.11,22.16Zm6.77,10.59c2.21-.73,2.77-.78,4.31,1A66,66,0,0,1,41,41.82l.11.17,0,0,0,0c-.5.37-1.47,1.1-3.5-.58-.23-.19-.51-.45-.51-.45s-1.65-3.47-2.12-4.54c-.08-.17-.22-.15-.25-.11L36.94,47.8a2.76,2.76,0,0,1-3.34-2.11c-.8-2.47-2.16-7-2.16-7s-4.66.94-6,1.19c-1.9.34-3.31-.53-3.7-1.86q-1.17-4-2-8.15c-.73-3.65,4.37-5,5.71-1,.55,1.79,1.16,3.56,1.81,5.32,1.21-.51,2.49-1,3.68-1.43Zm-1.2,7.37h-.06c-.35.07-2.09.41-4.4.83a3.85,3.85,0,0,1-4.64-2.75L18.81,31a.88.88,0,0,0-1.07-.63.87.87,0,0,0-.63,1.05h0l1.78,7.18A5.36,5.36,0,0,0,21,41.77l-2,6.09h1.84l1.74-5.32a6.2,6.2,0,0,0,1.74.25,6.06,6.06,0,0,0,1.19-.11l.2,0,.41-.07,2.11,5.29h1.88l-2.24-5.62c1.3-.24,2.13-.41,2.13-.41a.86.86,0,0,0,.64-1A.87.87,0,0,0,29.68,40.12Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="binnen_met_zitplaats"><path d="M28.64,5.73,51,26.86a1.91,1.91,0,0,1,.61,1.41v1.41a1,1,0,0,1-.95.95H46.86V50.51H9.14V30.63H5.37a1,1,0,0,1-1-.95V28.27A1.91,1.91,0,0,1,5,26.86L27.36,5.73A1,1,0,0,1,28.64,5.73ZM24.11,22.16a2.66,2.66,0,0,1-2.28,3.33A2.63,2.63,0,0,1,18.61,23c-.28-1.77.48-3.15,2.27-3.42S23.8,20.21,24.11,22.16Zm6.77,10.59c2.21-.73,2.77-.78,4.31,1A66,66,0,0,1,41,41.82l.11.17,0,0,0,0c-.5.37-1.47,1.1-3.5-.58-.23-.19-.51-.45-.51-.45s-1.65-3.47-2.12-4.54c-.08-.17-.22-.15-.25-.11L36.94,47.8a2.76,2.76,0,0,1-3.34-2.11c-.8-2.47-2.16-7-2.16-7s-4.66.94-6,1.19c-1.9.34-3.31-.53-3.7-1.86q-1.17-4-2-8.15c-.73-3.65,4.37-5,5.71-1,.55,1.79,1.16,3.56,1.81,5.32,1.21-.51,2.49-1,3.68-1.43Zm-1.2,7.37h-.06c-.35.07-2.09.41-4.4.83a3.85,3.85,0,0,1-4.64-2.75L18.81,31a.88.88,0,0,0-1.07-.63.87.87,0,0,0-.63,1.05h0l1.78,7.18A5.36,5.36,0,0,0,21,41.77l-2,6.09h1.84l1.74-5.32a6.2,6.2,0,0,0,1.74.25,6.06,6.06,0,0,0,1.19-.11l.2,0,.41-.07,2.11,5.29h1.88l-2.24-5.62c1.3-.24,2.13-.41,2.13-.41a.86.86,0,0,0,.64-1A.87.87,0,0,0,29.68,40.12Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/binnen_zonder_zitplaats.svg b/packages/icons/src/svg/binnen_zonder_zitplaats.svg
index 6724ff90da..95769e2465 100644
--- a/packages/icons/src/svg/binnen_zonder_zitplaats.svg
+++ b/packages/icons/src/svg/binnen_zonder_zitplaats.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="binnen_zonder_zitplaats"><path d="M51,26.91,28.64,5.79h0a.93.93,0,0,0-1.28,0L5,26.91a1.91,1.91,0,0,0-.61,1.41v1.41h0a1,1,0,0,0,1,.95H9.14V50.57H46.86V30.68h3.77a1,1,0,0,0,.95-.95V28.32A1.93,1.93,0,0,0,51,26.91Zm-23-7c1.42,0,2.3.91,2.3,2.6A2.25,2.25,0,0,1,28,25c-1.46,0-2.3-.9-2.3-2.51S26.51,19.91,28,19.91Zm-8.44.51c1.26,0,2.05.82,2.05,2.34A2,2,0,0,1,19.56,25h0c-1.3,0-2-.81-2-2.26S18.23,20.42,19.56,20.42Zm2.56,27.12a2,2,0,0,1-2.23-2.16l-.34-8.47a.23.23,0,0,0-.24-.22.25.25,0,0,0-.26.22l-.34,8.46a2.1,2.1,0,0,1-2.21,2.16V29.37c-.07-.07-.16,0-.2.17a10.87,10.87,0,0,0-.37,3.16v4.48a1.76,1.76,0,0,1-1.75-1.74c-.27-2.65-.48-8.23,2.43-9.06a13.08,13.08,0,0,1,5.84,0,3.32,3.32,0,0,1,.55.22c-2,2-1.7,6.86-1.52,9.76v.06a2.82,2.82,0,0,0,.63,1.71ZM33.76,36.32v0A1.81,1.81,0,0,1,32,38.26v-4a18,18,0,0,0-.41-4.49c-.06-.19-.15-.21-.21-.15v20a2.45,2.45,0,0,1-2.68-2.35L28.27,38a.27.27,0,0,0-.54,0l-.38,9.24a2.45,2.45,0,0,1-2.68,2.35V29.63c0-.05-.14,0-.21.15a14.72,14.72,0,0,0-.41,4.49v4a1.81,1.81,0,0,1-1.8-1.89v-.06c-.2-3.26-.55-9,2.62-9.88a13.07,13.07,0,0,1,6.28,0C34.31,27.29,34,33.07,33.76,36.32Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="binnen_zonder_zitplaats"><path d="M51,26.91,28.64,5.79h0a.93.93,0,0,0-1.28,0L5,26.91a1.91,1.91,0,0,0-.61,1.41v1.41h0a1,1,0,0,0,1,.95H9.14V50.57H46.86V30.68h3.77a1,1,0,0,0,.95-.95V28.32A1.93,1.93,0,0,0,51,26.91Zm-23-7c1.42,0,2.3.91,2.3,2.6A2.25,2.25,0,0,1,28,25c-1.46,0-2.3-.9-2.3-2.51S26.51,19.91,28,19.91Zm-8.44.51c1.26,0,2.05.82,2.05,2.34A2,2,0,0,1,19.56,25h0c-1.3,0-2-.81-2-2.26S18.23,20.42,19.56,20.42Zm2.56,27.12a2,2,0,0,1-2.23-2.16l-.34-8.47a.23.23,0,0,0-.24-.22.25.25,0,0,0-.26.22l-.34,8.46a2.1,2.1,0,0,1-2.21,2.16V29.37c-.07-.07-.16,0-.2.17a10.87,10.87,0,0,0-.37,3.16v4.48a1.76,1.76,0,0,1-1.75-1.74c-.27-2.65-.48-8.23,2.43-9.06a13.08,13.08,0,0,1,5.84,0,3.32,3.32,0,0,1,.55.22c-2,2-1.7,6.86-1.52,9.76v.06a2.82,2.82,0,0,0,.63,1.71ZM33.76,36.32v0A1.81,1.81,0,0,1,32,38.26v-4a18,18,0,0,0-.41-4.49c-.06-.19-.15-.21-.21-.15v20a2.45,2.45,0,0,1-2.68-2.35L28.27,38a.27.27,0,0,0-.54,0l-.38,9.24a2.45,2.45,0,0,1-2.68,2.35V29.63c0-.05-.14,0-.21.15a14.72,14.72,0,0,0-.41,4.49v4a1.81,1.81,0,0,1-1.8-1.89v-.06c-.2-3.26-.55-9,2.62-9.88a13.07,13.07,0,0,1,6.28,0C34.31,27.29,34,33.07,33.76,36.32Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/binnensporten.svg b/packages/icons/src/svg/binnensporten.svg
index 887e32b9b0..2202d67afb 100644
--- a/packages/icons/src/svg/binnensporten.svg
+++ b/packages/icons/src/svg/binnensporten.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="binnensporten"><path d="M51,27.38l-22.53-21a.91.91,0,0,0-1.2,0L5,27.38a2.29,2.29,0,0,0-.6,1.5v1.2a.8.8,0,0,0,.9.9H9.23V50.5H46.77V31.28h3.91a.8.8,0,0,0,.9-.9v-1.5A2.29,2.29,0,0,0,51,27.38Zm-30-6.91a2,2,0,0,1,2.7,1.8c.31,1.5-.3,2.7-1.5,3-1.5.6-2.4,0-2.7-1.51A2.35,2.35,0,0,1,20.94,20.47Zm9.91,18.32c-.3,1.8-3,6.61-3.6,7.81a2.9,2.9,0,0,1-.9-3.3c.3-1.21,1.2-3,1.5-4.21a17.27,17.27,0,0,0-3-.6c-.3,2.4-.6,3.6-.6,4.2a11.08,11.08,0,0,1-.61,1.81c-1.2,1.8-3.9,5.4-4.5,6a3.15,3.15,0,0,1,0-3.6c.6-.9,1.5-2.7,1.8-3.3,0-.3.3-.6.3-1.21a22.5,22.5,0,0,1,.3-3.6H24v-.3a4.47,4.47,0,0,1-2.71-1.2c-.6-1.2.3-2.7-.3-6-1.8.9-1.8,1.2-2.1,1.8A23,23,0,0,0,17,37.89a2.46,2.46,0,0,1-1.2-3l.9-2.71c0-.3.3-.6.6-.9.3-.9,1.5-1.8,2.1-2.4,2.1-1.8,3-2.1,6-4.51.6-.6,1.2-.9,1.5-1.8a23.92,23.92,0,0,0,.9-4.5c.3,0,1.8.3,1.5,3a5.89,5.89,0,0,1-.9,3,7.2,7.2,0,0,1-3,3,25.72,25.72,0,0,1,.3,7.21c1.5.6,4.5,1.5,5.1,3Zm4.51-17.72a2.26,2.26,0,0,1-3.61,0,3.15,3.15,0,0,1,0-3.9c.91-1.21,2.71-.91,3.91,0A2.8,2.8,0,0,1,35.36,21.07Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="binnensporten"><path d="M51,27.38l-22.53-21a.91.91,0,0,0-1.2,0L5,27.38a2.29,2.29,0,0,0-.6,1.5v1.2a.8.8,0,0,0,.9.9H9.23V50.5H46.77V31.28h3.91a.8.8,0,0,0,.9-.9v-1.5A2.29,2.29,0,0,0,51,27.38Zm-30-6.91a2,2,0,0,1,2.7,1.8c.31,1.5-.3,2.7-1.5,3-1.5.6-2.4,0-2.7-1.51A2.35,2.35,0,0,1,20.94,20.47Zm9.91,18.32c-.3,1.8-3,6.61-3.6,7.81a2.9,2.9,0,0,1-.9-3.3c.3-1.21,1.2-3,1.5-4.21a17.27,17.27,0,0,0-3-.6c-.3,2.4-.6,3.6-.6,4.2a11.08,11.08,0,0,1-.61,1.81c-1.2,1.8-3.9,5.4-4.5,6a3.15,3.15,0,0,1,0-3.6c.6-.9,1.5-2.7,1.8-3.3,0-.3.3-.6.3-1.21a22.5,22.5,0,0,1,.3-3.6H24v-.3a4.47,4.47,0,0,1-2.71-1.2c-.6-1.2.3-2.7-.3-6-1.8.9-1.8,1.2-2.1,1.8A23,23,0,0,0,17,37.89a2.46,2.46,0,0,1-1.2-3l.9-2.71c0-.3.3-.6.6-.9.3-.9,1.5-1.8,2.1-2.4,2.1-1.8,3-2.1,6-4.51.6-.6,1.2-.9,1.5-1.8a23.92,23.92,0,0,0,.9-4.5c.3,0,1.8.3,1.5,3a5.89,5.89,0,0,1-.9,3,7.2,7.2,0,0,1-3,3,25.72,25.72,0,0,1,.3,7.21c1.5.6,4.5,1.5,5.1,3Zm4.51-17.72a2.26,2.26,0,0,1-3.61,0,3.15,3.15,0,0,1,0-3.9c.91-1.21,2.71-.91,3.91,0A2.8,2.8,0,0,1,35.36,21.07Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/binnensportlocaties.svg b/packages/icons/src/svg/binnensportlocaties.svg
index 6851f1d7c3..b4bc4c20ac 100644
--- a/packages/icons/src/svg/binnensportlocaties.svg
+++ b/packages/icons/src/svg/binnensportlocaties.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="binnensportlocaties"><path d="M51.43,27.59A1.83,1.83,0,0,0,51,27L28.63,5.83a.89.89,0,0,0-1.26,0L5,27a1.83,1.83,0,0,0-.47.63,2,2,0,0,0-.15.77v1.4a.91.91,0,0,0,.28.67,1,1,0,0,0,.66.29H9.14V50.53H46.86V30.72h3.78a1,1,0,0,0,.66-.29.91.91,0,0,0,.28-.67v-1.4A2,2,0,0,0,51.43,27.59ZM26.2,22.15a2.08,2.08,0,0,1,.29-.88,2.05,2.05,0,0,1,.63-.68,2.21,2.21,0,0,1,.85-.36,2.24,2.24,0,0,1,.93,0,2.3,2.3,0,0,1,.87.36,2.12,2.12,0,0,1,.63.7,2.14,2.14,0,0,1,.27.9,2.07,2.07,0,0,1-.15.92,2.17,2.17,0,0,1-.3.85,2.14,2.14,0,0,1-.62.65,2.24,2.24,0,0,1-.83.34,2.28,2.28,0,0,1-.9,0h0a2.22,2.22,0,0,1-.86-.34,2,2,0,0,1-.63-.68,2,2,0,0,1-.28-.88A2,2,0,0,1,26.2,22.15Zm4.95,11.09a7.88,7.88,0,0,1-2.32-2.92c-.34,1.44-.76,3.24-1.06,4.78,3,2.21,3.6,2.77,3.83,3.26A4.48,4.48,0,0,1,31.84,40v3c-.06,1.83-.13,3-.24,4.84a2.83,2.83,0,0,1-1.41-.76,2.8,2.8,0,0,1-.77-1.42A50,50,0,0,0,28.9,40a26.92,26.92,0,0,0-2.45-1.27c-.17.26-.37.59-.6.94-.57.9-1.24,2-1.72,2.66-.67,1-1,1.33-1.89,1.33a23.17,23.17,0,0,1-6.65-1.8s.58-1.8,2.25-1.44a24.69,24.69,0,0,0,3.91.72,36.62,36.62,0,0,0,1.8-3.6l1.53.25c.18,0,.18-.09.18-.09l-.17-.1c-1.28-.77-2.41-1.44-2.13-3.34l.05-.31c.19-1.21.63-3.9,1.14-5.85a8.36,8.36,0,0,0-2.42.61,19.73,19.73,0,0,0-2.88,4.13,1.93,1.93,0,0,1-.52-2.47,12.05,12.05,0,0,1,2.07-3.28,10.5,10.5,0,0,1,5.8-1.35,4.08,4.08,0,0,1,4.07,2.94,14.44,14.44,0,0,0,1.8,2.79,35.07,35.07,0,0,0,4.09.47h0a2,2,0,0,1-1.8,1.54A8.37,8.37,0,0,1,31.15,33.24Zm8.76,11.6a2.54,2.54,0,0,1-1.13.92,2.51,2.51,0,0,1-3.29-3.29,2.52,2.52,0,1,1,4.42,2.37Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="binnensportlocaties"><path d="M51.43,27.59A1.83,1.83,0,0,0,51,27L28.63,5.83a.89.89,0,0,0-1.26,0L5,27a1.83,1.83,0,0,0-.47.63,2,2,0,0,0-.15.77v1.4a.91.91,0,0,0,.28.67,1,1,0,0,0,.66.29H9.14V50.53H46.86V30.72h3.78a1,1,0,0,0,.66-.29.91.91,0,0,0,.28-.67v-1.4A2,2,0,0,0,51.43,27.59ZM26.2,22.15a2.08,2.08,0,0,1,.29-.88,2.05,2.05,0,0,1,.63-.68,2.21,2.21,0,0,1,.85-.36,2.24,2.24,0,0,1,.93,0,2.3,2.3,0,0,1,.87.36,2.12,2.12,0,0,1,.63.7,2.14,2.14,0,0,1,.27.9,2.07,2.07,0,0,1-.15.92,2.17,2.17,0,0,1-.3.85,2.14,2.14,0,0,1-.62.65,2.24,2.24,0,0,1-.83.34,2.28,2.28,0,0,1-.9,0h0a2.22,2.22,0,0,1-.86-.34,2,2,0,0,1-.63-.68,2,2,0,0,1-.28-.88A2,2,0,0,1,26.2,22.15Zm4.95,11.09a7.88,7.88,0,0,1-2.32-2.92c-.34,1.44-.76,3.24-1.06,4.78,3,2.21,3.6,2.77,3.83,3.26A4.48,4.48,0,0,1,31.84,40v3c-.06,1.83-.13,3-.24,4.84a2.83,2.83,0,0,1-1.41-.76,2.8,2.8,0,0,1-.77-1.42A50,50,0,0,0,28.9,40a26.92,26.92,0,0,0-2.45-1.27c-.17.26-.37.59-.6.94-.57.9-1.24,2-1.72,2.66-.67,1-1,1.33-1.89,1.33a23.17,23.17,0,0,1-6.65-1.8s.58-1.8,2.25-1.44a24.69,24.69,0,0,0,3.91.72,36.62,36.62,0,0,0,1.8-3.6l1.53.25c.18,0,.18-.09.18-.09l-.17-.1c-1.28-.77-2.41-1.44-2.13-3.34l.05-.31c.19-1.21.63-3.9,1.14-5.85a8.36,8.36,0,0,0-2.42.61,19.73,19.73,0,0,0-2.88,4.13,1.93,1.93,0,0,1-.52-2.47,12.05,12.05,0,0,1,2.07-3.28,10.5,10.5,0,0,1,5.8-1.35,4.08,4.08,0,0,1,4.07,2.94,14.44,14.44,0,0,0,1.8,2.79,35.07,35.07,0,0,0,4.09.47h0a2,2,0,0,1-1.8,1.54A8.37,8.37,0,0,1,31.15,33.24Zm8.76,11.6a2.54,2.54,0,0,1-1.13.92,2.51,2.51,0,0,1-3.29-3.29,2.52,2.52,0,1,1,4.42,2.37Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/boosterprik.svg b/packages/icons/src/svg/boosterprik.svg
index 9339b602bf..59b2b5bb1a 100644
--- a/packages/icons/src/svg/boosterprik.svg
+++ b/packages/icons/src/svg/boosterprik.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="boosterprik"><path d="M41.74,27.5c1.5.92,3-1.16,2-2.2L38.7,19.87,44.2,14s.79.55,2.48,1.55a1.54,1.54,0,0,0,1.84-2.43L40.91,4.9c-1.24-1.34-3.07.42-2.26,2,.94,1.81,1.44,2.66,1.44,2.66l-4.28,4.6s.73,1.56,2,4.3c.12.26,0,.36-.07.38L29.55,10c-1-1-2.9.56-2.05,2.17s2,3.66,2,3.66L15.35,31.08a3.65,3.65,0,0,0-.91,1.83L13,41.27,4.48,50.69H7.34l7.33-7.57,7.8-1.58a3.27,3.27,0,0,0,1.7-1L38.33,25.35S40.27,26.61,41.74,27.5Zm-8.91-1.33-2.35-2.52-1.17,2.52,1.76,1.9L29.31,30,27,27.43,25.79,30l1.76,1.89-1.76,1.89-2.35-2.52-1.17,2.52L24,35.63l-1.76,1.89-4.11-4.41,13.5-14.5L35.76,23Z"/><polygon points="44.14 41.67 44.14 35.07 40.84 35.07 40.84 41.67 34.23 41.67 34.23 44.97 40.84 44.97 40.84 51.57 44.14 51.57 44.14 44.97 50.74 44.97 50.74 41.67 44.14 41.67"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="boosterprik"><path d="M41.74,27.5c1.5.92,3-1.16,2-2.2L38.7,19.87,44.2,14s.79.55,2.48,1.55a1.54,1.54,0,0,0,1.84-2.43L40.91,4.9c-1.24-1.34-3.07.42-2.26,2,.94,1.81,1.44,2.66,1.44,2.66l-4.28,4.6s.73,1.56,2,4.3c.12.26,0,.36-.07.38L29.55,10c-1-1-2.9.56-2.05,2.17s2,3.66,2,3.66L15.35,31.08a3.65,3.65,0,0,0-.91,1.83L13,41.27,4.48,50.69H7.34l7.33-7.57,7.8-1.58a3.27,3.27,0,0,0,1.7-1L38.33,25.35S40.27,26.61,41.74,27.5Zm-8.91-1.33-2.35-2.52-1.17,2.52,1.76,1.9L29.31,30,27,27.43,25.79,30l1.76,1.89-1.76,1.89-2.35-2.52-1.17,2.52L24,35.63l-1.76,1.89-4.11-4.41,13.5-14.5L35.76,23Z"/><polygon points="44.14 41.67 44.14 35.07 40.84 35.07 40.84 41.67 34.23 41.67 34.23 44.97 40.84 44.97 40.84 51.57 44.14 51.57 44.14 44.97 50.74 44.97 50.74 41.67 44.14 41.67"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/calendar.svg b/packages/icons/src/svg/calendar.svg
index 4c85930158..ab628989af 100644
--- a/packages/icons/src/svg/calendar.svg
+++ b/packages/icons/src/svg/calendar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="calendar"><path d="M48.21,11.48H42.6V6.81c0-1.87-1.58-2.34-3.37-2.34s-3.37.47-3.37,2.34v4.67H20.14V6.81c0-1.87-1.57-2.34-3.37-2.34s-3.37.47-3.37,2.34v4.67H7.79A3.53,3.53,0,0,0,4.42,15V48.13a3.53,3.53,0,0,0,3.37,3.5H48.21a3.53,3.53,0,0,0,3.37-3.5V15A3.53,3.53,0,0,0,48.21,11.48ZM47.09,23.16V33.52h-11V23.16ZM22.66,33.52V23.16h11V33.52Zm11,2.62V47H22.66V36.14Zm-24.7-13H20.14V33.52H8.91v2.62H20.14V47H8.91ZM36.13,47V36.14h11V47Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="calendar"><path d="M48.21,11.48H42.6V6.81c0-1.87-1.58-2.34-3.37-2.34s-3.37.47-3.37,2.34v4.67H20.14V6.81c0-1.87-1.57-2.34-3.37-2.34s-3.37.47-3.37,2.34v4.67H7.79A3.53,3.53,0,0,0,4.42,15V48.13a3.53,3.53,0,0,0,3.37,3.5H48.21a3.53,3.53,0,0,0,3.37-3.5V15A3.53,3.53,0,0,0,48.21,11.48ZM47.09,23.16V33.52h-11V23.16ZM22.66,33.52V23.16h11V33.52Zm11,2.62V47H22.66V36.14Zm-24.7-13H20.14V33.52H8.91v2.62H20.14V47H8.91ZM36.13,47V36.14h11V47Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/check.svg b/packages/icons/src/svg/check.svg
index a5661c6a23..2bfcfa9e21 100644
--- a/packages/icons/src/svg/check.svg
+++ b/packages/icons/src/svg/check.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="check"><polygon points="23.28 49.18 4.42 30.03 10.29 24.25 22.5 36.64 44.72 7.64 51.26 12.65 23.28 49.18"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="check"><polygon points="23.28 49.18 4.42 30.03 10.29 24.25 22.5 36.64 44.72 7.64 51.26 12.65 23.28 49.18"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/checked.svg b/packages/icons/src/svg/checked.svg
index 22924557d0..a24489bc08 100644
--- a/packages/icons/src/svg/checked.svg
+++ b/packages/icons/src/svg/checked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="checked"><path d="M4.42,4.42V51.57H51.57V4.42ZM42.09,16.88l-14,23.17a2.14,2.14,0,0,1-1.84,1h0A2.12,2.12,0,0,1,24.39,40l-9.18-15.4a2.16,2.16,0,0,1,3.25-2.75L26,28.49,38.65,14.31A2.14,2.14,0,0,1,41.53,14,2.16,2.16,0,0,1,42.09,16.88Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="checked"><path d="M4.42,4.42V51.57H51.57V4.42ZM42.09,16.88l-14,23.17a2.14,2.14,0,0,1-1.84,1h0A2.12,2.12,0,0,1,24.39,40l-9.18-15.4a2.16,2.16,0,0,1,3.25-2.75L26,28.49,38.65,14.31A2.14,2.14,0,0,1,41.53,14,2.16,2.16,0,0,1,42.09,16.88Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/chevron_down.svg b/packages/icons/src/svg/chevron_down.svg
index 99313ae92d..51285e5678 100644
--- a/packages/icons/src/svg/chevron_down.svg
+++ b/packages/icons/src/svg/chevron_down.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="chevron_down"><path d="M50.81,16.05a2.63,2.63,0,0,0-3.71,0L28,35.16,8.9,16.05a2.62,2.62,0,0,0-3.71,3.71L28,42.56l22.81-22.8A2.63,2.63,0,0,0,50.81,16.05Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="chevron_down"><path d="M50.81,16.05a2.63,2.63,0,0,0-3.71,0L28,35.16,8.9,16.05a2.62,2.62,0,0,0-3.71,3.71L28,42.56l22.81-22.8A2.63,2.63,0,0,0,50.81,16.05Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/chevron_right.svg b/packages/icons/src/svg/chevron_right.svg
index 4733ddebe2..ed424fc83e 100644
--- a/packages/icons/src/svg/chevron_right.svg
+++ b/packages/icons/src/svg/chevron_right.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="chevron_right"><path d="M16.32,5.19a2.63,2.63,0,0,0,0,3.71L35.42,28,16.32,47.1A2.62,2.62,0,0,0,20,50.81L42.83,28,20,5.19A2.62,2.62,0,0,0,16.32,5.19Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="chevron_right"><path d="M16.32,5.19a2.63,2.63,0,0,0,0,3.71L35.42,28,16.32,47.1A2.62,2.62,0,0,0,20,50.81L42.83,28,20,5.19A2.62,2.62,0,0,0,16.32,5.19Z"/></g></svg>
diff --git a/packages/icons/src/svg/clock.svg b/packages/icons/src/svg/clock.svg
index 04a023a1f5..b9fd091c46 100644
--- a/packages/icons/src/svg/clock.svg
+++ b/packages/icons/src/svg/clock.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="clock"><path d="M28,4.42A23.58,23.58,0,1,0,51.58,28,23.61,23.61,0,0,0,28,4.42Zm0,44.21A20.63,20.63,0,1,1,48.63,28,20.65,20.65,0,0,1,28,48.63Z"/><path d="M38.32,28H28V14.74a1.48,1.48,0,1,0-2.95,0V29.47A1.48,1.48,0,0,0,26.53,31H38.32a1.48,1.48,0,0,0,0-2.95Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="clock"><path d="M28,4.42A23.58,23.58,0,1,0,51.58,28,23.61,23.61,0,0,0,28,4.42Zm0,44.21A20.63,20.63,0,1,1,48.63,28,20.65,20.65,0,0,1,28,48.63Z"/><path d="M38.32,28H28V14.74a1.48,1.48,0,1,0-2.95,0V29.47A1.48,1.48,0,0,0,26.53,31H38.32a1.48,1.48,0,0,0,0-2.95Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/close.svg b/packages/icons/src/svg/close.svg
index 382fbd9708..9ab9f8d6ac 100644
--- a/packages/icons/src/svg/close.svg
+++ b/packages/icons/src/svg/close.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="close"><path d="M31.23,28.05,50.91,8.37a2.28,2.28,0,1,0-3.23-3.23L28,24.82,8.32,5.14A2.28,2.28,0,0,0,5.09,8.37L24.77,28.05,5.09,47.73a2.29,2.29,0,0,0,1.62,3.9A2.26,2.26,0,0,0,8.32,51L28,31.28,47.68,51a2.28,2.28,0,1,0,3.23-3.23Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="close"><path d="M31.23,28.05,50.91,8.37a2.28,2.28,0,1,0-3.23-3.23L28,24.82,8.32,5.14A2.28,2.28,0,0,0,5.09,8.37L24.77,28.05,5.09,47.73a2.29,2.29,0,0,0,1.62,3.9A2.26,2.26,0,0,0,8.32,51L28,31.28,47.68,51a2.28,2.28,0,1,0,3.23-3.23Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/close_thick.svg b/packages/icons/src/svg/close_thick.svg
index 10956ace52..75395694b0 100644
--- a/packages/icons/src/svg/close_thick.svg
+++ b/packages/icons/src/svg/close_thick.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="close_thick"><path d="M32.94,28,51.58,9.36,46.64,4.42,28,23.06,9.36,4.42,4.42,9.36,23.06,28,4.42,46.64l4.94,4.94L28,32.94,46.64,51.58l4.94-4.94Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="close_thick"><path d="M32.94,28,51.58,9.36,46.64,4.42,28,23.06,9.36,4.42,4.42,9.36,23.06,28,4.42,46.64l4.94,4.94L28,32.94,46.64,51.58l4.94-4.94Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/contact_beroepen.svg b/packages/icons/src/svg/contact_beroepen.svg
index f2f241ce2c..fb7bca0ded 100644
--- a/packages/icons/src/svg/contact_beroepen.svg
+++ b/packages/icons/src/svg/contact_beroepen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="contact_beroepen"><path d="M26.47,25.34s-1.41-2-2.54-1.13c-1.13-.85-2.54,1.13-2.54,1.13s1.41,1.41,2.54,1.41S26.47,25.34,26.47,25.34Z"/><path d="M35.22,34.37a40.12,40.12,0,0,1-4.8-2.26,8,8,0,0,0-.14-1.27,7.83,7.83,0,0,1-.14-1.27,12.08,12.08,0,0,0,3.1-5.93,5.31,5.31,0,0,0,1.7-4.23,5.13,5.13,0,0,0-.85-3.11C35.22,10.09,31.83,4.44,27,5.57A7.64,7.64,0,0,0,22.8,4.44c-4.52.29-10.17,5.65-8.75,12.14a5.14,5.14,0,0,0-.85,3.11,5.34,5.34,0,0,0,1.69,4.24v.28h-.56a3.22,3.22,0,0,0-3.67,3.1c-.57,3.11-2,2-2,2a4.62,4.62,0,0,1-.84-1.69S5,30.14,7,32.68a6.54,6.54,0,0,0,3.1,2,8.1,8.1,0,0,1,3.39-1.13c.35,0,.48,0,.53.07s0,.11,0,.22l-1.13.56c-1.7.85-3.39,1.69-4,2.54-2.25,2-3.38,10.45-3.38,10.45H26.47l11-11.86A5.73,5.73,0,0,0,35.22,34.37ZM23.93,42s-7.34-1.69-9-6.21l1-.4c2.27-.88,3.77-1.47,3.77-2.7,0-.18.11-.89.26-1.88.09-.61.2-1.32.31-2.08a8.31,8.31,0,0,1-3.11-6.21c-1.13-.28-1.41-1.69-1.41-2.82V18.56A1,1,0,0,1,16,18c.28-.29.57,0,.85.28v-1.7a17.31,17.31,0,0,0,9.32-4.79A6.88,6.88,0,0,1,30.42,14v.29a4.76,4.76,0,0,1,.26.71,1.57,1.57,0,0,0,.31.7V18a1,1,0,0,1,.84-.29c.57.57.57.85.57,2s-.29,2.54-1.41,2.82c0,2.54-1.7,4.8-3.39,6.5a5,5,0,0,0-.46.34,4.45,4.45,0,0,1-3.21,1.07,5.53,5.53,0,0,1-2.26-.28,2.81,2.81,0,0,0,2.54,2A4.49,4.49,0,0,0,27,31.37a7.31,7.31,0,0,1,.84-.39c0,.29,0,1.41.28,1.7.26,1.3,1.73,1.88,4.17,2.85l.63.25C31.27,40.3,23.93,42,23.93,42Z"/><path d="M36.07,47.36h6.21s-.28-2.54-.85-5.08Z"/><path d="M50.75,33.52a2.72,2.72,0,0,0-2.83-.84,3.92,3.92,0,0,0-2.82,1.41l-5.64,5.08-.29-.28s5.08-5.37,5.08-5.65c1.7-1.69,2-4.23.57-5.64A2.12,2.12,0,0,0,43.41,27a6.2,6.2,0,0,1,0-3.39c.28-.56,0-1.13-.57-1.13-.56-.28-1.13,0-1.13.57a10.86,10.86,0,0,0-.28,4,3.91,3.91,0,0,0-2.26,1.41,4,4,0,0,0-1.41,2.83,3.14,3.14,0,0,0,.85,2.82,2.46,2.46,0,0,0,1.69.85L27,49.05a1.38,1.38,0,0,0,0,2,1.49,1.49,0,0,0,1.13.56,1.71,1.71,0,0,0,1.13-.28L43.41,38a2,2,0,0,0,.84,1.69,3.21,3.21,0,0,0,2.26.85h.57a3.9,3.9,0,0,0,2.82-1.41,3.9,3.9,0,0,0,1.41-2.82A3.32,3.32,0,0,0,50.75,33.52ZM40,32.68a1.14,1.14,0,0,1-.56-1.13A3,3,0,0,1,42,29h.28a1.71,1.71,0,0,1,1.13.28c.56.56.28,2-.57,3.1C42,33.24,40.58,33.52,40,32.68ZM37.76,42a1.23,1.23,0,0,1-1.41,0,1,1,0,1,1,1.41-1.41A1.29,1.29,0,0,1,37.76,42Zm11-4.23a2.46,2.46,0,0,1-1.69.85,3,3,0,0,1-1.41-.29,2.05,2.05,0,0,1-.29-1.41,3,3,0,0,1,2.54-2.54h.29a2.17,2.17,0,0,1,1.13.28,3.1,3.1,0,0,1,.28,1.41A2.44,2.44,0,0,1,48.77,37.76Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="contact_beroepen"><path d="M26.47,25.34s-1.41-2-2.54-1.13c-1.13-.85-2.54,1.13-2.54,1.13s1.41,1.41,2.54,1.41S26.47,25.34,26.47,25.34Z"/><path d="M35.22,34.37a40.12,40.12,0,0,1-4.8-2.26,8,8,0,0,0-.14-1.27,7.83,7.83,0,0,1-.14-1.27,12.08,12.08,0,0,0,3.1-5.93,5.31,5.31,0,0,0,1.7-4.23,5.13,5.13,0,0,0-.85-3.11C35.22,10.09,31.83,4.44,27,5.57A7.64,7.64,0,0,0,22.8,4.44c-4.52.29-10.17,5.65-8.75,12.14a5.14,5.14,0,0,0-.85,3.11,5.34,5.34,0,0,0,1.69,4.24v.28h-.56a3.22,3.22,0,0,0-3.67,3.1c-.57,3.11-2,2-2,2a4.62,4.62,0,0,1-.84-1.69S5,30.14,7,32.68a6.54,6.54,0,0,0,3.1,2,8.1,8.1,0,0,1,3.39-1.13c.35,0,.48,0,.53.07s0,.11,0,.22l-1.13.56c-1.7.85-3.39,1.69-4,2.54-2.25,2-3.38,10.45-3.38,10.45H26.47l11-11.86A5.73,5.73,0,0,0,35.22,34.37ZM23.93,42s-7.34-1.69-9-6.21l1-.4c2.27-.88,3.77-1.47,3.77-2.7,0-.18.11-.89.26-1.88.09-.61.2-1.32.31-2.08a8.31,8.31,0,0,1-3.11-6.21c-1.13-.28-1.41-1.69-1.41-2.82V18.56A1,1,0,0,1,16,18c.28-.29.57,0,.85.28v-1.7a17.31,17.31,0,0,0,9.32-4.79A6.88,6.88,0,0,1,30.42,14v.29a4.76,4.76,0,0,1,.26.71,1.57,1.57,0,0,0,.31.7V18a1,1,0,0,1,.84-.29c.57.57.57.85.57,2s-.29,2.54-1.41,2.82c0,2.54-1.7,4.8-3.39,6.5a5,5,0,0,0-.46.34,4.45,4.45,0,0,1-3.21,1.07,5.53,5.53,0,0,1-2.26-.28,2.81,2.81,0,0,0,2.54,2A4.49,4.49,0,0,0,27,31.37a7.31,7.31,0,0,1,.84-.39c0,.29,0,1.41.28,1.7.26,1.3,1.73,1.88,4.17,2.85l.63.25C31.27,40.3,23.93,42,23.93,42Z"/><path d="M36.07,47.36h6.21s-.28-2.54-.85-5.08Z"/><path d="M50.75,33.52a2.72,2.72,0,0,0-2.83-.84,3.92,3.92,0,0,0-2.82,1.41l-5.64,5.08-.29-.28s5.08-5.37,5.08-5.65c1.7-1.69,2-4.23.57-5.64A2.12,2.12,0,0,0,43.41,27a6.2,6.2,0,0,1,0-3.39c.28-.56,0-1.13-.57-1.13-.56-.28-1.13,0-1.13.57a10.86,10.86,0,0,0-.28,4,3.91,3.91,0,0,0-2.26,1.41,4,4,0,0,0-1.41,2.83,3.14,3.14,0,0,0,.85,2.82,2.46,2.46,0,0,0,1.69.85L27,49.05a1.38,1.38,0,0,0,0,2,1.49,1.49,0,0,0,1.13.56,1.71,1.71,0,0,0,1.13-.28L43.41,38a2,2,0,0,0,.84,1.69,3.21,3.21,0,0,0,2.26.85h.57a3.9,3.9,0,0,0,2.82-1.41,3.9,3.9,0,0,0,1.41-2.82A3.32,3.32,0,0,0,50.75,33.52ZM40,32.68a1.14,1.14,0,0,1-.56-1.13A3,3,0,0,1,42,29h.28a1.71,1.71,0,0,1,1.13.28c.56.56.28,2-.57,3.1C42,33.24,40.58,33.52,40,32.68ZM37.76,42a1.23,1.23,0,0,1-1.41,0,1,1,0,1,1,1.41-1.41A1.29,1.29,0,0,1,37.76,42Zm11-4.23a2.46,2.46,0,0,1-1.69.85,3,3,0,0,1-1.41-.29,2.05,2.05,0,0,1-.29-1.41,3,3,0,0,1,2.54-2.54h.29a2.17,2.17,0,0,1,1.13.28,3.1,3.1,0,0,1,.28,1.41A2.44,2.44,0,0,1,48.77,37.76Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/coronavirus.svg b/packages/icons/src/svg/coronavirus.svg
index 39fa39af39..ab813531ff 100644
--- a/packages/icons/src/svg/coronavirus.svg
+++ b/packages/icons/src/svg/coronavirus.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="coronavirus"><path d="M47.33,16.84a3.12,3.12,0,0,1,2.35,0,3.08,3.08,0,0,1,1,.67,3.17,3.17,0,0,1,.66,1,3,3,0,0,1,.24,1.18,3.23,3.23,0,0,1-.24,1.18,3.07,3.07,0,0,1-.68,1,3,3,0,0,1-1,.66,3,3,0,0,1-3-.42h0a3.2,3.2,0,0,1-1-1.36c-.06,0-.27.07-.2.4l.42,1.31-5.73,2.42a12.56,12.56,0,0,1-.17,6.69l3,1.48,0,0h0a3.07,3.07,0,0,1,3-.5,3.09,3.09,0,0,1,1.14,5,3.25,3.25,0,0,1-1,.7,3.14,3.14,0,0,1-2.36.06A3.09,3.09,0,0,1,41.87,36h0v0a3.1,3.1,0,0,1,.2-1.63s0,0,0,0-.24-.13-.42.16l-.6,1.24-2.41-1.26a12.48,12.48,0,0,1-4.57,4.47l2.73,6.66v0s0,0,0,0a3.08,3.08,0,0,1,1.48.61,2.94,2.94,0,0,1,1,1.26,3,3,0,0,1,0,2.36,3.07,3.07,0,0,1-3.64,1.8A3.08,3.08,0,0,1,34,46.76h0a3.18,3.18,0,0,1,1.34-1c0-.06-.07-.27-.4-.2L33.65,46,31.23,40a12.43,12.43,0,0,1-3.32.46,11.79,11.79,0,0,1-3.12-.42l-1.48,3.07,0,0,0,0a3.08,3.08,0,0,1-.24,4,3,3,0,0,1-1,.67,3,3,0,0,1-2.35,0A3,3,0,0,1,18,46.25,3.07,3.07,0,0,1,20.46,42h0a3,3,0,0,1,1.61.24h0s.14-.24-.14-.42l-1.23-.63L21.92,39a12.49,12.49,0,0,1-4.76-4.59l-6.54,2.71h-.08a3.17,3.17,0,0,1-.6,1.48,3.05,3.05,0,0,1-1.27,1,3,3,0,0,1-2.35,0,3.07,3.07,0,0,1-1.66-1.66,3.11,3.11,0,0,1,0-2.36,3,3,0,0,1,4.71-1.25h0a3.16,3.16,0,0,1,1,1.31s0,0,0,0,.27-.07.2-.4l-.42-1.31,5.73-2.37a12.57,12.57,0,0,1-.18-6.61l-3.28-1.3,0,0,0,0a3.15,3.15,0,0,1-1.45.66,3.07,3.07,0,0,1-1.59-.16,3.11,3.11,0,0,1-1.71-1.63,3,3,0,0,1-.06-2.36,3.06,3.06,0,0,1,.63-1,3.13,3.13,0,0,1,1-.7,3.07,3.07,0,0,1,1.17-.26,2.8,2.8,0,0,1,1.18.2,3,3,0,0,1,1.29.95,3.05,3.05,0,0,1,.64,1.46h0a.08.08,0,0,1,0,0,3.2,3.2,0,0,1-.21,1.63s0,0,0,0,.25.13.42-.15l.6-1.24,2.52,1A12.48,12.48,0,0,1,21.7,17l-2.58-6.17s0,0,0,0v0a3.08,3.08,0,0,1-1.48-.61,3,3,0,0,1-1-1.26,3.11,3.11,0,0,1,0-2.36,3.07,3.07,0,0,1,1.67-1.67,3.08,3.08,0,0,1,3.62,1,3.06,3.06,0,0,1,0,3.76h0v0a3.1,3.1,0,0,1-1.3,1l-.05,0c0,.06.07.27.4.2l1.32-.42,2.27,5.42a12.51,12.51,0,0,1,6.89.05L33,13.07,33,13l0,0a3.09,3.09,0,0,1-.42-3.06,3,3,0,0,1,1.66-1.66,3,3,0,0,1,2.35,0A3,3,0,0,1,38.31,10a3.11,3.11,0,0,1,0,2.36,3.07,3.07,0,0,1-2.45,1.87h0a3,3,0,0,1-1.65-.26c0,.05-.14.24.15.43l1.22.63-1.28,2A12.56,12.56,0,0,1,39,22l6.38-2.67h.07a3.1,3.1,0,0,1,1.87-2.46Zm-25.16,7.8a2.11,2.11,0,1,0-2.09-2.11A2.1,2.1,0,0,0,22.17,24.64Zm13.57,8A1.57,1.57,0,1,1,34.17,31,1.57,1.57,0,0,1,35.74,32.59Zm-1.05-4.77a2.12,2.12,0,1,0-2.09-2.11A2.09,2.09,0,0,0,34.69,27.82ZM22.2,31.53a1.57,1.57,0,1,1-1.57-1.59A1.57,1.57,0,0,1,22.2,31.53ZM30,21.47a1.59,1.59,0,1,0-1.57-1.58A1.57,1.57,0,0,0,30,21.47Zm.55,5.3a3.13,3.13,0,1,1-3.13-3.18A3.15,3.15,0,0,1,30.58,26.77ZM27.94,37.35a2.64,2.64,0,1,0-2.61-2.64,2.62,2.62,0,0,0,2.61,2.64Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="coronavirus"><path d="M47.33,16.84a3.12,3.12,0,0,1,2.35,0,3.08,3.08,0,0,1,1,.67,3.17,3.17,0,0,1,.66,1,3,3,0,0,1,.24,1.18,3.23,3.23,0,0,1-.24,1.18,3.07,3.07,0,0,1-.68,1,3,3,0,0,1-1,.66,3,3,0,0,1-3-.42h0a3.2,3.2,0,0,1-1-1.36c-.06,0-.27.07-.2.4l.42,1.31-5.73,2.42a12.56,12.56,0,0,1-.17,6.69l3,1.48,0,0h0a3.07,3.07,0,0,1,3-.5,3.09,3.09,0,0,1,1.14,5,3.25,3.25,0,0,1-1,.7,3.14,3.14,0,0,1-2.36.06A3.09,3.09,0,0,1,41.87,36h0v0a3.1,3.1,0,0,1,.2-1.63s0,0,0,0-.24-.13-.42.16l-.6,1.24-2.41-1.26a12.48,12.48,0,0,1-4.57,4.47l2.73,6.66v0s0,0,0,0a3.08,3.08,0,0,1,1.48.61,2.94,2.94,0,0,1,1,1.26,3,3,0,0,1,0,2.36,3.07,3.07,0,0,1-3.64,1.8A3.08,3.08,0,0,1,34,46.76h0a3.18,3.18,0,0,1,1.34-1c0-.06-.07-.27-.4-.2L33.65,46,31.23,40a12.43,12.43,0,0,1-3.32.46,11.79,11.79,0,0,1-3.12-.42l-1.48,3.07,0,0,0,0a3.08,3.08,0,0,1-.24,4,3,3,0,0,1-1,.67,3,3,0,0,1-2.35,0A3,3,0,0,1,18,46.25,3.07,3.07,0,0,1,20.46,42h0a3,3,0,0,1,1.61.24h0s.14-.24-.14-.42l-1.23-.63L21.92,39a12.49,12.49,0,0,1-4.76-4.59l-6.54,2.71h-.08a3.17,3.17,0,0,1-.6,1.48,3.05,3.05,0,0,1-1.27,1,3,3,0,0,1-2.35,0,3.07,3.07,0,0,1-1.66-1.66,3.11,3.11,0,0,1,0-2.36,3,3,0,0,1,4.71-1.25h0a3.16,3.16,0,0,1,1,1.31s0,0,0,0,.27-.07.2-.4l-.42-1.31,5.73-2.37a12.57,12.57,0,0,1-.18-6.61l-3.28-1.3,0,0,0,0a3.15,3.15,0,0,1-1.45.66,3.07,3.07,0,0,1-1.59-.16,3.11,3.11,0,0,1-1.71-1.63,3,3,0,0,1-.06-2.36,3.06,3.06,0,0,1,.63-1,3.13,3.13,0,0,1,1-.7,3.07,3.07,0,0,1,1.17-.26,2.8,2.8,0,0,1,1.18.2,3,3,0,0,1,1.29.95,3.05,3.05,0,0,1,.64,1.46h0a.08.08,0,0,1,0,0,3.2,3.2,0,0,1-.21,1.63s0,0,0,0,.25.13.42-.15l.6-1.24,2.52,1A12.48,12.48,0,0,1,21.7,17l-2.58-6.17s0,0,0,0v0a3.08,3.08,0,0,1-1.48-.61,3,3,0,0,1-1-1.26,3.11,3.11,0,0,1,0-2.36,3.07,3.07,0,0,1,1.67-1.67,3.08,3.08,0,0,1,3.62,1,3.06,3.06,0,0,1,0,3.76h0v0a3.1,3.1,0,0,1-1.3,1l-.05,0c0,.06.07.27.4.2l1.32-.42,2.27,5.42a12.51,12.51,0,0,1,6.89.05L33,13.07,33,13l0,0a3.09,3.09,0,0,1-.42-3.06,3,3,0,0,1,1.66-1.66,3,3,0,0,1,2.35,0A3,3,0,0,1,38.31,10a3.11,3.11,0,0,1,0,2.36,3.07,3.07,0,0,1-2.45,1.87h0a3,3,0,0,1-1.65-.26c0,.05-.14.24.15.43l1.22.63-1.28,2A12.56,12.56,0,0,1,39,22l6.38-2.67h.07a3.1,3.1,0,0,1,1.87-2.46Zm-25.16,7.8a2.11,2.11,0,1,0-2.09-2.11A2.1,2.1,0,0,0,22.17,24.64Zm13.57,8A1.57,1.57,0,1,1,34.17,31,1.57,1.57,0,0,1,35.74,32.59Zm-1.05-4.77a2.12,2.12,0,1,0-2.09-2.11A2.09,2.09,0,0,0,34.69,27.82ZM22.2,31.53a1.57,1.57,0,1,1-1.57-1.59A1.57,1.57,0,0,1,22.2,31.53ZM30,21.47a1.59,1.59,0,1,0-1.57-1.58A1.57,1.57,0,0,0,30,21.47Zm.55,5.3a3.13,3.13,0,1,1-3.13-3.18A3.15,3.15,0,0,1,30.58,26.77ZM27.94,37.35a2.64,2.64,0,1,0-2.61-2.64,2.62,2.62,0,0,0,2.61,2.64Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/cross.svg b/packages/icons/src/svg/cross.svg
index b7a6ba036b..a8926480cb 100644
--- a/packages/icons/src/svg/cross.svg
+++ b/packages/icons/src/svg/cross.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="cross"><rect x="-0.6" y="23.31" width="57.2" height="9.48" transform="translate(-11.63 28.01) rotate(-45)"/><rect x="23.26" y="-0.55" width="9.48" height="57.2" transform="translate(-11.63 28.01) rotate(-45)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="cross"><rect x="-0.6" y="23.31" width="57.2" height="9.48" transform="translate(-11.63 28.01) rotate(-45)"/><rect x="23.26" y="-0.55" width="9.48" height="57.2" transform="translate(-11.63 28.01) rotate(-45)"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/database.svg b/packages/icons/src/svg/database.svg
index d298674b56..8a8e1ddb75 100644
--- a/packages/icons/src/svg/database.svg
+++ b/packages/icons/src/svg/database.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="database"><path d="M49.41,12.31C48.33,1.85,7.67,1.85,6.59,12.31a1.86,1.86,0,0,0,0,.42V43.21c0,5.78,11.12,8.4,21.46,8.4S49.46,49,49.46,43.21V12.73A1.86,1.86,0,0,0,49.41,12.31ZM45.73,28c0,1.39-6,4.66-17.73,4.66S10.27,29.36,10.27,28V17.73C14.4,20,21.35,21.13,28,21.13s13.6-1.1,17.73-3.4ZM28,8.06c11.7,0,17.73,3.27,17.73,4.67s-6,4.66-17.73,4.66-17.73-3.27-17.73-4.66S16.3,8.06,28,8.06Zm0,39.82c-11.7,0-17.73-3.27-17.73-4.67V33c4.13,2.31,11.08,3.4,17.73,3.4S41.6,35.27,45.73,33V43.21C45.73,44.61,39.7,47.88,28,47.88Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="database"><path d="M49.41,12.31C48.33,1.85,7.67,1.85,6.59,12.31a1.86,1.86,0,0,0,0,.42V43.21c0,5.78,11.12,8.4,21.46,8.4S49.46,49,49.46,43.21V12.73A1.86,1.86,0,0,0,49.41,12.31ZM45.73,28c0,1.39-6,4.66-17.73,4.66S10.27,29.36,10.27,28V17.73C14.4,20,21.35,21.13,28,21.13s13.6-1.1,17.73-3.4ZM28,8.06c11.7,0,17.73,3.27,17.73,4.67s-6,4.66-17.73,4.66-17.73-3.27-17.73-4.66S16.3,8.06,28,8.06Zm0,39.82c-11.7,0-17.73-3.27-17.73-4.67V33c4.13,2.31,11.08,3.4,17.73,3.4S41.6,35.27,45.73,33V43.21C45.73,44.61,39.7,47.88,28,47.88Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/doorstroom_evenementen.svg b/packages/icons/src/svg/doorstroom_evenementen.svg
index b31e71098f..8ccaeb0530 100644
--- a/packages/icons/src/svg/doorstroom_evenementen.svg
+++ b/packages/icons/src/svg/doorstroom_evenementen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="doorstroom_evenementen"><path d="M29.3,28.5l-.09,0c-.26,0-.41,0-.4-.2a4.6,4.6,0,0,0,2.3-1.19,4.62,4.62,0,0,0-2.62-7.95,4.62,4.62,0,0,0-5.2,4.59,4.54,4.54,0,0,0,1.2,3.07L20.2,34.42a5,5,0,0,1,.95,2.19,15.24,15.24,0,0,0,1.85.81l4.92-8.91,4.93,8.82a13.16,13.16,0,0,0,1.93-.72,5,5,0,0,1,.95-2.11l-3.81-6.86A4.56,4.56,0,0,1,29.3,28.5Z"/><path d="M41.11,44.21a4.62,4.62,0,0,1-1.52.26,4.93,4.93,0,0,1-2-.43,5,5,0,0,1-1.66-1.2l3.57,6.43H16.34l3.57-6.43a4.93,4.93,0,0,1-3.65,1.63,4.68,4.68,0,0,1-1.53-.26l-2.81,5.06H9.4v2.3H46.45v-2.3H43.93Z"/><path d="M48,22.4a3.47,3.47,0,0,0-1.73-1.23A18.41,18.41,0,0,0,43,13v-.92a3.43,3.43,0,0,0-3.43-3.43,2.64,2.64,0,0,0-.79.1,18.21,18.21,0,0,0-8.68-3.43,3.35,3.35,0,0,0-4.39,0,18.42,18.42,0,0,0-8.68,3.43,3.55,3.55,0,0,0-.79-.09,3.43,3.43,0,0,0-3.43,3.43V13a18.32,18.32,0,0,0-3.26,8.18A3.39,3.39,0,0,0,8,22.44a3.35,3.35,0,0,0-.61,2v2.06a3.39,3.39,0,0,0,.89,2.32,3.47,3.47,0,0,0,2.23,1.11,18.2,18.2,0,0,0,3.09,5.5,3.43,3.43,0,0,0-.72,2.08v2.06a3.46,3.46,0,0,0,.74,2.53,3.47,3.47,0,0,0,2.32,1.27,3.41,3.41,0,0,0,2.53-.75,3.32,3.32,0,0,0,.87-1,3.61,3.61,0,0,0,.4-1.28A18.66,18.66,0,0,0,24.61,42a1.93,1.93,0,0,0,0,.34v2.06a3.43,3.43,0,1,0,6.86,0V42.32a1.71,1.71,0,0,0,0-.32,18.28,18.28,0,0,0,4.93-1.72,3.39,3.39,0,0,0,1.35,2,3.43,3.43,0,0,0,4.54-.49,3.4,3.4,0,0,0,.88-2.27V37.49a3.41,3.41,0,0,0-.72-2.08,18.82,18.82,0,0,0,3.09-5.51,3.41,3.41,0,0,0,3.12-3.43V24.41A3.42,3.42,0,0,0,48,22.4ZM38.47,12.05a1.13,1.13,0,0,1,1.12-1.12,1.13,1.13,0,0,1,.79.33,1.1,1.1,0,0,1,.32.79v1.37H38.47ZM26.81,7.93a1.15,1.15,0,0,1,.32-.79,1.13,1.13,0,0,1,.79-.33A1.13,1.13,0,0,1,29,7.93V9.3H26.81ZM15.14,12.05a1.13,1.13,0,0,1,1.12-1.12,1.13,1.13,0,0,1,.79.33,1.1,1.1,0,0,1,.32.79v1.37H15.14ZM11.88,25.77H9.65V24.4a1.13,1.13,0,0,1,1.12-1.12,1.13,1.13,0,0,1,.79.33,1.1,1.1,0,0,1,.32.79Zm5.49,13H15.14V37.44a1.13,1.13,0,0,1,1.12-1.12,1.13,1.13,0,0,1,.79.33,1.1,1.1,0,0,1,.32.79ZM29,43.61H26.81V42.24a1.15,1.15,0,0,1,.32-.79,1.13,1.13,0,0,1,.79-.33A1.13,1.13,0,0,1,29,42.24Zm11.66-4.8H38.47V37.44a1.13,1.13,0,0,1,1.12-1.12,1.13,1.13,0,0,1,.79.33,1.1,1.1,0,0,1,.32.79Zm-.37-4.72a3.06,3.06,0,0,0-.74-.09,3.43,3.43,0,0,0-3.43,3.44v.22a16.19,16.19,0,0,1-5.9,2.07,3.45,3.45,0,0,0-4.67,0,16.12,16.12,0,0,1-5.9-2.07v-.22A3.45,3.45,0,0,0,16.26,34a4.78,4.78,0,0,0-.76.09,16.5,16.5,0,0,1-2.79-4.82,3.46,3.46,0,0,0,1.09-1.22,3.41,3.41,0,0,0,.4-1.59V24.4a3.43,3.43,0,0,0-2.27-3.23,16.25,16.25,0,0,1,1.72-5,3.4,3.4,0,0,0,1.19,1,3.48,3.48,0,0,0,1.49.36,3.45,3.45,0,0,0,3.43-3.44v-2a3.34,3.34,0,0,0-.59-1.91,16.47,16.47,0,0,1,5.32-2.26V10a3.43,3.43,0,0,0,6.86,0V7.88a15.82,15.82,0,0,1,5.39,2.26,3.26,3.26,0,0,0-.58,1.91v2a3.43,3.43,0,0,0,3.43,3.44,3.55,3.55,0,0,0,1.49-.36,3.36,3.36,0,0,0,1.18-1,16.25,16.25,0,0,1,1.72,5,3.43,3.43,0,0,0-2.33,3.23v2.06a3.41,3.41,0,0,0,.4,1.59,3.37,3.37,0,0,0,1.09,1.22A16.78,16.78,0,0,1,40.33,34.09Zm5.86-8.25H44V24.47a1.13,1.13,0,0,1,1.12-1.12,1.13,1.13,0,0,1,.79.33,1.1,1.1,0,0,1,.32.79Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="doorstroom_evenementen"><path d="M29.3,28.5l-.09,0c-.26,0-.41,0-.4-.2a4.6,4.6,0,0,0,2.3-1.19,4.62,4.62,0,0,0-2.62-7.95,4.62,4.62,0,0,0-5.2,4.59,4.54,4.54,0,0,0,1.2,3.07L20.2,34.42a5,5,0,0,1,.95,2.19,15.24,15.24,0,0,0,1.85.81l4.92-8.91,4.93,8.82a13.16,13.16,0,0,0,1.93-.72,5,5,0,0,1,.95-2.11l-3.81-6.86A4.56,4.56,0,0,1,29.3,28.5Z"/><path d="M41.11,44.21a4.62,4.62,0,0,1-1.52.26,4.93,4.93,0,0,1-2-.43,5,5,0,0,1-1.66-1.2l3.57,6.43H16.34l3.57-6.43a4.93,4.93,0,0,1-3.65,1.63,4.68,4.68,0,0,1-1.53-.26l-2.81,5.06H9.4v2.3H46.45v-2.3H43.93Z"/><path d="M48,22.4a3.47,3.47,0,0,0-1.73-1.23A18.41,18.41,0,0,0,43,13v-.92a3.43,3.43,0,0,0-3.43-3.43,2.64,2.64,0,0,0-.79.1,18.21,18.21,0,0,0-8.68-3.43,3.35,3.35,0,0,0-4.39,0,18.42,18.42,0,0,0-8.68,3.43,3.55,3.55,0,0,0-.79-.09,3.43,3.43,0,0,0-3.43,3.43V13a18.32,18.32,0,0,0-3.26,8.18A3.39,3.39,0,0,0,8,22.44a3.35,3.35,0,0,0-.61,2v2.06a3.39,3.39,0,0,0,.89,2.32,3.47,3.47,0,0,0,2.23,1.11,18.2,18.2,0,0,0,3.09,5.5,3.43,3.43,0,0,0-.72,2.08v2.06a3.46,3.46,0,0,0,.74,2.53,3.47,3.47,0,0,0,2.32,1.27,3.41,3.41,0,0,0,2.53-.75,3.32,3.32,0,0,0,.87-1,3.61,3.61,0,0,0,.4-1.28A18.66,18.66,0,0,0,24.61,42a1.93,1.93,0,0,0,0,.34v2.06a3.43,3.43,0,1,0,6.86,0V42.32a1.71,1.71,0,0,0,0-.32,18.28,18.28,0,0,0,4.93-1.72,3.39,3.39,0,0,0,1.35,2,3.43,3.43,0,0,0,4.54-.49,3.4,3.4,0,0,0,.88-2.27V37.49a3.41,3.41,0,0,0-.72-2.08,18.82,18.82,0,0,0,3.09-5.51,3.41,3.41,0,0,0,3.12-3.43V24.41A3.42,3.42,0,0,0,48,22.4ZM38.47,12.05a1.13,1.13,0,0,1,1.12-1.12,1.13,1.13,0,0,1,.79.33,1.1,1.1,0,0,1,.32.79v1.37H38.47ZM26.81,7.93a1.15,1.15,0,0,1,.32-.79,1.13,1.13,0,0,1,.79-.33A1.13,1.13,0,0,1,29,7.93V9.3H26.81ZM15.14,12.05a1.13,1.13,0,0,1,1.12-1.12,1.13,1.13,0,0,1,.79.33,1.1,1.1,0,0,1,.32.79v1.37H15.14ZM11.88,25.77H9.65V24.4a1.13,1.13,0,0,1,1.12-1.12,1.13,1.13,0,0,1,.79.33,1.1,1.1,0,0,1,.32.79Zm5.49,13H15.14V37.44a1.13,1.13,0,0,1,1.12-1.12,1.13,1.13,0,0,1,.79.33,1.1,1.1,0,0,1,.32.79ZM29,43.61H26.81V42.24a1.15,1.15,0,0,1,.32-.79,1.13,1.13,0,0,1,.79-.33A1.13,1.13,0,0,1,29,42.24Zm11.66-4.8H38.47V37.44a1.13,1.13,0,0,1,1.12-1.12,1.13,1.13,0,0,1,.79.33,1.1,1.1,0,0,1,.32.79Zm-.37-4.72a3.06,3.06,0,0,0-.74-.09,3.43,3.43,0,0,0-3.43,3.44v.22a16.19,16.19,0,0,1-5.9,2.07,3.45,3.45,0,0,0-4.67,0,16.12,16.12,0,0,1-5.9-2.07v-.22A3.45,3.45,0,0,0,16.26,34a4.78,4.78,0,0,0-.76.09,16.5,16.5,0,0,1-2.79-4.82,3.46,3.46,0,0,0,1.09-1.22,3.41,3.41,0,0,0,.4-1.59V24.4a3.43,3.43,0,0,0-2.27-3.23,16.25,16.25,0,0,1,1.72-5,3.4,3.4,0,0,0,1.19,1,3.48,3.48,0,0,0,1.49.36,3.45,3.45,0,0,0,3.43-3.44v-2a3.34,3.34,0,0,0-.59-1.91,16.47,16.47,0,0,1,5.32-2.26V10a3.43,3.43,0,0,0,6.86,0V7.88a15.82,15.82,0,0,1,5.39,2.26,3.26,3.26,0,0,0-.58,1.91v2a3.43,3.43,0,0,0,3.43,3.44,3.55,3.55,0,0,0,1.49-.36,3.36,3.36,0,0,0,1.18-1,16.25,16.25,0,0,1,1.72,5,3.43,3.43,0,0,0-2.33,3.23v2.06a3.41,3.41,0,0,0,.4,1.59,3.37,3.37,0,0,0,1.09,1.22A16.78,16.78,0,0,1,40.33,34.09Zm5.86-8.25H44V24.47a1.13,1.13,0,0,1,1.12-1.12,1.13,1.13,0,0,1,.79.33,1.1,1.1,0,0,1,.32.79Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/dot.svg b/packages/icons/src/svg/dot.svg
index d5b081ae5f..012c44e375 100644
--- a/packages/icons/src/svg/dot.svg
+++ b/packages/icons/src/svg/dot.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="dot"><circle cx="28" cy="28.05" r="23.58"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="dot"><circle cx="28" cy="28.05" r="23.58"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/down.svg b/packages/icons/src/svg/down.svg
index cb052b0ff3..5d85f9ba59 100644
--- a/packages/icons/src/svg/down.svg
+++ b/packages/icons/src/svg/down.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="down"><path d="M48,24a3.19,3.19,0,0,0-4.16-.52l-9.38,6.25V8.85c0-3.38-2.87-4.43-6.25-4.43-3.13,0-6.78,1-6.78,4.43V29.69l-9.37-6.25A2.94,2.94,0,0,0,7.89,24a3.54,3.54,0,0,0-.26,4.17L25.34,50.27A3.21,3.21,0,0,0,28,51.57a3.61,3.61,0,0,0,2.6-1.3L48.26,28.13A3.15,3.15,0,0,0,48,24Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="down"><path d="M48,24a3.19,3.19,0,0,0-4.16-.52l-9.38,6.25V8.85c0-3.38-2.87-4.43-6.25-4.43-3.13,0-6.78,1-6.78,4.43V29.69l-9.37-6.25A2.94,2.94,0,0,0,7.89,24a3.54,3.54,0,0,0-.26,4.17L25.34,50.27A3.21,3.21,0,0,0,28,51.57a3.61,3.61,0,0,0,2.6-1.3L48.26,28.13A3.15,3.15,0,0,0,48,24Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/download.svg b/packages/icons/src/svg/download.svg
index 6c82d26510..3662ee8764 100644
--- a/packages/icons/src/svg/download.svg
+++ b/packages/icons/src/svg/download.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="download"><path d="M42.15,39.78V44.5H13.85V39.78H6.77v9.43a2.36,2.36,0,0,0,.69,1.67,2.4,2.4,0,0,0,1.67.69H46.87a2.4,2.4,0,0,0,1.67-.69,2.36,2.36,0,0,0,.69-1.67V39.78Z"/><path d="M25.5,38.54a3.19,3.19,0,0,0,5,0L44.13,21.48a3.13,3.13,0,0,0,.71-2.08,3.2,3.2,0,0,0-2.75-3.08,3.16,3.16,0,0,0-2.14.46l-7.23,4.51V7.75c0-2.56-2.22-3.33-4.72-3.33s-4.72.77-4.72,3.33V21.29l-7.22-4.51a3.2,3.2,0,0,0-2.15-.46,3.2,3.2,0,0,0-2.75,3.08,3.17,3.17,0,0,0,.71,2.09L25.5,38.54Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="download"><path d="M42.15,39.78V44.5H13.85V39.78H6.77v9.43a2.36,2.36,0,0,0,.69,1.67,2.4,2.4,0,0,0,1.67.69H46.87a2.4,2.4,0,0,0,1.67-.69,2.36,2.36,0,0,0,.69-1.67V39.78Z"/><path d="M25.5,38.54a3.19,3.19,0,0,0,5,0L44.13,21.48a3.13,3.13,0,0,0,.71-2.08,3.2,3.2,0,0,0-2.75-3.08,3.16,3.16,0,0,0-2.14.46l-7.23,4.51V7.75c0-2.56-2.22-3.33-4.72-3.33s-4.72.77-4.72,3.33V21.29l-7.22-4.51a3.2,3.2,0,0,0-2.15-.46,3.2,3.2,0,0,0-2.75,3.08,3.17,3.17,0,0,0,.71,2.09L25.5,38.54Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/een_persoon_doorgestreept.svg b/packages/icons/src/svg/een_persoon_doorgestreept.svg
index 4c2d85298d..6a83f5cf89 100644
--- a/packages/icons/src/svg/een_persoon_doorgestreept.svg
+++ b/packages/icons/src/svg/een_persoon_doorgestreept.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="een_persoon_doorgestreept"><path d="M28.84,12.69c2.35,0,3.7-1.73,3.7-4.13,0-2.76-1.35-4.13-3.7-4.13s-3.69,1.72-3.69,4.13C25.15,11.31,26.49,12.69,28.84,12.69Z"/><path d="M33.88,19.91a24.28,24.28,0,0,1,1,7.57v3.1l2,2.07a1.92,1.92,0,0,0,1-1.72c.34-5.51.67-14.8-4-16.18a23.16,23.16,0,0,0-9.74,0,4.17,4.17,0,0,0-2.69,2.07L33.88,29.55Z"/><path d="M13.39,11.31,11,13.37l8.73,9a37.2,37.2,0,0,0-.07,5.78c0,.88.07,1.71.07,2.48a2.76,2.76,0,0,0,2.69,3.1V25.07l1,1V51.57c2.35,0,4-1.37,4-3.78,0,0,.67-14.46.67-14.8a.34.34,0,1,1,.67,0l.67,14.8a4,4,0,0,0,4,3.78V37.12l8.74,9L45,43.66Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="een_persoon_doorgestreept"><path d="M28.84,12.69c2.35,0,3.7-1.73,3.7-4.13,0-2.76-1.35-4.13-3.7-4.13s-3.69,1.72-3.69,4.13C25.15,11.31,26.49,12.69,28.84,12.69Z"/><path d="M33.88,19.91a24.28,24.28,0,0,1,1,7.57v3.1l2,2.07a1.92,1.92,0,0,0,1-1.72c.34-5.51.67-14.8-4-16.18a23.16,23.16,0,0,0-9.74,0,4.17,4.17,0,0,0-2.69,2.07L33.88,29.55Z"/><path d="M13.39,11.31,11,13.37l8.73,9a37.2,37.2,0,0,0-.07,5.78c0,.88.07,1.71.07,2.48a2.76,2.76,0,0,0,2.69,3.1V25.07l1,1V51.57c2.35,0,4-1.37,4-3.78,0,0,.67-14.46.67-14.8a.34.34,0,1,1,.67,0l.67,14.8a4,4,0,0,0,4,3.78V37.12l8.74,9L45,43.66Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/elderly.svg b/packages/icons/src/svg/elderly.svg
index a68b28191a..4b7f1c2ef0 100644
--- a/packages/icons/src/svg/elderly.svg
+++ b/packages/icons/src/svg/elderly.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="elderly"><path d="M50.87,27,28.59,5.66a1,1,0,0,0-1.28,0L5,27a2,2,0,0,0-.61,1.42v1.42a1,1,0,0,0,.94,1H9.13V50.58H46.77V30.77h3.77a1,1,0,0,0,.94-1V28.39A2,2,0,0,0,50.87,27ZM14.93,45.83s.79-5.68,2.29-7.19c1.2-1.21,5.33-2.67,6.94-3.21a14.29,14.29,0,0,0,.32-1.58,6.89,6.89,0,0,1-1.81-3.69c-1-.27-1.14-2.07-1.14-2.75s.13-1.05.4-1.16a.38.38,0,0,1,.18,0c-.14-1.06-.5-4.62.48-5.86a7.13,7.13,0,0,1,3.67-1.95,4.4,4.4,0,0,1,3.88.42,2.68,2.68,0,0,1,3.37,1.5c.78,1.36.38,4.83.24,5.88a.43.43,0,0,1,.22,0c.27.11.4.48.4,1.16s-.19,2.48-1.13,2.75a7.15,7.15,0,0,1-1.85,3.72,12.09,12.09,0,0,0,.34,1.54c1.61.54,5.75,2,7,3.22C40.18,40.15,41,45.83,41,45.83Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="elderly"><path d="M50.87,27,28.59,5.66a1,1,0,0,0-1.28,0L5,27a2,2,0,0,0-.61,1.42v1.42a1,1,0,0,0,.94,1H9.13V50.58H46.77V30.77h3.77a1,1,0,0,0,.94-1V28.39A2,2,0,0,0,50.87,27ZM14.93,45.83s.79-5.68,2.29-7.19c1.2-1.21,5.33-2.67,6.94-3.21a14.29,14.29,0,0,0,.32-1.58,6.89,6.89,0,0,1-1.81-3.69c-1-.27-1.14-2.07-1.14-2.75s.13-1.05.4-1.16a.38.38,0,0,1,.18,0c-.14-1.06-.5-4.62.48-5.86a7.13,7.13,0,0,1,3.67-1.95,4.4,4.4,0,0,1,3.88.42,2.68,2.68,0,0,1,3.37,1.5c.78,1.36.38,4.83.24,5.88a.43.43,0,0,1,.22,0c.27.11.4.48.4,1.16s-.19,2.48-1.13,2.75a7.15,7.15,0,0,1-1.85,3.72,12.09,12.09,0,0,0,.34,1.54c1.61.54,5.75,2,7,3.22C40.18,40.15,41,45.83,41,45.83Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/expand.svg b/packages/icons/src/svg/expand.svg
index fcfc2e6ff4..ae6e99aeef 100644
--- a/packages/icons/src/svg/expand.svg
+++ b/packages/icons/src/svg/expand.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 56 56"><g id="expand"><path d="M51.25,6.77A2.4,2.4,0,0,0,51.09,6a2.23,2.23,0,0,0-.5-.76,2.37,2.37,0,0,0-.77-.5h0a2.14,2.14,0,0,0-.75-.16h-17a2.27,2.27,0,1,0,0,4.53H43.52L30.47,22.17a2.26,2.26,0,0,0,3.2,3.2l13-13V23.77a2.27,2.27,0,0,0,4.53,0v-17Z" stroke="currentColor" /><path d="M25.21,30.62a2.28,2.28,0,0,0-3.21,0L9,43.67V32.22a2.27,2.27,0,0,0-4.53,0v17h0a2.47,2.47,0,0,0,.17.77h0a2.29,2.29,0,0,0,.5.75,2.26,2.26,0,0,0,.76.51,2.38,2.38,0,0,0,.75.15h17a2.27,2.27,0,1,0,0-4.53H12.16L25.21,33.83A2.28,2.28,0,0,0,25.21,30.62Z" stroke="currentColor" /></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="expand"><path d="M51.25,6.77A2.4,2.4,0,0,0,51.09,6a2.23,2.23,0,0,0-.5-.76,2.37,2.37,0,0,0-.77-.5h0a2.14,2.14,0,0,0-.75-.16h-17a2.27,2.27,0,1,0,0,4.53H43.52L30.47,22.17a2.26,2.26,0,0,0,3.2,3.2l13-13V23.77a2.27,2.27,0,0,0,4.53,0v-17Z" stroke="currentColor" /><path d="M25.21,30.62a2.28,2.28,0,0,0-3.21,0L9,43.67V32.22a2.27,2.27,0,0,0-4.53,0v17h0a2.47,2.47,0,0,0,.17.77h0a2.29,2.29,0,0,0,.5.75,2.26,2.26,0,0,0,.76.51,2.38,2.38,0,0,0,.75.15h17a2.27,2.27,0,1,0,0-4.53H12.16L25.21,33.83A2.28,2.28,0,0,0,25.21,30.62Z" /></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/experimenteel.svg b/packages/icons/src/svg/experimenteel.svg
index df2ed3be3f..7cd83a52a5 100644
--- a/packages/icons/src/svg/experimenteel.svg
+++ b/packages/icons/src/svg/experimenteel.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="experimenteel"><path d="M38.44,4.42H17.56c-1.12,0-1.38,2,0,2.37.77.21,1.68.44,2.33.6V43.44a8.13,8.13,0,1,0,16.26,0v-36c.65-.16,1.56-.39,2.33-.6C39.82,6.41,39.56,4.42,38.44,4.42ZM32.88,20.68H24.75V43.44a3.57,3.57,0,0,0,1.69,2.85,6.82,6.82,0,0,0,4.47.91c.1.09,0,.24-.13.35a4.84,4.84,0,0,1-2.73.85H28a4.83,4.83,0,0,1-4.83-4.83V7.67h9.76Z"/><path d="M29.63,13.37a1.62,1.62,0,0,0,1.62-1.63,1.62,1.62,0,0,0-1.62-1.63,1.59,1.59,0,0,0-1.15.48A1.6,1.6,0,0,0,28,11.74a1.64,1.64,0,0,0,1.63,1.63Z"/><path d="M26.37,18.24a1.62,1.62,0,0,0,1.15-2.77A1.59,1.59,0,0,0,26.37,15a1.62,1.62,0,0,0-1.62,1.63,1.6,1.6,0,0,0,1.62,1.62Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="experimenteel"><path d="M38.44,4.42H17.56c-1.12,0-1.38,2,0,2.37.77.21,1.68.44,2.33.6V43.44a8.13,8.13,0,1,0,16.26,0v-36c.65-.16,1.56-.39,2.33-.6C39.82,6.41,39.56,4.42,38.44,4.42ZM32.88,20.68H24.75V43.44a3.57,3.57,0,0,0,1.69,2.85,6.82,6.82,0,0,0,4.47.91c.1.09,0,.24-.13.35a4.84,4.84,0,0,1-2.73.85H28a4.83,4.83,0,0,1-4.83-4.83V7.67h9.76Z"/><path d="M29.63,13.37a1.62,1.62,0,0,0,1.62-1.63,1.62,1.62,0,0,0-1.62-1.63,1.59,1.59,0,0,0-1.15.48A1.6,1.6,0,0,0,28,11.74a1.64,1.64,0,0,0,1.63,1.63Z"/><path d="M26.37,18.24a1.62,1.62,0,0,0,1.15-2.77A1.59,1.59,0,0,0,26.37,15a1.62,1.62,0,0,0-1.62,1.63,1.6,1.6,0,0,0,1.62,1.62Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/external.svg b/packages/icons/src/svg/external.svg
index 6abdada06a..b8d64b2658 100644
--- a/packages/icons/src/svg/external.svg
+++ b/packages/icons/src/svg/external.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor" ><g id="external"><path d="M8.2,4.42a2.73,2.73,0,1,0,0,5.45H41.37L6.63,46a2.72,2.72,0,1,0,3.85,3.85l34.6-36.33V47.12a2.73,2.73,0,0,0,5.45,0V4.42Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="external"><path d="M8.2,4.42a2.73,2.73,0,1,0,0,5.45H41.37L6.63,46a2.72,2.72,0,1,0,3.85,3.85l34.6-36.33V47.12a2.73,2.73,0,0,0,5.45,0V4.42Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/eye.svg b/packages/icons/src/svg/eye.svg
new file mode 100644
index 0000000000..30cceabbfa
--- /dev/null
+++ b/packages/icons/src/svg/eye.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><path d="M28.0428 40.9994C23.6639 40.9833 19.8618 39.2926 16.3242 36.8691C13.4368 34.8923 10.935 32.4881 8.71046 29.7817C7.86272 28.7499 7.73205 27.461 8.54474 26.4742C12.2544 21.9614 16.5473 18.1815 22.0927 16.1051C27.262 14.1669 32.2369 14.874 37.0078 17.4776C41.0202 19.6665 44.3443 22.6879 47.2763 26.1721C48.2069 27.2778 48.2452 28.6888 47.3592 29.7528C44.0957 33.6741 40.3414 36.9848 35.7011 39.1898C33.2631 40.3469 30.6051 40.9897 28.0428 40.9994V40.9994ZM36.6158 28.0363C36.6254 23.2632 32.7819 19.3322 28.0874 19.3129C23.3579 19.2936 19.4411 23.1764 19.4251 27.8981C19.4092 32.7613 23.1858 36.6505 27.9504 36.6762C32.734 36.7052 36.6062 32.8416 36.6158 28.0363Z" /><path d="M28.0065 22.0001C31.3491 22.022 34.0338 24.7159 33.9997 28.0186C33.9624 31.3432 31.2467 34.0309 27.9475 33.9997C24.6483 33.9716 21.945 31.2059 22.0009 27.9219C22.0567 24.6004 24.7166 21.9814 28.0065 22.0001V22.0001Z"/></svg>
diff --git a/packages/icons/src/svg/frisse_lucht.svg b/packages/icons/src/svg/frisse_lucht.svg
index dec6b7c571..5766792d7e 100644
--- a/packages/icons/src/svg/frisse_lucht.svg
+++ b/packages/icons/src/svg/frisse_lucht.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="frisse_lucht"><path d="M31.72,39.45H21.1V13.2a1.22,1.22,0,0,0-.56-1L12.33,7.62H31.91v7.14a9.43,9.43,0,0,1,2.89-1.42V5.73a1.3,1.3,0,0,0-1.38-1.31H6.84a1.76,1.76,0,0,0-1.7,1.5V42.06A1.75,1.75,0,0,0,6,43.3l13,8.1a1.46,1.46,0,0,0,2.17-1.12V42.62H33.42c1.07,0,1.33-1.07,1.33-1.61V32.59a13.16,13.16,0,0,1-3,1.4ZM12.05,43.09a.17.17,0,0,1-.26.14L8.32,41.06a.16.16,0,0,1-.08-.14V26.57a.17.17,0,0,1,.25-.14L12,28.34a.19.19,0,0,1,.09.15Zm0-17.6a.17.17,0,0,1-.25.15L8.33,23.7a.19.19,0,0,1-.09-.15V9.21a.17.17,0,0,1,.25-.15L12,11a.19.19,0,0,1,.09.15ZM18.11,47a.16.16,0,0,1-.25.15l-3.47-2.22a.16.16,0,0,1-.08-.14V29.84a.17.17,0,0,1,.25-.15L18,31.61a.16.16,0,0,1,.08.15Zm0-18.22a.16.16,0,0,1-.25.14L14.4,27a.16.16,0,0,1-.09-.15V12.48a.17.17,0,0,1,.25-.15L18,14.25a.16.16,0,0,1,.08.14Z"/><path d="M50.64,17.61,45,12.82a.81.81,0,0,0-1,1l1.66,2.76c-1.77.42-2.85-.4-3.9-1s-5.48-2.22-8.47.14c-2.39,1.89-5.29.75-6.51,0a1.45,1.45,0,0,0-1.93.56,1.63,1.63,0,0,0,.67,2.26,10,10,0,0,0,4.67,1.31c.75,0,3.29-.35,4.34-1.31a5.68,5.68,0,0,1,2.92-1.12C39,17.35,41,18.68,42,19.19a9.86,9.86,0,0,0,3.64.56l-1.4,2.18a1,1,0,0,0-.09,1.26c.39.42.74.33.86.23,1.71-1.43,5.23-4.4,5.62-4.81A.68.68,0,0,0,50.64,17.61Z"/><path d="M47.31,28.78c-1.21.75-4.12,1.89-6.51,0-3-2.36-7.42-.77-8.47-.14s-2.12,1.45-3.9,1l1.66-2.76a.81.81,0,0,0-1-1.05l-5.67,4.79a.69.69,0,0,0,0,1c.39.41,3.91,3.38,5.62,4.81.13.1.48.19.87-.24a1,1,0,0,0-.1-1.26l-1.4-2.17a9.83,9.83,0,0,0,3.64-.56c1-.51,3-1.84,4.58-1.75a5.71,5.71,0,0,1,2.92,1.12c1,1,3.59,1.31,4.34,1.31a10,10,0,0,0,4.66-1.31,1.64,1.64,0,0,0,.68-2.26A1.47,1.47,0,0,0,47.31,28.78Z"/><path d="M34.78,20.2a6.86,6.86,0,0,1-3,1.07v5.84a6.92,6.92,0,0,1,3-1.12Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="frisse_lucht"><path d="M31.72,39.45H21.1V13.2a1.22,1.22,0,0,0-.56-1L12.33,7.62H31.91v7.14a9.43,9.43,0,0,1,2.89-1.42V5.73a1.3,1.3,0,0,0-1.38-1.31H6.84a1.76,1.76,0,0,0-1.7,1.5V42.06A1.75,1.75,0,0,0,6,43.3l13,8.1a1.46,1.46,0,0,0,2.17-1.12V42.62H33.42c1.07,0,1.33-1.07,1.33-1.61V32.59a13.16,13.16,0,0,1-3,1.4ZM12.05,43.09a.17.17,0,0,1-.26.14L8.32,41.06a.16.16,0,0,1-.08-.14V26.57a.17.17,0,0,1,.25-.14L12,28.34a.19.19,0,0,1,.09.15Zm0-17.6a.17.17,0,0,1-.25.15L8.33,23.7a.19.19,0,0,1-.09-.15V9.21a.17.17,0,0,1,.25-.15L12,11a.19.19,0,0,1,.09.15ZM18.11,47a.16.16,0,0,1-.25.15l-3.47-2.22a.16.16,0,0,1-.08-.14V29.84a.17.17,0,0,1,.25-.15L18,31.61a.16.16,0,0,1,.08.15Zm0-18.22a.16.16,0,0,1-.25.14L14.4,27a.16.16,0,0,1-.09-.15V12.48a.17.17,0,0,1,.25-.15L18,14.25a.16.16,0,0,1,.08.14Z"/><path d="M50.64,17.61,45,12.82a.81.81,0,0,0-1,1l1.66,2.76c-1.77.42-2.85-.4-3.9-1s-5.48-2.22-8.47.14c-2.39,1.89-5.29.75-6.51,0a1.45,1.45,0,0,0-1.93.56,1.63,1.63,0,0,0,.67,2.26,10,10,0,0,0,4.67,1.31c.75,0,3.29-.35,4.34-1.31a5.68,5.68,0,0,1,2.92-1.12C39,17.35,41,18.68,42,19.19a9.86,9.86,0,0,0,3.64.56l-1.4,2.18a1,1,0,0,0-.09,1.26c.39.42.74.33.86.23,1.71-1.43,5.23-4.4,5.62-4.81A.68.68,0,0,0,50.64,17.61Z"/><path d="M47.31,28.78c-1.21.75-4.12,1.89-6.51,0-3-2.36-7.42-.77-8.47-.14s-2.12,1.45-3.9,1l1.66-2.76a.81.81,0,0,0-1-1.05l-5.67,4.79a.69.69,0,0,0,0,1c.39.41,3.91,3.38,5.62,4.81.13.1.48.19.87-.24a1,1,0,0,0-.1-1.26l-1.4-2.17a9.83,9.83,0,0,0,3.64-.56c1-.51,3-1.84,4.58-1.75a5.71,5.71,0,0,1,2.92,1.12c1,1,3.59,1.31,4.34,1.31a10,10,0,0,0,4.66-1.31,1.64,1.64,0,0,0,.68-2.26A1.47,1.47,0,0,0,47.31,28.78Z"/><path d="M34.78,20.2a6.86,6.86,0,0,1-3,1.07v5.84a6.92,6.92,0,0,1,3-1.12Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/gedeeltelijk_open_rugzak.svg b/packages/icons/src/svg/gedeeltelijk_open_rugzak.svg
index 88938dbce1..3185c57a7b 100644
--- a/packages/icons/src/svg/gedeeltelijk_open_rugzak.svg
+++ b/packages/icons/src/svg/gedeeltelijk_open_rugzak.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="gedeeltelijk_open_rugzak"><path d="M33.69,9.54C26.48,11.7,23,21.14,22.55,28.77c-.45,0-.76-.57-.76-1.19C21.79,11.57,32,8.32,32,8.32a7.53,7.53,0,0,0-4.4-.84C26.54,6,24.74,3.9,22.26,4.54a3.71,3.71,0,0,0-2.53,2.69,6.73,6.73,0,0,0,.5,4.71,14.73,14.73,0,0,0-1.14,1.79,7.77,7.77,0,0,0-6.48.08C10.11,15.19,8.7,18.27,8.43,23c-.58,10,5.42,18.19,7.78,21,.12,1,.24,1.89.36,2.63a4.08,4.08,0,0,0,2.93,3.27c2.66.74,6.36,1.38,8,1.64a5.19,5.19,0,0,0,1.62,0c5.86-1,13-5.76,16.53-8.38a4.86,4.86,0,0,0,1.95-4.44C46.14,25.59,44.56,6.29,33.69,9.54ZM22,7.9c.54-1.82,2.2-1.15,3.16.19a12.72,12.72,0,0,0-3,1.79c-.06,0-.11.11-.17.15A4.27,4.27,0,0,1,22,7.9ZM15.7,38c-2.21-3.61-4.55-8.91-4.2-14.83.2-3.51,1.1-5.8,2.59-6.63a4.64,4.64,0,0,1,3.76,0C15.61,22.78,15.35,31.24,15.7,38Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="gedeeltelijk_open_rugzak"><path d="M33.69,9.54C26.48,11.7,23,21.14,22.55,28.77c-.45,0-.76-.57-.76-1.19C21.79,11.57,32,8.32,32,8.32a7.53,7.53,0,0,0-4.4-.84C26.54,6,24.74,3.9,22.26,4.54a3.71,3.71,0,0,0-2.53,2.69,6.73,6.73,0,0,0,.5,4.71,14.73,14.73,0,0,0-1.14,1.79,7.77,7.77,0,0,0-6.48.08C10.11,15.19,8.7,18.27,8.43,23c-.58,10,5.42,18.19,7.78,21,.12,1,.24,1.89.36,2.63a4.08,4.08,0,0,0,2.93,3.27c2.66.74,6.36,1.38,8,1.64a5.19,5.19,0,0,0,1.62,0c5.86-1,13-5.76,16.53-8.38a4.86,4.86,0,0,0,1.95-4.44C46.14,25.59,44.56,6.29,33.69,9.54ZM22,7.9c.54-1.82,2.2-1.15,3.16.19a12.72,12.72,0,0,0-3,1.79c-.06,0-.11.11-.17.15A4.27,4.27,0,0,1,22,7.9ZM15.7,38c-2.21-3.61-4.55-8.91-4.2-14.83.2-3.51,1.1-5.8,2.59-6.63a4.64,4.64,0,0,1,3.76,0C15.61,22.78,15.35,31.24,15.7,38Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/geen_entertainment.svg b/packages/icons/src/svg/geen_entertainment.svg
index f72cd751c0..ad0eb3c68d 100644
--- a/packages/icons/src/svg/geen_entertainment.svg
+++ b/packages/icons/src/svg/geen_entertainment.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="geen_entertainment"><path d="M44.24,4.42,35.34,15.5a15.52,15.52,0,0,0-2.26-.17c-5,.18-6.43,1.79-7.08,2.64a57.32,57.32,0,0,0-2.49,5.47,32.26,32.26,0,0,1-6.23-2.94A3.1,3.1,0,0,0,18,24.14c.91.85,5.25,2.94,6.37,2.56.8-.28,2-2.34,2.88-3.94.36-.62.67-1.17.91-1.53.15.85.3,1.74.46,2.65L9.17,48.06l2.59,2.08L46.83,6.5Z"/><path d="M14.14,17.53a2.31,2.31,0,0,0,1,0A2.2,2.2,0,0,0,16,17a2.08,2.08,0,0,0,.58-.79,2.12,2.12,0,0,0,.19-1V9.84l2.94,1V8.61h0L15.26,6.37V13.8a3.38,3.38,0,0,0-1.12-.26c-1.44,0-2.59.73-2.59,1.85S12.73,17.39,14.14,17.53Z"/><path d="M26.8,12.13A3.38,3.38,0,0,0,29,13.88a3.28,3.28,0,0,0,1.43,0h0a3.3,3.3,0,0,0,2.49-1.39,3.28,3.28,0,0,0,.44-2.81A3.44,3.44,0,0,0,33,8.31a3.48,3.48,0,0,0-.91-1.14,3.39,3.39,0,0,0-1.29-.67,3.55,3.55,0,0,0-1.45-.07,3.27,3.27,0,0,0-2.52,1.45,3.3,3.3,0,0,0-.54,1.38,3.41,3.41,0,0,0,.12,1.49A3.33,3.33,0,0,0,26.8,12.13Z"/><path d="M23.43,39.72c.37,1.38.77,2.81,1.1,4s.61,2.18.65,2.39A4.52,4.52,0,0,0,27.91,42c-.23-1.64-.82-5.18-1.05-6.55Z"/><path d="M27.57,34.57a31.75,31.75,0,0,1,5.07-1.5c0,1.88,0,4.43-.15,6.22a39.38,39.38,0,0,1-.6,4.34A30.82,30.82,0,0,0,31.41,47a4,4,0,0,0,.48,2.76,4,4,0,0,0,2.16,1.79,81.87,81.87,0,0,0,2.61-12.48,68.13,68.13,0,0,0-.22-15.57Z"/><path d="M41.89,18l-.67-.42-2.1,2.61.39.19a41.43,41.43,0,0,1-.79,7.2,3.15,3.15,0,0,0,2.94-2.5c.32-1.7,1-6.34,0-7.11Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="geen_entertainment"><path d="M44.24,4.42,35.34,15.5a15.52,15.52,0,0,0-2.26-.17c-5,.18-6.43,1.79-7.08,2.64a57.32,57.32,0,0,0-2.49,5.47,32.26,32.26,0,0,1-6.23-2.94A3.1,3.1,0,0,0,18,24.14c.91.85,5.25,2.94,6.37,2.56.8-.28,2-2.34,2.88-3.94.36-.62.67-1.17.91-1.53.15.85.3,1.74.46,2.65L9.17,48.06l2.59,2.08L46.83,6.5Z"/><path d="M14.14,17.53a2.31,2.31,0,0,0,1,0A2.2,2.2,0,0,0,16,17a2.08,2.08,0,0,0,.58-.79,2.12,2.12,0,0,0,.19-1V9.84l2.94,1V8.61h0L15.26,6.37V13.8a3.38,3.38,0,0,0-1.12-.26c-1.44,0-2.59.73-2.59,1.85S12.73,17.39,14.14,17.53Z"/><path d="M26.8,12.13A3.38,3.38,0,0,0,29,13.88a3.28,3.28,0,0,0,1.43,0h0a3.3,3.3,0,0,0,2.49-1.39,3.28,3.28,0,0,0,.44-2.81A3.44,3.44,0,0,0,33,8.31a3.48,3.48,0,0,0-.91-1.14,3.39,3.39,0,0,0-1.29-.67,3.55,3.55,0,0,0-1.45-.07,3.27,3.27,0,0,0-2.52,1.45,3.3,3.3,0,0,0-.54,1.38,3.41,3.41,0,0,0,.12,1.49A3.33,3.33,0,0,0,26.8,12.13Z"/><path d="M23.43,39.72c.37,1.38.77,2.81,1.1,4s.61,2.18.65,2.39A4.52,4.52,0,0,0,27.91,42c-.23-1.64-.82-5.18-1.05-6.55Z"/><path d="M27.57,34.57a31.75,31.75,0,0,1,5.07-1.5c0,1.88,0,4.43-.15,6.22a39.38,39.38,0,0,1-.6,4.34A30.82,30.82,0,0,0,31.41,47a4,4,0,0,0,.48,2.76,4,4,0,0,0,2.16,1.79,81.87,81.87,0,0,0,2.61-12.48,68.13,68.13,0,0,0-.22-15.57Z"/><path d="M41.89,18l-.67-.42-2.1,2.61.39.19a41.43,41.43,0,0,1-.79,7.2,3.15,3.15,0,0,0,2.94-2.5c.32-1.7,1-6.34,0-7.11Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/geen_max_aantal_bezoekers.svg b/packages/icons/src/svg/geen_max_aantal_bezoekers.svg
index d63dd9faef..7e8ce4325c 100644
--- a/packages/icons/src/svg/geen_max_aantal_bezoekers.svg
+++ b/packages/icons/src/svg/geen_max_aantal_bezoekers.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="geen_max_aantal_bezoekers"><path d="M41.36,12.61c2.06,0,3.24-1.29,3.24-3.59s-1.13-3.69-3.24-3.69S38.12,6.62,38.12,9C38.12,11.14,39.31,12.61,41.36,12.61Z"/><path d="M14.64,12.61c2.05,0,3.24-1.47,3.24-3.59,0-2.4-1.25-3.69-3.24-3.69S11.4,6.85,11.4,9,12.59,12.61,14.64,12.61Z"/><path d="M28,12.61c2.31,0,3.64-1.63,3.64-4C31.64,6,30.25,4.51,28,4.51s-3.64,1.7-3.64,4.12S25.69,12.61,28,12.61Z"/><path d="M46,14.76a20.59,20.59,0,0,0-9.24,0,4.66,4.66,0,0,0-.87.35c3.17,3.23,2.69,10.86,2.4,15.44v.11a4.59,4.59,0,0,1-1,2.7V48.25a3.23,3.23,0,0,0,3.52-3.41l.54-13.42a.38.38,0,0,1,.39-.35.39.39,0,0,1,.4.35l.55,13.4a3.34,3.34,0,0,0,3.49,3.43V19.48c.11-.1.25,0,.33.28a17.41,17.41,0,0,1,.58,5v7.09a2.78,2.78,0,0,0,2.76-2.76C50.31,24.9,50.64,16.07,46,14.76Z"/><path d="M33,14.84a20.74,20.74,0,0,0-9.94,0c-5,1.3-4.46,10.48-4.14,15.63v.1a2.86,2.86,0,0,0,2.85,3V27.25c0-2.82,0-5.48.65-7.11.11-.28.27-.32.34-.24V51.49A3.9,3.9,0,0,0,27,47.76l.59-14.62a.43.43,0,0,1,.43-.38.43.43,0,0,1,.43.38L29,47.76a3.91,3.91,0,0,0,4.25,3.73V19.9c.1-.09.24-.06.33.24a28.4,28.4,0,0,1,.66,7.1v6.33a2.87,2.87,0,0,0,2.85-3V30.5C37.43,25.35,38,16.19,33,14.84Z"/><path d="M17.69,30.56c-.29-4.59-.77-12.22,2.4-15.44a4.19,4.19,0,0,0-.87-.36h0a20.31,20.31,0,0,0-9.24,0C5.36,16.07,5.7,24.9,6.13,29.1a2.78,2.78,0,0,0,2.76,2.75V24.76a17.29,17.29,0,0,1,.58-5c.08-.26.22-.39.33-.28V48.25a3.34,3.34,0,0,0,3.49-3.43s.55-13.25.55-13.4a.39.39,0,0,1,.4-.35h0a.38.38,0,0,1,.39.35l.54,13.42a3.23,3.23,0,0,0,3.52,3.41V33.36a4.52,4.52,0,0,1-1-2.7Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="geen_max_aantal_bezoekers"><path d="M41.36,12.61c2.06,0,3.24-1.29,3.24-3.59s-1.13-3.69-3.24-3.69S38.12,6.62,38.12,9C38.12,11.14,39.31,12.61,41.36,12.61Z"/><path d="M14.64,12.61c2.05,0,3.24-1.47,3.24-3.59,0-2.4-1.25-3.69-3.24-3.69S11.4,6.85,11.4,9,12.59,12.61,14.64,12.61Z"/><path d="M28,12.61c2.31,0,3.64-1.63,3.64-4C31.64,6,30.25,4.51,28,4.51s-3.64,1.7-3.64,4.12S25.69,12.61,28,12.61Z"/><path d="M46,14.76a20.59,20.59,0,0,0-9.24,0,4.66,4.66,0,0,0-.87.35c3.17,3.23,2.69,10.86,2.4,15.44v.11a4.59,4.59,0,0,1-1,2.7V48.25a3.23,3.23,0,0,0,3.52-3.41l.54-13.42a.38.38,0,0,1,.39-.35.39.39,0,0,1,.4.35l.55,13.4a3.34,3.34,0,0,0,3.49,3.43V19.48c.11-.1.25,0,.33.28a17.41,17.41,0,0,1,.58,5v7.09a2.78,2.78,0,0,0,2.76-2.76C50.31,24.9,50.64,16.07,46,14.76Z"/><path d="M33,14.84a20.74,20.74,0,0,0-9.94,0c-5,1.3-4.46,10.48-4.14,15.63v.1a2.86,2.86,0,0,0,2.85,3V27.25c0-2.82,0-5.48.65-7.11.11-.28.27-.32.34-.24V51.49A3.9,3.9,0,0,0,27,47.76l.59-14.62a.43.43,0,0,1,.43-.38.43.43,0,0,1,.43.38L29,47.76a3.91,3.91,0,0,0,4.25,3.73V19.9c.1-.09.24-.06.33.24a28.4,28.4,0,0,1,.66,7.1v6.33a2.87,2.87,0,0,0,2.85-3V30.5C37.43,25.35,38,16.19,33,14.84Z"/><path d="M17.69,30.56c-.29-4.59-.77-12.22,2.4-15.44a4.19,4.19,0,0,0-.87-.36h0a20.31,20.31,0,0,0-9.24,0C5.36,16.07,5.7,24.9,6.13,29.1a2.78,2.78,0,0,0,2.76,2.75V24.76a17.29,17.29,0,0,1,.58-5c.08-.26.22-.39.33-.28V48.25a3.34,3.34,0,0,0,3.49-3.43s.55-13.25.55-13.4a.39.39,0,0,1,.4-.35h0a.38.38,0,0,1,.39.35l.54,13.42a3.23,3.23,0,0,0,3.52,3.41V33.36a4.52,4.52,0,0,1-1-2.7Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/geen_wedstrijden.svg b/packages/icons/src/svg/geen_wedstrijden.svg
index cdb8d73d8c..1b726c5863 100644
--- a/packages/icons/src/svg/geen_wedstrijden.svg
+++ b/packages/icons/src/svg/geen_wedstrijden.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="geen_wedstrijden"><path d="M23.85,21.62c1.61.46,3-.69,3.46-2.31.23-1.84-.46-3.23-2.08-3.46-1.85-.46-3,.46-3.46,2.31A2.57,2.57,0,0,0,23.85,21.62Z"/><path d="M47.62,49.78,10.22,12.39,8.38,14.23l8.95,9a7.18,7.18,0,0,0-2.95,1.21,12.76,12.76,0,0,0-2.54,4.15,2.45,2.45,0,0,0,.7,3c.09-.15.25-.42.44-.76.76-1.33,2.15-3.77,3.25-4.32a7.07,7.07,0,0,1,3-.69c-.69,2.76-1.39,6.46-1.62,7.84-.41,2.3.87,3.09,2.49,4.08l.51.31h-.23A3.3,3.3,0,0,1,20,38a7.15,7.15,0,0,0-1.47-.17c-.46,1.15-1.62,3.46-2.08,4.38a22.76,22.76,0,0,1-4.85-.92,3,3,0,0,0-3.23,1.85c1.85.69,6.46,2.31,8.31,2.31,1.15,0,1.62-.47,2.31-1.62.34-.51.71-1.11,1.08-1.72A32.44,32.44,0,0,1,22,39.16c.92.46,2.31,1.16,3,1.62.12.81.23,2.19.35,3.58s.23,2.77.34,3.57a3.35,3.35,0,0,0,2.77,2.77,52.25,52.25,0,0,0,.23-6V40.78a3.45,3.45,0,0,0-.46-2.08c-.23-.69-.92-1.38-4.85-4.15.24-.93.47-2,.7-3,.1-.45.19-.89.29-1.33L36.11,42a3.23,3.23,0,1,0,3.41,3.42l6.26,6.25Z"/><path d="M34.23,30.62c-1.62-.11-2.77-.23-3.58-.34l2,2A2.27,2.27,0,0,0,34.23,30.62Z"/><path d="M23.47,23.1l3.39,3.38h0l-.12-.27A4.4,4.4,0,0,0,23.47,23.1Z"/><path d="M35.85,6.39c.46.23.92-.24,1.15-.7a.8.8,0,0,0-.69-1.15c-.69-.23-.92.23-1.15.69S35.16,6.15,35.85,6.39Z"/><path d="M41.39,13.31c.92.23,1.62-.23,1.85-1.38a1.56,1.56,0,0,0-1.16-2.08A1.81,1.81,0,0,0,40,11.23C40,12.39,40.24,13.08,41.39,13.31Z"/><path d="M34.08,13.72c.05-.06.09-.12.15-.18.12-.23.29-.52.47-.81s.34-.57.46-.8a1.74,1.74,0,0,0,.92.46c0,.23.06.69.12,1.15s.1.85.11,1.1a1.75,1.75,0,0,0-.46.29,4.58,4.58,0,0,0-1.2,1.6,7.19,7.19,0,0,1-.42.7,1.44,1.44,0,0,0,.47,1.85,6.38,6.38,0,0,0,.46-.74,8.91,8.91,0,0,1,1.61-2.26,3,3,0,0,1,1.85-.46A29.8,29.8,0,0,0,38,18.74c-.11.61-.19,1.14-.28,1.5-.21,1.22.49,1.72,1.29,2.3l.32.23h-.23a4,4,0,0,1-1.15-.23,8.87,8.87,0,0,1-1.39,2.54,11.45,11.45,0,0,1-2.15-.34,4.89,4.89,0,0,0-.62-.12c-1.15-.23-1.61,1.16-1.61,1.16A19.16,19.16,0,0,0,37,27.16c.7,0,.93-.23,1.39-.92A30.91,30.91,0,0,0,40,23.47l1.85.92a14.68,14.68,0,0,1,.23,2.08,16.14,16.14,0,0,0,.23,2.07,1.89,1.89,0,0,0,1.62,1.62,17.19,17.19,0,0,1,.12-1.89,13.34,13.34,0,0,0,.11-1.57V24.39a1.72,1.72,0,0,0-.23-1.15c-.17-.33-.45-.54-1.34-1.22-.36-.27-.83-.62-1.43-1.09.08-.39.15-.8.23-1.21.15-.82.31-1.64.46-2.25a5,5,0,0,0,1.62,2.07,7.86,7.86,0,0,0,2.31.23,1.82,1.82,0,0,0,1.61-1.15c-1-.12-1.65-.25-2.12-.34a5.86,5.86,0,0,0-.88-.12c-.46-.23-1.15-1.62-1.38-2.08,0-.08-.08-.16-.12-.24C42.49,15,42.11,14.21,40,14a6.91,6.91,0,0,0-2.77.3V12.39a.88.88,0,0,0-.23-.7c0-.23-.23-.46-1.61-1.38a2.62,2.62,0,0,0,.69-1.85A5.1,5.1,0,0,0,37,9.62a1.47,1.47,0,0,0,1.39,0c.52.17.65,0,.78-.26a.72.72,0,0,1,.14-.2,5.4,5.4,0,0,1-1.61-.24A3.1,3.1,0,0,1,37,7.77l0-.12a1.51,1.51,0,0,0-1.56-1,5.83,5.83,0,0,0-2.31.46,7.16,7.16,0,0,0-.92,1.38.7.7,0,0,0,.23.93,3.91,3.91,0,0,0,.32-.52,3,3,0,0,1,.83-1.1.73.73,0,0,0,.3-.09,1.62,1.62,0,0,1,.62-.14,8.39,8.39,0,0,0-.69,2.54c-.21.84.35,1.11.8,1.32l.13.06H34l-.23.52a3.41,3.41,0,0,1-.46.87,6.45,6.45,0,0,1-1.05-.15c-.26,0-.47-.08-.57-.08a1,1,0,0,0-.92.69,12.21,12.21,0,0,0,2.77.69A.53.53,0,0,0,34.08,13.72Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="geen_wedstrijden"><path d="M23.85,21.62c1.61.46,3-.69,3.46-2.31.23-1.84-.46-3.23-2.08-3.46-1.85-.46-3,.46-3.46,2.31A2.57,2.57,0,0,0,23.85,21.62Z"/><path d="M47.62,49.78,10.22,12.39,8.38,14.23l8.95,9a7.18,7.18,0,0,0-2.95,1.21,12.76,12.76,0,0,0-2.54,4.15,2.45,2.45,0,0,0,.7,3c.09-.15.25-.42.44-.76.76-1.33,2.15-3.77,3.25-4.32a7.07,7.07,0,0,1,3-.69c-.69,2.76-1.39,6.46-1.62,7.84-.41,2.3.87,3.09,2.49,4.08l.51.31h-.23A3.3,3.3,0,0,1,20,38a7.15,7.15,0,0,0-1.47-.17c-.46,1.15-1.62,3.46-2.08,4.38a22.76,22.76,0,0,1-4.85-.92,3,3,0,0,0-3.23,1.85c1.85.69,6.46,2.31,8.31,2.31,1.15,0,1.62-.47,2.31-1.62.34-.51.71-1.11,1.08-1.72A32.44,32.44,0,0,1,22,39.16c.92.46,2.31,1.16,3,1.62.12.81.23,2.19.35,3.58s.23,2.77.34,3.57a3.35,3.35,0,0,0,2.77,2.77,52.25,52.25,0,0,0,.23-6V40.78a3.45,3.45,0,0,0-.46-2.08c-.23-.69-.92-1.38-4.85-4.15.24-.93.47-2,.7-3,.1-.45.19-.89.29-1.33L36.11,42a3.23,3.23,0,1,0,3.41,3.42l6.26,6.25Z"/><path d="M34.23,30.62c-1.62-.11-2.77-.23-3.58-.34l2,2A2.27,2.27,0,0,0,34.23,30.62Z"/><path d="M23.47,23.1l3.39,3.38h0l-.12-.27A4.4,4.4,0,0,0,23.47,23.1Z"/><path d="M35.85,6.39c.46.23.92-.24,1.15-.7a.8.8,0,0,0-.69-1.15c-.69-.23-.92.23-1.15.69S35.16,6.15,35.85,6.39Z"/><path d="M41.39,13.31c.92.23,1.62-.23,1.85-1.38a1.56,1.56,0,0,0-1.16-2.08A1.81,1.81,0,0,0,40,11.23C40,12.39,40.24,13.08,41.39,13.31Z"/><path d="M34.08,13.72c.05-.06.09-.12.15-.18.12-.23.29-.52.47-.81s.34-.57.46-.8a1.74,1.74,0,0,0,.92.46c0,.23.06.69.12,1.15s.1.85.11,1.1a1.75,1.75,0,0,0-.46.29,4.58,4.58,0,0,0-1.2,1.6,7.19,7.19,0,0,1-.42.7,1.44,1.44,0,0,0,.47,1.85,6.38,6.38,0,0,0,.46-.74,8.91,8.91,0,0,1,1.61-2.26,3,3,0,0,1,1.85-.46A29.8,29.8,0,0,0,38,18.74c-.11.61-.19,1.14-.28,1.5-.21,1.22.49,1.72,1.29,2.3l.32.23h-.23a4,4,0,0,1-1.15-.23,8.87,8.87,0,0,1-1.39,2.54,11.45,11.45,0,0,1-2.15-.34,4.89,4.89,0,0,0-.62-.12c-1.15-.23-1.61,1.16-1.61,1.16A19.16,19.16,0,0,0,37,27.16c.7,0,.93-.23,1.39-.92A30.91,30.91,0,0,0,40,23.47l1.85.92a14.68,14.68,0,0,1,.23,2.08,16.14,16.14,0,0,0,.23,2.07,1.89,1.89,0,0,0,1.62,1.62,17.19,17.19,0,0,1,.12-1.89,13.34,13.34,0,0,0,.11-1.57V24.39a1.72,1.72,0,0,0-.23-1.15c-.17-.33-.45-.54-1.34-1.22-.36-.27-.83-.62-1.43-1.09.08-.39.15-.8.23-1.21.15-.82.31-1.64.46-2.25a5,5,0,0,0,1.62,2.07,7.86,7.86,0,0,0,2.31.23,1.82,1.82,0,0,0,1.61-1.15c-1-.12-1.65-.25-2.12-.34a5.86,5.86,0,0,0-.88-.12c-.46-.23-1.15-1.62-1.38-2.08,0-.08-.08-.16-.12-.24C42.49,15,42.11,14.21,40,14a6.91,6.91,0,0,0-2.77.3V12.39a.88.88,0,0,0-.23-.7c0-.23-.23-.46-1.61-1.38a2.62,2.62,0,0,0,.69-1.85A5.1,5.1,0,0,0,37,9.62a1.47,1.47,0,0,0,1.39,0c.52.17.65,0,.78-.26a.72.72,0,0,1,.14-.2,5.4,5.4,0,0,1-1.61-.24A3.1,3.1,0,0,1,37,7.77l0-.12a1.51,1.51,0,0,0-1.56-1,5.83,5.83,0,0,0-2.31.46,7.16,7.16,0,0,0-.92,1.38.7.7,0,0,0,.23.93,3.91,3.91,0,0,0,.32-.52,3,3,0,0,1,.83-1.1.73.73,0,0,0,.3-.09,1.62,1.62,0,0,1,.62-.14,8.39,8.39,0,0,0-.69,2.54c-.21.84.35,1.11.8,1.32l.13.06H34l-.23.52a3.41,3.41,0,0,1-.46.87,6.45,6.45,0,0,1-1.05-.15c-.26,0-.47-.08-.57-.08a1,1,0,0,0-.92.69,12.21,12.21,0,0,0,2.77.69A.53.53,0,0,0,34.08,13.72Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/gehandicaptenzorg.svg b/packages/icons/src/svg/gehandicaptenzorg.svg
index 066bdf79c4..6c359c2926 100644
--- a/packages/icons/src/svg/gehandicaptenzorg.svg
+++ b/packages/icons/src/svg/gehandicaptenzorg.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="gehandicaptenzorg"><path d="M51,27,28.64,5.62a.93.93,0,0,0-1.28,0L5,27a1.93,1.93,0,0,0-.61,1.42v1.42a1,1,0,0,0,1,1H9.14V50.63H46.86V30.78h3.77a1,1,0,0,0,.95-1V28.39A1.93,1.93,0,0,0,51,27Zm-25.4-9.32c.29-1.91,1.49-3.08,3.33-2.78s2.64,1.59,2.31,3.7c-.28,1.85-1.52,3-3.31,2.67S25.26,19.65,25.57,17.65Zm.86,30A8.92,8.92,0,0,1,20.68,32c0,.23,0,.44,0,.65A4.5,4.5,0,0,0,21.33,35,6.3,6.3,0,1,0,32,41.67c.13.34.24.65.33.91a7.73,7.73,0,0,0,.92,1.8A8.79,8.79,0,0,1,26.43,47.63ZM34,42c-.57-1.54-1.62-4.57-2.2-6.43H25.82c-1.67,0-3.4-.89-3.42-2.93A37.51,37.51,0,0,1,23,26.51a4.44,4.44,0,0,0-1.73,1.43,30,30,0,0,0-1.51,3.38,2.31,2.31,0,0,1-2.59,1.45A41.32,41.32,0,0,1,19,26.63a4.15,4.15,0,0,1,.86-1.21,16.71,16.71,0,0,1,4.85-3,3.57,3.57,0,0,1,4.12.73c.72.89.49,1.77.3,3.2-.14,1.11-.34,2.69-.64,4.59a34.49,34.49,0,0,1,4.62,1.22,2.5,2.5,0,0,1,1.58,1.67c.88,2.23,2.17,8.38,2.74,10.73C36.84,44.68,35,45,34,42Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="gehandicaptenzorg"><path d="M51,27,28.64,5.62a.93.93,0,0,0-1.28,0L5,27a1.93,1.93,0,0,0-.61,1.42v1.42a1,1,0,0,0,1,1H9.14V50.63H46.86V30.78h3.77a1,1,0,0,0,.95-1V28.39A1.93,1.93,0,0,0,51,27Zm-25.4-9.32c.29-1.91,1.49-3.08,3.33-2.78s2.64,1.59,2.31,3.7c-.28,1.85-1.52,3-3.31,2.67S25.26,19.65,25.57,17.65Zm.86,30A8.92,8.92,0,0,1,20.68,32c0,.23,0,.44,0,.65A4.5,4.5,0,0,0,21.33,35,6.3,6.3,0,1,0,32,41.67c.13.34.24.65.33.91a7.73,7.73,0,0,0,.92,1.8A8.79,8.79,0,0,1,26.43,47.63ZM34,42c-.57-1.54-1.62-4.57-2.2-6.43H25.82c-1.67,0-3.4-.89-3.42-2.93A37.51,37.51,0,0,1,23,26.51a4.44,4.44,0,0,0-1.73,1.43,30,30,0,0,0-1.51,3.38,2.31,2.31,0,0,1-2.59,1.45A41.32,41.32,0,0,1,19,26.63a4.15,4.15,0,0,1,.86-1.21,16.71,16.71,0,0,1,4.85-3,3.57,3.57,0,0,1,4.12.73c.72.89.49,1.77.3,3.2-.14,1.11-.34,2.69-.64,4.59a34.49,34.49,0,0,1,4.62,1.22,2.5,2.5,0,0,1,1.58,1.67c.88,2.23,2.17,8.38,2.74,10.73C36.84,44.68,35,45,34,42Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/georganiseerde_kunst_en_cultuurbeoefening.svg b/packages/icons/src/svg/georganiseerde_kunst_en_cultuurbeoefening.svg
index 5ee1011b63..780b37d46f 100644
--- a/packages/icons/src/svg/georganiseerde_kunst_en_cultuurbeoefening.svg
+++ b/packages/icons/src/svg/georganiseerde_kunst_en_cultuurbeoefening.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="georganiseerde_kunst_en_cultuurbeoefening"><path d="M19.85,14.33v24a7.35,7.35,0,0,0-11,9.2,7.26,7.26,0,0,0,3.47,3.36A7.34,7.34,0,0,0,22.81,44.2V25.06l22.13-7.4V33.9a7.35,7.35,0,1,0,3,5.89V4.42Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="georganiseerde_kunst_en_cultuurbeoefening"><path d="M19.85,14.33v24a7.35,7.35,0,0,0-11,9.2,7.26,7.26,0,0,0,3.47,3.36A7.34,7.34,0,0,0,22.81,44.2V25.06l22.13-7.4V33.9a7.35,7.35,0,1,0,3,5.89V4.42Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/ggd_testen.svg b/packages/icons/src/svg/ggd_testen.svg
index be54622cb7..8f8b92af86 100644
--- a/packages/icons/src/svg/ggd_testen.svg
+++ b/packages/icons/src/svg/ggd_testen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="ggd_testen"><path d="M39.28,4.42H17.7c-1.18,0-1.44,2,0,2.36.75.24,1.77.41,2.44.57V43.44a8.44,8.44,0,0,0,16.86,0v-36c.68-.16,1.6-.41,2.45-.57C40.71,6.37,40.46,4.42,39.28,4.42ZM23.43,7.67H33.55v13H23.43Zm7,34.8c-.93,2.68-3.12,4.39-4.81,3.9s-2.28-3.17-1.26-5.94a6.2,6.2,0,0,1,3.2-3.74L31.44,25.8l2.19,2.85-3.2,9A6.26,6.26,0,0,1,30.43,42.47Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="ggd_testen"><path d="M39.28,4.42H17.7c-1.18,0-1.44,2,0,2.36.75.24,1.77.41,2.44.57V43.44a8.44,8.44,0,0,0,16.86,0v-36c.68-.16,1.6-.41,2.45-.57C40.71,6.37,40.46,4.42,39.28,4.42ZM23.43,7.67H33.55v13H23.43Zm7,34.8c-.93,2.68-3.12,4.39-4.81,3.9s-2.28-3.17-1.26-5.94a6.2,6.2,0,0,1,3.2-3.74L31.44,25.8l2.19,2.85-3.2,9A6.26,6.26,0,0,1,30.43,42.47Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/groepen.svg b/packages/icons/src/svg/groepen.svg
index 741a26139f..aaf43c8767 100644
--- a/packages/icons/src/svg/groepen.svg
+++ b/packages/icons/src/svg/groepen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="groepen"><path d="M34.48,12.64c2.39,0,3.58-1.52,3.58-4,0-2.74-1.19-4.26-3.58-4.26S30.9,6.25,30.9,8.68,32.39,12.64,34.48,12.64Z"/><path d="M24.31,30.38C24,25.5,23.55,18.3,26.72,15.07a1.1,1.1,0,0,1-.44-.15,1,1,0,0,0-.45-.15,23.59,23.59,0,0,0-9.25,0C12.11,16,12.4,25.11,12.7,29.06c.6,2.44,2.09,3,3,3V24.8a15.53,15.53,0,0,1,.59-5.17s.3-.3.3,0v28.9a3.59,3.59,0,0,0,3.58-3.35l.6-13.38a.29.29,0,0,1,.3-.3.29.29,0,0,1,.29.3L22,45.18c0,2.13,1.19,3.35,3.58,3.35V33.62a5.46,5.46,0,0,1-1.19-2.73Z"/><path d="M39.55,14.77a17.88,17.88,0,0,0-9.84,0c-5,1.5-4.49,10.4-4.19,15.61v.2a2.74,2.74,0,0,0,2.69,3V27.24c0-2.74,0-5.48.59-7.3a.3.3,0,0,1,.3-.31V51.57a4,4,0,0,0,4.18-3.65l.59-14.6a.3.3,0,0,1,.6,0c0,.3.6,14.6.6,14.6a4,4,0,0,0,4.17,3.65V19.94a.29.29,0,0,1,.3.3c.6,1.52.6,4.26.6,7.3v6.39c1.19,0,2.68-.61,2.68-3C43.73,25.41,44.32,16.29,39.55,14.77Z"/><path d="M21.35,12.64c2.09,0,3.29-1.52,3.29-3.65,0-2.44-1.2-3.65-3.29-3.65S18.07,6.86,18.07,9C18.07,11.42,19.27,12.64,21.35,12.64Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="groepen"><path d="M34.48,12.64c2.39,0,3.58-1.52,3.58-4,0-2.74-1.19-4.26-3.58-4.26S30.9,6.25,30.9,8.68,32.39,12.64,34.48,12.64Z"/><path d="M24.31,30.38C24,25.5,23.55,18.3,26.72,15.07a1.1,1.1,0,0,1-.44-.15,1,1,0,0,0-.45-.15,23.59,23.59,0,0,0-9.25,0C12.11,16,12.4,25.11,12.7,29.06c.6,2.44,2.09,3,3,3V24.8a15.53,15.53,0,0,1,.59-5.17s.3-.3.3,0v28.9a3.59,3.59,0,0,0,3.58-3.35l.6-13.38a.29.29,0,0,1,.3-.3.29.29,0,0,1,.29.3L22,45.18c0,2.13,1.19,3.35,3.58,3.35V33.62a5.46,5.46,0,0,1-1.19-2.73Z"/><path d="M39.55,14.77a17.88,17.88,0,0,0-9.84,0c-5,1.5-4.49,10.4-4.19,15.61v.2a2.74,2.74,0,0,0,2.69,3V27.24c0-2.74,0-5.48.59-7.3a.3.3,0,0,1,.3-.31V51.57a4,4,0,0,0,4.18-3.65l.59-14.6a.3.3,0,0,1,.6,0c0,.3.6,14.6.6,14.6a4,4,0,0,0,4.17,3.65V19.94a.29.29,0,0,1,.3.3c.6,1.52.6,4.26.6,7.3v6.39c1.19,0,2.68-.61,2.68-3C43.73,25.41,44.32,16.29,39.55,14.77Z"/><path d="M21.35,12.64c2.09,0,3.29-1.52,3.29-3.65,0-2.44-1.2-3.65-3.29-3.65S18.07,6.86,18.07,9C18.07,11.42,19.27,12.64,21.35,12.64Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/health_care.svg b/packages/icons/src/svg/health_care.svg
index 69a93389af..b376c91ac8 100644
--- a/packages/icons/src/svg/health_care.svg
+++ b/packages/icons/src/svg/health_care.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="health_care"><path d="M7.37,36.84H19.16V48.62a3,3,0,0,0,2.95,3H33.89a3,3,0,0,0,3-3V36.84H48.63a3,3,0,0,0,2.94-3V22.1a2.94,2.94,0,0,0-2.94-2.94H36.84V7.37a3,3,0,0,0-3-2.95H22.11a3,3,0,0,0-2.95,3V19.16H7.37A2.94,2.94,0,0,0,4.43,22.1V33.89A3,3,0,0,0,7.37,36.84Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="health_care"><path d="M7.37,36.84H19.16V48.62a3,3,0,0,0,2.95,3H33.89a3,3,0,0,0,3-3V36.84H48.63a3,3,0,0,0,2.94-3V22.1a2.94,2.94,0,0,0-2.94-2.94H36.84V7.37a3,3,0,0,0-3-2.95H22.11a3,3,0,0,0-2.95,3V19.16H7.37A2.94,2.94,0,0,0,4.43,22.1V33.89A3,3,0,0,0,7.37,36.84Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/home_and_visits.svg b/packages/icons/src/svg/home_and_visits.svg
index 4380335fc8..4ae0aa09fe 100644
--- a/packages/icons/src/svg/home_and_visits.svg
+++ b/packages/icons/src/svg/home_and_visits.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="home_and_visits"><path d="M35.22,20.77c0-2-.85-3.06-2.57-3.06S30.08,19,30.08,20.77a2.56,2.56,0,0,0,2.57,2.84C34.37,23.61,35.22,22.52,35.22,20.77Z"/><path d="M25.35,36.35c-.22-3.5-.54-8.67,1.73-11a.87.87,0,0,1-.32-.11.82.82,0,0,0-.32-.11,16.86,16.86,0,0,0-6.64,0c-3.21.87-3,7.43-2.79,10.27.43,1.74,1.5,2.18,2.15,2.18V32.35a11,11,0,0,1,.43-3.71s.21-.22.21,0V49.39A2.58,2.58,0,0,0,22.37,47l.43-9.61a.21.21,0,0,1,.21-.22.22.22,0,0,1,.22.22L23.66,47c0,1.53.85,2.41,2.57,2.41V38.68a3.94,3.94,0,0,1-.86-2Z"/><path d="M38.65,36.72c.64-3.93,1.07-10.49-2.36-11.58a13,13,0,0,0-7.06,0c-3.6,1.08-3.23,7.47-3,11.21v.15a2,2,0,0,0,1.92,2.18V34.1a19.11,19.11,0,0,1,.43-5.25.21.21,0,0,1,.22-.21V51.57a2.85,2.85,0,0,0,3-2.62l.42-10.49a.21.21,0,0,1,.22-.21.21.21,0,0,1,.21.21c0,.22.43,10.49.43,10.49a2.85,2.85,0,0,0,3,2.62V28.85a.21.21,0,0,1,.21.22,17.5,17.5,0,0,1,.43,5.24V38.9C37.58,38.9,38.65,38.46,38.65,36.72Z"/><path d="M25.58,21c0-1.75-.85-2.62-2.35-2.62A2.34,2.34,0,0,0,20.87,21c0,1.75.86,2.62,2.36,2.62A2.33,2.33,0,0,0,25.58,21Z"/><path d="M48.08,23.05,28.58,4.62a.83.83,0,0,0-1.07,0L8,23.05a2.08,2.08,0,0,0-.53,1.34v1.33a.71.71,0,0,0,.8.81h3.21V43.89h6.44V39.23a3.62,3.62,0,0,1-1.1-.63,5,5,0,0,1-1.63-2.75l0-.15,0-.15a29.06,29.06,0,0,1,.13-6.3,10.51,10.51,0,0,1,1.06-3.43,4.84,4.84,0,0,1,3-2.48h.08l.1,0A5.27,5.27,0,0,1,19,21a4.64,4.64,0,0,1,1.08-3.1,4.05,4.05,0,0,1,3.15-1.39,4.13,4.13,0,0,1,3.11,1.26A4.65,4.65,0,0,1,27.45,21a4.88,4.88,0,0,1-.55,2.33l.37.11.14.06h.87l.41-.14h0l.12,0a5.09,5.09,0,0,1-.63-2.54,5.35,5.35,0,0,1,1-3.33A4.5,4.5,0,0,1,36,17.32a5.32,5.32,0,0,1,1.07,3.45,5.34,5.34,0,0,1-.56,2.5l.31.09h0a5.11,5.11,0,0,1,3,2.64,10.07,10.07,0,0,1,1,3.67,28.07,28.07,0,0,1-.34,7.21,4,4,0,0,1-1.27,3,3.63,3.63,0,0,1-1.29.72v3.3h6.39V26.26h3.2a.71.71,0,0,0,.81-.8V24.39C48.61,23.85,48.61,23.32,48.08,23.05Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="home_and_visits"><path d="M35.22,20.77c0-2-.85-3.06-2.57-3.06S30.08,19,30.08,20.77a2.56,2.56,0,0,0,2.57,2.84C34.37,23.61,35.22,22.52,35.22,20.77Z"/><path d="M25.35,36.35c-.22-3.5-.54-8.67,1.73-11a.87.87,0,0,1-.32-.11.82.82,0,0,0-.32-.11,16.86,16.86,0,0,0-6.64,0c-3.21.87-3,7.43-2.79,10.27.43,1.74,1.5,2.18,2.15,2.18V32.35a11,11,0,0,1,.43-3.71s.21-.22.21,0V49.39A2.58,2.58,0,0,0,22.37,47l.43-9.61a.21.21,0,0,1,.21-.22.22.22,0,0,1,.22.22L23.66,47c0,1.53.85,2.41,2.57,2.41V38.68a3.94,3.94,0,0,1-.86-2Z"/><path d="M38.65,36.72c.64-3.93,1.07-10.49-2.36-11.58a13,13,0,0,0-7.06,0c-3.6,1.08-3.23,7.47-3,11.21v.15a2,2,0,0,0,1.92,2.18V34.1a19.11,19.11,0,0,1,.43-5.25.21.21,0,0,1,.22-.21V51.57a2.85,2.85,0,0,0,3-2.62l.42-10.49a.21.21,0,0,1,.22-.21.21.21,0,0,1,.21.21c0,.22.43,10.49.43,10.49a2.85,2.85,0,0,0,3,2.62V28.85a.21.21,0,0,1,.21.22,17.5,17.5,0,0,1,.43,5.24V38.9C37.58,38.9,38.65,38.46,38.65,36.72Z"/><path d="M25.58,21c0-1.75-.85-2.62-2.35-2.62A2.34,2.34,0,0,0,20.87,21c0,1.75.86,2.62,2.36,2.62A2.33,2.33,0,0,0,25.58,21Z"/><path d="M48.08,23.05,28.58,4.62a.83.83,0,0,0-1.07,0L8,23.05a2.08,2.08,0,0,0-.53,1.34v1.33a.71.71,0,0,0,.8.81h3.21V43.89h6.44V39.23a3.62,3.62,0,0,1-1.1-.63,5,5,0,0,1-1.63-2.75l0-.15,0-.15a29.06,29.06,0,0,1,.13-6.3,10.51,10.51,0,0,1,1.06-3.43,4.84,4.84,0,0,1,3-2.48h.08l.1,0A5.27,5.27,0,0,1,19,21a4.64,4.64,0,0,1,1.08-3.1,4.05,4.05,0,0,1,3.15-1.39,4.13,4.13,0,0,1,3.11,1.26A4.65,4.65,0,0,1,27.45,21a4.88,4.88,0,0,1-.55,2.33l.37.11.14.06h.87l.41-.14h0l.12,0a5.09,5.09,0,0,1-.63-2.54,5.35,5.35,0,0,1,1-3.33A4.5,4.5,0,0,1,36,17.32a5.32,5.32,0,0,1,1.07,3.45,5.34,5.34,0,0,1-.56,2.5l.31.09h0a5.11,5.11,0,0,1,3,2.64,10.07,10.07,0,0,1,1,3.67,28.07,28.07,0,0,1-.34,7.21,4,4,0,0,1-1.27,3,3.63,3.63,0,0,1-1.29.72v3.3h6.39V26.26h3.2a.71.71,0,0,0,.81-.8V24.39C48.61,23.85,48.61,23.32,48.08,23.05Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/horeca_en_evenementen_bestellen.svg b/packages/icons/src/svg/horeca_en_evenementen_bestellen.svg
index 2a1e24c0bd..2f09a85c5c 100644
--- a/packages/icons/src/svg/horeca_en_evenementen_bestellen.svg
+++ b/packages/icons/src/svg/horeca_en_evenementen_bestellen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="horeca_en_evenementen_bestellen"><path d="M27,4.42c-.52,0-.77.26-1,.77L25.44,16a.81.81,0,0,1-.77.77A.68.68,0,0,1,23.9,16l-1-10.76a.77.77,0,1,0-1.54,0L20.57,16a.81.81,0,0,1-.77.77A.68.68,0,0,1,19,16L18,5.19a.68.68,0,0,0-.77-.77.82.82,0,0,0-.77.77l-.77,12c0,1.79,1.79,3.58,4.36,4.35-1,12-1.54,27.16-1.54,27.93,0,1,1.54,2,3.59,2s3.58-.77,3.58-2c0-.77-.51-15.12-1.28-26.65a4.89,4.89,0,0,1-2.56-.77.25.25,0,0,1-.26-.25h.52c3.33,0,6.4-2.31,6.4-4.61l-.77-12A.82.82,0,0,0,27,4.42Z"/><path d="M40.3,25.18c-.51-5.13-1.79-16.4-5.64-20.24a1.37,1.37,0,0,0-2.3.76V49.78c0,1,1.53,1.53,2.3,1.53,2.56,0,6.15-1.79,2.31-23.83h.77A2.36,2.36,0,0,0,40.3,25.18Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="horeca_en_evenementen_bestellen"><path d="M27,4.42c-.52,0-.77.26-1,.77L25.44,16a.81.81,0,0,1-.77.77A.68.68,0,0,1,23.9,16l-1-10.76a.77.77,0,1,0-1.54,0L20.57,16a.81.81,0,0,1-.77.77A.68.68,0,0,1,19,16L18,5.19a.68.68,0,0,0-.77-.77.82.82,0,0,0-.77.77l-.77,12c0,1.79,1.79,3.58,4.36,4.35-1,12-1.54,27.16-1.54,27.93,0,1,1.54,2,3.59,2s3.58-.77,3.58-2c0-.77-.51-15.12-1.28-26.65a4.89,4.89,0,0,1-2.56-.77.25.25,0,0,1-.26-.25h.52c3.33,0,6.4-2.31,6.4-4.61l-.77-12A.82.82,0,0,0,27,4.42Z"/><path d="M40.3,25.18c-.51-5.13-1.79-16.4-5.64-20.24a1.37,1.37,0,0,0-2.3.76V49.78c0,1,1.53,1.53,2.3,1.53,2.56,0,6.15-1.79,2.31-23.83h.77A2.36,2.36,0,0,0,40.3,25.18Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/horeca_en_evenementen_etendrinken.svg b/packages/icons/src/svg/horeca_en_evenementen_etendrinken.svg
index 13d9871dde..f5d19778af 100644
--- a/packages/icons/src/svg/horeca_en_evenementen_etendrinken.svg
+++ b/packages/icons/src/svg/horeca_en_evenementen_etendrinken.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="horeca_en_evenementen_etendrinken"><path d="M28.05,22.43c-1.84,0-3.68,2.46-3.68,5.22h7.37C31.74,24.58,29.89,22.43,28.05,22.43Z"/><path d="M28.05,30.11a2.1,2.1,0,0,0-2.15,2.15,1.69,1.69,0,0,0,.93,1.53v4.3h2.45v-4.3a1.69,1.69,0,0,0,.92-1.53A2.1,2.1,0,0,0,28.05,30.11Z"/><path d="M51.07,26.73,28.67,5.56a.93.93,0,0,0-1.23,0L5,26.73a2.34,2.34,0,0,0-.62,1.54V29.8a.82.82,0,0,0,.92.92H9v20H46.77V30.41h3.68a.81.81,0,0,0,.93-.92V28.27C51.68,27.65,51.68,27,51.07,26.73ZM34.8,39c0,.61-.61.92-1.22,1.22a41.25,41.25,0,0,1-5.53.31,41.2,41.2,0,0,1-5.52-.31A1.32,1.32,0,0,1,21.3,39,31.55,31.55,0,0,1,21,34.1a31.42,31.42,0,0,1,.31-4.91c0-.62.62-.92,1.23-1.23.31-4,2.76-7.37,5.52-7.37S33,23.36,33.58,27a.3.3,0,0,1-.31.3l-1.53,1.54a1.23,1.23,0,0,0-.47.15,1,1,0,0,1-.46.16h.31A5.53,5.53,0,0,0,33.58,28l.3-.31a4.23,4.23,0,0,0,.38.31c.27.2.54.41.54.61a35,35,0,0,1,.31,5.53A33.65,33.65,0,0,1,34.8,39Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="horeca_en_evenementen_etendrinken"><path d="M28.05,22.43c-1.84,0-3.68,2.46-3.68,5.22h7.37C31.74,24.58,29.89,22.43,28.05,22.43Z"/><path d="M28.05,30.11a2.1,2.1,0,0,0-2.15,2.15,1.69,1.69,0,0,0,.93,1.53v4.3h2.45v-4.3a1.69,1.69,0,0,0,.92-1.53A2.1,2.1,0,0,0,28.05,30.11Z"/><path d="M51.07,26.73,28.67,5.56a.93.93,0,0,0-1.23,0L5,26.73a2.34,2.34,0,0,0-.62,1.54V29.8a.82.82,0,0,0,.92.92H9v20H46.77V30.41h3.68a.81.81,0,0,0,.93-.92V28.27C51.68,27.65,51.68,27,51.07,26.73ZM34.8,39c0,.61-.61.92-1.22,1.22a41.25,41.25,0,0,1-5.53.31,41.2,41.2,0,0,1-5.52-.31A1.32,1.32,0,0,1,21.3,39,31.55,31.55,0,0,1,21,34.1a31.42,31.42,0,0,1,.31-4.91c0-.62.62-.92,1.23-1.23.31-4,2.76-7.37,5.52-7.37S33,23.36,33.58,27a.3.3,0,0,1-.31.3l-1.53,1.54a1.23,1.23,0,0,0-.47.15,1,1,0,0,1-.46.16h.31A5.53,5.53,0,0,0,33.58,28l.3-.31a4.23,4.23,0,0,0,.38.31c.27.2.54.41.54.61a35,35,0,0,1,.31,5.53A33.65,33.65,0,0,1,34.8,39Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/horeca_en_evenementen_evenementen.svg b/packages/icons/src/svg/horeca_en_evenementen_evenementen.svg
index 36e26c4f3f..89a78da22c 100644
--- a/packages/icons/src/svg/horeca_en_evenementen_evenementen.svg
+++ b/packages/icons/src/svg/horeca_en_evenementen_evenementen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="horeca_en_evenementen_evenementen"><path d="M28.29,9a.38.38,0,0,0,.32.05l5.8-2A.37.37,0,0,0,34.58,7a.36.36,0,0,0,0-.4.31.31,0,0,0-.17-.13l-5.8-2a.47.47,0,0,0-.17,0l-.15.06a.69.69,0,0,0-.11.13.37.37,0,0,0,0,.15v4a.37.37,0,0,0,0,.15A.69.69,0,0,0,28.29,9Z"/><path d="M27.7,13.56a53.09,53.09,0,0,1-2.16,6l20.4,20a79,79,0,0,1-2.08-10.19L45,29a1.41,1.41,0,0,0,.68-.5,1.36,1.36,0,0,0,.26-.8V24a1.39,1.39,0,0,0-.2-.72,1.38,1.38,0,0,0-.56-.51A49.34,49.34,0,0,1,28.92,10.22a.71.71,0,0,0-.25-.2.78.78,0,0,0-.31-.07.71.71,0,0,0-.56.27,32.78,32.78,0,0,1-5.88,5.89l1.49,1.43A36.71,36.71,0,0,0,27.7,13.56Zm13.74,9.53h-8.1a33.58,33.58,0,0,1-4.26-9.53A51.28,51.28,0,0,0,41.44,23.09Z"/><path d="M7.85,7.29,5.4,9.69,16.2,20.14a44.5,44.5,0,0,1-4.58,2.54,1.45,1.45,0,0,0-.56.51,1.37,1.37,0,0,0-.2.72v3.41a1.39,1.39,0,0,0,.2.71,1.3,1.3,0,0,0,.53.51,3.46,3.46,0,0,0,2.24.5,3.41,3.41,0,0,0,2.06-1s2.26,3.26,7.93.43c0,0,.52,0,0,.61A6.71,6.71,0,0,1,15.7,30a6.34,6.34,0,0,1-3,.84A52.09,52.09,0,0,1,9.46,43.55H21.35c4.22,0,7-11,7-11s2.79,11,7,11h4.87l8.19,8,2.37-2.34Zm7.44,15.8,2.44-1.45,1.49,1.45Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="horeca_en_evenementen_evenementen"><path d="M28.29,9a.38.38,0,0,0,.32.05l5.8-2A.37.37,0,0,0,34.58,7a.36.36,0,0,0,0-.4.31.31,0,0,0-.17-.13l-5.8-2a.47.47,0,0,0-.17,0l-.15.06a.69.69,0,0,0-.11.13.37.37,0,0,0,0,.15v4a.37.37,0,0,0,0,.15A.69.69,0,0,0,28.29,9Z"/><path d="M27.7,13.56a53.09,53.09,0,0,1-2.16,6l20.4,20a79,79,0,0,1-2.08-10.19L45,29a1.41,1.41,0,0,0,.68-.5,1.36,1.36,0,0,0,.26-.8V24a1.39,1.39,0,0,0-.2-.72,1.38,1.38,0,0,0-.56-.51A49.34,49.34,0,0,1,28.92,10.22a.71.71,0,0,0-.25-.2.78.78,0,0,0-.31-.07.71.71,0,0,0-.56.27,32.78,32.78,0,0,1-5.88,5.89l1.49,1.43A36.71,36.71,0,0,0,27.7,13.56Zm13.74,9.53h-8.1a33.58,33.58,0,0,1-4.26-9.53A51.28,51.28,0,0,0,41.44,23.09Z"/><path d="M7.85,7.29,5.4,9.69,16.2,20.14a44.5,44.5,0,0,1-4.58,2.54,1.45,1.45,0,0,0-.56.51,1.37,1.37,0,0,0-.2.72v3.41a1.39,1.39,0,0,0,.2.71,1.3,1.3,0,0,0,.53.51,3.46,3.46,0,0,0,2.24.5,3.41,3.41,0,0,0,2.06-1s2.26,3.26,7.93.43c0,0,.52,0,0,.61A6.71,6.71,0,0,1,15.7,30a6.34,6.34,0,0,1-3,.84A52.09,52.09,0,0,1,9.46,43.55H21.35c4.22,0,7-11,7-11s2.79,11,7,11h4.87l8.19,8,2.37-2.34Zm7.44,15.8,2.44-1.45,1.49,1.45Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/horeca_evenementen.svg b/packages/icons/src/svg/horeca_evenementen.svg
index f3424074a2..29b7df719f 100644
--- a/packages/icons/src/svg/horeca_evenementen.svg
+++ b/packages/icons/src/svg/horeca_evenementen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="horeca_evenementen"><path d="M28.66,9.7l6.59-2.31c.33,0,.33-.66,0-.66L28.66,4.42c-.33,0-.66,0-.66.33V9.37C28,9.7,28.33,10,28.66,9.7Z"/><path d="M46.13,34.43l1.32-.33a1.81,1.81,0,0,0,1-1.65V28.16c0-.66-.33-1.32-1-1.32-3-1.65-13.19-7.25-18.79-14.83a1,1,0,0,0-1.32,0c-5.6,7.58-15.83,13.18-18.79,14.83-.66.33-1,.66-1,1.32v4c0,.66.33,1.32,1,1.32a3.69,3.69,0,0,0,4.94-.66s2.64,3.95,9.23.66c0,0,.66,0,0,.66-1,1-5.27,3.95-9.56,1a6.43,6.43,0,0,1-3.62,1c-1.65,11.21-3.63,15.5-3.63,15.5H19.76C24.7,51.57,28,38.38,28,38.38s3.3,13.19,8.24,13.19H50.09S47.78,46.63,46.13,34.43ZM22.4,27.17H12.83A66.3,66.3,0,0,0,27.34,16C26.35,18.27,24.37,24.54,22.4,27.17Zm11.53,0c-2.3-2.63-4.28-8.9-5.27-11.21A57.41,57.41,0,0,0,43.17,27.17Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="horeca_evenementen"><path d="M28.66,9.7l6.59-2.31c.33,0,.33-.66,0-.66L28.66,4.42c-.33,0-.66,0-.66.33V9.37C28,9.7,28.33,10,28.66,9.7Z"/><path d="M46.13,34.43l1.32-.33a1.81,1.81,0,0,0,1-1.65V28.16c0-.66-.33-1.32-1-1.32-3-1.65-13.19-7.25-18.79-14.83a1,1,0,0,0-1.32,0c-5.6,7.58-15.83,13.18-18.79,14.83-.66.33-1,.66-1,1.32v4c0,.66.33,1.32,1,1.32a3.69,3.69,0,0,0,4.94-.66s2.64,3.95,9.23.66c0,0,.66,0,0,.66-1,1-5.27,3.95-9.56,1a6.43,6.43,0,0,1-3.62,1c-1.65,11.21-3.63,15.5-3.63,15.5H19.76C24.7,51.57,28,38.38,28,38.38s3.3,13.19,8.24,13.19H50.09S47.78,46.63,46.13,34.43ZM22.4,27.17H12.83A66.3,66.3,0,0,0,27.34,16C26.35,18.27,24.37,24.54,22.4,27.17Zm11.53,0c-2.3-2.63-4.28-8.9-5.27-11.21A57.41,57.41,0,0,0,43.17,27.17Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/hospitality.svg b/packages/icons/src/svg/hospitality.svg
index 2066f6edaf..abf0b7acaa 100644
--- a/packages/icons/src/svg/hospitality.svg
+++ b/packages/icons/src/svg/hospitality.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="hospitality"><path d="M45.23,28.15a2.56,2.56,0,0,0-2.38-2.38H38.1a2,2,0,0,0,1.48-1.19l1.19-12.77c0-.3,0-.3-.3-.59s-.29-.3-.59-.3H37.5l.6-4.75c0-.3-.3-.89-.6-.89s-.59.29-.59.89L36,10.92H31a1.07,1.07,0,0,0-.89.89l1.19,12.77a1.35,1.35,0,0,0,1.48,1.19H26.22a1.41,1.41,0,0,0-1.49-1.49H22.36V18.94a7.07,7.07,0,0,0,3.26-1.78,6.25,6.25,0,0,0,1.49-4.46l-.59-7.42c0-.3-.6-.6-.9-.6H17.31c-.6,0-.89.3-.89.6l-.89,7.12A7.3,7.3,0,0,0,17,16.86a7.11,7.11,0,0,0,3.27,1.78v5.64H18.2a1.41,1.41,0,0,0-1.49,1.49H13.15a2.34,2.34,0,0,0-2.38,2.38l-1.18,9.2,2.67,1.19a5.11,5.11,0,0,0,5,0,4.56,4.56,0,0,1,4.75,0L25.33,40V51.31h4.75V41.21a4,4,0,0,1-2.67-.29.29.29,0,0,1-.3-.3,6.13,6.13,0,0,0,3.27-.3l3.26-1.48a7.3,7.3,0,0,1,5,0,5.11,5.11,0,0,0,5.05,0l2.67-1.19ZM17.31,11.81l.59-5.64H25l.59,5.64Zm14.85,7.13-.6-6.24H39l-.6,6.24Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="hospitality"><path d="M45.23,28.15a2.56,2.56,0,0,0-2.38-2.38H38.1a2,2,0,0,0,1.48-1.19l1.19-12.77c0-.3,0-.3-.3-.59s-.29-.3-.59-.3H37.5l.6-4.75c0-.3-.3-.89-.6-.89s-.59.29-.59.89L36,10.92H31a1.07,1.07,0,0,0-.89.89l1.19,12.77a1.35,1.35,0,0,0,1.48,1.19H26.22a1.41,1.41,0,0,0-1.49-1.49H22.36V18.94a7.07,7.07,0,0,0,3.26-1.78,6.25,6.25,0,0,0,1.49-4.46l-.59-7.42c0-.3-.6-.6-.9-.6H17.31c-.6,0-.89.3-.89.6l-.89,7.12A7.3,7.3,0,0,0,17,16.86a7.11,7.11,0,0,0,3.27,1.78v5.64H18.2a1.41,1.41,0,0,0-1.49,1.49H13.15a2.34,2.34,0,0,0-2.38,2.38l-1.18,9.2,2.67,1.19a5.11,5.11,0,0,0,5,0,4.56,4.56,0,0,1,4.75,0L25.33,40V51.31h4.75V41.21a4,4,0,0,1-2.67-.29.29.29,0,0,1-.3-.3,6.13,6.13,0,0,0,3.27-.3l3.26-1.48a7.3,7.3,0,0,1,5,0,5.11,5.11,0,0,0,5.05,0l2.67-1.19ZM17.31,11.81l.59-5.64H25l.59,5.64Zm14.85,7.13-.6-6.24H39l-.6,6.24Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/information.svg b/packages/icons/src/svg/information.svg
index cc933edb79..e23ecce607 100644
--- a/packages/icons/src/svg/information.svg
+++ b/packages/icons/src/svg/information.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="information"><path d="M50.55,9.55a4.94,4.94,0,0,0-4.1-4.1c-6.15-1-16.4-1-18.45-1s-12.3,0-18.45,1a4.94,4.94,0,0,0-4.1,4.1c-1,6.15-1,16.4-1,18.45s0,12.3,1,18.45a5,5,0,0,0,4.1,4.1c6.15,1,16.4,1,18.45,1s12.3,0,18.45-1a5,5,0,0,0,4.1-4.1c1-6.15,1-16.4,1-18.45A111.88,111.88,0,0,0,50.55,9.55ZM31.1,44.5H24.32l.59-14.44V21.81H31.1ZM28,17.68A3.29,3.29,0,0,1,24.39,14,3.34,3.34,0,0,1,28,10.46c2.31,0,3.63,1.25,3.63,3.57A3.38,3.38,0,0,1,28,17.68Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="information"><path d="M50.55,9.55a4.94,4.94,0,0,0-4.1-4.1c-6.15-1-16.4-1-18.45-1s-12.3,0-18.45,1a4.94,4.94,0,0,0-4.1,4.1c-1,6.15-1,16.4-1,18.45s0,12.3,1,18.45a5,5,0,0,0,4.1,4.1c6.15,1,16.4,1,18.45,1s12.3,0,18.45-1a5,5,0,0,0,4.1-4.1c1-6.15,1-16.4,1-18.45A111.88,111.88,0,0,0,50.55,9.55ZM31.1,44.5H24.32l.59-14.44V21.81H31.1ZM28,17.68A3.29,3.29,0,0,1,24.39,14,3.34,3.34,0,0,1,28,10.46c2.31,0,3.63,1.25,3.63,3.57A3.38,3.38,0,0,1,28,17.68Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/intensive_care_opnames.svg b/packages/icons/src/svg/intensive_care_opnames.svg
new file mode 100644
index 0000000000..9c1e08c224
--- /dev/null
+++ b/packages/icons/src/svg/intensive_care_opnames.svg
@@ -0,0 +1,5 @@
+<svg viewBox="0 0 56 56" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+<path d="M26.6298 6C24.1759 6 21.7771 6.72767 19.7368 8.09098C17.6964 9.45429 16.1062 11.392 15.1671 13.6591C14.228 15.9262 13.9823 18.4209 14.4611 20.8277C14.9398 23.2344 16.1215 25.4451 17.8566 27.1803C19.5918 28.9155 21.8025 30.0972 24.2093 30.5759C26.616 31.0546 29.1107 30.8089 31.3778 29.8698C33.6449 28.9308 35.5826 27.3405 36.946 25.3002C38.3093 23.2598 39.0369 20.861 39.0369 18.4071C39.0369 15.1166 37.7298 11.9608 35.403 9.63397C33.0762 7.30718 29.9204 6 26.6298 6ZM34.0741 20.0378C34.0741 20.2728 33.9807 20.4983 33.8145 20.6644C33.6483 20.8306 33.4229 20.924 33.1879 20.924H29.1112V25.0007C29.1112 25.2357 29.0179 25.4611 28.8517 25.6273C28.6855 25.7935 28.46 25.8869 28.225 25.8869H25.0346C24.7996 25.8869 24.5741 25.7935 24.4079 25.6273C24.2417 25.4611 24.1484 25.2357 24.1484 25.0007V20.924H20.0717C19.8367 20.924 19.6113 20.8306 19.4451 20.6644C19.2789 20.4983 19.1855 20.2728 19.1855 20.0378V16.8562C19.1855 16.6212 19.2789 16.3958 19.4451 16.2296C19.6113 16.0634 19.8367 15.97 20.0717 15.97H24.1484V11.8934C24.1484 11.6583 24.2417 11.4329 24.4079 11.2667C24.5741 11.1005 24.7996 11.0072 25.0346 11.0072H28.225C28.46 11.0072 28.6855 11.1005 28.8517 11.2667C29.0179 11.4329 29.1112 11.6583 29.1112 11.8934V15.97H33.1879C33.4229 15.97 33.6483 16.0634 33.8145 16.2296C33.9807 16.3958 34.0741 16.6212 34.0741 16.8562V20.0378Z"/>
+<path d="M10.5272 45.5167H13.9568V46.8106C14.2268 46.8446 14.483 46.9494 14.6993 47.1144C14.9157 47.2794 15.0845 47.4987 15.1887 47.75C15.2419 47.9184 15.1267 47.9716 15.1267 47.9716C14.9784 47.8083 14.7979 47.6775 14.5966 47.5875C14.3952 47.4975 14.1774 47.4502 13.9568 47.4487C13.7241 47.4679 13.4974 47.5327 13.2897 47.6396C13.082 47.7464 12.8974 47.8931 12.7464 48.0712C12.5954 48.2494 12.4809 48.4556 12.4096 48.6779C12.3383 48.9003 12.3114 49.1346 12.3306 49.3674C12.3498 49.6001 12.4147 49.8268 12.5215 50.0345C12.6283 50.2422 12.775 50.4268 12.9532 50.5778C13.1313 50.7289 13.3375 50.8433 13.5599 50.9146C13.7823 50.986 14.0165 51.0128 14.2493 50.9936C14.6729 50.9085 15.0532 50.6773 15.3237 50.3404C15.5942 50.0035 15.7378 49.5822 15.7293 49.1502V45.5167H40.0384V46.8106C40.3094 46.8449 40.5666 46.9497 40.7843 47.1145C41.002 47.2794 41.1727 47.4985 41.2791 47.75C41.3323 47.9184 41.2171 47.9716 41.2171 47.9716C41.0668 47.8084 40.8847 47.6779 40.682 47.5879C40.4792 47.498 40.2602 47.4506 40.0384 47.4487C39.8057 47.4685 39.5791 47.5339 39.3716 47.6413C39.1641 47.7486 38.9798 47.8958 38.8292 48.0744C38.6786 48.2529 38.5647 48.4594 38.4939 48.682C38.4231 48.9047 38.3969 49.139 38.4166 49.3718C38.4364 49.6046 38.5019 49.8311 38.6092 50.0386C38.7166 50.2461 38.8637 50.4304 39.0423 50.581C39.2209 50.7316 39.4274 50.8455 39.65 50.9163C39.8726 50.9871 40.107 51.0134 40.3397 50.9936C40.7617 50.9067 41.1399 50.6747 41.4087 50.338C41.6774 50.0012 41.8197 49.581 41.8109 49.1502V45.5167H44.1948C44.6649 45.5167 45.1157 45.33 45.4481 44.9976C45.7805 44.6652 45.9673 44.2143 45.9673 43.7443V40.8463H8.74585V43.7443C8.74585 43.9778 8.79198 44.209 8.88161 44.4246C8.97124 44.6402 9.10259 44.836 9.26812 45.0007C9.43364 45.1654 9.63008 45.2958 9.84615 45.3843C10.0622 45.4729 10.2937 45.5179 10.5272 45.5167ZM13.9568 49.8947C13.8254 49.8947 13.6969 49.8557 13.5876 49.7826C13.4783 49.7096 13.3931 49.6058 13.3428 49.4844C13.2925 49.3629 13.2793 49.2293 13.305 49.1003C13.3306 48.9714 13.3939 48.853 13.4869 48.76C13.5798 48.667 13.6982 48.6037 13.8272 48.5781C13.9561 48.5525 14.0898 48.5656 14.2112 48.6159C14.3327 48.6662 14.4365 48.7514 14.5095 48.8607C14.5825 48.97 14.6215 49.0985 14.6215 49.23C14.6215 49.4063 14.5515 49.5753 14.4268 49.7C14.3022 49.8246 14.1331 49.8947 13.9568 49.8947ZM40.0384 49.8947C39.8621 49.8947 39.6931 49.8246 39.5684 49.7C39.4438 49.5753 39.3738 49.4063 39.3738 49.23C39.3738 49.0537 39.4438 48.8847 39.5684 48.76C39.6931 48.6354 39.8621 48.5653 40.0384 48.5653C40.2147 48.5653 40.3838 48.6354 40.5084 48.76C40.6331 48.8847 40.7031 49.0537 40.7031 49.23C40.7031 49.4063 40.6331 49.5753 40.5084 49.7C40.3838 49.8246 40.2147 49.8947 40.0384 49.8947Z"/>
+<path d="M48.4753 34.0401L48.174 33.2071C48.1355 33.0938 48.0744 32.9894 47.9945 32.9003C47.9146 32.8113 47.8175 32.7393 47.709 32.6888C47.6005 32.6383 47.4829 32.6102 47.3633 32.6064C47.2437 32.6026 47.1245 32.623 47.013 32.6665L33.8792 37.3014H7.88622C7.65118 37.3014 7.42577 37.3948 7.25957 37.561C7.09337 37.7272 7 37.9526 7 38.1876V39.0739C7 39.3089 7.09337 39.5343 7.25957 39.7005C7.42577 39.8667 7.65118 39.9601 7.88622 39.9601H34.3312L47.8993 35.1745C48.0126 35.1394 48.1177 35.0819 48.2084 35.0054C48.2991 34.9289 48.3736 34.835 48.4273 34.7292C48.481 34.6234 48.5129 34.5079 48.5212 34.3895C48.5294 34.2711 48.5138 34.1523 48.4753 34.0401Z"/>
+</svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/klachten.svg b/packages/icons/src/svg/klachten.svg
index 3db9f0eac5..336db67de0 100644
--- a/packages/icons/src/svg/klachten.svg
+++ b/packages/icons/src/svg/klachten.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><path d="M51.54,26.35,29.19,5A1.57,1.57,0,0,0,28,4.42a1.54,1.54,0,0,0-1.19.6L4.45,26.35a3.28,3.28,0,0,0-.89,2.1V30c0,.9.89,1.5,2.09,1.5h3V51a.64.64,0,0,0,.59.6H47.08a.65.65,0,0,0,.59-.61V31.75h3A1.93,1.93,0,0,0,52.44,30v-1.5A2.72,2.72,0,0,0,51.54,26.35ZM32,36.44a.68.68,0,0,1-.51.78,2.48,2.48,0,0,1-1,.13s.11.06.32.42.53,1.25.12,1.46-.55.1-.77.54c-.39.79-.91,1.61-2.11,1.07s-4.57-2.35-4.57-2.35a.23.23,0,0,0,0,.3l2.2,2.4V43h-11A73.51,73.51,0,0,0,18,36c.59-2.65-.89-6.78-1-9.44C17,24.25,17.75,20,22.41,19c4.41-1,9.56.7,10.71,2.08a2.92,2.92,0,0,1-.3,4.15,18.55,18.55,0,0,1,0,3.58c0,.32-.36.95-.39,1.34l1.67,3.64a.87.87,0,0,1-.57,1.08L32,35.14A1.73,1.73,0,0,0,32,36.44Zm.66,2.21a1,1,0,1,1,.95,1A1,1,0,0,1,32.63,38.65Zm1.09,3.29a.95.95,0,1,1,.94,1A.95.95,0,0,1,33.72,41.94Zm2,4.24a1,1,0,1,1,1-1A1,1,0,0,1,35.75,46.18Zm.68-8.62a.95.95,0,1,1,1,.95A1,1,0,0,1,36.43,37.56Zm2,4.33a1,1,0,1,1,1-1A.95.95,0,0,1,38.43,41.89Zm2.75-4.47a1,1,0,1,1,1-1A1,1,0,0,1,41.18,37.42Z"/></svg>
\ No newline at end of file
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><path d="M51.54,26.35,29.19,5A1.57,1.57,0,0,0,28,4.42a1.54,1.54,0,0,0-1.19.6L4.45,26.35a3.28,3.28,0,0,0-.89,2.1V30c0,.9.89,1.5,2.09,1.5h3V51a.64.64,0,0,0,.59.6H47.08a.65.65,0,0,0,.59-.61V31.75h3A1.93,1.93,0,0,0,52.44,30v-1.5A2.72,2.72,0,0,0,51.54,26.35ZM32,36.44a.68.68,0,0,1-.51.78,2.48,2.48,0,0,1-1,.13s.11.06.32.42.53,1.25.12,1.46-.55.1-.77.54c-.39.79-.91,1.61-2.11,1.07s-4.57-2.35-4.57-2.35a.23.23,0,0,0,0,.3l2.2,2.4V43h-11A73.51,73.51,0,0,0,18,36c.59-2.65-.89-6.78-1-9.44C17,24.25,17.75,20,22.41,19c4.41-1,9.56.7,10.71,2.08a2.92,2.92,0,0,1-.3,4.15,18.55,18.55,0,0,1,0,3.58c0,.32-.36.95-.39,1.34l1.67,3.64a.87.87,0,0,1-.57,1.08L32,35.14A1.73,1.73,0,0,0,32,36.44Zm.66,2.21a1,1,0,1,1,.95,1A1,1,0,0,1,32.63,38.65Zm1.09,3.29a.95.95,0,1,1,.94,1A.95.95,0,0,1,33.72,41.94Zm2,4.24a1,1,0,1,1,1-1A1,1,0,0,1,35.75,46.18Zm.68-8.62a.95.95,0,1,1,1,.95A1,1,0,0,1,36.43,37.56Zm2,4.33a1,1,0,1,1,1-1A.95.95,0,0,1,38.43,41.89Zm2.75-4.47a1,1,0,1,1,1-1A1,1,0,0,1,41.18,37.42Z"/></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/klok_2100-01.svg b/packages/icons/src/svg/klok_2100-01.svg
index 7f26f3d2bf..0f791fa542 100644
--- a/packages/icons/src/svg/klok_2100-01.svg
+++ b/packages/icons/src/svg/klok_2100-01.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="klok_2100"><path d="M28.21,13.39c-.85,0-1.48.43-1.48,1.27l-.64,11.43-8.89.64c-1.27.21-1.48.84-1.27,1.27a1.42,1.42,0,0,0,1.48,1.27c8.89.63,10.59.63,11,.63a2.08,2.08,0,0,0,1.9-2.11l-.63-13.13A1.42,1.42,0,0,0,28.21,13.39Z"/><path d="M28.21,4.72A23.28,23.28,0,1,0,51.49,28,23.21,23.21,0,0,0,28.21,4.72Zm0,41.27a18,18,0,1,1,18-18A18,18,0,0,1,28.21,46Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="klok_2100"><path d="M28.21,13.39c-.85,0-1.48.43-1.48,1.27l-.64,11.43-8.89.64c-1.27.21-1.48.84-1.27,1.27a1.42,1.42,0,0,0,1.48,1.27c8.89.63,10.59.63,11,.63a2.08,2.08,0,0,0,1.9-2.11l-.63-13.13A1.42,1.42,0,0,0,28.21,13.39Z"/><path d="M28.21,4.72A23.28,23.28,0,1,0,51.49,28,23.21,23.21,0,0,0,28.21,4.72Zm0,41.27a18,18,0,1,1,18-18A18,18,0,0,1,28.21,46Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/kunst_cultuur.svg b/packages/icons/src/svg/kunst_cultuur.svg
index 379a9b4cb7..9a6885eb65 100644
--- a/packages/icons/src/svg/kunst_cultuur.svg
+++ b/packages/icons/src/svg/kunst_cultuur.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="kunst_cultuur"><polygon points="17.7 29.89 17.7 29.89 17.7 29.89 17.7 29.89"/><path d="M31,12.48A35.83,35.83,0,0,1,17.7,7.81,35.75,35.75,0,0,1,4.46,12.48c0,14,2.09,21.82,13.24,25.71C28.86,34.3,31,26.51,31,12.48Zm-22.6,7.4s1.57-1.94,3.51-1.94,3.51,1.94,3.51,1.94-1.57,1.95-3.51,1.95S8.35,19.88,8.35,19.88Zm9.35,10a8,8,0,0,0-4.63,1.42C13.35,29.44,15.32,28,17.7,28s4.35,1.45,4.64,3.32A8,8,0,0,0,17.7,29.89Zm2.34-10s1.57-1.94,3.51-1.94,3.5,1.94,3.5,1.94-1.57,1.95-3.5,1.95S20,19.88,20,19.88Z"/><path d="M40.5,19.52a33.24,33.24,0,0,1-8.16.78,36,36,0,0,1-1.25,6.8,3.25,3.25,0,0,1,.62.13c1.84.63,2.7,3,2.7,3s-2.11,1.34-3.95.71a3,3,0,0,1-.74-.37,16.71,16.71,0,0,1-6.16,6.75c.69,4.12,2.89,7.64,7.19,11C42.56,48.19,47,41.48,51.54,28.2A35.79,35.79,0,0,1,40.5,19.52ZM32.93,41.85c-2.26-.77-3.65-2.77-3.32-4.63a8.27,8.27,0,0,0,8.78,3C37.52,41.87,35.19,42.61,32.93,41.85Zm8.6-7.17c-1.83-.63-2.69-3-2.69-3S41,30.37,42.78,31s2.7,3,2.7,3S43.37,35.3,41.53,34.68Z"/><polygon points="40.5 19.52 40.5 19.52 40.5 19.52 40.5 19.52"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="kunst_cultuur"><polygon points="17.7 29.89 17.7 29.89 17.7 29.89 17.7 29.89"/><path d="M31,12.48A35.83,35.83,0,0,1,17.7,7.81,35.75,35.75,0,0,1,4.46,12.48c0,14,2.09,21.82,13.24,25.71C28.86,34.3,31,26.51,31,12.48Zm-22.6,7.4s1.57-1.94,3.51-1.94,3.51,1.94,3.51,1.94-1.57,1.95-3.51,1.95S8.35,19.88,8.35,19.88Zm9.35,10a8,8,0,0,0-4.63,1.42C13.35,29.44,15.32,28,17.7,28s4.35,1.45,4.64,3.32A8,8,0,0,0,17.7,29.89Zm2.34-10s1.57-1.94,3.51-1.94,3.5,1.94,3.5,1.94-1.57,1.95-3.5,1.95S20,19.88,20,19.88Z"/><path d="M40.5,19.52a33.24,33.24,0,0,1-8.16.78,36,36,0,0,1-1.25,6.8,3.25,3.25,0,0,1,.62.13c1.84.63,2.7,3,2.7,3s-2.11,1.34-3.95.71a3,3,0,0,1-.74-.37,16.71,16.71,0,0,1-6.16,6.75c.69,4.12,2.89,7.64,7.19,11C42.56,48.19,47,41.48,51.54,28.2A35.79,35.79,0,0,1,40.5,19.52ZM32.93,41.85c-2.26-.77-3.65-2.77-3.32-4.63a8.27,8.27,0,0,0,8.78,3C37.52,41.87,35.19,42.61,32.93,41.85Zm8.6-7.17c-1.83-.63-2.69-3-2.69-3S41,30.37,42.78,31s2.7,3,2.7,3S43.37,35.3,41.53,34.68Z"/><polygon points="40.5 19.52 40.5 19.52 40.5 19.52 40.5 19.52"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/kunstcultuur_musea.svg b/packages/icons/src/svg/kunstcultuur_musea.svg
index ce1a08b9e8..c7d541e81e 100644
--- a/packages/icons/src/svg/kunstcultuur_musea.svg
+++ b/packages/icons/src/svg/kunstcultuur_musea.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="kunstcultuur_musea"><path d="M49.22,19a1,1,0,0,0-.3-.59L29.18,6.65a3.18,3.18,0,0,0-2.36,0L7.37,18.14c-.29.3-.29.3-.29.89v2.06H49.22ZM28,17.85a2.64,2.64,0,0,1-2.65-2.66A2.9,2.9,0,0,1,28,12.25a2.9,2.9,0,0,1,2.65,2.94A2.64,2.64,0,0,1,28,17.85Z"/><path d="M48.33,46.43V43.19H45.09V22.56h-5.3V42.9H30.65V22.56h-5V42.9H16.21V22.56h-5V42.9H7.67V45l5.59,1.18a.29.29,0,0,1,.3.29H4.42v3.25H51.58V46.43Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="kunstcultuur_musea"><path d="M49.22,19a1,1,0,0,0-.3-.59L29.18,6.65a3.18,3.18,0,0,0-2.36,0L7.37,18.14c-.29.3-.29.3-.29.89v2.06H49.22ZM28,17.85a2.64,2.64,0,0,1-2.65-2.66A2.9,2.9,0,0,1,28,12.25a2.9,2.9,0,0,1,2.65,2.94A2.64,2.64,0,0,1,28,17.85Z"/><path d="M48.33,46.43V43.19H45.09V22.56h-5.3V42.9H30.65V22.56h-5V42.9H16.21V22.56h-5V42.9H7.67V45l5.59,1.18a.29.29,0,0,1,.3.29H4.42v3.25H51.58V46.43Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/line.svg b/packages/icons/src/svg/line.svg
index 4f9e8716b9..aac92e652f 100644
--- a/packages/icons/src/svg/line.svg
+++ b/packages/icons/src/svg/line.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="line"><rect x="4.92" y="16.39" width="46.65" height="23.33"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="line"><rect x="4.92" y="16.39" width="46.65" height="23.33"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/locaties.svg b/packages/icons/src/svg/locaties.svg
index 69140ee1c4..069b083126 100644
--- a/packages/icons/src/svg/locaties.svg
+++ b/packages/icons/src/svg/locaties.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="locaties"><ellipse cx="27.6" cy="14.24" rx="3.25" ry="3.33"/><path d="M26.2,34A1.42,1.42,0,0,0,29,34a35.74,35.74,0,0,1,5-11.08c1.78-2.83,3.33-5.33,3.33-8.58a9.67,9.67,0,1,0-19.34,0c0,3.25,1.55,5.75,3.33,8.58A39.91,39.91,0,0,1,26.2,34ZM27.58,8.34a5.92,5.92,0,1,1-5.77,5.92A5.77,5.77,0,0,1,27.58,8.34Z"/><path d="M49.49,38.82c-.44-.75-1.66-2.79-5.49-1.41-2.27.83-5.2,2-7.47,3a2.83,2.83,0,0,1,0,1.16c-.33,2.33-2.28,3.83-5,3.92a24.72,24.72,0,0,1-10.91-1.65l0,0a.31.31,0,0,1-.25-.33,29.22,29.22,0,0,0,11,.33c2.68-.41,3.65-1.75,3.65-2.83s-.73-1.67-2.43-1.75A79.39,79.39,0,0,1,21,38c-.7-.12-1.43-.24-2.19-.35a13.32,13.32,0,0,0-9.26,2.16,14.72,14.72,0,0,0-3.25,2.5L11,51.57l6.1-2.5a4,4,0,0,1,2.19-.25l8.37,1.92a8.09,8.09,0,0,0,5.36-1L49.69,39.07S49.59,39,49.49,38.82Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="locaties"><ellipse cx="27.6" cy="14.24" rx="3.25" ry="3.33"/><path d="M26.2,34A1.42,1.42,0,0,0,29,34a35.74,35.74,0,0,1,5-11.08c1.78-2.83,3.33-5.33,3.33-8.58a9.67,9.67,0,1,0-19.34,0c0,3.25,1.55,5.75,3.33,8.58A39.91,39.91,0,0,1,26.2,34ZM27.58,8.34a5.92,5.92,0,1,1-5.77,5.92A5.77,5.77,0,0,1,27.58,8.34Z"/><path d="M49.49,38.82c-.44-.75-1.66-2.79-5.49-1.41-2.27.83-5.2,2-7.47,3a2.83,2.83,0,0,1,0,1.16c-.33,2.33-2.28,3.83-5,3.92a24.72,24.72,0,0,1-10.91-1.65l0,0a.31.31,0,0,1-.25-.33,29.22,29.22,0,0,0,11,.33c2.68-.41,3.65-1.75,3.65-2.83s-.73-1.67-2.43-1.75A79.39,79.39,0,0,1,21,38c-.7-.12-1.43-.24-2.19-.35a13.32,13.32,0,0,0-9.26,2.16,14.72,14.72,0,0,0-3.25,2.5L11,51.57l6.1-2.5a4,4,0,0,1,2.19-.25l8.37,1.92a8.09,8.09,0,0,0,5.36-1L49.69,39.07S49.59,39,49.49,38.82Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/location.svg b/packages/icons/src/svg/location.svg
index 20e71c0c28..57ed8e7486 100644
--- a/packages/icons/src/svg/location.svg
+++ b/packages/icons/src/svg/location.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="location"><path d="M28,4.42A15,15,0,0,0,13.14,19.63h0c0,2.83,1.06,5.44,2.12,8,.85,2.17,7.86,16.3,11,22.81A1.67,1.67,0,0,0,28,51.57a2.15,2.15,0,0,0,1.7-1.09l2.66-5.42c3.4-6.92,7.72-15.72,8.38-17.39,1.06-2.61,2.12-5.21,2.12-8A15,15,0,0,0,28,4.42Zm0,24.34a9.08,9.08,0,0,1-8.92-9.13h0A9.08,9.08,0,0,1,28,10.51a8.65,8.65,0,0,1,4.48,1.25,9.19,9.19,0,0,1,3.24,3.34,9.32,9.32,0,0,1,1.2,4.53A9.08,9.08,0,0,1,28,28.76Z"/><path d="M28,15.43a3.86,3.86,0,0,0-3.85,3.85,3.94,3.94,0,0,0,.29,1.48A3.85,3.85,0,0,0,25.27,22a3.9,3.9,0,0,0,1.25.83,3.75,3.75,0,0,0,1.47.3A3.81,3.81,0,0,0,30.72,22a3.81,3.81,0,0,0,1.13-2.72h0A3.84,3.84,0,0,0,28,15.43Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="location"><path d="M28,4.42A15,15,0,0,0,13.14,19.63h0c0,2.83,1.06,5.44,2.12,8,.85,2.17,7.86,16.3,11,22.81A1.67,1.67,0,0,0,28,51.57a2.15,2.15,0,0,0,1.7-1.09l2.66-5.42c3.4-6.92,7.72-15.72,8.38-17.39,1.06-2.61,2.12-5.21,2.12-8A15,15,0,0,0,28,4.42Zm0,24.34a9.08,9.08,0,0,1-8.92-9.13h0A9.08,9.08,0,0,1,28,10.51a8.65,8.65,0,0,1,4.48,1.25,9.19,9.19,0,0,1,3.24,3.34,9.32,9.32,0,0,1,1.2,4.53A9.08,9.08,0,0,1,28,28.76Z"/><path d="M28,15.43a3.86,3.86,0,0,0-3.85,3.85,3.94,3.94,0,0,0,.29,1.48A3.85,3.85,0,0,0,25.27,22a3.9,3.9,0,0,0,1.25.83,3.75,3.75,0,0,0,1.47.3A3.81,3.81,0,0,0,30.72,22a3.81,3.81,0,0,0,1.13-2.72h0A3.84,3.84,0,0,0,28,15.43Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/lopend.svg b/packages/icons/src/svg/lopend.svg
index cffb07e4f6..dd9c51aee7 100644
--- a/packages/icons/src/svg/lopend.svg
+++ b/packages/icons/src/svg/lopend.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="lopend"><path d="M30,12.4c2.19.38,3.71-1,4.08-3.3.41-2.62-.69-4.25-2.83-4.62s-3.73,1.07-4.11,3.44S27.79,12,30,12.4Z"/><path d="M34.19,36.89l-.12-.21c-.43-.74-.84-1.32-1.25-1.9l-.19-.27c-1-1.37-2-2.71-3-4,.4-2.21,1-4.95,1.55-7.4a18.73,18.73,0,0,0,.92,2.43,14.33,14.33,0,0,0,2.27,2.72l.65.68a3.32,3.32,0,0,0,4.15.92c-.48-.66-1.43-1.83-2.14-2.69l-.75-.93L36.14,26a12.29,12.29,0,0,1-1.33-1.91A17.59,17.59,0,0,1,34,21.56c0-.1-.11-.46-.23-1-.36-1.5-1-4.23-1.15-4.42-.59-1.54-5.07-3.69-7.72-2a30.73,30.73,0,0,0-5.59,4.6,6.09,6.09,0,0,0-1.55,3.7,30.37,30.37,0,0,0-.38,4.25,3.05,3.05,0,0,0,2.25,3.26c.33-2.57.85-6.41,1.64-8.08a8.67,8.67,0,0,1,2.4-2.1c0,.18-.09.41-.14.66a90.14,90.14,0,0,0-1.59,8.88,4.4,4.4,0,0,0,1.54,3.18l.26.27,2.74,3s-.1.18-.33,0l-2.78-1.66c-.4,1.54-1,4.06-1.61,5.55a10,10,0,0,1-.4,1c-.06.14-.14.26-.33.6-.41.73-.87,1.46-1.35,2.21S18.54,45.27,18,46.22a4.45,4.45,0,0,0,.61,5.35c.67-1,1.55-2.16,2.46-3.38,1.23-1.65,2.51-3.36,3.39-4.75l.12-.17a14.44,14.44,0,0,0,1-1.84c.44-.92,1-2.25,1.9-4.47.27.26.54.54.81.83l.31.33.6.61a6.42,6.42,0,0,1,1.27,1.55c.11.22.34.71.58,1.33.94,2.53,1.76,4.36,2.39,5.76.31.69.58,1.28.78,1.79a4,4,0,0,0,4.3,2.34c-.72-3-2.39-9-3.32-12A9.52,9.52,0,0,0,34.19,36.89Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="lopend"><path d="M30,12.4c2.19.38,3.71-1,4.08-3.3.41-2.62-.69-4.25-2.83-4.62s-3.73,1.07-4.11,3.44S27.79,12,30,12.4Z"/><path d="M34.19,36.89l-.12-.21c-.43-.74-.84-1.32-1.25-1.9l-.19-.27c-1-1.37-2-2.71-3-4,.4-2.21,1-4.95,1.55-7.4a18.73,18.73,0,0,0,.92,2.43,14.33,14.33,0,0,0,2.27,2.72l.65.68a3.32,3.32,0,0,0,4.15.92c-.48-.66-1.43-1.83-2.14-2.69l-.75-.93L36.14,26a12.29,12.29,0,0,1-1.33-1.91A17.59,17.59,0,0,1,34,21.56c0-.1-.11-.46-.23-1-.36-1.5-1-4.23-1.15-4.42-.59-1.54-5.07-3.69-7.72-2a30.73,30.73,0,0,0-5.59,4.6,6.09,6.09,0,0,0-1.55,3.7,30.37,30.37,0,0,0-.38,4.25,3.05,3.05,0,0,0,2.25,3.26c.33-2.57.85-6.41,1.64-8.08a8.67,8.67,0,0,1,2.4-2.1c0,.18-.09.41-.14.66a90.14,90.14,0,0,0-1.59,8.88,4.4,4.4,0,0,0,1.54,3.18l.26.27,2.74,3s-.1.18-.33,0l-2.78-1.66c-.4,1.54-1,4.06-1.61,5.55a10,10,0,0,1-.4,1c-.06.14-.14.26-.33.6-.41.73-.87,1.46-1.35,2.21S18.54,45.27,18,46.22a4.45,4.45,0,0,0,.61,5.35c.67-1,1.55-2.16,2.46-3.38,1.23-1.65,2.51-3.36,3.39-4.75l.12-.17a14.44,14.44,0,0,0,1-1.84c.44-.92,1-2.25,1.9-4.47.27.26.54.54.81.83l.31.33.6.61a6.42,6.42,0,0,1,1.27,1.55c.11.22.34.71.58,1.33.94,2.53,1.76,4.36,2.39,5.76.31.69.58,1.28.78,1.79a4,4,0,0,0,4.3,2.34c-.72-3-2.39-9-3.32-12A9.52,9.52,0,0,0,34.19,36.89Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/maatregelen.svg b/packages/icons/src/svg/maatregelen.svg
index 4c47587c8a..24c60e3d1a 100644
--- a/packages/icons/src/svg/maatregelen.svg
+++ b/packages/icons/src/svg/maatregelen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="maatregelen"><path d="M20.59,14a2.34,2.34,0,0,0,2.3,1.89H33.1A2.35,2.35,0,0,0,35.41,14a17.15,17.15,0,0,0,.27-3.42V10.3a1.21,1.21,0,0,0-1-1.24l-1.41-.25a8.66,8.66,0,0,1-1.75,2.39c-.47.4-.73.44-.88.29l0,0a4.16,4.16,0,0,0,1.17-2.91,3.86,3.86,0,1,0-7.7,0v0l-2.85.5a1.21,1.21,0,0,0-1,1.24v.25A17.15,17.15,0,0,0,20.59,14ZM28,6.71a1.79,1.79,0,0,1,1.74,1.83h0a1.74,1.74,0,1,1-3.48,0A1.79,1.79,0,0,1,28,6.71Z"/><path d="M41.87,11H37.31A17.42,17.42,0,0,1,37,14.3a4.66,4.66,0,0,1-.23.75h2.77V47.56H16.44V15.05h2.77A3.83,3.83,0,0,1,19,14.3,17.35,17.35,0,0,1,18.69,11H14.13a1.59,1.59,0,0,0-1.54,1.63V50a1.58,1.58,0,0,0,1.54,1.62H41.87A1.58,1.58,0,0,0,43.41,50V12.61A1.59,1.59,0,0,0,41.87,11Z"/><rect x="28.77" y="39.43" width="9.25" height="2.44"/><rect x="28.77" y="30.49" width="9.25" height="2.44"/><rect x="28.77" y="21.55" width="9.25" height="2.44"/><path d="M26.21,28.22a.56.56,0,0,0-.8.09h0l-3.54,4.18-2.12-1.94a.57.57,0,0,0-.78,0,.64.64,0,0,0-.13.81l2.57,4.53a.59.59,0,0,0,.52.31h0a.58.58,0,0,0,.51-.31l3.93-6.81A.65.65,0,0,0,26.21,28.22Z"/><path d="M18.84,22.4l2.57,4.53h0a.59.59,0,0,0,.52.31h0a.58.58,0,0,0,.51-.31l3.93-6.81a.66.66,0,0,0-.15-.84.57.57,0,0,0-.81.09l-3.54,4.16-2.12-1.94a.58.58,0,0,0-.78,0A.64.64,0,0,0,18.84,22.4Z"/><path d="M19.75,39.48a.57.57,0,0,0-.78,0,.66.66,0,0,0-.13.82l2.57,4.52a.58.58,0,0,0,.51.31.6.6,0,0,0,.52-.3L26.37,38a.66.66,0,0,0-.16-.84.57.57,0,0,0-.81.09h0l-3.54,4.17Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="maatregelen"><path d="M20.59,14a2.34,2.34,0,0,0,2.3,1.89H33.1A2.35,2.35,0,0,0,35.41,14a17.15,17.15,0,0,0,.27-3.42V10.3a1.21,1.21,0,0,0-1-1.24l-1.41-.25a8.66,8.66,0,0,1-1.75,2.39c-.47.4-.73.44-.88.29l0,0a4.16,4.16,0,0,0,1.17-2.91,3.86,3.86,0,1,0-7.7,0v0l-2.85.5a1.21,1.21,0,0,0-1,1.24v.25A17.15,17.15,0,0,0,20.59,14ZM28,6.71a1.79,1.79,0,0,1,1.74,1.83h0a1.74,1.74,0,1,1-3.48,0A1.79,1.79,0,0,1,28,6.71Z"/><path d="M41.87,11H37.31A17.42,17.42,0,0,1,37,14.3a4.66,4.66,0,0,1-.23.75h2.77V47.56H16.44V15.05h2.77A3.83,3.83,0,0,1,19,14.3,17.35,17.35,0,0,1,18.69,11H14.13a1.59,1.59,0,0,0-1.54,1.63V50a1.58,1.58,0,0,0,1.54,1.62H41.87A1.58,1.58,0,0,0,43.41,50V12.61A1.59,1.59,0,0,0,41.87,11Z"/><rect x="28.77" y="39.43" width="9.25" height="2.44"/><rect x="28.77" y="30.49" width="9.25" height="2.44"/><rect x="28.77" y="21.55" width="9.25" height="2.44"/><path d="M26.21,28.22a.56.56,0,0,0-.8.09h0l-3.54,4.18-2.12-1.94a.57.57,0,0,0-.78,0,.64.64,0,0,0-.13.81l2.57,4.53a.59.59,0,0,0,.52.31h0a.58.58,0,0,0,.51-.31l3.93-6.81A.65.65,0,0,0,26.21,28.22Z"/><path d="M18.84,22.4l2.57,4.53h0a.59.59,0,0,0,.52.31h0a.58.58,0,0,0,.51-.31l3.93-6.81a.66.66,0,0,0-.15-.84.57.57,0,0,0-.81.09l-3.54,4.16-2.12-1.94a.58.58,0,0,0-.78,0A.64.64,0,0,0,18.84,22.4Z"/><path d="M19.75,39.48a.57.57,0,0,0-.78,0,.66.66,0,0,0-.13.82l2.57,4.52a.58.58,0,0,0,.51.31.6.6,0,0,0,.52-.3L26.37,38a.66.66,0,0,0-.16-.84.57.57,0,0,0-.81.09h0l-3.54,4.17Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/max_aantal_bezoekers.svg b/packages/icons/src/svg/max_aantal_bezoekers.svg
index 782430c699..6533875cc5 100644
--- a/packages/icons/src/svg/max_aantal_bezoekers.svg
+++ b/packages/icons/src/svg/max_aantal_bezoekers.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="max_aantal_bezoekers"><path d="M51.42,27.58A1.75,1.75,0,0,0,51,27h-.11L28.58,5.84a.93.93,0,0,0-1.27,0L5,27a1.83,1.83,0,0,0-.45.62,2,2,0,0,0-.15.76v1.42a1,1,0,0,0,.28.67,1,1,0,0,0,.66.29H9.12v19.8H46.77V30.71h3.87a1,1,0,0,0,.67-.29,1,1,0,0,0,.27-.67V28.33A1.78,1.78,0,0,0,51.42,27.58ZM36.5,20.44a2.1,2.1,0,0,1,2.06,2.35,1.92,1.92,0,0,1-.06.86,2.05,2.05,0,0,1-.43.76,2.23,2.23,0,0,1-.71.5,2,2,0,0,1-.86.14,2.21,2.21,0,0,1-.84-.17,2.26,2.26,0,0,1-.69-.5,2.18,2.18,0,0,1-.42-.74,2.06,2.06,0,0,1-.09-.85C34.46,21.26,35.26,20.44,36.5,20.44ZM25.8,21.56a2.21,2.21,0,0,1,.47-.85,2.25,2.25,0,0,1,.79-.58,2.22,2.22,0,0,1,1-.2c1.45,0,2.32.91,2.32,2.6a2.22,2.22,0,0,1-.09,1,2.4,2.4,0,0,1-.49.83,2.17,2.17,0,0,1-.79.55,2.2,2.2,0,0,1-.95.18c-1.44,0-2.29-.91-2.29-2.52A2.28,2.28,0,0,1,25.8,21.56Zm-6.27-1.12c1.24,0,2,.82,2,2.35a1.9,1.9,0,0,1-.08.85,2.06,2.06,0,0,1-1.12,1.24,2.16,2.16,0,0,1-.83.17,1.93,1.93,0,0,1-.86-.14,2.23,2.23,0,0,1-.71-.5,2,2,0,0,1-.5-1.62A2.11,2.11,0,0,1,19.53,20.44Zm2.54,27.07a2.15,2.15,0,0,1-.87-.1,2.19,2.19,0,0,1-.74-.46,2,2,0,0,1-.49-.73,2.1,2.1,0,0,1-.13-.86l-.34-8.49a.3.3,0,0,0-.07-.15.26.26,0,0,0-.16-.07.27.27,0,0,0-.17.06.3.3,0,0,0-.08.16c0,.14-.37,8.49-.37,8.49a2.18,2.18,0,0,1-.14.84,2.3,2.3,0,0,1-.47.72,2.11,2.11,0,0,1-.72.46,2.23,2.23,0,0,1-.85.13V29.38c-.22-.06-.22,0-.22.17a11.28,11.28,0,0,0-.37,3.17v4.46a1.7,1.7,0,0,1-1.22-.52,1.73,1.73,0,0,1-.51-1.23c-.39-2.63-.39-8.2,2.44-9a12.45,12.45,0,0,1,5.82,0,1.81,1.81,0,0,1,.54.22c-2,2-1.7,7-1.5,9.79a2.9,2.9,0,0,0,.62,1.7Zm10.81-9.4a1.74,1.74,0,0,1-.71.15v-4a17.7,17.7,0,0,0-.42-4.47l-.2-.17v19.8a2.56,2.56,0,0,1-1-.06,2.35,2.35,0,0,1-.91-.48,2.3,2.3,0,0,1-.64-.81,2.46,2.46,0,0,1-.25-1l-.37-9.2a.27.27,0,0,0-.28-.25.24.24,0,0,0-.18.07.25.25,0,0,0-.08.18c0,.09-.36,9.2-.36,9.2a2.46,2.46,0,0,1-.25,1,2.42,2.42,0,0,1-.64.81,2.35,2.35,0,0,1-.91.48,2.56,2.56,0,0,1-1,.06V29.63s-.2,0-.2.17A14,14,0,0,0,24,34.27v4a1.88,1.88,0,0,1-.71-.15,1.81,1.81,0,0,1-.6-.42,1.84,1.84,0,0,1-.38-.61,1.76,1.76,0,0,1-.12-.72v0c-.19-3.23-.55-9.06,2.64-9.88a12.72,12.72,0,0,1,6.25,0h.28c3.16.84,2.81,6.55,2.61,9.79v.11a1.78,1.78,0,0,1-.48,1.34A1.61,1.61,0,0,1,32.88,38.11Zm8.85-2.68a1.73,1.73,0,0,1-.52,1.23,1.74,1.74,0,0,1-1.23.52V32.72a10.59,10.59,0,0,0-.37-3.17c0-.14,0-.23-.2-.17V47.51a2.23,2.23,0,0,1-.85-.13,2.11,2.11,0,0,1-.72-.46,2.07,2.07,0,0,1-.48-.72,2,2,0,0,1-.15-.84s-.34-8.35-.34-8.49a.26.26,0,0,0-.09-.16.27.27,0,0,0-.42.16L36,45.36a2.07,2.07,0,0,1-.6,1.59,2.19,2.19,0,0,1-.74.46,2.15,2.15,0,0,1-.87.1V38.12a2.77,2.77,0,0,0,.62-1.7c.2-2.83.51-7.75-1.49-9.79a1.65,1.65,0,0,1,.53-.22,12.49,12.49,0,0,1,5.83,0C42.13,27.23,42.13,32.8,41.73,35.43Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="max_aantal_bezoekers"><path d="M51.42,27.58A1.75,1.75,0,0,0,51,27h-.11L28.58,5.84a.93.93,0,0,0-1.27,0L5,27a1.83,1.83,0,0,0-.45.62,2,2,0,0,0-.15.76v1.42a1,1,0,0,0,.28.67,1,1,0,0,0,.66.29H9.12v19.8H46.77V30.71h3.87a1,1,0,0,0,.67-.29,1,1,0,0,0,.27-.67V28.33A1.78,1.78,0,0,0,51.42,27.58ZM36.5,20.44a2.1,2.1,0,0,1,2.06,2.35,1.92,1.92,0,0,1-.06.86,2.05,2.05,0,0,1-.43.76,2.23,2.23,0,0,1-.71.5,2,2,0,0,1-.86.14,2.21,2.21,0,0,1-.84-.17,2.26,2.26,0,0,1-.69-.5,2.18,2.18,0,0,1-.42-.74,2.06,2.06,0,0,1-.09-.85C34.46,21.26,35.26,20.44,36.5,20.44ZM25.8,21.56a2.21,2.21,0,0,1,.47-.85,2.25,2.25,0,0,1,.79-.58,2.22,2.22,0,0,1,1-.2c1.45,0,2.32.91,2.32,2.6a2.22,2.22,0,0,1-.09,1,2.4,2.4,0,0,1-.49.83,2.17,2.17,0,0,1-.79.55,2.2,2.2,0,0,1-.95.18c-1.44,0-2.29-.91-2.29-2.52A2.28,2.28,0,0,1,25.8,21.56Zm-6.27-1.12c1.24,0,2,.82,2,2.35a1.9,1.9,0,0,1-.08.85,2.06,2.06,0,0,1-1.12,1.24,2.16,2.16,0,0,1-.83.17,1.93,1.93,0,0,1-.86-.14,2.23,2.23,0,0,1-.71-.5,2,2,0,0,1-.5-1.62A2.11,2.11,0,0,1,19.53,20.44Zm2.54,27.07a2.15,2.15,0,0,1-.87-.1,2.19,2.19,0,0,1-.74-.46,2,2,0,0,1-.49-.73,2.1,2.1,0,0,1-.13-.86l-.34-8.49a.3.3,0,0,0-.07-.15.26.26,0,0,0-.16-.07.27.27,0,0,0-.17.06.3.3,0,0,0-.08.16c0,.14-.37,8.49-.37,8.49a2.18,2.18,0,0,1-.14.84,2.3,2.3,0,0,1-.47.72,2.11,2.11,0,0,1-.72.46,2.23,2.23,0,0,1-.85.13V29.38c-.22-.06-.22,0-.22.17a11.28,11.28,0,0,0-.37,3.17v4.46a1.7,1.7,0,0,1-1.22-.52,1.73,1.73,0,0,1-.51-1.23c-.39-2.63-.39-8.2,2.44-9a12.45,12.45,0,0,1,5.82,0,1.81,1.81,0,0,1,.54.22c-2,2-1.7,7-1.5,9.79a2.9,2.9,0,0,0,.62,1.7Zm10.81-9.4a1.74,1.74,0,0,1-.71.15v-4a17.7,17.7,0,0,0-.42-4.47l-.2-.17v19.8a2.56,2.56,0,0,1-1-.06,2.35,2.35,0,0,1-.91-.48,2.3,2.3,0,0,1-.64-.81,2.46,2.46,0,0,1-.25-1l-.37-9.2a.27.27,0,0,0-.28-.25.24.24,0,0,0-.18.07.25.25,0,0,0-.08.18c0,.09-.36,9.2-.36,9.2a2.46,2.46,0,0,1-.25,1,2.42,2.42,0,0,1-.64.81,2.35,2.35,0,0,1-.91.48,2.56,2.56,0,0,1-1,.06V29.63s-.2,0-.2.17A14,14,0,0,0,24,34.27v4a1.88,1.88,0,0,1-.71-.15,1.81,1.81,0,0,1-.6-.42,1.84,1.84,0,0,1-.38-.61,1.76,1.76,0,0,1-.12-.72v0c-.19-3.23-.55-9.06,2.64-9.88a12.72,12.72,0,0,1,6.25,0h.28c3.16.84,2.81,6.55,2.61,9.79v.11a1.78,1.78,0,0,1-.48,1.34A1.61,1.61,0,0,1,32.88,38.11Zm8.85-2.68a1.73,1.73,0,0,1-.52,1.23,1.74,1.74,0,0,1-1.23.52V32.72a10.59,10.59,0,0,0-.37-3.17c0-.14,0-.23-.2-.17V47.51a2.23,2.23,0,0,1-.85-.13,2.11,2.11,0,0,1-.72-.46,2.07,2.07,0,0,1-.48-.72,2,2,0,0,1-.15-.84s-.34-8.35-.34-8.49a.26.26,0,0,0-.09-.16.27.27,0,0,0-.42.16L36,45.36a2.07,2.07,0,0,1-.6,1.59,2.19,2.19,0,0,1-.74.46,2.15,2.15,0,0,1-.87.1V38.12a2.77,2.77,0,0,0,.62-1.7c.2-2.83.51-7.75-1.49-9.79a1.65,1.65,0,0,1,.53-.22,12.49,12.49,0,0,1,5.83,0C42.13,27.23,42.13,32.8,41.73,35.43Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/max_visitors.svg b/packages/icons/src/svg/max_visitors.svg
index ffcfc4a2bd..38c12b9fcf 100644
--- a/packages/icons/src/svg/max_visitors.svg
+++ b/packages/icons/src/svg/max_visitors.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="max_visitors"><path d="M51,27,28.63,5.89a1,1,0,0,0-1.26,0L5.05,27a2,2,0,0,0-.63,1.42v1.41a1,1,0,0,0,1,.94H9.14V50.45H46.86V30.8h3.77a.78.78,0,0,0,.37-.06.79.79,0,0,0,.31-.2.87.87,0,0,0,.2-.31,1,1,0,0,0,.07-.37V28.45A2,2,0,0,0,51,27Zm-17.84-7.7c1.33,0,2.2.86,2.2,2.51a2.17,2.17,0,0,1-2.2,2.44c-1.42,0-2.2-.86-2.2-2.44S31.69,19.33,33.11,19.33Zm-10.06-.71c1.33,0,2.2.87,2.2,2.52a2.17,2.17,0,0,1-2.2,2.43c-1.42,0-2.2-.86-2.2-2.43S21.63,18.62,23.05,18.62ZM37.51,35.91a52.88,52.88,0,0,1-1.65-7.54l-.24-.47a3.9,3.9,0,0,1-.08,2.43,4.58,4.58,0,0,0-.15,2,18.13,18.13,0,0,1,1.33,6.84A4.45,4.45,0,0,0,35.54,39h-.15v8.33s-2-.32-2-2.13v-6c-.23,0-.55.08-.78.08v6a2.5,2.5,0,0,1-2.05,2.13V39.84a1.36,1.36,0,0,0,1.42-1.34c0-2.43.07-6.36-1.34-6.91a9.3,9.3,0,0,0-4.63,0c-1.5.71-1.58,4.56-1.42,6.91A1.36,1.36,0,0,0,26,39.84v7.47A2.32,2.32,0,0,1,23.52,45s-.31-9-.31-9.12a.36.36,0,0,0-.32-.24.34.34,0,0,0-.31.24c0,.08-.32,9.12-.32,9.12a2,2,0,0,1-2.12,2.28V28.37c0-.08-.31,0-.47.23a3.79,3.79,0,0,0-.32,1.89V36.3a1.78,1.78,0,0,1-1.8-1.8c-.16-3.15-.55-8.88,2.51-9.67a12.14,12.14,0,0,1,6.05,0,2.9,2.9,0,0,1,1.42.94,2.38,2.38,0,0,0-1.26,2.28,2.07,2.07,0,0,0,2.2,2.36,2.11,2.11,0,0,0,2.2-2.36,2.62,2.62,0,0,0-.71-2,3,3,0,0,1,1.1-.63,6.69,6.69,0,0,1,2.12-.32,6.25,6.25,0,0,1,2.13.32c1.41.47,2.2,1.73,2.51,4.32.16,1.18.55,2.12.87,3.85C38.92,35.05,38.14,35.83,37.51,35.91Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="max_visitors"><path d="M51,27,28.63,5.89a1,1,0,0,0-1.26,0L5.05,27a2,2,0,0,0-.63,1.42v1.41a1,1,0,0,0,1,.94H9.14V50.45H46.86V30.8h3.77a.78.78,0,0,0,.37-.06.79.79,0,0,0,.31-.2.87.87,0,0,0,.2-.31,1,1,0,0,0,.07-.37V28.45A2,2,0,0,0,51,27Zm-17.84-7.7c1.33,0,2.2.86,2.2,2.51a2.17,2.17,0,0,1-2.2,2.44c-1.42,0-2.2-.86-2.2-2.44S31.69,19.33,33.11,19.33Zm-10.06-.71c1.33,0,2.2.87,2.2,2.52a2.17,2.17,0,0,1-2.2,2.43c-1.42,0-2.2-.86-2.2-2.43S21.63,18.62,23.05,18.62ZM37.51,35.91a52.88,52.88,0,0,1-1.65-7.54l-.24-.47a3.9,3.9,0,0,1-.08,2.43,4.58,4.58,0,0,0-.15,2,18.13,18.13,0,0,1,1.33,6.84A4.45,4.45,0,0,0,35.54,39h-.15v8.33s-2-.32-2-2.13v-6c-.23,0-.55.08-.78.08v6a2.5,2.5,0,0,1-2.05,2.13V39.84a1.36,1.36,0,0,0,1.42-1.34c0-2.43.07-6.36-1.34-6.91a9.3,9.3,0,0,0-4.63,0c-1.5.71-1.58,4.56-1.42,6.91A1.36,1.36,0,0,0,26,39.84v7.47A2.32,2.32,0,0,1,23.52,45s-.31-9-.31-9.12a.36.36,0,0,0-.32-.24.34.34,0,0,0-.31.24c0,.08-.32,9.12-.32,9.12a2,2,0,0,1-2.12,2.28V28.37c0-.08-.31,0-.47.23a3.79,3.79,0,0,0-.32,1.89V36.3a1.78,1.78,0,0,1-1.8-1.8c-.16-3.15-.55-8.88,2.51-9.67a12.14,12.14,0,0,1,6.05,0,2.9,2.9,0,0,1,1.42.94,2.38,2.38,0,0,0-1.26,2.28,2.07,2.07,0,0,0,2.2,2.36,2.11,2.11,0,0,0,2.2-2.36,2.62,2.62,0,0,0-.71-2,3,3,0,0,1,1.1-.63,6.69,6.69,0,0,1,2.12-.32,6.25,6.25,0,0,1,2.13.32c1.41.47,2.2,1.73,2.51,4.32.16,1.18.55,2.12.87,3.85C38.92,35.05,38.14,35.83,37.51,35.91Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/medische_screening.svg b/packages/icons/src/svg/medische_screening.svg
index 415ac0ce71..78feacfe61 100644
--- a/packages/icons/src/svg/medische_screening.svg
+++ b/packages/icons/src/svg/medische_screening.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="medische_screening"><path d="M26.48,37.72a11.2,11.2,0,0,1,22.25-1.85,1.85,1.85,0,0,0,1.9-1.8v-13a1.85,1.85,0,0,0-1.85-1.85H35.88V6.3a1.86,1.86,0,0,0-1.82-1.88H21a1.86,1.86,0,0,0-1.89,1.81v13H6.25A1.85,1.85,0,0,0,4.4,21.06V34a1.85,1.85,0,0,0,1.85,1.85h12.9V48.81A1.85,1.85,0,0,0,21,50.66H34a1.84,1.84,0,0,0,1.88-1.81v-.1A11.2,11.2,0,0,1,26.48,37.72Z"/><path d="M51.05,46.8,46.5,42.25A8.62,8.62,0,0,1,44,44.08c-.58.24-.85.2-1,0a8.54,8.54,0,1,0-1.75,1.11l5.68,5.68c1.08,1.09,2.37.45,3.45-.63S52.13,47.89,51.05,46.8ZM42.4,37.72A4.73,4.73,0,1,1,37.67,33a4.71,4.71,0,0,1,4.73,4.73Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="medische_screening"><path d="M26.48,37.72a11.2,11.2,0,0,1,22.25-1.85,1.85,1.85,0,0,0,1.9-1.8v-13a1.85,1.85,0,0,0-1.85-1.85H35.88V6.3a1.86,1.86,0,0,0-1.82-1.88H21a1.86,1.86,0,0,0-1.89,1.81v13H6.25A1.85,1.85,0,0,0,4.4,21.06V34a1.85,1.85,0,0,0,1.85,1.85h12.9V48.81A1.85,1.85,0,0,0,21,50.66H34a1.84,1.84,0,0,0,1.88-1.81v-.1A11.2,11.2,0,0,1,26.48,37.72Z"/><path d="M51.05,46.8,46.5,42.25A8.62,8.62,0,0,1,44,44.08c-.58.24-.85.2-1,0a8.54,8.54,0,1,0-1.75,1.11l5.68,5.68c1.08,1.09,2.37.45,3.45-.63S52.13,47.89,51.05,46.8ZM42.4,37.72A4.73,4.73,0,1,1,37.67,33a4.71,4.71,0,0,1,4.73,4.73Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/meer_informatie.svg b/packages/icons/src/svg/meer_informatie.svg
index cad11589af..6d963bb0ee 100644
--- a/packages/icons/src/svg/meer_informatie.svg
+++ b/packages/icons/src/svg/meer_informatie.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="meer_informatie"><path d="M28,4.42A23.58,23.58,0,1,0,51.58,28,23.58,23.58,0,0,0,28,4.42Zm0,44.2A20.63,20.63,0,1,1,48.63,28,20.62,20.62,0,0,1,28,48.62Z"/><path d="M28,12.77a2.37,2.37,0,0,0-2.37,2.37v.1a2.38,2.38,0,0,0,4.75,0v-.1A2.38,2.38,0,0,0,28,12.77Z"/><path d="M28,19.81a2.37,2.37,0,0,0-2.37,2.37V39.42a2.38,2.38,0,0,0,4.75,0V22.18A2.38,2.38,0,0,0,28,19.81Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="meer_informatie"><path d="M28,4.42A23.58,23.58,0,1,0,51.58,28,23.58,23.58,0,0,0,28,4.42Zm0,44.2A20.63,20.63,0,1,1,48.63,28,20.62,20.62,0,0,1,28,48.62Z"/><path d="M28,12.77a2.37,2.37,0,0,0-2.37,2.37v.1a2.38,2.38,0,0,0,4.75,0v-.1A2.38,2.38,0,0,0,28,12.77Z"/><path d="M28,19.81a2.37,2.37,0,0,0-2.37,2.37V39.42a2.38,2.38,0,0,0,4.75,0V22.18A2.38,2.38,0,0,0,28,19.81Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/meerdaagse_evenementen.svg b/packages/icons/src/svg/meerdaagse_evenementen.svg
index 39925f4f3f..952b51f193 100644
--- a/packages/icons/src/svg/meerdaagse_evenementen.svg
+++ b/packages/icons/src/svg/meerdaagse_evenementen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="meerdaagse_evenementen"><path d="M23.84,26.9h7.47v5.59H23.84Z"/><path d="M42.52,26.9H35v5.59h7.48Z"/><path d="M12.66,36.23h7.47v5.59H12.66Z"/><path d="M42.64,10.11h6.55a2,2,0,0,1,.72.13,2,2,0,0,1,.61.4,2,2,0,0,1,.41.61,1.91,1.91,0,0,1,.14.71V49.29a1.91,1.91,0,0,1-.14.71,2,2,0,0,1-.41.61,2,2,0,0,1-.61.4,2,2,0,0,1-.72.13H6.31A2,2,0,0,1,5.59,51a1.8,1.8,0,0,1-.61-.4A1.69,1.69,0,0,1,4.57,50a1.74,1.74,0,0,1-.15-.71V12a1.74,1.74,0,0,1,.15-.71A1.69,1.69,0,0,1,5,10.64a1.8,1.8,0,0,1,.61-.4,2,2,0,0,1,.72-.13h6.57c.1-1.18.29-3.23.39-3.83s.29-1.76,1.18-1.76h2.68c.76,0,.92.8,1.05,1.43a2.72,2.72,0,0,0,.07.33,26.6,26.6,0,0,1,.16,3.83V15.7a.2.2,0,0,0,.11,0,.21.21,0,0,0,.11,0,.3.3,0,0,0,.08-.08.22.22,0,0,0,.05-.11l1.6-5.36H35.27c.09-1.18.28-3.23.38-3.83s.29-1.76,1.21-1.76h2.56c.89,0,1.12,1.12,1.12,1.76a32.62,32.62,0,0,1,.15,3.83V15.7a.24.24,0,0,0,.12,0,.21.21,0,0,0,.11,0,.3.3,0,0,0,.08-.08.37.37,0,0,0,0-.11ZM8.93,46.48H46.41l-.16-24.24H8.93Z"/><path d="M20.13,26.9H12.66v5.59h7.47Z"/><path d="M31.31,36.23H23.84v5.59h7.47Z"/><path d="M35,36.23h7.48v5.59H35Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="meerdaagse_evenementen"><path d="M23.84,26.9h7.47v5.59H23.84Z"/><path d="M42.52,26.9H35v5.59h7.48Z"/><path d="M12.66,36.23h7.47v5.59H12.66Z"/><path d="M42.64,10.11h6.55a2,2,0,0,1,.72.13,2,2,0,0,1,.61.4,2,2,0,0,1,.41.61,1.91,1.91,0,0,1,.14.71V49.29a1.91,1.91,0,0,1-.14.71,2,2,0,0,1-.41.61,2,2,0,0,1-.61.4,2,2,0,0,1-.72.13H6.31A2,2,0,0,1,5.59,51a1.8,1.8,0,0,1-.61-.4A1.69,1.69,0,0,1,4.57,50a1.74,1.74,0,0,1-.15-.71V12a1.74,1.74,0,0,1,.15-.71A1.69,1.69,0,0,1,5,10.64a1.8,1.8,0,0,1,.61-.4,2,2,0,0,1,.72-.13h6.57c.1-1.18.29-3.23.39-3.83s.29-1.76,1.18-1.76h2.68c.76,0,.92.8,1.05,1.43a2.72,2.72,0,0,0,.07.33,26.6,26.6,0,0,1,.16,3.83V15.7a.2.2,0,0,0,.11,0,.21.21,0,0,0,.11,0,.3.3,0,0,0,.08-.08.22.22,0,0,0,.05-.11l1.6-5.36H35.27c.09-1.18.28-3.23.38-3.83s.29-1.76,1.21-1.76h2.56c.89,0,1.12,1.12,1.12,1.76a32.62,32.62,0,0,1,.15,3.83V15.7a.24.24,0,0,0,.12,0,.21.21,0,0,0,.11,0,.3.3,0,0,0,.08-.08.37.37,0,0,0,0-.11ZM8.93,46.48H46.41l-.16-24.24H8.93Z"/><path d="M20.13,26.9H12.66v5.59h7.47Z"/><path d="M31.31,36.23H23.84v5.59h7.47Z"/><path d="M35,36.23h7.48v5.59H35Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/menu.svg b/packages/icons/src/svg/menu.svg
index ccf490652c..793ba623d3 100644
--- a/packages/icons/src/svg/menu.svg
+++ b/packages/icons/src/svg/menu.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="menu"><polygon points="51.58 5.95 4.43 5.95 4.43 14.79 47.16 14.79 51.58 5.95"/><polygon points="4.43 32.47 47.16 32.47 51.58 23.63 4.43 23.63 4.43 32.47"/><polygon points="4.42 50.15 47.16 50.15 51.58 41.31 4.42 41.31 4.42 50.15"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="menu"><polygon points="51.58 5.95 4.43 5.95 4.43 14.79 47.16 14.79 51.58 5.95"/><polygon points="4.43 32.47 47.16 32.47 51.58 23.63 4.43 23.63 4.43 32.47"/><polygon points="4.42 50.15 47.16 50.15 51.58 41.31 4.42 41.31 4.42 50.15"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/mondkapje.svg b/packages/icons/src/svg/mondkapje.svg
index e0ed94c28f..ceda9b7129 100644
--- a/packages/icons/src/svg/mondkapje.svg
+++ b/packages/icons/src/svg/mondkapje.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="mondkapje"><path d="M43.89,42.86a12.83,12.83,0,0,0-4.35-2.46c-1.14-.45-4.8-1.79-5-2,0-.67-.23-1.34-.23-2,1.14-.9,2.05-1.79,3.65-2.91a1,1,0,0,0,.23-1.12l-.46-.89c0-.22.23-.89.23-1.12v-.67a6.25,6.25,0,0,0,1.15-3.8,4.69,4.69,0,0,0-.92-3.12,9.9,9.9,0,0,0-6.85-11.18A3,3,0,0,0,29,10.68c0-.22.23-.22.46-.22a11.29,11.29,0,0,1,3.88.22,7.78,7.78,0,0,0,.69-2.46,3.88,3.88,0,0,0-4.12-3.8,5.13,5.13,0,0,0-4.11,2.24c-1.37,1.79-2.29.67-1.37-.67,0,0-2.75.22-2.75,2.23,0,1.57,1.6,2.91,2.29,3.35A9.59,9.59,0,0,0,18.06,22.3a4.72,4.72,0,0,0-.92,3.13,6.36,6.36,0,0,0,1.14,3.8v.67A2.34,2.34,0,0,1,18.51,31l-.45.9A1,1,0,0,0,18.28,33a31,31,0,0,0,3.66,2.91c0,.67-.23,1.34-.23,2-.22,0-4.57,2-5,2a13,13,0,0,0-4.34,2.46c-1.6,1.56-2.74,6.48-3.2,9.16H46.86C46.63,49.34,45.49,44.42,43.89,42.86ZM19.43,25.43c0-.45,0-1.57.46-1.79.22-.22.68,0,.91.22a11.82,11.82,0,0,1,.69-4.24,10.08,10.08,0,0,1,6.63-2.46,9.24,9.24,0,0,1,6.62,2.68v.22A3.73,3.73,0,0,1,35,21.63a9.75,9.75,0,0,1,.23,2.46c.23-.23.69-.45.91-.23.69,0,.92.67.92,1.57v.44q-4.45,0-5.49-.67c-.91-.67-1.6-1.56-3.2-1.56-1.83,0-2.51.89-3.43,1.56-.45.45-2.28.67-5.48.9Zm.68,6.7a.81.81,0,0,0,.23-.67l4.57,1.12s.23-.23,0-.23l-4.8-2.68c0-.67-.22-1.11-.22-1.78,3.88,0,5.25-.45,6.17-1.12s1.14-1.12,2.05-1.12c.69,0,1.15.45,2.06,1.12s2.29,1.12,6.17,1.12a4.75,4.75,0,0,1-.23,1.78l-4.79,2.68c-.23.23-.23.23,0,.23l4.57-1.12c0,.22.22.22.22.67a16.31,16.31,0,0,0-2,1.79,7.1,7.1,0,0,1-5.72,2.46,7.32,7.32,0,0,1-5.71-2.24A16.84,16.84,0,0,1,20.11,32.13Zm8.23,14.3S20.8,46.21,19,41.74c3-1.12,5-1.57,5-3.13a2.39,2.39,0,0,1,.23-1.12,10.39,10.39,0,0,0,4.11.67,11.26,11.26,0,0,0,4.12-.67v1.12c.22,1.57,2,1.79,5,3.13C35.89,46.21,28.34,46.43,28.34,46.43Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="mondkapje"><path d="M43.89,42.86a12.83,12.83,0,0,0-4.35-2.46c-1.14-.45-4.8-1.79-5-2,0-.67-.23-1.34-.23-2,1.14-.9,2.05-1.79,3.65-2.91a1,1,0,0,0,.23-1.12l-.46-.89c0-.22.23-.89.23-1.12v-.67a6.25,6.25,0,0,0,1.15-3.8,4.69,4.69,0,0,0-.92-3.12,9.9,9.9,0,0,0-6.85-11.18A3,3,0,0,0,29,10.68c0-.22.23-.22.46-.22a11.29,11.29,0,0,1,3.88.22,7.78,7.78,0,0,0,.69-2.46,3.88,3.88,0,0,0-4.12-3.8,5.13,5.13,0,0,0-4.11,2.24c-1.37,1.79-2.29.67-1.37-.67,0,0-2.75.22-2.75,2.23,0,1.57,1.6,2.91,2.29,3.35A9.59,9.59,0,0,0,18.06,22.3a4.72,4.72,0,0,0-.92,3.13,6.36,6.36,0,0,0,1.14,3.8v.67A2.34,2.34,0,0,1,18.51,31l-.45.9A1,1,0,0,0,18.28,33a31,31,0,0,0,3.66,2.91c0,.67-.23,1.34-.23,2-.22,0-4.57,2-5,2a13,13,0,0,0-4.34,2.46c-1.6,1.56-2.74,6.48-3.2,9.16H46.86C46.63,49.34,45.49,44.42,43.89,42.86ZM19.43,25.43c0-.45,0-1.57.46-1.79.22-.22.68,0,.91.22a11.82,11.82,0,0,1,.69-4.24,10.08,10.08,0,0,1,6.63-2.46,9.24,9.24,0,0,1,6.62,2.68v.22A3.73,3.73,0,0,1,35,21.63a9.75,9.75,0,0,1,.23,2.46c.23-.23.69-.45.91-.23.69,0,.92.67.92,1.57v.44q-4.45,0-5.49-.67c-.91-.67-1.6-1.56-3.2-1.56-1.83,0-2.51.89-3.43,1.56-.45.45-2.28.67-5.48.9Zm.68,6.7a.81.81,0,0,0,.23-.67l4.57,1.12s.23-.23,0-.23l-4.8-2.68c0-.67-.22-1.11-.22-1.78,3.88,0,5.25-.45,6.17-1.12s1.14-1.12,2.05-1.12c.69,0,1.15.45,2.06,1.12s2.29,1.12,6.17,1.12a4.75,4.75,0,0,1-.23,1.78l-4.79,2.68c-.23.23-.23.23,0,.23l4.57-1.12c0,.22.22.22.22.67a16.31,16.31,0,0,0-2,1.79,7.1,7.1,0,0,1-5.72,2.46,7.32,7.32,0,0,1-5.71-2.24A16.84,16.84,0,0,1,20.11,32.13Zm8.23,14.3S20.8,46.21,19,41.74c3-1.12,5-1.57,5-3.13a2.39,2.39,0,0,1,.23-1.12,10.39,10.39,0,0,0,4.11.67,11.26,11.26,0,0,0,4.12-.67v1.12c.22,1.57,2,1.79,5,3.13C35.89,46.21,28.34,46.43,28.34,46.43Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/nederland.svg b/packages/icons/src/svg/nederland.svg
index b610d302b8..81a99c5ec5 100644
--- a/packages/icons/src/svg/nederland.svg
+++ b/packages/icons/src/svg/nederland.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="nederland"><polygon points="23.58 10.27 23.66 10.19 24.13 10.19 24.28 10.11 24.36 10.03 24.36 9.96 24.44 9.96 24.52 9.88 24.75 9.72 24.83 9.57 24.75 9.57 24.75 9.33 24.91 9.26 25.38 9.1 25.53 9.02 25.61 8.94 25.61 8.87 25.92 8.87 26 8.79 26 8.71 25.76 8.63 25.69 8.63 25.53 8.71 25.38 8.79 25.14 8.87 25.06 8.94 24.91 9.02 24.6 9.25 24.52 9.33 24.36 9.49 24.21 9.57 23.97 9.8 23.5 10.03 23.5 10.35 23.58 10.35 23.58 10.27"/><polygon points="12.98 34.58 13.06 34.66 13.14 34.66 13.14 34.58 13.06 34.5 12.98 34.43 13.06 34.19 13.06 34.19 12.98 34.35 12.9 34.43 12.75 34.5 12.83 34.5 12.98 34.58"/><polygon points="26.7 8.01 26.93 8.01 27.01 7.93 26.93 7.93 27.09 7.85 27.17 7.85 27.17 7.77 27.25 7.7 27.32 7.7 27.4 7.62 27.48 7.7 27.56 7.62 27.64 7.54 27.87 7.54 27.95 7.62 27.95 7.54 28.02 7.54 28.1 7.46 28.18 7.46 28.18 7.38 28.26 7.46 28.34 7.46 28.34 7.38 28.49 7.38 28.57 7.31 28.73 7.15 28.8 7.07 28.88 7.07 29.04 7 29.35 7 29.35 6.99 29.74 6.99 29.82 6.92 29.66 6.92 29.58 6.84 29.74 6.84 29.74 6.76 29.66 6.68 29.74 6.68 29.74 6.76 29.89 6.76 29.97 6.68 29.89 6.68 29.89 6.61 29.97 6.68 30.13 6.61 30.36 6.61 30.44 6.53 30.52 6.45 30.52 6.37 30.6 6.45 30.6 6.37 30.52 6.29 30.44 6.29 30.36 6.21 30.13 6.29 29.89 6.29 29.04 6.61 28.65 6.76 28.18 6.92 28.02 6.92 27.56 7 27.25 7.07 27.09 7.15 26.93 7.23 26.78 7.46 26.62 7.7 26.54 7.77 26.54 7.85 26.62 7.85 26.7 8.01"/><polygon points="36.36 6.14 36.52 6.14 36.52 6.06 36.6 6.06 36.6 5.98 36.67 5.83 37.06 5.83 37.3 5.75 37.61 5.75 37.77 5.67 37.77 5.59 37.84 5.51 38.08 5.44 38.23 5.36 38.55 5.36 38.55 5.2 38.47 5.13 38.31 5.2 37.84 5.28 37.61 5.28 36.83 5.36 36.6 5.36 36.6 5.44 36.44 5.51 36.36 5.59 36.36 5.83 36.44 5.9 36.36 5.98 36.28 5.98 36.28 6.06 36.36 6.22 36.36 6.14"/><polygon points="31.38 6.61 31.45 6.68 31.61 6.68 31.69 6.76 31.77 6.68 31.84 6.68 31.92 6.61 32.08 6.61 32.16 6.53 32.23 6.45 32.23 6.37 32.54 6.37 32.78 6.45 33.09 6.45 33.4 6.37 33.71 6.29 33.79 6.29 33.95 6.22 34.1 6.14 34.8 6.14 34.8 5.98 34.73 5.98 34.57 5.9 34.34 5.9 33.87 5.98 32.86 6.06 32.39 6.06 32 6.06 31.69 5.98 31.45 5.98 31.53 5.9 31.77 5.9 31.84 5.98 31.92 5.98 31.84 5.9 31.77 5.9 31.69 5.83 31.53 5.83 31.38 5.98 31.3 6.06 31.22 6.22 31.14 6.29 31.14 6.37 31.22 6.53 31.38 6.61"/><polygon points="24.83 9.49 24.83 9.57 24.91 9.49 24.83 9.49"/><polygon points="36.36 5.36 36.6 5.36 36.44 5.28 36.36 5.36"/><polygon points="22.1 14.09 22.18 14.09 22.26 14.01 22.34 14.01 22.41 13.93 22.57 13.93 22.57 13.85 22.65 13.85 22.57 13.78 22.49 13.7 22.41 13.62 22.49 13.62 22.65 13.7 22.73 13.78 22.88 13.78 22.88 13.62 23.11 13.31 23.35 13.31 23.43 13.23 23.58 13.07 23.58 13 23.74 12.84 23.74 12.68 23.82 12.61 23.89 12.61 23.97 12.45 23.97 11.67 24.05 11.59 24.05 11.52 23.89 11.28 23.82 11.2 23.74 11.13 23.74 11.05 23.74 10.89 23.66 10.81 23.58 10.74 23.43 10.74 23.43 10.81 23.27 10.89 23.19 10.97 22.96 11.44 23.11 11.36 23.19 11.28 23.19 11.36 23.11 11.44 23.04 11.52 22.96 11.59 22.96 11.44 22.73 11.67 22.57 11.98 22.41 12.22 22.34 12.29 22.26 12.53 22.18 12.76 22.1 13 22.1 13.07 22.02 13.31 22.02 13.54 22.1 13.85 22.1 14.09"/><polygon points="21.56 14.48 21.56 14.4 21.63 14.4 21.71 14.32 21.87 14.24 21.87 14.24 22.02 14.16 22.02 14.09 21.87 14.09 21.63 14.16 21.4 14.16 21.4 14.4 21.48 14.48 21.56 14.48"/><polygon points="14.39 33.1 14.54 33.1 14.54 33.02 14.39 33.1"/><polygon points="25.45 14.87 25.53 14.87 25.61 14.79 26.7 13.85 26.7 13.85 25.61 14.79 25.45 14.79 25.45 14.87 25.38 14.87 25.38 14.94 25.45 15.02 25.45 14.87"/><polygon points="13.06 34.12 13.14 34.12 13.14 34.19 13.22 34.19 13.37 34.12 13.37 34.04 13.29 34.04 13.29 33.96 13.53 33.96 13.61 33.88 13.84 33.88 13.92 33.8 14 33.73 14.15 33.8 14.31 33.8 14.46 33.88 14.46 33.96 14.54 34.04 14.62 34.19 14.7 34.19 14.7 34.43 14.62 34.43 14.62 34.5 14.7 34.5 14.62 34.58 14.62 34.66 14.7 34.82 14.78 34.82 14.78 34.89 14.85 34.97 14.85 35.05 14.93 35.21 14.93 35.36 15.09 35.36 15.16 35.44 15.24 35.36 15.24 35.44 15.71 35.44 15.79 35.52 16.02 35.6 16.1 35.75 16.18 35.83 16.41 35.83 16.41 35.91 16.57 35.91 16.65 35.98 16.72 35.98 16.72 36.14 16.88 36.22 16.96 36.3 17.35 36.3 17.5 36.22 17.74 36.22 17.97 36.14 18.13 36.06 18.2 35.98 18.28 35.83 18.28 35.75 18.2 35.75 18.2 35.67 18.52 35.67 18.67 35.6 18.59 35.6 18.59 35.44 18.52 35.44 18.44 35.52 17.74 35.52 17.58 35.28 17.43 35.28 17.35 35.21 17.27 35.21 17.19 35.13 17.19 35.05 17.04 34.97 17.04 34.82 16.96 34.82 16.72 34.58 16.49 34.35 16.41 34.35 16.41 34.27 16.26 34.27 16.18 34.19 16.1 34.19 15.94 34.04 15.79 33.96 15.71 33.96 15.4 33.8 15.32 33.73 15.09 33.65 15.09 33.57 15.01 33.49 14.93 33.49 14.93 33.57 14.85 33.49 14.93 33.49 14.93 33.34 14.85 33.34 14.85 33.41 14.78 33.41 14.78 33.34 14.62 33.26 14.62 33.18 14.54 33.1 14.54 33.1 14.31 33.18 14.15 33.18 14.31 33.1 14.07 33.18 13.61 33.34 13.45 33.41 13.37 33.41 13.14 33.49 13.06 33.49 12.98 33.65 12.98 33.8 13.06 34.04 13.06 34.12"/><polygon points="17.27 34.82 17.43 34.97 17.5 34.97 17.58 35.05 17.66 35.13 17.97 35.13 18.13 35.05 18.2 35.05 18.13 34.97 17.97 34.89 17.74 34.82 17.58 34.74 17.58 34.74 17.35 34.66 17.19 34.66 17.11 34.74 17.19 34.82 17.27 34.82"/><path d="M47.27,11.67,47,11.51V11.2l.08-.07v-.24l.07-.23h.08l.08-.08h.16l-.16-.08-.08-.08.08-.07V10l-.08-.24V9.64h-.08L47,9.57h-.08V9.49h-.31V9.41h-.31l-.08-.08H46.1L46,9.18V8.94L46,8.87,46,8.71V8.63H46l.07-.15V8.4L46,8.48l-.08.07H45.4l-.15-.07V8.4h-.16l-.31-.16v.08l-.31-.16h-.08V8.09h.08l-.24-.24h-.07l-.08-.08V7.38L44,7.31V7l-.08-.16h-.08V6.61l.08-.24V6.29l-.23-.23L43.53,6l-.08.16.08.08H43.3V6.14l.08.08V6.14L43.45,6h-.07l-.16-.08-.16.16L43,6l-.16-.08H42.6l-.08-.07-.16.07h0L41.74,6l-.08.08-.23.08h-.08l-.08.08h-.15L41,6.37h-.23l-.32.16-.07-.08-.08.08h-.39l-.23.08-.32.07h-.15L39,6.76h-.15l-.47.16L38.31,7v.07l-.16.08L38,7l-.39-.23h-.08l-.31.16V6.84h-.08v.08h-.08V6.84L37,6.92l.07.07h.08l.08.08h.08l.08.08h.07v.08h-.23V7.15l-.16-.08V7h-.15l-.08.16h.08l.08.08h.07v.08L37,7.38l-.08-.07v.07l.08.08h.39v.08h-.24L37,7.46v.08l-.08-.08v.08l.08.08h.39l.07-.08V7.7h-.07l.07.07.08-.07h.08v.07l-.08.08h-.15v.08l.07.08.08-.08h.08L37.53,8h-.15l.07.08v.07h-.07V8.09L37.3,8V7.93l.08.08-.08-.16h-.08l-.08-.08v.08L37.06,8V7.85l-.15-.08-.08.08v.08l.16.16v.07h-.08V8.09l-.08.07V8.09L36.75,8V7.7l-.08-.08V7.54l.08-.08h-.08V7.31l-.07-.08.07-.16V6.92l.16-.08L36.44,7h-.08l-.15-.07H36V7h-.15l-.08-.07L35.43,7h-.24l-.07.08-.32.08h-.15l-.31.16H34V7.23l-.08-.08v.16l-.31.15-.08.08-.16.08-.07.08-.16.07h-.16l-.23.16-.47.23-.39.24h-.23l-.08.08-.16.07H31.3l-.08.08-.31.16L30.67,9l-.07.16-.08.08v.07h-.08v.08l-.16.08-.07.08h-.08l-.24.23h-.07l-.08.08-.08.15h-.08l-.08.08-.07.16-.08.23-.08.08v.08h.08l-.08.08-.16.15V11h.08v.16l-.08.15v.47l-.07.08v.07l-.16.08H28.8l.08.08-.08.08v.08l-.07.07h.07l.08.08.08.16v.23l.08.16H29L29,13H29v-.24h-.08v-.15h-.15v-.08h-.08l.08.15v.08l.15.16H28.8v.15H29v.24l.08-.08v.08H29v.08H29l.07.07v.24l-.07.07v.16l.07.23v.16l.08.08v0l.16-.1-.16.16v-.06l-.08.06v.23H29l-.08.08.08.08.07.15v.31l-.07.08h-.16l-.31.31.08.08V16h.15V16h.08l.31.31h.39v-.08l.24.08H30l.08.07.31.16h.16v.08h.15l.08-.08h.08V16.5l.08-.08v-.07l.15-.08.16.08.08-.08.15-.08h.08l.08.08v.15h.47v.08h.07l.08-.08v.16h-.08l-.39.08h-.07v.08l-.24.39-.39.62v.08l-.07.23v1.48h.07l.16.16.15.23.24.31.08.08h1.87l-.08.08v.31l.08.08v.08l-.31-.08.07.08h.16v.07l.08.08v.16l.15.15v.16l.08.08V22l-.08.23-.08.16v.15l-.07.16v.16l-.08-.08v.15H33.4v-.15l.31-.63v-.62l-.07-.16-.39-.39v-.07H32.7l-.31-.08-.7-.24h-.08l-.08-.15h-.08l-.08.08-.54.15h-.08l-.08.08-.62.55v.07h-.47v.08l-.08.24v-.08l-.07.15V22l-.16.07h-.08l-.08.08-.07.16h-.16v.08l-1.32.85-.24.16v.08h-.08v.07h-.12l-.5.32-.08.07-.31.24h-.08v.08l.16.15v.39l-.08.08h.08l.08.15h-.08l.08.08.08-.08h.07l.31-.07H27l.08.07h.31l.23.08.16.16.23.08.08.07v.08h.08l.7.63.08.15H29l.15.08.16-.08.39-.15H30l.08-.08.23-.08h.08l.08-.31.08-.08v-.23h.08V25h-.08v-.08l-.08-.16.31-.31.16.08.23-.08h.08l.08-.08h-.08l.47-.46.62-.32h.16l.07.08h.08l.31-.23.08-.16.16-.15.08-.16.07-.08V23h.08v.08h-.08l.08.08-.54.54-.16.08v.08h-.08l-.08.08h-.07l-.08.07v.08h-.08v.08h-.16l-.15.08-.08.08h-.08l-.08.07-.15.08h-.08l-.16.16v.08h-.15v.15h-.08v.08h-.08V25H31v.07l-.16.08-.16.16v.08l-.07.15v.16l-.08.15v.08l-.08.16-.08.08H30l-.15.15-.08-.08-.08.08-.23.08h-.16l-.08.08H29l-.24-.24h-.07v-.07l-.08-.08h-.24L28.34,26h-.16L28,25.78V25.7l.07-.08h-.15l-.08-.08h-.08l-.08-.08h-.07v-.07l-.08-.08-.08.08h-.47l-.08.07h-.07l-.08.08h-.08v-.08h-.08l-.15-.15-.08-.16h-.08v-.08H26l-.08-.15h-.39l-.16.08-.07-.08V25h-.08v-.08h.08v-.08l-.08-.08h-.08l-.08.08h-.15v-.08H25v-.15l-.15-.08h-.08v.08h-.08l-.08-.08h-.07v-.08h.15l.08-.08-.23-.15v-.08l.15.08.08.08h.08l.08-.08v.08l.07.07.08-.07v-.16h.08l.08-.08v-.15l.23-.24h.16v-.08l.08-.07v-.08l.15-.16h-.15l-.08-.08v.08l-.16-.08V23l.08-.08v-.08h-.08l-.08.08-.07-.08.15-.07h.16v-.08l-.08-.08v-.15l.08-.08.08.08v-.08l.07-.08.08-.16h-.08V22h-.07v-.08l-.08-.08v-.08l-.08-.15v-.08l-.16-.23v-.08l-.07-.08v-.16l-.08-.15v-.08l-.08-.08.08-.08-.08-.07V20h.08v-.08h.08l.07-.08h.16v.08l.08.08v-.08l.08-.08h.23l.16.16h.07l.08.08v.07h.31l.24-.23H27v-.08l.08-.07h.08V19.7l.15-.08v-.08l.08-.08v-.23l.08-.16h.23l.08-.07h.08l-.08-.08h.08l.15-.16-.15-.15v-.47h-.08l-.08-.08L27.56,18h-.32l-.07-.08h-.24l-.08.16-.07.08v.08l-.08-.08h-.23l-.32-.31.08-.16h-.08l-.07-.08H26l.15-1.17L26,16.19l-.24-.47v-.07l-.07-.08-.24-.47h-.08v-.16l-.07-.07h-.08l-.08.07h-.08L25,14.87h-.07l-.08.07h-.16l-.15.16v.08l-.16.23h-.08l-.15.08-.08.08-.31.15h0l-.08-.07-.23-.16h-.08l-.24-.16L23,15.18,22.88,15v-.31l.08-.16v-.07h0V14.4h-.08l.08.08h-.08v.07h-.16V14.4h-.46l-.16.23v.31l-.08.24v.54l-.15.47-.08.47-.16.47v.15h-.07v.16l-.16.31v.15l-.16.47v.55l-.07.31v.31l-.08.31v.39l-.08.08v.08l-.08.54-.08.71-.07.39-.24.46-.08.24.16-.08h.08l.15-.08.08.08h-.08v.08H20.7l-.08.07h.16v.08l-.16-.08h-.08v.08l-.15-.08V23l.07.16-.07.07v.16l-.08.16-.08.31-.08.23-.15.39-.31.62-.47,1-.16.23-.08.16-.23.39-.08.07V27l-.15.24-.08.15-.7.94-.24.15v.08l-.15.16h-.08v.15h.08l-.08.08v-.08h-.08l-.08.08-.07.16-.47.46-.24.32-.31.31v.08l-.15.23-.16.08-.15.15h-.08l-.08-.07L15,30.61l-.08.08h-.15l-.08.07v.08l-.08.08-.08.16.16.15v.08l-.16.15-.08.16-.15.23h.15l.08.08.08-.08.31-.07H15l.08.15H15V32l-.16.16v.07l-.07.08v.08l.07.08.32.47v.15l-.08.08.15-.08.24.24v.07h.31l-.08.08.08.08h.08v-.08h.23l.08.08.15.23h.24v.08h.15l.08.16.08.07H17l-.08.08h-.08l.08.16.08.08.23.07v.08h.16l.15.08h.16v.08l.31.08.15.15h.08l.16.08.23.16h.08l.08.07H19v.08h.39l.16.08h.16l.07.08h.08l.08.07H20l.15-.07h.08l.23-.08h.08l.08-.08h.16l.07-.15.08.07H21l.16-.07v.15l-.16.08-.08.08h-.08l-.15.15-.62.16h-.16l-.23.08h-.16l-.23-.08-.08-.08h-.08l-.08-.08h-.23l-.08.08-.16.08-.07.08V36l-.08.16-.24.23-.15.08H18l-.08.08h-.08v-.08h-.07l-.08.08h-.23l-.08.08h-.16l-.08.15H17v-.07H16.8l-.15-.08h-.32l-.15-.08-.24-.16h-.07l-.24-.07v.07l-.15.16H15.4l.08.16h.08l.15.31h.47v-.08h.08v.16l-.08.07h-.39l-.08.08h-.08l-.15-.15L15.17,37h-.08l-.16.08-.08.07h-.07l-.16.08-.08.08-.08-.08-.15.08-.08.08v.15h.08v.08h.15l.16.16h.08v.15l.08.08h.07l.16.16v.15l.08.08h.08v.08h.62l.08.08h.07v-.08l.32.15-.08.08v.16h.08l.31.15.08.08v.55l.07.31h-.23l-.08-.08h-.23L16.1,40H16l-.08.08h-.23V40h-.08l-.23-.16h-.08l-.08-.23h-.08L15,39.34v-.08l-.08-.08L15,39.1,14.93,39v-.15h-.08l-.31-.31h-.15l-.08-.08h-.08l-.16-.08H14l-.08-.08-.08.08h-.08v.08l-.15-.24h.07l-.07-.07v-.08h-.24l-.08.08h-.54v-.08L12.67,38h-.15l-.16.08h-.08l-.08.08L12,38.09h-.08L11.81,38l-.07.08-.16.08v.07l-.08.08v.08l-.08.08h-.07l-.08.08h.15l-.15.07v-.07L11,38.32v-.08L11,38v-.08h-.08l-.08-.07-.15-.08-.16-.16v-.23l.08-.08h-.16l-.08-.08H9.79v.08H9.63l-.08.08-.15.08-.08.07-.16.08H9.09l-.16.16-.16.08-.07.07H8.62l-.16.16v.23l.08.16h.08l.15.15.16.08v.08H9l.15.16V39l.08.08v.08l.08.08v.08l.16.15.15.08v.08h.08l.08.08v.07h.31v-.23h.08v.16l.08.07h.23l.08-.07v-.08h.31l-.16-.08.08-.08.16-.08H11v.08l.24-.15v-.16l.08.08v.08h.07l-.07.07h-.08l-.16.08.16.08h.15l-.07.08.07.08v.07l-.07-.07-.08.07h-.08l.08-.15-.16-.08L11,39.49l-.07.16.07.08.24.15.08.08V40h.07v.23h.08l.08.08h.08v-.08h.08l.15.08H12v.08l.16.07v.08h.07l.16.16h.23l.16-.08h.08l.08-.08h.23l.08.08.07-.08.08-.31h.08v-.15h.08v-.47l.15.08.16-.08h.08l.15-.16.24.24v.07h.08v.08h.15l.16.16h.15v.23l.16.08h.08l.07.08h.08l.31.15h.16l.08.08h.15l.24-.08.15-.08h.16v.08h.16l.15.08.08.23v.16h.23l.16-.08h.54v.08l.08.08v.23l.08-.08.23.08h.32l.07-.08.16-.07h.08v-.16l-.39-.55-.08-.23.08-.08h.08v-.31h-.08l-.08-.08.08-.07.54-.24h.16l.16-.15h.15l.55-.08.07.15-.15.39.08.47.39-.15h.23l.31.07.16.08h.08v-.08l.07.08.16-.08-.08-.31.24-.08h.07l.08-.23.16-.08.07-.08.08-.15.16-.08.08-.08L22.18,39h.15V39l.16-.08.08.08V39h.15l.16.08H23v.16l.08.08.07-.08.08.08-.08.15v.16h.08v.08h-.08l-.15.15.08.31v.08h.15v.08h-.08l-.23-.08-.08-.08h-.15v-.07h-.08l-.16.07v.16l.08.08.16.07h.07l.24-.07h.31l.08.07h.08v-.07h.31l.15.15v.08H24l.08.08h.08l.31-.47.47-.31V39.8H25v-.07l-.07-.08v-.08l.07-.08v-.08l.08-.07.16-.08h.08l-.08.08.08.07v.08h.39l.23.7-.31.63.47.54v.08l.15.16v.54l.31.08.08-.08.23-.08h.08V42l.47.31-.16.62.08.08.31-.08L28,43h.39l.07-.08.08-.16.24.08.31.08.15.08.31-.31.24-.08.15-.16v-.08H30l.31.08v.08l.08.16.24.15.07.08v.47l.08.31h.08l.16.08.62.23.08.08v.08l.07.15.08-.07.08.07h.62l.08-.07h.08l.08.07h.15l.08.08v.08h.08l-.08.08h-.08v.08H33v.23h.08v-.08h.15v-.08h.16v-.07l.16-.08v.08h.07v.15l.24.16-.16.15v.08l-.15.08h-.08v.08l-.16.15.08.08h.16l.07.08v.08l-.07.07v.08h-.08l-.08-.08h-.16V46l.08.08v.08h-.08v.07l.08.16h-.08v.08h-.07L33,46.35l-.08.23v.16l-.08.08v.07h.08L33,47v.08l-.08.16v.23l-.15.16-.08.15h-.08l-.15.31v.08h.15l.08-.08h.08l.08.08v.08l-.16.08v.15l-.16.16v.08l-.07.08.07.07-.07.08h-.24l-.08.08v.15l-.15.16v.08h-.08l-.08.08h-.08v.07h-.15l.08.08-.08.08v.47h.08v.15h.07v.08l.08.08H32v.08h.15l.08.08v.07l-.08.08.08.24v.15l-.15.23v.08h.15l.08-.08h.08l.08-.07v.07l.07.08h.08l.08-.08v-.07l.08-.08.15-.23h.16v.15l.08.16.07-.08.16.23h.08l.08-.08.07.08.16-.15v.23l.16-.16v-.07h.15l.16-.08v.23l.15.08v-.08h.16v.08l.16-.08.07-.08h.32l.07.08.16.08h.08v-.08h.23v-.15l.08-.16L35.5,51h-.07L35.35,51v-.08h-.08l-.08-.08v-.15l.08-.08.08.08.15.07.08-.15.08-.08V50.4h.08l-.08-.08v-.07l-.08-.08V50l.08-.08h.16l.07-.07H36v-.08h.08v.08l.16.07V49.7h.07v-.08l.08-.08v-.15l-.08-.08v.08l-.07-.16v-.15l.07-.08v-.08l.08-.08v-.07l-.08-.08H36v-.16l-.08.08-.07-.08-.24-.08v-.23l-.15-.08.07-.08h.08V48l.08-.32h-.47l-.07.08H35L35,47.67V47.6h-.08l-.15.07h-.08l-.08.08h-.08l-.08.08h-.07l-.08-.08.15-.15v-.24h-.07l-.08-.08v-.07h-.08v-.08H34.1v-.39L34,46.66,34,46.51h.31v-.08l.15-.08.08-.08v.08l.16.23.08.16v.08l.07-.08h.08v.08H35v-.08l.08-.08v-.08l.08-.07v-.16l.07-.08v-.08l.08-.07V46l.08-.08.15-.08.08-.08.16-.07h.08l.15-.16v-.08l.08-.08h.16l.07-.07v-.16l.08-.08h.16L36.6,45h.07V45h.16l.08-.08h.23l-.08-.08h.08l.08-.08-.31-.23h-.08l.47-.23-.16-.16-.47.23-.15.16h-.31V44.4l-.08-.08v-.54l-.08-.08.08-.08h.15l-.15-.31.15-.08.08-.15.31-.32v-.07l.08-.08.16-.24.08-.15v-.08l.07-.08v-.15l.08-.08v-.08h.24v-.08l.38-.39-.07-.23-.08-.16v-.07l.15-.16h-.23v-.08l.08-.46v-.24h.08l-.08-.15.08-.08v-.24l-.16-.31.08-.15-.08-.08v-.24l-.08-.15-.31-.16L37,37.86l-.16-.08-.16-.16-.07-.15v-.08h-.08l-.24-.16v-.31h.08v-.08l.08-.23v-.08l.08-.08v-.08l-.16-.07h-.15v-.08h-.16l-.39-.16L35.58,36v-.15l.08-.08-.08-.08v-.23h.16v-.08h-.08v-.15h-.08l-.23-.16L35.27,35H34.8v-.15l.08-.08.16-.08h.08l.07-.16v-.07h-.07v-.16h.07l-.07-.08H35V34l-.16-.16h-.15v-.07l.07-.08h.08l-.15-.08.15-.23H35v.07h.23l.16-.07h.08l.15-.16.08.08.16-.16h.07L35.82,33l.15-.15.24.23h.15l.31.08h.24l.08.08v-.39l-.16-.08h-.08v-.16l-.08-.15-.07-.08h-.24l.08-.08v-.08h.08l.08.08.31-.15.08.07h.07l.08.08.16.08v.08h-.16l.24.23.15.08h.16v-.08h.15l.08.08H38v-.08h.08v-.08l.07.08.24.08v.08l.08.15v.08l.15-.08h.24l.07.08H39l.08.08v.16h.23l.16.07h.08l-.08-.15.08.08-.08-.16V33.1l.08-.08h-.08V33H39.4l-.08-.08v-.24l.16.08h.08l.07.08h.08v.08h.16l.08-.08L40,33h.08l.08.07.08-.07.23-.08v-.16h.08l.08-.08h.15l.08-.07v-.08H41L41,32.4v.08h.08l.07-.08.16-.08.39-.15h.16v-.08l.31-.16h.07l.08-.08v.08h.16V32l.23.23.16-.07v-.08H43l.07-.08h.08v-.08l.08-.08h.08l.15-.23.08-.08v-.39l.16-.07h.15l.08-.16-.08-.08v-.23l-.23-.08h.08l-.47-.31-.08-.08L43.06,30l-.39-.15h-.31v-.31l.08-.08v-.16h.23l.32-.15v-.24h.07v-.07l.08-.32H44l.23-.23v-.08l.08-.39h.08v-.08l.23-.15v-.08l.24-.08h.23l.08-.15v-.08l.08-.08V27l.07-.07v-.24l.08-.08.16-.07.08.07H46l.23-.15V26.4L46,26.09,45.87,26v-.16h-.08v-.31l.08-.23v-.08H46v-.08H46V25l.07-.16v-.08l.16-.23v-.39l-.16-.31v-.16h-.23l-.16-.31-.15-.16v-.07L45.48,23v-.16l-.08-.15v-.08h-.15l-.08.16-.08.23-.16.08v.08h-.07l-.39-.08L44.31,23l-.23-.08h-.16l.08-.15H43l-.08-.08-.31-.16-.08-.07-.16-.08.08-.63-.16-.23-.15-.31h.08l.15.08h.16L42.6,21h.15l.16.08L43,21l-.47-.39v-.15l.08-.31v-.08l-.16-.16.08-.08h.08l.07-.07.08-.16H43l.07-.08h.39l.08.08.08-.08H44l.08-.08.08.08h.23l.15.08v.08h.55l.08-.08h.08l.07.08.08-.08v.08h.08l.23.08h.08l.16-.16v-.55l.08-.78V16.81l.23-.46-.08-.16v-.08l.16-.23.46-.78.32-.55.15-.62.08-.39.08-.08v-.07l-.16-.71ZM29,13.15v-.08h.07Zm-3.23,5.91h0l-.05,0ZM19.06,33.73v-.08h.08Zm6.51-14.5h0Zm-.12.09h.12v0h0l-.11,0h0l-.15.07.15-.07Zm-1.34-3.6h0ZM36.67,8.48V8.4h.08Zm.24-.08-.08-.08h.08Zm.31-.47.08-.08v.08Z"/><polygon points="15.01 33.26 15.09 33.26 15.09 33.18 15.01 33.26"/><polygon points="29.27 10.66 29.27 10.66 29.19 10.74 29.27 10.74 29.27 10.66"/><polygon points="28.49 12.53 28.34 12.53 28.41 12.61 28.49 12.61 28.57 12.53 28.73 12.29 28.49 12.53"/><polygon points="24.67 24.53 24.75 24.53 24.67 24.45 24.67 24.53"/><polygon points="27.12 23.59 27.24 23.52 27.09 23.59 27.12 23.59"/><polygon points="31.38 24.61 31.22 24.53 31.3 24.61 31.38 24.61"/><polygon points="10.64 37.31 10.64 37.47 10.72 37.47 10.72 37.62 10.8 37.62 10.88 37.7 10.96 37.7 11.11 37.85 11.19 37.78 11.19 37.85 11.11 37.85 11.11 37.85 11.11 37.85 11.27 38.01 11.27 38.17 11.19 38.24 11.27 38.32 11.27 38.4 11.35 38.24 11.42 38.24 11.5 38.09 11.58 38.01 11.89 37.93 12.05 37.93 12.13 38.01 12.44 38.01 12.44 37.93 12.67 37.93 12.83 38.09 12.98 38.09 13.06 37.93 13.22 37.93 13.29 37.85 13.29 37.62 13.22 37.62 13.22 37.54 13.14 37.47 13.06 37.31 13.06 37.23 12.98 37.15 12.83 37.15 12.83 37.08 12.67 37.08 12.52 37.15 12.44 37.08 12.28 37.08 12.13 37.15 12.05 37.23 11.89 37.15 11.74 37.23 11.66 37.23 11.58 37.31 11.5 37.31 11.42 37.23 11.35 37.23 11.27 37.15 11.11 37.15 11.11 37.08 11.04 37.08 11.04 37.15 10.57 37.31 10.64 37.31"/><polygon points="25.92 23.05 26 23.05 26.07 22.97 26.15 22.97 26.23 22.89 26.31 22.89 26.31 22.82 26.15 22.89 26 22.74 26 22.89 25.92 23.05"/><polygon points="32.54 20.71 32.54 20.63 32.62 20.63 32.7 20.55 32.62 20.48 32.39 20.48 32.39 20.55 32.47 20.55 32.47 20.63 32.54 20.71"/><polygon points="44.55 8.09 44.47 8.09 44.55 8.16 44.55 8.09"/><polygon points="26 22.74 26 22.74 26 22.74 26 22.74"/><polygon points="47.19 9.57 47.27 9.64 47.27 9.49 47.19 9.57"/><polygon points="23.97 40.82 24.05 40.74 23.89 40.74 23.97 40.82"/><path d="M16.72,41.36h-.07v-.15l-.08.07v-.15l-.08-.08h-.16l.08-.08h-.15v.08l-.08.08v.08l.08.07h.07v.16l-.07-.08-.08.08h.08l-.08.08h.08v.08l-.08-.08H16l.08.08v.07L16,41.52l-.08-.08h-.07l.07.08.08.08h-.08v-.08h-.07v-.16l-.16-.15h-.23v.07h.23l-.08.08v.08l.08-.08.08.08h-.08v.16h.08v.07h-.08l-.16-.31h-.07l-.24-.15v-.08h-.08v.08l-.31-.08-.07-.08V41l-.08-.08v-.07l-.08-.08.08-.08h-.08l-.08-.08v-.07h-.23l-.08-.08h-.16l-.07.15v.08h-.08v.39l-.08.08v-.08l-.08.08h-.08l-.23.08-.16.07-.07.08h-.08v.08H13v.08l-.07.08h-.32l-.07-.08h-.08v.08l-.08-.08v.15l-.08-.15v-.08h-.15v-.08h-.24v.24l-.15-.08v-.08l.07-.08h-.46v-.08l-.16-.15h-.08v-.08L11,41H10.8l-.15-.08h-.08l-.24-.07h-.07v-.08h-.08L10,40.66H9.94l-.15-.15H9.71l-.08-.08H9.55v-.08H9.09v.08H8.93l-.16.08H8.62l-.08.07H8.15v.08H8.07L8,40.74H7.84l-.08.08H7.68v.07l.08.08v.31l.08.08v.16l-.31.31.23.23H7.61v.08l.15.16v.08l-.08.07.08.08h.08l.08.16H8l.07.15.08-.08.08.08V43h.08l.08.08H8.7L9.32,43l-.08-.55-.08-.07.16-.08.08.08h.08V42.3h.15v-.08h.08l.16.16.07-.08-.07-.16.15-.08.08.08.16.08.07.08.16.08h.08V42.3h.15l.16.15H11l.07.08v.08h.24l.08.08v-.08l.31.08h.08l.07.15h.08v-.08l.16.16h.08V43l-.08.08v.54l.08.08h.07v-.08l.08.08h.55l.15-.16h.16v.16h-.08l-.08.08.08.08h.16l.15-.08h.08l-.08-.16.16-.08.08.16h.07v-.08h.16l.08-.08v-.07h.15l.08-.16h.08l.08-.08.15-.08h.08v.08h.08l.08-.08v.08h.15l.08-.08H15l.23-.23.31-.16.39-.31.08-.07.78-.94h-.08Zm-.78.39h-.07v-.08h.07Zm.32-.54v-.08l.07.08Zm.15,0v-.08h.08Z"/><polygon points="16.02 41.44 16.18 41.44 16.1 41.36 16.02 41.44"/><polygon points="16.33 41.36 16.26 41.28 16.18 41.28 16.18 41.21 16.1 41.21 16.1 41.13 15.94 41.13 15.94 41.28 16.02 41.36 16.1 41.36 16.26 41.36 16.33 41.36"/><polygon points="41.19 4.66 41.04 4.58 40.73 4.58 40.65 4.66 40.65 4.74 40.73 4.66 41.19 4.66"/><polygon points="29.58 20.63 29.19 19.96 29.19 20.01 29.58 20.63"/><polygon points="28.02 19 28.02 19 28.02 19 28.02 19"/><polygon points="27.95 19.07 27.87 19.15 28.02 19.15 28.09 19.02 28.02 19 27.95 19.07"/><polygon points="29.74 21.1 29.74 21.1 29.74 21.02 29.64 20.78 29.74 21.02 29.74 21.1"/><polygon points="29.64 20.78 29.58 20.63 29.58 20.63 29.58 20.63 29.64 20.78"/><polygon points="39.71 4.97 39.79 5.05 39.87 4.89 39.79 4.89 39.79 4.74 40.1 4.74 40.02 4.66 39.95 4.58 39.95 4.5 39.87 4.42 39.64 4.42 39.56 4.58 39.56 4.66 39.64 4.74 39.71 4.97"/><polygon points="28.09 19.02 28.57 19.23 28.1 19 28.09 19.02"/><polygon points="15.95 35.91 15.87 35.91 15.95 35.98 15.95 35.91"/><polygon points="28.57 19.23 28.65 19.31 29.04 19.7 28.65 19.31 28.57 19.23"/><polygon points="16.1 36.14 16.18 36.06 16.1 36.06 16.02 36.14 16.1 36.14"/><polygon points="11.27 35.91 11.27 35.98 11.43 35.98 11.5 36.06 11.58 35.98 11.74 35.91 11.89 35.91 12.05 35.83 12.13 35.67 12.2 35.67 12.2 35.6 12.28 35.52 12.52 35.52 12.59 35.6 12.59 35.75 12.83 35.83 12.83 35.91 12.9 35.83 13.06 35.91 13.14 36.06 13.14 36.22 13.22 36.22 13.22 36.38 13.29 36.45 13.22 36.61 13.29 36.61 13.3 36.61 13.29 36.61 13.45 36.53 13.3 36.61 13.37 36.61 13.53 36.69 13.69 36.69 13.76 36.61 13.84 36.77 14 36.92 14.54 36.92 14.54 36.84 14.7 36.84 14.78 36.77 14.93 36.69 15.01 36.77 15.09 36.69 15.16 36.69 15.24 36.53 15.32 36.45 15.4 36.45 15.4 36.38 15.48 36.38 15.48 36.3 15.48 36.22 15.4 36.14 15.4 36.06 15.32 36.06 15.32 35.98 15.24 35.98 15.01 35.83 14.85 35.75 14.54 35.75 14.54 35.6 14.46 35.44 14.31 35.28 14.23 35.21 14.23 35.05 14.15 34.97 13.92 34.97 13.84 34.9 13.69 34.97 13.45 34.97 13.45 34.9 13.37 34.82 13.29 34.74 13.14 34.82 12.59 34.82 12.36 34.74 12.05 34.74 11.97 34.82 11.66 34.9 11.5 34.9 11.35 34.97 11.19 35.13 11.11 35.28 11.11 35.67 11.19 35.83 11.27 35.91"/><polygon points="11.43 36.22 11.5 36.3 11.58 36.3 11.58 36.22 11.5 36.22 11.43 36.22"/><polygon points="12.67 34.58 12.59 34.66 12.59 34.82 12.67 34.66 12.67 34.58"/><polygon points="15.55 35.98 15.63 35.98 15.87 35.91 15.55 35.91 15.4 36.06 15.48 36.06 15.55 35.98"/><polygon points="16.02 35.98 16.1 36.06 16.1 35.83 16.02 35.83 15.95 35.91 16.02 35.91 16.02 35.98"/><polygon points="12.75 34.58 12.83 34.51 12.67 34.51 12.67 34.58 12.75 34.58 12.75 34.58"/><polygon points="29.43 21.26 29.58 21.18 29.66 21.1 29.5 21.18 29.43 21.26"/><polygon points="29.04 19.7 29.19 19.96 29.19 19.93 29.04 19.7"/><polygon points="29.35 21.72 29.27 21.72 29.27 21.88 29.35 21.72"/><polygon points="28.26 12.61 28.02 12.68 28.1 12.68 28.26 12.61"/><polygon points="12.83 34.58 12.75 34.58 12.75 34.66 12.83 34.58"/><polygon points="27.17 13.46 27.25 13.39 27.95 12.68 27.09 13.46 27.17 13.46"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="nederland"><polygon points="23.58 10.27 23.66 10.19 24.13 10.19 24.28 10.11 24.36 10.03 24.36 9.96 24.44 9.96 24.52 9.88 24.75 9.72 24.83 9.57 24.75 9.57 24.75 9.33 24.91 9.26 25.38 9.1 25.53 9.02 25.61 8.94 25.61 8.87 25.92 8.87 26 8.79 26 8.71 25.76 8.63 25.69 8.63 25.53 8.71 25.38 8.79 25.14 8.87 25.06 8.94 24.91 9.02 24.6 9.25 24.52 9.33 24.36 9.49 24.21 9.57 23.97 9.8 23.5 10.03 23.5 10.35 23.58 10.35 23.58 10.27"/><polygon points="12.98 34.58 13.06 34.66 13.14 34.66 13.14 34.58 13.06 34.5 12.98 34.43 13.06 34.19 13.06 34.19 12.98 34.35 12.9 34.43 12.75 34.5 12.83 34.5 12.98 34.58"/><polygon points="26.7 8.01 26.93 8.01 27.01 7.93 26.93 7.93 27.09 7.85 27.17 7.85 27.17 7.77 27.25 7.7 27.32 7.7 27.4 7.62 27.48 7.7 27.56 7.62 27.64 7.54 27.87 7.54 27.95 7.62 27.95 7.54 28.02 7.54 28.1 7.46 28.18 7.46 28.18 7.38 28.26 7.46 28.34 7.46 28.34 7.38 28.49 7.38 28.57 7.31 28.73 7.15 28.8 7.07 28.88 7.07 29.04 7 29.35 7 29.35 6.99 29.74 6.99 29.82 6.92 29.66 6.92 29.58 6.84 29.74 6.84 29.74 6.76 29.66 6.68 29.74 6.68 29.74 6.76 29.89 6.76 29.97 6.68 29.89 6.68 29.89 6.61 29.97 6.68 30.13 6.61 30.36 6.61 30.44 6.53 30.52 6.45 30.52 6.37 30.6 6.45 30.6 6.37 30.52 6.29 30.44 6.29 30.36 6.21 30.13 6.29 29.89 6.29 29.04 6.61 28.65 6.76 28.18 6.92 28.02 6.92 27.56 7 27.25 7.07 27.09 7.15 26.93 7.23 26.78 7.46 26.62 7.7 26.54 7.77 26.54 7.85 26.62 7.85 26.7 8.01"/><polygon points="36.36 6.14 36.52 6.14 36.52 6.06 36.6 6.06 36.6 5.98 36.67 5.83 37.06 5.83 37.3 5.75 37.61 5.75 37.77 5.67 37.77 5.59 37.84 5.51 38.08 5.44 38.23 5.36 38.55 5.36 38.55 5.2 38.47 5.13 38.31 5.2 37.84 5.28 37.61 5.28 36.83 5.36 36.6 5.36 36.6 5.44 36.44 5.51 36.36 5.59 36.36 5.83 36.44 5.9 36.36 5.98 36.28 5.98 36.28 6.06 36.36 6.22 36.36 6.14"/><polygon points="31.38 6.61 31.45 6.68 31.61 6.68 31.69 6.76 31.77 6.68 31.84 6.68 31.92 6.61 32.08 6.61 32.16 6.53 32.23 6.45 32.23 6.37 32.54 6.37 32.78 6.45 33.09 6.45 33.4 6.37 33.71 6.29 33.79 6.29 33.95 6.22 34.1 6.14 34.8 6.14 34.8 5.98 34.73 5.98 34.57 5.9 34.34 5.9 33.87 5.98 32.86 6.06 32.39 6.06 32 6.06 31.69 5.98 31.45 5.98 31.53 5.9 31.77 5.9 31.84 5.98 31.92 5.98 31.84 5.9 31.77 5.9 31.69 5.83 31.53 5.83 31.38 5.98 31.3 6.06 31.22 6.22 31.14 6.29 31.14 6.37 31.22 6.53 31.38 6.61"/><polygon points="24.83 9.49 24.83 9.57 24.91 9.49 24.83 9.49"/><polygon points="36.36 5.36 36.6 5.36 36.44 5.28 36.36 5.36"/><polygon points="22.1 14.09 22.18 14.09 22.26 14.01 22.34 14.01 22.41 13.93 22.57 13.93 22.57 13.85 22.65 13.85 22.57 13.78 22.49 13.7 22.41 13.62 22.49 13.62 22.65 13.7 22.73 13.78 22.88 13.78 22.88 13.62 23.11 13.31 23.35 13.31 23.43 13.23 23.58 13.07 23.58 13 23.74 12.84 23.74 12.68 23.82 12.61 23.89 12.61 23.97 12.45 23.97 11.67 24.05 11.59 24.05 11.52 23.89 11.28 23.82 11.2 23.74 11.13 23.74 11.05 23.74 10.89 23.66 10.81 23.58 10.74 23.43 10.74 23.43 10.81 23.27 10.89 23.19 10.97 22.96 11.44 23.11 11.36 23.19 11.28 23.19 11.36 23.11 11.44 23.04 11.52 22.96 11.59 22.96 11.44 22.73 11.67 22.57 11.98 22.41 12.22 22.34 12.29 22.26 12.53 22.18 12.76 22.1 13 22.1 13.07 22.02 13.31 22.02 13.54 22.1 13.85 22.1 14.09"/><polygon points="21.56 14.48 21.56 14.4 21.63 14.4 21.71 14.32 21.87 14.24 21.87 14.24 22.02 14.16 22.02 14.09 21.87 14.09 21.63 14.16 21.4 14.16 21.4 14.4 21.48 14.48 21.56 14.48"/><polygon points="14.39 33.1 14.54 33.1 14.54 33.02 14.39 33.1"/><polygon points="25.45 14.87 25.53 14.87 25.61 14.79 26.7 13.85 26.7 13.85 25.61 14.79 25.45 14.79 25.45 14.87 25.38 14.87 25.38 14.94 25.45 15.02 25.45 14.87"/><polygon points="13.06 34.12 13.14 34.12 13.14 34.19 13.22 34.19 13.37 34.12 13.37 34.04 13.29 34.04 13.29 33.96 13.53 33.96 13.61 33.88 13.84 33.88 13.92 33.8 14 33.73 14.15 33.8 14.31 33.8 14.46 33.88 14.46 33.96 14.54 34.04 14.62 34.19 14.7 34.19 14.7 34.43 14.62 34.43 14.62 34.5 14.7 34.5 14.62 34.58 14.62 34.66 14.7 34.82 14.78 34.82 14.78 34.89 14.85 34.97 14.85 35.05 14.93 35.21 14.93 35.36 15.09 35.36 15.16 35.44 15.24 35.36 15.24 35.44 15.71 35.44 15.79 35.52 16.02 35.6 16.1 35.75 16.18 35.83 16.41 35.83 16.41 35.91 16.57 35.91 16.65 35.98 16.72 35.98 16.72 36.14 16.88 36.22 16.96 36.3 17.35 36.3 17.5 36.22 17.74 36.22 17.97 36.14 18.13 36.06 18.2 35.98 18.28 35.83 18.28 35.75 18.2 35.75 18.2 35.67 18.52 35.67 18.67 35.6 18.59 35.6 18.59 35.44 18.52 35.44 18.44 35.52 17.74 35.52 17.58 35.28 17.43 35.28 17.35 35.21 17.27 35.21 17.19 35.13 17.19 35.05 17.04 34.97 17.04 34.82 16.96 34.82 16.72 34.58 16.49 34.35 16.41 34.35 16.41 34.27 16.26 34.27 16.18 34.19 16.1 34.19 15.94 34.04 15.79 33.96 15.71 33.96 15.4 33.8 15.32 33.73 15.09 33.65 15.09 33.57 15.01 33.49 14.93 33.49 14.93 33.57 14.85 33.49 14.93 33.49 14.93 33.34 14.85 33.34 14.85 33.41 14.78 33.41 14.78 33.34 14.62 33.26 14.62 33.18 14.54 33.1 14.54 33.1 14.31 33.18 14.15 33.18 14.31 33.1 14.07 33.18 13.61 33.34 13.45 33.41 13.37 33.41 13.14 33.49 13.06 33.49 12.98 33.65 12.98 33.8 13.06 34.04 13.06 34.12"/><polygon points="17.27 34.82 17.43 34.97 17.5 34.97 17.58 35.05 17.66 35.13 17.97 35.13 18.13 35.05 18.2 35.05 18.13 34.97 17.97 34.89 17.74 34.82 17.58 34.74 17.58 34.74 17.35 34.66 17.19 34.66 17.11 34.74 17.19 34.82 17.27 34.82"/><path d="M47.27,11.67,47,11.51V11.2l.08-.07v-.24l.07-.23h.08l.08-.08h.16l-.16-.08-.08-.08.08-.07V10l-.08-.24V9.64h-.08L47,9.57h-.08V9.49h-.31V9.41h-.31l-.08-.08H46.1L46,9.18V8.94L46,8.87,46,8.71V8.63H46l.07-.15V8.4L46,8.48l-.08.07H45.4l-.15-.07V8.4h-.16l-.31-.16v.08l-.31-.16h-.08V8.09h.08l-.24-.24h-.07l-.08-.08V7.38L44,7.31V7l-.08-.16h-.08V6.61l.08-.24V6.29l-.23-.23L43.53,6l-.08.16.08.08H43.3V6.14l.08.08V6.14L43.45,6h-.07l-.16-.08-.16.16L43,6l-.16-.08H42.6l-.08-.07-.16.07h0L41.74,6l-.08.08-.23.08h-.08l-.08.08h-.15L41,6.37h-.23l-.32.16-.07-.08-.08.08h-.39l-.23.08-.32.07h-.15L39,6.76h-.15l-.47.16L38.31,7v.07l-.16.08L38,7l-.39-.23h-.08l-.31.16V6.84h-.08v.08h-.08V6.84L37,6.92l.07.07h.08l.08.08h.08l.08.08h.07v.08h-.23V7.15l-.16-.08V7h-.15l-.08.16h.08l.08.08h.07v.08L37,7.38l-.08-.07v.07l.08.08h.39v.08h-.24L37,7.46v.08l-.08-.08v.08l.08.08h.39l.07-.08V7.7h-.07l.07.07.08-.07h.08v.07l-.08.08h-.15v.08l.07.08.08-.08h.08L37.53,8h-.15l.07.08v.07h-.07V8.09L37.3,8V7.93l.08.08-.08-.16h-.08l-.08-.08v.08L37.06,8V7.85l-.15-.08-.08.08v.08l.16.16v.07h-.08V8.09l-.08.07V8.09L36.75,8V7.7l-.08-.08V7.54l.08-.08h-.08V7.31l-.07-.08.07-.16V6.92l.16-.08L36.44,7h-.08l-.15-.07H36V7h-.15l-.08-.07L35.43,7h-.24l-.07.08-.32.08h-.15l-.31.16H34V7.23l-.08-.08v.16l-.31.15-.08.08-.16.08-.07.08-.16.07h-.16l-.23.16-.47.23-.39.24h-.23l-.08.08-.16.07H31.3l-.08.08-.31.16L30.67,9l-.07.16-.08.08v.07h-.08v.08l-.16.08-.07.08h-.08l-.24.23h-.07l-.08.08-.08.15h-.08l-.08.08-.07.16-.08.23-.08.08v.08h.08l-.08.08-.16.15V11h.08v.16l-.08.15v.47l-.07.08v.07l-.16.08H28.8l.08.08-.08.08v.08l-.07.07h.07l.08.08.08.16v.23l.08.16H29L29,13H29v-.24h-.08v-.15h-.15v-.08h-.08l.08.15v.08l.15.16H28.8v.15H29v.24l.08-.08v.08H29v.08H29l.07.07v.24l-.07.07v.16l.07.23v.16l.08.08v0l.16-.1-.16.16v-.06l-.08.06v.23H29l-.08.08.08.08.07.15v.31l-.07.08h-.16l-.31.31.08.08V16h.15V16h.08l.31.31h.39v-.08l.24.08H30l.08.07.31.16h.16v.08h.15l.08-.08h.08V16.5l.08-.08v-.07l.15-.08.16.08.08-.08.15-.08h.08l.08.08v.15h.47v.08h.07l.08-.08v.16h-.08l-.39.08h-.07v.08l-.24.39-.39.62v.08l-.07.23v1.48h.07l.16.16.15.23.24.31.08.08h1.87l-.08.08v.31l.08.08v.08l-.31-.08.07.08h.16v.07l.08.08v.16l.15.15v.16l.08.08V22l-.08.23-.08.16v.15l-.07.16v.16l-.08-.08v.15H33.4v-.15l.31-.63v-.62l-.07-.16-.39-.39v-.07H32.7l-.31-.08-.7-.24h-.08l-.08-.15h-.08l-.08.08-.54.15h-.08l-.08.08-.62.55v.07h-.47v.08l-.08.24v-.08l-.07.15V22l-.16.07h-.08l-.08.08-.07.16h-.16v.08l-1.32.85-.24.16v.08h-.08v.07h-.12l-.5.32-.08.07-.31.24h-.08v.08l.16.15v.39l-.08.08h.08l.08.15h-.08l.08.08.08-.08h.07l.31-.07H27l.08.07h.31l.23.08.16.16.23.08.08.07v.08h.08l.7.63.08.15H29l.15.08.16-.08.39-.15H30l.08-.08.23-.08h.08l.08-.31.08-.08v-.23h.08V25h-.08v-.08l-.08-.16.31-.31.16.08.23-.08h.08l.08-.08h-.08l.47-.46.62-.32h.16l.07.08h.08l.31-.23.08-.16.16-.15.08-.16.07-.08V23h.08v.08h-.08l.08.08-.54.54-.16.08v.08h-.08l-.08.08h-.07l-.08.07v.08h-.08v.08h-.16l-.15.08-.08.08h-.08l-.08.07-.15.08h-.08l-.16.16v.08h-.15v.15h-.08v.08h-.08V25H31v.07l-.16.08-.16.16v.08l-.07.15v.16l-.08.15v.08l-.08.16-.08.08H30l-.15.15-.08-.08-.08.08-.23.08h-.16l-.08.08H29l-.24-.24h-.07v-.07l-.08-.08h-.24L28.34,26h-.16L28,25.78V25.7l.07-.08h-.15l-.08-.08h-.08l-.08-.08h-.07v-.07l-.08-.08-.08.08h-.47l-.08.07h-.07l-.08.08h-.08v-.08h-.08l-.15-.15-.08-.16h-.08v-.08H26l-.08-.15h-.39l-.16.08-.07-.08V25h-.08v-.08h.08v-.08l-.08-.08h-.08l-.08.08h-.15v-.08H25v-.15l-.15-.08h-.08v.08h-.08l-.08-.08h-.07v-.08h.15l.08-.08-.23-.15v-.08l.15.08.08.08h.08l.08-.08v.08l.07.07.08-.07v-.16h.08l.08-.08v-.15l.23-.24h.16v-.08l.08-.07v-.08l.15-.16h-.15l-.08-.08v.08l-.16-.08V23l.08-.08v-.08h-.08l-.08.08-.07-.08.15-.07h.16v-.08l-.08-.08v-.15l.08-.08.08.08v-.08l.07-.08.08-.16h-.08V22h-.07v-.08l-.08-.08v-.08l-.08-.15v-.08l-.16-.23v-.08l-.07-.08v-.16l-.08-.15v-.08l-.08-.08.08-.08-.08-.07V20h.08v-.08h.08l.07-.08h.16v.08l.08.08v-.08l.08-.08h.23l.16.16h.07l.08.08v.07h.31l.24-.23H27v-.08l.08-.07h.08V19.7l.15-.08v-.08l.08-.08v-.23l.08-.16h.23l.08-.07h.08l-.08-.08h.08l.15-.16-.15-.15v-.47h-.08l-.08-.08L27.56,18h-.32l-.07-.08h-.24l-.08.16-.07.08v.08l-.08-.08h-.23l-.32-.31.08-.16h-.08l-.07-.08H26l.15-1.17L26,16.19l-.24-.47v-.07l-.07-.08-.24-.47h-.08v-.16l-.07-.07h-.08l-.08.07h-.08L25,14.87h-.07l-.08.07h-.16l-.15.16v.08l-.16.23h-.08l-.15.08-.08.08-.31.15h0l-.08-.07-.23-.16h-.08l-.24-.16L23,15.18,22.88,15v-.31l.08-.16v-.07h0V14.4h-.08l.08.08h-.08v.07h-.16V14.4h-.46l-.16.23v.31l-.08.24v.54l-.15.47-.08.47-.16.47v.15h-.07v.16l-.16.31v.15l-.16.47v.55l-.07.31v.31l-.08.31v.39l-.08.08v.08l-.08.54-.08.71-.07.39-.24.46-.08.24.16-.08h.08l.15-.08.08.08h-.08v.08H20.7l-.08.07h.16v.08l-.16-.08h-.08v.08l-.15-.08V23l.07.16-.07.07v.16l-.08.16-.08.31-.08.23-.15.39-.31.62-.47,1-.16.23-.08.16-.23.39-.08.07V27l-.15.24-.08.15-.7.94-.24.15v.08l-.15.16h-.08v.15h.08l-.08.08v-.08h-.08l-.08.08-.07.16-.47.46-.24.32-.31.31v.08l-.15.23-.16.08-.15.15h-.08l-.08-.07L15,30.61l-.08.08h-.15l-.08.07v.08l-.08.08-.08.16.16.15v.08l-.16.15-.08.16-.15.23h.15l.08.08.08-.08.31-.07H15l.08.15H15V32l-.16.16v.07l-.07.08v.08l.07.08.32.47v.15l-.08.08.15-.08.24.24v.07h.31l-.08.08.08.08h.08v-.08h.23l.08.08.15.23h.24v.08h.15l.08.16.08.07H17l-.08.08h-.08l.08.16.08.08.23.07v.08h.16l.15.08h.16v.08l.31.08.15.15h.08l.16.08.23.16h.08l.08.07H19v.08h.39l.16.08h.16l.07.08h.08l.08.07H20l.15-.07h.08l.23-.08h.08l.08-.08h.16l.07-.15.08.07H21l.16-.07v.15l-.16.08-.08.08h-.08l-.15.15-.62.16h-.16l-.23.08h-.16l-.23-.08-.08-.08h-.08l-.08-.08h-.23l-.08.08-.16.08-.07.08V36l-.08.16-.24.23-.15.08H18l-.08.08h-.08v-.08h-.07l-.08.08h-.23l-.08.08h-.16l-.08.15H17v-.07H16.8l-.15-.08h-.32l-.15-.08-.24-.16h-.07l-.24-.07v.07l-.15.16H15.4l.08.16h.08l.15.31h.47v-.08h.08v.16l-.08.07h-.39l-.08.08h-.08l-.15-.15L15.17,37h-.08l-.16.08-.08.07h-.07l-.16.08-.08.08-.08-.08-.15.08-.08.08v.15h.08v.08h.15l.16.16h.08v.15l.08.08h.07l.16.16v.15l.08.08h.08v.08h.62l.08.08h.07v-.08l.32.15-.08.08v.16h.08l.31.15.08.08v.55l.07.31h-.23l-.08-.08h-.23L16.1,40H16l-.08.08h-.23V40h-.08l-.23-.16h-.08l-.08-.23h-.08L15,39.34v-.08l-.08-.08L15,39.1,14.93,39v-.15h-.08l-.31-.31h-.15l-.08-.08h-.08l-.16-.08H14l-.08-.08-.08.08h-.08v.08l-.15-.24h.07l-.07-.07v-.08h-.24l-.08.08h-.54v-.08L12.67,38h-.15l-.16.08h-.08l-.08.08L12,38.09h-.08L11.81,38l-.07.08-.16.08v.07l-.08.08v.08l-.08.08h-.07l-.08.08h.15l-.15.07v-.07L11,38.32v-.08L11,38v-.08h-.08l-.08-.07-.15-.08-.16-.16v-.23l.08-.08h-.16l-.08-.08H9.79v.08H9.63l-.08.08-.15.08-.08.07-.16.08H9.09l-.16.16-.16.08-.07.07H8.62l-.16.16v.23l.08.16h.08l.15.15.16.08v.08H9l.15.16V39l.08.08v.08l.08.08v.08l.16.15.15.08v.08h.08l.08.08v.07h.31v-.23h.08v.16l.08.07h.23l.08-.07v-.08h.31l-.16-.08.08-.08.16-.08H11v.08l.24-.15v-.16l.08.08v.08h.07l-.07.07h-.08l-.16.08.16.08h.15l-.07.08.07.08v.07l-.07-.07-.08.07h-.08l.08-.15-.16-.08L11,39.49l-.07.16.07.08.24.15.08.08V40h.07v.23h.08l.08.08h.08v-.08h.08l.15.08H12v.08l.16.07v.08h.07l.16.16h.23l.16-.08h.08l.08-.08h.23l.08.08.07-.08.08-.31h.08v-.15h.08v-.47l.15.08.16-.08h.08l.15-.16.24.24v.07h.08v.08h.15l.16.16h.15v.23l.16.08h.08l.07.08h.08l.31.15h.16l.08.08h.15l.24-.08.15-.08h.16v.08h.16l.15.08.08.23v.16h.23l.16-.08h.54v.08l.08.08v.23l.08-.08.23.08h.32l.07-.08.16-.07h.08v-.16l-.39-.55-.08-.23.08-.08h.08v-.31h-.08l-.08-.08.08-.07.54-.24h.16l.16-.15h.15l.55-.08.07.15-.15.39.08.47.39-.15h.23l.31.07.16.08h.08v-.08l.07.08.16-.08-.08-.31.24-.08h.07l.08-.23.16-.08.07-.08.08-.15.16-.08.08-.08L22.18,39h.15V39l.16-.08.08.08V39h.15l.16.08H23v.16l.08.08.07-.08.08.08-.08.15v.16h.08v.08h-.08l-.15.15.08.31v.08h.15v.08h-.08l-.23-.08-.08-.08h-.15v-.07h-.08l-.16.07v.16l.08.08.16.07h.07l.24-.07h.31l.08.07h.08v-.07h.31l.15.15v.08H24l.08.08h.08l.31-.47.47-.31V39.8H25v-.07l-.07-.08v-.08l.07-.08v-.08l.08-.07.16-.08h.08l-.08.08.08.07v.08h.39l.23.7-.31.63.47.54v.08l.15.16v.54l.31.08.08-.08.23-.08h.08V42l.47.31-.16.62.08.08.31-.08L28,43h.39l.07-.08.08-.16.24.08.31.08.15.08.31-.31.24-.08.15-.16v-.08H30l.31.08v.08l.08.16.24.15.07.08v.47l.08.31h.08l.16.08.62.23.08.08v.08l.07.15.08-.07.08.07h.62l.08-.07h.08l.08.07h.15l.08.08v.08h.08l-.08.08h-.08v.08H33v.23h.08v-.08h.15v-.08h.16v-.07l.16-.08v.08h.07v.15l.24.16-.16.15v.08l-.15.08h-.08v.08l-.16.15.08.08h.16l.07.08v.08l-.07.07v.08h-.08l-.08-.08h-.16V46l.08.08v.08h-.08v.07l.08.16h-.08v.08h-.07L33,46.35l-.08.23v.16l-.08.08v.07h.08L33,47v.08l-.08.16v.23l-.15.16-.08.15h-.08l-.15.31v.08h.15l.08-.08h.08l.08.08v.08l-.16.08v.15l-.16.16v.08l-.07.08.07.07-.07.08h-.24l-.08.08v.15l-.15.16v.08h-.08l-.08.08h-.08v.07h-.15l.08.08-.08.08v.47h.08v.15h.07v.08l.08.08H32v.08h.15l.08.08v.07l-.08.08.08.24v.15l-.15.23v.08h.15l.08-.08h.08l.08-.07v.07l.07.08h.08l.08-.08v-.07l.08-.08.15-.23h.16v.15l.08.16.07-.08.16.23h.08l.08-.08.07.08.16-.15v.23l.16-.16v-.07h.15l.16-.08v.23l.15.08v-.08h.16v.08l.16-.08.07-.08h.32l.07.08.16.08h.08v-.08h.23v-.15l.08-.16L35.5,51h-.07L35.35,51v-.08h-.08l-.08-.08v-.15l.08-.08.08.08.15.07.08-.15.08-.08V50.4h.08l-.08-.08v-.07l-.08-.08V50l.08-.08h.16l.07-.07H36v-.08h.08v.08l.16.07V49.7h.07v-.08l.08-.08v-.15l-.08-.08v.08l-.07-.16v-.15l.07-.08v-.08l.08-.08v-.07l-.08-.08H36v-.16l-.08.08-.07-.08-.24-.08v-.23l-.15-.08.07-.08h.08V48l.08-.32h-.47l-.07.08H35L35,47.67V47.6h-.08l-.15.07h-.08l-.08.08h-.08l-.08.08h-.07l-.08-.08.15-.15v-.24h-.07l-.08-.08v-.07h-.08v-.08H34.1v-.39L34,46.66,34,46.51h.31v-.08l.15-.08.08-.08v.08l.16.23.08.16v.08l.07-.08h.08v.08H35v-.08l.08-.08v-.08l.08-.07v-.16l.07-.08v-.08l.08-.07V46l.08-.08.15-.08.08-.08.16-.07h.08l.15-.16v-.08l.08-.08h.16l.07-.07v-.16l.08-.08h.16L36.6,45h.07V45h.16l.08-.08h.23l-.08-.08h.08l.08-.08-.31-.23h-.08l.47-.23-.16-.16-.47.23-.15.16h-.31V44.4l-.08-.08v-.54l-.08-.08.08-.08h.15l-.15-.31.15-.08.08-.15.31-.32v-.07l.08-.08.16-.24.08-.15v-.08l.07-.08v-.15l.08-.08v-.08h.24v-.08l.38-.39-.07-.23-.08-.16v-.07l.15-.16h-.23v-.08l.08-.46v-.24h.08l-.08-.15.08-.08v-.24l-.16-.31.08-.15-.08-.08v-.24l-.08-.15-.31-.16L37,37.86l-.16-.08-.16-.16-.07-.15v-.08h-.08l-.24-.16v-.31h.08v-.08l.08-.23v-.08l.08-.08v-.08l-.16-.07h-.15v-.08h-.16l-.39-.16L35.58,36v-.15l.08-.08-.08-.08v-.23h.16v-.08h-.08v-.15h-.08l-.23-.16L35.27,35H34.8v-.15l.08-.08.16-.08h.08l.07-.16v-.07h-.07v-.16h.07l-.07-.08H35V34l-.16-.16h-.15v-.07l.07-.08h.08l-.15-.08.15-.23H35v.07h.23l.16-.07h.08l.15-.16.08.08.16-.16h.07L35.82,33l.15-.15.24.23h.15l.31.08h.24l.08.08v-.39l-.16-.08h-.08v-.16l-.08-.15-.07-.08h-.24l.08-.08v-.08h.08l.08.08.31-.15.08.07h.07l.08.08.16.08v.08h-.16l.24.23.15.08h.16v-.08h.15l.08.08H38v-.08h.08v-.08l.07.08.24.08v.08l.08.15v.08l.15-.08h.24l.07.08H39l.08.08v.16h.23l.16.07h.08l-.08-.15.08.08-.08-.16V33.1l.08-.08h-.08V33H39.4l-.08-.08v-.24l.16.08h.08l.07.08h.08v.08h.16l.08-.08L40,33h.08l.08.07.08-.07.23-.08v-.16h.08l.08-.08h.15l.08-.07v-.08H41L41,32.4v.08h.08l.07-.08.16-.08.39-.15h.16v-.08l.31-.16h.07l.08-.08v.08h.16V32l.23.23.16-.07v-.08H43l.07-.08h.08v-.08l.08-.08h.08l.15-.23.08-.08v-.39l.16-.07h.15l.08-.16-.08-.08v-.23l-.23-.08h.08l-.47-.31-.08-.08L43.06,30l-.39-.15h-.31v-.31l.08-.08v-.16h.23l.32-.15v-.24h.07v-.07l.08-.32H44l.23-.23v-.08l.08-.39h.08v-.08l.23-.15v-.08l.24-.08h.23l.08-.15v-.08l.08-.08V27l.07-.07v-.24l.08-.08.16-.07.08.07H46l.23-.15V26.4L46,26.09,45.87,26v-.16h-.08v-.31l.08-.23v-.08H46v-.08H46V25l.07-.16v-.08l.16-.23v-.39l-.16-.31v-.16h-.23l-.16-.31-.15-.16v-.07L45.48,23v-.16l-.08-.15v-.08h-.15l-.08.16-.08.23-.16.08v.08h-.07l-.39-.08L44.31,23l-.23-.08h-.16l.08-.15H43l-.08-.08-.31-.16-.08-.07-.16-.08.08-.63-.16-.23-.15-.31h.08l.15.08h.16L42.6,21h.15l.16.08L43,21l-.47-.39v-.15l.08-.31v-.08l-.16-.16.08-.08h.08l.07-.07.08-.16H43l.07-.08h.39l.08.08.08-.08H44l.08-.08.08.08h.23l.15.08v.08h.55l.08-.08h.08l.07.08.08-.08v.08h.08l.23.08h.08l.16-.16v-.55l.08-.78V16.81l.23-.46-.08-.16v-.08l.16-.23.46-.78.32-.55.15-.62.08-.39.08-.08v-.07l-.16-.71ZM29,13.15v-.08h.07Zm-3.23,5.91h0l-.05,0ZM19.06,33.73v-.08h.08Zm6.51-14.5h0Zm-.12.09h.12v0h0l-.11,0h0l-.15.07.15-.07Zm-1.34-3.6h0ZM36.67,8.48V8.4h.08Zm.24-.08-.08-.08h.08Zm.31-.47.08-.08v.08Z"/><polygon points="15.01 33.26 15.09 33.26 15.09 33.18 15.01 33.26"/><polygon points="29.27 10.66 29.27 10.66 29.19 10.74 29.27 10.74 29.27 10.66"/><polygon points="28.49 12.53 28.34 12.53 28.41 12.61 28.49 12.61 28.57 12.53 28.73 12.29 28.49 12.53"/><polygon points="24.67 24.53 24.75 24.53 24.67 24.45 24.67 24.53"/><polygon points="27.12 23.59 27.24 23.52 27.09 23.59 27.12 23.59"/><polygon points="31.38 24.61 31.22 24.53 31.3 24.61 31.38 24.61"/><polygon points="10.64 37.31 10.64 37.47 10.72 37.47 10.72 37.62 10.8 37.62 10.88 37.7 10.96 37.7 11.11 37.85 11.19 37.78 11.19 37.85 11.11 37.85 11.11 37.85 11.11 37.85 11.27 38.01 11.27 38.17 11.19 38.24 11.27 38.32 11.27 38.4 11.35 38.24 11.42 38.24 11.5 38.09 11.58 38.01 11.89 37.93 12.05 37.93 12.13 38.01 12.44 38.01 12.44 37.93 12.67 37.93 12.83 38.09 12.98 38.09 13.06 37.93 13.22 37.93 13.29 37.85 13.29 37.62 13.22 37.62 13.22 37.54 13.14 37.47 13.06 37.31 13.06 37.23 12.98 37.15 12.83 37.15 12.83 37.08 12.67 37.08 12.52 37.15 12.44 37.08 12.28 37.08 12.13 37.15 12.05 37.23 11.89 37.15 11.74 37.23 11.66 37.23 11.58 37.31 11.5 37.31 11.42 37.23 11.35 37.23 11.27 37.15 11.11 37.15 11.11 37.08 11.04 37.08 11.04 37.15 10.57 37.31 10.64 37.31"/><polygon points="25.92 23.05 26 23.05 26.07 22.97 26.15 22.97 26.23 22.89 26.31 22.89 26.31 22.82 26.15 22.89 26 22.74 26 22.89 25.92 23.05"/><polygon points="32.54 20.71 32.54 20.63 32.62 20.63 32.7 20.55 32.62 20.48 32.39 20.48 32.39 20.55 32.47 20.55 32.47 20.63 32.54 20.71"/><polygon points="44.55 8.09 44.47 8.09 44.55 8.16 44.55 8.09"/><polygon points="26 22.74 26 22.74 26 22.74 26 22.74"/><polygon points="47.19 9.57 47.27 9.64 47.27 9.49 47.19 9.57"/><polygon points="23.97 40.82 24.05 40.74 23.89 40.74 23.97 40.82"/><path d="M16.72,41.36h-.07v-.15l-.08.07v-.15l-.08-.08h-.16l.08-.08h-.15v.08l-.08.08v.08l.08.07h.07v.16l-.07-.08-.08.08h.08l-.08.08h.08v.08l-.08-.08H16l.08.08v.07L16,41.52l-.08-.08h-.07l.07.08.08.08h-.08v-.08h-.07v-.16l-.16-.15h-.23v.07h.23l-.08.08v.08l.08-.08.08.08h-.08v.16h.08v.07h-.08l-.16-.31h-.07l-.24-.15v-.08h-.08v.08l-.31-.08-.07-.08V41l-.08-.08v-.07l-.08-.08.08-.08h-.08l-.08-.08v-.07h-.23l-.08-.08h-.16l-.07.15v.08h-.08v.39l-.08.08v-.08l-.08.08h-.08l-.23.08-.16.07-.07.08h-.08v.08H13v.08l-.07.08h-.32l-.07-.08h-.08v.08l-.08-.08v.15l-.08-.15v-.08h-.15v-.08h-.24v.24l-.15-.08v-.08l.07-.08h-.46v-.08l-.16-.15h-.08v-.08L11,41H10.8l-.15-.08h-.08l-.24-.07h-.07v-.08h-.08L10,40.66H9.94l-.15-.15H9.71l-.08-.08H9.55v-.08H9.09v.08H8.93l-.16.08H8.62l-.08.07H8.15v.08H8.07L8,40.74H7.84l-.08.08H7.68v.07l.08.08v.31l.08.08v.16l-.31.31.23.23H7.61v.08l.15.16v.08l-.08.07.08.08h.08l.08.16H8l.07.15.08-.08.08.08V43h.08l.08.08H8.7L9.32,43l-.08-.55-.08-.07.16-.08.08.08h.08V42.3h.15v-.08h.08l.16.16.07-.08-.07-.16.15-.08.08.08.16.08.07.08.16.08h.08V42.3h.15l.16.15H11l.07.08v.08h.24l.08.08v-.08l.31.08h.08l.07.15h.08v-.08l.16.16h.08V43l-.08.08v.54l.08.08h.07v-.08l.08.08h.55l.15-.16h.16v.16h-.08l-.08.08.08.08h.16l.15-.08h.08l-.08-.16.16-.08.08.16h.07v-.08h.16l.08-.08v-.07h.15l.08-.16h.08l.08-.08.15-.08h.08v.08h.08l.08-.08v.08h.15l.08-.08H15l.23-.23.31-.16.39-.31.08-.07.78-.94h-.08Zm-.78.39h-.07v-.08h.07Zm.32-.54v-.08l.07.08Zm.15,0v-.08h.08Z"/><polygon points="16.02 41.44 16.18 41.44 16.1 41.36 16.02 41.44"/><polygon points="16.33 41.36 16.26 41.28 16.18 41.28 16.18 41.21 16.1 41.21 16.1 41.13 15.94 41.13 15.94 41.28 16.02 41.36 16.1 41.36 16.26 41.36 16.33 41.36"/><polygon points="41.19 4.66 41.04 4.58 40.73 4.58 40.65 4.66 40.65 4.74 40.73 4.66 41.19 4.66"/><polygon points="29.58 20.63 29.19 19.96 29.19 20.01 29.58 20.63"/><polygon points="28.02 19 28.02 19 28.02 19 28.02 19"/><polygon points="27.95 19.07 27.87 19.15 28.02 19.15 28.09 19.02 28.02 19 27.95 19.07"/><polygon points="29.74 21.1 29.74 21.1 29.74 21.02 29.64 20.78 29.74 21.02 29.74 21.1"/><polygon points="29.64 20.78 29.58 20.63 29.58 20.63 29.58 20.63 29.64 20.78"/><polygon points="39.71 4.97 39.79 5.05 39.87 4.89 39.79 4.89 39.79 4.74 40.1 4.74 40.02 4.66 39.95 4.58 39.95 4.5 39.87 4.42 39.64 4.42 39.56 4.58 39.56 4.66 39.64 4.74 39.71 4.97"/><polygon points="28.09 19.02 28.57 19.23 28.1 19 28.09 19.02"/><polygon points="15.95 35.91 15.87 35.91 15.95 35.98 15.95 35.91"/><polygon points="28.57 19.23 28.65 19.31 29.04 19.7 28.65 19.31 28.57 19.23"/><polygon points="16.1 36.14 16.18 36.06 16.1 36.06 16.02 36.14 16.1 36.14"/><polygon points="11.27 35.91 11.27 35.98 11.43 35.98 11.5 36.06 11.58 35.98 11.74 35.91 11.89 35.91 12.05 35.83 12.13 35.67 12.2 35.67 12.2 35.6 12.28 35.52 12.52 35.52 12.59 35.6 12.59 35.75 12.83 35.83 12.83 35.91 12.9 35.83 13.06 35.91 13.14 36.06 13.14 36.22 13.22 36.22 13.22 36.38 13.29 36.45 13.22 36.61 13.29 36.61 13.3 36.61 13.29 36.61 13.45 36.53 13.3 36.61 13.37 36.61 13.53 36.69 13.69 36.69 13.76 36.61 13.84 36.77 14 36.92 14.54 36.92 14.54 36.84 14.7 36.84 14.78 36.77 14.93 36.69 15.01 36.77 15.09 36.69 15.16 36.69 15.24 36.53 15.32 36.45 15.4 36.45 15.4 36.38 15.48 36.38 15.48 36.3 15.48 36.22 15.4 36.14 15.4 36.06 15.32 36.06 15.32 35.98 15.24 35.98 15.01 35.83 14.85 35.75 14.54 35.75 14.54 35.6 14.46 35.44 14.31 35.28 14.23 35.21 14.23 35.05 14.15 34.97 13.92 34.97 13.84 34.9 13.69 34.97 13.45 34.97 13.45 34.9 13.37 34.82 13.29 34.74 13.14 34.82 12.59 34.82 12.36 34.74 12.05 34.74 11.97 34.82 11.66 34.9 11.5 34.9 11.35 34.97 11.19 35.13 11.11 35.28 11.11 35.67 11.19 35.83 11.27 35.91"/><polygon points="11.43 36.22 11.5 36.3 11.58 36.3 11.58 36.22 11.5 36.22 11.43 36.22"/><polygon points="12.67 34.58 12.59 34.66 12.59 34.82 12.67 34.66 12.67 34.58"/><polygon points="15.55 35.98 15.63 35.98 15.87 35.91 15.55 35.91 15.4 36.06 15.48 36.06 15.55 35.98"/><polygon points="16.02 35.98 16.1 36.06 16.1 35.83 16.02 35.83 15.95 35.91 16.02 35.91 16.02 35.98"/><polygon points="12.75 34.58 12.83 34.51 12.67 34.51 12.67 34.58 12.75 34.58 12.75 34.58"/><polygon points="29.43 21.26 29.58 21.18 29.66 21.1 29.5 21.18 29.43 21.26"/><polygon points="29.04 19.7 29.19 19.96 29.19 19.93 29.04 19.7"/><polygon points="29.35 21.72 29.27 21.72 29.27 21.88 29.35 21.72"/><polygon points="28.26 12.61 28.02 12.68 28.1 12.68 28.26 12.61"/><polygon points="12.83 34.58 12.75 34.58 12.75 34.66 12.83 34.58"/><polygon points="27.17 13.46 27.25 13.39 27.95 12.68 27.09 13.46 27.17 13.46"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/notification.svg b/packages/icons/src/svg/notification.svg
index b5c1bf516b..d2541b3f9d 100644
--- a/packages/icons/src/svg/notification.svg
+++ b/packages/icons/src/svg/notification.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="notification"><path d="M26.48,34.21l7.61-7.71a2.33,2.33,0,0,1,2.83-.22,2,2,0,0,1,.43,2.79l-8.7,12.86a2.7,2.7,0,0,1-1.73.85,2.75,2.75,0,0,1-1.75-.85l-6.3-8.36a1.91,1.91,0,0,1,0-2.57,2,2,0,0,1,2.61-.22Z"/><path d="M42.14,10.85h5.43a3.32,3.32,0,0,1,3.27,3.22V48.36a3.32,3.32,0,0,1-3.27,3.21H8.43a3.33,3.33,0,0,1-3.27-3.21V14.07a3.32,3.32,0,0,1,3.27-3.22h5.43V6.57c0-1.72,1.53-2.15,3.27-2.15s3.26.43,3.26,2.15v4.28H35.61V6.57c0-1.72,1.52-2.15,3.26-2.15s3.27.43,3.27,2.15v4.28ZM9.51,21.57V47.28h37V21.57Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="notification"><path d="M26.48,34.21l7.61-7.71a2.33,2.33,0,0,1,2.83-.22,2,2,0,0,1,.43,2.79l-8.7,12.86a2.7,2.7,0,0,1-1.73.85,2.75,2.75,0,0,1-1.75-.85l-6.3-8.36a1.91,1.91,0,0,1,0-2.57,2,2,0,0,1,2.61-.22Z"/><path d="M42.14,10.85h5.43a3.32,3.32,0,0,1,3.27,3.22V48.36a3.32,3.32,0,0,1-3.27,3.21H8.43a3.33,3.33,0,0,1-3.27-3.21V14.07a3.32,3.32,0,0,1,3.27-3.22h5.43V6.57c0-1.72,1.53-2.15,3.27-2.15s3.26.43,3.26,2.15v4.28H35.61V6.57c0-1.72,1.52-2.15,3.26-2.15s3.27.43,3.27,2.15v4.28ZM9.51,21.57V47.28h37V21.57Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/onderwijs_en_kinderopvang_noodopvang.svg b/packages/icons/src/svg/onderwijs_en_kinderopvang_noodopvang.svg
index f4eb3ed446..62432a5cfe 100644
--- a/packages/icons/src/svg/onderwijs_en_kinderopvang_noodopvang.svg
+++ b/packages/icons/src/svg/onderwijs_en_kinderopvang_noodopvang.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="onderwijs_en_kinderopvang_noodopvang.svg"><path d="M15.57,23.66c2.11-.47,3.05-2.35,2.58-4.69-.71-2.35-2.35-3.29-4.46-2.82-2.34.47-3,2.35-2.58,4.69C11.82,23.19,13.46,24.13,15.57,23.66Z"/><path d="M33.4,8.88a4.46,4.46,0,1,0-4.46,4.46A4.19,4.19,0,0,0,33.4,8.88Z"/><path d="M20.26,35.39a26.54,26.54,0,0,1-.47-6.34c3.75-2.58,4.93-6.57,4.22-10.79-.23-1.64-1.17-2.81-2.81-2.34,1.41,4.92.47,9.14-5.4,9.85-5.63.7-8.68-2.35-8.44-8C5.72,17.79,5,19.44,5,20.84c.24,4.22,2.82,7.27,6.81,8.68.23,5.63.46,6.57,2.58,12.67,0,0-1.41.94-2.35,1.41-1.64,1.17-2.35,2.81-1.41,4.45,1.41-.7,5.4-2.81,6.57-3.52.7-.23.94-.93.94-1.87,0-.47-.47-2.35-.71-4,.47.47,1.41.94,3.76,2.81,0,1.41-.24,3.29-.24,4.93,0,2.35.94,3.28,2.82,3.75,0,0,.7-6.33,1.17-9.61a2.54,2.54,0,0,0-.7-1.65C22.61,37.5,21.43,36.32,20.26,35.39Z"/><path d="M38.09,23.89A3.45,3.45,0,0,0,41.84,22,2.29,2.29,0,0,0,44,23c1.64-.47,1.41-1.64,3.28-1.17a.23.23,0,0,0,.24-.23A5,5,0,0,0,44,19.9a2.32,2.32,0,0,0-1.88.71c.24-2.35-.7-4-2.81-4.22-2.35-.47-3.75,1.17-4.22,3.28A3.69,3.69,0,0,0,38.09,23.89Z"/><path d="M45.36,29.76c-3.52-2.11-3-3.52-5.87-4.23-3.05-.7-5.16.71-7.27-3.28-.94-1.41-1.41-3.52-2.11-6.33-1.64.47-2.34,1.87-1.88,3.75.71,3.52,1.88,6.8,5.17,8.91a59.61,59.61,0,0,0-2.82,11.26c0,.47.23.94.7.94h1.65a8.9,8.9,0,0,0-.24,2.11,5.07,5.07,0,0,0,.24,1.88c.47,1.64,1.87,5.39,2.34,6.8,1.88-.7,2.35-1.88,1.88-4s-.94-3.75-.94-3.75L37.15,41h.7a13.18,13.18,0,0,0,.24,1.64A1.55,1.55,0,0,0,39,43.83c6.1,4,4.7,3.05,6.57,4.22,1.18-1.64.24-2.81-.94-4.22L42.78,42,40,41.48a.23.23,0,0,1-.23-.23h3.52c.47,0,.94-.47.7-.94L42.31,31.4A10.07,10.07,0,0,0,47.23,34c1.88.23,3.52,0,3.76-1.64A44.37,44.37,0,0,1,45.36,29.76Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="onderwijs_en_kinderopvang_noodopvang.svg"><path d="M15.57,23.66c2.11-.47,3.05-2.35,2.58-4.69-.71-2.35-2.35-3.29-4.46-2.82-2.34.47-3,2.35-2.58,4.69C11.82,23.19,13.46,24.13,15.57,23.66Z"/><path d="M33.4,8.88a4.46,4.46,0,1,0-4.46,4.46A4.19,4.19,0,0,0,33.4,8.88Z"/><path d="M20.26,35.39a26.54,26.54,0,0,1-.47-6.34c3.75-2.58,4.93-6.57,4.22-10.79-.23-1.64-1.17-2.81-2.81-2.34,1.41,4.92.47,9.14-5.4,9.85-5.63.7-8.68-2.35-8.44-8C5.72,17.79,5,19.44,5,20.84c.24,4.22,2.82,7.27,6.81,8.68.23,5.63.46,6.57,2.58,12.67,0,0-1.41.94-2.35,1.41-1.64,1.17-2.35,2.81-1.41,4.45,1.41-.7,5.4-2.81,6.57-3.52.7-.23.94-.93.94-1.87,0-.47-.47-2.35-.71-4,.47.47,1.41.94,3.76,2.81,0,1.41-.24,3.29-.24,4.93,0,2.35.94,3.28,2.82,3.75,0,0,.7-6.33,1.17-9.61a2.54,2.54,0,0,0-.7-1.65C22.61,37.5,21.43,36.32,20.26,35.39Z"/><path d="M38.09,23.89A3.45,3.45,0,0,0,41.84,22,2.29,2.29,0,0,0,44,23c1.64-.47,1.41-1.64,3.28-1.17a.23.23,0,0,0,.24-.23A5,5,0,0,0,44,19.9a2.32,2.32,0,0,0-1.88.71c.24-2.35-.7-4-2.81-4.22-2.35-.47-3.75,1.17-4.22,3.28A3.69,3.69,0,0,0,38.09,23.89Z"/><path d="M45.36,29.76c-3.52-2.11-3-3.52-5.87-4.23-3.05-.7-5.16.71-7.27-3.28-.94-1.41-1.41-3.52-2.11-6.33-1.64.47-2.34,1.87-1.88,3.75.71,3.52,1.88,6.8,5.17,8.91a59.61,59.61,0,0,0-2.82,11.26c0,.47.23.94.7.94h1.65a8.9,8.9,0,0,0-.24,2.11,5.07,5.07,0,0,0,.24,1.88c.47,1.64,1.87,5.39,2.34,6.8,1.88-.7,2.35-1.88,1.88-4s-.94-3.75-.94-3.75L37.15,41h.7a13.18,13.18,0,0,0,.24,1.64A1.55,1.55,0,0,0,39,43.83c6.1,4,4.7,3.05,6.57,4.22,1.18-1.64.24-2.81-.94-4.22L42.78,42,40,41.48a.23.23,0,0,1-.23-.23h3.52c.47,0,.94-.47.7-.94L42.31,31.4A10.07,10.07,0,0,0,47.23,34c1.88.23,3.52,0,3.76-1.64A44.37,44.37,0,0,1,45.36,29.76Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/onderwijs_en_kinderopvang_op_afstand.svg b/packages/icons/src/svg/onderwijs_en_kinderopvang_op_afstand.svg
index 3f6c59cf02..9902953a44 100644
--- a/packages/icons/src/svg/onderwijs_en_kinderopvang_op_afstand.svg
+++ b/packages/icons/src/svg/onderwijs_en_kinderopvang_op_afstand.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="onderwijs_en_kinderopvang_op_afstand"><polygon points="33.02 20.57 22.79 18.21 28.3 26.61 29.35 24.25 32.76 26.35 34.07 24.25 30.66 22.15 33.02 20.57"/><path d="M51.12,39.2,46.4,31.86l-1-19.16a2.82,2.82,0,0,0-2.62-2.62H13.08a2.63,2.63,0,0,0-2.62,2.62L9.67,31.86l-5,7.34c-.27.26-.27.79-.27,1.31v3.68A1.79,1.79,0,0,0,6.26,46H49.81a1.79,1.79,0,0,0,1.84-1.83V40.51A2,2,0,0,0,51.12,39.2Zm-29.38.53,1.84-3.41h8.65l1.84,3.41Zm23.61-7.87H10.72a.26.26,0,0,1,.26-.27,22.3,22.3,0,0,0,2.36-.78l.79-17.32H42.2L43,30.81a20.45,20.45,0,0,1,2.36.78Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="onderwijs_en_kinderopvang_op_afstand"><polygon points="33.02 20.57 22.79 18.21 28.3 26.61 29.35 24.25 32.76 26.35 34.07 24.25 30.66 22.15 33.02 20.57"/><path d="M51.12,39.2,46.4,31.86l-1-19.16a2.82,2.82,0,0,0-2.62-2.62H13.08a2.63,2.63,0,0,0-2.62,2.62L9.67,31.86l-5,7.34c-.27.26-.27.79-.27,1.31v3.68A1.79,1.79,0,0,0,6.26,46H49.81a1.79,1.79,0,0,0,1.84-1.83V40.51A2,2,0,0,0,51.12,39.2Zm-29.38.53,1.84-3.41h8.65l1.84,3.41Zm23.61-7.87H10.72a.26.26,0,0,1,.26-.27,22.3,22.3,0,0,0,2.36-.78l.79-17.32H42.2L43,30.81a20.45,20.45,0,0,1,2.36.78Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/ontmoetingen_bezoek.svg b/packages/icons/src/svg/ontmoetingen_bezoek.svg
index cf1dc72ef9..8bad556144 100644
--- a/packages/icons/src/svg/ontmoetingen_bezoek.svg
+++ b/packages/icons/src/svg/ontmoetingen_bezoek.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="ontmoetingen_bezoek"><path d="M28.6,26.4v10H22.47A14.21,14.21,0,0,1,28.6,26.4Z"/><path d="M28.28,6.09,50.52,27a1.7,1.7,0,0,1,.64,1.29v1.29a.85.85,0,0,1-1,1H46.33V50.25H9.26V30.59H5.39a.86.86,0,0,1-1-1V28.33A1.71,1.71,0,0,1,5.07,27L27,6.09A1,1,0,0,1,28.28,6.09Zm6.77,30.3H32.47V22.85H28.6c-5.48,2.58-8.7,8.06-9.67,14.19l1,2.57h8.7v5.81h3.87V39.61h2.58Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="ontmoetingen_bezoek"><path d="M28.6,26.4v10H22.47A14.21,14.21,0,0,1,28.6,26.4Z"/><path d="M28.28,6.09,50.52,27a1.7,1.7,0,0,1,.64,1.29v1.29a.85.85,0,0,1-1,1H46.33V50.25H9.26V30.59H5.39a.86.86,0,0,1-1-1V28.33A1.71,1.71,0,0,1,5.07,27L27,6.09A1,1,0,0,1,28.28,6.09Zm6.77,30.3H32.47V22.85H28.6c-5.48,2.58-8.7,8.06-9.67,14.19l1,2.57h8.7v5.81h3.87V39.61h2.58Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/openbaar_vervoer.svg b/packages/icons/src/svg/openbaar_vervoer.svg
index cc7c87c267..e898dbf6a4 100644
--- a/packages/icons/src/svg/openbaar_vervoer.svg
+++ b/packages/icons/src/svg/openbaar_vervoer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="openbaar_vervoer"><path d="M10.19,10.1h-5a.82.82,0,0,0-.83.83v7.44a.83.83,0,0,0,.24.58.83.83,0,0,0,.59.25H6.87V44.82H8.53V19.2h1.66a.71.71,0,0,0,.32-.07.68.68,0,0,0,.26-.18.71.71,0,0,0,.18-.27.65.65,0,0,0,.05-.31V10.93a.83.83,0,0,0-.23-.58A.88.88,0,0,0,10.19,10.1Z"/><path d="M41.2,34.9H35.39a1.29,1.29,0,0,0-.89.36,1.27,1.27,0,0,0-.36.88,1.25,1.25,0,0,0,1.25,1.25H41.2a1.23,1.23,0,0,0,.88-.37,1.25,1.25,0,0,0,.36-.88A1.23,1.23,0,0,0,41.2,34.9Z"/><path d="M30.82,23.9h-.08a10.67,10.67,0,0,0-4.77,0c-2.74.66-2.57,5-2.57,8.79a1.75,1.75,0,0,0,.47,1.19,1.72,1.72,0,0,0,1.17.51v-4a12.65,12.65,0,0,1,.34-3.25c0-.17.17-.13.17-.13V44.77a2.25,2.25,0,0,0,2.27-2.21s.32-8.32.32-8.4a.2.2,0,0,1,.07-.16.23.23,0,0,1,.16-.06.25.25,0,0,1,.16.06.23.23,0,0,1,.06.16l.32,8.34a2.19,2.19,0,0,0,.18.87,2.23,2.23,0,0,0,.49.73,2.21,2.21,0,0,0,.73.48,2.36,2.36,0,0,0,.87.17V27.05a.22.22,0,0,1,.19.13,13,13,0,0,1,.39,3.23v4a1.72,1.72,0,0,0,1.17-.51,1.66,1.66,0,0,0,.47-1.19C33.4,28.92,33.57,24.54,30.82,23.9Z"/><path d="M29.24,22.55A2.29,2.29,0,0,0,30,22a2.12,2.12,0,0,0,.44-.77,2.21,2.21,0,0,0,.09-.88c0-1.57-.81-2.42-2.13-2.42a2.16,2.16,0,0,0-2.14,2.42,2.06,2.06,0,0,0,2.14,2.32A2.2,2.2,0,0,0,29.24,22.55ZM27,21l.92-.36a1.53,1.53,0,0,1,1,0l.92.36a1.34,1.34,0,0,1-.5.81,1.73,1.73,0,0,1-1.84,0A1.28,1.28,0,0,1,27,21Z"/><path d="M51.33,12a.83.83,0,0,0-.58-.24v0H15.14a.83.83,0,0,0-.59.25.78.78,0,0,0-.24.58v1.66a.82.82,0,0,0,.83.83h5.77c0,.12,0,.27-.24.31l-1.4.3V44.82h2.49V15.06H44.14V44.82h2.47V15.06h4.14a.85.85,0,0,0,.58-.23.88.88,0,0,0,.25-.58V12.61A.83.83,0,0,0,51.33,12Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="openbaar_vervoer"><path d="M10.19,10.1h-5a.82.82,0,0,0-.83.83v7.44a.83.83,0,0,0,.24.58.83.83,0,0,0,.59.25H6.87V44.82H8.53V19.2h1.66a.71.71,0,0,0,.32-.07.68.68,0,0,0,.26-.18.71.71,0,0,0,.18-.27.65.65,0,0,0,.05-.31V10.93a.83.83,0,0,0-.23-.58A.88.88,0,0,0,10.19,10.1Z"/><path d="M41.2,34.9H35.39a1.29,1.29,0,0,0-.89.36,1.27,1.27,0,0,0-.36.88,1.25,1.25,0,0,0,1.25,1.25H41.2a1.23,1.23,0,0,0,.88-.37,1.25,1.25,0,0,0,.36-.88A1.23,1.23,0,0,0,41.2,34.9Z"/><path d="M30.82,23.9h-.08a10.67,10.67,0,0,0-4.77,0c-2.74.66-2.57,5-2.57,8.79a1.75,1.75,0,0,0,.47,1.19,1.72,1.72,0,0,0,1.17.51v-4a12.65,12.65,0,0,1,.34-3.25c0-.17.17-.13.17-.13V44.77a2.25,2.25,0,0,0,2.27-2.21s.32-8.32.32-8.4a.2.2,0,0,1,.07-.16.23.23,0,0,1,.16-.06.25.25,0,0,1,.16.06.23.23,0,0,1,.06.16l.32,8.34a2.19,2.19,0,0,0,.18.87,2.23,2.23,0,0,0,.49.73,2.21,2.21,0,0,0,.73.48,2.36,2.36,0,0,0,.87.17V27.05a.22.22,0,0,1,.19.13,13,13,0,0,1,.39,3.23v4a1.72,1.72,0,0,0,1.17-.51,1.66,1.66,0,0,0,.47-1.19C33.4,28.92,33.57,24.54,30.82,23.9Z"/><path d="M29.24,22.55A2.29,2.29,0,0,0,30,22a2.12,2.12,0,0,0,.44-.77,2.21,2.21,0,0,0,.09-.88c0-1.57-.81-2.42-2.13-2.42a2.16,2.16,0,0,0-2.14,2.42,2.06,2.06,0,0,0,2.14,2.32A2.2,2.2,0,0,0,29.24,22.55ZM27,21l.92-.36a1.53,1.53,0,0,1,1,0l.92.36a1.34,1.34,0,0,1-.5.81,1.73,1.73,0,0,1-1.84,0A1.28,1.28,0,0,1,27,21Z"/><path d="M51.33,12a.83.83,0,0,0-.58-.24v0H15.14a.83.83,0,0,0-.59.25.78.78,0,0,0-.24.58v1.66a.82.82,0,0,0,.83.83h5.77c0,.12,0,.27-.24.31l-1.4.3V44.82h2.49V15.06H44.14V44.82h2.47V15.06h4.14a.85.85,0,0,0,.58-.23.88.88,0,0,0,.25-.58V12.61A.83.83,0,0,0,51.33,12Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/openingstijden.svg b/packages/icons/src/svg/openingstijden.svg
index 1c19135c8e..2babcf9489 100644
--- a/packages/icons/src/svg/openingstijden.svg
+++ b/packages/icons/src/svg/openingstijden.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="openingstijden"><path d="M40.61,27.74l-10.46-1-.82-11.5a1.49,1.49,0,0,0-1.49-1.39,1.43,1.43,0,0,0-.54.09,1.35,1.35,0,0,0-.47.3,1.47,1.47,0,0,0-.32.46,1.25,1.25,0,0,0-.12.54l-1,13.52a2.44,2.44,0,0,0,2.18,2.44l13-.92c.85,0,1.48-.44,1.48-1.23S41.53,27.81,40.61,27.74Z"/><path d="M44.66,11.32A23.59,23.59,0,1,0,51.57,28,23.55,23.55,0,0,0,44.66,11.32ZM40.54,40.5A17.73,17.73,0,1,1,45.73,28,17.77,17.77,0,0,1,40.54,40.5Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="openingstijden"><path d="M40.61,27.74l-10.46-1-.82-11.5a1.49,1.49,0,0,0-1.49-1.39,1.43,1.43,0,0,0-.54.09,1.35,1.35,0,0,0-.47.3,1.47,1.47,0,0,0-.32.46,1.25,1.25,0,0,0-.12.54l-1,13.52a2.44,2.44,0,0,0,2.18,2.44l13-.92c.85,0,1.48-.44,1.48-1.23S41.53,27.81,40.61,27.74Z"/><path d="M44.66,11.32A23.59,23.59,0,1,0,51.57,28,23.55,23.55,0,0,0,44.66,11.32ZM40.54,40.5A17.73,17.73,0,1,1,45.73,28,17.77,17.77,0,0,1,40.54,40.5Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/other.svg b/packages/icons/src/svg/other.svg
index 261c62bea9..55db279f7f 100644
--- a/packages/icons/src/svg/other.svg
+++ b/packages/icons/src/svg/other.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="other"><path d="M10.66,21.76A6.24,6.24,0,1,0,16.91,28,6.22,6.22,0,0,0,10.66,21.76Z"/><path d="M45.34,21.76A6.24,6.24,0,1,0,51.58,28,6.22,6.22,0,0,0,45.34,21.76Z"/><path d="M28,21.76A6.24,6.24,0,1,0,34.24,28,6.21,6.21,0,0,0,28,21.76Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="other"><path d="M10.66,21.76A6.24,6.24,0,1,0,16.91,28,6.22,6.22,0,0,0,10.66,21.76Z"/><path d="M45.34,21.76A6.24,6.24,0,1,0,51.58,28,6.22,6.22,0,0,0,45.34,21.76Z"/><path d="M28,21.76A6.24,6.24,0,1,0,34.24,28,6.21,6.21,0,0,0,28,21.76Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/overige.svg b/packages/icons/src/svg/overige.svg
index 786068cb23..a77f6a2ee3 100644
--- a/packages/icons/src/svg/overige.svg
+++ b/packages/icons/src/svg/overige.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="overige"><path d="M34.21,12.21a1.4,1.4,0,0,0,1.8-.66L38.44,7a1.36,1.36,0,0,0-.63-1.88l-1.3-.56a1.27,1.27,0,0,0-1.72.87l-1.41,5A1.52,1.52,0,0,0,34.21,12.21Z"/><path d="M20.16,20.61h0a1,1,0,0,1,.77-.95A26.52,26.52,0,0,1,28,18.61a26.1,26.1,0,0,1,7.06,1.05,1,1,0,0,1,.77.94l.1,1.28c-10-1.79-13.17.07-13.17.07l-.45,5.56a5.55,5.55,0,0,1,6.14-1,6.12,6.12,0,0,0,0,11,5.54,5.54,0,0,1-2.34.51,5.68,5.68,0,0,1-4.47-2.21l-.48,6H40.82L39.24,20.34A4.59,4.59,0,0,0,36,16.22a30.78,30.78,0,0,0-8-1.12,30.87,30.87,0,0,0-8,1.12,4.59,4.59,0,0,0-3.3,4.12L15.17,41.79h3.42Z"/><path d="M20,11.54a1.4,1.4,0,0,0,1.8.66,1.49,1.49,0,0,0,.83-1.79l-1.4-5a1.27,1.27,0,0,0-1.72-.87l-1.3.57A1.35,1.35,0,0,0,17.56,7Z"/><path d="M50.13,18.91h0l-.53-1.35a1.27,1.27,0,0,0-1.81-.66l-4.4,2.52a1.51,1.51,0,0,0-.63,1.87,1.41,1.41,0,0,0,1.72.87L49.3,20.7A1.36,1.36,0,0,0,50.13,18.91Z"/><path d="M13.25,21.29a1.51,1.51,0,0,0-.63-1.87l-4.4-2.53a1.27,1.27,0,0,0-1.81.66L5.87,18.9a1.35,1.35,0,0,0,.83,1.79l4.83,1.46A1.4,1.4,0,0,0,13.25,21.29Z"/><path d="M42.64,47.33c-.6-.18-1.21-.33-1.82-.47V43.57H15.17v3.29c-.64.16-1.28.32-1.82.47-2.36.67-1.89,4.24,0,4.24H42.61C44.54,51.57,45,48,42.64,47.33Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="overige"><path d="M34.21,12.21a1.4,1.4,0,0,0,1.8-.66L38.44,7a1.36,1.36,0,0,0-.63-1.88l-1.3-.56a1.27,1.27,0,0,0-1.72.87l-1.41,5A1.52,1.52,0,0,0,34.21,12.21Z"/><path d="M20.16,20.61h0a1,1,0,0,1,.77-.95A26.52,26.52,0,0,1,28,18.61a26.1,26.1,0,0,1,7.06,1.05,1,1,0,0,1,.77.94l.1,1.28c-10-1.79-13.17.07-13.17.07l-.45,5.56a5.55,5.55,0,0,1,6.14-1,6.12,6.12,0,0,0,0,11,5.54,5.54,0,0,1-2.34.51,5.68,5.68,0,0,1-4.47-2.21l-.48,6H40.82L39.24,20.34A4.59,4.59,0,0,0,36,16.22a30.78,30.78,0,0,0-8-1.12,30.87,30.87,0,0,0-8,1.12,4.59,4.59,0,0,0-3.3,4.12L15.17,41.79h3.42Z"/><path d="M20,11.54a1.4,1.4,0,0,0,1.8.66,1.49,1.49,0,0,0,.83-1.79l-1.4-5a1.27,1.27,0,0,0-1.72-.87l-1.3.57A1.35,1.35,0,0,0,17.56,7Z"/><path d="M50.13,18.91h0l-.53-1.35a1.27,1.27,0,0,0-1.81-.66l-4.4,2.52a1.51,1.51,0,0,0-.63,1.87,1.41,1.41,0,0,0,1.72.87L49.3,20.7A1.36,1.36,0,0,0,50.13,18.91Z"/><path d="M13.25,21.29a1.51,1.51,0,0,0-.63-1.87l-4.4-2.53a1.27,1.27,0,0,0-1.81.66L5.87,18.9a1.35,1.35,0,0,0,.83,1.79l4.83,1.46A1.4,1.4,0,0,0,13.25,21.29Z"/><path d="M42.64,47.33c-.6-.18-1.21-.33-1.82-.47V43.57H15.17v3.29c-.64.16-1.28.32-1.82.47-2.36.67-1.89,4.24,0,4.24H42.61C44.54,51.57,45,48,42.64,47.33Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/phone.svg b/packages/icons/src/svg/phone.svg
index ae24d49fcc..0c4b89c67b 100644
--- a/packages/icons/src/svg/phone.svg
+++ b/packages/icons/src/svg/phone.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="phone"><path d="M38.62,5.21a71.53,71.53,0,0,0-21.17,0A3.93,3.93,0,0,0,14.25,9V47a4,4,0,0,0,3.27,3.76,71.06,71.06,0,0,0,21.1,0A3.85,3.85,0,0,0,41.75,47V9A3.86,3.86,0,0,0,38.62,5.21ZM28,48.88a2.5,2.5,0,1,1,2.43-2.5A2.47,2.47,0,0,1,28,48.88ZM38.08,41.2H17.92V11H38.08Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="phone"><path d="M38.62,5.21a71.53,71.53,0,0,0-21.17,0A3.93,3.93,0,0,0,14.25,9V47a4,4,0,0,0,3.27,3.76,71.06,71.06,0,0,0,21.1,0A3.85,3.85,0,0,0,41.75,47V9A3.86,3.86,0,0,0,38.62,5.21ZM28,48.88a2.5,2.5,0,1,1,2.43-2.5A2.47,2.47,0,0,1,28,48.88ZM38.08,41.2H17.92V11H38.08Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/recreatie.svg b/packages/icons/src/svg/recreatie.svg
index 1143b5187a..90aefa7b88 100644
--- a/packages/icons/src/svg/recreatie.svg
+++ b/packages/icons/src/svg/recreatie.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="recreatie"><path d="M15.52,40.57a2.8,2.8,0,0,1,3.12,2.86c0-1.3,1-2.6,3.12-2.6s3.12,1.3,3.12,2.6c0-1.3,1-2.6,3.12-2.6s3.12,1.3,3.12,2.6c0-1.3,1-2.6,3.12-2.6h.26C36.84,32,40,16.13,40,16.13s2.6.78,4.16,1.3c1.82.52,3.64-1,1.56-3.64a51.13,51.13,0,0,0-4.94-5.21,5.14,5.14,0,0,0-1.94-.91l-.4-.13L37.36,6a.36.36,0,0,1,.13-.26.32.32,0,0,0,.13-.26,1,1,0,1,0-2.08,0c0,.52.26.78.78,1l.52,1.56c-.26,0-.52,0-.52.26a8.85,8.85,0,0,0-2.6-.26c-.78,0-1.3,0-1.56.52-.78,1.3,1.82,2.6,2.86,2.87-.29.91-.64,2.07-1,3.38-1.4,4.64-3.39,11.2-5.21,15.86-1.11,2.78-4.09,4.08-7.21,5.44-2.71,1.18-5.54,2.41-7.35,4.7a1.83,1.83,0,0,0,.43-.09A3,3,0,0,1,15.52,40.57Zm25-29.65a.84.84,0,0,1,.78.79.78.78,0,1,1-1.56,0A.69.69,0,0,1,40.48,10.92Z"/><path d="M46.2,42.13c-.78,0-1.56.26-1.56,1V45H41.52V43.43c0-.78-.78-1-1.56-1s-1.56.26-1.56,1v1.82H35.28V43.43c0-.78-.78-1-1.56-1s-1.3,0-1.3,1v1.82H29.3V43.43c0-.78-.78-1-1.56-1s-1.56.26-1.56,1v1.82H23.06V43.43c0-.78-.78-1-1.56-1s-1.56,0-1.56,1v1.82H17.08V43.43c0-.78-.78-1-1.56-1s-1.56.26-1.56,1v1.82H10.84V43.43c0-.78-.78-1-1.56-1-.79-.26-1.57,0-1.57,1V51.5h3.13V48.37H14V51.5h3.12V48.37H20.2V51.5h3.12V48.37h3.12V51.5h3.12V48.37h3.12V51.5H35.8V48.37h3.12V51.5H42V48.37h3.12V51.5h3.13V43.43A2,2,0,0,0,46.2,42.13Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="recreatie"><path d="M15.52,40.57a2.8,2.8,0,0,1,3.12,2.86c0-1.3,1-2.6,3.12-2.6s3.12,1.3,3.12,2.6c0-1.3,1-2.6,3.12-2.6s3.12,1.3,3.12,2.6c0-1.3,1-2.6,3.12-2.6h.26C36.84,32,40,16.13,40,16.13s2.6.78,4.16,1.3c1.82.52,3.64-1,1.56-3.64a51.13,51.13,0,0,0-4.94-5.21,5.14,5.14,0,0,0-1.94-.91l-.4-.13L37.36,6a.36.36,0,0,1,.13-.26.32.32,0,0,0,.13-.26,1,1,0,1,0-2.08,0c0,.52.26.78.78,1l.52,1.56c-.26,0-.52,0-.52.26a8.85,8.85,0,0,0-2.6-.26c-.78,0-1.3,0-1.56.52-.78,1.3,1.82,2.6,2.86,2.87-.29.91-.64,2.07-1,3.38-1.4,4.64-3.39,11.2-5.21,15.86-1.11,2.78-4.09,4.08-7.21,5.44-2.71,1.18-5.54,2.41-7.35,4.7a1.83,1.83,0,0,0,.43-.09A3,3,0,0,1,15.52,40.57Zm25-29.65a.84.84,0,0,1,.78.79.78.78,0,1,1-1.56,0A.69.69,0,0,1,40.48,10.92Z"/><path d="M46.2,42.13c-.78,0-1.56.26-1.56,1V45H41.52V43.43c0-.78-.78-1-1.56-1s-1.56.26-1.56,1v1.82H35.28V43.43c0-.78-.78-1-1.56-1s-1.3,0-1.3,1v1.82H29.3V43.43c0-.78-.78-1-1.56-1s-1.56.26-1.56,1v1.82H23.06V43.43c0-.78-.78-1-1.56-1s-1.56,0-1.56,1v1.82H17.08V43.43c0-.78-.78-1-1.56-1s-1.56.26-1.56,1v1.82H10.84V43.43c0-.78-.78-1-1.56-1-.79-.26-1.57,0-1.57,1V51.5h3.13V48.37H14V51.5h3.12V48.37H20.2V51.5h3.12V48.37h3.12V51.5h3.12V48.37h3.12V51.5H35.8V48.37h3.12V51.5H42V48.37h3.12V51.5h3.13V43.43A2,2,0,0,0,46.2,42.13Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/reizen.svg b/packages/icons/src/svg/reizen.svg
index 4f88b308cf..7aa18fdc7d 100644
--- a/packages/icons/src/svg/reizen.svg
+++ b/packages/icons/src/svg/reizen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="reizen"><path d="M51,19.06A4.47,4.47,0,0,0,46.57,15H35.64V11.2a3.52,3.52,0,0,0-3.75-4.1H24a3.88,3.88,0,0,0-3.76,4.1v4.1H9.35a4.72,4.72,0,0,0-4.44,4.1c-.35,8.19-.35,16.73,0,25.27a4.47,4.47,0,0,0,4.44,4.1H46.91a4.72,4.72,0,0,0,4.44-4.1A214.56,214.56,0,0,0,51,19.06ZM18.23,30.33l-5.81-3.08,3.76-7.51,4.09-.68L22,22.81ZM31.89,15H24V11.2h7.86Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="reizen"><path d="M51,19.06A4.47,4.47,0,0,0,46.57,15H35.64V11.2a3.52,3.52,0,0,0-3.75-4.1H24a3.88,3.88,0,0,0-3.76,4.1v4.1H9.35a4.72,4.72,0,0,0-4.44,4.1c-.35,8.19-.35,16.73,0,25.27a4.47,4.47,0,0,0,4.44,4.1H46.91a4.72,4.72,0,0,0,4.44-4.1A214.56,214.56,0,0,0,51,19.06ZM18.23,30.33l-5.81-3.08,3.76-7.51,4.09-.68L22,22.81ZM31.89,15H24V11.2h7.86Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/reproductie_graf.svg b/packages/icons/src/svg/reproductie_graf.svg
index ac0d4a087c..304b16f72d 100644
--- a/packages/icons/src/svg/reproductie_graf.svg
+++ b/packages/icons/src/svg/reproductie_graf.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="reproductie_graf"><path d="M48.88,28.26a9.44,9.44,0,0,0-6.8-2.54,9.79,9.79,0,0,0-7,2.94,10.3,10.3,0,0,0-3,7.8q0,4.92,2.65,7.45a9.7,9.7,0,0,0,6.84,2.49,9.86,9.86,0,0,0,7-2.9,10.31,10.31,0,0,0,3-7.8Q51.58,30.8,48.88,28.26Zm-2.33,7.56a6.84,6.84,0,0,1-1.41,4.63,4.23,4.23,0,0,1-3.34,1.61,4.54,4.54,0,0,1-3.46-1.41,6.39,6.39,0,0,1-1.28-4.35,6.85,6.85,0,0,1,1.36-4.62,4.54,4.54,0,0,1,6.8-.16,6,6,0,0,1,1.33,4.3Z"/><path d="M25.29,24.79A10.62,10.62,0,0,0,26.9,19a8.23,8.23,0,0,0-3.17-6.63Q20.61,9.7,14.28,9.7H4.42v33H11V30.37h3.87L22,42.69h7.69L21,28.51A10.25,10.25,0,0,0,25.29,24.79Zm-6.79-1a5.65,5.65,0,0,1-4.12,1.51H10.86V14.88h3c2.21,0,3.8.4,4.77,1.21a4.4,4.4,0,0,1,1.46,3.62A5.39,5.39,0,0,1,18.5,23.78Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="reproductie_graf"><path d="M48.88,28.26a9.44,9.44,0,0,0-6.8-2.54,9.79,9.79,0,0,0-7,2.94,10.3,10.3,0,0,0-3,7.8q0,4.92,2.65,7.45a9.7,9.7,0,0,0,6.84,2.49,9.86,9.86,0,0,0,7-2.9,10.31,10.31,0,0,0,3-7.8Q51.58,30.8,48.88,28.26Zm-2.33,7.56a6.84,6.84,0,0,1-1.41,4.63,4.23,4.23,0,0,1-3.34,1.61,4.54,4.54,0,0,1-3.46-1.41,6.39,6.39,0,0,1-1.28-4.35,6.85,6.85,0,0,1,1.36-4.62,4.54,4.54,0,0,1,6.8-.16,6,6,0,0,1,1.33,4.3Z"/><path d="M25.29,24.79A10.62,10.62,0,0,0,26.9,19a8.23,8.23,0,0,0-3.17-6.63Q20.61,9.7,14.28,9.7H4.42v33H11V30.37h3.87L22,42.69h7.69L21,28.51A10.25,10.25,0,0,0,25.29,24.79Zm-6.79-1a5.65,5.65,0,0,1-4.12,1.51H10.86V14.88h3c2.21,0,3.8.4,4.77,1.21a4.4,4.4,0,0,1,1.46,3.62A5.39,5.39,0,0,1,18.5,23.78Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/reproductiegetal.svg b/packages/icons/src/svg/reproductiegetal.svg
index f0c0155b1e..c245c73452 100644
--- a/packages/icons/src/svg/reproductiegetal.svg
+++ b/packages/icons/src/svg/reproductiegetal.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="reproductiegetal"><path d="M33.37,31.3a14.12,14.12,0,0,0,6-5.32,15.5,15.5,0,0,0,2.21-8.33,11.94,11.94,0,0,0-4.36-9.49c-2.86-2.49-7.21-3.74-13-3.74H10.58V51.57h9V34h5.34l9.9,17.61h10.6ZM30,24.55a7.68,7.68,0,0,1-5.68,2.15H19.44V11.83h4.09q4.57,0,6.58,1.72a6.46,6.46,0,0,1,2,5.18A7.86,7.86,0,0,1,30,24.55Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="reproductiegetal"><path d="M33.37,31.3a14.12,14.12,0,0,0,6-5.32,15.5,15.5,0,0,0,2.21-8.33,11.94,11.94,0,0,0-4.36-9.49c-2.86-2.49-7.21-3.74-13-3.74H10.58V51.57h9V34h5.34l9.9,17.61h10.6ZM30,24.55a7.68,7.68,0,0,1-5.68,2.15H19.44V11.83h4.09q4.57,0,6.58,1.72a6.46,6.46,0,0,1,2,5.18A7.86,7.86,0,0,1,30,24.55Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/rioolvirus.svg b/packages/icons/src/svg/rioolvirus.svg
index f34689b48d..10ffb0b853 100644
--- a/packages/icons/src/svg/rioolvirus.svg
+++ b/packages/icons/src/svg/rioolvirus.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="rioolvirus"><path d="M12.32,15a10.47,10.47,0,0,0,5.23,1.7A10.54,10.54,0,0,0,22.79,15,10.47,10.47,0,0,0,28,16.7,10.51,10.51,0,0,0,33.26,15a10.54,10.54,0,0,0,5.24,1.7A10.47,10.47,0,0,0,43.73,15,10.54,10.54,0,0,0,49,16.7a8.41,8.41,0,0,0,2.58-.45V12.41a6.29,6.29,0,0,1-2.58.72c-2,0-4.1-1.62-5.1-2.41l-.14-.11-.16.13c-1,.76-3,2.39-5.07,2.39s-4.1-1.62-5.11-2.41l-.13-.11-.16.13c-1,.76-3,2.39-5.08,2.39s-4.1-1.62-5.1-2.41l-.13-.11-.17.13c-1,.76-3,2.39-5.07,2.39s-4.1-1.62-5.1-2.41l-.13-.11-.17.13c-1,.76-3,2.39-5.07,2.39a6.31,6.31,0,0,1-2.66-.76v3.86a8.64,8.64,0,0,0,2.66.47A10.54,10.54,0,0,0,12.32,15Z"/><path d="M28.89,33.1l2.64-4.77A6.75,6.75,0,0,1,28,29.58c-2.05,0-4.1-1.62-5.1-2.41l-.13-.1-.17.13c-1,.76-3,2.38-5.07,2.38s-4.1-1.62-5.1-2.41l-.13-.1-.17.13c-1,.76-3,2.38-5.07,2.38a6.17,6.17,0,0,1-2.66-.76v3.86a8.36,8.36,0,0,0,2.66.48,10.54,10.54,0,0,0,5.24-1.71,10.47,10.47,0,0,0,5.23,1.71,10.54,10.54,0,0,0,5.24-1.71A10.47,10.47,0,0,0,28,33.16,8.29,8.29,0,0,0,28.89,33.1Z"/><path d="M49,29.55a6.86,6.86,0,0,1-3.56-1.28l2.7,4.8a6.22,6.22,0,0,0,.86.06,8.47,8.47,0,0,0,2.58-.45V28.83A6.18,6.18,0,0,1,49,29.55Z"/><path d="M43.81,18.94l-.14-.1-.13.1a14,14,0,0,1-3,1.92A4.4,4.4,0,0,1,42,22.42l.74,1.31c.33-.17.63-.35.89-.51a10.54,10.54,0,0,0,5.24,1.71,8.41,8.41,0,0,0,2.58-.45V20.63a6.14,6.14,0,0,1-2.58.72C46.86,21.35,44.81,19.74,43.81,18.94Z"/><path d="M12.32,23.22a10.47,10.47,0,0,0,5.23,1.71,10.54,10.54,0,0,0,5.24-1.71A10.47,10.47,0,0,0,28,24.93a10.51,10.51,0,0,0,5.24-1.71c.24.15.53.32.84.48l.69-1.25a4.47,4.47,0,0,1,1.55-1.62,14.41,14.41,0,0,1-3-1.91l-.1-.08L33.1,19c-1,.76-3,2.38-5.08,2.38s-4.1-1.61-5.1-2.41l-.13-.1-.16.13h0c-1,.76-3,2.38-5.07,2.38s-4.1-1.61-5.1-2.41l-.13-.1-.17.13c-1,.76-3,2.38-5.07,2.38a6.3,6.3,0,0,1-2.66-.75v3.85a8.36,8.36,0,0,0,2.66.48A10.54,10.54,0,0,0,12.32,23.22Z"/><path d="M38.44,40.15a1.07,1.07,0,0,0-1.07,1.21c0,.76.39,1.18,1.08,1.18a1.06,1.06,0,0,0,1.07-1.18C39.52,40.58,39.12,40.15,38.44,40.15Z"/><polygon points="37.69 39.16 39.35 39.12 39.51 32.27 37.13 32.27 37.69 39.16"/><path d="M39.62,23.92a1.43,1.43,0,0,0-1.24-.74h0a1.44,1.44,0,0,0-1.24.75L25.67,44.61a1.61,1.61,0,0,0,0,1.52,1.45,1.45,0,0,0,1.25.75H50a1.45,1.45,0,0,0,1.26-.76,1.61,1.61,0,0,0,0-1.52ZM30,43.38l8.42-15.21L47,43.38Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="rioolvirus"><path d="M12.32,15a10.47,10.47,0,0,0,5.23,1.7A10.54,10.54,0,0,0,22.79,15,10.47,10.47,0,0,0,28,16.7,10.51,10.51,0,0,0,33.26,15a10.54,10.54,0,0,0,5.24,1.7A10.47,10.47,0,0,0,43.73,15,10.54,10.54,0,0,0,49,16.7a8.41,8.41,0,0,0,2.58-.45V12.41a6.29,6.29,0,0,1-2.58.72c-2,0-4.1-1.62-5.1-2.41l-.14-.11-.16.13c-1,.76-3,2.39-5.07,2.39s-4.1-1.62-5.11-2.41l-.13-.11-.16.13c-1,.76-3,2.39-5.08,2.39s-4.1-1.62-5.1-2.41l-.13-.11-.17.13c-1,.76-3,2.39-5.07,2.39s-4.1-1.62-5.1-2.41l-.13-.11-.17.13c-1,.76-3,2.39-5.07,2.39a6.31,6.31,0,0,1-2.66-.76v3.86a8.64,8.64,0,0,0,2.66.47A10.54,10.54,0,0,0,12.32,15Z"/><path d="M28.89,33.1l2.64-4.77A6.75,6.75,0,0,1,28,29.58c-2.05,0-4.1-1.62-5.1-2.41l-.13-.1-.17.13c-1,.76-3,2.38-5.07,2.38s-4.1-1.62-5.1-2.41l-.13-.1-.17.13c-1,.76-3,2.38-5.07,2.38a6.17,6.17,0,0,1-2.66-.76v3.86a8.36,8.36,0,0,0,2.66.48,10.54,10.54,0,0,0,5.24-1.71,10.47,10.47,0,0,0,5.23,1.71,10.54,10.54,0,0,0,5.24-1.71A10.47,10.47,0,0,0,28,33.16,8.29,8.29,0,0,0,28.89,33.1Z"/><path d="M49,29.55a6.86,6.86,0,0,1-3.56-1.28l2.7,4.8a6.22,6.22,0,0,0,.86.06,8.47,8.47,0,0,0,2.58-.45V28.83A6.18,6.18,0,0,1,49,29.55Z"/><path d="M43.81,18.94l-.14-.1-.13.1a14,14,0,0,1-3,1.92A4.4,4.4,0,0,1,42,22.42l.74,1.31c.33-.17.63-.35.89-.51a10.54,10.54,0,0,0,5.24,1.71,8.41,8.41,0,0,0,2.58-.45V20.63a6.14,6.14,0,0,1-2.58.72C46.86,21.35,44.81,19.74,43.81,18.94Z"/><path d="M12.32,23.22a10.47,10.47,0,0,0,5.23,1.71,10.54,10.54,0,0,0,5.24-1.71A10.47,10.47,0,0,0,28,24.93a10.51,10.51,0,0,0,5.24-1.71c.24.15.53.32.84.48l.69-1.25a4.47,4.47,0,0,1,1.55-1.62,14.41,14.41,0,0,1-3-1.91l-.1-.08L33.1,19c-1,.76-3,2.38-5.08,2.38s-4.1-1.61-5.1-2.41l-.13-.1-.16.13h0c-1,.76-3,2.38-5.07,2.38s-4.1-1.61-5.1-2.41l-.13-.1-.17.13c-1,.76-3,2.38-5.07,2.38a6.3,6.3,0,0,1-2.66-.75v3.85a8.36,8.36,0,0,0,2.66.48A10.54,10.54,0,0,0,12.32,23.22Z"/><path d="M38.44,40.15a1.07,1.07,0,0,0-1.07,1.21c0,.76.39,1.18,1.08,1.18a1.06,1.06,0,0,0,1.07-1.18C39.52,40.58,39.12,40.15,38.44,40.15Z"/><polygon points="37.69 39.16 39.35 39.12 39.51 32.27 37.13 32.27 37.69 39.16"/><path d="M39.62,23.92a1.43,1.43,0,0,0-1.24-.74h0a1.44,1.44,0,0,0-1.24.75L25.67,44.61a1.61,1.61,0,0,0,0,1.52,1.45,1.45,0,0,0,1.25.75H50a1.45,1.45,0,0,0,1.26-.76,1.61,1.61,0,0,0,0-1.52ZM30,43.38l8.42-15.21L47,43.38Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/search-icon.svg b/packages/icons/src/svg/search-icon.svg
index 8fc9076697..2d582c322b 100644
--- a/packages/icons/src/svg/search-icon.svg
+++ b/packages/icons/src/svg/search-icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="search_icon"><path d="M25.92,4.42A21.42,21.42,0,1,0,38.82,43l7.72,7.68a2.86,2.86,0,0,0,1,.65,2.81,2.81,0,0,0,1.14.24,3,3,0,0,0,1.14-.22,3,3,0,0,0,1-.65,3.15,3.15,0,0,0,.64-1,3,3,0,0,0,.21-1.14,2.81,2.81,0,0,0-.24-1.14,2.85,2.85,0,0,0-.66-1L43,38.86a21.23,21.23,0,0,0,4.43-13A21.48,21.48,0,0,0,25.92,4.42ZM10.29,25.84A15.63,15.63,0,1,1,25.92,41.37,15.57,15.57,0,0,1,10.29,25.84Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="search_icon"><path d="M25.92,4.42A21.42,21.42,0,1,0,38.82,43l7.72,7.68a2.86,2.86,0,0,0,1,.65,2.81,2.81,0,0,0,1.14.24,3,3,0,0,0,1.14-.22,3,3,0,0,0,1-.65,3.15,3.15,0,0,0,.64-1,3,3,0,0,0,.21-1.14,2.81,2.81,0,0,0-.24-1.14,2.85,2.85,0,0,0-.66-1L43,38.86a21.23,21.23,0,0,0,4.43-13A21.48,21.48,0,0,0,25.92,4.42ZM10.29,25.84A15.63,15.63,0,1,1,25.92,41.37,15.57,15.57,0,0,1,10.29,25.84Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/search_icon_bold.svg b/packages/icons/src/svg/search_icon_bold.svg
index 66c6d09697..5153a169c1 100644
--- a/packages/icons/src/svg/search_icon_bold.svg
+++ b/packages/icons/src/svg/search_icon_bold.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="search_icon_bold"><path d="M50.17,42.83,38.26,30.92a18,18,0,1,0-7.45,7.41L42.74,50.26a4.8,4.8,0,0,0,6.78,0l.65-.65A4.79,4.79,0,0,0,50.17,42.83ZM11.51,22.43a10.9,10.9,0,1,1,10.9,10.9A10.91,10.91,0,0,1,11.51,22.43Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="search_icon_bold"><path d="M50.17,42.83,38.26,30.92a18,18,0,1,0-7.45,7.41L42.74,50.26a4.8,4.8,0,0,0,6.78,0l.65-.65A4.79,4.79,0,0,0,50.17,42.83ZM11.51,22.43a10.9,10.9,0,1,1,10.9,10.9A10.91,10.91,0,0,1,11.51,22.43Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/sport_buiten.svg b/packages/icons/src/svg/sport_buiten.svg
index e9a3286579..d959e4ddea 100644
--- a/packages/icons/src/svg/sport_buiten.svg
+++ b/packages/icons/src/svg/sport_buiten.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="sport_buiten"><path d="M27.86,12.45c2.21.55,3.86-.83,4.41-3,.55-2.76-.55-4.41-2.75-5a4,4,0,0,0-4.41,3.3C24.56,10.24,25.66,12.17,27.86,12.45Z"/><path d="M28,28a56.92,56.92,0,0,1,1.55-6.21C30.34,23.19,32,26,33.37,26.5c1.1.55,4.14.55,5.51.55a3.61,3.61,0,0,0,2.92-2.51l.11-.24A36.27,36.27,0,0,1,35,23.47c-.83-.55-2.48-3.58-3-4.69-.14-.24-.27-.5-.4-.76-.92-1.77-1.92-3.71-6.48-4.19-3.31-.28-8.54,1.1-9.92,2.48a23,23,0,0,0-3.58,5.51A3.85,3.85,0,0,0,12.43,26c.11-.16.29-.46.53-.86,1-1.7,3.09-5.14,4.43-6,.55-.55,2.21-.83,4.14-1.1-.73,3.15-1.46,7.59-1.81,9.73h0c0,.29-.09.53-.12.73C19.08,31.52,21,32.68,23,33.94h0l.43.26h-.27a4.45,4.45,0,0,1-.52-.07,12.37,12.37,0,0,0-2-.2,63.4,63.4,0,0,1-3,6.06,22.81,22.81,0,0,1-4.14-.67,16.36,16.36,0,0,0-2.47-.43C8.3,38.35,7.2,41.38,7.2,41.38c.46.15,1.06.37,1.73.61,2.91,1,7.33,2.64,9.56,2.42,1.66,0,2.21-.55,3.31-2.21s2.76-4.4,3.86-6.33l.22.11.65.31a21,21,0,0,1,3.26,1.78,57.05,57.05,0,0,1,.83,9.64,4.9,4.9,0,0,0,3.58,3.86c.14-1.57.21-2.84.28-4.16h0c.07-1.22.14-2.5.27-4.08V38.07a4.51,4.51,0,0,0-.55-2.75c-.28-.83-1.38-1.66-6.61-5.51.12-.57.25-1.16.37-1.76Z"/><path d="M44.67,39.72a4.14,4.14,0,1,0,4.13,4.14A4.06,4.06,0,0,0,44.67,39.72Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="sport_buiten"><path d="M27.86,12.45c2.21.55,3.86-.83,4.41-3,.55-2.76-.55-4.41-2.75-5a4,4,0,0,0-4.41,3.3C24.56,10.24,25.66,12.17,27.86,12.45Z"/><path d="M28,28a56.92,56.92,0,0,1,1.55-6.21C30.34,23.19,32,26,33.37,26.5c1.1.55,4.14.55,5.51.55a3.61,3.61,0,0,0,2.92-2.51l.11-.24A36.27,36.27,0,0,1,35,23.47c-.83-.55-2.48-3.58-3-4.69-.14-.24-.27-.5-.4-.76-.92-1.77-1.92-3.71-6.48-4.19-3.31-.28-8.54,1.1-9.92,2.48a23,23,0,0,0-3.58,5.51A3.85,3.85,0,0,0,12.43,26c.11-.16.29-.46.53-.86,1-1.7,3.09-5.14,4.43-6,.55-.55,2.21-.83,4.14-1.1-.73,3.15-1.46,7.59-1.81,9.73h0c0,.29-.09.53-.12.73C19.08,31.52,21,32.68,23,33.94h0l.43.26h-.27a4.45,4.45,0,0,1-.52-.07,12.37,12.37,0,0,0-2-.2,63.4,63.4,0,0,1-3,6.06,22.81,22.81,0,0,1-4.14-.67,16.36,16.36,0,0,0-2.47-.43C8.3,38.35,7.2,41.38,7.2,41.38c.46.15,1.06.37,1.73.61,2.91,1,7.33,2.64,9.56,2.42,1.66,0,2.21-.55,3.31-2.21s2.76-4.4,3.86-6.33l.22.11.65.31a21,21,0,0,1,3.26,1.78,57.05,57.05,0,0,1,.83,9.64,4.9,4.9,0,0,0,3.58,3.86c.14-1.57.21-2.84.28-4.16h0c.07-1.22.14-2.5.27-4.08V38.07a4.51,4.51,0,0,0-.55-2.75c-.28-.83-1.38-1.66-6.61-5.51.12-.57.25-1.16.37-1.76Z"/><path d="M44.67,39.72a4.14,4.14,0,1,0,4.13,4.14A4.06,4.06,0,0,0,44.67,39.72Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/sport_met_zweetband.svg b/packages/icons/src/svg/sport_met_zweetband.svg
index f1e65c1c52..0628c78636 100644
--- a/packages/icons/src/svg/sport_met_zweetband.svg
+++ b/packages/icons/src/svg/sport_met_zweetband.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="sport_met_zweetband"><path d="M44.87,39c-2.09-1.84-6.55-3.41-8.9-3.93a13.66,13.66,0,0,0-.53-2.88,10.67,10.67,0,0,0,2.62-5.5,6.16,6.16,0,0,0,1.57-4.46,4.54,4.54,0,0,0-1.31-3.66A17.1,17.1,0,0,0,39.63,12l1.57-.79c-2.62-5.5-8.64-2.88-8.64-2.88-2.36-3.93-9.69-3.93-9.69-3.93a7.87,7.87,0,0,1,1.57,2.36c-7.86-.79-8.91,5.76-8.91,5.76s.79-.26,1.84-.52a26.23,26.23,0,0,0,1.05,6.81c-.79.52-1.31,1.57-1.31,3.4a6.16,6.16,0,0,0,1.57,4.46,12.73,12.73,0,0,0,2.88,6,4.73,4.73,0,0,1-.11.84,7.13,7.13,0,0,0-.15,1.26c-1.84.52-7.34,2.35-9.43,4.19,1.83,1.31,5.5,4.71,7.33,12.31H37.54A22.68,22.68,0,0,1,44.87,39ZM37,13.07a15.48,15.48,0,0,1-.52,3.4,67.67,67.67,0,0,0-16.24-.26,13.85,13.85,0,0,0-.13-1.57A12,12,0,0,1,20,13.07,61.41,61.41,0,0,1,37,13.07ZM33.71,36.8a4,4,0,0,1-.63,1.67c-1.83,3.93-7.85,3.67-9.16-.52a3.07,3.07,0,0,0-.06-.52,1.58,1.58,0,0,1,.06-1c0-.54,0-.77,0-1,0-.44.16-.87.5-3.45C22.61,30.09,21,28,21,25.38c-1.31-.26-1.58-2.1-1.58-3.15A2.51,2.51,0,0,1,20,20.4a.44.44,0,0,1,.52-.06.88.88,0,0,0,.26.06A2.69,2.69,0,0,0,21,21.45a1.14,1.14,0,0,0,1,.78V18.57a28.74,28.74,0,0,1,4.72-.26,9.41,9.41,0,0,1-1.05,2.61,6.28,6.28,0,0,0,5-2.88h1a12,12,0,0,0,1.31,2.36,8.9,8.9,0,0,1,1.55-1.58l.29-.25v3.66s.78,0,.78-.52A2,2,0,0,1,36,20.66a.88.88,0,0,0,.26-.06c.17-.05.35-.11.52.06a2.53,2.53,0,0,1,.52,1.84c0,1-.26,2.62-1.57,3.14,0,2.88-2.09,5.24-4.45,7.33a5,5,0,0,1-3.14.79,6.27,6.27,0,0,1-2.36-.52c.17.11.35.25.55.4a6.48,6.48,0,0,0,2.85,1.43,5,5,0,0,0,4.46-.79s.26,1.57.26,1.84Z"/><path d="M10.82,41.09C9.25,44.76,8.2,51.57,8.2,51.57h8.64C15.27,45,12.13,42.14,10.82,41.09Z"/><path d="M46.18,41.09c-1.31,1-4.45,3.93-6,10.48H48.8S48,44.76,46.18,41.09Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="sport_met_zweetband"><path d="M44.87,39c-2.09-1.84-6.55-3.41-8.9-3.93a13.66,13.66,0,0,0-.53-2.88,10.67,10.67,0,0,0,2.62-5.5,6.16,6.16,0,0,0,1.57-4.46,4.54,4.54,0,0,0-1.31-3.66A17.1,17.1,0,0,0,39.63,12l1.57-.79c-2.62-5.5-8.64-2.88-8.64-2.88-2.36-3.93-9.69-3.93-9.69-3.93a7.87,7.87,0,0,1,1.57,2.36c-7.86-.79-8.91,5.76-8.91,5.76s.79-.26,1.84-.52a26.23,26.23,0,0,0,1.05,6.81c-.79.52-1.31,1.57-1.31,3.4a6.16,6.16,0,0,0,1.57,4.46,12.73,12.73,0,0,0,2.88,6,4.73,4.73,0,0,1-.11.84,7.13,7.13,0,0,0-.15,1.26c-1.84.52-7.34,2.35-9.43,4.19,1.83,1.31,5.5,4.71,7.33,12.31H37.54A22.68,22.68,0,0,1,44.87,39ZM37,13.07a15.48,15.48,0,0,1-.52,3.4,67.67,67.67,0,0,0-16.24-.26,13.85,13.85,0,0,0-.13-1.57A12,12,0,0,1,20,13.07,61.41,61.41,0,0,1,37,13.07ZM33.71,36.8a4,4,0,0,1-.63,1.67c-1.83,3.93-7.85,3.67-9.16-.52a3.07,3.07,0,0,0-.06-.52,1.58,1.58,0,0,1,.06-1c0-.54,0-.77,0-1,0-.44.16-.87.5-3.45C22.61,30.09,21,28,21,25.38c-1.31-.26-1.58-2.1-1.58-3.15A2.51,2.51,0,0,1,20,20.4a.44.44,0,0,1,.52-.06.88.88,0,0,0,.26.06A2.69,2.69,0,0,0,21,21.45a1.14,1.14,0,0,0,1,.78V18.57a28.74,28.74,0,0,1,4.72-.26,9.41,9.41,0,0,1-1.05,2.61,6.28,6.28,0,0,0,5-2.88h1a12,12,0,0,0,1.31,2.36,8.9,8.9,0,0,1,1.55-1.58l.29-.25v3.66s.78,0,.78-.52A2,2,0,0,1,36,20.66a.88.88,0,0,0,.26-.06c.17-.05.35-.11.52.06a2.53,2.53,0,0,1,.52,1.84c0,1-.26,2.62-1.57,3.14,0,2.88-2.09,5.24-4.45,7.33a5,5,0,0,1-3.14.79,6.27,6.27,0,0,1-2.36-.52c.17.11.35.25.55.4a6.48,6.48,0,0,0,2.85,1.43,5,5,0,0,0,4.46-.79s.26,1.57.26,1.84Z"/><path d="M10.82,41.09C9.25,44.76,8.2,51.57,8.2,51.57h8.64C15.27,45,12.13,42.14,10.82,41.09Z"/><path d="M46.18,41.09c-1.31,1-4.45,3.93-6,10.48H48.8S48,44.76,46.18,41.09Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/sport_wedstrijden.svg b/packages/icons/src/svg/sport_wedstrijden.svg
index 13b128d2d1..b03ae7fc44 100644
--- a/packages/icons/src/svg/sport_wedstrijden.svg
+++ b/packages/icons/src/svg/sport_wedstrijden.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="sport_wedstrijden"><path d="M36.68,29.12a11.39,11.39,0,0,0,8.84-3.47,18.28,18.28,0,0,0,4.25-12.78c0-1.14-.52-1.16-1.26-1.16H40.62V10H23.83v7.65L36,29.82A5.78,5.78,0,0,0,36.68,29.12Zm4-10.32v-5h5.7c.6,0,.91,0,.79.8a16.1,16.1,0,0,1-3.5,9.4,8.77,8.77,0,0,1-5.08,2.57A15.43,15.43,0,0,0,40.65,18.8Z"/><path d="M7.07,4.42,4.43,7.06l6,6.05a18.28,18.28,0,0,0,4.15,12.54,11.58,11.58,0,0,0,8.84,3.47,6.41,6.41,0,0,0,4.16,2.17s.82,3.91-2.11,5.16c-.77.33-1.54.62-2.26.9-2.06.79-3.71,1.43-3.67,2.15v6.41h21V43.25l8.31,8.32,2.64-2.64ZM16.44,24A16.37,16.37,0,0,1,13,15.63l6.81,6.82a15.51,15.51,0,0,0,1.59,4.08A8.72,8.72,0,0,1,16.44,24ZM38.17,43.58H21.83V41.07H38.17Z"/><polygon points="22.06 10.02 19.58 10.02 19.58 11.65 17.8 11.65 22.06 15.9 22.06 10.02"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="sport_wedstrijden"><path d="M36.68,29.12a11.39,11.39,0,0,0,8.84-3.47,18.28,18.28,0,0,0,4.25-12.78c0-1.14-.52-1.16-1.26-1.16H40.62V10H23.83v7.65L36,29.82A5.78,5.78,0,0,0,36.68,29.12Zm4-10.32v-5h5.7c.6,0,.91,0,.79.8a16.1,16.1,0,0,1-3.5,9.4,8.77,8.77,0,0,1-5.08,2.57A15.43,15.43,0,0,0,40.65,18.8Z"/><path d="M7.07,4.42,4.43,7.06l6,6.05a18.28,18.28,0,0,0,4.15,12.54,11.58,11.58,0,0,0,8.84,3.47,6.41,6.41,0,0,0,4.16,2.17s.82,3.91-2.11,5.16c-.77.33-1.54.62-2.26.9-2.06.79-3.71,1.43-3.67,2.15v6.41h21V43.25l8.31,8.32,2.64-2.64ZM16.44,24A16.37,16.37,0,0,1,13,15.63l6.81,6.82a15.51,15.51,0,0,0,1.59,4.08A8.72,8.72,0,0,1,16.44,24ZM38.17,43.58H21.83V41.07H38.17Z"/><polygon points="22.06 10.02 19.58 10.02 19.58 11.65 17.8 11.65 22.06 15.9 22.06 10.02"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/stap_1_horeca_max.svg b/packages/icons/src/svg/stap_1_horeca_max.svg
index ac50935a09..d9917d0c8a 100644
--- a/packages/icons/src/svg/stap_1_horeca_max.svg
+++ b/packages/icons/src/svg/stap_1_horeca_max.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="stap_1_horeca_max"><path d="M38,12.62a3.77,3.77,0,0,0,3.81-4.1c0-2.63-1.46-4.1-3.81-4.1s-3.51,1.76-3.51,4.1C34.44,11.16,35.61,12.62,38,12.62Z"/><path d="M42.35,14.67a20.92,20.92,0,0,0-8.49,0c-5,1.17-4.69,9.08-4.69,15.82.29,2.34,1.76,2.92,2.93,2.92V27.26a31.43,31.43,0,0,1,.88-7,.29.29,0,0,1,.29-.3V51.57a3.88,3.88,0,0,0,3.81-3.81s.58-14.64.58-14.93,0-.29.29-.29a.29.29,0,0,1,.3.29l.58,14.64c.3,4.1,3.81,4.1,3.81,4.1V19.94a.29.29,0,0,1,.29.3c.59.88,1.17,4.1,1.17,6.73v6.15c1.18,0,2.64-.58,2.93-2.93C47,23.75,47.33,15.84,42.35,14.67Z"/><path d="M11.6,27.56H10.43v-2h3.8V24H9v5h1.76c1.46,0,2.34.88,2.34,1.76,0,1.17-1.17,2-2.92,2H9V34h1.18c2.92,0,4.68-1.46,4.68-3.51C14.82,28.73,13.65,27.56,11.6,27.56Z"/><path d="M19.51,23.75A3.92,3.92,0,0,0,16,27.85c0,2.64,1.47,3.81,3.52,3.81A3.92,3.92,0,0,0,23,27.56C23,24.92,21.56,23.75,19.51,23.75Zm0,6.44c-1.18,0-1.76-.58-1.76-2.34,0-1.46.58-2.34,1.76-2.63,1.17,0,1.75.87,1.75,2.34C21.26,29.31,20.38,30.19,19.51,30.19Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="stap_1_horeca_max"><path d="M38,12.62a3.77,3.77,0,0,0,3.81-4.1c0-2.63-1.46-4.1-3.81-4.1s-3.51,1.76-3.51,4.1C34.44,11.16,35.61,12.62,38,12.62Z"/><path d="M42.35,14.67a20.92,20.92,0,0,0-8.49,0c-5,1.17-4.69,9.08-4.69,15.82.29,2.34,1.76,2.92,2.93,2.92V27.26a31.43,31.43,0,0,1,.88-7,.29.29,0,0,1,.29-.3V51.57a3.88,3.88,0,0,0,3.81-3.81s.58-14.64.58-14.93,0-.29.29-.29a.29.29,0,0,1,.3.29l.58,14.64c.3,4.1,3.81,4.1,3.81,4.1V19.94a.29.29,0,0,1,.29.3c.59.88,1.17,4.1,1.17,6.73v6.15c1.18,0,2.64-.58,2.93-2.93C47,23.75,47.33,15.84,42.35,14.67Z"/><path d="M11.6,27.56H10.43v-2h3.8V24H9v5h1.76c1.46,0,2.34.88,2.34,1.76,0,1.17-1.17,2-2.92,2H9V34h1.18c2.92,0,4.68-1.46,4.68-3.51C14.82,28.73,13.65,27.56,11.6,27.56Z"/><path d="M19.51,23.75A3.92,3.92,0,0,0,16,27.85c0,2.64,1.47,3.81,3.52,3.81A3.92,3.92,0,0,0,23,27.56C23,24.92,21.56,23.75,19.51,23.75Zm0,6.44c-1.18,0-1.76-.58-1.76-2.34,0-1.46.58-2.34,1.76-2.63,1.17,0,1.75.87,1.75,2.34C21.26,29.31,20.38,30.19,19.51,30.19Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/stap_1_horeca_pertafel.svg b/packages/icons/src/svg/stap_1_horeca_pertafel.svg
index eacbf8baf8..99629259fe 100644
--- a/packages/icons/src/svg/stap_1_horeca_pertafel.svg
+++ b/packages/icons/src/svg/stap_1_horeca_pertafel.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="stap_1-horeca_pertafel"><path d="M34.48,12.64c2.39,0,3.58-1.52,3.58-4,0-2.74-1.19-4.26-3.58-4.26S30.9,6.25,30.9,8.68,32.39,12.64,34.48,12.64Z"/><path d="M24.31,30.38C24,25.5,23.55,18.3,26.72,15.07a1.1,1.1,0,0,1-.44-.15,1,1,0,0,0-.45-.15,23.59,23.59,0,0,0-9.25,0C12.11,16,12.4,25.11,12.7,29.06c.6,2.44,2.09,3,3,3V24.8a15.53,15.53,0,0,1,.59-5.17s.3-.3.3,0v28.9a3.59,3.59,0,0,0,3.58-3.35l.6-13.38a.29.29,0,0,1,.3-.3.29.29,0,0,1,.29.3L22,45.18c0,2.13,1.19,3.35,3.58,3.35V33.62a5.46,5.46,0,0,1-1.19-2.73Z"/><path d="M39.55,14.77a17.88,17.88,0,0,0-9.84,0c-5,1.5-4.49,10.4-4.19,15.61v.2a2.74,2.74,0,0,0,2.69,3V27.24c0-2.74,0-5.48.59-7.3a.3.3,0,0,1,.3-.31V51.57a4,4,0,0,0,4.18-3.65l.59-14.6a.3.3,0,0,1,.6,0c0,.3.6,14.6.6,14.6a4,4,0,0,0,4.17,3.65V19.94a.29.29,0,0,1,.3.3c.6,1.52.6,4.26.6,7.3v6.39c1.19,0,2.68-.61,2.68-3C43.73,25.41,44.32,16.29,39.55,14.77Z"/><path d="M21.35,12.64c2.09,0,3.29-1.52,3.29-3.65,0-2.44-1.2-3.65-3.29-3.65S18.07,6.86,18.07,9C18.07,11.42,19.27,12.64,21.35,12.64Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="stap_1-horeca_pertafel"><path d="M34.48,12.64c2.39,0,3.58-1.52,3.58-4,0-2.74-1.19-4.26-3.58-4.26S30.9,6.25,30.9,8.68,32.39,12.64,34.48,12.64Z"/><path d="M24.31,30.38C24,25.5,23.55,18.3,26.72,15.07a1.1,1.1,0,0,1-.44-.15,1,1,0,0,0-.45-.15,23.59,23.59,0,0,0-9.25,0C12.11,16,12.4,25.11,12.7,29.06c.6,2.44,2.09,3,3,3V24.8a15.53,15.53,0,0,1,.59-5.17s.3-.3.3,0v28.9a3.59,3.59,0,0,0,3.58-3.35l.6-13.38a.29.29,0,0,1,.3-.3.29.29,0,0,1,.29.3L22,45.18c0,2.13,1.19,3.35,3.58,3.35V33.62a5.46,5.46,0,0,1-1.19-2.73Z"/><path d="M39.55,14.77a17.88,17.88,0,0,0-9.84,0c-5,1.5-4.49,10.4-4.19,15.61v.2a2.74,2.74,0,0,0,2.69,3V27.24c0-2.74,0-5.48.59-7.3a.3.3,0,0,1,.3-.31V51.57a4,4,0,0,0,4.18-3.65l.59-14.6a.3.3,0,0,1,.6,0c0,.3.6,14.6.6,14.6a4,4,0,0,0,4.17,3.65V19.94a.29.29,0,0,1,.3.3c.6,1.52.6,4.26.6,7.3v6.39c1.19,0,2.68-.61,2.68-3C43.73,25.41,44.32,16.29,39.55,14.77Z"/><path d="M21.35,12.64c2.09,0,3.29-1.52,3.29-3.65,0-2.44-1.2-3.65-3.29-3.65S18.07,6.86,18.07,9C18.07,11.42,19.27,12.64,21.35,12.64Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/stap_1_horeca_verplaatsen.svg b/packages/icons/src/svg/stap_1_horeca_verplaatsen.svg
index f080e6bfb2..58676483e7 100644
--- a/packages/icons/src/svg/stap_1_horeca_verplaatsen.svg
+++ b/packages/icons/src/svg/stap_1_horeca_verplaatsen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="stap_1_horeca_verplaatsen"><path d="M16.62,14.24c2.79-.35,4.18-2.79,3.84-5.58-.7-3.14-2.8-4.53-5.59-4.18A4.75,4.75,0,0,0,11,10.06C11.73,13.2,13.48,14.94,16.62,14.24Z"/><path d="M38.6,27.85c-2.45-2.79-3.49-2.79-7-1.75-2.09,1-4.19,1.75-6.28,2.8-1.4-4.89-2.79-9.07-2.79-9.07-2.44-6.63-10.82-4.19-9.77,1.74a127.44,127.44,0,0,0,3.49,13.6c.7,2.1,3.14,3.49,6.28,3.14C25,38,32.67,36.22,32.67,36.22s2.09,7.68,3.48,11.51c1.4,4.19,4.54,3.84,5.59,3.49L37.9,32.38a.34.34,0,0,1,.35.35c.69,1.75,3.49,7.68,3.49,7.68l.69.7c3.49,3.13,5.24,1.39,5.93.69C48,40.76,44.18,34.13,38.6,27.85Z"/><path d="M29.53,38.66s-3.14.7-7.33,1.4c-3.49.7-7-1.4-7.67-4.54L11.39,23.66a1.18,1.18,0,0,0-1.75-1c-.7,0-1.05.69-1.05,1.74l2.8,11.86a10.66,10.66,0,0,0,3.48,5.23L11.39,51.57h3.14l2.79-8.72a7.63,7.63,0,0,0,2.79.35,4.42,4.42,0,0,0,2.09-.35,1.29,1.29,0,0,0,1.05-.35l3.49,8.72h3.13L26,41.8c2.09-.35,3.49-.69,3.49-.69a1.34,1.34,0,0,0,1-1.75C30.92,39,30.22,38.66,29.53,38.66Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="stap_1_horeca_verplaatsen"><path d="M16.62,14.24c2.79-.35,4.18-2.79,3.84-5.58-.7-3.14-2.8-4.53-5.59-4.18A4.75,4.75,0,0,0,11,10.06C11.73,13.2,13.48,14.94,16.62,14.24Z"/><path d="M38.6,27.85c-2.45-2.79-3.49-2.79-7-1.75-2.09,1-4.19,1.75-6.28,2.8-1.4-4.89-2.79-9.07-2.79-9.07-2.44-6.63-10.82-4.19-9.77,1.74a127.44,127.44,0,0,0,3.49,13.6c.7,2.1,3.14,3.49,6.28,3.14C25,38,32.67,36.22,32.67,36.22s2.09,7.68,3.48,11.51c1.4,4.19,4.54,3.84,5.59,3.49L37.9,32.38a.34.34,0,0,1,.35.35c.69,1.75,3.49,7.68,3.49,7.68l.69.7c3.49,3.13,5.24,1.39,5.93.69C48,40.76,44.18,34.13,38.6,27.85Z"/><path d="M29.53,38.66s-3.14.7-7.33,1.4c-3.49.7-7-1.4-7.67-4.54L11.39,23.66a1.18,1.18,0,0,0-1.75-1c-.7,0-1.05.69-1.05,1.74l2.8,11.86a10.66,10.66,0,0,0,3.48,5.23L11.39,51.57h3.14l2.79-8.72a7.63,7.63,0,0,0,2.79.35,4.42,4.42,0,0,0,2.09-.35,1.29,1.29,0,0,0,1.05-.35l3.49,8.72h3.13L26,41.8c2.09-.35,3.49-.69,3.49-.69a1.34,1.34,0,0,0,1-1.75C30.92,39,30.22,38.66,29.53,38.66Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/stap_1_onderwijs_bibliotheek.svg b/packages/icons/src/svg/stap_1_onderwijs_bibliotheek.svg
index c670b25d4e..bc165e72ea 100644
--- a/packages/icons/src/svg/stap_1_onderwijs_bibliotheek.svg
+++ b/packages/icons/src/svg/stap_1_onderwijs_bibliotheek.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="stap_1_onderwijs_bibliotheek"><path d="M49.58,10.78H46.26V7.46A1.57,1.57,0,0,0,44.6,5.8H18c-4.32,0-8.64,1.66-8.64,6v7.31c-2.65.66-5,2.32-5,5.64V46A4.4,4.4,0,0,0,8.74,50.3H27.67a1.57,1.57,0,0,0,1.66-1.66V26.39a1.57,1.57,0,0,0-1.66-1.66H9.4c-.33,0-.66-.33-.66-1,.66-1.32,3.32-1.66,4.32-1.66H32.65V47h5a1.57,1.57,0,0,0,1.66-1.66V13.44a1.56,1.56,0,0,0-1.66-1.66H14.39c-.34,0-.67-.33-.67-1C14.39,9.46,17,9.12,18,9.12h24.9V41.67H44.6A1.57,1.57,0,0,0,46.26,40V13.44h2.66V38.35h1a1.58,1.58,0,0,0,1.66-1.67V12.78A2.15,2.15,0,0,0,49.58,10.78Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="stap_1_onderwijs_bibliotheek"><path d="M49.58,10.78H46.26V7.46A1.57,1.57,0,0,0,44.6,5.8H18c-4.32,0-8.64,1.66-8.64,6v7.31c-2.65.66-5,2.32-5,5.64V46A4.4,4.4,0,0,0,8.74,50.3H27.67a1.57,1.57,0,0,0,1.66-1.66V26.39a1.57,1.57,0,0,0-1.66-1.66H9.4c-.33,0-.66-.33-.66-1,.66-1.32,3.32-1.66,4.32-1.66H32.65V47h5a1.57,1.57,0,0,0,1.66-1.66V13.44a1.56,1.56,0,0,0-1.66-1.66H14.39c-.34,0-.67-.33-.67-1C14.39,9.46,17,9.12,18,9.12h24.9V41.67H44.6A1.57,1.57,0,0,0,46.26,40V13.44h2.66V38.35h1a1.58,1.58,0,0,0,1.66-1.67V12.78A2.15,2.15,0,0,0,49.58,10.78Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/stap_1_onderwijs_open.svg b/packages/icons/src/svg/stap_1_onderwijs_open.svg
index b41fce1617..2b89474302 100644
--- a/packages/icons/src/svg/stap_1_onderwijs_open.svg
+++ b/packages/icons/src/svg/stap_1_onderwijs_open.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="stap_1_onderwijs_open"><path d="M51.45,20.32,41.53,6.24a1.76,1.76,0,0,0-1.6-1h-24a1.66,1.66,0,0,0-1.28.64L4.42,20.32c0,.32,0,.64.32.64h6.4L25.86,8.8a2.91,2.91,0,0,1,3.84,0L44.41,21h6.4C51.45,21,51.77,20.64,51.45,20.32Z"/><path d="M28.1,11.36,12.74,23.84H7.62V50.71H48.25V23.84H43.13ZM21.38,45H14V40.47h7.36Zm0-7.36H14V29.28h7.36ZM31.62,45H24.26V40.47h7.36Zm0-7.36H24.26V29.28h7.36ZM28.1,24.8A3.7,3.7,0,0,1,24.26,21a3.7,3.7,0,0,1,3.84-3.84A3.7,3.7,0,0,1,31.94,21,3.89,3.89,0,0,1,28.1,24.8ZM41.85,45H34.5V40.47h7.35Zm0-7.36H34.5V29.28h7.35Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="stap_1_onderwijs_open"><path d="M51.45,20.32,41.53,6.24a1.76,1.76,0,0,0-1.6-1h-24a1.66,1.66,0,0,0-1.28.64L4.42,20.32c0,.32,0,.64.32.64h6.4L25.86,8.8a2.91,2.91,0,0,1,3.84,0L44.41,21h6.4C51.45,21,51.77,20.64,51.45,20.32Z"/><path d="M28.1,11.36,12.74,23.84H7.62V50.71H48.25V23.84H43.13ZM21.38,45H14V40.47h7.36Zm0-7.36H14V29.28h7.36ZM31.62,45H24.26V40.47h7.36Zm0-7.36H24.26V29.28h7.36ZM28.1,24.8A3.7,3.7,0,0,1,24.26,21a3.7,3.7,0,0,1,3.84-3.84A3.7,3.7,0,0,1,31.94,21,3.89,3.89,0,0,1,28.1,24.8ZM41.85,45H34.5V40.47h7.35Zm0-7.36H34.5V29.28h7.35Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/stap_1_theorie.svg b/packages/icons/src/svg/stap_1_theorie.svg
index 8a155e96e5..cff37ddc9c 100644
--- a/packages/icons/src/svg/stap_1_theorie.svg
+++ b/packages/icons/src/svg/stap_1_theorie.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="stap_1_theorie"><path d="M45,4.42H25.09c-.61,0-.92.31-1.53.62L9.78,18.81c-.3.61-.61.92-.61,1.53V49.73A2,2,0,0,0,11,51.57H45a2,2,0,0,0,1.84-1.84V6.26A2,2,0,0,0,45,4.42ZM13.76,47V21.57l-3.06-.92a.3.3,0,0,1-.3-.31H23.87a.81.81,0,0,0,.92-.92V6a.3.3,0,0,1,.3.31L26,9.32H41.62V47Z"/><rect x="29.07" y="17.59" width="9.49" height="2.76"/><rect x="24.17" y="27.08" width="14.08" height="2.76"/><rect x="17.74" y="27.08" width="4.59" height="2.76"/><rect x="24.17" y="32.59" width="14.08" height="2.76"/><rect x="17.74" y="32.59" width="4.59" height="2.76"/><rect x="17.74" y="38.41" width="4.59" height="2.76"/><rect x="24.17" y="38.41" width="14.08" height="2.76"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="stap_1_theorie"><path d="M45,4.42H25.09c-.61,0-.92.31-1.53.62L9.78,18.81c-.3.61-.61.92-.61,1.53V49.73A2,2,0,0,0,11,51.57H45a2,2,0,0,0,1.84-1.84V6.26A2,2,0,0,0,45,4.42ZM13.76,47V21.57l-3.06-.92a.3.3,0,0,1-.3-.31H23.87a.81.81,0,0,0,.92-.92V6a.3.3,0,0,1,.3.31L26,9.32H41.62V47Z"/><rect x="29.07" y="17.59" width="9.49" height="2.76"/><rect x="24.17" y="27.08" width="14.08" height="2.76"/><rect x="17.74" y="27.08" width="4.59" height="2.76"/><rect x="24.17" y="32.59" width="14.08" height="2.76"/><rect x="17.74" y="32.59" width="4.59" height="2.76"/><rect x="17.74" y="38.41" width="4.59" height="2.76"/><rect x="24.17" y="38.41" width="14.08" height="2.76"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/stap_1_thuisbezoek.svg b/packages/icons/src/svg/stap_1_thuisbezoek.svg
index 907b49a869..556ec0b40d 100644
--- a/packages/icons/src/svg/stap_1_thuisbezoek.svg
+++ b/packages/icons/src/svg/stap_1_thuisbezoek.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="stap_1_thuisbezoek"><path d="M51,27.08,28.59,5.86a.89.89,0,0,0-1.18,0L5,27.08a1.54,1.54,0,0,0-.59,1.17v1.48a.78.78,0,0,0,.89.88H9.14V50.36H46.86V30.61h3.83a.78.78,0,0,0,.89-.88V28.25A1.54,1.54,0,0,0,51,27.08ZM34.78,40.93h-13l-.59-3c.3-1.77,1.77-3.54,4.13-4.72l2.36-1.17c1.76-.89,2.35-1.48,2.35-2.66s-1.18-1.76-3.24-1.76c-.88.14-1.62.29-2.36.44s-1.47.29-2.35.44V25.31a15.4,15.4,0,0,1,5-.59c4.42,0,6.48,2.06,6.48,5,.29,2.36-1.18,4.12-3.83,5l-2.06.88a12,12,0,0,0-1.84,1.18c-.26.2-.52.39-.82.59h9.73Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="stap_1_thuisbezoek"><path d="M51,27.08,28.59,5.86a.89.89,0,0,0-1.18,0L5,27.08a1.54,1.54,0,0,0-.59,1.17v1.48a.78.78,0,0,0,.89.88H9.14V50.36H46.86V30.61h3.83a.78.78,0,0,0,.89-.88V28.25A1.54,1.54,0,0,0,51,27.08ZM34.78,40.93h-13l-.59-3c.3-1.77,1.77-3.54,4.13-4.72l2.36-1.17c1.76-.89,2.35-1.48,2.35-2.66s-1.18-1.76-3.24-1.76c-.88.14-1.62.29-2.36.44s-1.47.29-2.35.44V25.31a15.4,15.4,0,0,1,5-.59c4.42,0,6.48,2.06,6.48,5,.29,2.36-1.18,4.12-3.83,5l-2.06.88a12,12,0,0,0-1.84,1.18c-.26.2-.52.39-.82.59h9.73Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/stap_1_uitvaarten.svg b/packages/icons/src/svg/stap_1_uitvaarten.svg
index 0c65183795..1afff1611a 100644
--- a/packages/icons/src/svg/stap_1_uitvaarten.svg
+++ b/packages/icons/src/svg/stap_1_uitvaarten.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="stap_1_uitvaarten"><path d="M44.9,11.25H41.49a17,17,0,0,0-27.29,0H10.78a.82.82,0,0,0-.93.93V51.57h18V41.64c2.8-.31,4-3.72,4.35-3.72v-.31c-.93.93-2.79,2.79-4.35,2.48-.93-.31-.93-2.79-.31-4a.83.83,0,0,1,.94-.93,57.8,57.8,0,0,1,8.06-.93.82.82,0,0,1,.93.93V51.57h8.69V12.18C45.84,11.56,45.53,11.25,44.9,11.25ZM33.12,32.65a2.37,2.37,0,0,0,.62-1.55,3.35,3.35,0,0,0-1.24-2.48,3.17,3.17,0,0,0-1.24,2.17,3.32,3.32,0,0,0,.62,1.86c-1.55,0-2.79-1.24-3.1-3.1-.62-3.41,2.48-7.76,3.72-9,.31,4.35,2.79,3.72,3.72,7.14C36.84,30.48,35.29,32,33.12,32.65Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="stap_1_uitvaarten"><path d="M44.9,11.25H41.49a17,17,0,0,0-27.29,0H10.78a.82.82,0,0,0-.93.93V51.57h18V41.64c2.8-.31,4-3.72,4.35-3.72v-.31c-.93.93-2.79,2.79-4.35,2.48-.93-.31-.93-2.79-.31-4a.83.83,0,0,1,.94-.93,57.8,57.8,0,0,1,8.06-.93.82.82,0,0,1,.93.93V51.57h8.69V12.18C45.84,11.56,45.53,11.25,44.9,11.25ZM33.12,32.65a2.37,2.37,0,0,0,.62-1.55,3.35,3.35,0,0,0-1.24-2.48,3.17,3.17,0,0,0-1.24,2.17,3.32,3.32,0,0,0,.62,1.86c-1.55,0-2.79-1.24-3.1-3.1-.62-3.41,2.48-7.76,3.72-9,.31,4.35,2.79,3.72,3.72,7.14C36.84,30.48,35.29,32,33.12,32.65Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/stap_1_winkels_alleen.svg b/packages/icons/src/svg/stap_1_winkels_alleen.svg
index 6a9c803eed..9a0b35404e 100644
--- a/packages/icons/src/svg/stap_1_winkels_alleen.svg
+++ b/packages/icons/src/svg/stap_1_winkels_alleen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="stap_1_winkels_alleen"><path d="M26.34,12.74c2.49,0,3.88-1.66,3.88-4.16,0-2.77-1.39-4.16-3.88-4.16s-3.61,1.67-3.61,4.16C22.73,11.36,24.12,12.74,26.34,12.74Z"/><path d="M36.88,33.82a3.13,3.13,0,0,0-2-3.05c0-6.66.28-14.7-4.43-15.81a21.18,21.18,0,0,0-8.32,0c-4.72.83-4.44,8.6-4.44,15.26a3.22,3.22,0,0,0,2.77,3.05V26.33a22.18,22.18,0,0,1,.56-5.54.27.27,0,0,1,.28-.28V51.57a3.94,3.94,0,0,0,3.88-3.88s.55-14.42.55-14.7,0-.28.28-.28a.27.27,0,0,1,.28.28c0,.28.55,14.7.55,14.7a3.94,3.94,0,0,0,3.88,3.88V46h7.49V33.82Zm-4.72-2.77c-.28.28-.55.83-.83,1.11V20.23a.27.27,0,0,1,.28.28,22.86,22.86,0,0,1,.55,5.55Zm.28,2.77c0-1.11.55-1.94,1.39-1.94a1.85,1.85,0,0,1,1.66,1.94Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="stap_1_winkels_alleen"><path d="M26.34,12.74c2.49,0,3.88-1.66,3.88-4.16,0-2.77-1.39-4.16-3.88-4.16s-3.61,1.67-3.61,4.16C22.73,11.36,24.12,12.74,26.34,12.74Z"/><path d="M36.88,33.82a3.13,3.13,0,0,0-2-3.05c0-6.66.28-14.7-4.43-15.81a21.18,21.18,0,0,0-8.32,0c-4.72.83-4.44,8.6-4.44,15.26a3.22,3.22,0,0,0,2.77,3.05V26.33a22.18,22.18,0,0,1,.56-5.54.27.27,0,0,1,.28-.28V51.57a3.94,3.94,0,0,0,3.88-3.88s.55-14.42.55-14.7,0-.28.28-.28a.27.27,0,0,1,.28.28c0,.28.55,14.7.55,14.7a3.94,3.94,0,0,0,3.88,3.88V46h7.49V33.82Zm-4.72-2.77c-.28.28-.55.83-.83,1.11V20.23a.27.27,0,0,1,.28.28,22.86,22.86,0,0,1,.55,5.55Zm.28,2.77c0-1.11.55-1.94,1.39-1.94a1.85,1.85,0,0,1,1.66,1.94Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/stap_1_winkels_markten.svg b/packages/icons/src/svg/stap_1_winkels_markten.svg
index bb91ddaecf..e6f4f03fb4 100644
--- a/packages/icons/src/svg/stap_1_winkels_markten.svg
+++ b/packages/icons/src/svg/stap_1_winkels_markten.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="stap_1_winkels_markten"><path d="M50.63,45.34H48.75L44,35.28h-2.2l4.09,10.06H43.09L39.63,35.28h-2.2l2.83,10.06H37.43L35.54,35h-2.2L34.92,45H32.09L31.14,35h-2.2L29.26,45H26.74L27.06,35h-2.2L23.91,45H21.08L22.66,35h-2.2L18.26,45H15.43L18.26,35H16.05L12.6,45H10.08L14.17,35H11.65L6.94,45H5.37a.84.84,0,0,0-1,.94V48.8a.84.84,0,0,0,1,.94H50.63a.84.84,0,0,0,.95-.94V46C51.58,45.65,51.26,45.34,50.63,45.34Z"/><path d="M50.63,28.68H48.75L44,18.31V7.3a.83.83,0,0,0-.94-.94H12.6c-.32,0-.63.31-.63.94v11L7.25,28.68H5.37a.84.84,0,0,0-1,.94v2.83a.84.84,0,0,0,1,.95H50.63a.84.84,0,0,0,.95-.95V29.62A.84.84,0,0,0,50.63,28.68Zm-40.55,0,4.09-10.06h2.2L12.6,28.68Zm8.18,0H15.43l2.83-10.06h2.2Zm5.65,0H21.08l1.58-10.06h2.2Zm2.83,0,.32-10.06h2.2l.31,10.06Zm5.35-.31v.31l-1-10.37h2.2l1.58,10.06Zm5.65,0v.31l-2.2-10.37h2.2l2.83,10.06Zm5.66.31L40,18.62h2.2l4.08,10.06Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="stap_1_winkels_markten"><path d="M50.63,45.34H48.75L44,35.28h-2.2l4.09,10.06H43.09L39.63,35.28h-2.2l2.83,10.06H37.43L35.54,35h-2.2L34.92,45H32.09L31.14,35h-2.2L29.26,45H26.74L27.06,35h-2.2L23.91,45H21.08L22.66,35h-2.2L18.26,45H15.43L18.26,35H16.05L12.6,45H10.08L14.17,35H11.65L6.94,45H5.37a.84.84,0,0,0-1,.94V48.8a.84.84,0,0,0,1,.94H50.63a.84.84,0,0,0,.95-.94V46C51.58,45.65,51.26,45.34,50.63,45.34Z"/><path d="M50.63,28.68H48.75L44,18.31V7.3a.83.83,0,0,0-.94-.94H12.6c-.32,0-.63.31-.63.94v11L7.25,28.68H5.37a.84.84,0,0,0-1,.94v2.83a.84.84,0,0,0,1,.95H50.63a.84.84,0,0,0,.95-.95V29.62A.84.84,0,0,0,50.63,28.68Zm-40.55,0,4.09-10.06h2.2L12.6,28.68Zm8.18,0H15.43l2.83-10.06h2.2Zm5.65,0H21.08l1.58-10.06h2.2Zm2.83,0,.32-10.06h2.2l.31,10.06Zm5.35-.31v.31l-1-10.37h2.2l1.58,10.06Zm5.65,0v.31l-2.2-10.37h2.2l2.83,10.06Zm5.66.31L40,18.62h2.2l4.08,10.06Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/stap_1_winkels_open.svg b/packages/icons/src/svg/stap_1_winkels_open.svg
index 83da7a1a28..4a1b72d1db 100644
--- a/packages/icons/src/svg/stap_1_winkels_open.svg
+++ b/packages/icons/src/svg/stap_1_winkels_open.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="stap_1_winkels_open"><path d="M51.45,40.05,45,31.23c-.29-.29-.59-.59-.88-.59H39.4l-.3.3-1.17,4.11a1.09,1.09,0,0,0,.29.88l6.47,8.82a.9.9,0,0,0,1.17,0l5.59-4.12A.4.4,0,0,0,51.45,40.05Zm-9.11-5.59c-.59.3-1.18.3-1.47-.29s-.3-1.18.29-1.47,1.18-.29,1.47.29S42.92,34.17,42.34,34.46Z"/><path d="M47,22.41,40.28,12.13a5.25,5.25,0,0,0-2.06-1.47L32.64,8.6c-1.77,2.65-4.71,5.58-7.94,5a.29.29,0,0,1-.29-.3,10.4,10.4,0,0,0,5.29-3.23,17.62,17.62,0,0,1-4.12.59A14.4,14.4,0,0,1,18.82,8.6l-5.58,1.76a5.46,5.46,0,0,0-2.06,1.47L4.42,22.41l6.18,6.17,3.82-3.23v22H37.34V25.06l3.82,3.23Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="stap_1_winkels_open"><path d="M51.45,40.05,45,31.23c-.29-.29-.59-.59-.88-.59H39.4l-.3.3-1.17,4.11a1.09,1.09,0,0,0,.29.88l6.47,8.82a.9.9,0,0,0,1.17,0l5.59-4.12A.4.4,0,0,0,51.45,40.05Zm-9.11-5.59c-.59.3-1.18.3-1.47-.29s-.3-1.18.29-1.47,1.18-.29,1.47.29S42.92,34.17,42.34,34.46Z"/><path d="M47,22.41,40.28,12.13a5.25,5.25,0,0,0-2.06-1.47L32.64,8.6c-1.77,2.65-4.71,5.58-7.94,5a.29.29,0,0,1-.29-.3,10.4,10.4,0,0,0,5.29-3.23,17.62,17.62,0,0,1-4.12.59A14.4,14.4,0,0,1,18.82,8.6l-5.58,1.76a5.46,5.46,0,0,0-2.06,1.47L4.42,22.41l6.18,6.17,3.82-3.23v22H37.34V25.06l3.82,3.23Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/stopwatch.svg b/packages/icons/src/svg/stopwatch.svg
index 872daf4fbe..a45e0b9c0a 100644
--- a/packages/icons/src/svg/stopwatch.svg
+++ b/packages/icons/src/svg/stopwatch.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="stopwatch"><rect x="21.6" y="37.48" width="13.2" height="3.77"/><path d="M28.2,4.48A23.57,23.57,0,1,0,51.78,28.05,23.59,23.59,0,0,0,28.2,4.48ZM41.63,40.14l-2.76-2.75-1.33,1.33,2.75,2.75a17.94,17.94,0,0,1-24.17,0l2.75-2.75-1.34-1.33-2.75,2.75A18,18,0,0,1,10.16,29h3.9V27.11h-3.9A18,18,0,0,1,14.79,16l2.74,2.75,1.34-1.34-2.75-2.74A18.06,18.06,0,0,1,27.26,10v3.91h1.89V10a18,18,0,0,1,11.13,4.64l-2.74,2.74,1.33,1.34L41.61,16a18,18,0,0,1,4.64,11.14h-3.9V29h3.9A18.09,18.09,0,0,1,41.63,40.14Z"/><path d="M28,34.24a3.29,3.29,0,0,0,3-2.6c.2-.94,2.71-14,2.71-14,.21-1.16-1-1.6-1.65-.57L26.7,26.21a3.56,3.56,0,0,1,3,1.32c.36.5.19.68.1.69h0a3.21,3.21,0,0,0-2.16-.7A3.36,3.36,0,0,0,28,34.24Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="stopwatch"><rect x="21.6" y="37.48" width="13.2" height="3.77"/><path d="M28.2,4.48A23.57,23.57,0,1,0,51.78,28.05,23.59,23.59,0,0,0,28.2,4.48ZM41.63,40.14l-2.76-2.75-1.33,1.33,2.75,2.75a17.94,17.94,0,0,1-24.17,0l2.75-2.75-1.34-1.33-2.75,2.75A18,18,0,0,1,10.16,29h3.9V27.11h-3.9A18,18,0,0,1,14.79,16l2.74,2.75,1.34-1.34-2.75-2.74A18.06,18.06,0,0,1,27.26,10v3.91h1.89V10a18,18,0,0,1,11.13,4.64l-2.74,2.74,1.33,1.34L41.61,16a18,18,0,0,1,4.64,11.14h-3.9V29h3.9A18.09,18.09,0,0,1,41.63,40.14Z"/><path d="M28,34.24a3.29,3.29,0,0,0,3-2.6c.2-.94,2.71-14,2.71-14,.21-1.16-1-1.6-1.65-.57L26.7,26.21a3.56,3.56,0,0,1,3,1.32c.36.5.19.68.1.69h0a3.21,3.21,0,0,0-2.16-.7A3.36,3.36,0,0,0,28,34.24Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/taxi.svg b/packages/icons/src/svg/taxi.svg
index fbc2a5e391..29f0270b03 100644
--- a/packages/icons/src/svg/taxi.svg
+++ b/packages/icons/src/svg/taxi.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="taxi"><path d="M49.22,25.09a6.31,6.31,0,0,0,2-2.14A2.08,2.08,0,0,0,49.79,20a12.91,12.91,0,0,0-3.22.16c-.91-3.29-2.49-8.63-3.42-9.59S39.34,9,33.66,8.76V6.11a1,1,0,0,0-.94-1,62,62,0,0,0-9.44,0,1.06,1.06,0,0,0-.94,1V8.76c-5.67.22-8.52.84-9.49,1.85s-2.51,6.3-3.42,9.59A12,12,0,0,0,6.22,20,2.07,2.07,0,0,0,4.77,23a6.1,6.1,0,0,0,2,2.14C5,27.55,4.42,29.68,4.42,33.65V44.5a31.64,31.64,0,0,0,.45,5.28A1.7,1.7,0,0,0,6.56,51.1h6.1a1.7,1.7,0,0,0,1.69-1.32A25.49,25.49,0,0,0,14.76,46L9,44.84c-.3-.1-.25-.29-.24-.35H47.26c0,.06.06.25-.24.35L41.24,46a26.84,26.84,0,0,0,.4,3.79,1.72,1.72,0,0,0,1.7,1.32h6.1a1.7,1.7,0,0,0,1.69-1.32,31.73,31.73,0,0,0,.45-5.29V33.65C51.58,29.68,51,27.55,49.22,25.09Zm-33.57-12c.55-.28,4.61-.74,12.35-.74s11.81.47,12.36.74a66.83,66.83,0,0,1,2.8,9.41c-2.75.76-9,1.29-15.16,1.29s-12.4-.52-15.15-1.29A66.83,66.83,0,0,1,15.65,13.13Zm1.49,24.5h0l-5.55-.44a3.08,3.08,0,0,1-2.7-2.64L8.66,33a1.46,1.46,0,0,1,1.86-1.54L15,32.67a3.44,3.44,0,0,1,2,2.09l.61,2.29A.47.47,0,0,1,17.14,37.63Zm16.52,4H22.34V38.84H33.66Zm13.46-7.12a3.1,3.1,0,0,1-2.71,2.64l-5.55.44a.48.48,0,0,1-.52-.58L39,34.76a3.43,3.43,0,0,1,2-2.09l4.49-1.25A1.46,1.46,0,0,1,47.34,33Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="taxi"><path d="M49.22,25.09a6.31,6.31,0,0,0,2-2.14A2.08,2.08,0,0,0,49.79,20a12.91,12.91,0,0,0-3.22.16c-.91-3.29-2.49-8.63-3.42-9.59S39.34,9,33.66,8.76V6.11a1,1,0,0,0-.94-1,62,62,0,0,0-9.44,0,1.06,1.06,0,0,0-.94,1V8.76c-5.67.22-8.52.84-9.49,1.85s-2.51,6.3-3.42,9.59A12,12,0,0,0,6.22,20,2.07,2.07,0,0,0,4.77,23a6.1,6.1,0,0,0,2,2.14C5,27.55,4.42,29.68,4.42,33.65V44.5a31.64,31.64,0,0,0,.45,5.28A1.7,1.7,0,0,0,6.56,51.1h6.1a1.7,1.7,0,0,0,1.69-1.32A25.49,25.49,0,0,0,14.76,46L9,44.84c-.3-.1-.25-.29-.24-.35H47.26c0,.06.06.25-.24.35L41.24,46a26.84,26.84,0,0,0,.4,3.79,1.72,1.72,0,0,0,1.7,1.32h6.1a1.7,1.7,0,0,0,1.69-1.32,31.73,31.73,0,0,0,.45-5.29V33.65C51.58,29.68,51,27.55,49.22,25.09Zm-33.57-12c.55-.28,4.61-.74,12.35-.74s11.81.47,12.36.74a66.83,66.83,0,0,1,2.8,9.41c-2.75.76-9,1.29-15.16,1.29s-12.4-.52-15.15-1.29A66.83,66.83,0,0,1,15.65,13.13Zm1.49,24.5h0l-5.55-.44a3.08,3.08,0,0,1-2.7-2.64L8.66,33a1.46,1.46,0,0,1,1.86-1.54L15,32.67a3.44,3.44,0,0,1,2,2.09l.61,2.29A.47.47,0,0,1,17.14,37.63Zm16.52,4H22.34V38.84H33.66Zm13.46-7.12a3.1,3.1,0,0,1-2.71,2.64l-5.55.44a.48.48,0,0,1-.52-.58L39,34.76a3.43,3.43,0,0,1,2-2.09l4.49-1.25A1.46,1.46,0,0,1,47.34,33Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/testbewijs.svg b/packages/icons/src/svg/testbewijs.svg
index b096ca0c79..0e9c990afc 100644
--- a/packages/icons/src/svg/testbewijs.svg
+++ b/packages/icons/src/svg/testbewijs.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="testbewijs"><path d="M39.08,21.52l-.62-.45c-.29-.2-.65-.45-1.1-.78a11.33,11.33,0,0,1-2-1.73A4,4,0,0,1,35,17c0-.31-.08-.64-.14-1-.28-1.53-2.46-4.76-2.46-4.76.45-1.74-.91-7-9.61-4.68-6.64,1.77-9.5,5.27-10.73,8.12.82,0,1.64-.06,2.46-.06a56.13,56.13,0,0,1,8,.58,4.28,4.28,0,0,1,3.57,4.16V40.8h7.79a23.06,23.06,0,0,1-.39-4.34,7,7,0,0,1-3.76-1.38c-.43-.32-.36-.43-.32-.49l0,0a11.8,11.8,0,0,0,5.94.78c2-.18,3.23-1.33,2.67-3.71a2,2,0,0,1,.4-1.46,1.74,1.74,0,0,0,.11-.18c.33-.5.54-.83,0-1.48a4,4,0,0,0-.52-.56,2.66,2.66,0,0,0,.7-.95.86.86,0,0,0-.18-1,2.77,2.77,0,0,1-.28-.4,2.28,2.28,0,0,1-.3-1.05s.69-.59,1.18-1.11A1.15,1.15,0,0,0,39.08,21.52Z"/><path d="M51.44,33.83l-7.23-6.07a.74.74,0,0,0-.25-.69l-2.85-2.4a.77.77,0,0,0-1.06.09.76.76,0,0,0,.1,1.06L43,28.21a.7.7,0,0,0,.72.12L51,34.41a.38.38,0,0,0,.48-.58Z"/><path d="M13.24,35a1,1,0,0,0,.77.45h0a.91.91,0,0,0,.77-.44c2.82-4.46,4.49-7,4.49-7a.89.89,0,0,0-1.43-1.06l-3.91,4.4L11.36,29a.91.91,0,0,0-1.16,0,.89.89,0,0,0-.2,1.14S11.41,32.29,13.24,35Z"/><path d="M22.28,16.73a53.74,53.74,0,0,0-15.51,0,2.81,2.81,0,0,0-2.35,2.68v27.1a2.86,2.86,0,0,0,2.4,2.68,53.39,53.39,0,0,0,15.46,0,2.76,2.76,0,0,0,2.3-2.68V19.41A2.76,2.76,0,0,0,22.28,16.73ZM14.5,47.87a1.81,1.81,0,1,1,1.81-1.81A1.81,1.81,0,0,1,14.5,47.87Zm7.09-5.58H7.41V20.65H21.59Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="testbewijs"><path d="M39.08,21.52l-.62-.45c-.29-.2-.65-.45-1.1-.78a11.33,11.33,0,0,1-2-1.73A4,4,0,0,1,35,17c0-.31-.08-.64-.14-1-.28-1.53-2.46-4.76-2.46-4.76.45-1.74-.91-7-9.61-4.68-6.64,1.77-9.5,5.27-10.73,8.12.82,0,1.64-.06,2.46-.06a56.13,56.13,0,0,1,8,.58,4.28,4.28,0,0,1,3.57,4.16V40.8h7.79a23.06,23.06,0,0,1-.39-4.34,7,7,0,0,1-3.76-1.38c-.43-.32-.36-.43-.32-.49l0,0a11.8,11.8,0,0,0,5.94.78c2-.18,3.23-1.33,2.67-3.71a2,2,0,0,1,.4-1.46,1.74,1.74,0,0,0,.11-.18c.33-.5.54-.83,0-1.48a4,4,0,0,0-.52-.56,2.66,2.66,0,0,0,.7-.95.86.86,0,0,0-.18-1,2.77,2.77,0,0,1-.28-.4,2.28,2.28,0,0,1-.3-1.05s.69-.59,1.18-1.11A1.15,1.15,0,0,0,39.08,21.52Z"/><path d="M51.44,33.83l-7.23-6.07a.74.74,0,0,0-.25-.69l-2.85-2.4a.77.77,0,0,0-1.06.09.76.76,0,0,0,.1,1.06L43,28.21a.7.7,0,0,0,.72.12L51,34.41a.38.38,0,0,0,.48-.58Z"/><path d="M13.24,35a1,1,0,0,0,.77.45h0a.91.91,0,0,0,.77-.44c2.82-4.46,4.49-7,4.49-7a.89.89,0,0,0-1.43-1.06l-3.91,4.4L11.36,29a.91.91,0,0,0-1.16,0,.89.89,0,0,0-.2,1.14S11.41,32.29,13.24,35Z"/><path d="M22.28,16.73a53.74,53.74,0,0,0-15.51,0,2.81,2.81,0,0,0-2.35,2.68v27.1a2.86,2.86,0,0,0,2.4,2.68,53.39,53.39,0,0,0,15.46,0,2.76,2.76,0,0,0,2.3-2.68V19.41A2.76,2.76,0,0,0,22.28,16.73ZM14.5,47.87a1.81,1.81,0,1,1,1.81-1.81A1.81,1.81,0,0,1,14.5,47.87Zm7.09-5.58H7.41V20.65H21.59Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/toegangsbewijzen.svg b/packages/icons/src/svg/toegangsbewijzen.svg
index df2f0231fa..5d4144b7b2 100644
--- a/packages/icons/src/svg/toegangsbewijzen.svg
+++ b/packages/icons/src/svg/toegangsbewijzen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="toegangsbewijzen"><path d="M8.34,19.26l-2.47-.73c-.27,0-.16-.29-.16-.29H17a.79.79,0,0,0,.78-.78V6.18a.33.33,0,0,1,.29.19l.73,2.47h13.1v2c1.32-.16,2.69-.27,4-.35V6.47a1.62,1.62,0,0,0-.47-1.11,1.65,1.65,0,0,0-1.11-.47H17.64a1.59,1.59,0,0,0-1.11.48L4.88,17a1.57,1.57,0,0,0-.46,1.1V42.59a1.53,1.53,0,0,0,.12.6,1.41,1.41,0,0,0,.35.51A1.57,1.57,0,0,0,5.4,44a1.61,1.61,0,0,0,.61.11H26.42V40.23H8.34Z"/><path d="M38.26,33.78l0,.17a1.1,1.1,0,0,0,.38.36,1.08,1.08,0,0,0,.5.15,1.11,1.11,0,0,0,.51-.14,1,1,0,0,0,.38-.37l5.23-8.25A1,1,0,0,0,45,24.33a1.14,1.14,0,0,0-.7-.26,1.1,1.1,0,0,0-.7.26l-4.57,5.16-3-2.69a1.07,1.07,0,0,0-1.35,0,1,1,0,0,0-.37.61,1,1,0,0,0,.13.71S36.11,30.64,38.26,33.78Z"/><path d="M50.8,13.71a3.2,3.2,0,0,0-1.91-1.09h0a62.58,62.58,0,0,0-18.13,0A3.31,3.31,0,0,0,28,15.77V47.43a3.41,3.41,0,0,0,.85,2.07,3.35,3.35,0,0,0,2,1.07,63.39,63.39,0,0,0,18,0,3.25,3.25,0,0,0,2.69-3.14V15.77A3.23,3.23,0,0,0,50.8,13.71Zm-9,34a2,2,0,0,1-.48.69,2.13,2.13,0,0,1-.7.44,2.21,2.21,0,0,1-.8.14h0a2.2,2.2,0,0,1-1.16-.36,2.1,2.1,0,0,1-.78-1,2.07,2.07,0,0,1-.11-1.23,2.11,2.11,0,0,1,1.68-1.66,2.17,2.17,0,0,1,1.23.14,2.12,2.12,0,0,1,.94.79,2.15,2.15,0,0,1,.35,1.19A2.11,2.11,0,0,1,41.77,47.74Zm6.69-5.15H31.17V17.46H48.46Z"/><rect x="20.91" y="15.87" width="5.5" height="2.36"/><rect x="16.99" y="23.74" width="9.43" height="2.36"/><rect x="11.49" y="23.74" width="3.92" height="2.36"/><rect x="16.99" y="28.44" width="9.43" height="2.36"/><rect x="11.49" y="28.44" width="3.92" height="2.36"/><rect x="11.49" y="33.14" width="3.92" height="2.36"/><rect x="16.99" y="33.14" width="9.43" height="2.36"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="toegangsbewijzen"><path d="M8.34,19.26l-2.47-.73c-.27,0-.16-.29-.16-.29H17a.79.79,0,0,0,.78-.78V6.18a.33.33,0,0,1,.29.19l.73,2.47h13.1v2c1.32-.16,2.69-.27,4-.35V6.47a1.62,1.62,0,0,0-.47-1.11,1.65,1.65,0,0,0-1.11-.47H17.64a1.59,1.59,0,0,0-1.11.48L4.88,17a1.57,1.57,0,0,0-.46,1.1V42.59a1.53,1.53,0,0,0,.12.6,1.41,1.41,0,0,0,.35.51A1.57,1.57,0,0,0,5.4,44a1.61,1.61,0,0,0,.61.11H26.42V40.23H8.34Z"/><path d="M38.26,33.78l0,.17a1.1,1.1,0,0,0,.38.36,1.08,1.08,0,0,0,.5.15,1.11,1.11,0,0,0,.51-.14,1,1,0,0,0,.38-.37l5.23-8.25A1,1,0,0,0,45,24.33a1.14,1.14,0,0,0-.7-.26,1.1,1.1,0,0,0-.7.26l-4.57,5.16-3-2.69a1.07,1.07,0,0,0-1.35,0,1,1,0,0,0-.37.61,1,1,0,0,0,.13.71S36.11,30.64,38.26,33.78Z"/><path d="M50.8,13.71a3.2,3.2,0,0,0-1.91-1.09h0a62.58,62.58,0,0,0-18.13,0A3.31,3.31,0,0,0,28,15.77V47.43a3.41,3.41,0,0,0,.85,2.07,3.35,3.35,0,0,0,2,1.07,63.39,63.39,0,0,0,18,0,3.25,3.25,0,0,0,2.69-3.14V15.77A3.23,3.23,0,0,0,50.8,13.71Zm-9,34a2,2,0,0,1-.48.69,2.13,2.13,0,0,1-.7.44,2.21,2.21,0,0,1-.8.14h0a2.2,2.2,0,0,1-1.16-.36,2.1,2.1,0,0,1-.78-1,2.07,2.07,0,0,1-.11-1.23,2.11,2.11,0,0,1,1.68-1.66,2.17,2.17,0,0,1,1.23.14,2.12,2.12,0,0,1,.94.79,2.15,2.15,0,0,1,.35,1.19A2.11,2.11,0,0,1,41.77,47.74Zm6.69-5.15H31.17V17.46H48.46Z"/><rect x="20.91" y="15.87" width="5.5" height="2.36"/><rect x="16.99" y="23.74" width="9.43" height="2.36"/><rect x="11.49" y="23.74" width="3.92" height="2.36"/><rect x="16.99" y="28.44" width="9.43" height="2.36"/><rect x="11.49" y="28.44" width="3.92" height="2.36"/><rect x="11.49" y="33.14" width="3.92" height="2.36"/><rect x="16.99" y="33.14" width="9.43" height="2.36"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/travel.svg b/packages/icons/src/svg/travel.svg
index 9fcc6b3fa4..8d8695332d 100644
--- a/packages/icons/src/svg/travel.svg
+++ b/packages/icons/src/svg/travel.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="travel"><path d="M29.23,10c2.27-1,3.66-2.38,3.5-3.41S30.45,4.52,26.91,6L21.65,8.29,13.08,5.18a.69.69,0,0,0-.51,0l-.71.31a.22.22,0,0,0-.07.36l4.51,4.72-.38.16c-1.91.82-3.5,1.61-4.79,2.32L5.82,10.35a.69.69,0,0,0-.58,0l-.68.29a.23.23,0,0,0-.08.36L8,15a10.4,10.4,0,0,0-.93.75.46.46,0,0,0,.21.81c2.38.36,7.09-.63,10.05-1.55l-2.18,7.64a.23.23,0,0,0,.31.27L17,22.27a.67.67,0,0,0,.3-.25l6.39-9.6Z"/><path d="M49.9,32.34a4.35,4.35,0,0,0,1.43-1.52,1.47,1.47,0,0,0-1-2.07,8.89,8.89,0,0,0-2.28.11c-.65-2.34-1.78-6.14-2.44-6.83-.89-.92-4-1.38-10.79-1.38S24.89,21.11,24,22c-.66.69-1.79,4.49-2.44,6.83a8.54,8.54,0,0,0-2.29-.11,1.47,1.47,0,0,0-1,2.07,4.31,4.31,0,0,0,1.44,1.52c-1.3,1.75-1.68,3.27-1.68,6.1v7.72a23.26,23.26,0,0,0,.31,3.76,1.23,1.23,0,0,0,1.21.94h4.34a1.23,1.23,0,0,0,1.21-.94,19.85,19.85,0,0,0,.29-2.7s-3.69-.84-4-.92-.35-.16-.31-.39H48.5c0,.23-.09.33-.31.39s-4,.92-4,.92a17.11,17.11,0,0,0,.29,2.7,1.21,1.21,0,0,0,1.2.94h4.34a1.21,1.21,0,0,0,1.21-.94,22.55,22.55,0,0,0,.32-3.76V38.44C51.58,35.61,51.2,34.09,49.9,32.34ZM26,23.83c.4-.2,3.29-.53,8.8-.53s8.41.33,8.8.53a46.58,46.58,0,0,1,2,6.7,51.58,51.58,0,0,1-10.79.91A51.58,51.58,0,0,1,24,30.53,47.9,47.9,0,0,1,26,23.83Zm1.07,17.44L23.11,41a2.22,2.22,0,0,1-1.93-1.88L21,38a1,1,0,0,1,1.33-1.1l3.2.89A2.41,2.41,0,0,1,27,39.23l.44,1.63A.34.34,0,0,1,27.06,41.27Zm11.42,2.22H31.11V41.85h7.37ZM48.56,38l-.16,1.13A2.21,2.21,0,0,1,46.48,41l-4,.31a.34.34,0,0,1-.37-.41l.44-1.63A2.41,2.41,0,0,1,44,37.74l3.2-.89A1,1,0,0,1,48.56,38Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="travel"><path d="M29.23,10c2.27-1,3.66-2.38,3.5-3.41S30.45,4.52,26.91,6L21.65,8.29,13.08,5.18a.69.69,0,0,0-.51,0l-.71.31a.22.22,0,0,0-.07.36l4.51,4.72-.38.16c-1.91.82-3.5,1.61-4.79,2.32L5.82,10.35a.69.69,0,0,0-.58,0l-.68.29a.23.23,0,0,0-.08.36L8,15a10.4,10.4,0,0,0-.93.75.46.46,0,0,0,.21.81c2.38.36,7.09-.63,10.05-1.55l-2.18,7.64a.23.23,0,0,0,.31.27L17,22.27a.67.67,0,0,0,.3-.25l6.39-9.6Z"/><path d="M49.9,32.34a4.35,4.35,0,0,0,1.43-1.52,1.47,1.47,0,0,0-1-2.07,8.89,8.89,0,0,0-2.28.11c-.65-2.34-1.78-6.14-2.44-6.83-.89-.92-4-1.38-10.79-1.38S24.89,21.11,24,22c-.66.69-1.79,4.49-2.44,6.83a8.54,8.54,0,0,0-2.29-.11,1.47,1.47,0,0,0-1,2.07,4.31,4.31,0,0,0,1.44,1.52c-1.3,1.75-1.68,3.27-1.68,6.1v7.72a23.26,23.26,0,0,0,.31,3.76,1.23,1.23,0,0,0,1.21.94h4.34a1.23,1.23,0,0,0,1.21-.94,19.85,19.85,0,0,0,.29-2.7s-3.69-.84-4-.92-.35-.16-.31-.39H48.5c0,.23-.09.33-.31.39s-4,.92-4,.92a17.11,17.11,0,0,0,.29,2.7,1.21,1.21,0,0,0,1.2.94h4.34a1.21,1.21,0,0,0,1.21-.94,22.55,22.55,0,0,0,.32-3.76V38.44C51.58,35.61,51.2,34.09,49.9,32.34ZM26,23.83c.4-.2,3.29-.53,8.8-.53s8.41.33,8.8.53a46.58,46.58,0,0,1,2,6.7,51.58,51.58,0,0,1-10.79.91A51.58,51.58,0,0,1,24,30.53,47.9,47.9,0,0,1,26,23.83Zm1.07,17.44L23.11,41a2.22,2.22,0,0,1-1.93-1.88L21,38a1,1,0,0,1,1.33-1.1l3.2.89A2.41,2.41,0,0,1,27,39.23l.44,1.63A.34.34,0,0,1,27.06,41.27Zm11.42,2.22H31.11V41.85h7.37ZM48.56,38l-.16,1.13A2.21,2.21,0,0,1,46.48,41l-4,.31a.34.34,0,0,1-.37-.41l.44-1.63A2.41,2.41,0,0,1,44,37.74l3.2-.89A1,1,0,0,1,48.56,38Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/unchecked.svg b/packages/icons/src/svg/unchecked.svg
index 1646e26d25..7522cb1fd4 100644
--- a/packages/icons/src/svg/unchecked.svg
+++ b/packages/icons/src/svg/unchecked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="unchecked"><path d="M51.58,51.63H4.42V4.48H51.58ZM7.79,48.26H48.21V7.84H7.79Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="unchecked"><path d="M51.58,51.63H4.42V4.48H51.58ZM7.79,48.26H48.21V7.84H7.79Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/up.svg b/packages/icons/src/svg/up.svg
index 273a9526b9..6fdba19e6f 100644
--- a/packages/icons/src/svg/up.svg
+++ b/packages/icons/src/svg/up.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="up"><path d="M48.81,27.8,31,5.6a3.48,3.48,0,0,0-5.22,0L8.06,27.8A2.91,2.91,0,0,0,8.32,32a3.19,3.19,0,0,0,4.18.52l9.4-6.27v20.9c0,3.4,3.66,4.44,6.79,4.44s6.27-1,6.27-4.44V26.23l9.41,6.27a4.84,4.84,0,0,0,1.82.53A2.87,2.87,0,0,0,48.55,32,3.18,3.18,0,0,0,48.81,27.8Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="up"><path d="M48.81,27.8,31,5.6a3.48,3.48,0,0,0-5.22,0L8.06,27.8A2.91,2.91,0,0,0,8.32,32a3.19,3.19,0,0,0,4.18.52l9.4-6.27v20.9c0,3.4,3.66,4.44,6.79,4.44s6.27-1,6.27-4.44V26.23l9.41,6.27a4.84,4.84,0,0,0,1.82.53A2.87,2.87,0,0,0,48.55,32,3.18,3.18,0,0,0,48.81,27.8Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/vaccinaties.svg b/packages/icons/src/svg/vaccinaties.svg
index ec395fc203..89f1c8d185 100644
--- a/packages/icons/src/svg/vaccinaties.svg
+++ b/packages/icons/src/svg/vaccinaties.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="vaccinaties"><path d="M50.05,13.35c-1.18-1.28-6.5-7-7.69-8.27s-3.11.42-2.29,2c1,1.84,1.46,2.69,1.46,2.69l-4.34,4.66s.74,1.58,2,4.34c.13.27,0,.37-.06.4l-8.28-8.89c-1-1-2.93.56-2.07,2.19s2,3.71,2,3.71L16.49,31.57a3.78,3.78,0,0,0-.92,1.84l-1.5,8.46L5.5,51.4H8.39l7.42-7.66,7.89-1.59a3.34,3.34,0,0,0,1.72-1L39.75,25.77s2,1.28,3.44,2.18,3-1.18,2-2.23l-5.11-5.5,5.57-6s.79.55,2.5,1.57A1.56,1.56,0,0,0,50.05,13.35ZM34.18,26.6l-2.37-2.55L30.62,26.6l1.78,1.92-1.78,1.91-2.38-2.55-1.18,2.55,1.78,1.91-1.78,1.92-2.38-2.55-1.19,2.55,1.78,1.91-1.78,1.91-4.15-4.46L33,19l4.16,4.46Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="vaccinaties"><path d="M50.05,13.35c-1.18-1.28-6.5-7-7.69-8.27s-3.11.42-2.29,2c1,1.84,1.46,2.69,1.46,2.69l-4.34,4.66s.74,1.58,2,4.34c.13.27,0,.37-.06.4l-8.28-8.89c-1-1-2.93.56-2.07,2.19s2,3.71,2,3.71L16.49,31.57a3.78,3.78,0,0,0-.92,1.84l-1.5,8.46L5.5,51.4H8.39l7.42-7.66,7.89-1.59a3.34,3.34,0,0,0,1.72-1L39.75,25.77s2,1.28,3.44,2.18,3-1.18,2-2.23l-5.11-5.5,5.57-6s.79.55,2.5,1.57A1.56,1.56,0,0,0,50.05,13.35ZM34.18,26.6l-2.37-2.55L30.62,26.6l1.78,1.92-1.78,1.91-2.38-2.55-1.18,2.55,1.78,1.91-1.78,1.92-2.38-2.55-1.19,2.55,1.78,1.91-1.78,1.91-4.15-4.46L33,19l4.16,4.46Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/varianten.svg b/packages/icons/src/svg/varianten.svg
index 4458bdde9e..8460bde5ed 100644
--- a/packages/icons/src/svg/varianten.svg
+++ b/packages/icons/src/svg/varianten.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor">
    <g id="varianten">
       <path d="M10.7,20.13A15.47,15.47,0,0,1,15.06,20L15,13.58,13,13.5c-.47-.07-.46-.37-.44-.47h.06a4.48,4.48,0,0,0,2.22-.63.05.05,0,0,0,0,0h0A4.31,4.31,0,1,0,8.27,8.89a4.23,4.23,0,0,0,2.33,3.63v0s0,0,0,.08Z" />
       <path d="M29,25.72a14.87,14.87,0,0,0-3.18-3l3.36-3.5.07-.05,0,0a4.24,4.24,0,0,1,1-4.2,4.41,4.41,0,0,1,6.16-.22,4.28,4.28,0,0,1,.23,6.09,4.38,4.38,0,0,1-4.17,1.24h0l0,0a4.47,4.47,0,0,1-2-1.1l0,0c-.08.05-.31.25,0,.63L31.65,23Z" />
       <path d="M34.73,42.36a14.75,14.75,0,0,0-.13-4.31l7.58-.12h.11a4.33,4.33,0,1,1,.17,4.27h0a.09.09,0,0,1,0,0A4.42,4.42,0,0,1,41.78,40v-.06c-.09,0-.4,0-.47.43l-.08,1.93Z" />
-      <path d="M28.09,50.59l-.91,1H5.52V24.41a18,18,0,0,1,5.8-1.95,15.88,15.88,0,0,1,4.34-.17,17.72,17.72,0,0,1,8.75,3.21,15.5,15.5,0,0,1,4.39,4.42,17.59,17.59,0,0,1,2.52,5.51,19.55,19.55,0,0,1,.06,8.48A17.5,17.5,0,0,1,28.09,50.59ZM21.4,34a2.93,2.93,0,0,0,1.67,3.81,3,3,0,0,0,3.86-1.61,2.92,2.92,0,0,0-1.66-3.8A3,3,0,0,0,21.4,34Zm-9-3.54A2.19,2.19,0,1,1,14,26.4a2.18,2.18,0,0,1,1.25,2.85A2.24,2.24,0,0,1,12.37,30.46Zm9.05,15.36a2.19,2.19,0,0,0,1.25,2.86,2.24,2.24,0,0,0,2.9-1.2,2.21,2.21,0,0,0-1.25-2.86A2.23,2.23,0,0,0,21.42,45.82Zm-7.22-2a4.39,4.39,0,0,1-2.5-5.71,4.44,4.44,0,0,1,5.79-2.4A4.37,4.37,0,0,1,20,41.38,4.47,4.47,0,0,1,14.2,43.79Z" />
+      <path d="M28.09,50.59l-.91,1H5.52V24.41a18,18,0,0,1,5.8-1.95,15.88,15.88,0,0,1,4.34-.17,17.72,17.72,0,0,1,8.75,3.21,15.5,15.5,0,0,1,4.39,4.42,17.59,17.59,0,0,1,2.52,5.51,19.55,19.55,0,0,1,.06,8.48A17.5,17.5,0,0,1,28.09,50.59ZM21.4,34a2.93,2.93,0,0,0,1.67,3.81,3,3,0,0,0,3.86-1.61,2.92,2.92,0,0,0-1.66-3.8A3,3,0,0,0,21.4,34Zm-9-3.54A2.19,2.19,0,1,1,14,26.4a2.18,2.18,0,0,1,1.25,2.85A2.24,2.24,0,0,1,12.37,30.46Zm9.05,15.36a2.19,2.19,0,0,0,1.25,2.86,2.24,2.24,0,0,0,2.9-1.2,2.21,2.21,0,0,0-1.25-2.86A2.23,2.23,0,0,0,21.42,45.82Zm-7.22-2a4.39,4.39,0,0,1-2.5-5.71,4.44,4.44,0,0,1,5.79-2.4A4.37,4.37,0,0,1,20,41.38,4.47,4.47,0,0,1,14.2,43.79Z" fill-rule="evenodd" />
    </g>
 </svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/verpleeghuis.svg b/packages/icons/src/svg/verpleeghuis.svg
index 3b587fdd26..7a1a722d69 100644
--- a/packages/icons/src/svg/verpleeghuis.svg
+++ b/packages/icons/src/svg/verpleeghuis.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="verpleeghuis"><path d="M32.4,13.52H50.78a.82.82,0,0,1,.8.83v34.5H30.51c0-.4.06-2.36.14-4.69.13-3.68.3-8.27.22-9a20.1,20.1,0,0,0-1.53-4.7l-.08-.19,0,0c-.62-1.42-1.56-3.61-3.7-4.3-3.42-1.11-4.16,2-4.42,3.15,0,.09,0,.16-.06.23-.42,1.59-.44,1.69-.48,1.8s0,.12-.12.41a15.45,15.45,0,0,1-1.3,2.47c-.45.75-.93,1.57-1.36,2.42a1.56,1.56,0,0,0-.09.47s0,.8.05,2c0,.77.07,1.71.12,2.71,0,.56.05,1.13.07,1.71l.26,5.6h-5.9a51.85,51.85,0,0,0,2.24-9.11,8.76,8.76,0,0,1-1,.08A7.72,7.72,0,0,1,5.9,32a8,8,0,0,1,.66-3.17A7.37,7.37,0,0,1,8.34,17.13q0-.35,0-.69a6.94,6.94,0,0,1,6.85-7l.55,0a6.74,6.74,0,0,1,5.06-2.3,6.87,6.87,0,0,1,6.46,4.69,8,8,0,0,1,4.92,7.44A8.45,8.45,0,0,1,32,21a8,8,0,0,1,2.16,5.51,8.26,8.26,0,0,1-.58,3,8.52,8.52,0,0,0,.58-9.48c0-.27,0-.54,0-.82A10.26,10.26,0,0,0,32.4,13.52ZM19.66,22.44c.36,1.67,1.55,2.63,3.17,2.26s2.34-1.6,2-3.42h0v0h0s-.45-2.82-1.72-3S17.17,21,17.32,21.79c.09.45,1.23.35,2,.29l.31,0a.45.45,0,0,0,0,.11C19.63,22.25,19.64,22.34,19.66,22.44Zm19.1,19H46v-7.4H38.76Zm0-14H46V20.1H38.76Z"/><path d="M23.19,31.54a11.65,11.65,0,0,1-.72,1.8l-.24.42a25.07,25.07,0,0,1-2.4,3.65,1.22,1.22,0,0,1-.25.2c0,.32,0,.72,0,1.18,0,.77,0,1.71,0,2.71h0c0,.56,0,1.14,0,1.71,0,1.32,0,2.63,0,3.72h0c0,.78,0,1.44,0,1.92H22.6l0-.55c.1-2.84.15-4.35.34-6.29a21.7,21.7,0,0,1,1.66-4.1c.27-.56.51-1.08.68-1.47C24.74,35,23.92,33.15,23.19,31.54Z"/><path d="M25.15,48.7l0,.15h3l-.71-8.17c-.3.52-.6,1.06-.84,1.55C26.15,43.05,25.91,44.41,25.15,48.7Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="verpleeghuis"><path d="M32.4,13.52H50.78a.82.82,0,0,1,.8.83v34.5H30.51c0-.4.06-2.36.14-4.69.13-3.68.3-8.27.22-9a20.1,20.1,0,0,0-1.53-4.7l-.08-.19,0,0c-.62-1.42-1.56-3.61-3.7-4.3-3.42-1.11-4.16,2-4.42,3.15,0,.09,0,.16-.06.23-.42,1.59-.44,1.69-.48,1.8s0,.12-.12.41a15.45,15.45,0,0,1-1.3,2.47c-.45.75-.93,1.57-1.36,2.42a1.56,1.56,0,0,0-.09.47s0,.8.05,2c0,.77.07,1.71.12,2.71,0,.56.05,1.13.07,1.71l.26,5.6h-5.9a51.85,51.85,0,0,0,2.24-9.11,8.76,8.76,0,0,1-1,.08A7.72,7.72,0,0,1,5.9,32a8,8,0,0,1,.66-3.17A7.37,7.37,0,0,1,8.34,17.13q0-.35,0-.69a6.94,6.94,0,0,1,6.85-7l.55,0a6.74,6.74,0,0,1,5.06-2.3,6.87,6.87,0,0,1,6.46,4.69,8,8,0,0,1,4.92,7.44A8.45,8.45,0,0,1,32,21a8,8,0,0,1,2.16,5.51,8.26,8.26,0,0,1-.58,3,8.52,8.52,0,0,0,.58-9.48c0-.27,0-.54,0-.82A10.26,10.26,0,0,0,32.4,13.52ZM19.66,22.44c.36,1.67,1.55,2.63,3.17,2.26s2.34-1.6,2-3.42h0v0h0s-.45-2.82-1.72-3S17.17,21,17.32,21.79c.09.45,1.23.35,2,.29l.31,0a.45.45,0,0,0,0,.11C19.63,22.25,19.64,22.34,19.66,22.44Zm19.1,19H46v-7.4H38.76Zm0-14H46V20.1H38.76Z"/><path d="M23.19,31.54a11.65,11.65,0,0,1-.72,1.8l-.24.42a25.07,25.07,0,0,1-2.4,3.65,1.22,1.22,0,0,1-.25.2c0,.32,0,.72,0,1.18,0,.77,0,1.71,0,2.71h0c0,.56,0,1.14,0,1.71,0,1.32,0,2.63,0,3.72h0c0,.78,0,1.44,0,1.92H22.6l0-.55c.1-2.84.15-4.35.34-6.29a21.7,21.7,0,0,1,1.66-4.1c.27-.56.51-1.08.68-1.47C24.74,35,23.92,33.15,23.19,31.54Z"/><path d="M25.15,48.7l0,.15h3l-.71-8.17c-.3.52-.6,1.06-.84,1.55C26.15,43.05,25.91,44.41,25.15,48.7Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/vervoer_en_reizen_buitenland.svg b/packages/icons/src/svg/vervoer_en_reizen_buitenland.svg
index f1f867b02a..4aa2e40c42 100644
--- a/packages/icons/src/svg/vervoer_en_reizen_buitenland.svg
+++ b/packages/icons/src/svg/vervoer_en_reizen_buitenland.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="vervoer_en_reizen_buitenland"><path d="M7.4,4.42,4.82,7l8.59,8.6h-.62a3.73,3.73,0,0,0-3.48,3.49,134.47,134.47,0,0,0,0,21.8,3.75,3.75,0,0,0,3.48,3.49H42.2l6.23,6.23L51,48ZM20.64,28.68l-5.23-2.62,2.82-5.64,4.24,4.24Z"/><path d="M48.55,40.89a136.77,136.77,0,0,0,0-21.8,3.8,3.8,0,0,0-3.78-3.49h-9.3V12.11A3.53,3.53,0,0,0,32,8.62H25.59a3.53,3.53,0,0,0-3.49,3.49v2.94L48.45,41.4A3.84,3.84,0,0,0,48.55,40.89ZM32.27,15.6H25.59V12.11h6.68Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="vervoer_en_reizen_buitenland"><path d="M7.4,4.42,4.82,7l8.59,8.6h-.62a3.73,3.73,0,0,0-3.48,3.49,134.47,134.47,0,0,0,0,21.8,3.75,3.75,0,0,0,3.48,3.49H42.2l6.23,6.23L51,48ZM20.64,28.68l-5.23-2.62,2.82-5.64,4.24,4.24Z"/><path d="M48.55,40.89a136.77,136.77,0,0,0,0-21.8,3.8,3.8,0,0,0-3.78-3.49h-9.3V12.11A3.53,3.53,0,0,0,32,8.62H25.59a3.53,3.53,0,0,0-3.49,3.49v2.94L48.45,41.4A3.84,3.84,0,0,0,48.55,40.89ZM32.27,15.6H25.59V12.11h6.68Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/vervoer_en_reizen_ov.svg b/packages/icons/src/svg/vervoer_en_reizen_ov.svg
index 8122fe01e1..bf84fb0eea 100644
--- a/packages/icons/src/svg/vervoer_en_reizen_ov.svg
+++ b/packages/icons/src/svg/vervoer_en_reizen_ov.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="vervoer_en_reizen_ov"><path d="M51,13.07c-1.1-2.23-3.86-7.25-4.68-7.81C45,4.7,39.72,4.42,35.86,4.42c-4.14,0-9.38.28-10.75.84-1.11.56-3.59,5.58-4.69,7.81a8.16,8.16,0,0,0-.55,2.51L20.69,34c.28,10.32,9.1,11.71,15.17,11.71S50.47,44.32,51,34l.55-18.42A8.16,8.16,0,0,0,51,13.07ZM35.86,8.33a2.51,2.51,0,1,1-2.48,2.51A2.48,2.48,0,0,1,35.86,8.33Zm-7.17,29a2.51,2.51,0,1,1,2.48-2.51A2.48,2.48,0,0,1,28.69,37.34Zm14.06,0a2.51,2.51,0,1,1,2.48-2.51A2.48,2.48,0,0,1,42.75,37.34ZM47.16,16.7l-2.75,8.65c0,.28-.28.55-.83.55h-16c-.28,0-.56-.27-.83-.55L24,16.7a1.2,1.2,0,0,1,1.11-1.12h21.5A.82.82,0,0,1,47.16,16.7Z"/><path d="M12.42,21.16a1.94,1.94,0,0,0,2.48-1.95c.28-1.67-.55-2.79-1.93-2.79-1.1-.56-1.93.56-2.2,1.95A2.13,2.13,0,0,0,12.42,21.16Z"/><path d="M15.18,27a7,7,0,0,1-.55-1.67,8.1,8.1,0,0,0-.55-1.68c-.28-.83-3-2.23-5-1.11a32,32,0,0,0-3.58,2.79,9.26,9.26,0,0,0-.83,2.23,9.8,9.8,0,0,0-.27,2.79A2.09,2.09,0,0,0,5.8,32.32c0-.27.09-.56.14-.85a17.48,17.48,0,0,1,1-4.17,8.6,8.6,0,0,1,1.65-1.4c-.05.24-.11.55-.18.91C8,28.54,7.46,31.35,7.46,32a2.89,2.89,0,0,0,1.1,2.23l1.66,2s0,.28-.28,0L8.29,35.11A18.9,18.9,0,0,1,6.91,39.3a12,12,0,0,1-1,1.53,11.94,11.94,0,0,0-1,1.53,2.62,2.62,0,0,0,.12,3,.8.8,0,0,1,.15.3c.55-.7,1.24-1.6,1.93-2.51s1.38-1.81,1.93-2.51A17,17,0,0,0,11,36.78l1.93,2,2.48,5.58a2.36,2.36,0,0,0,2.76,1.39c-.07-.22-.24-.85-.46-1.69-.62-2.4-1.68-6.48-2.3-7.51a12.7,12.7,0,0,0-1.37-2A11.71,11.71,0,0,1,12.7,32.6,8.75,8.75,0,0,1,13,29.08c.08-.33.15-.64.21-.94a7.66,7.66,0,0,0,1.66,2.66c.23.26.49.56.82,1a2.58,2.58,0,0,0,2.53.6l.23,0a21.78,21.78,0,0,0-1.78-2.18A5.07,5.07,0,0,1,15.18,27Z"/><path d="M44,46.64a23.63,23.63,0,0,1-2.89.75l.82,4.18h4.69l-1.38-5.3C44.85,46.37,44.44,46.5,44,46.64Z"/><path d="M26.48,46.27l-1.65,5.3h4.69l.82-4.18a22.24,22.24,0,0,1-2.4-.68C27.42,46.54,26.93,46.38,26.48,46.27Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="vervoer_en_reizen_ov"><path d="M51,13.07c-1.1-2.23-3.86-7.25-4.68-7.81C45,4.7,39.72,4.42,35.86,4.42c-4.14,0-9.38.28-10.75.84-1.11.56-3.59,5.58-4.69,7.81a8.16,8.16,0,0,0-.55,2.51L20.69,34c.28,10.32,9.1,11.71,15.17,11.71S50.47,44.32,51,34l.55-18.42A8.16,8.16,0,0,0,51,13.07ZM35.86,8.33a2.51,2.51,0,1,1-2.48,2.51A2.48,2.48,0,0,1,35.86,8.33Zm-7.17,29a2.51,2.51,0,1,1,2.48-2.51A2.48,2.48,0,0,1,28.69,37.34Zm14.06,0a2.51,2.51,0,1,1,2.48-2.51A2.48,2.48,0,0,1,42.75,37.34ZM47.16,16.7l-2.75,8.65c0,.28-.28.55-.83.55h-16c-.28,0-.56-.27-.83-.55L24,16.7a1.2,1.2,0,0,1,1.11-1.12h21.5A.82.82,0,0,1,47.16,16.7Z"/><path d="M12.42,21.16a1.94,1.94,0,0,0,2.48-1.95c.28-1.67-.55-2.79-1.93-2.79-1.1-.56-1.93.56-2.2,1.95A2.13,2.13,0,0,0,12.42,21.16Z"/><path d="M15.18,27a7,7,0,0,1-.55-1.67,8.1,8.1,0,0,0-.55-1.68c-.28-.83-3-2.23-5-1.11a32,32,0,0,0-3.58,2.79,9.26,9.26,0,0,0-.83,2.23,9.8,9.8,0,0,0-.27,2.79A2.09,2.09,0,0,0,5.8,32.32c0-.27.09-.56.14-.85a17.48,17.48,0,0,1,1-4.17,8.6,8.6,0,0,1,1.65-1.4c-.05.24-.11.55-.18.91C8,28.54,7.46,31.35,7.46,32a2.89,2.89,0,0,0,1.1,2.23l1.66,2s0,.28-.28,0L8.29,35.11A18.9,18.9,0,0,1,6.91,39.3a12,12,0,0,1-1,1.53,11.94,11.94,0,0,0-1,1.53,2.62,2.62,0,0,0,.12,3,.8.8,0,0,1,.15.3c.55-.7,1.24-1.6,1.93-2.51s1.38-1.81,1.93-2.51A17,17,0,0,0,11,36.78l1.93,2,2.48,5.58a2.36,2.36,0,0,0,2.76,1.39c-.07-.22-.24-.85-.46-1.69-.62-2.4-1.68-6.48-2.3-7.51a12.7,12.7,0,0,0-1.37-2A11.71,11.71,0,0,1,12.7,32.6,8.75,8.75,0,0,1,13,29.08c.08-.33.15-.64.21-.94a7.66,7.66,0,0,0,1.66,2.66c.23.26.49.56.82,1a2.58,2.58,0,0,0,2.53.6l.23,0a21.78,21.78,0,0,0-1.78-2.18A5.07,5.07,0,0,1,15.18,27Z"/><path d="M44,46.64a23.63,23.63,0,0,1-2.89.75l.82,4.18h4.69l-1.38-5.3C44.85,46.37,44.44,46.5,44,46.64Z"/><path d="M26.48,46.27l-1.65,5.3h4.69l.82-4.18a22.24,22.24,0,0,1-2.4-.68C27.42,46.54,26.93,46.38,26.48,46.27Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/vliegen.svg b/packages/icons/src/svg/vliegen.svg
index 203ae2539c..d9daa1103c 100644
--- a/packages/icons/src/svg/vliegen.svg
+++ b/packages/icons/src/svg/vliegen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="vliegen"><path d="M51.16,16.26H48.29V12.43c0-.46-.38-.68-.84-.68s-.83.22-.83.68v3.83H33.7a.42.42,0,0,0-.38.46l1.59,15.84a.41.41,0,0,0,.41.38h3V51.28h8.34V34.65l-5.73-1.39c-.29-.09-.24-.27-.23-.32h8.92a.42.42,0,0,0,.41-.38l1.58-15.85A.4.4,0,0,0,51.16,16.26Zm-4,10.84H37.69L37,20.42H47.87Z"/><path d="M25.35,5.55l-1.23.52h0L20.45,7.65l-8-2.9a.64.64,0,0,0-.47,0l-.66.29-.07,0a.22.22,0,0,0,0,.3l4.2,4.39-.12.05a50.29,50.29,0,0,0-4.68,2.25L5.72,9.56a.68.68,0,0,0-.54,0l-.63.27-.06,0a.22.22,0,0,0,0,.3l3.3,3.72a8.67,8.67,0,0,0-.86.69.43.43,0,0,0,.19.76c2.21.33,6.6-.59,9.35-1.45l-2,7.12a.22.22,0,0,0,0,.14.21.21,0,0,0,.28.11l1.38-.59a.7.7,0,0,0,.28-.23l5.94-8.93,1.95-.84L27.5,9.27c2.11-.91,3.41-2.21,3.26-3.17S28.64,4.14,25.35,5.55Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="vliegen"><path d="M51.16,16.26H48.29V12.43c0-.46-.38-.68-.84-.68s-.83.22-.83.68v3.83H33.7a.42.42,0,0,0-.38.46l1.59,15.84a.41.41,0,0,0,.41.38h3V51.28h8.34V34.65l-5.73-1.39c-.29-.09-.24-.27-.23-.32h8.92a.42.42,0,0,0,.41-.38l1.58-15.85A.4.4,0,0,0,51.16,16.26Zm-4,10.84H37.69L37,20.42H47.87Z"/><path d="M25.35,5.55l-1.23.52h0L20.45,7.65l-8-2.9a.64.64,0,0,0-.47,0l-.66.29-.07,0a.22.22,0,0,0,0,.3l4.2,4.39-.12.05a50.29,50.29,0,0,0-4.68,2.25L5.72,9.56a.68.68,0,0,0-.54,0l-.63.27-.06,0a.22.22,0,0,0,0,.3l3.3,3.72a8.67,8.67,0,0,0-.86.69.43.43,0,0,0,.19.76c2.21.33,6.6-.59,9.35-1.45l-2,7.12a.22.22,0,0,0,0,.14.21.21,0,0,0,.28.11l1.38-.59a.7.7,0,0,0,.28-.23l5.94-8.93,1.95-.84L27.5,9.27c2.11-.91,3.41-2.21,3.26-3.17S28.64,4.14,25.35,5.55Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/warn.svg b/packages/icons/src/svg/warn.svg
index c6f008aaf6..ef78e8d247 100644
--- a/packages/icons/src/svg/warn.svg
+++ b/packages/icons/src/svg/warn.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="warn"><path d="M28,4.42A23.46,23.46,0,1,0,51.44,27.88,23.49,23.49,0,0,0,28,4.42Zm0,45.24A21.79,21.79,0,1,1,49.76,27.88,21.81,21.81,0,0,1,28,49.66Z"/><path d="M29.94,35.49a1.73,1.73,0,0,0-.65-.45l0,0L29.17,35l0,0a2.42,2.42,0,0,0-.76-.12h-.05a2.29,2.29,0,0,0-.94.19,1.73,1.73,0,0,0-.72.45l0,0a2.1,2.1,0,0,0-.42.72v0a3.18,3.18,0,0,0-.11.92,2.79,2.79,0,0,0,.15.93,2.24,2.24,0,0,0,.42.72l0,0a2.27,2.27,0,0,0,.68.42h0a2.73,2.73,0,0,0,.92.14h.06a2.24,2.24,0,0,0,.73-.12h.05l0,0h.11l0,0a1.61,1.61,0,0,0,.63-.43,2.15,2.15,0,0,0,.46-.73,2.79,2.79,0,0,0,.15-.9,3.06,3.06,0,0,0-.15-1A1.62,1.62,0,0,0,29.94,35.49Z"/><polygon points="26.8 33.3 29.67 33.15 29.9 33.14 30.14 16.57 30.14 16.32 26.59 16.32 26.8 33.04 26.8 33.3"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="warn"><path d="M28,4.42A23.46,23.46,0,1,0,51.44,27.88,23.49,23.49,0,0,0,28,4.42Zm0,45.24A21.79,21.79,0,1,1,49.76,27.88,21.81,21.81,0,0,1,28,49.66Z"/><path d="M29.94,35.49a1.73,1.73,0,0,0-.65-.45l0,0L29.17,35l0,0a2.42,2.42,0,0,0-.76-.12h-.05a2.29,2.29,0,0,0-.94.19,1.73,1.73,0,0,0-.72.45l0,0a2.1,2.1,0,0,0-.42.72v0a3.18,3.18,0,0,0-.11.92,2.79,2.79,0,0,0,.15.93,2.24,2.24,0,0,0,.42.72l0,0a2.27,2.27,0,0,0,.68.42h0a2.73,2.73,0,0,0,.92.14h.06a2.24,2.24,0,0,0,.73-.12h.05l0,0h.11l0,0a1.61,1.61,0,0,0,.63-.43,2.15,2.15,0,0,0,.46-.73,2.79,2.79,0,0,0,.15-.9,3.06,3.06,0,0,0-.15-1A1.62,1.62,0,0,0,29.94,35.49Z"/><polygon points="26.8 33.3 29.67 33.15 29.9 33.14 30.14 16.57 30.14 16.32 26.59 16.32 26.8 33.04 26.8 33.3"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/warning.svg b/packages/icons/src/svg/warning.svg
index 3f33bb13be..838d94678d 100644
--- a/packages/icons/src/svg/warning.svg
+++ b/packages/icons/src/svg/warning.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="warning"><path d="M51.11,44.5l-21-35.65a2.7,2.7,0,0,0-1-.94,2.64,2.64,0,0,0-1.29-.34h0a2.63,2.63,0,0,0-2.25,1.3L4.88,44.51a2.61,2.61,0,0,0,0,2.61,2.65,2.65,0,0,0,1,1,2.62,2.62,0,0,0,1.31.35H48.86a2.62,2.62,0,0,0,1.31-.35,2.61,2.61,0,0,0,1.3-2.28A2.57,2.57,0,0,0,51.11,44.5ZM11.67,43.21,27.84,15.34,44.29,43.21Z"/><path d="M28,36.28a2,2,0,0,0-2,2.16,1.87,1.87,0,0,0,2,2.11,1.93,1.93,0,0,0,2-2.11A1.9,1.9,0,0,0,28,36.28Z"/><polygon points="26.38 35.39 29.59 35.31 29.59 31.06 29.9 22.6 26.38 22.91 26.38 35.39"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="warning"><path d="M51.11,44.5l-21-35.65a2.7,2.7,0,0,0-1-.94,2.64,2.64,0,0,0-1.29-.34h0a2.63,2.63,0,0,0-2.25,1.3L4.88,44.51a2.61,2.61,0,0,0,0,2.61,2.65,2.65,0,0,0,1,1,2.62,2.62,0,0,0,1.31.35H48.86a2.62,2.62,0,0,0,1.31-.35,2.61,2.61,0,0,0,1.3-2.28A2.57,2.57,0,0,0,51.11,44.5ZM11.67,43.21,27.84,15.34,44.29,43.21Z"/><path d="M28,36.28a2,2,0,0,0-2,2.16,1.87,1.87,0,0,0,2,2.11,1.93,1.93,0,0,0,2-2.11A1.9,1.9,0,0,0,28,36.28Z"/><polygon points="26.38 35.39 29.59 35.31 29.59 31.06 29.9 22.6 26.38 22.91 26.38 35.39"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/winkelen_en_boodschappen_alcohol.svg b/packages/icons/src/svg/winkelen_en_boodschappen_alcohol.svg
index 4f1eb9ebaa..f72d8aae07 100644
--- a/packages/icons/src/svg/winkelen_en_boodschappen_alcohol.svg
+++ b/packages/icons/src/svg/winkelen_en_boodschappen_alcohol.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="winkelen_en_boodschappen_alcohol"><path d="M33.72,34.48,47.44,48.2l2.45-2.45L8.56,4.42,6.11,6.88,16.93,17.7A29.8,29.8,0,0,0,17.47,27a11.92,11.92,0,0,0,9.08,8.33V48.58a58.4,58.4,0,0,0-5.9.77,1,1,0,0,0-.64.4,1.1,1.1,0,0,0,0,1.42,1.14,1.14,0,0,0,.64.4H37a1.2,1.2,0,0,0,.65-.4,1.13,1.13,0,0,0,0-1.42,1.09,1.09,0,0,0-.65-.4,58.4,58.4,0,0,0-5.9-.77V35.34A11.89,11.89,0,0,0,33.72,34.48ZM25,31.64a8.48,8.48,0,0,1-4.79-5.53,25.22,25.22,0,0,1-.63-5.73l1.88,1.88a16.62,16.62,0,0,0,1.8,6.31,10,10,0,0,0,2.64,3.07S25.94,32.09,25,31.64Z"/><path d="M21.42,11a48.27,48.27,0,0,1,7.41-.45,50.06,50.06,0,0,1,7.33.58,29.61,29.61,0,0,1,1.48,5.54H24.08L38.26,30.83A11.84,11.84,0,0,0,40.18,27,29.51,29.51,0,0,0,38.62,9.35a1.68,1.68,0,0,0-.49-.63,1.77,1.77,0,0,0-.73-.35,52.41,52.41,0,0,0-8.57-.77,52.43,52.43,0,0,0-8.58.77,1.79,1.79,0,0,0-.72.35,1.82,1.82,0,0,0-.5.63c-.22.54-.43,1.09-.62,1.64l2.24,2.23C20.87,12.47,21.13,11.73,21.42,11Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="winkelen_en_boodschappen_alcohol"><path d="M33.72,34.48,47.44,48.2l2.45-2.45L8.56,4.42,6.11,6.88,16.93,17.7A29.8,29.8,0,0,0,17.47,27a11.92,11.92,0,0,0,9.08,8.33V48.58a58.4,58.4,0,0,0-5.9.77,1,1,0,0,0-.64.4,1.1,1.1,0,0,0,0,1.42,1.14,1.14,0,0,0,.64.4H37a1.2,1.2,0,0,0,.65-.4,1.13,1.13,0,0,0,0-1.42,1.09,1.09,0,0,0-.65-.4,58.4,58.4,0,0,0-5.9-.77V35.34A11.89,11.89,0,0,0,33.72,34.48ZM25,31.64a8.48,8.48,0,0,1-4.79-5.53,25.22,25.22,0,0,1-.63-5.73l1.88,1.88a16.62,16.62,0,0,0,1.8,6.31,10,10,0,0,0,2.64,3.07S25.94,32.09,25,31.64Z"/><path d="M21.42,11a48.27,48.27,0,0,1,7.41-.45,50.06,50.06,0,0,1,7.33.58,29.61,29.61,0,0,1,1.48,5.54H24.08L38.26,30.83A11.84,11.84,0,0,0,40.18,27,29.51,29.51,0,0,0,38.62,9.35a1.68,1.68,0,0,0-.49-.63,1.77,1.77,0,0,0-.73-.35,52.41,52.41,0,0,0-8.57-.77,52.43,52.43,0,0,0-8.58.77,1.79,1.79,0,0,0-.72.35,1.82,1.82,0,0,0-.5.63c-.22.54-.43,1.09-.62,1.64l2.24,2.23C20.87,12.47,21.13,11.73,21.42,11Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/winkelen_en_boodschappen_open.svg b/packages/icons/src/svg/winkelen_en_boodschappen_open.svg
index 01a304d9f5..fd3abe33ba 100644
--- a/packages/icons/src/svg/winkelen_en_boodschappen_open.svg
+++ b/packages/icons/src/svg/winkelen_en_boodschappen_open.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="winkelen_en_boodschappen_open"><path d="M18.33,34.85H44.08s3,.34,3.68-3.68c.67-3.34,2.34-18.05,2.34-18.05a2.62,2.62,0,0,0-2.68-2.68H16.33L16,6.76a2.58,2.58,0,0,0-2.67-2.34H8a2.16,2.16,0,0,0-2,2C6,8.77,10,9.1,12.65,9.1l3,21.74a5.65,5.65,0,0,0-4,5.68c0,3.68,2,6.69,6.35,6.69H45.08c2.34,0,2.34-3.68,0-3.68,0,0-14.37-.33-26.75-.67a1.88,1.88,0,0,1-2-2A1.77,1.77,0,0,1,18.33,34.85Zm6.36-4H19.34l-1-6.69h6.36Zm14.38-17h7.35l-1.34,9.36a.33.33,0,0,1-.33-.34c-.33-1.33-.67-2.34-.67-2.34h-5Zm0,10.36h5.68l-1,6.69H39.07ZM28.7,13.79h6.69v9.36a.33.33,0,0,1-.34-.34,8.55,8.55,0,0,1-1-2.34H28.7Zm0,10.36h6.69v6.69H28.7ZM25,13.79v9.36a.33.33,0,0,1-.33-.34,8.75,8.75,0,0,1-1-2.34H18l-1-6.68Z"/><path d="M17.33,44.21A3.68,3.68,0,1,0,21,47.89,3.72,3.72,0,0,0,17.33,44.21Z"/><path d="M42.07,44.21a3.68,3.68,0,1,0,3.68,3.68A3.71,3.71,0,0,0,42.07,44.21Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="winkelen_en_boodschappen_open"><path d="M18.33,34.85H44.08s3,.34,3.68-3.68c.67-3.34,2.34-18.05,2.34-18.05a2.62,2.62,0,0,0-2.68-2.68H16.33L16,6.76a2.58,2.58,0,0,0-2.67-2.34H8a2.16,2.16,0,0,0-2,2C6,8.77,10,9.1,12.65,9.1l3,21.74a5.65,5.65,0,0,0-4,5.68c0,3.68,2,6.69,6.35,6.69H45.08c2.34,0,2.34-3.68,0-3.68,0,0-14.37-.33-26.75-.67a1.88,1.88,0,0,1-2-2A1.77,1.77,0,0,1,18.33,34.85Zm6.36-4H19.34l-1-6.69h6.36Zm14.38-17h7.35l-1.34,9.36a.33.33,0,0,1-.33-.34c-.33-1.33-.67-2.34-.67-2.34h-5Zm0,10.36h5.68l-1,6.69H39.07ZM28.7,13.79h6.69v9.36a.33.33,0,0,1-.34-.34,8.55,8.55,0,0,1-1-2.34H28.7Zm0,10.36h6.69v6.69H28.7ZM25,13.79v9.36a.33.33,0,0,1-.33-.34,8.75,8.75,0,0,1-1-2.34H18l-1-6.68Z"/><path d="M17.33,44.21A3.68,3.68,0,1,0,21,47.89,3.72,3.72,0,0,0,17.33,44.21Z"/><path d="M42.07,44.21a3.68,3.68,0,1,0,3.68,3.68A3.71,3.71,0,0,0,42.07,44.21Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/work.svg b/packages/icons/src/svg/work.svg
index e8801de52f..7fb749edfb 100644
--- a/packages/icons/src/svg/work.svg
+++ b/packages/icons/src/svg/work.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="work"><path d="M50.71,19.13A4.47,4.47,0,0,0,46.27,15H35.36V11.29A3.51,3.51,0,0,0,31.61,7.2H23.77A3.87,3.87,0,0,0,20,11.29v4.09H9.11a4.71,4.71,0,0,0-4.43,4.09c-.34,8.19-.34,16.71,0,25.23a4.46,4.46,0,0,0,4.43,4.09h37.5a4.71,4.71,0,0,0,4.44-4.09A213.94,213.94,0,0,0,50.71,19.13ZM31.61,15H23.77V11.29h7.84Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="work"><path d="M50.71,19.13A4.47,4.47,0,0,0,46.27,15H35.36V11.29A3.51,3.51,0,0,0,31.61,7.2H23.77A3.87,3.87,0,0,0,20,11.29v4.09H9.11a4.71,4.71,0,0,0-4.43,4.09c-.34,8.19-.34,16.71,0,25.23a4.46,4.46,0,0,0,4.43,4.09h37.5a4.71,4.71,0,0,0,4.44-4.09A213.94,213.94,0,0,0,50.71,19.13ZM31.61,15H23.77V11.29h7.84Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/ziekenhuis.svg b/packages/icons/src/svg/ziekenhuis.svg
index 085811a4f8..2c42a3b61f 100644
--- a/packages/icons/src/svg/ziekenhuis.svg
+++ b/packages/icons/src/svg/ziekenhuis.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="ziekenhuis"><path d="M23.4,12.79h2.9v3a.74.74,0,0,0,.72.76h2.9a.75.75,0,0,0,.72-.76v-3h2.89a.75.75,0,0,0,.73-.76V9a.75.75,0,0,0-.73-.76H30.64V5.18a.75.75,0,0,0-.72-.76H27a.74.74,0,0,0-.72.76V8.23H23.4a.74.74,0,0,0-.72.76v3A.74.74,0,0,0,23.4,12.79Z"/><path d="M41.51,18.1H15.45a.74.74,0,0,0-.72.76V51.57H22V45.49l2.89-.76v6.84H32.1V45.49l2.9-.76v6.84h7.24V18.86A.75.75,0,0,0,41.51,18.1Zm-15.2,5.33h4.34V28H26.31Zm0,7.61h4.34V35.6H26.31Zm-7.24-7.61h4.34V28H19.07Zm0,7.61h4.34V35.6H19.07ZM36.44,43.2H20.52v-3H36.44Zm1.45-7.6H33.55V31h4.34Zm0-7.61H33.55V23.43h4.34Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="ziekenhuis"><path d="M23.4,12.79h2.9v3a.74.74,0,0,0,.72.76h2.9a.75.75,0,0,0,.72-.76v-3h2.89a.75.75,0,0,0,.73-.76V9a.75.75,0,0,0-.73-.76H30.64V5.18a.75.75,0,0,0-.72-.76H27a.74.74,0,0,0-.72.76V8.23H23.4a.74.74,0,0,0-.72.76v3A.74.74,0,0,0,23.4,12.79Z"/><path d="M41.51,18.1H15.45a.74.74,0,0,0-.72.76V51.57H22V45.49l2.89-.76v6.84H32.1V45.49l2.9-.76v6.84h7.24V18.86A.75.75,0,0,0,41.51,18.1Zm-15.2,5.33h4.34V28H26.31Zm0,7.61h4.34V35.6H26.31Zm-7.24-7.61h4.34V28H19.07Zm0,7.61h4.34V35.6H19.07ZM36.44,43.2H20.52v-3H36.44Zm1.45-7.6H33.55V31h4.34Zm0-7.61H33.55V23.43h4.34Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/ziektegolf.svg b/packages/icons/src/svg/ziektegolf.svg
index 6d2b2f33d5..3858992bf1 100644
--- a/packages/icons/src/svg/ziektegolf.svg
+++ b/packages/icons/src/svg/ziektegolf.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56"><g id="ziektegolf"><path d="M38.55,38.67a1.63,1.63,0,1,0-1.63,1.65A1.63,1.63,0,0,0,38.55,38.67Zm1.86,5.63A1.63,1.63,0,1,0,38.78,46,1.63,1.63,0,0,0,40.41,44.3ZM36.9,32.12a1.48,1.48,0,0,0,1-1.84L35,24c0-.66.6-1.75.67-2.3a32,32,0,0,0-.06-6.14c2.24-2.36,2.26-5.05.52-7.11-2-2.37-10.8-5.21-18.36-3.57-8,1.74-9.31,9.07-9.19,13,.14,4.56,2.68,11.64,1.67,16.18-.45,2-5.84,12-5.84,12H23.3V43l-3.78-4.12a.37.37,0,0,1,0-.51s5.74,3.07,7.83,4,3-.47,3.61-1.82c.37-.76.75-.66,1.32-.94s.2-1.8-.2-2.5-.56-.72-.56-.72a4.46,4.46,0,0,0,1.79-.22,1.15,1.15,0,0,0,.87-1.34,3,3,0,0,1,.11-2.23Zm8.16,4.68a1.63,1.63,0,1,0-1.62,1.64A1.63,1.63,0,0,0,45.06,36.8ZM50,33.28a1.64,1.64,0,1,0,1.63,1.64A1.63,1.63,0,0,0,50,33.28Zm-9.31,15a1.65,1.65,0,1,0,1.63,1.64A1.62,1.62,0,0,0,40.64,48.29Zm4.6-7.35a1.65,1.65,0,1,0,1.63,1.65A1.64,1.64,0,0,0,45.24,40.94Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56" fill="currentColor"><g id="ziektegolf"><path d="M38.55,38.67a1.63,1.63,0,1,0-1.63,1.65A1.63,1.63,0,0,0,38.55,38.67Zm1.86,5.63A1.63,1.63,0,1,0,38.78,46,1.63,1.63,0,0,0,40.41,44.3ZM36.9,32.12a1.48,1.48,0,0,0,1-1.84L35,24c0-.66.6-1.75.67-2.3a32,32,0,0,0-.06-6.14c2.24-2.36,2.26-5.05.52-7.11-2-2.37-10.8-5.21-18.36-3.57-8,1.74-9.31,9.07-9.19,13,.14,4.56,2.68,11.64,1.67,16.18-.45,2-5.84,12-5.84,12H23.3V43l-3.78-4.12a.37.37,0,0,1,0-.51s5.74,3.07,7.83,4,3-.47,3.61-1.82c.37-.76.75-.66,1.32-.94s.2-1.8-.2-2.5-.56-.72-.56-.72a4.46,4.46,0,0,0,1.79-.22,1.15,1.15,0,0,0,.87-1.34,3,3,0,0,1,.11-2.23Zm8.16,4.68a1.63,1.63,0,1,0-1.62,1.64A1.63,1.63,0,0,0,45.06,36.8ZM50,33.28a1.64,1.64,0,1,0,1.63,1.64A1.63,1.63,0,0,0,50,33.28Zm-9.31,15a1.65,1.65,0,1,0,1.63,1.64A1.62,1.62,0,0,0,40.64,48.29Zm4.6-7.35a1.65,1.65,0,1,0,1.63,1.65A1.64,1.64,0,0,0,45.24,40.94Z"/></g></svg>
\ No newline at end of file