diff --git a/app/assets/images/buttons/bday.png b/app/assets/images/buttons/bday.png
deleted file mode 100644
index f0ff81e73..000000000
Binary files a/app/assets/images/buttons/bday.png and /dev/null differ
diff --git a/app/assets/images/buttons/bday@2x.png b/app/assets/images/buttons/bday@2x.png
new file mode 100644
index 000000000..18a0a2ca1
Binary files /dev/null and b/app/assets/images/buttons/bday@2x.png differ
diff --git a/app/assets/images/buttons/edit@2x.png b/app/assets/images/buttons/edit@2x.png
new file mode 100644
index 000000000..96b91998a
Binary files /dev/null and b/app/assets/images/buttons/edit@2x.png differ
diff --git a/app/assets/images/buttons/editgear.png b/app/assets/images/buttons/editgear.png
deleted file mode 100644
index d9aebbae0..000000000
Binary files a/app/assets/images/buttons/editgear.png and /dev/null differ
diff --git a/app/assets/images/buttons/pub.png b/app/assets/images/buttons/pub.png
deleted file mode 100644
index 671069ebc..000000000
Binary files a/app/assets/images/buttons/pub.png and /dev/null differ
diff --git a/app/assets/images/buttons/pub@2x.png b/app/assets/images/buttons/pub@2x.png
new file mode 100644
index 000000000..004eff66b
Binary files /dev/null and b/app/assets/images/buttons/pub@2x.png differ
diff --git a/app/assets/images/buttons/service-icons/fb.png b/app/assets/images/buttons/service-icons/fb.png
deleted file mode 100644
index 18707046d..000000000
Binary files a/app/assets/images/buttons/service-icons/fb.png and /dev/null differ
diff --git a/app/assets/images/buttons/service-icons/fb@2x.png b/app/assets/images/buttons/service-icons/fb@2x.png
new file mode 100644
index 000000000..fd582a21e
Binary files /dev/null and b/app/assets/images/buttons/service-icons/fb@2x.png differ
diff --git a/app/assets/images/buttons/service-icons/tumblr.png b/app/assets/images/buttons/service-icons/tumblr.png
deleted file mode 100644
index b7bf5a306..000000000
Binary files a/app/assets/images/buttons/service-icons/tumblr.png and /dev/null differ
diff --git a/app/assets/images/buttons/service-icons/tumblr@2x.png b/app/assets/images/buttons/service-icons/tumblr@2x.png
new file mode 100644
index 000000000..727615c46
Binary files /dev/null and b/app/assets/images/buttons/service-icons/tumblr@2x.png differ
diff --git a/app/assets/images/buttons/service-icons/twitter.png b/app/assets/images/buttons/service-icons/twitter.png
deleted file mode 100644
index d82670955..000000000
Binary files a/app/assets/images/buttons/service-icons/twitter.png and /dev/null differ
diff --git a/app/assets/images/buttons/service-icons/twitter@2x.png b/app/assets/images/buttons/service-icons/twitter@2x.png
new file mode 100644
index 000000000..d01096565
Binary files /dev/null and b/app/assets/images/buttons/service-icons/twitter@2x.png differ
diff --git a/app/assets/stylesheets/new_styles/_profile.scss b/app/assets/stylesheets/new_styles/_profile.scss
index e1fe26f61..1100860dc 100644
--- a/app/assets/stylesheets/new_styles/_profile.scss
+++ b/app/assets/stylesheets/new_styles/_profile.scss
@@ -65,6 +65,11 @@
     @include transition(opacity);
     @include opacity(0.4);
 
+    &.small img {
+      height : 40px;
+      width : 40px;
+    }
+
     &:hover {
       @include opacity(1);
       text-decoration : none;
@@ -126,6 +131,9 @@
   .cake {
     @include opacity(0.63);
 
+    width : 11px;
+    height : 15px;
+
     margin-right : 2px;
     position : relative;
     top : -3px;
diff --git a/app/assets/stylesheets/new_styles/_typography.scss b/app/assets/stylesheets/new_styles/_typography.scss
index b79b2f303..19e568b1a 100644
--- a/app/assets/stylesheets/new_styles/_typography.scss
+++ b/app/assets/stylesheets/new_styles/_typography.scss
@@ -1,16 +1,19 @@
 /* Roboto */
 @font-face {
   font-family : Roboto;
-  src : image-url('fonts/Roboto-Regular.ttf')
+  src : image-url('fonts/Roboto-Regular.ttf');
+  weight : normal;
 }
 
 @font-face {
   font-family : Roboto-Bold;
-  src : image-url('fonts/Roboto-Bold.ttf')
+  src : image-url('fonts/Roboto-Bold.ttf');
+  weight : normal;
 }
 
 body, p, h1, h2, h3, h4, h5, h6, textarea, input, * {
-  font-family : Roboto, Helvetica, sans;
+  font-family : Roboto, Helvetica, sans-serif;
+  font-weight : normal;
 }
 
 a {
diff --git a/app/assets/templates/profile-info.jst.hbs b/app/assets/templates/profile-info.jst.hbs
index 878506689..a293aeecc 100644
--- a/app/assets/templates/profile-info.jst.hbs
+++ b/app/assets/templates/profile-info.jst.hbs
@@ -15,10 +15,9 @@
             <span class="divider">•</span>
         {{/if}}
 
-
         {{#if birthday}}
             <span class="stat">
-                <img src='{{imageUrl "buttons/bday.png"}}' class="cake" />
+                <img src='{{imageUrl "buttons/bday@2x.png"}}' class="cake" />
                 {{birthday}}
             </span>
             <span class="divider">•</span>
@@ -26,17 +25,16 @@
 
         <span class="stat services">
             <a href="https://facebook.com" class="service" target="_blank">
-                <img src='{{imageUrl "buttons/service-icons/fb.png"}}' />
+                <img src='{{imageUrl "buttons/service-icons/fb@2x.png"}}' />
             </a>
             <a href="https://twitter.com" class="service" target="_blank">
-                <img src='{{imageUrl "buttons/service-icons/twitter.png"}}' />
+                <img src='{{imageUrl "buttons/service-icons/twitter@2x.png"}}' />
             </a>
             <a href="https://tumblr.com" class="service" target="_blank">
-                <img src='{{imageUrl "buttons/service-icons/tumblr.png"}}' />
+                <img src='{{imageUrl "buttons/service-icons/tumblr@2x.png"}}' />
             </a>
         </span>
     </div>
-
 </div>
 
 <!--<dl>-->
diff --git a/app/assets/templates/profile.jst.hbs b/app/assets/templates/profile.jst.hbs
index 01a75cd97..28c1f353e 100644
--- a/app/assets/templates/profile.jst.hbs
+++ b/app/assets/templates/profile.jst.hbs
@@ -19,11 +19,11 @@
 
 <section id="profile-controls">
     {{#if isOwnProfile}}
-        <a href="#composer" title="New Post" class="control" rel="facebox">
-            <img src='{{imageUrl "buttons/pub.png"}}' />
+        <a href="#composer" title="New Post" class="control small" rel="facebox">
+            <img src='{{imageUrl "buttons/pub@2x.png"}}' />
         </a>
-        <a href="#" title="Edit Layout" id="edit-mode-toggle" class="control">
-            <img src='{{imageUrl "buttons/editgear.png"}}' />
+        <a href="#" title="Edit Layout" id="edit-mode-toggle" class="control small">
+            <img src='{{imageUrl "buttons/edit@2x.png"}}' />
         </a>
     {{else}}
         <a href="#" class="control">
diff --git a/public/404.html b/public/404.html
index 5e5e5f4b0..7f831bafa 100644
--- a/public/404.html
+++ b/public/404.html
@@ -8,13 +8,13 @@
 
     body,
     html {
-      height: 100%;
+      overflow-y : hidden;
     }
 
     body {
       margin-bottom: 0;
       padding-bottom: 0;
-      margin-top: 10%;
+      margin-top: 5%;
       background-color: #fff;
       color: #666;
       text-align: center;