diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb
index 41ae068c0..1d7ecaf7e 100644
--- a/app/views/account/show.html.erb
+++ b/app/views/account/show.html.erb
@@ -44,13 +44,17 @@
           <h2><%= t("account.show.notifications")%></h2>
 
           <div>
-            <%= f.check_box :email_on_debate_comment, label: false %>
-            <span class="checkbox"><%= t("account.show.email_on_debate_comment_label") %></span>
+            <%= f.label :email_on_debate_comment do %>
+              <%= f.check_box :email_on_debate_comment, label: false %>
+              <span class="checkbox"><%= t("account.show.email_on_debate_comment_label") %></span>
+            <% end %>
           </div>
 
           <div>
-            <%= f.check_box :email_on_comment_reply, label: false %>
-            <span class="checkbox"><%= t("account.show.email_on_comment_reply_label") %></span>
+            <%= f.label :email_on_comment_reply do %>
+              <%= f.check_box :email_on_comment_reply, label: false %>
+              <span class="checkbox"><%= t("account.show.email_on_comment_reply_label") %></span>
+            <% end %>
           </div>
         </div>
 
diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb
index 1e29894c4..3ed8b3a9d 100644
--- a/app/views/debates/show.html.erb
+++ b/app/views/debates/show.html.erb
@@ -4,7 +4,7 @@
       <i class="icon-angle-left left"></i>&nbsp;<%= link_to t("debates.show.back_link"), debates_path, class: 'left back' %>
 
       <% if current_user && @debate.editable_by?(current_user) %>
-        <%= link_to edit_debate_path(@debate), :class => 'right' do %>
+        <%= link_to edit_debate_path(@debate), :class => 'edit-debate button success tiny radius right' do %>
           <i class="icon-edit"></i>
           <%= t("debates.show.edit_debate_link") %>
         <% end %>