diff --git a/vitess.io/_config.yml b/vitess.io/_config.yml
index 9b7b3a593d8..3c62aae419a 100644
--- a/vitess.io/_config.yml
+++ b/vitess.io/_config.yml
@@ -2,7 +2,7 @@
 
 title: Vitess
 description: "Vitess is a database clustering system for horizontal scaling of MySQL."
-logo: vitess-logo-large-cropped-2.png
+logo: vitess_logomark_cropped.svg
 teaser: 400x250.gif
 locale: en_US
 url: http://vitess.io
diff --git a/vitess.io/_config_dev.yml b/vitess.io/_config_dev.yml
index 3f48e0230aa..1b01b6e2591 100644
--- a/vitess.io/_config_dev.yml
+++ b/vitess.io/_config_dev.yml
@@ -2,7 +2,7 @@
 
 title: Vitess
 description: "Vitess is a database clustering system for horizontal scaling of MySQL."
-logo: vitess-logo-large-cropped-2.png
+logo: vitess_logomark_cropped.svg
 teaser: 400x250.gif
 locale: en_US
 url: 
diff --git a/vitess.io/_includes/nav.html b/vitess.io/_includes/nav.html
index f001c2211bc..2dc5ccd7714 100644
--- a/vitess.io/_includes/nav.html
+++ b/vitess.io/_includes/nav.html
@@ -9,7 +9,7 @@
         <span class="icon-bar"></span>
       </button>
       <a class="navbar-brand" href="/">
-        <img class="logo" src="/images/vitess-logo-large-cropped-2.png" alt="Vitess">
+        <img class="logo" src="/images/vitess_logomark_cropped.svg" alt="Vitess">
       </a>
     </div>
 
diff --git a/vitess.io/_layouts/base.liquid b/vitess.io/_layouts/base.liquid
index 4c9a2ebfac5..624b6e51697 100644
--- a/vitess.io/_layouts/base.liquid
+++ b/vitess.io/_layouts/base.liquid
@@ -13,6 +13,8 @@
     <meta name="og:image" content="{{ site.baseurl }}/images/{{ site.logo }}"/>
     <meta name="og:description" content="{{ site.description }}"/>
 
+    <link rel="icon" href="{{ site.baseurl }}/images/vitess_icon.png" type="image/png">
+
     {% if site.analytics.id %}
     {% include analytics.liquid %}
     {% endif %}
diff --git a/vitess.io/css/site.scss b/vitess.io/css/site.scss
index ac1d66d8e81..bab94422d01 100644
--- a/vitess.io/css/site.scss
+++ b/vitess.io/css/site.scss
@@ -197,7 +197,7 @@ aside.success, div.success, p.success {
   background-color: $darkerBrandColor;
 
   .logo {
-    width: 60px;
+    height: 34px;
   }
 }
 #common-nav > div {
@@ -275,7 +275,7 @@ aside.success, div.success, p.success {
   margin: 40px;
   max-width: calc(100% - 80px);
   text-align: center;
-  width: 402px;
+  height: 228px;
 }
 #home-page-text-only-logo {
   font-family: $textOnlyLogoFontFamily;
diff --git a/vitess.io/favicon.ico b/vitess.io/favicon.ico
deleted file mode 100644
index e8b6e5fb60e..00000000000
Binary files a/vitess.io/favicon.ico and /dev/null differ
diff --git a/vitess.io/images/vitess-logo-cropped2.png b/vitess.io/images/vitess-logo-cropped2.png
deleted file mode 100644
index dc90d50fc89..00000000000
Binary files a/vitess.io/images/vitess-logo-cropped2.png and /dev/null differ
diff --git a/vitess.io/images/vitess-logo-large-cropped-2.png b/vitess.io/images/vitess-logo-large-cropped-2.png
deleted file mode 100644
index 6b165e6845f..00000000000
Binary files a/vitess.io/images/vitess-logo-large-cropped-2.png and /dev/null differ
diff --git a/vitess.io/images/vitess-logo-large-cropped.png b/vitess.io/images/vitess-logo-large-cropped.png
deleted file mode 100644
index 467fe7e656c..00000000000
Binary files a/vitess.io/images/vitess-logo-large-cropped.png and /dev/null differ
diff --git a/vitess.io/images/vitess_icon.png b/vitess.io/images/vitess_icon.png
new file mode 100644
index 00000000000..800de14ca87
Binary files /dev/null and b/vitess.io/images/vitess_icon.png differ
diff --git a/vitess.io/images/vitess_logomark_cropped.svg b/vitess.io/images/vitess_logomark_cropped.svg
new file mode 100644
index 00000000000..cfbf1958cb0
--- /dev/null
+++ b/vitess.io/images/vitess_logomark_cropped.svg
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="314.14966"
+   height="288.51398"
+   viewBox="0 0 314.14966 288.51398"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="vitess_logomark.svg">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.1811 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09449 : 526.1811 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.7874 : 1"
+       id="perspective4346" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.50000001"
+     inkscape:cx="-207.6187"
+     inkscape:cy="-131.81567"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1855"
+     inkscape:window-height="1148"
+     inkscape:window-x="90"
+     inkscape:window-y="68"
+     inkscape:window-maximized="0"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     fit-margin-top="10"
+     fit-margin-left="10"
+     fit-margin-right="10"
+     fit-margin-bottom="10">
+    <sodipodi:guide
+       position="208.34996,1191.9716"
+       orientation="1,0"
+       id="guide4717" />
+    <sodipodi:guide
+       position="303.78411,278.21288"
+       orientation="0.87567158,-0.48290712"
+       id="guide4719" />
+    <sodipodi:guide
+       position="178.92927,1185.1531"
+       orientation="1,0"
+       id="guide4721" />
+    <sodipodi:guide
+       position="120.08788,1191.214"
+       orientation="1,0"
+       id="guide4723" />
+    <sodipodi:guide
+       position="91.20708,1148.5254"
+       orientation="1,0"
+       id="guide4725" />
+    <sodipodi:guide
+       position="14.70708,270.23962"
+       orientation="0.87868928,0.47739413"
+       id="guide4727" />
+    <sodipodi:guide
+       position="-96.21103,1181.9964"
+       orientation="0,1"
+       id="guide4729" />
+    <sodipodi:guide
+       position="149.50857,1188.0573"
+       orientation="1,0"
+       id="guide4731" />
+    <sodipodi:guide
+       position="32.07834,1185.5319"
+       orientation="1,0"
+       id="guide4733" />
+    <sodipodi:guide
+       position="2.7839197,1185.1531"
+       orientation="1,0"
+       id="guide4735" />
+    <sodipodi:guide
+       position="-26.63678,1190.5827"
+       orientation="1,0"
+       id="guide4737" />
+    <sodipodi:guide
+       position="-56.05747,1187.0472"
+       orientation="1,0"
+       id="guide4743" />
+    <sodipodi:guide
+       position="-30.29858,1127.827"
+       orientation="0,1"
+       id="guide4746" />
+    <sodipodi:guide
+       position="69.06423,1073.1682"
+       orientation="0,1"
+       id="guide4749" />
+    <sodipodi:guide
+       position="-63.07863,1018.8825"
+       orientation="0,1"
+       id="guide4751" />
+    <sodipodi:guide
+       position="18.70708,964.59681"
+       orientation="0,1"
+       id="guide4753" />
+    <sodipodi:guide
+       position="-16.47149,910.31112"
+       orientation="0,1"
+       id="guide4755" />
+    <sodipodi:guide
+       position="14.59994,856.02532"
+       orientation="0,1"
+       id="guide4757" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-216.29292,-378.08782)">
+    <path
+       style="fill:#254c63;fill-opacity:1;stroke:none"
+       inkscape:transform-center-x="1.1278866e-05"
+       inkscape:transform-center-y="9.0326795"
+       d="m 372.20303,656.60181 -27.87054,-51.05696 43.91222,-28.31214 z"
+       id="path5073"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#265c7d;fill-opacity:1;stroke:none"
+       inkscape:transform-center-x="1.0833444e-05"
+       inkscape:transform-center-y="-9.0326324"
+       d="m 363.1936,531.28889 -18.86111,74.25596 43.89303,-28.23753 z"
+       id="path5075"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#3788b7;fill-opacity:1;stroke:none"
+       inkscape:transform-center-x="1.4539605e-05"
+       inkscape:transform-center-y="9.0326757"
+       d="M 344.33249,605.54485 314.89475,551.2394 363.1936,531.28889 z"
+       id="path5077"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#1e4c66;fill-opacity:1;stroke:none"
+       inkscape:transform-center-x="1.4539605e-05"
+       inkscape:transform-center-y="-9.0326719"
+       d="M 326.85408,464.25704 314.89475,551.2394 363.1936,531.28889 z"
+       id="path5083"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#3e9dd7;fill-opacity:1;stroke:none"
+       inkscape:transform-center-x="1.7127283e-05"
+       inkscape:transform-center-y="-9.0326719"
+       d="m 402.00292,496.66907 -29.03865,52.56342 15.26125,28.07483 z"
+       id="path5085"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#2d709a;fill-opacity:1;stroke:none"
+       inkscape:transform-center-x="1.6018239e-05"
+       inkscape:transform-center-y="9.0326752"
+       d="m 314.89475,551.2394 -29.45786,-54.08204 41.41719,-32.90032 z"
+       id="path5087"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#28495c;fill-opacity:1;stroke:none"
+       inkscape:transform-center-x="1.4311967e-05"
+       inkscape:transform-center-y="9.0326752"
+       d="m 432.15525,551.82695 -39.57825,0.0312 68.05792,-55.31976 z"
+       id="path5089"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#3c97ce;fill-opacity:1;stroke:none"
+       inkscape:transform-center-x="1.7800343e-05"
+       inkscape:transform-center-y="-9.0326741"
+       d="m 314.9576,442.33115 -29.52071,54.82621 41.41719,-32.90032 z"
+       id="path5097"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#61b7eb;fill-opacity:1;stroke:none"
+       inkscape:transform-center-x="1.609407e-05"
+       inkscape:transform-center-y="-9.0326741"
+       d="m 431.79632,442.68829 -29.7934,53.98078 -9.42592,55.18913 z"
+       id="path5099"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#1e4c66;fill-opacity:1;stroke:none"
+       inkscape:transform-center-y="9.0326798"
+       d="m 285.43689,497.15736 -7.99111,-14.56861 37.51182,-40.2576 z"
+       id="path5101"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#296589;fill-opacity:1;stroke:none"
+       inkscape:transform-center-x="1.3724591e-05"
+       inkscape:transform-center-y="9.0326798"
+       d="m 392.577,551.8582 39.21932,-109.16991 28.8386,53.85018 z"
+       id="path5103"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#1a5a81;fill-opacity:1;stroke:none"
+       inkscape:transform-center-x="1.4136307e-05"
+       inkscape:transform-center-y="-9.0326738"
+       d="m 285.29502,388.08782 -7.84924,94.50093 37.51182,-40.2576 z"
+       id="path5115"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#427b9e;fill-opacity:1;stroke:none"
+       inkscape:transform-center-x="1.4316579e-05"
+       inkscape:transform-center-y="-9.0326738"
+       d="m 461.68858,388.08782 -29.89226,54.60047 28.8386,53.85018 z"
+       id="path5117"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#328cc2;fill-opacity:1;stroke:none"
+       inkscape:transform-center-x="1.2539717e-05"
+       inkscape:transform-center-y="9.0326732"
+       d="m 277.44578,482.58875 -51.15286,-94.50093 59.0021,0 z"
+       id="path5119"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#183b4f;fill-opacity:1;stroke:none"
+       inkscape:transform-center-y="9.0326732"
+       d="m 460.63492,496.53847 1.05366,-108.45065 58.75399,0 z"
+       id="path5121"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#0d3044;fill-opacity:1;stroke:none"
+       inkscape:transform-center-x="1.7127283e-05"
+       inkscape:transform-center-y="9.0326757"
+       d="M 372.20303,656.60181 392.577,551.8582 432.15525,551.827 z"
+       id="path5079"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>