diff --git a/Gemfile b/Gemfile
index 63ba1d3513..f4074a3d0a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,7 @@ platforms :ruby do
   elsif ENV['DB'] == 'postgres'
     gem 'pg'
   else
-    gem 'sqlite3'
+    gem 'sqlite3', '~> 1.4'
   end
 end
 
diff --git a/app/assets/images/admin/logo.png b/app/assets/images/admin/logo.png
deleted file mode 100644
index 51a360c77d..0000000000
Binary files a/app/assets/images/admin/logo.png and /dev/null differ
diff --git a/app/assets/images/favicon.png b/app/assets/images/favicon.png
new file mode 100644
index 0000000000..9d8b0f91aa
Binary files /dev/null and b/app/assets/images/favicon.png differ
diff --git a/app/assets/images/favicon_dark_bg.png b/app/assets/images/favicon_dark_bg.png
new file mode 100644
index 0000000000..bac0196410
Binary files /dev/null and b/app/assets/images/favicon_dark_bg.png differ
diff --git a/app/assets/images/logo_dark.png b/app/assets/images/logo_dark.png
new file mode 100644
index 0000000000..da379f90ee
Binary files /dev/null and b/app/assets/images/logo_dark.png differ
diff --git a/app/assets/images/logo_light.png b/app/assets/images/logo_light.png
new file mode 100644
index 0000000000..ff125cfe16
Binary files /dev/null and b/app/assets/images/logo_light.png differ
diff --git a/app/assets/images/spark_solutions_logo.png b/app/assets/images/spark_solutions_logo.png
new file mode 100644
index 0000000000..7f872c7d39
Binary files /dev/null and b/app/assets/images/spark_solutions_logo.png differ
diff --git a/app/assets/images/vendo_logo.png b/app/assets/images/vendo_logo.png
new file mode 100644
index 0000000000..dfa50412eb
Binary files /dev/null and b/app/assets/images/vendo_logo.png differ
diff --git a/app/assets/stylesheets/spree/backend/components/_buttons.scss b/app/assets/stylesheets/spree/backend/components/_buttons.scss
index 06273b78d7..3d91786b92 100644
--- a/app/assets/stylesheets/spree/backend/components/_buttons.scss
+++ b/app/assets/stylesheets/spree/backend/components/_buttons.scss
@@ -1,7 +1,3 @@
-.payment-action-save {
-  @include button-variant(theme-color('success'), theme-color('success'), theme-color('success') );
-}
-
 .btn,
 .nav-pills > li > a {
   vertical-align: middle;
diff --git a/app/assets/stylesheets/spree/backend/components/_navbar.scss b/app/assets/stylesheets/spree/backend/components/_navbar.scss
index 25998e8bb2..81fdc90789 100644
--- a/app/assets/stylesheets/spree/backend/components/_navbar.scss
+++ b/app/assets/stylesheets/spree/backend/components/_navbar.scss
@@ -1,3 +1,7 @@
+.dropdown-menu {
+  @extend .shadow;
+}
+
 .header {
   .navbar {
     min-height:54px;
@@ -16,13 +20,6 @@
       }
     }
 
-    #accountNav {
-      i {
-        font-size: 1.3em;
-        line-height: 1rem;
-      }
-    }
-
     #storeSwitcherDropdown {
       .dropdown-menu.show {
         min-width: 250px;
diff --git a/app/assets/stylesheets/spree/backend/components/_tables.scss b/app/assets/stylesheets/spree/backend/components/_tables.scss
index a276593ac0..5e615a66d3 100644
--- a/app/assets/stylesheets/spree/backend/components/_tables.scss
+++ b/app/assets/stylesheets/spree/backend/components/_tables.scss
@@ -19,7 +19,6 @@ table.table {
 
   thead {
     th {
-      text-transform: uppercase;
       font-size: $small-font-size;
       padding: 0.5rem;
       padding-top: 14px;
diff --git a/app/assets/stylesheets/spree/backend/global/_variables.scss b/app/assets/stylesheets/spree/backend/global/_variables.scss
index 3516d532e5..cd2efc17cb 100644
--- a/app/assets/stylesheets/spree/backend/global/_variables.scss
+++ b/app/assets/stylesheets/spree/backend/global/_variables.scss
@@ -1,8 +1,22 @@
+// https://github.com/twbs/bootstrap/blob/v4.6.2/scss/_variables.scss
+
 $theme-colors: (
-  "primary": #4C75BA,
+  "primary": #000,
 );
 
-$enable-shadows: true;
+$enable-responsive-font-sizes: true;
+$font-family-sans-serif: "Inter", "Helvetica Neue", Helvetica, Arial, sans-serif !default;
+$font-size-base:   0.813rem !default;
+$font-size-plus:   0.875rem !default;
+$font-size-sm:    0.75rem !default;
+$font-size-lg:    1rem !default;
+
+$border-radius: 0.5rem !default;
+$border-radius-sm: 0.4rem !default;
+$border-radius-lg: 0.75rem !default;
+
+$dropdown-item-padding-y:           .5rem !default;
+$dropdown-item-padding-x:           1rem !default;
 
 // https://github.com/twbs/bootstrap/issues/32019
 // we need this hotfix for sassc
diff --git a/app/assets/stylesheets/spree/backend/plugins/_sweetalert2_custom.scss b/app/assets/stylesheets/spree/backend/plugins/_sweetalert2_custom.scss
index 74faa46947..6e4d028bf5 100644
--- a/app/assets/stylesheets/spree/backend/plugins/_sweetalert2_custom.scss
+++ b/app/assets/stylesheets/spree/backend/plugins/_sweetalert2_custom.scss
@@ -5,7 +5,7 @@ body.swal2-shown {
   }
   .swal2-html-container {
     text-align: left;
-    font-size: 0.9em;
+    font-size: 0.813rem !important;
 
     .alert-link {
       font-weight: 400;
diff --git a/app/helpers/spree/admin/base_helper.rb b/app/helpers/spree/admin/base_helper.rb
index 5a7ac10bfb..ad054c383f 100644
--- a/app/helpers/spree/admin/base_helper.rb
+++ b/app/helpers/spree/admin/base_helper.rb
@@ -286,6 +286,10 @@ def product_wysiwyg_editor_enabled?
       def taxon_wysiwyg_editor_enabled?
         Spree::Backend::Config[:taxon_wysiwyg_editor_enabled]
       end
+
+      def spree_update_available?
+        @spree_update_available ||= Spree::Admin::Updater.update_available?
+      end
     end
   end
 end
diff --git a/app/helpers/spree/admin/navigation_helper.rb b/app/helpers/spree/admin/navigation_helper.rb
index dfecab836c..c13f7b9832 100644
--- a/app/helpers/spree/admin/navigation_helper.rb
+++ b/app/helpers/spree/admin/navigation_helper.rb
@@ -301,7 +301,7 @@ def wrapper_classes
       end
 
       def page_header_back_button(url)
-        link_to url, class: 'btn btn-outline-info mr-3 pr-1' do
+        link_to url, class: 'btn btn-light mr-3 pr-1' do
           svg_icon name: 'chevron-left.svg', width: 15, height: 15
         end
       end
diff --git a/app/helpers/spree/admin/stores_helper.rb b/app/helpers/spree/admin/stores_helper.rb
index 2cfb88dead..3ab5ba5d03 100644
--- a/app/helpers/spree/admin/stores_helper.rb
+++ b/app/helpers/spree/admin/stores_helper.rb
@@ -16,14 +16,14 @@ def stores_dropdown_values
       def store_switcher_link(store)
         if current_store.id == store.id
           classes = 'disabled bg-light'
-          icon = svg_icon name: 'circle-fill.svg', width: '18', height: '18'
+          icon = svg_icon name: 'circle-fill.svg', width: '14', height: '14'
         else
           classes = nil
-          icon = svg_icon name: 'circle.svg', width: '18', height: '18'
+          icon = svg_icon name: 'circle.svg', width: '14', height: '14'
         end
 
         link_to icon + store.unique_name, spree.admin_url(host: store.formatted_url),
-                class: "#{classes} py-3 px-4 dropdown-item rounded", id: store.code, data: { turbo: false }
+                class: "#{classes} dropdown-item", id: store.code, data: { turbo: false }
       end
     end
   end
diff --git a/app/models/spree/admin/actions/action.rb b/app/models/spree/admin/actions/action.rb
index 4b6b46e8e8..b854b9a232 100644
--- a/app/models/spree/admin/actions/action.rb
+++ b/app/models/spree/admin/actions/action.rb
@@ -3,7 +3,7 @@ module Admin
     module Actions
       class Action
         STYLE_CLASSES = {
-          ::Spree::Admin::Actions::ActionStyle::PRIMARY => 'btn-success',
+          ::Spree::Admin::Actions::ActionStyle::PRIMARY => 'btn-primary',
           ::Spree::Admin::Actions::ActionStyle::SECONDARY => 'btn-secondary',
           ::Spree::Admin::Actions::ActionStyle::LIGHT => 'btn-light'
         }
diff --git a/app/models/spree/admin/updater.rb b/app/models/spree/admin/updater.rb
new file mode 100644
index 0000000000..a396a3acbb
--- /dev/null
+++ b/app/models/spree/admin/updater.rb
@@ -0,0 +1,35 @@
+require 'net/http'
+require 'json'
+require 'uri'
+
+module Spree
+  module Admin
+    class Updater
+      SPREE_CLOUD_UPDATES_URL = 'https://spreecloud.io/updates.json'
+
+      @updates = nil
+
+      def self.update_available?
+        fetch_updates.any?
+      end
+
+      def self.fetch_updates
+        @updates ||= Rails.cache.fetch("spree/admin/updater/fetch_updates/#{Spree.version}", expires_in: 1.day) do
+          uri = URI(SPREE_CLOUD_UPDATES_URL)
+          params = { version: Spree.version }
+          uri.query = URI.encode_www_form(params)
+
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = uri.scheme == 'https'
+          http.open_timeout = 1 # 1s timeout for opening the connection
+          http.read_timeout = 1 # 1s timeout for reading the response
+
+          response = http.get(uri)
+          return {} unless response.is_a?(Net::HTTPSuccess)
+
+          JSON.parse(response.body)
+        end
+      end
+    end
+  end
+end
diff --git a/app/views/spree/admin/adjustments/_adjustments_table.html.erb b/app/views/spree/admin/adjustments/_adjustments_table.html.erb
index fb2757eb55..67d3de90c3 100644
--- a/app/views/spree/admin/adjustments/_adjustments_table.html.erb
+++ b/app/views/spree/admin/adjustments/_adjustments_table.html.erb
@@ -21,7 +21,7 @@
   <div class="card-footer">
     <div class="row text-center pb-0">
       <div class="col-12 col-lg-6">
-        <%= button_to Spree.t(:open_all_adjustments), open_adjustments_admin_order_path(@order), method: :put, class: "btn btn-success" %>
+        <%= button_to Spree.t(:open_all_adjustments), open_adjustments_admin_order_path(@order), method: :put, class: "btn btn-primary" %>
       </div>
       <div class="col-12 col-lg-6">
         <%= button_to Spree.t(:close_all_adjustments), close_adjustments_admin_order_path(@order), method: :put, class: "btn btn-danger" %>
diff --git a/app/views/spree/admin/cms_pages/_form.html.erb b/app/views/spree/admin/cms_pages/_form.html.erb
index 04621ca3b9..0ae0e9c50d 100644
--- a/app/views/spree/admin/cms_pages/_form.html.erb
+++ b/app/views/spree/admin/cms_pages/_form.html.erb
@@ -16,17 +16,17 @@
 
               <span id="visibilityStatus" class="d-flex align-items-center">
                 <span class="page_hidden badge badge-pill badge-secondary <% if @cms_page.visible? %>d-none<% end %>">
-                  <%= svg_icon name: "eye-slash-fill.svg", width: '18', height: '18' %> <%= Spree.t('admin.cms.draft_mode') %>
+                  <%= svg_icon name: "eye-slash-fill.svg", width: '14', height: '14' %> <%= Spree.t('admin.cms.draft_mode') %>
                 </span>
 
                 <span class="page_visible badge badge-pill badge-primary <% if @cms_page.draft_mode? %>d-none<% end %>">
-                  <%= svg_icon name: "view.svg", width: '18', height: '18' %> <%= Spree.t('admin.cms.visible') %>
+                  <%= svg_icon name: "view.svg", width: '14', height: '14' %> <%= Spree.t('admin.cms.visible') %>
                 </span>
               </span>
             </div>
             <div class="col-auto d-flex align-items-center">
               <span class="badge badge-pill badge-secondary">
-                  <%= svg_icon name: "translate.svg", width: '18', height: '18' %> <%= locale_full_name(@cms_page.locale) %>
+                  <%= svg_icon name: "translate.svg", width: '14', height: '14' %> <%= locale_full_name(@cms_page.locale) %>
               </span>
             </div>
           </div>
diff --git a/app/views/spree/admin/cms_pages/_live_preview_area.html.erb b/app/views/spree/admin/cms_pages/_live_preview_area.html.erb
index adba2e025a..2660e3e60b 100644
--- a/app/views/spree/admin/cms_pages/_live_preview_area.html.erb
+++ b/app/views/spree/admin/cms_pages/_live_preview_area.html.erb
@@ -4,7 +4,7 @@
       <hr class="mt-4 hide-on-full-screen-mode">
       <div class="row">
         <div class="col d-flex justify-content-start">
-          <%= button_link_to Spree.t('admin.cms.add_new_section'), spree.new_admin_cms_page_cms_section_path(@cms_page), icon: 'add.svg', class: 'no-wrap btn btn-success align-self-center' %>
+          <%= button_link_to Spree.t('admin.cms.add_new_section'), spree.new_admin_cms_page_cms_section_path(@cms_page), icon: 'add.svg', class: 'no-wrap btn btn-primary align-self-center' %>
         </div>
         <div class="col d-none d-md-flex justify-content-end">
           <div id="LiveViewSwitcher" class="btn-group btn-group-toggle" data-toggle="buttons">
diff --git a/app/views/spree/admin/cms_pages/index.html.erb b/app/views/spree/admin/cms_pages/index.html.erb
index fcae036861..3874e8a459 100644
--- a/app/views/spree/admin/cms_pages/index.html.erb
+++ b/app/views/spree/admin/cms_pages/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t('admin.cms.add_new_page'), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'new_page' } %>
+  <%= button_link_to Spree.t('admin.cms.add_new_page'), new_object_url, { class: "btn-primary", icon: 'add.svg', id: 'new_page' } %>
 <% end if can?(:create, Spree::CmsPage) %>
 
 <% content_for :table_filter do %>
diff --git a/app/views/spree/admin/countries/index.html.erb b/app/views/spree/admin/countries/index.html.erb
index 9ff5497b74..a9d356b689 100644
--- a/app/views/spree/admin/countries/index.html.erb
+++ b/app/views/spree/admin/countries/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_country), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'admin_new_country' } %>
+  <%= button_link_to Spree.t(:new_country), new_object_url, { class: "btn-primary", icon: 'add.svg', id: 'admin_new_country' } %>
 <% end if can? :create, Spree::Country %>
 <div class="table-responsive border rounded bg-white">
   <table class="table" id='listing_countries' data-hook>
diff --git a/app/views/spree/admin/customer_returns/_return_item_decision.html.erb b/app/views/spree/admin/customer_returns/_return_item_decision.html.erb
index a1c4803802..f033d8593f 100644
--- a/app/views/spree/admin/customer_returns/_return_item_decision.html.erb
+++ b/app/views/spree/admin/customer_returns/_return_item_decision.html.erb
@@ -40,7 +40,7 @@
           <% if show_decision %>
             <td class='actions'>
               <span class="d-flex justify-content-end">
-                <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-success btn-sm', params: { "return_item[acceptance_status]" => 'accepted' }, "data-action" => 'save', title: Spree.t(:accept), method: 'put' } do %>
+                <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-primary btn-sm', params: { "return_item[acceptance_status]" => 'accepted' }, "data-action" => 'save', title: Spree.t(:accept), method: 'put' } do %>
                   <%= Spree.t(:accept) %>
                 <% end if can?(:accept, return_item) %>
                 <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-danger btn-sm', params: { "return_item[acceptance_status]" => 'rejected' }, "data-action" => 'remove', title: Spree.t(:reject), method: 'put' } do %>
diff --git a/app/views/spree/admin/customer_returns/index.html.erb b/app/views/spree/admin/customer_returns/index.html.erb
index e1fc059eee..e5d6615bb3 100644
--- a/app/views/spree/admin/customer_returns/index.html.erb
+++ b/app/views/spree/admin/customer_returns/index.html.erb
@@ -2,7 +2,7 @@
 
 <% content_for :page_actions do %>
   <% if @order.shipments.any?(&:shipped?) && can?(:create, Spree::CustomerReturn) %>
-    <%= button_link_to Spree.t(:new_customer_return), spree.new_admin_order_customer_return_path(@order), icon: 'add.svg', class: 'btn-success' %>
+    <%= button_link_to Spree.t(:new_customer_return), spree.new_admin_order_customer_return_path(@order), icon: 'add.svg', class: 'btn-primary' %>
   <% end %>
 <% end %>
 
diff --git a/app/views/spree/admin/dashboard/_getting_started.html.erb b/app/views/spree/admin/dashboard/_getting_started.html.erb
index 1300dbdedb..b2376967c7 100644
--- a/app/views/spree/admin/dashboard/_getting_started.html.erb
+++ b/app/views/spree/admin/dashboard/_getting_started.html.erb
@@ -47,7 +47,7 @@
             <%= Spree.t('admin.getting_started.products_section.message_without_products') %>
             <%= link_to(Spree.t('admin.getting_started.products_section.import_message'), 'https://api.spreecommerce.org/docs/api-v2/27527143a4edf-create-a-product') %>
           </p>
-          <%= link_to_with_icon 'add.svg', Spree.t('admin.getting_started.add_products'), spree.admin_products_path, class: 'btn btn-success btn-sm mb-2' %>
+          <%= link_to_with_icon 'add.svg', Spree.t('admin.getting_started.add_products'), spree.admin_products_path, class: 'btn btn-primary btn-sm mb-2' %>
         <% end %>
       </div>
       <div class="tab-pane fade <% if @active_tab == 'shipping'%>show active<% end %>" id="list-shipping" role="tabpanel" aria-labelledby="list-shipping-list">
diff --git a/app/views/spree/admin/data_feeds/index.html.erb b/app/views/spree/admin/data_feeds/index.html.erb
index 256ace23c8..d18600de71 100644
--- a/app/views/spree/admin/data_feeds/index.html.erb
+++ b/app/views/spree/admin/data_feeds/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t('admin.data_feeds.new_data_feed'), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_data_feed_link' %>
+  <%= button_link_to Spree.t('admin.data_feeds.new_data_feed'), new_object_url, class: "btn-primary", icon: 'add.svg', id: 'admin_new_data_feed_link' %>
 <% end if can?(:create, Spree::DataFeed) %>
 
 <% if @data_feeds.present? %>
diff --git a/app/views/spree/admin/images/index.html.erb b/app/views/spree/admin/images/index.html.erb
index 313b02b73d..db9f3dc045 100644
--- a/app/views/spree/admin/images/index.html.erb
+++ b/app/views/spree/admin/images/index.html.erb
@@ -47,7 +47,7 @@
         <tr id="<%= spree_dom_id image %>" data-hook="images_row">
           <td class="move-handle text-center">
             <% if can? :edit, image %>
-              <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
+              <%= svg_icon name: "grip-vertical.svg", width: '14', height: '14' %>
             <% end %>
           </td>
           <td class="image text-center">
diff --git a/app/views/spree/admin/menus/edit.html.erb b/app/views/spree/admin/menus/edit.html.erb
index 2be361065c..8bd8b6b527 100644
--- a/app/views/spree/admin/menus/edit.html.erb
+++ b/app/views/spree/admin/menus/edit.html.erb
@@ -31,7 +31,7 @@
              <h5 class="mb-0 align-self-center"><%= Spree.t('admin.navigation.menu_items', menu_name: @menu.name) %></h5>
             </div>
             <div class="col d-flex justify-content-end">
-              <%= button_link_to Spree.t('admin.navigation.add_new_item', menu: @menu.name), spree.new_admin_menu_menu_item_path(@menu), icon: 'add.svg', class: 'no-wrap btn btn-success align-self-center' %>
+              <%= button_link_to Spree.t('admin.navigation.add_new_item', menu: @menu.name), spree.new_admin_menu_menu_item_path(@menu), icon: 'add.svg', class: 'no-wrap btn btn-primary align-self-center' %>
             </div>
           </div>
         </div>
diff --git a/app/views/spree/admin/menus/index.html.erb b/app/views/spree/admin/menus/index.html.erb
index e83cb22acf..fa36155a02 100644
--- a/app/views/spree/admin/menus/index.html.erb
+++ b/app/views/spree/admin/menus/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t('admin.navigation.add_new_menu'), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'new_menu' } %>
+  <%= button_link_to Spree.t('admin.navigation.add_new_menu'), new_object_url, { class: "btn-primary", icon: 'add.svg', id: 'new_menu' } %>
 <% end if can?(:create, Spree::Menu) %>
 
 <% content_for :table_filter do %>
diff --git a/app/views/spree/admin/oauth_applications/index.html.erb b/app/views/spree/admin/oauth_applications/index.html.erb
index 5069f8cd78..538cf87621 100644
--- a/app/views/spree/admin/oauth_applications/index.html.erb
+++ b/app/views/spree/admin/oauth_applications/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t('admin.oauth_applications.new'), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_role_link' %>
+  <%= button_link_to Spree.t('admin.oauth_applications.new'), new_object_url, class: "btn-primary", icon: 'add.svg', id: 'admin_new_role_link' %>
 <% end if can? :create, Spree::OauthApplication %>
 
   <div class="card bg-light">
@@ -33,7 +33,7 @@
                 <%= password_field_tag :password, application.uid, class: 'form-control unhide text-muted border-0 shadow-none bg-transparent', data: { password_toggle_target: 'unhide' }, readonly: true %>
                 <div class="input-group-append">
                   <%= button_tag class: 'btn btn-link rounded', data: { action: 'click->password-toggle#password' } do %>
-                    <%= svg_icon name: "view.svg", width: '18', height: '18' %>
+                    <%= svg_icon name: "view.svg", width: '14', height: '14' %>
                   <% end %>
                 </div>
               </div>
diff --git a/app/views/spree/admin/option_types/_option_value_fields.html.erb b/app/views/spree/admin/option_types/_option_value_fields.html.erb
index 40a8cb2c44..467e3e61cd 100644
--- a/app/views/spree/admin/option_types/_option_value_fields.html.erb
+++ b/app/views/spree/admin/option_types/_option_value_fields.html.erb
@@ -1,6 +1,6 @@
 <tr class="option_value fields" id="spree_<%= dom_id(f.object) %>" data-hook="option_value">
   <td class="move-handle text-center">
-    <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
+    <%= svg_icon name: "grip-vertical.svg", width: '14', height: '14' %>
     <%= f.hidden_field :id %>
   </td>
   <td class="name"><%= f.text_field :name, class: "form-control", required: true %></td>
diff --git a/app/views/spree/admin/option_types/edit.html.erb b/app/views/spree/admin/option_types/edit.html.erb
index d3ef743009..2d762e5764 100644
--- a/app/views/spree/admin/option_types/edit.html.erb
+++ b/app/views/spree/admin/option_types/edit.html.erb
@@ -40,7 +40,7 @@
             <tr>
               <td colspan="4">
                 <div id="new_add_option_value" class="d-flex" data-hook>
-                  <%= button_link_to Spree.t(:add_option_value), "javascript:;", { icon: 'add.svg', :'data-target' => "tbody#sortVert", class: 'btn-success mx-auto spree_add_fields' } %>
+                  <%= button_link_to Spree.t(:add_option_value), "javascript:;", { icon: 'add.svg', :'data-target' => "tbody#sortVert", class: 'btn-primary mx-auto spree_add_fields' } %>
                 </div>
               </td>
             </tr>
diff --git a/app/views/spree/admin/option_types/index.html.erb b/app/views/spree/admin/option_types/index.html.erb
index 4ef8e83198..93773596ae 100644
--- a/app/views/spree/admin/option_types/index.html.erb
+++ b/app/views/spree/admin/option_types/index.html.erb
@@ -4,7 +4,7 @@
 
 <% content_for :page_actions do %>
   <span id="new_ot_link">
-    <%= button_link_to Spree.t(:new_option_type), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'new_option_type_link' } %>
+    <%= button_link_to Spree.t(:new_option_type), new_object_url, { class: "btn-primary", icon: 'add.svg', id: 'new_option_type_link' } %>
   </span>
 <% end if can?(:create, Spree::OptionType) %>
 
@@ -26,7 +26,7 @@
       <% @option_types.each do |option_type| %>
         <tr class="spree_option_type <%= cycle('odd', 'even') %>" id="<%= spree_dom_id option_type %>" data-hook="option_row">
           <td class="move-handle text-center">
-            <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
+            <%= svg_icon name: "grip-vertical.svg", width: '14', height: '14' %>
           </td>
           <td><%= option_type.name %></td>
           <td class="presentation"><%= option_type.presentation %></td>
diff --git a/app/views/spree/admin/orders/_channel_form.html.erb b/app/views/spree/admin/orders/_channel_form.html.erb
index 24f9aa510f..499992ee21 100644
--- a/app/views/spree/admin/orders/_channel_form.html.erb
+++ b/app/views/spree/admin/orders/_channel_form.html.erb
@@ -9,7 +9,7 @@
       <% end %>
     </div>
     <div class="form-actions" data-hook="buttons">
-      <%= button Spree.t('actions.update'), 'recycle.svg', 'submit', { class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
+      <%= button Spree.t('actions.update'), 'recycle.svg', 'submit', { class: 'btn-primary', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
       <span class="or"><%= Spree.t(:or) %></span>
       <%= button_link_to Spree.t('actions.cancel'), edit_admin_order_url(order), icon: 'cancel.svg' %>
     </div>
diff --git a/app/views/spree/admin/orders/_line_items.html.erb b/app/views/spree/admin/orders/_line_items.html.erb
index 7bf2683e16..d1e47842b9 100644
--- a/app/views/spree/admin/orders/_line_items.html.erb
+++ b/app/views/spree/admin/orders/_line_items.html.erb
@@ -39,7 +39,7 @@
                 <span class="d-flex justify-content-center">
                   <% if can? :update, item %>
                     <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-line-item btn btn-light btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), style: 'display: none', no_text: true %>
-                    <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-line-item btn btn-success btn-sm', no_text: true, data: { :'line-item-id' => item.id, action: 'save'}, title: Spree.t('actions.save'), style: 'display: none' %>
+                    <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-line-item btn btn-primary btn-sm', no_text: true, data: { :'line-item-id' => item.id, action: 'save'}, title: Spree.t('actions.save'), style: 'display: none' %>
                     <%= link_to_with_icon 'edit.svg', Spree.t('edit'), "#", class: 'edit-line-item btn btn-light btn-sm', data: {action: 'edit'}, title: Spree.t('edit'), no_text: true %>
                     <%= link_to_with_icon 'delete.svg', Spree.t('delete'), "#", class: 'delete-line-item btn btn-danger btn-sm', data: { 'line-item-id' => item.id, action: 'remove'}, title: Spree.t('delete'), no_text: true %>
                   <% end %>
diff --git a/app/views/spree/admin/orders/_shipment.html.erb b/app/views/spree/admin/orders/_shipment.html.erb
index 8a746c93f0..1ed12d59db 100644
--- a/app/views/spree/admin/orders/_shipment.html.erb
+++ b/app/views/spree/admin/orders/_shipment.html.erb
@@ -3,19 +3,21 @@
   <%= render partial: "spree/admin/variants/split", formats: :js %>
 
   <div class="card-header stock-location no-borderb" data-hook="stock-location">
-    <h5 class="flex-wrap align-items-center card-title mb-0 h6">
-      <span class="shipment-number"><%= shipment.number %></span>
-      -
-      <span class="shipment-state"><%= Spree.t("shipment_states.#{shipment.state}") %></span>
-      <%= Spree.t(:package_from) %>
-      <strong class="stock-location-name" data-hook="stock-location-name">
-        <%= link_to shipment.stock_location.name, spree.edit_admin_stock_location_url(shipment.stock_location) %>
-      </strong>
+    <div class="d-flex align-items-center justify-content-between">
+      <h5 class="flex-wrap align-items-center card-title mb-0 h6">
+        <span class="shipment-number"><%= shipment.number %></span>
+        -
+        <span class="shipment-state"><%= Spree.t("shipment_states.#{shipment.state}") %></span>
+        <%= Spree.t(:package_from) %>
+        <strong class="stock-location-name" data-hook="stock-location-name">
+          <%= link_to shipment.stock_location.name, spree.edit_admin_stock_location_url(shipment.stock_location) %>
+        </strong>
+      </h5>
       <% if shipment.ready? and can? :update, shipment %>
-        <%= link_to Spree.t(:ship), 'javascript:;', class: 'ship ml-auto btn btn-success', data: { 'shipment-number' => shipment.number } %>
+        <%= link_to Spree.t(:ship), 'javascript:;', class: 'ship ml-auto btn btn-primary', data: { 'shipment-number' => shipment.number } %>
         <div class='clearfix'></div>
       <% end %>
-    </h5>
+    </div>
   </div>
 
   <div class="table-responsive bg-white">
@@ -47,7 +49,7 @@
               <span class="d-flex justify-content-center">
                 <% if can? :update, shipment %>
                   <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-method btn btn-light btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
-                  <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-method btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
+                  <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-method btn btn-primary btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
                 <% end %>
               </span>
             </td>
@@ -84,7 +86,7 @@
             <span class="d-flex justify-content-center">
               <% if can? :update, shipment %>
                 <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-tracking btn btn-light btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
-                <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-tracking btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
+                <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-tracking btn btn-primary btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
               <% end %>
             </span>
           </td>
diff --git a/app/views/spree/admin/orders/_shipment_manifest.html.erb b/app/views/spree/admin/orders/_shipment_manifest.html.erb
index 692e37b2ef..673e0ce990 100644
--- a/app/views/spree/admin/orders/_shipment_manifest.html.erb
+++ b/app/views/spree/admin/orders/_shipment_manifest.html.erb
@@ -36,7 +36,7 @@
         <% if((!shipment.shipped?) && can?(:update, item.line_item)) %>
           <%= link_to_with_icon 'edit.svg', Spree.t('actions.edit'), "#", class: 'edit-item btn btn-light btn-sm', title: Spree.t('actions.edit'), no_text: true %>
           <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-item  btn btn-light btn-sm', data: { action: 'cancel' }, title: Spree.t('actions.cancel'), style: 'display: none', no_text: true %>
-          <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-item btn btn-success btn-sm', data: {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, action: 'save'}, title: Spree.t('actions.save'), style: 'display: none', no_text: true %>
+          <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-item btn btn-primary btn-sm', data: {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, action: 'save'}, title: Spree.t('actions.save'), style: 'display: none', no_text: true %>
           <%= link_to_with_icon 'split.svg', Spree.t('split'), "#", class: 'split-item btn btn-light btn-sm', data: {action: 'split', 'variant-id' => item.variant.id}, title: Spree.t('split'), no_text: true %>
           <%= link_to_with_icon 'delete.svg', Spree.t('delete'), "#", class: 'delete-item btn btn-danger btn-sm', data: { 'shipment-number' => shipment.number, 'variant-id' => item.variant.id, action: 'remove'}, title: Spree.t('delete'), no_text: true %>
         <% end %>
diff --git a/app/views/spree/admin/payment_methods/index.html.erb b/app/views/spree/admin/payment_methods/index.html.erb
index 5abbf61fb7..e4e6b39388 100644
--- a/app/views/spree/admin/payment_methods/index.html.erb
+++ b/app/views/spree/admin/payment_methods/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_payment_method), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_payment_methods_link' %>
+  <%= button_link_to Spree.t(:new_payment_method), new_object_url, class: "btn-primary", icon: 'add.svg', id: 'admin_new_payment_methods_link' %>
 <% end if can? :create, Spree::PaymentMethod %>
 
 <% content_for :table_filter do %>
@@ -41,7 +41,7 @@
         <tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows">
           <td class="move-handle text-center">
             <% if can?(:edit, method) %>
-              <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
+              <%= svg_icon name: "grip-vertical.svg", width: '14', height: '14' %>
             <% end %>
           </td>
           <td><%= method.name %></td>
diff --git a/app/views/spree/admin/product_properties/_product_property_fields.html.erb b/app/views/spree/admin/product_properties/_product_property_fields.html.erb
index 22fd8d0759..ca8c3f8dd6 100644
--- a/app/views/spree/admin/product_properties/_product_property_fields.html.erb
+++ b/app/views/spree/admin/product_properties/_product_property_fields.html.erb
@@ -1,12 +1,12 @@
 <tr class="product_property fields" id="spree_<%= dom_id(f.object) %>" data-hook="product_property">
   <% if f.object.persisted? && can?(:edit, f.object) %>
   <td class="move-handle">
-    <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
+    <%= svg_icon name: "grip-vertical.svg", width: '14', height: '14' %>
     <%= f.hidden_field :id %>
   </td>
   <% else %>
   <td style="opacity:0.2;">
-    <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
+    <%= svg_icon name: "grip-vertical.svg", width: '14', height: '14' %>
     <%= f.hidden_field :id %>
   </td>
   <% end %>
@@ -25,7 +25,7 @@
         <%= link_to_delete f.object, no_text: true %>
       <% else %>
       <span class="btn btn-danger btn-sm icon-link disabled" style="opacity:0.2;">
-        <%= svg_icon name: "delete.svg", width: '18', height: '18' %>
+        <%= svg_icon name: "delete.svg", width: '14', height: '14' %>
       </span>
       <% end %>
     </span>
diff --git a/app/views/spree/admin/products/_autocomplete.js.erb b/app/views/spree/admin/products/_autocomplete.js.erb
index d561052d2e..7d2322e91c 100644
--- a/app/views/spree/admin/products/_autocomplete.js.erb
+++ b/app/views/spree/admin/products/_autocomplete.js.erb
@@ -7,7 +7,7 @@
         </a>
         <div class="dropdown p-0">
           <button class="btn btn-light dropdown-toggle products-ddb btn-sm" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            <%= svg_icon name: "chevron-down.svg", width: '18', height: '18' %>
+            <%= svg_icon name: "chevron-down.svg", width: '14', height: '14' %>
           </button>
           <div class="dropdown-menu dropdown-menu-right p-2" aria-labelledby="dropdownMenuButton">
             <a href="{{ edit_product_url product.id }}" class="edit-product js-edit-product dropdown-item p-1"><%= Spree.t(:edit) %></a>
diff --git a/app/views/spree/admin/promotion_categories/index.html.erb b/app/views/spree/admin/promotion_categories/index.html.erb
index 8047d71a02..409a2b2fa7 100644
--- a/app/views/spree/admin/promotion_categories/index.html.erb
+++ b/app/views/spree/admin/promotion_categories/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_promotion_category), new_object_url, icon: 'add.svg', class: 'btn-success' %>
+  <%= button_link_to Spree.t(:new_promotion_category), new_object_url, icon: 'add.svg', class: 'btn-primary' %>
 <% end if can?(:create, Spree::PromotionCategory) %>
 
 <% if @promotion_categories.any? %>
diff --git a/app/views/spree/admin/promotions/_actions.html.erb b/app/views/spree/admin/promotions/_actions.html.erb
index 0e2e5a3566..796c6fb9e9 100644
--- a/app/views/spree/admin/promotions/_actions.html.erb
+++ b/app/views/spree/admin/promotions/_actions.html.erb
@@ -12,7 +12,7 @@
       <%= select_tag 'action_type', options, class: 'select2' %>
     </div>
     <div class="form-actions">
-      <%= button Spree.t(:add), 'add.svg', 'submit', class: "btn-success" %>
+      <%= button Spree.t(:add), 'add.svg', 'submit', class: "btn-primary" %>
     </div>
 
   <% end %>
diff --git a/app/views/spree/admin/promotions/_rules.html.erb b/app/views/spree/admin/promotions/_rules.html.erb
index ccf4209a18..a939ee718d 100644
--- a/app/views/spree/admin/promotions/_rules.html.erb
+++ b/app/views/spree/admin/promotions/_rules.html.erb
@@ -12,7 +12,7 @@
       <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), class: 'select2') %>
     </div>
     <div class="form-actions">
-      <%= button Spree.t(:add), 'add.svg', 'submit', class: "btn-success" %>
+      <%= button Spree.t(:add), 'add.svg', 'submit', class: "btn-primary" %>
     </div>
 
   <% end %>
diff --git a/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb b/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb
index ad9d80131e..ebd16237b0 100644
--- a/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb
+++ b/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb
@@ -14,7 +14,7 @@
 </div>
 
 <div class="js-tiers"></div>
-<button class="btn btn-success js-add-tier"><%= Spree.t(:add) %></button>
+<button class="btn btn-primary js-add-tier"><%= Spree.t(:add) %></button>
 
 <script type="text/x-handlebars-template" id="tier-input-name">
   <%= prefix %>[calculator_attributes][preferred_tiers][{{base}}]
diff --git a/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb b/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb
index 16aa0f06cb..ac4d839b42 100644
--- a/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb
+++ b/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb
@@ -14,7 +14,7 @@
 </div>
 
 <div class="js-tiers"></div>
-<button class="btn btn-success js-add-tier"><%= Spree.t(:add) %></button>
+<button class="btn btn-primary js-add-tier"><%= Spree.t(:add) %></button>
 
 <script type="text/x-handlebars-template" id="tier-input-name">
   <%= prefix %>[calculator_attributes][preferred_tiers][{{base}}]
diff --git a/app/views/spree/admin/promotions/index.html.erb b/app/views/spree/admin/promotions/index.html.erb
index 35062e04bd..17b24bcf39 100644
--- a/app/views/spree/admin/promotions/index.html.erb
+++ b/app/views/spree/admin/promotions/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_promotion), new_object_url, class: "btn-success", icon: 'add.svg' %>
+  <%= button_link_to Spree.t(:new_promotion), new_object_url, class: "btn-primary", icon: 'add.svg' %>
 <% end if can?(:create, Spree::Promotion) %>
 
 <% content_for :table_filter do %>
diff --git a/app/views/spree/admin/promotions/rules/_option_value.html.erb b/app/views/spree/admin/promotions/rules/_option_value.html.erb
index e259371f84..7468370249 100644
--- a/app/views/spree/admin/promotions/rules/_option_value.html.erb
+++ b/app/views/spree/admin/promotions/rules/_option_value.html.erb
@@ -1,7 +1,7 @@
 <div class="card-body">
   <div class="promo-rule-option-values">
     <div class="js-promo-rule-option-values"></div> <!-- display div for option value select -->
-    <button class="btn btn-primary btn-success js-add-promo-rule-option-value">
+    <button class="btn btn-primary btn-primary js-add-promo-rule-option-value">
       <%= svg_icon name: "plus-circle", width: '16', height: '16' %>
       <%= Spree.t(:add) %>
     </button>
diff --git a/app/views/spree/admin/properties/index.html.erb b/app/views/spree/admin/properties/index.html.erb
index abd3a9e10c..d06f872e94 100644
--- a/app/views/spree/admin/properties/index.html.erb
+++ b/app/views/spree/admin/properties/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_property), new_object_url, { class: "btn-success", icon: 'add.svg', 'data-update' => 'new_property', id: 'new_property_link' } %>
+  <%= button_link_to Spree.t(:new_property), new_object_url, { class: "btn-primary", icon: 'add.svg', 'data-update' => 'new_property', id: 'new_property_link' } %>
 <% end if can?(:create, Spree::Property) %>
 
 <% content_for :table_filter do %>
diff --git a/app/views/spree/admin/prototypes/_prototypes.html.erb b/app/views/spree/admin/prototypes/_prototypes.html.erb
index 7c0e2b152d..4eff569c88 100644
--- a/app/views/spree/admin/prototypes/_prototypes.html.erb
+++ b/app/views/spree/admin/prototypes/_prototypes.html.erb
@@ -15,7 +15,7 @@
               <%= link_to_with_icon 'save.svg',
                 Spree.t(:select),
                 select_admin_prototype_url(prototype),
-                class: 'btn btn-success btn-sm ajax select_properties_from_prototype',
+                class: 'btn btn-primary btn-sm ajax select_properties_from_prototype',
                 no_text: true %>
             </span>
           </td>
diff --git a/app/views/spree/admin/prototypes/index.html.erb b/app/views/spree/admin/prototypes/index.html.erb
index b369167116..ebd684d9e3 100644
--- a/app/views/spree/admin/prototypes/index.html.erb
+++ b/app/views/spree/admin/prototypes/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_prototype), new_object_url, { class: "btn-success", icon: 'add.svg', 'data-update' => 'new_prototype', id: 'new_prototype_link'} %>
+  <%= button_link_to Spree.t(:new_prototype), new_object_url, { class: "btn-primary", icon: 'add.svg', 'data-update' => 'new_prototype', id: 'new_prototype_link'} %>
 <% end if can?(:create, Spree::Prototype) %>
 
 <% if @prototypes.any? %>
diff --git a/app/views/spree/admin/reimbursement_types/index.html.erb b/app/views/spree/admin/reimbursement_types/index.html.erb
index 8092ce18bf..f28a5f8139 100644
--- a/app/views/spree/admin/reimbursement_types/index.html.erb
+++ b/app/views/spree/admin/reimbursement_types/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_reimbursement_type), new_object_url, { :class => "btn-success", :icon => 'add.svg', :id => 'admin_new_reimbursement_type' } %>
+  <%= button_link_to Spree.t(:new_reimbursement_type), new_object_url, { :class => "btn-primary", :icon => 'add.svg', :id => 'admin_new_reimbursement_type' } %>
 <% end if can?(:create, Spree::ReimbursementType) %>
 
 <% if @reimbursement_types.any? %>
diff --git a/app/views/spree/admin/return_authorizations/index.html.erb b/app/views/spree/admin/return_authorizations/index.html.erb
index aa3d92c8bc..441ca3185f 100644
--- a/app/views/spree/admin/return_authorizations/index.html.erb
+++ b/app/views/spree/admin/return_authorizations/index.html.erb
@@ -2,7 +2,7 @@
 
 <% content_for :page_actions do %>
   <% if @order.shipments.any?(&:shipped?) && can?(:create, Spree::ReturnAuthorization) %>
-    <%= button_link_to Spree.t(:new_return_authorization), new_admin_order_return_authorization_url(@order), class: "btn-success", icon: 'add.svg' %>
+    <%= button_link_to Spree.t(:new_return_authorization), new_admin_order_return_authorization_url(@order), class: "btn-primary", icon: 'add.svg' %>
   <% end %>
 <% end %>
 
diff --git a/app/views/spree/admin/roles/index.html.erb b/app/views/spree/admin/roles/index.html.erb
index 1049d11e72..52be836fb8 100644
--- a/app/views/spree/admin/roles/index.html.erb
+++ b/app/views/spree/admin/roles/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_role), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_role_link' %>
+  <%= button_link_to Spree.t(:new_role), new_object_url, class: "btn-primary", icon: 'add.svg', id: 'admin_new_role_link' %>
 <% end if can? :create, Spree::Role %>
 
 <% if @roles.any? %>
diff --git a/app/views/spree/admin/shared/_account_nav.html.erb b/app/views/spree/admin/shared/_account_nav.html.erb
index 9e3251052c..087bbb861c 100644
--- a/app/views/spree/admin/shared/_account_nav.html.erb
+++ b/app/views/spree/admin/shared/_account_nav.html.erb
@@ -7,53 +7,67 @@
 
     <div class="dropdown-menu dropdown-menu-right overflow-hidden mt-2 p-0 mr-2">
       <div class="dropdown-item px-0 text-center bg-light">
-        <span class="d-block py-2 px-4"><%= try_spree_current_user.email %></span>
+        <span class="d-block"><%= try_spree_current_user.try(:email) %></span>
       </div>
       <div class="dropdown-divider m-0"></div>
 
       <% if spree.respond_to? :root_path %>
-          <%= link_to spree.root_path, target: :blank, class: 'd-block py-2 px-4 my-1 dropdown-item', data: { turbo: false } do %>
-            <%= svg_icon name: "store.svg", width: '18', height: '18' %>
+          <%= link_to spree.root_path, target: :blank, class: 'd-block my-1 dropdown-item', data: { turbo: false } do %>
+            <%= svg_icon name: "store.svg", width: '14', height: '14' %>
             &nbsp;
             <%= Spree.t(:back_to_store) %>
           <% end %>
       <% end %>
 
-      <% if can?(:manage, try_spree_current_user) %>
-          <%= link_to spree.edit_admin_user_path(try_spree_current_user), class: 'd-block py-2 px-4 my-1 dropdown-item' do %>
-            <%= svg_icon name: "user.svg", width: '18', height: '18' %>
+      <% if can?(:manage, try_spree_current_user) && try_spree_current_user.persisted? %>
+          <%= link_to spree.edit_admin_user_path(try_spree_current_user), class: 'd-block my-1 dropdown-item' do %>
+            <%= svg_icon name: "user.svg", width: '14', height: '14' %>
             &nbsp;
             <%= Spree.t(:account) %>
           <% end %>
       <% end %>
 
       <% if admin_logout_link %>
-          <%= link_to admin_logout_link, class: 'd-block py-2 px-4 my-1 dropdown-item' do %>
-            <%= svg_icon name: "exit.svg", width: '18', height: '18' %>
+          <%= link_to admin_logout_link, class: 'd-block my-1 dropdown-item' do %>
+            <%= svg_icon name: "exit.svg", width: '14', height: '14' %>
             &nbsp;
             <%= Spree.t(:logout) %>
           <% end %>
       <% end %>
 
-      <div class="dropdown-divider m-0"></div>
+      <div class="dropdown-divider"></div>
+
+        <%= link_to 'http://docs.spreecommerce.org', target: :blank, class: 'd-block my-1 dropdown-item' do %>
+        <%= svg_icon name: "book.svg", width: '14', height: '14' %>
+          &nbsp;
+          <%= Spree.t(:documentation) %>
+        <% end %>
 
-        <%= link_to 'http://spreecommerce.org/contact', target: :blank, class: 'd-block py-2 px-4 my-1 dropdown-item' do %>
-        <%= svg_icon name: "info.svg", width: '18', height: '18' %>
+        <%= link_to 'http://spreecommerce.org/contact', target: :blank, class: 'd-block my-1 dropdown-item' do %>
+        <%= svg_icon name: "chat-dots.svg", width: '14', height: '14' %>
           &nbsp;
-          <%= Spree.t(:support) %>
+          <%= Spree.t(:enterprise_support) %>
         <% end %>
 
-        <%= link_to 'http://slack.spreecommerce.org', target: :blank, class: 'd-block py-2 px-4 my-1 dropdown-item' do %>
-        <%= svg_icon name: "slack.svg", width: '18', height: '18' %>
+        <%= link_to 'http://slack.spreecommerce.org', target: :blank, class: 'd-block my-1 dropdown-item' do %>
+        <%= svg_icon name: "slack.svg", width: '14', height: '14' %>
           &nbsp;
           <%= Spree.t(:join_slack) %>
         <% end %>
 
-        <%= link_to 'https://docs.spreecommerce.org/developer/extending-spree/3rd-party-extensions', target: :blank, class: 'd-block py-2 px-4 my-1 dropdown-item' do %>
-        <%= svg_icon name: "extensions.svg", width: '18', height: '18' %>
+        <%= link_to 'https://docs.spreecommerce.org/developer/extending-spree/3rd-party-extensions', target: :blank, class: 'd-block my-1 dropdown-item' do %>
+        <%= svg_icon name: "extensions.svg", width: '14', height: '14' %>
           &nbsp;
-          <%= Spree.t(:extensions_directory) %>
+          <%= Spree.t(:extensions) %>
         <% end %>
+
+        <div class="dropdown-divider"></div>
+
+        <div class="dropdown-header">
+          Developed by
+        </div>
+
+        <%= link_to image_tag('vendo_logo.png', height: 24), 'https://getvendo.com?utm_source=spree-admin', target: :blank, class: 'dropdown-item mb-2 with-tip', title: 'Vendo - The fastest way to build your own e-commerce business', data: { toggle: 'tooltip', placement: 'left' } %>
     </div>
   </div>
 <% end %>
diff --git a/app/views/spree/admin/shared/_edit_resource_links.html.erb b/app/views/spree/admin/shared/_edit_resource_links.html.erb
index 25cd38b18c..e180338303 100644
--- a/app/views/spree/admin/shared/_edit_resource_links.html.erb
+++ b/app/views/spree/admin/shared/_edit_resource_links.html.erb
@@ -1,5 +1,5 @@
 <div class="form-actions" data-hook="buttons">
-  <%= button Spree.t('actions.update'), 'save.svg', 'submit', {class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
+  <%= button Spree.t('actions.update'), 'save.svg', 'submit', {class: 'btn-primary', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
   <span class="or"><%= Spree.t(:or) %></span>
   <%= button_link_to Spree.t('actions.cancel'), collection_url, icon: 'cancel.svg' %>
 </div>
diff --git a/app/views/spree/admin/shared/_head.html.erb b/app/views/spree/admin/shared/_head.html.erb
index b8979c05fd..15e286b97c 100644
--- a/app/views/spree/admin/shared/_head.html.erb
+++ b/app/views/spree/admin/shared/_head.html.erb
@@ -13,6 +13,12 @@
   <% end %>
 </title>
 
+<%= favicon_link_tag asset_path('favicon.png') %>
+
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Inter:wght@100..900&display=swap" rel="stylesheet">
+
 <%= stylesheet_link_tag 'spree/backend/all', media: :all %>
 
 <script>
diff --git a/app/views/spree/admin/shared/_header.html.erb b/app/views/spree/admin/shared/_header.html.erb
index b27ffc68fd..13d16d5b1b 100644
--- a/app/views/spree/admin/shared/_header.html.erb
+++ b/app/views/spree/admin/shared/_header.html.erb
@@ -1,22 +1,30 @@
-<header class="header logged-in">
-  <nav class="navbar fixed-top navbar-dark flex-nowrap bg-primary p-0">
-    <div class="col p-0 d-lg-none">
-      <button
-        id="sidebar-open"
-        class="navbar-toggler h-100 text-light px-3"
-        type="button"
-        aria-expanded="false"
-        aria-label="Toggle navigation">
-        <%= svg_icon name: "menu.svg", width: '20', height: '20' %>
-      </button>
-    </div>
+<% if try_spree_current_user %>
+  <header class="header logged-in" id="header-logged-in" data-turbo-permanent>
+    <nav class="navbar fixed-top navbar-dark flex-nowrap bg-primary p-0">
+      <div class="col p-0 d-lg-none">
+        <button
+          id="sidebar-open"
+          class="navbar-toggler h-100 text-light px-3"
+          type="button"
+          aria-expanded="false"
+          aria-label="Toggle navigation">
+          <%= svg_icon name: "menu.svg", width: '20', height: '20' %>
+        </button>
+      </div>
 
-    <div id="storeSwitcherDropdown" class="col-auto text-center text-lg-left px-0 px-lg-2 align-items-center dropdown">
-      <%= render partial: 'spree/admin/shared/store_switcher' %>
-    </div>
+      <div id="storeSwitcherDropdown" class="col-auto text-center text-lg-left px-0 px-lg-2 align-items-center dropdown">
+        <%= render partial: 'spree/admin/shared/store_switcher' %>
+      </div>
 
-    <div class="col text-right p-0">
-      <%= render partial: 'spree/admin/shared/account_nav' %>
+      <div class="col text-right p-0">
+        <%= render partial: 'spree/admin/shared/account_nav' %>
+      </div>
+    </nav>
+  </header>
+<% else %>
+  <header class="header">
+    <div class="text-center">
+      <%= image_tag 'logo_light.png', height: 48 %>
     </div>
-  </nav>
-</header>
+  </header>
+<% end %>
diff --git a/app/views/spree/admin/shared/_new_resource_links.html.erb b/app/views/spree/admin/shared/_new_resource_links.html.erb
index 78a8e1923a..d031227ec4 100644
--- a/app/views/spree/admin/shared/_new_resource_links.html.erb
+++ b/app/views/spree/admin/shared/_new_resource_links.html.erb
@@ -1,5 +1,5 @@
 <div class="form-actions" data-hook="buttons">
-  <%= button Spree.t('actions.create'), 'save.svg', 'submit', {class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
+  <%= button Spree.t('actions.create'), 'save.svg', 'submit', {class: 'btn-primary', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
   <span class="or"><%= Spree.t(:or) %></span>
   <%= button_link_to Spree.t('actions.cancel'), collection_url, icon: 'cancel.svg', data: { turbo: false } %>
 </div>
diff --git a/app/views/spree/admin/shared/_store_switcher.html.erb b/app/views/spree/admin/shared/_store_switcher.html.erb
index 0012e66e0d..845b5aa7d3 100644
--- a/app/views/spree/admin/shared/_store_switcher.html.erb
+++ b/app/views/spree/admin/shared/_store_switcher.html.erb
@@ -1,10 +1,10 @@
 <% if can?(:admin, current_store) %>
     <span class="d-none d-lg-inline text-light pl-1 pr-2">
-      <%= svg_icon name: "spree-icon.svg", width: '28', height: '28' %>
+      <%= image_tag('favicon_dark_bg.png', alt: 'Spree Commerce', height: 28) %>
     </span>
 
     <a class="px-0 py-1 btn text-light" id="storeSelectorDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-     <span class="d-sm-none"><%= svg_icon name: "store.svg", width: '18', height: '18' %></span>
+     <span class="d-sm-none"><%= svg_icon name: "store.svg", width: '14', height: '14' %></span>
      <span class="d-none d-sm-inline"><%= current_store.name %></span> (<%= current_store.code %>) <%= svg_icon name: "chevron-down.svg", width: '12', height: '12', classes: 'ml-1 mb-0' %>
     </a>
 
@@ -14,9 +14,9 @@
       <% end %>
 
       <% if can?(:create, Spree::Store) %>
-        <div class="dropdown-divider m-0"></div>
-        <%= link_to spree.new_admin_store_path, class: 'py-2 px-4 mt-1 mb-0 dropdown-item', id: 'addNewStoreLink' do %>
-          <%= svg_icon name: "plus-circle", width: '18', height: '18' %> <%= Spree.t(:add_new_store) %>
+        <div class="dropdown-divider"></div>
+        <%= link_to spree.new_admin_store_path, class: 'dropdown-item', id: 'addNewStoreLink' do %>
+          <%= svg_icon name: "plus-circle", width: '14', height: '14' %> <%= Spree.t(:add_new_store) %>
         <% end %>
       <% end %>
     </div>
diff --git a/app/views/spree/admin/shared/_version.html.erb b/app/views/spree/admin/shared/_version.html.erb
index 7636acf388..7c5795940d 100644
--- a/app/views/spree/admin/shared/_version.html.erb
+++ b/app/views/spree/admin/shared/_version.html.erb
@@ -1,9 +1,22 @@
 <% if can?(:admin, current_store) && Spree::Backend::RuntimeConfig[:admin_show_version] %>
-  <p
-    class="spree-version ml-3 my-3"
+  <div
+    class="spree-version px-3 py-2"
     aria-label="Spree Commerce version">
-    <span class="badge badge-pill badge-info">
-    <%= Spree.version %>
-    </span>
-  </p>
+    <div class="d-flex align-items-center justify-content-between">
+      <span class="text-muted small">
+        <%= link_to Spree.version, "https://github.com/spree/spree/releases/tag/v#{Spree.version.gsub(/\.beta|\.rc\d+/, '')}", target: '_blank' %>
+      </span>
+      <% if spree_update_available? %>
+        <span class="small text-info">
+          <%= Spree.t(:update_available) %>!
+        </span>
+      <% end %>
+    </div>
+    
+    <% if spree_update_available? %>
+      <a href="https://docs.spreecommerce.org/developer/upgrades" target="_blank" class="mt-2 btn btn-sm btn-primary with-tip btn-block" title="Update your Spree instance to the latest version">
+        <%= Spree.t(:update_spree) %>
+      </a>
+    <% end %>
+  </div>
 <% end %>
diff --git a/app/views/spree/admin/shared/named_types/_index.html.erb b/app/views/spree/admin/shared/named_types/_index.html.erb
index 057db16b8f..9d4d1568e3 100644
--- a/app/views/spree/admin/shared/named_types/_index.html.erb
+++ b/app/views/spree/admin/shared/named_types/_index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to new_button_text, new_object_url, { icon: 'add.svg', id: 'admin_new_named_type', class: "btn-success" } %>
+  <%= button_link_to new_button_text, new_object_url, { icon: 'add.svg', id: 'admin_new_named_type', class: "btn-primary" } %>
 <% end if can? :create, resource %>
 
 <% if @collection.any? %>
diff --git a/app/views/spree/admin/shipping_categories/index.html.erb b/app/views/spree/admin/shipping_categories/index.html.erb
index 0a87bfd582..6cc7875a27 100644
--- a/app/views/spree/admin/shipping_categories/index.html.erb
+++ b/app/views/spree/admin/shipping_categories/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_shipping_category), new_object_url, class: "btn-success", icon: 'add.svg' %>
+  <%= button_link_to Spree.t(:new_shipping_category), new_object_url, class: "btn-primary", icon: 'add.svg' %>
 <% end if can? :create, Spree::ShippingCategory %>
 
 <% if @shipping_categories.any? %>
diff --git a/app/views/spree/admin/shipping_methods/index.html.erb b/app/views/spree/admin/shipping_methods/index.html.erb
index 779b00c7d3..6272ac0923 100644
--- a/app/views/spree/admin/shipping_methods/index.html.erb
+++ b/app/views/spree/admin/shipping_methods/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_shipping_method), new_object_url,  class: "btn-success", icon: 'add.svg', id: 'admin_new_shipping_method_link' %>
+  <%= button_link_to Spree.t(:new_shipping_method), new_object_url,  class: "btn-primary", icon: 'add.svg', id: 'admin_new_shipping_method_link' %>
 <% end if can? :create, Spree::ShippingMethod %>
 
 <% if @shipping_methods.any? %>
diff --git a/app/views/spree/admin/states/index.html.erb b/app/views/spree/admin/states/index.html.erb
index 7677134a38..4373c145ae 100644
--- a/app/views/spree/admin/states/index.html.erb
+++ b/app/views/spree/admin/states/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { class: "btn-success", icon: 'add.svg', id: 'new_state_link' } %>
+  <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { class: "btn-primary", icon: 'add.svg', id: 'new_state_link' } %>
 <% end if can? :create, Spree::State %>
 
 <div data-hook="country" class="form-group">
diff --git a/app/views/spree/admin/stock_locations/index.html.erb b/app/views/spree/admin/stock_locations/index.html.erb
index 197f60b066..0e686e87b3 100644
--- a/app/views/spree/admin/stock_locations/index.html.erb
+++ b/app/views/spree/admin/stock_locations/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_location), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'admin_new_stock_location' } %>
+  <%= button_link_to Spree.t(:new_stock_location), new_object_url, { class: "btn-primary", icon: 'add.svg', id: 'admin_new_stock_location' } %>
 <% end if can? :create, Spree::StockLocation %>
 
 <% if @stock_locations.any? %>
diff --git a/app/views/spree/admin/stock_movements/index.html.erb b/app/views/spree/admin/stock_movements/index.html.erb
index 0148e11574..9e16a489bf 100644
--- a/app/views/spree/admin/stock_movements/index.html.erb
+++ b/app/views/spree/admin/stock_movements/index.html.erb
@@ -4,7 +4,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_movement), new_admin_stock_location_stock_movement_path(@stock_location), icon: 'add.svg', class: 'btn-success', id: 'admin_new_stock_movement_link' %>
+  <%= button_link_to Spree.t(:new_stock_movement), new_admin_stock_location_stock_movement_path(@stock_location), icon: 'add.svg', class: 'btn-primary', id: 'admin_new_stock_movement_link' %>
 <% end %>
 
 <% if @stock_movements.any? %>
diff --git a/app/views/spree/admin/stock_transfers/index.html.erb b/app/views/spree/admin/stock_transfers/index.html.erb
index 2483e28030..10e1c2f7d0 100644
--- a/app/views/spree/admin/stock_transfers/index.html.erb
+++ b/app/views/spree/admin/stock_transfers/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { icon: 'add.svg', class: 'btn-success' } %>
+  <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { icon: 'add.svg', class: 'btn-primary' } %>
 <% end if can? :create, Spree::StockTransfer %>
 
 <% content_for :table_filter do %>
diff --git a/app/views/spree/admin/stock_transfers/show.html.erb b/app/views/spree/admin/stock_transfers/show.html.erb
index 3241781ece..d07c8ee1c4 100644
--- a/app/views/spree/admin/stock_transfers/show.html.erb
+++ b/app/views/spree/admin/stock_transfers/show.html.erb
@@ -4,7 +4,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { icon: 'add', class: 'btn-success' } %>
+  <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { icon: 'add', class: 'btn-primary' } %>
 <% end if can? :create, Spree::StockTransfer %>
 
 <fieldset>
diff --git a/app/views/spree/admin/store_credit_categories/index.html.erb b/app/views/spree/admin/store_credit_categories/index.html.erb
index 3a2b139ac7..673c173dca 100644
--- a/app/views/spree/admin/store_credit_categories/index.html.erb
+++ b/app/views/spree/admin/store_credit_categories/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_store_credit_category), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_store_credit_category_link' %>
+  <%= button_link_to Spree.t(:new_store_credit_category), new_object_url, class: "btn-primary", icon: 'add.svg', id: 'admin_new_store_credit_category_link' %>
 <% end if can? :create, Spree::StoreCreditCategory %>
 
 <% if @store_credit_categories.any? %>
diff --git a/app/views/spree/admin/stores/edit.html.erb b/app/views/spree/admin/stores/edit.html.erb
index 218a7e5282..1cee48bab3 100644
--- a/app/views/spree/admin/stores/edit.html.erb
+++ b/app/views/spree/admin/stores/edit.html.erb
@@ -9,7 +9,7 @@
   <fieldset>
     <%= render partial: 'form', locals: { f: f } %>
     <div class="form-actions" data-hook="buttons">
-      <%= button Spree.t('actions.update'), 'save.svg', 'submit', {class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
+      <%= button Spree.t('actions.update'), 'save.svg', 'submit', {class: 'btn-primary', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
 
       <%= link_to_with_icon 'delete.svg', Spree.t(:delete), spree.admin_store_url(@store), { class: 'btn btn-danger float-right', data: { confirm: Spree.t(:are_you_sure), method: :delete } } if can?(:delete, @store) && @store.can_be_deleted? %>
     </div>
diff --git a/app/views/spree/admin/stores/index.html.erb b/app/views/spree/admin/stores/index.html.erb
index 4c3552e11b..0852b53ee6 100644
--- a/app/views/spree/admin/stores/index.html.erb
+++ b/app/views/spree/admin/stores/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:add_store), spree.new_admin_store_path(@user), class: "btn-success", icon: 'add.svg' if can?(:create, Spree::Store) %>
+  <%= button_link_to Spree.t(:add_store), spree.new_admin_store_path(@user), class: "btn-primary", icon: 'add.svg' if can?(:create, Spree::Store) %>
 <% end %>
 
 <% if @stores.any? %>
diff --git a/app/views/spree/admin/tax_categories/index.html.erb b/app/views/spree/admin/tax_categories/index.html.erb
index fbe56b3b64..9e392a0e74 100644
--- a/app/views/spree/admin/tax_categories/index.html.erb
+++ b/app/views/spree/admin/tax_categories/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_tax_category), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_tax_categories_link' %>
+  <%= button_link_to Spree.t(:new_tax_category), new_object_url, class: "btn-primary", icon: 'add.svg', id: 'admin_new_tax_categories_link' %>
 <% end if can? :create, Spree::TaxCategory %>
 
 <% if @tax_categories.any? %>
diff --git a/app/views/spree/admin/tax_rates/index.html.erb b/app/views/spree/admin/tax_rates/index.html.erb
index 15f2296212..5be7c33564 100644
--- a/app/views/spree/admin/tax_rates/index.html.erb
+++ b/app/views/spree/admin/tax_rates/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_tax_rate), new_object_url, class: "btn-success", icon: 'add.svg' %>
+  <%= button_link_to Spree.t(:new_tax_rate), new_object_url, class: "btn-primary", icon: 'add.svg' %>
 <% end if can? :create, Spree::TaxRate %>
 
 <% if @tax_rates.any? %>
diff --git a/app/views/spree/admin/taxonomies/_list.html.erb b/app/views/spree/admin/taxonomies/_list.html.erb
index 58457236b7..0f82011f06 100644
--- a/app/views/spree/admin/taxonomies/_list.html.erb
+++ b/app/views/spree/admin/taxonomies/_list.html.erb
@@ -11,7 +11,7 @@
       <% @taxonomies.each do |taxonomy| %>
         <tr id="<%= spree_dom_id taxonomy %>" data-hook="taxonomies_row">
           <td class="move-handle">
-            <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
+            <%= svg_icon name: "grip-vertical.svg", width: '14', height: '14' %>
           </td>
           <td><%= taxonomy.name %></td>
           <td class="actions">
diff --git a/app/views/spree/admin/taxonomies/edit.html.erb b/app/views/spree/admin/taxonomies/edit.html.erb
index afa41ff76d..4c1294ee29 100755
--- a/app/views/spree/admin/taxonomies/edit.html.erb
+++ b/app/views/spree/admin/taxonomies/edit.html.erb
@@ -13,7 +13,7 @@
               <%= button_link_to Spree.t('admin.taxonomies.edit_root_taxonomy', name: @taxonomy.root.name ), spree.edit_admin_taxonomy_taxon_path(@taxonomy, @taxonomy.root.id), icon: 'edit.svg', class: 'no-wrap btn-light align-self-center' %>
             </div>
             <div class="col d-flex my-1 justify-content-end">
-              <%= button_link_to Spree.t('admin.taxonomies.add_new_taxon'), spree.new_admin_taxonomy_taxon_path(@taxonomy.id), icon: 'add.svg', class: 'no-wrap btn btn-success align-self-center' %>
+              <%= button_link_to Spree.t('admin.taxonomies.add_new_taxon'), spree.new_admin_taxonomy_taxon_path(@taxonomy.id), icon: 'add.svg', class: 'no-wrap btn btn-primary align-self-center' %>
             </div>
           </div>
         </div>
diff --git a/app/views/spree/admin/taxonomies/index.html.erb b/app/views/spree/admin/taxonomies/index.html.erb
index 7945bab2ba..8270c22cae 100644
--- a/app/views/spree/admin/taxonomies/index.html.erb
+++ b/app/views/spree/admin/taxonomies/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_taxonomy), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_taxonomy_link' %>
+  <%= button_link_to Spree.t(:new_taxonomy), new_object_url, class: "btn-primary", icon: 'add.svg', id: 'admin_new_taxonomy_link' %>
 <% end if can?(:create, Spree::Taxonomy) %>
 
 <% if @taxonomies.any? %>
diff --git a/app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb b/app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb
index d7610e1100..03195e20c0 100644
--- a/app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb
+++ b/app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb
@@ -23,7 +23,7 @@
             </td>
             <td class="actions">
               <span class="d-flex justify-content-center">
-                <button class="btn btn-sm btn-success add_variant with-tip icon-add icon-link" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                <button class="btn btn-sm btn-primary add_variant with-tip icon-add icon-link" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
                    <%= svg_icon name: "add.svg", width: '16', height: '16' %>
                 </button>
               </span>
@@ -39,7 +39,7 @@
               </td>
               <td class="actions">
                 <span class="d-flex justify-content-center">
-                  <button class="btn btn-sm btn-success add_variant with-tip icon-add icon-link" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                  <button class="btn btn-sm btn-primary add_variant with-tip icon-add icon-link" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
                      <%= svg_icon name: "add.svg", width: '16', height: '16' %>
                   </button>
                 </span>
@@ -57,7 +57,7 @@
           </td>
           <td class="actions">
             <span class="d-flex justify-content-center">
-              <button class="btn btn-sm btn-success add_variant with-tip icon-add icon-link" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
+              <button class="btn btn-sm btn-primary add_variant with-tip icon-add icon-link" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
                 <%= svg_icon name: "add.svg", width: '16', height: '16' %>
               </button>
             </span>
diff --git a/app/views/spree/admin/variants/_autocomplete_stock.js.erb b/app/views/spree/admin/variants/_autocomplete_stock.js.erb
index 2d49e5a493..468cd8391d 100644
--- a/app/views/spree/admin/variants/_autocomplete_stock.js.erb
+++ b/app/views/spree/admin/variants/_autocomplete_stock.js.erb
@@ -19,7 +19,7 @@
             </td>
             <td class="actions">
               <span class="d-flex justify-content-center">
-                <button class="btn btn-sm btn-success add_variant with-tip" data-stock-location-id="{{this.stock_location.id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                <button class="btn btn-sm btn-primary add_variant with-tip" data-stock-location-id="{{this.stock_location.id}}" title="<%= Spree.t(:add) %>" data-action="add">
                   <%= svg_icon name: "add", width: '16', height: '16' %>
                 </button>
               </span>
@@ -35,7 +35,7 @@
               </td>
               <td class="actions">
                 <span class="d-flex justify-content-center">
-                  <button class="btn btn-sm btn-success add_variant with-tip icon-link" data-stock-location-id="{{this.stock_location.id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                  <button class="btn btn-sm btn-primary add_variant with-tip icon-link" data-stock-location-id="{{this.stock_location.id}}" title="<%= Spree.t(:add) %>" data-action="add">
                     <%= svg_icon name: "add.svg", width: '16', height: '16' %>
                   </button>
                 </span>
diff --git a/app/views/spree/admin/variants/_split.js.erb b/app/views/spree/admin/variants/_split.js.erb
index 3e7175297b..5ce12bf616 100644
--- a/app/views/spree/admin/variants/_split.js.erb
+++ b/app/views/spree/admin/variants/_split.js.erb
@@ -26,7 +26,7 @@
         <a href='#' class='cancel-split with-tip btn btn-sm btn-light' title='Cancel'>
           <%= svg_icon name: "cancel", classes: 'icon-cancel', width: '16', height: '16' %>
         </a>
-        <a href='#' class='icon-save-split save-split with-tip btn btn-sm btn-success' title='Save'>
+        <a href='#' class='icon-save-split save-split with-tip btn btn-sm btn-primary' title='Save'>
           <%= svg_icon name: "split", classes: 'icon-save', width: '16', height: '16' %>
         </a>
       </span>
diff --git a/app/views/spree/admin/variants/index.html.erb b/app/views/spree/admin/variants/index.html.erb
index e2b6cc3446..e0ccffda30 100644
--- a/app/views/spree/admin/variants/index.html.erb
+++ b/app/views/spree/admin/variants/index.html.erb
@@ -20,7 +20,7 @@
       <tr id="<%= spree_dom_id variant %>" <%= 'style="color:red;"' if variant.deleted? %> data-hook="variants_row">
         <td class="move-handle">
           <% if can? :edit, variant %>
-            <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
+            <%= svg_icon name: "grip-vertical.svg", width: '14', height: '14' %>
           <% end %>
         </td>
         <td><%= variant.sku %></td>
diff --git a/app/views/spree/admin/webhooks_subscribers/index.html.erb b/app/views/spree/admin/webhooks_subscribers/index.html.erb
index 4c44f8258f..404412d3d6 100644
--- a/app/views/spree/admin/webhooks_subscribers/index.html.erb
+++ b/app/views/spree/admin/webhooks_subscribers/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t('admin.webhooks_subscribers.new_webhooks_subscriber'), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_webhooks_subscriber_link' %>
+  <%= button_link_to Spree.t('admin.webhooks_subscribers.new_webhooks_subscriber'), new_object_url, class: "btn-primary", icon: 'add.svg', id: 'admin_new_webhooks_subscriber_link' %>
 <% end if can?(:create, Spree::Webhooks::Subscriber) %>
 
 <% if @webhooks_subscribers.any? %>
@@ -37,7 +37,7 @@
             <%= password_field_tag :password, webhooks_subscriber.secret_key, class: 'form-control unhide text-muted border-0 shadow-none bg-transparent', data: { password_toggle_target: 'unhide' }, readonly: true %>
             <div class="input-group-append">
               <%= button_tag class: 'btn btn-link rounded', data: { action: 'click->password-toggle#password' } do %>
-                <%= svg_icon name: "view.svg", width: '18', height: '18' %>
+                <%= svg_icon name: "view.svg", width: '14', height: '14' %>
               <% end %>
             </div>
           </div>
diff --git a/app/views/spree/admin/zones/index.html.erb b/app/views/spree/admin/zones/index.html.erb
index b8555ac7b6..aa490ce1dc 100644
--- a/app/views/spree/admin/zones/index.html.erb
+++ b/app/views/spree/admin/zones/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_zone), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_zone_link' %>
+  <%= button_link_to Spree.t(:new_zone), new_object_url, class: "btn-primary", icon: 'add.svg', id: 'admin_new_zone_link' %>
 <% end if can? :create, Spree::Zone %>
 
 <% if @zones.any? %>
diff --git a/app/views/spree/layouts/admin.html.erb b/app/views/spree/layouts/admin.html.erb
index b90283013b..e6fe1cdefd 100644
--- a/app/views/spree/layouts/admin.html.erb
+++ b/app/views/spree/layouts/admin.html.erb
@@ -23,7 +23,7 @@
         <%# Sidebar                                         %>
         <%#-------------------------------------------------%>
         <aside
-          class="col-12 col-lg-3 col-xl-2 sidebar position-fixed d-flex justify-content-between flex-column px-0"
+          class="col-12 col-lg-3 col-xl-2 sidebar position-fixed d-flex justify-content-between flex-column px-0 bg-light"
           id="main-sidebar"
           data-hook="admin_tabs">
           <%= render partial: 'spree/admin/shared/main_menu' %>
diff --git a/spec/features/admin/menus/new_menu_spec.rb b/spec/features/admin/menus/new_menu_spec.rb
index d1343f0f3e..a84e59174e 100644
--- a/spec/features/admin/menus/new_menu_spec.rb
+++ b/spec/features/admin/menus/new_menu_spec.rb
@@ -45,8 +45,6 @@
       expect(page).to have_text 'Main Menu has no items. Click the Add New Item button to begin adding links to this menu.'
       expect(page).to have_selector('a', text: Spree.t('admin.navigation.add_new_item'))
 
-      expect(page).not_to have_css('.translation_missing', visible: :all)
-
       # Tests that root name is in sync with menu name.
       fill_in 'Name', with: 'X14dP'
       click_on 'Update'
diff --git a/spec/features/admin/products/edit/properties_spec.rb b/spec/features/admin/products/edit/properties_spec.rb
index 9b83aa3a20..7a69bcfefd 100644
--- a/spec/features/admin/products/edit/properties_spec.rb
+++ b/spec/features/admin/products/edit/properties_spec.rb
@@ -20,7 +20,7 @@
 
       expect(page).to have_current_path(spree.admin_product_product_properties_path(product))
       expect(page).to have_content('Add Product Properties')
-      expect(page).to have_content('SHOW PROPERTY')
+      expect(page).to have_content('Show Property')
       expect(page).to have_selector("input[value='Material']")
       expect(page).to have_selector("input[value='Leather']")
       expect(page).to have_field('product_product_properties_attributes_0_show_property', checked: true)
diff --git a/spec/features/admin/products/variant_prices_spec.rb b/spec/features/admin/products/variant_prices_spec.rb
index 88acf5414b..8869caeef3 100644
--- a/spec/features/admin/products/variant_prices_spec.rb
+++ b/spec/features/admin/products/variant_prices_spec.rb
@@ -35,7 +35,7 @@
     it 'allows to save a compare to price for each currency' do
       visit spree.admin_product_path(product)
       click_link 'Prices'
-      expect(page).to have_content 'COMPARE AT PRICE'
+      expect(page).to have_content 'Compare at price'
 
       fill_in "vp_#{product.master.id}_USD_price", with: '29.95', fill_options: { clear: :backspace }
       fill_in "vp_#{product.master.id}_EUR_price", with: '21.94', fill_options: { clear: :backspace }
diff --git a/spec/models/spree/admin/actions/action_spec.rb b/spec/models/spree/admin/actions/action_spec.rb
index deedcb613a..23411e99cd 100644
--- a/spec/models/spree/admin/actions/action_spec.rb
+++ b/spec/models/spree/admin/actions/action_spec.rb
@@ -59,7 +59,7 @@ module Admin
         subject { action.classes }
 
         it 'returns style classes and additional classes' do
-          expect(subject).to eq('btn-success additional-class')
+          expect(subject).to eq('btn-primary additional-class')
         end
       end