diff --git a/webmaker/src/components/ContentWrap.jsx b/webmaker/src/components/ContentWrap.jsx
index daf9927..173de97 100644
--- a/webmaker/src/components/ContentWrap.jsx
+++ b/webmaker/src/components/ContentWrap.jsx
@@ -457,7 +457,9 @@ export default class ContentWrap extends Component {
 										title="Clear console (CTRL + L)"
 										d-click="onClearConsoleBtnClick"
 									>
-										Clear
+										<svg>
+											<use xlinkHref="#cancel-icon" />
+										</svg>
 									</a>
 									<a
 										class="code-wrap__header-btn  code-wrap__collapse-btn"
diff --git a/webmaker/src/components/Footer.jsx b/webmaker/src/components/Footer.jsx
index 3733776..0aee9ab 100644
--- a/webmaker/src/components/Footer.jsx
+++ b/webmaker/src/components/Footer.jsx
@@ -144,7 +144,15 @@ export default class Footer extends Component {
 					class="footer__link  hint--rounded  hint--top-right hide-on-mobile"
 					aria-label="Keyboard shortcuts"
 				>
-					Keyboard
+					<svg
+						style={{
+							width: '20px',
+							height: '20px',
+							verticalAlign: 'text-bottom'
+						}}
+					>
+						<use xlinkHref="#keyboard-icon" />
+					</svg>
 				</a>
 				<a
 					class="footer__link  hint--rounded  hint--top-right"
@@ -152,7 +160,15 @@ export default class Footer extends Component {
 					href="http://twitter.com/share?url=https://webmakerapp.com/&text=Web Maker - A blazing fast %26 offline web playground! via @webmakerApp&related=webmakerApp&hashtags=web,frontend,playground,offline"
 					target="_blank"
 				>
-					Tweet
+					<svg
+						style={{
+							width: '20px',
+							height: '20px',
+							verticalAlign: 'text-bottom'
+						}}
+					>
+						<use xlinkHref="#twitter-icon" />
+					</svg>
 				</a>
 				<a
 					d-click="openSupportDeveloperModal"
diff --git a/webmaker/src/components/MainHeader.jsx b/webmaker/src/components/MainHeader.jsx
index 0f63e51..744d316 100644
--- a/webmaker/src/components/MainHeader.jsx
+++ b/webmaker/src/components/MainHeader.jsx
@@ -18,7 +18,9 @@ export default class Header extends Component {
 						aria-label="Run preview (Ctrl/⌘ + Shift + 5)"
 						d-click="onRunBtnClick"
 					>
-						<svg style="width: 14px; height: 14px;">Play</svg>Run
+						<svg style="width: 14px; height: 14px;">
+							<use xlinkHref="#play-icon" />
+						</svg>Run
 					</a>
 
 					<a
@@ -61,7 +63,7 @@ export default class Header extends Component {
 							<path d="M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z" />
 						</svg>
 						<svg class="btn-loader" width="15" height="15" stroke="#fff">
-							Loader
+							<use xlinkHref="#loader-icon" />
 						</svg>
 						Save
 					</a>
@@ -78,7 +80,7 @@ export default class Header extends Component {
 							<path d="M13,9V3.5L18.5,9M6,2C4.89,2 4,2.89 4,4V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V8L14,2H6Z" />
 						</svg>
 						<svg class="btn-loader" width="15" height="15" stroke="#fff">
-							Loader
+							<use xlinkHref="#loader-icon" />
 						</svg>
 						Open
 					</a>