diff --git a/app/assets/javascripts/backbone/templates/habits/habit.jst.ejs b/app/assets/javascripts/backbone/templates/habits/habit.jst.ejs
index b2859c0d5f..8d2edfb8b8 100644
--- a/app/assets/javascripts/backbone/templates/habits/habit.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/habits/habit.jst.ejs
@@ -10,10 +10,11 @@
 <% } %>
 
 <span class="habit-text"><%= name %></span>
-<div class='edit'>
+
+<div class='habit-meta'>
+  <a class="edit-link" href="#/<%= id %>/edit">Edit</a>
   <% if (notes) { %>
     <img src='/assets/comment.png' class="comment" />
     <div class='qtip'><%= notes %></div>
   <% } %>
-  <a href="#/<%= id %>/edit">Edit</a>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/assets/stylesheets/habits.css.scss b/app/assets/stylesheets/habits.css.scss
index 9896659b8c..61071f7118 100644
--- a/app/assets/stylesheets/habits.css.scss
+++ b/app/assets/stylesheets/habits.css.scss
@@ -40,10 +40,18 @@
   text-decoration:none;
 }
 
-.edit { float:right; }
-
 #progressbar { margin-top: 20px; }
 
 #tnl { float:right; margin:5px; }
 
 #money { float:right; }
+
+.habit-meta { float:right; }
+
+.habit-meta .edit-link {
+  display: none;
+}
+
+li:hover .habit-meta .edit-link {
+  display: inline;
+}
diff --git a/app/assets/stylesheets/rewards.css.scss b/app/assets/stylesheets/rewards.css.scss
deleted file mode 100644
index fb8a5be462..0000000000
--- a/app/assets/stylesheets/rewards.css.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the rewards controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/