diff --git a/app/assets/stylesheets/petitions/admin/views/_shared.scss b/app/assets/stylesheets/petitions/admin/views/_shared.scss
index 226797ddf..b646c52e1 100644
--- a/app/assets/stylesheets/petitions/admin/views/_shared.scss
+++ b/app/assets/stylesheets/petitions/admin/views/_shared.scss
@@ -93,7 +93,7 @@
   .button_to {
     display: inline-block;
 
-    input[type=submit] {
+    button, input[type=submit] {
       margin: 0;
       font-size: 12px;
       padding: 2px 8px;
diff --git a/app/views/admin/signatures/_signature.html.erb b/app/views/admin/signatures/_signature.html.erb
index 869b3bb42..42a4fb1e7 100644
--- a/app/views/admin/signatures/_signature.html.erb
+++ b/app/views/admin/signatures/_signature.html.erb
@@ -54,7 +54,11 @@
       <% if signature.pending? %>
         <%= button_to 'Validate', validate_admin_signature_path(signature, search_params), method: :post, class: 'button validate-action', data: { confirm: 'Validate signature?' } %>
       <% else %>
-        &nbsp;
+        <% if signature.subscribed? %>
+          <%= button_to 'Unsubscribe', [:unsubscribe, :admin, @petition, signature, search_params].compact, method: :post, class: 'button unsubscribe-action', data: { confirm: 'Unsubscribe signature?' } %>
+        <% else %>
+          <%= button_to 'Subscribe', [:subscribe, :admin, @petition, signature, search_params].compact, method: :post, class: 'button subscribe-action', data: { confirm: 'Subscribe signature?' } %>
+        <% end %>
       <% end %>
     <% else %>
       <% if signature.validated? %>