diff --git a/package.json b/package.json
index 2b9eac85..2830a6a9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@netdata/netdata-ui",
-  "version": "5.2.4",
+  "version": "5.2.5",
   "description": "netdata UI kit",
   "main": "dist/index.js",
   "module": "dist/es6/index.js",
diff --git a/src/components/button/buttonGroup.js b/src/components/button/buttonGroup.js
index 7cbae2fa..9c21e30f 100644
--- a/src/components/button/buttonGroup.js
+++ b/src/components/button/buttonGroup.js
@@ -32,7 +32,14 @@ const Content = ({ children }) => {
   )
 }
 
-const RadioButtons = ({ items, value, isMulti, buttonProps = {}, onChange }) => {
+const RadioButtons = ({
+  items,
+  value,
+  isMulti,
+  ButtonComponent = Button,
+  buttonProps = {},
+  onChange,
+}) => {
   return (
     <>
       {items.map((item, index) => {
@@ -54,7 +61,7 @@ const RadioButtons = ({ items, value, isMulti, buttonProps = {}, onChange }) =>
         }
 
         return (
-          <Button
+          <ButtonComponent
             key={item.value}
             label={item.label}
             onClick={onClick}
@@ -62,6 +69,7 @@ const RadioButtons = ({ items, value, isMulti, buttonProps = {}, onChange }) =>
             {...(!isSelected ? { flavour: "hollow" } : {})}
             {...buttonGroupProps}
             {...buttonProps}
+            {...(item.buttonProps || {})}
           />
         )
       })}
@@ -75,6 +83,7 @@ export const ButtonGroup = ({
   isMulti,
   onChange = noop,
   children,
+  ButtonComponent,
   buttonProps,
   ...props
 }) => (
@@ -85,6 +94,7 @@ export const ButtonGroup = ({
         value={value}
         isMulti={isMulti}
         onChange={onChange}
+        ButtonComponent={ButtonComponent}
         buttonProps={buttonProps}
       />
     ) : (