diff --git a/package.json b/package.json
index 5471a5d..0bd184d 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
     "lodash.throttle": "^4.1.1",
     "mapbox-gl": "^0.34.0",
     "mapbox-gl-inspect": "^1.2.3",
+    "maputnik-design": "github:maputnik/design",
     "mousetrap": "^1.6.0",
     "ol-mapbox-style": "1.0.1",
     "openlayers": "^3.19.1",
diff --git a/src/components/Toolbar.jsx b/src/components/Toolbar.jsx
index bcb60f8..9bf7ad6 100644
--- a/src/components/Toolbar.jsx
+++ b/src/components/Toolbar.jsx
@@ -16,7 +16,7 @@ import MdFontDownload from 'react-icons/lib/md/font-download'
 import HelpIcon from 'react-icons/lib/md/help-outline'
 import InspectionIcon from 'react-icons/lib/md/find-in-page'
 
-import logoImage from '../img/maputnik.png'
+import logoImage from 'maputnik-design/logos/logo-color.svg'
 import SettingsModal from './modals/SettingsModal'
 import ExportModal from './modals/ExportModal'
 import SourcesModal from './modals/SourcesModal'
diff --git a/src/styles/_toolbar.scss b/src/styles/_toolbar.scss
index e945964..77dbea8 100644
--- a/src/styles/_toolbar.scss
+++ b/src/styles/_toolbar.scss
@@ -22,9 +22,8 @@
 
   img {
     width: 30px;
-    height: 30px;
     padding-right: $margin-2;
-    vertical-align: middle;
+    vertical-align: top;
   }
 }
 
diff --git a/test/specs/simple.js b/test/specs/simple.js
index 56b2769..fb6ca49 100644
--- a/test/specs/simple.js
+++ b/test/specs/simple.js
@@ -9,7 +9,7 @@ describe('maputnik', function() {
     browser.waitForExist(".maputnik-toolbar-link");
 
     var src = browser.getAttribute(".maputnik-toolbar-link img", "src");
-    assert.equal(src, config.baseUrl+'/img/maputnik.png');
+    assert.equal(src, config.baseUrl+'/img/logo-color.svg');
   });
 
 });