diff --git a/src/application/tabs.css b/src/application/tabs.css
index e0d5ce015c0c..630875daa07a 100644
--- a/src/application/tabs.css
+++ b/src/application/tabs.css
@@ -142,22 +142,25 @@
   display: inline-block;
 }
 
+.p-TabBar-WindowTabLabel {
+  margin-top: 4px;
+}
 
 .p-DockPanel-tabBar .p-TabBar-tab.p-mod-closable > .p-TabBar-tabCloseIcon {
   margin-left: 4px;
+  padding-top: 8px;
+  background-size: 16px;
+  height: 16px;
+  width: 16px;
+  background-image: url(../default-theme/icons/md/close.svg);
+  background-position: center;
+  background-repeat: no-repeat;
 }
 
 
-.p-DockPanel-tabBar .p-TabBar-tab.p-mod-closable > .p-TabBar-tabCloseIcon:before {
-  content: '\f00d';  /* close */
-  font-family: FontAwesome;
-}
-
-
-.p-DockPanel-tabBar .p-TabBar-tab.p-mod-closable.jp-mod-dirty > .p-TabBar-tabCloseIcon:before {
-  font-family: FontAwesome;
-  content: '\f111'; /* circle */
-  font-size: 10px;
+.p-DockPanel-tabBar .p-TabBar-tab.p-mod-closable.jp-mod-dirty > .p-TabBar-tabCloseIcon {
+  background-size: 12px;
+  background-image: url(../default-theme/icons/md/circle.svg);
 }
 
 
diff --git a/src/commandpalette/index.css b/src/commandpalette/index.css
index 67aa68dbd01e..24e4bf79b7b6 100644
--- a/src/commandpalette/index.css
+++ b/src/commandpalette/index.css
@@ -43,16 +43,18 @@
 
 
 .p-CommandPalette-wrapper::after {
-  font-family: FontAwesome;
-  content: "\f002"; /* search */
+  content: " ";
   color: white;
   background-color: var(--jp-brand-color1);
-  font-size: var(--jp-ui-icon-font-size);
-  line-height: var(--jp-private-commandpalette-search-height);
   position: absolute;
   right: 12px;
   height: 30px;
+  width: 12px;
   padding: 0px 12px;
+  background-image: url(../default-theme/icons/md/search.svg);
+  background-size: 20px;
+  background-repeat: no-repeat;
+  background-position: center;
 }
 
 .p-CommandPalette-input {
diff --git a/src/default-theme/icons.css b/src/default-theme/icons.css
index 20f6851b3287..c2f9ea768844 100644
--- a/src/default-theme/icons.css
+++ b/src/default-theme/icons.css
@@ -16,6 +16,10 @@
   background-image: url(icons/md/add.svg);
 }
 
+.jp-CloseIcon {
+  background-image: url(icons/md/close.svg);
+}
+
 .jp-CutIcon {
   background-image: url(icons/md/cut.svg);
 }
diff --git a/src/default-theme/icons/md/circle.svg b/src/default-theme/icons/md/circle.svg
new file mode 100644
index 000000000000..0a5cff96b61e
--- /dev/null
+++ b/src/default-theme/icons/md/circle.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+</style>
+<path class="st0" d="M0,0h18v18H0V0z"/>
+<circle cx="9" cy="9" r="8"/>
+</svg>
diff --git a/src/default-theme/icons/md/close.svg b/src/default-theme/icons/md/close.svg
new file mode 100644
index 000000000000..0236047025fd
--- /dev/null
+++ b/src/default-theme/icons/md/close.svg
@@ -0,0 +1,4 @@
+<svg fill="#000000" height="16" viewBox="0 0 24 24" width="16" xmlns="http://www.w3.org/2000/svg">
+    <path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/>
+    <path d="M0 0h24v24H0z" fill="none"/>
+</svg>
\ No newline at end of file
diff --git a/src/default-theme/icons/md/search.svg b/src/default-theme/icons/md/search.svg
new file mode 100644
index 000000000000..1e84b4108e0f
--- /dev/null
+++ b/src/default-theme/icons/md/search.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:none;}
+</style>
+<path class="st0" d="M12.1,10.9h-0.7l-0.2-0.2c0.8-0.9,1.3-2.2,1.3-3.5c0-3-2.4-5.4-5.4-5.4S1.8,4.2,1.8,7.1s2.4,5.4,5.4,5.4
+	c1.3,0,2.5-0.5,3.5-1.3l0.2,0.2v0.7l4.1,4.1l1.2-1.2L12.1,10.9z M7.1,10.9c-2.1,0-3.7-1.7-3.7-3.7s1.7-3.7,3.7-3.7s3.7,1.7,3.7,3.7
+	S9.2,10.9,7.1,10.9z"/>
+<path class="st1" d="M0,0h18v18H0V0z"/>
+</svg>
diff --git a/src/default-theme/icons/notebook.svg b/src/default-theme/icons/notebook.svg
index 7b6307e85264..95b97d292629 100644
--- a/src/default-theme/icons/notebook.svg
+++ b/src/default-theme/icons/notebook.svg
@@ -2,12 +2,17 @@
 <!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
 <g>
-	<path d="M14,2H6C4.9,2,4,2.9,4,4v16c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2V8L14,2z M11.1,19.2H10v-3.3c0-0.9-0.3-1.7-1.3-1.7
-		c-0.7,0-1.2,0.5-1.4,1.1c0,0.1-0.1,0.3-0.1,0.5v3.5H6.1V15c0-0.6,0-1.1,0-1.6H7l0.1,1h0c0.3-0.6,1-1.1,1.9-1.1
-		c0.8,0,2.1,0.5,2.1,2.5V19.2z M15.7,19.4c-0.8,0-1.5-0.3-1.9-1.1h0l0,1h-0.9c0-0.4,0-1,0-1.5v-7h1v3.6h0c0.4-0.6,1-1.1,2-1.1
-		c1.4,0,2.5,1.2,2.4,3C18.3,18.3,17,19.4,15.7,19.4z M13,9V3.5L18.5,9H13z"/>
-	<path d="M15.5,14.1c-0.7,0-1.4,0.5-1.6,1.3c0,0.1-0.1,0.3-0.1,0.4v1c0,0.1,0,0.3,0,0.4c0.2,0.7,0.8,1.2,1.6,1.2
-		c1.1,0,1.8-0.9,1.8-2.2C17.2,15.1,16.6,14.1,15.5,14.1z"/>
+	<path d="M14,2H6C4.9,2,4,2.9,4,4v16c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2V8L14,2z M13,9V3.5L18.5,9H13z"/>
+	<g>
+		<path class="st0" d="M5.5,16.2c0-0.7,0-1.4,0-1.9H7l0.1,0.8h0C7.4,14.8,8,14.2,9,14.2c1.2,0,2.1,0.8,2.1,2.5v3.5H9.2v-3.2
+			c0-0.8-0.3-1.3-0.9-1.3c-0.5,0-0.8,0.3-0.9,0.7c0,0.1-0.1,0.3-0.1,0.5v3.4H5.5V16.2z"/>
+		<path class="st0" d="M12.5,20.2c0-0.4,0-1.1,0-1.8v-6.8h1.8V15h0c0.3-0.5,1-0.8,1.8-0.8c1.4,0,2.4,1.2,2.4,3
+			c0,2.1-1.3,3.2-2.7,3.2c-0.7,0-1.3-0.3-1.8-0.9h0L14,20.2H12.5z M14.3,17.7c0,0.1,0,0.2,0,0.3c0.1,0.5,0.5,0.9,1.1,0.9
+			c0.8,0,1.3-0.6,1.3-1.7c0-0.9-0.4-1.6-1.3-1.6c-0.5,0-0.9,0.4-1.1,0.9c0,0.1,0,0.2,0,0.3V17.7z"/>
+	</g>
 </g>
 </svg>