diff --git a/package.json b/package.json
index e38fa67b..dd3ec29e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@netdata/netdata-ui",
-  "version": "5.4.5",
+  "version": "5.4.6",
   "description": "netdata UI kit",
   "main": "dist/index.js",
   "module": "dist/es6/index.js",
diff --git a/src/components/tabs/styled.js b/src/components/tabs/styled.js
index 3842d87b..d6e835c4 100644
--- a/src/components/tabs/styled.js
+++ b/src/components/tabs/styled.js
@@ -26,21 +26,23 @@ export const StyledTabs = styled(Flex).attrs(props => ({
 }))``
 
 const colorsByFlavour = {
-  success: { background: "menuItemSelected", borderColor: "accent", color: "menuItem" },
-  warning: { background: "warningSemi", borderColor: "warning", color: "menuItem" },
-  error: { background: "errorSemi", borderColor: "error", color: "menuItem" },
+  success: { background: "menuItemSelected", borderColor: "border", color: "menuItem" },
+  warning: { background: "warningSemi", borderColor: "border", color: "menuItem" },
+  error: { background: "errorSemi", borderColor: "border", color: "menuItem" },
   default: { background: "modalBackground", borderColor: "border", color: "menuItem" },
 }
 
 const activeColorsByFlavour = {
-  success: { ...colorsByFlavour.success, color: "primary" },
-  warning: { ...colorsByFlavour.warning, color: "warning" },
-  error: { ...colorsByFlavour.error, color: "error" },
+  success: { ...colorsByFlavour.success, borderColor: "primary", color: "primary" },
+  warning: { ...colorsByFlavour.warning, borderColor: "warning", color: "warning" },
+  error: { ...colorsByFlavour.error, borderColor: "error", color: "error" },
   default: { background: "menuItemSelected", borderColor: "accent", color: "primary" },
 }
 
 const hoverColorsByFlavour = {
-  ...colorsByFlavour,
+  success: { ...colorsByFlavour.success, borderColor: "primary" },
+  warning: { ...colorsByFlavour.warning, borderColor: "warning" },
+  error: { ...colorsByFlavour.error, borderColor: "error" },
   default: { ...colorsByFlavour.default, borderColor: "primary" },
 }