diff --git a/CHANGES b/CHANGES
index 22b68f263..f55a5a093 100644
--- a/CHANGES
+++ b/CHANGES
@@ -157,6 +157,7 @@ Bugs fixed
   directory. Thanks to Peter Suter.
 * PR#297, #1571: Add imgpath property to all builders. It make easier to
   develop builder extensions. Thanks to Takeshi Komiya.
+* #1584: Point to master doc in HTML "top" link.
 
 Documentation
 -------------
diff --git a/sphinx/builders/__init__.py b/sphinx/builders/__init__.py
index ee55830fc..7d1bd9206 100644
--- a/sphinx/builders/__init__.py
+++ b/sphinx/builders/__init__.py
@@ -71,9 +71,9 @@ class Builder(object):
         # images that need to be copied over (source -> dest)
         self.images = {}
         # basename of images directory
-        imagedir = ""
+        self.imagedir = ""
         # relative path to image directory from current docname (used at writing docs)
-        imgpath = ""
+        self.imgpath = ""
 
         # these get set later
         self.parallel_ok = False
diff --git a/sphinx/themes/basic/layout.html b/sphinx/themes/basic/layout.html
index f33b7cbe7..a7bbbb9aa 100644
--- a/sphinx/themes/basic/layout.html
+++ b/sphinx/themes/basic/layout.html
@@ -139,7 +139,7 @@
     {%- if hasdoc('copyright') %}
     <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}" />
     {%- endif %}
-    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}" />
+    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto(master_doc) }}" />
     {%- if parents %}
     <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="{{ parents[-1].link|e }}" />
     {%- endif %}
diff --git a/sphinx/themes/bizstyle/static/bizstyle.css_t b/sphinx/themes/bizstyle/static/bizstyle.css_t
index 80b6dfe37..2b3964c2d 100644
--- a/sphinx/themes/bizstyle/static/bizstyle.css_t
+++ b/sphinx/themes/bizstyle/static/bizstyle.css_t
@@ -244,13 +244,13 @@ cite, code, tt {
     letter-spacing: 0.01em;
 }
 
-tt {
+code {
     background-color: #F2F2F2;
     border-bottom: 1px solid #ddd;
     color: #333;
 }
 
-tt.descname, tt.descclassname, tt.xref {
+code.descname, code.descclassname, code.xref {
     border: 0;
 }
 
@@ -259,12 +259,12 @@ hr {
     margin: 2em;
 }
 
-a tt {
+a code {
     border: 0;
     color: #CA7900;
 }
 
-a tt:hover {
+a code:hover {
     color: #2491CF;
 }