diff --git a/package-lock.json b/package-lock.json
index 563f17a4..310e2086 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1432,9 +1432,9 @@
       }
     },
     "@entur/button": {
-      "version": "2.10.15",
-      "resolved": "https://registry.npmjs.org/@entur/button/-/button-2.10.15.tgz",
-      "integrity": "sha512-8FYfFz4P3ZTQZew5ndhNkSS8qBd/lIeM52bzoJarPLGA0FDIrehXcTZG842jWkouA+OTaPVp1x0+VcS4mKUftw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@entur/button/-/button-3.0.0.tgz",
+      "integrity": "sha512-0zhnD8UjwP2Hmw4ITSxHwwGleeF7qoCu7gMSvCmhK5sV673M/h8vma3x8npiExmpXl4QQKGsnw7CeE1iX93bJQ==",
       "requires": {
         "@entur/loader": "^0.4.23",
         "@entur/tokens": "^3.8.0",
@@ -1461,17 +1461,6 @@
             "hex-rgb": "^4.3.0"
           }
         },
-        "@entur/typography": {
-          "version": "1.7.11",
-          "resolved": "https://registry.npmjs.org/@entur/typography/-/typography-1.7.11.tgz",
-          "integrity": "sha512-YDQWMH2wDiV1LUp4bpDMsGJok0/AlOQDtXAW6XbIKLiBxKgslDcOZUXXrgSh71RI8ynuKwdkJ5IWssv529+YUw==",
-          "requires": {
-            "@entur/tokens": "^3.8.0",
-            "@entur/utils": "^0.5.5",
-            "classnames": "^2.3.1",
-            "normalize-scss": "^7.0.1"
-          }
-        },
         "classnames": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
@@ -1527,6 +1516,40 @@
             "classnames": "^2.3.1"
           }
         },
+        "@entur/loader": {
+          "version": "0.4.23",
+          "resolved": "https://registry.npmjs.org/@entur/loader/-/loader-0.4.23.tgz",
+          "integrity": "sha512-A8UK0Q2xQddF7vuxqxkwicLfm0ldo7GeuFOJXe+oKw3ixQm467LCI8FK9u7ZsWET81m0LV08Sm5bU4CypEutnQ==",
+          "requires": {
+            "@entur/tokens": "^3.8.0",
+            "@entur/typography": "^1.7.11",
+            "@entur/utils": "^0.5.5",
+            "classnames": "^2.3.1"
+          },
+          "dependencies": {
+            "@entur/tokens": {
+              "version": "3.8.0",
+              "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.8.0.tgz",
+              "integrity": "sha512-Qp10NhCGaS7GyiXAz10t3X505h/OkMKSYqikjPQhBG+WCK4EBIqWBN1GK8CQCWo2ruRlRqULLDSvlW8DefHesA==",
+              "requires": {
+                "hex-rgb": "^4.3.0"
+              }
+            },
+            "@entur/utils": {
+              "version": "0.5.5",
+              "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.5.5.tgz",
+              "integrity": "sha512-Xj8O9mlSE1w6R+utl/fzm+E7kDXbsA+kg3Ci8xbUn+2tq/+OyKzTFzp4ACCpWQ6BIJHsaE4FGVoVrG0Pu5Nulg==",
+              "requires": {
+                "tiny-warning": "^1.0.3"
+              }
+            },
+            "hex-rgb": {
+              "version": "4.3.0",
+              "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.3.0.tgz",
+              "integrity": "sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw=="
+            }
+          }
+        },
         "@entur/tokens": {
           "version": "3.3.1",
           "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.3.1.tgz",
@@ -1546,6 +1569,42 @@
             "@entur/utils": "^0.4.3",
             "@popperjs/core": "^2.10.1",
             "react-popper": "^2.2.5"
+          },
+          "dependencies": {
+            "@entur/button": {
+              "version": "2.10.15",
+              "resolved": "https://registry.npmjs.org/@entur/button/-/button-2.10.15.tgz",
+              "integrity": "sha512-8FYfFz4P3ZTQZew5ndhNkSS8qBd/lIeM52bzoJarPLGA0FDIrehXcTZG842jWkouA+OTaPVp1x0+VcS4mKUftw==",
+              "requires": {
+                "@entur/loader": "^0.4.23",
+                "@entur/tokens": "^3.8.0",
+                "@entur/utils": "^0.5.5",
+                "classnames": "^2.3.1"
+              },
+              "dependencies": {
+                "@entur/utils": {
+                  "version": "0.5.5",
+                  "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.5.5.tgz",
+                  "integrity": "sha512-Xj8O9mlSE1w6R+utl/fzm+E7kDXbsA+kg3Ci8xbUn+2tq/+OyKzTFzp4ACCpWQ6BIJHsaE4FGVoVrG0Pu5Nulg==",
+                  "requires": {
+                    "tiny-warning": "^1.0.3"
+                  }
+                }
+              }
+            },
+            "@entur/tokens": {
+              "version": "3.8.0",
+              "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.8.0.tgz",
+              "integrity": "sha512-Qp10NhCGaS7GyiXAz10t3X505h/OkMKSYqikjPQhBG+WCK4EBIqWBN1GK8CQCWo2ruRlRqULLDSvlW8DefHesA==",
+              "requires": {
+                "hex-rgb": "^4.3.0"
+              }
+            },
+            "hex-rgb": {
+              "version": "4.3.0",
+              "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.3.0.tgz",
+              "integrity": "sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw=="
+            }
           }
         },
         "@entur/utils": {
@@ -1681,6 +1740,35 @@
             "react-popper": "^2.2.5"
           },
           "dependencies": {
+            "@entur/button": {
+              "version": "2.10.15",
+              "resolved": "https://registry.npmjs.org/@entur/button/-/button-2.10.15.tgz",
+              "integrity": "sha512-8FYfFz4P3ZTQZew5ndhNkSS8qBd/lIeM52bzoJarPLGA0FDIrehXcTZG842jWkouA+OTaPVp1x0+VcS4mKUftw==",
+              "requires": {
+                "@entur/loader": "^0.4.23",
+                "@entur/tokens": "^3.8.0",
+                "@entur/utils": "^0.5.5",
+                "classnames": "^2.3.1"
+              },
+              "dependencies": {
+                "@entur/tokens": {
+                  "version": "3.8.0",
+                  "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.8.0.tgz",
+                  "integrity": "sha512-Qp10NhCGaS7GyiXAz10t3X505h/OkMKSYqikjPQhBG+WCK4EBIqWBN1GK8CQCWo2ruRlRqULLDSvlW8DefHesA==",
+                  "requires": {
+                    "hex-rgb": "^4.3.0"
+                  }
+                },
+                "@entur/utils": {
+                  "version": "0.5.5",
+                  "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.5.5.tgz",
+                  "integrity": "sha512-Xj8O9mlSE1w6R+utl/fzm+E7kDXbsA+kg3Ci8xbUn+2tq/+OyKzTFzp4ACCpWQ6BIJHsaE4FGVoVrG0Pu5Nulg==",
+                  "requires": {
+                    "tiny-warning": "^1.0.3"
+                  }
+                }
+              }
+            },
             "@entur/icons": {
               "version": "3.5.0",
               "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-3.5.0.tgz",
@@ -1689,6 +1777,45 @@
                 "@entur/tokens": "^3.3.1",
                 "@entur/utils": "^0.4.3"
               }
+            },
+            "@entur/loader": {
+              "version": "0.4.23",
+              "resolved": "https://registry.npmjs.org/@entur/loader/-/loader-0.4.23.tgz",
+              "integrity": "sha512-A8UK0Q2xQddF7vuxqxkwicLfm0ldo7GeuFOJXe+oKw3ixQm467LCI8FK9u7ZsWET81m0LV08Sm5bU4CypEutnQ==",
+              "requires": {
+                "@entur/tokens": "^3.8.0",
+                "@entur/typography": "^1.7.11",
+                "@entur/utils": "^0.5.5",
+                "classnames": "^2.3.1"
+              },
+              "dependencies": {
+                "@entur/tokens": {
+                  "version": "3.8.0",
+                  "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.8.0.tgz",
+                  "integrity": "sha512-Qp10NhCGaS7GyiXAz10t3X505h/OkMKSYqikjPQhBG+WCK4EBIqWBN1GK8CQCWo2ruRlRqULLDSvlW8DefHesA==",
+                  "requires": {
+                    "hex-rgb": "^4.3.0"
+                  }
+                },
+                "@entur/utils": {
+                  "version": "0.5.5",
+                  "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.5.5.tgz",
+                  "integrity": "sha512-Xj8O9mlSE1w6R+utl/fzm+E7kDXbsA+kg3Ci8xbUn+2tq/+OyKzTFzp4ACCpWQ6BIJHsaE4FGVoVrG0Pu5Nulg==",
+                  "requires": {
+                    "tiny-warning": "^1.0.3"
+                  }
+                }
+              }
+            },
+            "classnames": {
+              "version": "2.3.2",
+              "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
+              "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
+            },
+            "hex-rgb": {
+              "version": "4.3.0",
+              "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.3.0.tgz",
+              "integrity": "sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw=="
             }
           }
         },
@@ -1945,6 +2072,40 @@
         "react-popper": "^2.2.5"
       },
       "dependencies": {
+        "@entur/button": {
+          "version": "2.10.15",
+          "resolved": "https://registry.npmjs.org/@entur/button/-/button-2.10.15.tgz",
+          "integrity": "sha512-8FYfFz4P3ZTQZew5ndhNkSS8qBd/lIeM52bzoJarPLGA0FDIrehXcTZG842jWkouA+OTaPVp1x0+VcS4mKUftw==",
+          "requires": {
+            "@entur/loader": "^0.4.23",
+            "@entur/tokens": "^3.8.0",
+            "@entur/utils": "^0.5.5",
+            "classnames": "^2.3.1"
+          },
+          "dependencies": {
+            "@entur/tokens": {
+              "version": "3.8.0",
+              "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.8.0.tgz",
+              "integrity": "sha512-Qp10NhCGaS7GyiXAz10t3X505h/OkMKSYqikjPQhBG+WCK4EBIqWBN1GK8CQCWo2ruRlRqULLDSvlW8DefHesA==",
+              "requires": {
+                "hex-rgb": "^4.3.0"
+              }
+            },
+            "@entur/utils": {
+              "version": "0.5.5",
+              "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.5.5.tgz",
+              "integrity": "sha512-Xj8O9mlSE1w6R+utl/fzm+E7kDXbsA+kg3Ci8xbUn+2tq/+OyKzTFzp4ACCpWQ6BIJHsaE4FGVoVrG0Pu5Nulg==",
+              "requires": {
+                "tiny-warning": "^1.0.3"
+              }
+            },
+            "hex-rgb": {
+              "version": "4.3.0",
+              "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.3.0.tgz",
+              "integrity": "sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw=="
+            }
+          }
+        },
         "@entur/icons": {
           "version": "3.5.0",
           "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-3.5.0.tgz",
@@ -1964,6 +2125,40 @@
             "classnames": "^2.3.1"
           }
         },
+        "@entur/loader": {
+          "version": "0.4.23",
+          "resolved": "https://registry.npmjs.org/@entur/loader/-/loader-0.4.23.tgz",
+          "integrity": "sha512-A8UK0Q2xQddF7vuxqxkwicLfm0ldo7GeuFOJXe+oKw3ixQm467LCI8FK9u7ZsWET81m0LV08Sm5bU4CypEutnQ==",
+          "requires": {
+            "@entur/tokens": "^3.8.0",
+            "@entur/typography": "^1.7.11",
+            "@entur/utils": "^0.5.5",
+            "classnames": "^2.3.1"
+          },
+          "dependencies": {
+            "@entur/tokens": {
+              "version": "3.8.0",
+              "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.8.0.tgz",
+              "integrity": "sha512-Qp10NhCGaS7GyiXAz10t3X505h/OkMKSYqikjPQhBG+WCK4EBIqWBN1GK8CQCWo2ruRlRqULLDSvlW8DefHesA==",
+              "requires": {
+                "hex-rgb": "^4.3.0"
+              }
+            },
+            "@entur/utils": {
+              "version": "0.5.5",
+              "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.5.5.tgz",
+              "integrity": "sha512-Xj8O9mlSE1w6R+utl/fzm+E7kDXbsA+kg3Ci8xbUn+2tq/+OyKzTFzp4ACCpWQ6BIJHsaE4FGVoVrG0Pu5Nulg==",
+              "requires": {
+                "tiny-warning": "^1.0.3"
+              }
+            },
+            "hex-rgb": {
+              "version": "4.3.0",
+              "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.3.0.tgz",
+              "integrity": "sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw=="
+            }
+          }
+        },
         "@entur/tokens": {
           "version": "3.3.1",
           "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.3.1.tgz",
diff --git a/package.json b/package.json
index 205d78cc..6e7ede15 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "@deck.gl/core": "8.3.10",
     "@deck.gl/layers": "8.3.10",
     "@deck.gl/react": "8.8.27",
-    "@entur/button": "2.10.15",
+    "@entur/button": "3.0.0",
     "@entur/dropdown": "1.4.7",
     "@entur/form": "4.4.7",
     "@entur/layout": "1.10.4",