diff --git a/website/themes/uppy/layout/layout.ejs b/website/themes/uppy/layout/layout.ejs
index 5cca00b63..64a0929e7 100644
--- a/website/themes/uppy/layout/layout.ejs
+++ b/website/themes/uppy/layout/layout.ejs
@@ -11,17 +11,18 @@
     <meta name="twitter:site" content="@uppy_io">
     <meta name="twitter:creator" content="@uppy_io">
     <meta property="og:url" content="<%- url %>">
-    <meta property="og:title" content="<%= page.title ? page.title + ' - ' : '' %><%- config.title %>">
-    <meta name="twitter:title" content="<%= page.title ? page.title + ' - ' : '' %><%- config.title %>">
+    <meta property="og:title" content="<%= page.title ? page.title : config.title %>">
+    <meta name="twitter:title" content="<%= page.title ? page.title : config.title %>">
     <meta name="description" content="<%= config.description %>">
     <meta name="twitter:description" content="<%= config.description %>">
     <meta property="og:image" content="<%- config.url %>/images/uppy-social.jpg">
     <meta name="twitter:image" content="<%- config.url %>/images/uppy-social.jpg">
-    <link rel="alternate" type="application/rss+xml" title="<%= config.title %>" href="/atom.xml">
+
+    <link rel="icon" href="<%- config.logo_icon %>" type="image/x-icon">
+    <link rel="alternate" type="application/rss+xml" title="<%= config.title %>" href="<%- config.url %>/atom.xml">
 
     <link href="http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600|Roboto+Mono" rel="stylesheet">
     <link href="http://fonts.googleapis.com/css?family=Poiret+One:400" rel="stylesheet">
-    <link rel="icon" href="<%- config.logo_icon %>" type="image/x-icon">
     <script>
       window.PAGE_TYPE = "<%- page.type %>"
     </script>