diff --git a/core/modules/contextual/contextual.toolbar.css b/core/modules/contextual/contextual.toolbar.css
index 189a07f..d9a122f 100644
--- a/core/modules/contextual/contextual.toolbar.css
+++ b/core/modules/contextual/contextual.toolbar.css
@@ -6,6 +6,7 @@
 /* Tab icon. */
 .icon-edit:before {
   background-image: url("../../misc/edit.png");
+  top: 0;
 }
 .icon-edit:active:before,
 .active.icon-edit:before {
diff --git a/core/modules/shortcut/shortcut.theme.css b/core/modules/shortcut/shortcut.theme.css
index 04f7c9f..93200b8 100644
--- a/core/modules/shortcut/shortcut.theme.css
+++ b/core/modules/shortcut/shortcut.theme.css
@@ -8,6 +8,7 @@
  */
 .icon-shortcut:before {
   background-image: url("images/shortcut.png");
+  top: 0;
 }
 .icon-shortcut:active:before,
 .icon-shortcut.active:before {
diff --git a/core/modules/toolbar/css/toolbar.icons.css b/core/modules/toolbar/css/toolbar.icons.css
index 7fc06bf..de1535e 100644
--- a/core/modules/toolbar/css/toolbar.icons.css
+++ b/core/modules/toolbar/css/toolbar.icons.css
@@ -1,6 +1,39 @@
 /**
  * @file toolbar.icons.css
  */
+
+
+@font-face {
+	font-family: 'drupal';
+	src:url('../fonts/drupal.eot');
+	src:url('../fonts/drupal.eot?#iefix') format('embedded-opentype'),
+		url('../fonts/drupal.woff') format('woff'),
+		url('../fonts/drupal.ttf') format('truetype'),
+		url('../fonts/drupal.svg#drupal') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+
+.icon {
+  font-family: "drupal", "Source Sans Pro", "Lucida Grande", Verdana, sans-serif;
+  font-size: 0.8125rem;
+  -moz-tap-highlight-color: rgba(0,0,0,0);
+  -o-tap-highlight-color: rgba(0,0,0,0);
+  -webkit-tap-highlight-color: rgba(0,0,0,0);
+  tap-highlight-color: rgba(0,0,0,0);
+  -moz-touch-callout: none;
+  -o-touch-callout: none;
+  -webkit-touch-callout: none;
+  touch-callout: none;
+  speak: none;
+	font-style: normal;
+	font-weight: normal;
+	font-variant: normal;
+	text-transform: none;
+	line-height: 1;
+	-webkit-font-smoothing: antialiased;
+}
+
 .toolbar .icon {
   padding-left: 2.75em; /* LTR */
   position: relative;
@@ -15,7 +48,6 @@
   height: 100%;
   left: 0.6667em; /* LTR */
   position: absolute;
-  top: 0;
   width: 20px;
 }
 .toolbar button.icon {
@@ -39,79 +71,55 @@
 /**
  * Top level icons
  */
-.icon-home:before {
-  background-image: url("../images/icon-home.png");
-}
-.icon-home:active:before,
-.icon-home.active:before {
-  background-image: url("../images/icon-home-active.png");
-}
-.icon-menu:before {
-  background-image: url("../images/icon-menu.png");
-}
-.icon-menu:active:before,
-.icon-menu.active:before {
-  background-image: url("../images/icon-menu-active.png");
+icon-home:before {
+  font-size: 1.3em;
+  color: #d0d0d0;
+	content: "\e000";
+}
+.icon.icon-home:active:before,
+.icon.icon-home.active:before {
+  font-size: 1.3em;
+  color: #ffffff;
+  content: "\e000";
+}
+.icon.icon-menu:before {
+  color: #d0d0d0;
+  font-size: 1.3em;
+	content: "\e00f";
+}
+.icon.icon-menu:active:before,
+.icon.icon-menu.active:before {
+  color: #ffffff;
+  font-size: 1.3em;
+	content: "\e010";
 }
 
 /**
  * Main menu icons.
  */
-.icon-content:before {
-  background-image: url("../images/icon-content.png");
-}
-.icon-content:active:before,
-.icon-content.active:before {
-  background-image: url("../images/icon-content-active.png");
-}
-.icon-structure:before {
-  background-image: url("../images/icon-structure.png");
-}
-.icon-structure:active:before,
-.icon-structure.active:before {
-  background-image: url("../images/icon-structure-active.png");
-}
-.icon-appearance:before {
-  background-image: url("../images/icon-appearance.png");
-}
-.icon-appearance:active:before,
-.icon-appearance.active:before {
-  background-image: url("../images/icon-appearance-active.png");
-}
-.icon-people:before {
-  background-image: url("../images/icon-people.png");
-}
-.icon-people:active:before,
-.icon-people.active:before {
-  background-image: url("../images/icon-people-active.png");
-}
-.icon-extend:before {
-  background-image: url("../images/icon-extend.png");
+.icon.icon-content:before {
+	content: "\e002";
 }
-.icon-extend:active:before,
-.icon-extend.active:before {
-  background-image: url("../images/icon-extend-active.png");
+.icon.icon-structure:before {
+	content: "\e011";
 }
-.icon-configuration:before {
-  background-image: url("../images/icon-configuration.png");
+.icon.icon-appearance:before {
+	content: "\e004";
 }
-.icon-configuration:active:before,
-.icon-configuration.active:before {
-  background-image: url("../images/icon-configuration-active.png");
+.icon.icon-people:before {
+	content: "\e007";
 }
-.icon-reports:before {
-  background-image: url("../images/icon-reports.png");
+.icon.icon-extend:before {
+	content: "\e00e";
 }
-.icon-reports:active:before,
-.icon-reports.active:before {
-  background-image: url("../images/icon-reports-active.png");
+.icon.icon-configuration:before {
+	content: "\e00d";
 }
-.icon-help:before {
-  background-image: url("../images/icon-help.png");
+.icon.icon-reports:before {
+	content: "\e003";
 }
-.icon-help:active:before,
-.icon-help.active:before {
-  background-image: url("../images/icon-help-active.png");
+.icon.icon-help:before {
+	content: "\e017";
 }
 
 @media only screen and (min-width: 16.5em) {
diff --git a/core/modules/toolbar/css/toolbar.menu.css b/core/modules/toolbar/css/toolbar.menu.css
index c77c4c5..c30c487 100644
--- a/core/modules/toolbar/css/toolbar.menu.css
+++ b/core/modules/toolbar/css/toolbar.menu.css
@@ -87,15 +87,17 @@
   z-index: 1;
 }
 .toolbar .icon.handle:before {
-  background-image: url("../images/icon-open.png");
+	content: "\e009";
   left: 0; /* LTR */
+  text-indent: 0;
+  color: #d0d0d0;
 }
 .toolbar .icon.handle.open:before {
-  background-image: url("../images/icon-collapse.png");
+	content: "\e00a";
 }
 .toolbar .menu .menu .icon.handle:before {
-  background-image: url("../images/icon-child-open.png");
+	content: "\e009";
 }
 .toolbar .menu .menu .icon.handle.open:before {
-  background-image: url("../images/icon-child-collapse.png");
+ 	content: "\e00a";
 }
diff --git a/core/modules/toolbar/css/toolbar.theme-rtl.css b/core/modules/toolbar/css/toolbar.theme-rtl.css
index 031bc60..393529a 100644
--- a/core/modules/toolbar/css/toolbar.theme-rtl.css
+++ b/core/modules/toolbar/css/toolbar.theme-rtl.css
@@ -61,5 +61,5 @@
   right: 0;
 }
 .toolbar .toggle-orientation [value="vertical"]:before {
-  background-image: url('../images/icon-toggle-vertical-rtl.png'); /* LTR */
+	content: "\e005"; /* LTR */
 }
diff --git a/core/modules/toolbar/css/toolbar.theme.css b/core/modules/toolbar/css/toolbar.theme.css
index 4120135..14bd7b7 100644
--- a/core/modules/toolbar/css/toolbar.theme.css
+++ b/core/modules/toolbar/css/toolbar.theme.css
@@ -141,10 +141,12 @@
 }
 .toolbar .toggle-orientation button:before {
   left: 0; /* LTR */
+  text-indent: 0;
+  color: #d0d0d0;
 }
-.toolbar .toggle-orientation [value="vertical"]:before {
-  background-image: url('../images/icon-toggle-vertical.png'); /* LTR */
+.toolbar  .toggle-orientation [value="vertical"]:before {
+	content: "\e005"; /* LTR */
 }
 .toolbar .toggle-orientation [value="horizontal"]:before {
-  background-image: url('../images/icon-toggle-horizontal.png');
+	content: "\e006";
 }
diff --git a/core/modules/user/user.css b/core/modules/user/user.css
index 2c88121..f27827d 100644
--- a/core/modules/user/user.css
+++ b/core/modules/user/user.css
@@ -95,6 +95,8 @@ div.password-suggestions ul {
  */
 .icon-user:before {
   background-image: url("images/icon-user.png");
+  top: 0;
+
 }
 .icon-user:active:before,
 .icon-user.active:before {