diff --git a/xubuntu-eighteen/header.php b/xubuntu-eighteen/header.php
index 82e433a..80864c4 100644
--- a/xubuntu-eighteen/header.php
+++ b/xubuntu-eighteen/header.php
@@ -9,6 +9,7 @@
 	<meta name="author" content="The Xubuntu community" />
 	<meta name="viewport" content="width=device-width, maximum-scale=1.0, minimum-scale=1.0, initial-scale=1" />
 
+	<link rel="icon" type="image/svg+xml" href="<?php echo get_stylesheet_directory_uri( ); ?>/images/xubuntu-icon.svg">
 	<link rel="shortcut icon" href="<?php echo get_stylesheet_directory_uri( ); ?>/images/xubuntu-icon-16.png">
 
 	<?php wp_head( ); ?>
@@ -19,7 +20,7 @@
 <header>
 	<div id="logo">
 		<a href="<?php echo home_url( '/' ); ?>">
-			<img class="light" src="<?php echo get_stylesheet_directory_uri( ); ?>/images/xubuntu-logo-45.png" alt="Xubuntu" />
+			<img class="light" src="<?php echo get_stylesheet_directory_uri( ); ?>/images/xubuntu-logo.svg" alt="Xubuntu" />
 		</a>
 	</div>
 
diff --git a/xubuntu-eighteen/images/xubuntu-icon.svg b/xubuntu-eighteen/images/xubuntu-icon.svg
new file mode 100644
index 0000000..cc3cf5b
--- /dev/null
+++ b/xubuntu-eighteen/images/xubuntu-icon.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64">
+  <g transform="translate(-501.3 -494)">
+    <circle r="32" cy="526" cx="533.3" fill="#04a"/>
+    <path d="M524 511.8c-.4 2.2.2 4.9 1.1 8 .1.2 0 .5-.1.5-.4.1-1.2 0-1.3-.3-.7-1.5-1-3-2-4.4-.5-1-1.1-2-1.8-2.7-.9-.8-1.6-1-2.5-.5a3.9 3.9 0 00-2.2 2.7c-.2 1-.1 2.3 0 3.4l1 3.5c-.3.8-2 5.4-2.4 8.7-.6 4-2 16.6 11.7 15.2 5-.5 9.2-2.3 13-4.1l6.3-3.1c2.2-1.2 4.2-2.5 5.7-3.8 1.5-1.4 2.6-2.9 2.4-4.3-.3-2.4-1.9-4.2-4-5.5a35.9 35.9 0 00-8.3-3.4 38 38 0 00-9.2-1.6c-.2-3.2.2-7.5-1.8-10-.5-.6-1.2-1-2-1-1.3 0-3.2.5-3.6 2.7z" fill="#fff"/>
+    <path d="M540.2 517.6c0 .8 0 2.5 1.1 2.6 1.3.2 1.7-.9 1.8-1.7.5-2.5.6-3.3.8-5.6.2-2.7 1-7.3-.3-7-1.1.5-2 4.2-2.4 5.7-.2 1.2-1 4.6-1 6zM545.6 518.1c-.7 1.6-1 3 0 3.5s2-.6 2.4-1.3l2.2-5.3c1-2.6 3.8-7.4 2-7.1-1.3.1-3 3.3-3.7 4.7-1 1.7-1.9 3.2-2.9 5.5z" fill="#fff"/>
+  </g>
+</svg>
diff --git a/xubuntu-eighteen/images/xubuntu-logo.svg b/xubuntu-eighteen/images/xubuntu-logo.svg
new file mode 100644
index 0000000..40680c8
--- /dev/null
+++ b/xubuntu-eighteen/images/xubuntu-logo.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="80" width="384">
+  <g fill="#fff" font-weight="400" font-size="49.5" font-family="ubuntubeta">
+    <path style="-inkscape-font-specification:ubuntubeta" d="M34 79a71.9 71.9 0 00-5.6-9.5 155.6 155.6 0 00-7.1-10 131.1 131.1 0 00-7 10A161 161 0 008.6 79H0c2.1-4 4.6-8.3 7.5-12.5l8.8-12.2L.7 31.8h9.5l11.3 16.5 11.3-16.5h9L26.5 53.6l9 12.5c3 4.4 5.6 8.6 7.7 12.8H34M86.4 77.6c-2 .4-4.5 1-7.7 1.5a65 65 0 01-11 .8 24 24 0 01-9.1-1.5c-2.5-1.1-4.5-2.6-6-4.6-1.5-1.9-2.6-4.2-3.3-6.8-.6-2.6-1-5.5-1-8.7V31.8h8.5v24.6c0 5.8.9 9.9 2.7 12.4 1.8 2.4 4.8 3.7 9.1 3.7a45 45 0 009.4-1V31.9h8.4v45.8M103.3 33.9a23 23 0 0120.8-1.4c2.7 1.2 5 3 6.7 5.1 1.8 2.2 3.2 4.8 4.1 7.8a32.6 32.6 0 01-.3 20.3 21 21 0 01-12.1 12.6 26.4 26.4 0 01-9.8 1.7A59.3 59.3 0 0195 77.6V10l8.4-1.5V34m0 37.7a31.9 31.9 0 009.3 1 14 14 0 0010.9-4.5c2.7-3 4-7.2 4-12.7 0-2.5-.2-4.7-.7-6.8-.4-2.1-1.2-4-2.3-5.5-1.1-1.5-2.5-2.7-4.3-3.6-1.7-.9-3.7-1.4-6.1-1.4-2.3 0-4.4.4-6.4 1.2-1.9.8-3.4 1.6-4.4 2.5v29.8M181.8 77.6c-2 .4-4.5 1-7.7 1.5a65 65 0 01-11 .8 24 24 0 01-9.1-1.5c-2.5-1.1-4.5-2.6-6-4.6-1.5-1.9-2.6-4.2-3.3-6.8-.6-2.6-1-5.5-1-8.7V31.8h8.4v24.6c0 5.8 1 9.9 2.8 12.4 1.8 2.4 4.8 3.7 9.1 3.7a45 45 0 009.3-1V31.9h8.5v45.8M189.1 33.2l7.7-1.6c3.2-.5 7-.8 11-.8 3.8 0 7 .6 9.4 1.6 2.5 1 4.4 2.5 5.9 4.5 1.5 1.9 2.6 4.1 3.2 6.8.6 2.6.9 5.6.9 8.8v26.4h-8.4V54.3c0-3-.3-5.4-.7-7.5-.3-2-1-3.7-1.9-5a7.4 7.4 0 00-3.6-2.7c-1.5-.6-3.4-.9-5.6-.9a45.2 45.2 0 00-9.4 1v39.7H189V33.2M243 31.8h17.8v7H243v21.8c0 2.4.1 4.3.5 5.9.4 1.5 1 2.7 1.6 3.6A6 6 0 00248 72a18.4 18.4 0 0013.1-1.5l1.6 7a29 29 0 01-19.6 1.3c-2-.8-3.7-2-5-3.7a15.1 15.1 0 01-2.7-6c-.5-2.4-.8-5.2-.8-8.3v-42l8.5-1.5v14.6M307 77.6c-2 .4-4.6 1-7.8 1.5a65 65 0 01-11 .8 24 24 0 01-9-1.5c-2.6-1.1-4.6-2.6-6-4.6-1.6-1.9-2.7-4.2-3.3-6.8-.7-2.6-1-5.5-1-8.7V31.8h8.4v24.6c0 5.8.9 9.9 2.7 12.4 1.8 2.4 4.9 3.7 9.2 3.7a45 45 0 009.3-1V31.9h8.4v45.8"/>
+  </g>
+  <g transform="matrix(1.02608 0 0 1.02608 -196 -507)">
+    <circle r="32" cy="526" cx="533.3" fill="#04a"/>
+    <path d="M524 511.8c-.4 2.2.2 4.9 1.1 8 .1.2 0 .5-.1.5-.4.1-1.2 0-1.3-.3-.7-1.5-1-3-2-4.4-.5-1-1.1-2-1.8-2.7-.9-.8-1.6-1-2.5-.5a3.9 3.9 0 00-2.2 2.7c-.2 1-.1 2.3 0 3.4l1 3.5c-.3.8-2 5.4-2.4 8.7-.6 4-2 16.6 11.7 15.2 5-.5 9.2-2.3 13-4.1l6.3-3.1c2.2-1.2 4.2-2.5 5.7-3.8 1.5-1.4 2.6-2.9 2.4-4.3-.3-2.4-1.9-4.2-4-5.5a35.9 35.9 0 00-8.3-3.4 38 38 0 00-9.2-1.6c-.2-3.2.2-7.5-1.8-10-.5-.6-1.2-1-2-1-1.3 0-3.2.5-3.6 2.7z" fill="#fff"/>
+    <path d="M540.2 517.6c0 .8 0 2.5 1.1 2.6 1.3.2 1.7-.9 1.8-1.7.5-2.5.6-3.3.8-5.6.2-2.7 1-7.3-.3-7-1.1.5-2 4.2-2.4 5.7-.2 1.2-1 4.6-1 6zM545.6 518.1c-.7 1.6-1 3 0 3.5s2-.6 2.4-1.3l2.2-5.3c1-2.6 3.8-7.4 2-7.1-1.3.1-3 3.3-3.7 4.7-1 1.7-1.9 3.2-2.9 5.5z" fill="#fff"/>
+  </g>
+</svg>
diff --git a/xubuntu-eighteen/style-600.css b/xubuntu-eighteen/style-600.css
index 7856717..a714852 100644
--- a/xubuntu-eighteen/style-600.css
+++ b/xubuntu-eighteen/style-600.css
@@ -27,6 +27,7 @@ header {
 	}
 		#logo a img.light {
 			display: block;
+			width: 13.5rem;
 		}
 		#logo a::after {
 			display: none;
diff --git a/xubuntu-eighteen/style.css b/xubuntu-eighteen/style.css
index faefa48..ff6bd41 100644
--- a/xubuntu-eighteen/style.css
+++ b/xubuntu-eighteen/style.css
@@ -70,7 +70,7 @@ header {
 
 			padding-right: 30px;
 
-			background: transparent url(images/xubuntu-icon-20.png) 100% 50% no-repeat;
+			background: transparent url(images/xubuntu-icon.svg) 100% 50% / 1.25rem 1.25rem no-repeat;
 			content: "Xubuntu";
 
 			color: #fff;
@@ -104,7 +104,7 @@ header {
 
 /*
  *  Main content area
- * 
+ *
  */
 
 section#middle {