diff --git a/app/assets/javascripts/sitewide/drag_n_drop.js.erb b/app/assets/javascripts/sitewide/drag_n_drop.js.erb
index 123a96657..4c513c6dd 100644
--- a/app/assets/javascripts/sitewide/drag_n_drop.js.erb
+++ b/app/assets/javascripts/sitewide/drag_n_drop.js.erb
@@ -137,7 +137,7 @@
       html += 'placeholder="<%= I18n.t('assets.from_clipboard.file_name_placeholder') %>" aria-describedby="image-name">';
       html += '<span class="input-group-addon" id="image-name"></span></div>';
       html += '</div><div class="modal-footer">';
-      html += '<button type="button" class="btn btn-default" data-dismiss="modal"><%= I18n.t('general.cancel') %></button>'
+      html += '<button type="button" class="btn btn-default" data-dismiss="modal"><%= I18n.t('general.cancel') %></button>';
       html += '<button type="button" class="btn btn-success" data-action="addImageFormClipboard"><%= I18n.t('assets.from_clipboard.add_image') %></button>';
       html += '</div></div></div></div><!-- /.modal -->';
       return $(html).appendTo($('body')).promise().done(function() {
diff --git a/app/views/my_modules/_complete_task_modal.html.erb b/app/views/my_modules/_complete_task_modal.html.erb
index 9c58d711a..49e2b4238 100644
--- a/app/views/my_modules/_complete_task_modal.html.erb
+++ b/app/views/my_modules/_complete_task_modal.html.erb
@@ -16,12 +16,12 @@
         <p><%=t 'my_modules.complete_modal.description' %></p>
       </div>
       <div class="modal-footer">
-        <button type="button"
-                class="btn btn-primary"
-                data-action="complete"><%=t 'my_modules.buttons.complete' %></button>
         <button type="button"
                 class="btn btn-default"
                 data-dismiss="modal"><%=t 'my_modules.complete_modal.leave_uncompleted' %></button>
+        <button type="button"
+                class="btn btn-success"
+                data-action="complete"><%=t 'my_modules.buttons.complete' %></button>
       </div>
     </div>
   </div>
diff --git a/app/views/my_modules/protocols/_confirm_link_update_modal.html.erb b/app/views/my_modules/protocols/_confirm_link_update_modal.html.erb
index c0283956d..350a4d69f 100644
--- a/app/views/my_modules/protocols/_confirm_link_update_modal.html.erb
+++ b/app/views/my_modules/protocols/_confirm_link_update_modal.html.erb
@@ -7,9 +7,9 @@
       </div>
       <div class="modal-body"></div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-primary" data-action="submit"></button>
         <button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel") %></button>
+        <button type="button" class="btn btn-success" data-action="submit"></button>
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/repositories/_repository_row_info_modal.html.erb b/app/views/repositories/_repository_row_info_modal.html.erb
index 6256fe6d9..ba2d7d30a 100644
--- a/app/views/repositories/_repository_row_info_modal.html.erb
+++ b/app/views/repositories/_repository_row_info_modal.html.erb
@@ -82,7 +82,7 @@
       </div>
       <script>window.initPreviewModal()</script>
       <div class="modal-footer">
-        <button type="button" class="btn btn-primary" data-dismiss="modal"><%= t("general.close")%></button>
+        <button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.close")%></button>
       </div>
     </div>
   </div>
diff --git a/app/views/users/settings/teams/_destroy_modal.html.erb b/app/views/users/settings/teams/_destroy_modal.html.erb
index f2d585424..fd1049615 100644
--- a/app/views/users/settings/teams/_destroy_modal.html.erb
+++ b/app/views/users/settings/teams/_destroy_modal.html.erb
@@ -15,7 +15,7 @@
       <div class="modal-footer">
         <%= bootstrap_form_tag url: destroy_team_path(team), method: :delete do |f| %>
           <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('general.cancel') %></button>
-          <%= f.submit t("users.settings.teams.edit.modal_destroy_team.confirm"), class: "btn btn-primary" %>
+          <%= f.submit t("users.settings.teams.edit.modal_destroy_team.confirm"), class: "btn btn-danger" %>
         <% end %>
       </div>
     </div>
diff --git a/app/views/users/settings/teams/index.html.erb b/app/views/users/settings/teams/index.html.erb
index f2508f7ff..6787c1319 100644
--- a/app/views/users/settings/teams/index.html.erb
+++ b/app/views/users/settings/teams/index.html.erb
@@ -15,7 +15,7 @@
       <% end %>
       <% if can_create_teams? %>
         <span id="new-team-button">
-          <%= link_to new_team_path, class: "btn btn-default", style: "margin-left: 30px;" do %>
+          <%= link_to new_team_path, class: "btn btn-primary", style: "margin-left: 30px;" do %>
             <span class="glyphicon glyphicon-plus"></span>
             <span class="hidden-xs">
               <%= t("users.settings.teams.index.new_team") %>
diff --git a/app/views/users/settings/teams/new.html.erb b/app/views/users/settings/teams/new.html.erb
index 9c95922c7..0924ef067 100644
--- a/app/views/users/settings/teams/new.html.erb
+++ b/app/views/users/settings/teams/new.html.erb
@@ -26,7 +26,7 @@
       </div>
 
       <%= link_to t('general.cancel'), teams_path, class: 'btn btn-default' %>
-      <%= f.submit t('users.settings.teams.new.create'), class: 'btn btn-primary' %>
+      <%= f.submit t('users.settings.teams.new.create'), class: 'btn btn-success' %>
 
     <% end %>
   </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c59280f67..db4734530 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1396,7 +1396,7 @@ en:
             one: "You are member of %{count} team."
             other: "You are member of %{count} teams."
           no_teams: "You are not a member of any team."
-          new_team: "New team"
+          new_team: "New Team"
           thead_name: "Team"
           thead_role: "Role"
           thead_created_at: "Created at"
@@ -1410,7 +1410,7 @@ en:
           name_sublabel: "Pick a name that would best describe your team (e.g. 'University of ..., Department of ...')."
           description_label: "Description"
           description_sublabel: "Describe your team."
-          create: "Create team"
+          create: "Create"
         edit:
           header_created_at: "Created on:"
           header_created_by: "Created by:"