diff --git a/images/logos/php-logo@144.png b/images/logos/php-logo@144.png
deleted file mode 100644
index eb44bfef8..000000000
Binary files a/images/logos/php-logo@144.png and /dev/null differ
diff --git a/images/logos/php-logo@2x.png b/images/logos/php-logo@2x.png
new file mode 100644
index 000000000..aa4da62e8
Binary files /dev/null and b/images/logos/php-logo@2x.png differ
diff --git a/images/notes-add@2x.png b/images/notes-add@2x.png
new file mode 100644
index 000000000..ab97defb1
Binary files /dev/null and b/images/notes-add@2x.png differ
diff --git a/images/notes-delete@2x.png b/images/notes-delete@2x.png
new file mode 100644
index 000000000..6dee9af32
Binary files /dev/null and b/images/notes-delete@2x.png differ
diff --git a/images/notes-edit@2x.png b/images/notes-edit@2x.png
new file mode 100644
index 000000000..d863b97a1
Binary files /dev/null and b/images/notes-edit@2x.png differ
diff --git a/images/notes-reject@2x.png b/images/notes-reject@2x.png
new file mode 100644
index 000000000..1b2b1e276
Binary files /dev/null and b/images/notes-reject@2x.png differ
diff --git a/images/to-top@2x.png b/images/to-top@2x.png
new file mode 100644
index 000000000..f2eb4e075
Binary files /dev/null and b/images/to-top@2x.png differ
diff --git a/include/header.inc b/include/header.inc
index 4e36374d3..fc19c4e75 100644
--- a/include/header.inc
+++ b/include/header.inc
@@ -84,7 +84,7 @@ if (isset($shortname) && $shortname) {
 <nav id="head-nav" class="navbar navbar-inverse navbar-fixed-top">
   <div class="navbar-inner">
     <div class="container">
-      <a href="/" class="brand"><img src="/images/logos/php-logo@144.png" width="58" height="30" alt="php"/></a>
+      <a href="/" class="brand"><img src="/images/logos/php-logo@2x.png" width="48" height="24" alt="php"/></a>
       <ul class="nav">
         <li class="<?php echo $curr == "downloads" ? "active" : ""?>"><a href="/downloads">Downloads</a></li>
         <li class="<?php echo $curr == "docs" ? "active" : ""?>"><a href="/manual/">Documentation</a></li>
diff --git a/include/shared-manual.inc b/include/shared-manual.inc
index 719c34628..34428dcc6 100644
--- a/include/shared-manual.inc
+++ b/include/shared-manual.inc
@@ -402,11 +402,10 @@ function manual_notes_beta() {
     // and it's extended form with a [+] image
     $addnotelink = '/manual/add-note.php?sect=' . $filename .
                    '&amp;redirect=' . $_SERVER['BASE_HREF'];
-    $addnotesnippet =
-        make_link($addnotelink, make_image('notes-add.gif', 'add a note', FALSE, 'class="middle"')) .
-        ' <small>' .
-        make_link($addnotelink, 'add a note') .
-        '</small>';
+    $addnotesnippet = make_link(
+        $addnotelink,
+        "<img src='/images/notes-add@2x.png' alt='add a note' width='12' height='12' /> <small>add a note</small>"
+    );
 
     $num_notes = count($notes);
     if ($num_notes) {
@@ -529,21 +528,21 @@ VOTEDIV;
 
         make_popup_link(
             'https://master.php.net/manage/user-notes.php?action=edit+' . $id,
-            make_image('notes-edit.gif', 'edit note'),
+            '<img src="/images/notes-edit@2x.png" height="12" width="12" alt="edit note" />',
             'admin',
             'scrollbars=yes,width=650,height=400'
         ) . "\n   " .
 
         make_popup_link(
             'https://master.php.net/manage/user-notes.php?action=reject+' . $id,
-            make_image('notes-reject.gif', 'reject note'),
+            '<img src="/images/notes-reject@2x.png" height="12" width="12" alt="reject note" />',
             'admin',
             'scrollbars=no,width=300,height=200'
         ) . "\n   " .
 
         make_popup_link(
             'https://master.php.net/manage/user-notes.php?action=delete+' . $id,
-            make_image('notes-delete.gif', 'delete note'),
+            '<img src="/images/notes-delete@2x.png" height="12" width="12" alt="delete note" />',
             'admin',
             'scrollbars=no,width=300,height=200'
         ) . "\n  </span>";
diff --git a/js/common.js b/js/common.js
index e9e810672..1d424ece1 100644
--- a/js/common.js
+++ b/js/common.js
@@ -159,7 +159,7 @@ $(document).ready(function() {
         var containerIDhash = '#' + settings.containerID;
         var containerHoverIDHash = '#'+settings.containerHoverID;
 
-        $('body').append('<a href="#" id="'+settings.containerID+'" onclick="return false;">'+settings.text+'</a>');
+        $('body').append('<a href="#" id="'+settings.containerID+'" onclick="return false;"><img src="/images/to-top@2x.png" width="40" hieght="40" alt="'+settings.text+'"/></a>');
         $(containerIDhash).hide().click(function(){
             $('html, body').animate({scrollTop:0}, settings.scrollSpeed, settings.easingType);
             $('#'+settings.containerHoverID, this).stop().animate({'opacity': 0 }, settings.inDelay, settings.easingType);
diff --git a/styles/doc.css b/styles/doc.css
index 45301834d..4a9e730b3 100755
--- a/styles/doc.css
+++ b/styles/doc.css
@@ -280,8 +280,8 @@ ul.chunklist_children {
     left: 0;
 }
 
+.docs .classsynopsis,
 .docs .refsect1 {
-    margin-top: 3em;
     color: #333;
     border-top:0.125em solid #669;
     border-bottom:1px solid #d6d6dd;
@@ -290,6 +290,10 @@ ul.chunklist_children {
         inset -2px 0 2px -2px #d6d6dd;
 }
 
+.docs .refsect1 {
+    margin-top: 3em;
+}
+
 .docs .classsynopsis,
 .docs div.refsect1 {
     position: relative;
diff --git a/styles/theme.css b/styles/theme.css
index fb66e1e0f..c1d9f1818 100755
--- a/styles/theme.css
+++ b/styles/theme.css
@@ -216,7 +216,7 @@ hr {
     margin-right:.75em;
 }
 .navbar .brand img {
-    padding:1px 0;
+    padding:4px 0 2px;
 }
 .navbar a {
     border:0;
@@ -998,9 +998,6 @@ em, strong {
     height:43px;
     border:none;
     z-index:100;
-    text-indent:-999px;
-    background:url(../images/to-top.png) no-repeat;
-    opacity:0.5;
 }
 
 #toTopHover {