diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb
index ec5def9..606af02 100644
--- a/app/views/guidance_groups/admin_edit.html.erb
+++ b/app/views/guidance_groups/admin_edit.html.erb
@@ -2,9 +2,7 @@
 <div class="row">
   <div class="col-md-12">
     <h1><%= _('Guidance group') %></h1>
-      <button type="button" class="btn btn-default pull-right"> 
-        <%= link_to _('View all guidance'), admin_index_guidance_path(current_user.org_id), class: 'link_as_button' %>
-      </button>
+    <%= link_to _('View all guidance'), admin_index_guidance_path(current_user.org_id), class: 'btn btn-default pull-right' %>
   </div>
 </div>
 
diff --git a/app/views/guidances/admin_index.html.erb b/app/views/guidances/admin_index.html.erb
index 56190a3..15c1f2c 100644
--- a/app/views/guidances/admin_index.html.erb
+++ b/app/views/guidances/admin_index.html.erb
@@ -21,9 +21,7 @@
       scope: @guidance_groups,
       query_params: { sort_field: 'guidance_groups.name', sort_direction: :asc }) %>
     <div>
-      <button type="button" class="btn btn-primary"> 
-        <a href="<%= admin_new_guidance_group_path %>" class="link_as_button"><%= _('Create a guidance group') %></a>
-      </button>
+      <a href="<%= admin_new_guidance_group_path %>" class="btn btn-primary"><%= _('Create a guidance group') %></a>
     </div>
 
     <h2><%= _('Guidance list') %></h2>
@@ -44,9 +42,7 @@
         query_params: { sort_field: 'guidances.text', sort_direction: :asc }) %>
   
     <div>
-      <button type="button" class="btn btn-primary"> 
-        <a href="<%= admin_new_guidance_path %>" class="link_as_button"><%= _('Create guidance') %></a>
-      </button>
+      <a href="<%= admin_new_guidance_path %>" class="btn btn-primary"><%= _('Create guidance') %></a>
     </div>
   </div>
 </div>
diff --git a/app/views/guidances/new_edit.html.erb b/app/views/guidances/new_edit.html.erb
index f635228..66e3e2c 100644
--- a/app/views/guidances/new_edit.html.erb
+++ b/app/views/guidances/new_edit.html.erb
@@ -3,9 +3,7 @@
 <div class="row">
   <div class="col-xs-12">
     <h1><%= _('Guidance') %></h1>
-      <button type="button" class="btn btn-default pull-right"> 
-        <%= link_to _('View all guidance'), admin_index_guidance_path(current_user.org_id), class: 'link_as_button' %>
-      </button>
+    <%= link_to _('View all guidance'), admin_index_guidance_path(current_user.org_id), class: 'btn btn-default pull-right' %>
   </div>
 </div>
 <div class="row">
@@ -28,9 +26,7 @@
       </div>
       <div class="form-group clear-fix">
         <%= f.submit _('Save'), name: "edit_guidance_submit", class: "btn btn-primary" %>
-        <button type="button" class="btn btn-primary"> 
-          <%= link_to _('Cancel'), admin_index_guidance_path, class: "link_as_button" %>
-        </button>        
+        <%= link_to _('Cancel'), admin_index_guidance_path, class: "btn btn-primary", role: 'button' %>
       </div>
     <%end%>
   </div>
diff --git a/app/views/org_admin/plans/index.html.erb b/app/views/org_admin/plans/index.html.erb
index 277db0c..3e8d2f4 100644
--- a/app/views/org_admin/plans/index.html.erb
+++ b/app/views/org_admin/plans/index.html.erb
@@ -35,9 +35,7 @@
       </div>
     <% end %>
     <% if @plans.length > 0 %>
-        <button type="button" class="btn btn-default pull-right"> 
-          <%= link_to _('Download plans'), org_admin_download_plans_path(format: :csv), target: '_blank', class: 'link_as_button' %>
-        </button>
+      <%= link_to _('Download plans'), org_admin_download_plans_path(format: :csv), target: '_blank', class: 'btn btn-default pull-right' %>
       <%= paginable_renderise(
         partial: '/paginable/plans/org_admin',
         controller: 'paginable/plans',
diff --git a/app/views/org_admin/templates/index.html.erb b/app/views/org_admin/templates/index.html.erb
index 6dc4fc4..ad18404 100644
--- a/app/views/org_admin/templates/index.html.erb
+++ b/app/views/org_admin/templates/index.html.erb
@@ -76,9 +76,8 @@
       </div>
     </div>
 
-    <button type="button" class="btn btn-primary"> 
-      <a href="<%= new_org_admin_template_path %>" class="link_as_button">
-      <%= _('Create a template') %></a>
-    </button>
+    <a href="<%= new_org_admin_template_path %>" class="btn btn-primary" role="button">
+      <%= _('Create a template') %>
+    </a>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/views/phases/_overview.html.erb b/app/views/phases/_overview.html.erb
index 0907d69..f216c85 100644
--- a/app/views/phases/_overview.html.erb
+++ b/app/views/phases/_overview.html.erb
@@ -3,9 +3,7 @@
   <div class="col-xs-12">
     <h4>
       <%= _('Instructions') %>
-      <button type="button" class="btn btn-default pull-right"> 
-        <a href="<%= edit_plan_path(plan_id, phase_id: phase.id) %>" class="link_as_button"><%= _('Write plan') %></a>
-      </button>
+      <a href="<%= edit_plan_path(plan_id, phase_id: phase.id) %>" class="btn btn-default pull-right"><%= _('Write plan') %></a>
     </h4>
     <p class="text-justify">
       <%= raw(phase.description) %>
diff --git a/app/views/plans/_share_form.html.erb b/app/views/plans/_share_form.html.erb
index 97b6267..7b0e448 100644
--- a/app/views/plans/_share_form.html.erb
+++ b/app/views/plans/_share_form.html.erb
@@ -106,9 +106,7 @@
   <p><%= _('You can continue to edit and download the plan in the interim.') %></p>
 
   <div class="form-group col-xs-8">
-    <button type="button" class="btn btn-default"> 
-      <%= link_to _('Request feedback'), request_feedback_plan_path, class: "link_as_button#{' disabled' if @plan.feedback_requested?}" %>
-    </button>
+    <%= link_to _('Request feedback'), request_feedback_plan_path, class: "btn btn-default#{' disabled' if @plan.feedback_requested?}" %>
     <span><%= _("Feedback has been requested.") if @plan.feedback_requested? %></span>
   </div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/plans/index.html.erb b/app/views/plans/index.html.erb
index 2e721b1..862d276 100644
--- a/app/views/plans/index.html.erb
+++ b/app/views/plans/index.html.erb
@@ -26,9 +26,7 @@
 </div>
 <div class="row">
   <div class="col-md-12">
-    <button type="button" class="btn btn-primary"> 
-      <%= link_to _('Create plan'), new_plan_path, class: "link_as_button" %>
-    </button>
+    <%= link_to _('Create plan'), new_plan_path, class: "btn btn-primary" %>
   </div>
 </div>
 <div class="row">
diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb
index 35ae713..963960e 100644
--- a/app/views/plans/new.html.erb
+++ b/app/views/plans/new.html.erb
@@ -89,9 +89,7 @@
 
       <%= f.hidden_field(:visibility, value: @is_test ? 'is_test' : Rails.application.config.default_plan_visibility) %>
       <%= f.button(_('Create plan'), class: "btn btn-primary", type: "submit") %>
-      <button type="button" class="btn btn-default"> 
-        <%= link_to _('Cancel'), plans_path, class: 'link_as_button' %>
-      </button>
+      <%= link_to _('Cancel'), plans_path, class: 'btn btn-default' %>
     <% end %>
   </div>
 </div>
diff --git a/app/views/shared/_sign_in_form.html.erb b/app/views/shared/_sign_in_form.html.erb
index 7608dba..bd4af43 100644
--- a/app/views/shared/_sign_in_form.html.erb
+++ b/app/views/shared/_sign_in_form.html.erb
@@ -19,12 +19,10 @@
     <% if session['devise.shibboleth_data'].nil? %>
       <h4 class="text-center">- <%= _('or') %> -</h4>
       <div class="form-group">
-        <button type="button" class="btn btn-default">
-          <span class="center-block btn-group-justified">
-            <% target = (Rails.application.config.shibboleth_use_filtered_discovery_service ? shibboleth_ds_path : user_shibboleth_omniauth_authorize_path) %> 
-            <a href="<%= target %>" class="link_as_button"><%= _('Sign in with your institutional credentials') %></a>
-          </span>
-        </button>
+        <span class="center-block btn-group-justified">
+          <% target = (Rails.application.config.shibboleth_use_filtered_discovery_service ? shibboleth_ds_path : user_shibboleth_omniauth_authorize_path) %>
+          <a href="<%= target %>" class="btn btn-default"><%= _('Sign in with your institutional credentials') %></a>
+        </span>
       </div>
     <% else %>
       <%= f.hidden_field :shibboleth_id, :value => session['devise.shibboleth_data']['uid'] %>
diff --git a/app/views/super_admin/notifications/_form.html.erb b/app/views/super_admin/notifications/_form.html.erb
index eddfa85..c6ff825 100644
--- a/app/views/super_admin/notifications/_form.html.erb
+++ b/app/views/super_admin/notifications/_form.html.erb
@@ -61,8 +61,6 @@
           class: 'btn btn-default',
           method: :delete,
           data: { confirm: _('Are you sure you want to delete the notification "%{title}"') % { title: @notification.title }}) unless @notification.new_record? %>
-    <button type="button" class="btn btn-default"> 
-      <%= link_to _('Cancel'), super_admin_notifications_path, class: 'link_as_button' %>
-    </button>
+    <%= link_to _('Cancel'), super_admin_notifications_path, class: 'btn btn-default', role: 'button' %>
   </div>
 <% end %>
diff --git a/app/views/super_admin/notifications/index.html.erb b/app/views/super_admin/notifications/index.html.erb
index 0d4fc7b..216d7ee 100644
--- a/app/views/super_admin/notifications/index.html.erb
+++ b/app/views/super_admin/notifications/index.html.erb
@@ -7,10 +7,7 @@
 <div class="row">
   <div class="col-xs-12">
     <div class="pull-right">
-      <button type="button" class="btn btn-default"> 
-       <%= link_to _('+ Add New Notification'), new_super_admin_notification_path, class: 'link_as_button' %>
-      </button>
-
+      <%= link_to _('+ Add New Notification'), new_super_admin_notification_path, class: 'btn btn-default', role: 'button' %>
     </div>
     <div class="table-responsive">
       <%= paginable_renderise(
diff --git a/app/views/super_admin/orgs/index.html.erb b/app/views/super_admin/orgs/index.html.erb
index e3e08b6..ef42981 100644
--- a/app/views/super_admin/orgs/index.html.erb
+++ b/app/views/super_admin/orgs/index.html.erb
@@ -4,10 +4,8 @@
   <div class="col-md-12">
     <h1>
       <%= _('Organisations') %>
-        <button type="button" class="btn btn-primary pull-right"> 
-          <a href="<%= new_super_admin_org_path %>" 
-             class="link_as_button"><%= _('Create Organisation') %></a>
-        </button>
+      <a href="<%= new_super_admin_org_path %>" 
+         class="btn btn-primary pull-right"><%= _('Create Organisation') %></a>
     </h1>
   </div>
 </div>
diff --git a/app/views/super_admin/themes/index.html.erb b/app/views/super_admin/themes/index.html.erb
index 63582bf..917e48a 100644
--- a/app/views/super_admin/themes/index.html.erb
+++ b/app/views/super_admin/themes/index.html.erb
@@ -7,9 +7,7 @@
 <div class="row">
   <div class="col-xs-12">
     <div class="pull-right">
-      <button type="button" class="btn btn-default"> 
-        <%= link_to(_('+ Add New Theme'), new_super_admin_theme_path, class: 'link_as_button') %>
-      </button>
+      <%= link_to(_('+ Add New Theme'), new_super_admin_theme_path, class: 'btn btn-default', role: 'button') %>
     </div>
     <div class="table-responsive">
       <%= paginable_renderise(
diff --git a/lib/assets/stylesheets/overrides.scss b/lib/assets/stylesheets/overrides.scss
index 4848cdd..114ae84 100644
--- a/lib/assets/stylesheets/overrides.scss
+++ b/lib/assets/stylesheets/overrides.scss
@@ -233,7 +233,7 @@
   background-color: $grey;
   color: $white;
   border-color: $grey;
-  outline-color: transparent;
+  outline: none;
   margin-top: 5px;
   margin-bottom: 10px;
 }
@@ -249,7 +249,7 @@
   background-color: $grey;
   color: $white;
   border-color: $grey;
-  outline-color: transparent;
+  outline: none;
   margin-top: 5px;
   margin-bottom: 10px;
 }
@@ -605,4 +605,4 @@
   background-color: $grey;
   color: $white;
   padding: 10px;
-}
\ No newline at end of file
+}