diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js
index 28d716d5e..f9ae09fd5 100644
--- a/app/assets/javascripts/repositories/repository_datatable.js
+++ b/app/assets/javascripts/repositories/repository_datatable.js
@@ -638,9 +638,8 @@ var RepositoryDatatable = (function(global) {
 
   global.onClickToggleAssignedRecords = function() {
     $('.repository-assign-group > .btn').click(function() {
-      $('.btn-group > .btn').removeClass('active btn-toggle');
-      $('.btn-group > .btn').addClass('btn-default');
-      $(this).addClass('active btn-toggle');
+      $('.btn-group > .btn').removeClass('active');
+      $(this).addClass('active');
     });
 
     $('#assigned-repo-records').on('click', function() {
diff --git a/app/assets/javascripts/sitewide/dropdown_selector.js b/app/assets/javascripts/sitewide/dropdown_selector.js
index 30ac959c1..1c29b1450 100644
--- a/app/assets/javascripts/sitewide/dropdown_selector.js
+++ b/app/assets/javascripts/sitewide/dropdown_selector.js
@@ -731,6 +731,7 @@ var dropdownSelector = (function() {
 
       $.get(selector.data('ajax-url'), ajaxParams, (data) => {
         loadData(selector, container, data);
+        PerfectSb().update_all();
       });
     // For local options we convert options element from select to correct array
     } else if (selector.data('select-by-group')) {
diff --git a/app/assets/stylesheets/constants.scss b/app/assets/stylesheets/constants.scss
index 048763939..00661294f 100644
--- a/app/assets/stylesheets/constants.scss
+++ b/app/assets/stylesheets/constants.scss
@@ -142,9 +142,6 @@ $btn-warning-border: darken($btn-warning-bg, 5%);
 $btn-danger-color: $color-white;
 $btn-danger-bg: $brand-danger;
 $btn-danger-border: darken($btn-danger-bg, 5%);
-$btn-toggle-color: $color-white;
-$btn-toggle-bg: $brand-primary;
-$btn-toggle-border: darken($btn-toggle-bg, 5%);
 $btn-link-disabled-color: $gray-light;
 $btn-border-radius-base: $border-radius-base;
 $btn-border-radius-large: $border-radius-large;
diff --git a/app/assets/stylesheets/global_activities.scss b/app/assets/stylesheets/global_activities.scss
index c73837ffd..e90481bbf 100644
--- a/app/assets/stylesheets/global_activities.scss
+++ b/app/assets/stylesheets/global_activities.scss
@@ -309,8 +309,8 @@
     width: 100%;
 
     .title {
+      @include font-small;
       float: left;
-      font-size: 16px;
       line-height: 20px;
       margin-bottom: 5px;
       width: calc(100% - 50px);
diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss
index a7859d1b9..19e9fa154 100644
--- a/app/assets/stylesheets/projects.scss
+++ b/app/assets/stylesheets/projects.scss
@@ -7,16 +7,6 @@
 $color-group-hover: $color-alabaster;
 $color-module-hover: $brand-primary;
 
-#new-project-modal,
-#edit-project-modal,
-#copy-to-repository-modal {
-  .btn-group label.btn-toggle:not(.active) {
-    background-color: $color-white;
-    border-color: $color-silver;
-    color: $color-emperor;
-  }
-}
-
 #sortMenu {
   border-color: $color-white;
 
@@ -32,13 +22,6 @@ $color-module-hover: $brand-primary;
 /* Secondary navigation */
 
 .navbar-nav {
-
-  .btn-group .btn-toggle:not(.active) {
-    background-color: $color-white;
-    border-color: $color-silver;
-    color: $color-emperor;
-  }
-
   .projects-view-mode-switch {
     margin: 8px 10px 12px;
   }
diff --git a/app/assets/stylesheets/shared_styles/constants/fonts.scss b/app/assets/stylesheets/shared_styles/constants/fonts.scss
index 17ff6737d..5bced3ebc 100644
--- a/app/assets/stylesheets/shared_styles/constants/fonts.scss
+++ b/app/assets/stylesheets/shared_styles/constants/fonts.scss
@@ -5,6 +5,7 @@ $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
 $font-family-base: $font-family-lato;
 $font-family-icons: "Font Awesome 5 Free";
 $font-size-base: 16px;
+$headings-font-weight: bold;
 
 $font-size-h1: 24px;
 $font-size-h2: 18px;
@@ -52,9 +53,6 @@ $font-fas-exclamation-circle: "\f06a";
   font-weight: 501;
 }
 
-
-
-
 // $font-size-large: ceil(($font-size-base * 1.1)); //16px
 // $font-size-small: ceil(($font-size-base * .9)); //13px
 // $font-size-h1: floor(($font-size-base * 2.6)); //36px
diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss
index 7b0069667..49907303f 100644
--- a/app/assets/stylesheets/themes/scinote.scss
+++ b/app/assets/stylesheets/themes/scinote.scss
@@ -30,7 +30,20 @@ table {
 }
 
 .btn-toggle {
-  @include button-variant($btn-toggle-color, $btn-toggle-bg, $btn-toggle-border);
+  background: $color-white;
+  border: $border-default;
+  color: $color-volcano;
+
+  &.active {
+    background: $brand-primary;
+    border: 1px solid $brand-primary;
+    box-shadow: none;
+    color: $color-white;
+
+    &.focus {
+      outline: 0;
+    }
+  }
 }
 
 #no-teams-jumbotron {
diff --git a/app/views/assets/wopi/_create_wopi_file_modal.html.erb b/app/views/assets/wopi/_create_wopi_file_modal.html.erb
index 5c132a6e5..563a4a82b 100644
--- a/app/views/assets/wopi/_create_wopi_file_modal.html.erb
+++ b/app/views/assets/wopi/_create_wopi_file_modal.html.erb
@@ -55,7 +55,7 @@
             <div class='col-md-4'></div>
             <div class='col-md-4' id='submit-btn-cont'>
               <%= f.submit t('assets.create_wopi_file.create_document_button'),
-                class: 'btn btn-toggle' %>
+                class: 'btn btn-primary' %>
             </div>
           </div>
         </div>
diff --git a/app/views/my_modules/repository.html.erb b/app/views/my_modules/repository.html.erb
index e77c40ab7..5ae682ea0 100644
--- a/app/views/my_modules/repository.html.erb
+++ b/app/views/my_modules/repository.html.erb
@@ -14,7 +14,7 @@
 
   <div id="show-assigned-buttons" class="btn-group repository-assign-group" data-toggle="buttons">
     <button type="button" class="active btn btn-toggle" id="assigned-repo-records"><%= t("repositories.view_assigned_records") %></button>
-    <button type="button" class="btn btn-default" id="all-repo-records"><%= t("repositories.view_all_records") %></button>
+    <button type="button" class="btn btn-toggle" id="all-repo-records"><%= t("repositories.view_all_records") %></button>
   </div>
 
   <div class="repo-datatables-buttons pull-right" style="display: inline;">
diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb
index 40137c451..afe7eabcc 100644
--- a/app/views/users/registrations/new.html.erb
+++ b/app/views/users/registrations/new.html.erb
@@ -1,7 +1,7 @@
 <% provide(:head_title, t('users.registrations.new.head_title')) %>
 
 <div class="center-block center-block-narrow">
-  <h2>Sign up</h2>
+  <h1><%= t 'users.registrations.new.head_title' %></h1>
   <div data-hook="sign-up-form-hook">
   <%= form_for(:user, as: resource_name, url: registration_path(resource_name), html: { id: "sign-up-form" } ) do |f| %>
 
diff --git a/app/views/users/sessions/new.html.erb b/app/views/users/sessions/new.html.erb
index 245e51f83..166515060 100644
--- a/app/views/users/sessions/new.html.erb
+++ b/app/views/users/sessions/new.html.erb
@@ -1,7 +1,7 @@
 <% provide(:head_title, t("devise.sessions.new.head_title")) %>
 
 <div class="center-block center-block-narrow">
-  <h2><%=t "devise.sessions.new.title" %></h2>
+  <h1><%=t "devise.sessions.new.title" %></h1>
 
   <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
     <div class="input-group">