diff --git a/progit/static/images/fork_button.png b/progit/static/images/fork_button.png
new file mode 100644
index 0000000..d7dad2b
Binary files /dev/null and b/progit/static/images/fork_button.png differ
diff --git a/progit/static/images/fork_button_hover.png b/progit/static/images/fork_button_hover.png
new file mode 100644
index 0000000..bb9d373
Binary files /dev/null and b/progit/static/images/fork_button_hover.png differ
diff --git a/progit/static/images/settings_button.png b/progit/static/images/settings_button.png
new file mode 100644
index 0000000..247a501
Binary files /dev/null and b/progit/static/images/settings_button.png differ
diff --git a/progit/static/images/settings_button_hover.png b/progit/static/images/settings_button_hover.png
new file mode 100644
index 0000000..ee743d6
Binary files /dev/null and b/progit/static/images/settings_button_hover.png differ
diff --git a/progit/static/progit.css b/progit/static/progit.css
index a387aa0..37d2988 100644
--- a/progit/static/progit.css
+++ b/progit/static/progit.css
@@ -45,6 +45,8 @@ textarea {
 table.list thead th,
 .user_list a:hover,
 .project_list > header,
+[id=fork_button]:hover,
+[id=settings_button]:hover,
 .fgradient{
     color: white;
     background: #426ead; /* Old browsers */
@@ -57,7 +59,6 @@ table.list thead th,
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#426ead', endColorstr='#1e4a88',GradientType=0 ); /* IE6-9 */
 }
 
-
 div.horizontal-menu {
     background-color: #EDEDED;
     border-radius: 10px;
@@ -68,11 +69,12 @@ div.horizontal-menu ul {
     float: left;
     margin: 0;
     padding: 0;
+    height: 100%;
 }
 
 div.horizontal-menu li {
-    display: inline;
-    float: left;
+    display: inline-block;
+    height: 100%;
 }
 
 div.horizontal-menu a {
@@ -80,7 +82,7 @@ div.horizontal-menu a {
     display: block;
     font-size: 1.1em;
     font-weight: bold;
-    padding: 0.61em;
+    padding: .61em .61em .9em;
 }
 
 div.horizontal-menu li.selected a, div.horizontal-menu li.hovered a {
@@ -541,3 +543,36 @@ a.user_settings {
     float: right;
 }
 
+#fork_button, #settings_button {
+    border-radius: 10px;
+}
+
+#fork_button a,
+#settings_button a {
+    background-position: 8px 50%;
+    background-repeat: no-repeat;
+    margin-top: .2em;
+    padding-left: 30px;
+    padding-bottom: .61em;
+}
+
+#fork_button a {
+    background-image: url(images/fork_button.png);
+}
+
+#settings_button a {
+    background-image: url(images/settings_button.png);
+}
+
+#fork_button:hover a,
+#settings_button:hover a {
+    color: white;
+}
+
+#fork_button:hover a {
+    background-image: url(images/fork_button_hover.png);
+}
+
+#settings_button:hover a {
+    background-image: url(images/settings_button_hover.png);
+}
diff --git a/progit/templates/repo_master.html b/progit/templates/repo_master.html
index 905502e..192e5c1 100644
--- a/progit/templates/repo_master.html
+++ b/progit/templates/repo_master.html
@@ -78,14 +78,14 @@
     </ul>
     <ul class="right">
       {% if g.fas_user and g.fas_user.username != repo.user.user %}
-      <li {% if select == '' %}class="selected" {% endif %}>
+      <li id="fork_button" {% if select == '' %}class="selected" {% endif %}>
         <a href="{{ url_for(
             'fork_project', repo=repo.name, username=username) }}">
         Fork</a>
       </li>
       {% endif %}
       {% if g.fas_user and g.fas_user.username == repo.user.user %}
-      <li {% if select == 'settings' %}class="selected" {% endif %}>
+      <li id="settings_button" {% if select == 'settings' %}class="selected" {% endif %}>
         <a href="{{ url_for(
             'view_settings', repo=repo.name, username=username) }}">
           Settings</a>