diff --git a/src/components/ListItems/AddressItem/__tests__/__snapshots__/AddressItem.test.js.snap b/src/components/ListItems/AddressItem/__tests__/__snapshots__/AddressItem.test.js.snap
index 63ad57655..c3de1151b 100644
--- a/src/components/ListItems/AddressItem/__tests__/__snapshots__/AddressItem.test.js.snap
+++ b/src/components/ListItems/AddressItem/__tests__/__snapshots__/AddressItem.test.js.snap
@@ -3,7 +3,7 @@
 exports[`<AddressItem /> should work 1`] = `
 <div>
   <li
-    class="MuiButtonBase-root MuiListItemButton-root css-1ls6ttt MuiListItemButton-gutters MuiListItemButton-root css-1ls6ttt MuiListItemButton-gutters null css-13g1ozv-MuiButtonBase-root-MuiListItemButton-root"
+    class="MuiButtonBase-root MuiListItemButton-root css-1ls6ttt MuiListItemButton-gutters MuiListItemButton-root css-1ls6ttt MuiListItemButton-gutters null css-367pw5-MuiButtonBase-root-MuiListItemButton-root"
     role="link"
     tabindex="0"
   >
diff --git a/src/components/ListItems/ResultItem/__tests__/__snapshots__/ResultItem.test.js.snap b/src/components/ListItems/ResultItem/__tests__/__snapshots__/ResultItem.test.js.snap
index bbc3bbfcb..56ab8e3f6 100644
--- a/src/components/ListItems/ResultItem/__tests__/__snapshots__/ResultItem.test.js.snap
+++ b/src/components/ListItems/ResultItem/__tests__/__snapshots__/ResultItem.test.js.snap
@@ -3,7 +3,7 @@
 exports[`<ResultItem /> should work 1`] = `
 <div>
   <li
-    class="MuiButtonBase-root MuiListItemButton-root MuiListItemButton-gutters MuiListItemButton-root MuiListItemButton-gutters css-mctqh3-MuiButtonBase-root-MuiListItemButton-root"
+    class="MuiButtonBase-root MuiListItemButton-root MuiListItemButton-gutters MuiListItemButton-root MuiListItemButton-gutters css-oga50u-MuiButtonBase-root-MuiListItemButton-root"
     data-sm="ResultItemComponent"
     role="link"
     tabindex="0"
diff --git a/src/components/ListItems/ServiceItem/__tests__/__snapshots__/ServiceItem.test.js.snap b/src/components/ListItems/ServiceItem/__tests__/__snapshots__/ServiceItem.test.js.snap
index 1e2a4ac90..5d171e14b 100644
--- a/src/components/ListItems/ServiceItem/__tests__/__snapshots__/ServiceItem.test.js.snap
+++ b/src/components/ListItems/ServiceItem/__tests__/__snapshots__/ServiceItem.test.js.snap
@@ -3,7 +3,7 @@
 exports[`<ServiceItem /> should work 1`] = `
 <div>
   <li
-    class="MuiButtonBase-root MuiListItemButton-root css-1ls6ttt MuiListItemButton-gutters MuiListItemButton-root css-1ls6ttt MuiListItemButton-gutters null css-13g1ozv-MuiButtonBase-root-MuiListItemButton-root"
+    class="MuiButtonBase-root MuiListItemButton-root css-1ls6ttt MuiListItemButton-gutters MuiListItemButton-root css-1ls6ttt MuiListItemButton-gutters null css-367pw5-MuiButtonBase-root-MuiListItemButton-root"
     role="link"
     tabindex="0"
   >
diff --git a/src/components/ListItems/SimpleListItem/__tests__/__snapshots__/SimpleListItem.test.js.snap b/src/components/ListItems/SimpleListItem/__tests__/__snapshots__/SimpleListItem.test.js.snap
index 4659e6006..174e98a41 100644
--- a/src/components/ListItems/SimpleListItem/__tests__/__snapshots__/SimpleListItem.test.js.snap
+++ b/src/components/ListItems/SimpleListItem/__tests__/__snapshots__/SimpleListItem.test.js.snap
@@ -3,7 +3,7 @@
 exports[`<SimpleListItem /> should work 1`] = `
 <div>
   <li
-    class="MuiButtonBase-root MuiListItemButton-root css-1ls6ttt MuiListItemButton-gutters MuiListItemButton-root css-1ls6ttt MuiListItemButton-gutters null css-13g1ozv-MuiButtonBase-root-MuiListItemButton-root"
+    class="MuiButtonBase-root MuiListItemButton-root css-1ls6ttt MuiListItemButton-gutters MuiListItemButton-root css-1ls6ttt MuiListItemButton-gutters null css-367pw5-MuiButtonBase-root-MuiListItemButton-root"
     tabindex="-1"
   >
     <div
diff --git a/src/components/ListItems/SuggestionItem/__tests__/__snapshots__/SuggestionItem.test.js.snap b/src/components/ListItems/SuggestionItem/__tests__/__snapshots__/SuggestionItem.test.js.snap
index c836c2999..2ff9686f1 100644
--- a/src/components/ListItems/SuggestionItem/__tests__/__snapshots__/SuggestionItem.test.js.snap
+++ b/src/components/ListItems/SuggestionItem/__tests__/__snapshots__/SuggestionItem.test.js.snap
@@ -4,7 +4,7 @@ exports[`<SuggestionItem /> should work 1`] = `
 <div>
   <li
     aria-label="Title text Subtitle text"
-    class="MuiButtonBase-root MuiListItemButton-root css-zkfegi MuiListItemButton-gutters MuiListItemButton-root css-zkfegi MuiListItemButton-gutters suggestion css-13g1ozv-MuiButtonBase-root-MuiListItemButton-root"
+    class="MuiButtonBase-root MuiListItemButton-root css-zkfegi MuiListItemButton-gutters MuiListItemButton-root css-zkfegi MuiListItemButton-gutters suggestion css-367pw5-MuiButtonBase-root-MuiListItemButton-root"
     role="link"
     tabindex="0"
   >
diff --git a/src/components/ListItems/UnitItem/__tests__/__snapshots__/UnitItem.test.js.snap b/src/components/ListItems/UnitItem/__tests__/__snapshots__/UnitItem.test.js.snap
index 6c3134bdf..a29b9f2f3 100644
--- a/src/components/ListItems/UnitItem/__tests__/__snapshots__/UnitItem.test.js.snap
+++ b/src/components/ListItems/UnitItem/__tests__/__snapshots__/UnitItem.test.js.snap
@@ -3,7 +3,7 @@
 exports[`<UnitItem /> should work 1`] = `
 <div>
   <li
-    class="MuiButtonBase-root MuiListItemButton-root MuiListItemButton-gutters MuiListItemButton-root MuiListItemButton-gutters css-mctqh3-MuiButtonBase-root-MuiListItemButton-root"
+    class="MuiButtonBase-root MuiListItemButton-root MuiListItemButton-gutters MuiListItemButton-root MuiListItemButton-gutters css-oga50u-MuiButtonBase-root-MuiListItemButton-root"
     data-sm="UnitItem"
     role="link"
     tabindex="0"
diff --git a/src/components/Lists/ResultList/__tests__/__snapshots__/ResultList.test.js.snap b/src/components/Lists/ResultList/__tests__/__snapshots__/ResultList.test.js.snap
index de1166655..d7d597619 100644
--- a/src/components/Lists/ResultList/__tests__/__snapshots__/ResultList.test.js.snap
+++ b/src/components/Lists/ResultList/__tests__/__snapshots__/ResultList.test.js.snap
@@ -41,7 +41,7 @@ exports[`<ResultList /> should work 1`] = `
       id="testID"
     >
       <li
-        class="MuiButtonBase-root MuiListItemButton-root MuiListItemButton-gutters MuiListItemButton-root MuiListItemButton-gutters css-mctqh3-MuiButtonBase-root-MuiListItemButton-root"
+        class="MuiButtonBase-root MuiListItemButton-root MuiListItemButton-gutters MuiListItemButton-root MuiListItemButton-gutters css-oga50u-MuiButtonBase-root-MuiListItemButton-root"
         data-sm="UnitItem"
         role="link"
         tabindex="0"
@@ -107,7 +107,7 @@ exports[`<ResultList /> should work 1`] = `
         />
       </li>
       <li
-        class="MuiButtonBase-root MuiListItemButton-root MuiListItemButton-gutters MuiListItemButton-root MuiListItemButton-gutters css-mctqh3-MuiButtonBase-root-MuiListItemButton-root"
+        class="MuiButtonBase-root MuiListItemButton-root MuiListItemButton-gutters MuiListItemButton-root MuiListItemButton-gutters css-oga50u-MuiButtonBase-root-MuiListItemButton-root"
         data-sm="UnitItem"
         role="link"
         tabindex="0"
diff --git a/src/components/PaginationComponent/__tests__/__snapshots__/PageElement.test.js.snap b/src/components/PaginationComponent/__tests__/__snapshots__/PageElement.test.js.snap
index 1f85b656c..6a97d32d3 100644
--- a/src/components/PaginationComponent/__tests__/__snapshots__/PageElement.test.js.snap
+++ b/src/components/PaginationComponent/__tests__/__snapshots__/PageElement.test.js.snap
@@ -4,7 +4,7 @@ exports[`<PageElement /> should work 1`] = `
 <div>
   <li>
     <button
-      class="MuiButtonBase-root css-1walttk-MuiButtonBase-root"
+      class="MuiButtonBase-root css-9fh4tn-MuiButtonBase-root"
       role="link"
       tabindex="0"
       type="button"
diff --git a/src/components/PaginationComponent/__tests__/__snapshots__/PaginationComponent.test.js.snap b/src/components/PaginationComponent/__tests__/__snapshots__/PaginationComponent.test.js.snap
index 481312638..0203798c5 100644
--- a/src/components/PaginationComponent/__tests__/__snapshots__/PaginationComponent.test.js.snap
+++ b/src/components/PaginationComponent/__tests__/__snapshots__/PaginationComponent.test.js.snap
@@ -8,7 +8,7 @@ exports[`<PaginationComponent /> should work 1`] = `
   >
     <button
       aria-label="Previous page"
-      class="MuiButtonBase-root SMButton css-16f78l8-MuiButtonBase-root"
+      class="MuiButtonBase-root SMButton css-vfffhu-MuiButtonBase-root"
       color="primary"
       id="PaginationPreviousButton"
       margin="0"
@@ -32,7 +32,7 @@ exports[`<PaginationComponent /> should work 1`] = `
     </button>
     <button
       aria-label="Next page"
-      class="MuiButtonBase-root SMButton css-4cjl82-MuiButtonBase-root"
+      class="MuiButtonBase-root SMButton css-nymwz-MuiButtonBase-root"
       color="primary"
       id="PaginationNextButton"
       margin="0"
@@ -62,7 +62,7 @@ exports[`<PaginationComponent /> should work 1`] = `
       >
         <li>
           <button
-            class="MuiButtonBase-root css-1walttk-MuiButtonBase-root"
+            class="MuiButtonBase-root css-9fh4tn-MuiButtonBase-root"
             role="link"
             tabindex="0"
             type="button"
@@ -86,7 +86,7 @@ exports[`<PaginationComponent /> should work 1`] = `
         </li>
         <li>
           <button
-            class="MuiButtonBase-root Mui-disabled css-1walttk-MuiButtonBase-root"
+            class="MuiButtonBase-root Mui-disabled css-9fh4tn-MuiButtonBase-root"
             disabled=""
             role="link"
             tabindex="-1"
@@ -111,7 +111,7 @@ exports[`<PaginationComponent /> should work 1`] = `
         </li>
         <li>
           <button
-            class="MuiButtonBase-root css-1walttk-MuiButtonBase-root"
+            class="MuiButtonBase-root css-9fh4tn-MuiButtonBase-root"
             role="link"
             tabindex="0"
             type="button"
@@ -135,7 +135,7 @@ exports[`<PaginationComponent /> should work 1`] = `
         </li>
         <li>
           <button
-            class="MuiButtonBase-root css-1walttk-MuiButtonBase-root"
+            class="MuiButtonBase-root css-9fh4tn-MuiButtonBase-root"
             role="link"
             tabindex="0"
             type="button"
@@ -159,7 +159,7 @@ exports[`<PaginationComponent /> should work 1`] = `
         </li>
         <li>
           <button
-            class="MuiButtonBase-root css-1walttk-MuiButtonBase-root"
+            class="MuiButtonBase-root css-9fh4tn-MuiButtonBase-root"
             role="link"
             tabindex="0"
             type="button"
diff --git a/src/components/SMRadio/__tests__/__snapshots__/SMRadio.test.js.snap b/src/components/SMRadio/__tests__/__snapshots__/SMRadio.test.js.snap
index d89c8b880..e54591b8d 100644
--- a/src/components/SMRadio/__tests__/__snapshots__/SMRadio.test.js.snap
+++ b/src/components/SMRadio/__tests__/__snapshots__/SMRadio.test.js.snap
@@ -14,7 +14,7 @@ exports[`<SMRadio /> should work 1`] = `
         class="MuiFormControlLabel-root MuiFormControlLabel-labelPlacementEnd css-19opgx6-MuiFormControlLabel-root"
       >
         <span
-          class="MuiButtonBase-root MuiRadio-root MuiRadio-colorPrimary PrivateSwitchBase-root MuiRadio-root MuiRadio-colorPrimary Mui-checked MuiRadio-root MuiRadio-colorPrimary css-b2e26m-MuiButtonBase-root-MuiRadio-root"
+          class="MuiButtonBase-root MuiRadio-root MuiRadio-colorPrimary PrivateSwitchBase-root MuiRadio-root MuiRadio-colorPrimary Mui-checked MuiRadio-root MuiRadio-colorPrimary css-18i0j3m-MuiButtonBase-root-MuiRadio-root"
         >
           <input
             checked=""
@@ -60,7 +60,7 @@ exports[`<SMRadio /> should work 1`] = `
         class="MuiFormControlLabel-root MuiFormControlLabel-labelPlacementEnd css-19opgx6-MuiFormControlLabel-root"
       >
         <span
-          class="MuiButtonBase-root MuiRadio-root MuiRadio-colorPrimary PrivateSwitchBase-root MuiRadio-root MuiRadio-colorPrimary MuiRadio-root MuiRadio-colorPrimary css-b2e26m-MuiButtonBase-root-MuiRadio-root"
+          class="MuiButtonBase-root MuiRadio-root MuiRadio-colorPrimary PrivateSwitchBase-root MuiRadio-root MuiRadio-colorPrimary MuiRadio-root MuiRadio-colorPrimary css-18i0j3m-MuiButtonBase-root-MuiRadio-root"
         >
           <input
             class="PrivateSwitchBase-input css-j8yymo"
@@ -105,7 +105,7 @@ exports[`<SMRadio /> should work 1`] = `
         class="MuiFormControlLabel-root MuiFormControlLabel-labelPlacementEnd css-19opgx6-MuiFormControlLabel-root"
       >
         <span
-          class="MuiButtonBase-root MuiRadio-root MuiRadio-colorPrimary PrivateSwitchBase-root MuiRadio-root MuiRadio-colorPrimary MuiRadio-root MuiRadio-colorPrimary css-b2e26m-MuiButtonBase-root-MuiRadio-root"
+          class="MuiButtonBase-root MuiRadio-root MuiRadio-colorPrimary PrivateSwitchBase-root MuiRadio-root MuiRadio-colorPrimary MuiRadio-root MuiRadio-colorPrimary css-18i0j3m-MuiButtonBase-root-MuiRadio-root"
         >
           <input
             class="PrivateSwitchBase-input css-j8yymo"
diff --git a/src/components/ServiceMapButton/__tests__/__snapshots__/ServiceMapButton.test.js.snap b/src/components/ServiceMapButton/__tests__/__snapshots__/ServiceMapButton.test.js.snap
index a88028486..25aedb23d 100644
--- a/src/components/ServiceMapButton/__tests__/__snapshots__/ServiceMapButton.test.js.snap
+++ b/src/components/ServiceMapButton/__tests__/__snapshots__/ServiceMapButton.test.js.snap
@@ -3,7 +3,7 @@
 exports[`<ServiceMapButton /> should work 1`] = `
 <div>
   <button
-    class="MuiButtonBase-root SMButton css-urweha-MuiButtonBase-root"
+    class="MuiButtonBase-root SMButton css-60seh6-MuiButtonBase-root"
     color="default"
     margin="0"
     role="button"
diff --git a/src/components/ToolMenu/MeasuringStopButton/__tests__/__snapshots__/MeasuringStopButton.test.js.snap b/src/components/ToolMenu/MeasuringStopButton/__tests__/__snapshots__/MeasuringStopButton.test.js.snap
index 572a40be9..05950cd51 100644
--- a/src/components/ToolMenu/MeasuringStopButton/__tests__/__snapshots__/MeasuringStopButton.test.js.snap
+++ b/src/components/ToolMenu/MeasuringStopButton/__tests__/__snapshots__/MeasuringStopButton.test.js.snap
@@ -4,7 +4,7 @@ exports[`<MeasuringStopButton /> should work 1`] = `
 <div>
   <button
     aria-label="Stop measuring"
-    class="MuiButtonBase-root SMButton css-1tt00yd-MuiButtonBase-root"
+    class="MuiButtonBase-root SMButton css-1g3sd65-MuiButtonBase-root"
     color="primary"
     id="MeasuringStopButton"
     margin="0"
diff --git a/src/components/TopBar/MenuButton/__tests__/__snapshots__/MenuButton.test.js.snap b/src/components/TopBar/MenuButton/__tests__/__snapshots__/MenuButton.test.js.snap
index a94e3f4c4..c78aadc87 100644
--- a/src/components/TopBar/MenuButton/__tests__/__snapshots__/MenuButton.test.js.snap
+++ b/src/components/TopBar/MenuButton/__tests__/__snapshots__/MenuButton.test.js.snap
@@ -6,7 +6,7 @@ exports[`<MenuButton /> should work 1`] = `
     aria-expanded="false"
     aria-haspopup="true"
     aria-label="Menu"
-    class="MuiButtonBase-root css-6zf9p1-MuiButtonBase-root"
+    class="MuiButtonBase-root css-1aijl4j-MuiButtonBase-root"
     id="MenuButton"
     largebutton="1"
     tabindex="0"
diff --git a/src/components/TopBar/SMLogo/__tests__/__snapshots__/SMLogo.test.js.snap b/src/components/TopBar/SMLogo/__tests__/__snapshots__/SMLogo.test.js.snap
index cda4e94b4..19d2b85f2 100644
--- a/src/components/TopBar/SMLogo/__tests__/__snapshots__/SMLogo.test.js.snap
+++ b/src/components/TopBar/SMLogo/__tests__/__snapshots__/SMLogo.test.js.snap
@@ -5,7 +5,7 @@ exports[`<SMLogo /> should work 1`] = `
   <button
     aria-current="page"
     aria-label="Servicemap - Go to home page"
-    class="MuiButtonBase-root css-1walttk-MuiButtonBase-root"
+    class="MuiButtonBase-root css-9fh4tn-MuiButtonBase-root"
     role="link"
     tabindex="0"
     type="button"
diff --git a/src/themes/index.js b/src/themes/index.js
index 6fa2033f9..732ef7647 100644
--- a/src/themes/index.js
+++ b/src/themes/index.js
@@ -14,6 +14,124 @@ const props = {
   },
 };
 
+// Color palette from Helsinki Design System
+const colors = {
+  lightGray: 'rgba(222, 222, 222, 1)',
+  black03: '#F4F4F4',
+};
+
+// Color palette for normal theme
+export const paletteDefault = {
+  primary: {
+    main: 'rgb(10, 26, 175)',
+    highContrast: '#fff',
+  },
+  secondary: {
+    main: 'rgb(43, 47, 57)',
+    hover: '#1d39ad',
+  },
+  white: {
+    light: '#f2f2f2',
+    main: '#FFFFFF',
+    dark: '#949494',
+    contrastText: '#000',
+  },
+  detail: {
+    main: 'rgb(10, 26, 175)',
+    alpha: 'rgb(10, 26, 175, 0.5)',
+  },
+  disabled: {
+    main: 'rgb(239, 239, 239)',
+    strong: '#898989',
+  },
+  focusBorder: {
+    main: 'rgb(71, 131, 235)',
+  },
+  warning: {
+    main: '#AF0021',
+  },
+  measuringStroke: {
+    main: '#fff',
+    background: 'rgb(10, 26, 175)',
+    border: '#fff',
+  },
+  link: {
+    main: '#3333FF',
+  },
+  border: {
+    main: colors.lightGray,
+  },
+  hover: {
+    main: colors.black03,
+  },
+};
+
+// Color palette for dark theme
+export const paletteDark = {
+  primary: {
+    main: 'rgb(53, 54, 56)',
+    highContrast: '#fff',
+  },
+  secondary: {
+    main: 'rgb(43, 47, 57)',
+    hover: '#5b5d61',
+  },
+  background: {
+    main: '#4A4A4C',
+    plain: '#4A4A4C',
+    front:
+      'linear-gradient(326.21deg, rgba(0, 0, 0, 0.79) 0%, rgba(71, 71, 71, 0.79) 100%)',
+  },
+  white: {
+    light: '#f2f2f2',
+    main: '#FFFFFF',
+    dark: '#949494',
+    contrastText: '#000',
+  },
+  detail: {
+    main: '#585B63',
+    alpha: 'rgba(88,91,99,0.5)',
+  },
+  disabled: {
+    main: 'rgb(239, 239, 239)',
+    strong: '#898989',
+  },
+  warning: {
+    main: '#AF0021',
+  },
+  focusBorder: {
+    main: '#000',
+  },
+  measuringStroke: {
+    main: '#313131',
+    background: '#A6A6A6',
+    border: '#fff',
+  },
+  link: {
+    main: '#3333FF',
+  },
+  border: {
+    main: colors.lightGray,
+  },
+  hover: {
+    main: colors.black03,
+  },
+};
+
+const focusIndicator = {
+  outline: '2px solid transparent !important',
+  borderRadius: '4px',
+  boxShadow: `0 0 0 2px rgb(255, 255, 255), 0 0 0 6px ${paletteDefault.primary.main}, 0 0 0 8px rgb(255, 255, 255) !important`,
+  zIndex: '1',
+};
+
+const focusIndicatorDark = {
+  outline: '2px solid transparent !important',
+  boxShadow:
+    '0 0 0 2px rgb(255, 255, 255), 0 0 0 6px rgb(0, 0, 0), 0 0 0 8px rgb(255, 255, 255) !important',
+  zIndex: '1',
+};
+
 const components = theme => ({
   MuiListItem: {
     styleOverrides: {
@@ -200,124 +318,6 @@ const typography = {
   },
 };
 
-// Color palette from Helsinki Design System
-const colors = {
-  lightGray: 'rgba(222, 222, 222, 1)',
-  black03: '#F4F4F4',
-};
-
-// Color palette for normal theme
-export const paletteDefault = {
-  primary: {
-    main: 'rgb(10, 26, 175)',
-    highContrast: '#fff',
-  },
-  secondary: {
-    main: 'rgb(43, 47, 57)',
-    hover: '#1d39ad',
-  },
-  white: {
-    light: '#f2f2f2',
-    main: '#FFFFFF',
-    dark: '#949494',
-    contrastText: '#000',
-  },
-  detail: {
-    main: 'rgb(10, 26, 175)',
-    alpha: 'rgb(10, 26, 175, 0.5)',
-  },
-  disabled: {
-    main: 'rgb(239, 239, 239)',
-    strong: '#898989',
-  },
-  focusBorder: {
-    main: 'rgb(71, 131, 235)',
-  },
-  warning: {
-    main: '#AF0021',
-  },
-  measuringStroke: {
-    main: '#fff',
-    background: 'rgb(10, 26, 175)',
-    border: '#fff',
-  },
-  link: {
-    main: '#3333FF',
-  },
-  border: {
-    main: colors.lightGray,
-  },
-  hover: {
-    main: colors.black03,
-  },
-};
-
-// Color palette for dark theme
-export const paletteDark = {
-  primary: {
-    main: 'rgb(53, 54, 56)',
-    highContrast: '#fff',
-  },
-  secondary: {
-    main: 'rgb(43, 47, 57)',
-    hover: '#5b5d61',
-  },
-  background: {
-    main: '#4A4A4C',
-    plain: '#4A4A4C',
-    front:
-      'linear-gradient(326.21deg, rgba(0, 0, 0, 0.79) 0%, rgba(71, 71, 71, 0.79) 100%)',
-  },
-  white: {
-    light: '#f2f2f2',
-    main: '#FFFFFF',
-    dark: '#949494',
-    contrastText: '#000',
-  },
-  detail: {
-    main: '#585B63',
-    alpha: 'rgba(88,91,99,0.5)',
-  },
-  disabled: {
-    main: 'rgb(239, 239, 239)',
-    strong: '#898989',
-  },
-  warning: {
-    main: '#AF0021',
-  },
-  focusBorder: {
-    main: '#000',
-  },
-  measuringStroke: {
-    main: '#313131',
-    background: '#A6A6A6',
-    border: '#fff',
-  },
-  link: {
-    main: '#3333FF',
-  },
-  border: {
-    main: colors.lightGray,
-  },
-  hover: {
-    main: colors.black03,
-  },
-};
-
-const focusIndicator = {
-  outline: '2px solid transparent',
-  borderRadius: '4px',
-  boxShadow: `0 0 0 2px rgb(255, 255, 255), 0 0 0 6px ${paletteDefault.primary.main}, 0 0 0 8px rgb(255, 255, 255)`,
-  zIndex: '1',
-};
-
-const focusIndicatorDark = {
-  outline: '2px solid transparent',
-  boxShadow:
-    '0 0 0 2px rgb(255, 255, 255), 0 0 0 6px rgb(0, 0, 0), 0 0 0 8px rgb(255, 255, 255)',
-  zIndex: '1',
-};
-
 // Themes
 const SMTheme = createTheme({
   props,
diff --git a/src/views/UnitView/components/UnitDataList/__tests__/__snapshots__/UnitDataList.test.js.snap b/src/views/UnitView/components/UnitDataList/__tests__/__snapshots__/UnitDataList.test.js.snap
index 437c8852c..8cc6477cc 100644
--- a/src/views/UnitView/components/UnitDataList/__tests__/__snapshots__/UnitDataList.test.js.snap
+++ b/src/views/UnitView/components/UnitDataList/__tests__/__snapshots__/UnitDataList.test.js.snap
@@ -22,7 +22,7 @@ exports[`<UnitDataList /> should work 1`] = `
       class="MuiList-root css-54zhjy-MuiList-root"
     >
       <li
-        class="MuiButtonBase-root MuiListItemButton-root MuiListItemButton-gutters MuiListItemButton-root MuiListItemButton-gutters css-mctqh3-MuiButtonBase-root-MuiListItemButton-root"
+        class="MuiButtonBase-root MuiListItemButton-root MuiListItemButton-gutters MuiListItemButton-root MuiListItemButton-gutters css-oga50u-MuiButtonBase-root-MuiListItemButton-root"
         data-sm="ResultItemComponent"
         data-testid="EventItem"
         role="link"
@@ -83,7 +83,7 @@ exports[`<UnitDataList /> should work 1`] = `
         />
       </li>
       <li
-        class="MuiButtonBase-root MuiListItemButton-root MuiListItemButton-gutters MuiListItemButton-root MuiListItemButton-gutters css-mctqh3-MuiButtonBase-root-MuiListItemButton-root"
+        class="MuiButtonBase-root MuiListItemButton-root MuiListItemButton-gutters MuiListItemButton-root MuiListItemButton-gutters css-oga50u-MuiButtonBase-root-MuiListItemButton-root"
         data-sm="ResultItemComponent"
         data-testid="EventItem"
         role="link"
@@ -144,7 +144,7 @@ exports[`<UnitDataList /> should work 1`] = `
         />
       </li>
       <li
-        class="MuiButtonBase-root MuiListItemButton-root MuiListItemButton-gutters MuiListItemButton-root MuiListItemButton-gutters css-mctqh3-MuiButtonBase-root-MuiListItemButton-root"
+        class="MuiButtonBase-root MuiListItemButton-root MuiListItemButton-gutters MuiListItemButton-root MuiListItemButton-gutters css-oga50u-MuiButtonBase-root-MuiListItemButton-root"
         data-sm="ResultItemComponent"
         data-testid="EventItem"
         role="link"
@@ -199,7 +199,7 @@ exports[`<UnitDataList /> should work 1`] = `
     </ul>
     <button
       aria-label="Show more events (2)"
-      class="MuiButtonBase-root SMButton css-1a222ty-MuiButtonBase-root"
+      class="MuiButtonBase-root SMButton css-1r4tpir-MuiButtonBase-root"
       color="default"
       id="UniteventsButton"
       margin="1"