diff --git a/bugzilla-4.0/skins/contrib/Wikimedia/index.css b/bugzilla-4.0/skins/contrib/Wikimedia/index.css
index f174e05..b46485a 100644
--- a/bugzilla-4.0/skins/contrib/Wikimedia/index.css
+++ b/bugzilla-4.0/skins/contrib/Wikimedia/index.css
@@ -53,27 +53,43 @@
     .bz_common_actions {
         display: block;
         height: 190px;
-        width: 195px;
         float: left;
         margin: 0 3ex 3em 0;
         text-align: center;
     }
-    .bz_common_actions span {
+    .bz_common_actions ul {
+        list-style-type: none;
+        padding: 0;
+    }
+    .bz_common_actions ul li {
+	float: left;
+        display: inline;
+        vertical-align: top;
+    }
+    .bz_common_actions ul li a {
+        display: inline-block;
+        height: 170px;
+        width: 145px;
+        margin: 0 2ex 2em 0;
+    }
+    .bz_common_actions ul li a span {
         position: relative;
-        top: 95%;
+        top: 90%;
         font-weight: bold;
     }
-    
-    .bz_common_actions,
-    .bz_common_actions:visited,
-    .bz_common_actions:hover
-    {
+    .bz_common_actions a,
+    .bz_common_actions a:visited,
+    .bz_common_actions a:hover {
         text-decoration: none;
     }
-
-    #enter_bug { background: url(index/bug.gif)     no-repeat; }
-    #query     { background: url(index/search.gif)  no-repeat; }
-    #account   { background: url(index/account.gif) no-repeat; }
+    #enter_bug { background: url(../../standard/index/file-a-bug.png)     no-repeat; }
+    #query     { background: url(../../standard/index/search.png)  no-repeat; }
+    #help      { background: url(../../standard/index/help.png)     no-repeat; }
+    #report    { background: url(index/report.png)  no-repeat; }
+    #account   {
+      background: url(../../standard/index/new-account.png) no-repeat;
+      margin-right: 0;
+    }
     
     #quicksearchForm
     {
diff --git a/bugzilla-4.0/template/en/custom/index.html.tmpl b/bugzilla-4.0/template/en/custom/index.html.tmpl
index 5a3ac04..ad1802b 100644
--- a/bugzilla-4.0/template/en/custom/index.html.tmpl
+++ b/bugzilla-4.0/template/en/custom/index.html.tmpl
@@ -30,7 +30,7 @@
 
 
 [% PROCESS global/header.html.tmpl
-   title = "$terms.Bugzilla Main Page"
+   title = "Wikimedia $terms.Bugzilla Main Page"
    header = "Main Page" 
 %]
 
@@ -38,53 +38,69 @@
 
 <div id="page-index">
   [% IF user.settings.skin.value=='Wikimedia' %]
-  <div class="intro">
-    <img src="skins/contrib/Wikimedia/bugzilla-ayb.png" width="308" height="236" border="2" alt="bugzzz"/>
+  <div class="intro">[% Hook.process('intro') %]
+<!--    <img src="skins/contrib/Wikimedia/bugzilla-ayb.png" width="308" height="236" border="2" alt="bugzzz"/> -->
   </div>
   [% END %]
 
-  <p>This is the bug tracker for <a
+  <h1 id="welcome"> Welcome to MediaWiki [% terms.Bugzilla %]</h1>
+  <p style="text-align:center;">This is the bug tracker for <a
 href="http://www.mediawiki.org/">MediaWiki</a> and its extensions
 and site-specific problems on <a
 href="http://www.wikimedia.org/">Wikimedia's</a> wiki sites.</p>
 
-  <p>Welcome to [% terms.Bugzilla %]. To see what's new in this version
-    of [% terms.Bugzilla %], see the 
-    <a href="page.cgi?id=release-notes.html">release notes</a>!
-    You may also want to read the 
-    <a href="[% Param('docs_urlbase') FILTER html %]using.html">
-    [%- terms.Bugzilla %] User's Guide</a> to find out more about 
-    [%+ terms.Bugzilla %] and how to use it.</p>
-
-
-  <p>For help using this system, please see
+<!--  <p style="text-align:center;">For help using this system, please see
      <a
-href="http://www.mediawiki.org/wiki/Bugzilla">Mediawiki:Bugzilla</a>.</p>
-
-  <p><b>Not sure how to explain your problem clearly? Read
-     <a href="http://www.chiark.greenend.org.uk/~sgtatham/bugs.html"><i>How
-to Report Bugs Effectively</i></a> for some general pointers.</b></p>
+href="https://www.mediawiki.org/wiki/Bugzilla">Mediawiki:Bugzilla</a>
+and <a href="https://www.mediawiki.org/wiki/Bug_management">Bug management</a>.</p>
+-->
+
+  <p style="text-align:center;"><b>If you would like to file a bug report, please read
+     <a href="http://www.mediawiki.org/wiki/How_to_report_a_bug"><i>How
+to report a bug</i></a> for some pointers.</b></p>
+
+  <p style="text-align:center;">
+        <div class="bz_common_actions">
+          <ul>
+            <li>
+              <a id="enter_bug" href="enter_bug.cgi"><span>Report
+              [%= terms.aBug %]
+              [% IF !user.id %]
+                    <i>(Account Needed)</i>
+              [% END %]
+              </span></a>
+            </li>
+            <li>
+              <a id="query" href="query.cgi"><span>Search Bugs</span></a>
+            </li>
+            <li>
+              <a id="help" href="http://www.mediawiki.org/wiki/Bugzilla"><span>Help on Bugzilla</span></a>
+            </li>
+            <li>
+              <a id="report" href="report.cgi"><span>Reports / Charts</span></a>
+            </li>
+            <li>
+              <a id="account"
+                 [% IF user.id %]
+                   href="userprefs.cgi"><span>User Preferences</span></a>
+                 [% ELSIF Param('createemailregexp')
+                          && user.authorizer.user_can_create_account
+                 %]
+                   href="createaccount.cgi"><span>Create an Account</span></a>
+                 [% ELSE %]
+                   href="?GoAheadAndLogIn=1"><span>Log In</span></a>
+                 [% END %]
+            </li>
+          </ul>
+        </div>
+  </p>
 
   <div style="clear:both;"></div>
   <hr />
 
-  <p>But it all boils down to a choice of:</p>
-  <ul>
-    <li><a href="query.cgi">Search existing [% terms.bug %] reports</a></li>
-    <li><a href="enter_bug.cgi">Enter a new [% terms.bug %] report</a></li>
-    <li id="report"><a href="report.cgi">Summary reports and charts</a></li>
-    <li><a href="javascript:addSidebar()">Add to Sidebar</a> (requires a Mozilla browser like Mozilla Firefox)</li>
-    <li id="quick_search_plugin">
-      <a href="javascript:window.external.AddSearchProvider('[% Param('urlbase') %]search_plugin.cgi')">Install
-      the Quick Search plugin</a> (requires Firefox 2 or Internet Explorer 7)
-    </li>
-
-
     [%# List items of links to more things users can do on this installation. %]
     [% Hook.process("links") %]
 
-  </ul>
-
   <form id="f" name="f" action="buglist.cgi" method="get"
         onsubmit="if (this.quicksearch.value == '')
                   { alert('Please enter one or more search terms first.');
@@ -97,7 +113,8 @@ to Report Bugs Effectively</i></a> for some general pointers.</b></p>
   </div>
   </form>
 
-  <div class="outro"></div>
+  <div class="outro">[% Hook.process('outro') %]</div>
+
 </div>
 
 [% PROCESS global/footer.html.tmpl %]