diff --git a/client/Dockerfile b/client/Dockerfile
index 0fc2c49b20..3acd5d1d73 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -3,4 +3,4 @@ WORKDIR /home/weave
 COPY package.json yarn.lock /home/weave/
 ENV NPM_CONFIG_LOGLEVEL=warn NPM_CONFIG_PROGRESS=false
 RUN yarn --pure-lockfile
-COPY webpack-common.js webpack.local.config.js webpack.production.config.js server.js .babelrc .eslintrc .eslintignore .stylelintrc .sass-lint.yml /home/weave/
+COPY webpack.local.config.js webpack.production.config.js server.js .babelrc .eslintrc .eslintignore .stylelintrc .sass-lint.yml /home/weave/
diff --git a/client/app/styles/_base.scss b/client/app/styles/_base.scss
index c91940672d..887c869623 100644
--- a/client/app/styles/_base.scss
+++ b/client/app/styles/_base.scss
@@ -1454,7 +1454,7 @@ a {
 
   .fa {
     margin-left: 4px;
-    color: $color-red-berry;
+    color: $color-accent-orange;
   }
 
   &-wrapper {
diff --git a/client/package.json b/client/package.json
index 6d92e1fa86..75c472abd6 100644
--- a/client/package.json
+++ b/client/package.json
@@ -43,7 +43,7 @@
     "reselect": "3.0.1",
     "reselect-map": "1.0.3",
     "styled-components": "2.2.4",
-    "weaveworks-ui-components": "0.4.42",
+    "weaveworks-ui-components": "0.4.49",
     "whatwg-fetch": "2.0.3",
     "xterm": "2.9.2"
   },
diff --git a/client/webpack-common.js b/client/webpack-common.js
deleted file mode 100644
index 72cf9f02b8..0000000000
--- a/client/webpack-common.js
+++ /dev/null
@@ -1,25 +0,0 @@
-const { isString, kebabCase, forEach } = require('lodash');
-const theme = require('weaveworks-ui-components/lib/theme').default;
-
-// Flattens and collects all theme colors, names them
-// as Scss vars and returns them as query string
-// TODO: Move this helper to ui-components repo as
-// it's currently used both here and in service-ui.
-function themeColorsAsScss() {
-  const colors = [];
-  forEach(theme.colors, (value, name) => {
-    const colorPrefix = `$color-${kebabCase(name)}`;
-    if (isString(value)) {
-      colors.push(`${colorPrefix}: ${value}`);
-    } else {
-      forEach(value, (innerValue, subname) => {
-        colors.push(`${colorPrefix}-${kebabCase(subname)}: ${innerValue}`);
-      });
-    }
-  });
-  return `${colors.join('; ')};`;
-}
-
-module.exports = {
-  themeColorsAsScss,
-};
diff --git a/client/webpack.local.config.js b/client/webpack.local.config.js
index 4a3f1b84c6..7264cc3cd9 100644
--- a/client/webpack.local.config.js
+++ b/client/webpack.local.config.js
@@ -5,8 +5,7 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const SassLintPlugin = require('sasslint-webpack-plugin');
 const ContrastStyleCompiler = require('./app/scripts/contrast-compiler');
-
-const { themeColorsAsScss } = require('./webpack-common');
+const { themeColorsAsScss } = require('weaveworks-ui-components/lib/theme');
 
 /**
  * This is the Webpack configuration file for local development.
diff --git a/client/webpack.production.config.js b/client/webpack.production.config.js
index f04a20e8df..db23b8c930 100644
--- a/client/webpack.production.config.js
+++ b/client/webpack.production.config.js
@@ -6,8 +6,7 @@ const CleanWebpackPlugin = require('clean-webpack-plugin');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const ContrastStyleCompiler = require('./app/scripts/contrast-compiler');
-
-const { themeColorsAsScss } = require('./webpack-common');
+const { themeColorsAsScss } = require('weaveworks-ui-components/lib/theme');
 
 const GLOBALS = {
   'process.env': {NODE_ENV: '"production"'}
diff --git a/client/yarn.lock b/client/yarn.lock
index 2d48673a10..dc9f60b88e 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -7591,9 +7591,9 @@ wd@^0.4.0:
     underscore.string "~3.0.3"
     vargs "~0.1.0"
 
-weaveworks-ui-components@0.4.42:
-  version "0.4.42"
-  resolved "https://registry.yarnpkg.com/weaveworks-ui-components/-/weaveworks-ui-components-0.4.42.tgz#e2e4f22ebe9ac3f8c562e41a79b2cf29f628fbe6"
+weaveworks-ui-components@0.4.49:
+  version "0.4.49"
+  resolved "https://registry.yarnpkg.com/weaveworks-ui-components/-/weaveworks-ui-components-0.4.49.tgz#3aa1c014d6a93d2f3bc370b84268f7289bdfc0fb"
   dependencies:
     classnames "2.2.5"
     d3-drag "1.2.1"