diff --git a/packages/unleash-frontend-next/src/component/feature/feature-component.jsx b/packages/unleash-frontend-next/src/component/feature/feature-component.jsx
index d2dad486e1..92b022d4fd 100644
--- a/packages/unleash-frontend-next/src/component/feature/feature-component.jsx
+++ b/packages/unleash-frontend-next/src/component/feature/feature-component.jsx
@@ -4,6 +4,7 @@ import { Link } from 'react-router';
 import FontIcon from 'react-toolbox/lib/font_icon';
 import Switch from 'react-toolbox/lib/switch';
 import { ListItem } from 'react-toolbox/lib/list';
+import Chip from 'react-toolbox/lib/chip';
 
 import style from './feature.scss';
 
@@ -11,7 +12,7 @@ const Feature = ({ feature, onFeatureClick, onFeatureRemove }) => {
     const { name, description, enabled, strategies } = feature; // eslint-disable-line no-shadow
 
     const actions = [
-        strategies.map(s => s.name).join(', '),
+        <div>{strategies.map(s => <Chip><small>{s.name}</small></Chip>)}</div>,
         <Link to={`/features/edit/${name}`} title={`Edit ${name}`}>
             <FontIcon value="edit" className={style.action} />
         </Link>,
diff --git a/packages/unleash-frontend-next/src/component/feature/select-strategies.jsx b/packages/unleash-frontend-next/src/component/feature/select-strategies.jsx
index e5c6b62a06..79b4ea2ada 100644
--- a/packages/unleash-frontend-next/src/component/feature/select-strategies.jsx
+++ b/packages/unleash-frontend-next/src/component/feature/select-strategies.jsx
@@ -1,5 +1,6 @@
 import React, { PropTypes } from 'react';
-import { Button, Input } from 'react-toolbox';
+import Input from 'react-toolbox/lib/input';
+import Button from 'react-toolbox/lib/button';
 
 class SelectStrategies extends React.Component {
     constructor (props) {
diff --git a/packages/unleash-frontend-next/src/component/feature/selected-strategies.jsx b/packages/unleash-frontend-next/src/component/feature/selected-strategies.jsx
index a4f23e8af9..123ff36727 100644
--- a/packages/unleash-frontend-next/src/component/feature/selected-strategies.jsx
+++ b/packages/unleash-frontend-next/src/component/feature/selected-strategies.jsx
@@ -1,5 +1,6 @@
 import React, { PropTypes } from 'react';
-import { Avatar, Chip } from 'react-toolbox';
+import Chip from 'react-toolbox/lib/chip';
+import Avatar from 'react-toolbox/lib/avatar';
 
 class SelectedStrategies extends React.Component {
     static propTypes () {
diff --git a/packages/unleash-frontend-next/src/component/strategies/list-component.jsx b/packages/unleash-frontend-next/src/component/strategies/list-component.jsx
index f0145cd0fe..4a3208652b 100644
--- a/packages/unleash-frontend-next/src/component/strategies/list-component.jsx
+++ b/packages/unleash-frontend-next/src/component/strategies/list-component.jsx
@@ -1,6 +1,8 @@
 import React, { Component } from 'react';
 import { List, ListItem, ListSubHeader, ListDivider } from 'react-toolbox/lib/list';
 import FontIcon from 'react-toolbox/lib/font_icon';
+import Chip from 'react-toolbox/lib/chip';
+
 import style from './strategies.scss';
 
 class StrategiesListComponent extends Component {
@@ -15,7 +17,7 @@ class StrategiesListComponent extends Component {
 
     getParameterMap ({ parametersTemplate }) {
         return Object.keys(parametersTemplate || {}).map(k => (
-            <span className={style.label} key={k}>{k}</span>
+            <Chip key={k}><small>{k}</small></Chip>
         ));
     }
 
diff --git a/packages/unleash-frontend-next/src/component/strategies/strategies.scss b/packages/unleash-frontend-next/src/component/strategies/strategies.scss
index 4f726475a9..544d25fa08 100644
--- a/packages/unleash-frontend-next/src/component/strategies/strategies.scss
+++ b/packages/unleash-frontend-next/src/component/strategies/strategies.scss
@@ -1,13 +1,3 @@
-.label {
-    font-size: 75%;
-    color: #aaa;
-    padding: 4px 5px 3px 5px;
-    background-color: #ddd;
-    border-radius: 5px;
-    margin-right: 5px;
-}
-
-
 .non-style-button {
     cursor: pointer;
     color: #757575;