diff --git a/changes/8588.bugfix b/changes/8588.bugfix
new file mode 100644
index 00000000000..75b9daea495
--- /dev/null
+++ b/changes/8588.bugfix
@@ -0,0 +1 @@
+Fix `check_access` order for resource create view
diff --git a/changes/8611.misc b/changes/8611.misc
new file mode 100644
index 00000000000..3c2ffd50001
--- /dev/null
+++ b/changes/8611.misc
@@ -0,0 +1 @@
+Renamed .btn-default to .btn-secondary due to Bootstrap conventions.
diff --git a/ckan/public-midnight-blue/base/css/main-rtl.css b/ckan/public-midnight-blue/base/css/main-rtl.css
index bfb36be659f..3697025cf0a 100644
--- a/ckan/public-midnight-blue/base/css/main-rtl.css
+++ b/ckan/public-midnight-blue/base/css/main-rtl.css
@@ -2080,22 +2080,22 @@ progress {
 }
 
 .col-form-label {
-  padding-top: calc(0.625rem + 1px);
-  padding-bottom: calc(0.625rem + 1px);
+  padding-top: calc(0.5rem + 2px);
+  padding-bottom: calc(0.5rem + 2px);
   margin-bottom: 0;
   font-size: inherit;
   line-height: 1.5;
 }
 
 .col-form-label-lg {
-  padding-top: calc(0.5rem + 1px);
-  padding-bottom: calc(0.5rem + 1px);
+  padding-top: calc(0.5rem + 2px);
+  padding-bottom: calc(0.5rem + 2px);
   font-size: 1.25rem;
 }
 
 .col-form-label-sm {
-  padding-top: calc(0.25rem + 1px);
-  padding-bottom: calc(0.25rem + 1px);
+  padding-top: calc(0.25rem + 2px);
+  padding-bottom: calc(0.25rem + 2px);
   font-size: 0.875rem;
 }
 
@@ -2108,7 +2108,7 @@ progress {
 .form-control {
   display: block;
   width: 100%;
-  padding: 0.625rem 1rem;
+  padding: 0.5rem 1rem;
   font-size: 1rem;
   font-weight: 400;
   line-height: 1.5;
@@ -2116,9 +2116,9 @@ progress {
   appearance: none;
   background-color: #fff;
   background-clip: padding-box;
-  border: 1px solid #98a2b3;
+  border: 2px solid #d0d5dd;
   border-radius: 0.375rem;
-  box-shadow: 0;
+  box-shadow: var(--bs-box-shadow-inset);
   transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
 }
 @media (prefers-reduced-motion: reduce) {
@@ -2135,9 +2135,9 @@ progress {
 .form-control:focus {
   color: #101828;
   background-color: #fff;
-  border-color: #8a98c2;
+  border-color: #153084;
   outline: 0;
-  box-shadow: 0, 0 0 0 0.25rem rgba(21, 48, 132, 0.25);
+  box-shadow: var(--bs-box-shadow-inset), 0 0 0 0.25rem rgba(21, 48, 132, 0.25);
 }
 .form-control::-webkit-date-and-time-value {
   min-width: 85px;
@@ -2149,16 +2149,17 @@ progress {
   padding: 0;
 }
 .form-control::placeholder {
-  color: #475467;
+  color: #667085;
   opacity: 1;
 }
 .form-control:disabled {
-  background-color: #e4e7ec;
+  background-color: #f2f4f7;
+  border-color: #d0d5dd;
   opacity: 1;
 }
 .form-control::file-selector-button {
-  padding: 0.625rem 1rem;
-  margin: -0.625rem -1rem;
+  padding: 0.5rem 1rem;
+  margin: -0.5rem -1rem;
   margin-inline-end: 1rem;
   color: #101828;
   background-color: #e4e7ec;
@@ -2166,7 +2167,7 @@ progress {
   border-color: inherit;
   border-style: solid;
   border-width: 0;
-  border-inline-end-width: 1px;
+  border-inline-end-width: 2px;
   border-radius: 0;
   transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
 }
@@ -2182,13 +2183,13 @@ progress {
 .form-control-plaintext {
   display: block;
   width: 100%;
-  padding: 0.625rem 0;
+  padding: 0.5rem 0;
   margin-bottom: 0;
   line-height: 1.5;
   color: #101828;
   background-color: transparent;
   border: solid transparent;
-  border-width: 1px 0;
+  border-width: 2px 0;
 }
 .form-control-plaintext:focus {
   outline: 0;
@@ -2199,7 +2200,7 @@ progress {
 }
 
 .form-control-sm {
-  min-height: calc(1.5em + 0.5rem + 2px);
+  min-height: calc(1.5em + 0.5rem + 4px);
   padding: 0.25rem 0.5rem;
   font-size: 0.875rem;
   border-radius: 0.25rem;
@@ -2211,7 +2212,7 @@ progress {
 }
 
 .form-control-lg {
-  min-height: calc(1.5em + 1rem + 2px);
+  min-height: calc(1.5em + 1rem + 4px);
   padding: 0.5rem 1rem;
   font-size: 1.25rem;
   border-radius: 0.3rem;
@@ -2223,19 +2224,19 @@ progress {
 }
 
 textarea.form-control {
-  min-height: calc(1.5em + 1.25rem + 2px);
+  min-height: calc(1.5em + 1rem + 4px);
 }
 textarea.form-control-sm {
-  min-height: calc(1.5em + 0.5rem + 2px);
+  min-height: calc(1.5em + 0.5rem + 4px);
 }
 textarea.form-control-lg {
-  min-height: calc(1.5em + 1rem + 2px);
+  min-height: calc(1.5em + 1rem + 4px);
 }
 
 .form-control-color {
   width: 3rem;
-  height: calc(1.5em + 1.25rem + 2px);
-  padding: 0.625rem;
+  height: calc(1.5em + 1rem + 4px);
+  padding: 0.5rem;
 }
 .form-control-color:not(:disabled):not([readonly]) {
   cursor: pointer;
@@ -2249,17 +2250,17 @@ textarea.form-control-lg {
   border-radius: 0.375rem;
 }
 .form-control-color.form-control-sm {
-  height: calc(1.5em + 0.5rem + 2px);
+  height: calc(1.5em + 0.5rem + 4px);
 }
 .form-control-color.form-control-lg {
-  height: calc(1.5em + 1rem + 2px);
+  height: calc(1.5em + 1rem + 4px);
 }
 
 .form-select {
   --bs-form-select-bg-img: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%231d2939' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e");
   display: block;
   width: 100%;
-  padding: 0.625rem 3rem 0.625rem 1rem;
+  padding: 0.5rem 3rem 0.5rem 1rem;
   font-size: 1rem;
   font-weight: 400;
   line-height: 1.5;
@@ -2270,7 +2271,7 @@ textarea.form-control-lg {
   background-repeat: no-repeat;
   background-position: right 1rem center;
   background-size: 16px 12px;
-  border: 1px solid #98a2b3;
+  border: 2px solid #d0d5dd;
   border-radius: 0.375rem;
   box-shadow: 0;
   transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
@@ -2281,7 +2282,7 @@ textarea.form-control-lg {
   }
 }
 .form-select:focus {
-  border-color: #8a98c2;
+  border-color: #153084;
   outline: 0;
   box-shadow: 0, 0 0 0 0.25rem rgba(21, 48, 132, 0.25);
 }
@@ -2291,6 +2292,7 @@ textarea.form-control-lg {
 }
 .form-select:disabled {
   background-color: #e4e7ec;
+  border-color: #d0d5dd;
 }
 .form-select:-moz-focusring {
   color: transparent;
@@ -2365,7 +2367,7 @@ textarea.form-control-lg {
   filter: brightness(90%);
 }
 .form-check-input:focus {
-  border-color: #8a98c2;
+  border-color: #153084;
   outline: 0;
   box-shadow: 0 0 0 0.25rem rgba(21, 48, 132, 0.25);
 }
@@ -2412,7 +2414,7 @@ textarea.form-control-lg {
   }
 }
 .form-switch .form-check-input:focus {
-  --bs-form-switch-bg: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%238a98c2'/%3e%3c/svg%3e");
+  --bs-form-switch-bg: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23153084'/%3e%3c/svg%3e");
 }
 .form-switch .form-check-input:checked {
   background-position: right center;
@@ -2458,10 +2460,10 @@ textarea.form-control-lg {
   outline: 0;
 }
 .form-range:focus::-webkit-slider-thumb {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 0.25rem rgba(21, 48, 132, 0.25);
+  box-shadow: 0 0 0 1px #fff;
 }
 .form-range:focus::-moz-range-thumb {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 0.25rem rgba(21, 48, 132, 0.25);
+  box-shadow: 0 0 0 1px #fff;
 }
 .form-range::-moz-focus-outer {
   border: 0;
@@ -2539,8 +2541,8 @@ textarea.form-control-lg {
 .form-floating > .form-control,
 .form-floating > .form-control-plaintext,
 .form-floating > .form-select {
-  height: calc(3.5rem + 2px);
-  min-height: calc(3.5rem + 2px);
+  height: calc(3.5rem + 4px);
+  min-height: calc(3.5rem + 4px);
   line-height: 1.25;
 }
 .form-floating > label {
@@ -2555,7 +2557,7 @@ textarea.form-control-lg {
   text-overflow: ellipsis;
   white-space: nowrap;
   pointer-events: none;
-  border: 1px solid transparent;
+  border: 2px solid transparent;
   transform-origin: 0 0;
   transition: opacity 0.1s ease-in-out, transform 0.1s ease-in-out;
 }
@@ -2611,7 +2613,7 @@ textarea.form-control-lg {
   transform: scale(0.85) translateY(-0.5rem) translateX(0.15rem);
 }
 .form-floating > .form-control-plaintext ~ label {
-  border-width: 1px 0;
+  border-width: 2px 0;
 }
 .form-floating > :disabled ~ label,
 .form-floating > .form-control:disabled ~ label {
@@ -2619,7 +2621,7 @@ textarea.form-control-lg {
 }
 .form-floating > :disabled ~ label::after,
 .form-floating > .form-control:disabled ~ label::after {
-  background-color: #e4e7ec;
+  background-color: #f2f4f7;
 }
 
 .input-group {
@@ -2653,7 +2655,7 @@ textarea.form-control-lg {
 .input-group-text {
   display: flex;
   align-items: center;
-  padding: 0.625rem 1rem;
+  padding: 0.5rem 1rem;
   font-size: 1rem;
   font-weight: 400;
   line-height: 1.5;
@@ -2661,7 +2663,7 @@ textarea.form-control-lg {
   text-align: center;
   white-space: nowrap;
   background-color: #e4e7ec;
-  border: 1px solid #98a2b3;
+  border: 2px solid #d0d5dd;
   border-radius: 0.375rem;
 }
 
@@ -2703,7 +2705,7 @@ textarea.form-control-lg {
   border-bottom-right-radius: 0;
 }
 .input-group > :not(:first-child):not(.dropdown-menu):not(.valid-tooltip):not(.valid-feedback):not(.invalid-tooltip):not(.invalid-feedback) {
-  margin-left: calc(1px * -1);
+  margin-left: calc(2px * -1);
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
 }
@@ -2744,20 +2746,20 @@ textarea.form-control-lg {
 
 .was-validated .form-control:valid, .form-control.is-valid {
   border-color: #3A833A;
-  padding-right: calc(1.5em + 1.25rem);
+  padding-right: calc(1.5em + 1rem);
   background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%233A833A' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
   background-repeat: no-repeat;
-  background-position: right calc(0.375em + 0.3125rem) center;
-  background-size: calc(0.75em + 0.625rem) calc(0.75em + 0.625rem);
+  background-position: right calc(0.375em + 0.25rem) center;
+  background-size: calc(0.75em + 0.5rem) calc(0.75em + 0.5rem);
 }
 .was-validated .form-control:valid:focus, .form-control.is-valid:focus {
   border-color: #3A833A;
-  box-shadow: 0, 0 0 0 0.25rem rgba(58, 131, 58, 0.25);
+  box-shadow: var(--bs-box-shadow-inset), 0 0 0 0.25rem rgba(58, 131, 58, 0.25);
 }
 
 .was-validated textarea.form-control:valid, textarea.form-control.is-valid {
-  padding-right: calc(1.5em + 1.25rem);
-  background-position: top calc(0.375em + 0.3125rem) right calc(0.375em + 0.3125rem);
+  padding-right: calc(1.5em + 1rem);
+  background-position: top calc(0.375em + 0.25rem) right calc(0.375em + 0.25rem);
 }
 
 .was-validated .form-select:valid, .form-select.is-valid {
@@ -2767,7 +2769,7 @@ textarea.form-control-lg {
   --bs-form-select-bg-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%233A833A' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
   padding-right: 5.5rem;
   background-position: right 1rem center, center right 3rem;
-  background-size: 16px 12px, calc(0.75em + 0.625rem) calc(0.75em + 0.625rem);
+  background-size: 16px 12px, calc(0.75em + 0.5rem) calc(0.75em + 0.5rem);
 }
 .was-validated .form-select:valid:focus, .form-select.is-valid:focus {
   border-color: #3A833A;
@@ -2775,7 +2777,7 @@ textarea.form-control-lg {
 }
 
 .was-validated .form-control-color:valid, .form-control-color.is-valid {
-  width: calc(3rem + calc(1.5em + 1.25rem));
+  width: calc(3rem + calc(1.5em + 1rem));
 }
 
 .was-validated .form-check-input:valid, .form-check-input.is-valid {
@@ -2834,20 +2836,20 @@ textarea.form-control-lg {
 
 .was-validated .form-control:invalid, .form-control.is-invalid {
   border-color: #d43f3a;
-  padding-right: calc(1.5em + 1.25rem);
+  padding-right: calc(1.5em + 1rem);
   background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' width='12' height='12' fill='none' stroke='%23d43f3a'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23d43f3a' stroke='none'/%3e%3c/svg%3e");
   background-repeat: no-repeat;
-  background-position: right calc(0.375em + 0.3125rem) center;
-  background-size: calc(0.75em + 0.625rem) calc(0.75em + 0.625rem);
+  background-position: right calc(0.375em + 0.25rem) center;
+  background-size: calc(0.75em + 0.5rem) calc(0.75em + 0.5rem);
 }
 .was-validated .form-control:invalid:focus, .form-control.is-invalid:focus {
   border-color: #d43f3a;
-  box-shadow: 0, 0 0 0 0.25rem rgba(212, 63, 58, 0.25);
+  box-shadow: var(--bs-box-shadow-inset), 0 0 0 0.25rem rgba(212, 63, 58, 0.25);
 }
 
 .was-validated textarea.form-control:invalid, textarea.form-control.is-invalid {
-  padding-right: calc(1.5em + 1.25rem);
-  background-position: top calc(0.375em + 0.3125rem) right calc(0.375em + 0.3125rem);
+  padding-right: calc(1.5em + 1rem);
+  background-position: top calc(0.375em + 0.25rem) right calc(0.375em + 0.25rem);
 }
 
 .was-validated .form-select:invalid, .form-select.is-invalid {
@@ -2857,7 +2859,7 @@ textarea.form-control-lg {
   --bs-form-select-bg-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' width='12' height='12' fill='none' stroke='%23d43f3a'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23d43f3a' stroke='none'/%3e%3c/svg%3e");
   padding-right: 5.5rem;
   background-position: right 1rem center, center right 3rem;
-  background-size: 16px 12px, calc(0.75em + 0.625rem) calc(0.75em + 0.625rem);
+  background-size: 16px 12px, calc(0.75em + 0.5rem) calc(0.75em + 0.5rem);
 }
 .was-validated .form-select:invalid:focus, .form-select.is-invalid:focus {
   border-color: #d43f3a;
@@ -2865,7 +2867,7 @@ textarea.form-control-lg {
 }
 
 .was-validated .form-control-color:invalid, .form-control-color.is-invalid {
-  width: calc(3rem + calc(1.5em + 1.25rem));
+  width: calc(3rem + calc(1.5em + 1rem));
 }
 
 .was-validated .form-check-input:invalid, .form-check-input.is-invalid {
@@ -3077,7 +3079,7 @@ textarea.form-control-lg {
   --bs-btn-disabled-border-color: #d43f3a;
 }
 
-.btn-light, .btn-default {
+.btn-light, .btn-secondary {
   --bs-btn-color: #000;
   --bs-btn-bg: #fff;
   --bs-btn-border-color: #fff;
@@ -11843,10 +11845,10 @@ h6, .h6, h5, .h5, h4, .h4, h3, .h3, h2, .h2, h1, .h1 {
   font-weight: 600;
 }
 
-.btn-light, .btn-default {
+.btn-light, .btn-secondary {
   border: #d0d5dd solid 1px;
 }
-.btn-light:hover, .btn-default:hover {
+.btn-light:hover, .btn-secondary:hover {
   background-color: #d0d5dd !important;
   border-color: #d0d5dd;
 }
@@ -11920,7 +11922,7 @@ a.tag:hover {
   display: block;
 }
 
-.box, .wrapper {
+.box {
   background-color: #fff;
   border: 1px solid #ccc;
   border-radius: 4px;
@@ -13553,9 +13555,7 @@ td.diff_header {
 }
 
 .search-form {
-  margin-bottom: 20px;
   padding-bottom: 25px;
-  border-bottom: 1px dotted #ddd;
 }
 .search-form .search-input {
   position: relative;
@@ -13571,7 +13571,7 @@ td.diff_header {
   display: block;
   position: absolute;
   top: 50%;
-  margin-top: -10px;
+  margin-top: -12px;
   right: 10px;
   height: 20px;
   padding: 0;
@@ -13605,6 +13605,27 @@ td.diff_header {
   font-size: 28px;
   width: 28px;
 }
+.search-form .control-order-by {
+  width: 100%;
+  border-radius: 6px;
+  margin-bottom: 10px;
+  padding: 0 5px 5px;
+  background-color: #fff;
+}
+.search-form .control-order-by label {
+  font-size: 12px;
+  font-weight: 500;
+  color: #667085;
+  padding-left: 8px;
+}
+@media (min-width: 768px) {
+  .search-form .control-order-by {
+    float: right;
+    margin-left: 15px;
+    min-width: 200px;
+    max-width: min-content;
+  }
+}
 .search-form .control-order-by label,
 .search-form .control-order-by select {
   display: inline;
@@ -13612,6 +13633,21 @@ td.diff_header {
 .search-form .control-order-by .form-control {
   width: auto;
 }
+@media (max-width: 767.98px) {
+  .search-form .control-order-by .form-control {
+    width: 100%;
+  }
+}
+.search-form .control-order-by .form-select {
+  border: unset;
+  padding: 2px 3rem 0.5rem 0.5rem;
+  font-weight: 500;
+  background-position: right 1rem top;
+  background-size: 16px 16px;
+}
+.search-form .control-order-by:focus-within {
+  box-shadow: 0 0 0 0.25rem rgba(21, 48, 132, 0.25);
+}
 .search-form .filter-list {
   color: #444;
   line-height: 32px;
@@ -13633,14 +13669,26 @@ td.diff_header {
 .search-form .search-input-group {
   margin-bottom: 1.5rem;
 }
-
-@media (min-width: 768px) {
-  .search-form .control-order-by {
-    float: right;
-    margin-left: 15px;
-    width: auto;
-  }
+.search-form .search-input-group input {
+  padding-right: 45px;
 }
+.search-form .search-input-group button {
+  border: 0;
+  border-radius: 0 3px 3px 0;
+  color: #2f4b91;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 1rem;
+  line-height: 1.56;
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  top: 2px;
+  height: 92%;
+  cursor: pointer;
+}
+
 .group .media-vertical .image {
   margin: 0 -5px 5px;
 }
@@ -13792,9 +13840,10 @@ td.diff_header {
   background-color: #fff;
   border-bottom-color: transparent;
 }
-.page-header .content_action {
+
+.content_action .btn {
   float: right;
-  margin-top: -3px;
+  margin-bottom: 1rem;
 }
 
 .no-nav .page-header {
@@ -13844,36 +13893,6 @@ td.diff_header {
   white-space: nowrap;
 }
 
-.wrapper {
-  position: relative;
-  min-height: 300px;
-  background-color: #fff;
-}
-.wrapper::after {
-  display: block;
-  clear: both;
-  content: "";
-}
-@media (min-width: 768px) {
-  .wrapper:before {
-    content: "";
-    display: block;
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    width: 25%;
-    border-right: 1px solid #ddd;
-    z-index: 1;
-  }
-  .wrapper.no-nav:before {
-    display: none;
-  }
-  .wrapper.no-nav .module > .page-header {
-    margin-top: 0;
-  }
-}
-
 [role=main],
 .main {
   position: relative;
@@ -13881,7 +13900,7 @@ td.diff_header {
 
 .main {
   padding: 20px 0;
-  background: #eee url("../../../base/images/bg.png");
+  background-color: #fff;
 }
 
 .main:after,
@@ -13891,15 +13910,15 @@ td.diff_header {
 }
 
 .main .primary {
+  border-radius: 20px;
+  background-color: #f2f4f7;
   position: relative;
   float: right;
   margin-left: 0;
 }
 
 .main .secondary {
-  padding: 0;
   z-index: 1;
-  padding-right: 1px;
 }
 
 /* Filters modal */
@@ -13917,27 +13936,12 @@ td.diff_header {
 }
 
 @media (max-width: 767.98px) {
-  .wrapper {
-    border-width: 0;
-    box-shadow: 0;
-    border-radius: 0;
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: flex;
-    -webkit-box-orient: vertical;
-    -moz-box-orient: vertical;
-    -webkit-flex-direction: column-reverse;
-    flex-direction: column-reverse;
-    -webkit-box-align: start;
-    -moz-box-align: start;
-    -webkit-align-items: flex-start;
-    align-items: flex-start;
-  }
   .main .secondary {
     -webkit-box-ordinal-group: 2;
     -moz-box-ordinal-group: 2;
     -webkit-order: 2;
     order: 2;
+    margin-top: 1rem;
   }
   .js .main .secondary .filters {
     display: none;
@@ -13994,11 +13998,6 @@ td.diff_header {
   margin-top: 0;
 }
 
-@media (min-width: 576px) {
-  .hero {
-    background: url("../../../base/images/background-tile.png");
-  }
-}
 .hero:after {
   background-color: rgba(0, 0, 0, 0.09);
   background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0));
@@ -14654,7 +14653,8 @@ td.diff_header {
   margin-bottom: 20px;
 }
 
-.input-group .form-control {
+.input-group .form-control,
+.input-group > .form-control:focus {
   z-index: 0;
 }
 
@@ -14662,6 +14662,21 @@ td.diff_header {
   z-index: 0;
 }
 
+.input-group:not(.has-validation) > :not(:last-child):not(.dropdown-toggle):not(.dropdown-menu):not(.form-floating),
+.input-group:not(.has-validation) > .dropdown-toggle:nth-last-child(n+3),
+.input-group:not(.has-validation) > .form-floating:not(:last-child) > .form-control,
+.input-group:not(.has-validation) > .form-floating:not(:last-child) > .form-select {
+  border-top-right-radius: 0.3rem;
+  border-bottom-right-radius: 0.3rem;
+}
+.input-group.has-validation > :nth-last-child(n+3):not(.dropdown-toggle):not(.dropdown-menu):not(.form-floating),
+.input-group.has-validation > .dropdown-toggle:nth-last-child(n+4),
+.input-group.has-validation > .form-floating:nth-last-child(n+3) > .form-control,
+.input-group.has-validation > .form-floating:nth-last-child(n+3) > .form-select {
+  border-top-right-radius: 0.3rem;
+  border-bottom-right-radius: 0.3rem;
+}
+
 .format-label {
   text-indent: -900em;
   background: url("../../../base/images/sprite-resource-icons.png") no-repeat 0 0;
@@ -14913,7 +14928,7 @@ td.diff_header {
   }
 }
 @media (max-width: 767.98px) {
-  .login-main .btn-light, .login-main .btn-default {
+  .login-main .btn-light, .login-main .btn-secondary {
     width: 100%;
     display: block !important;
   }
diff --git a/ckan/public-midnight-blue/base/css/main.css b/ckan/public-midnight-blue/base/css/main.css
index bf01a0feaba..d072987a0ac 100644
--- a/ckan/public-midnight-blue/base/css/main.css
+++ b/ckan/public-midnight-blue/base/css/main.css
@@ -2080,22 +2080,22 @@ progress {
 }
 
 .col-form-label {
-  padding-top: calc(0.625rem + 1px);
-  padding-bottom: calc(0.625rem + 1px);
+  padding-top: calc(0.5rem + 2px);
+  padding-bottom: calc(0.5rem + 2px);
   margin-bottom: 0;
   font-size: inherit;
   line-height: 1.5;
 }
 
 .col-form-label-lg {
-  padding-top: calc(0.5rem + 1px);
-  padding-bottom: calc(0.5rem + 1px);
+  padding-top: calc(0.5rem + 2px);
+  padding-bottom: calc(0.5rem + 2px);
   font-size: 1.25rem;
 }
 
 .col-form-label-sm {
-  padding-top: calc(0.25rem + 1px);
-  padding-bottom: calc(0.25rem + 1px);
+  padding-top: calc(0.25rem + 2px);
+  padding-bottom: calc(0.25rem + 2px);
   font-size: 0.875rem;
 }
 
@@ -2108,7 +2108,7 @@ progress {
 .form-control {
   display: block;
   width: 100%;
-  padding: 0.625rem 1rem;
+  padding: 0.5rem 1rem;
   font-size: 1rem;
   font-weight: 400;
   line-height: 1.5;
@@ -2116,9 +2116,9 @@ progress {
   appearance: none;
   background-color: #fff;
   background-clip: padding-box;
-  border: 1px solid #98a2b3;
+  border: 2px solid #d0d5dd;
   border-radius: 0.375rem;
-  box-shadow: 0;
+  box-shadow: var(--bs-box-shadow-inset);
   transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
 }
 @media (prefers-reduced-motion: reduce) {
@@ -2135,9 +2135,9 @@ progress {
 .form-control:focus {
   color: #101828;
   background-color: #fff;
-  border-color: #8a98c2;
+  border-color: #153084;
   outline: 0;
-  box-shadow: 0, 0 0 0 0.25rem rgba(21, 48, 132, 0.25);
+  box-shadow: var(--bs-box-shadow-inset), 0 0 0 0.25rem rgba(21, 48, 132, 0.25);
 }
 .form-control::-webkit-date-and-time-value {
   min-width: 85px;
@@ -2149,16 +2149,17 @@ progress {
   padding: 0;
 }
 .form-control::placeholder {
-  color: #475467;
+  color: #667085;
   opacity: 1;
 }
 .form-control:disabled {
-  background-color: #e4e7ec;
+  background-color: #f2f4f7;
+  border-color: #d0d5dd;
   opacity: 1;
 }
 .form-control::file-selector-button {
-  padding: 0.625rem 1rem;
-  margin: -0.625rem -1rem;
+  padding: 0.5rem 1rem;
+  margin: -0.5rem -1rem;
   margin-inline-end: 1rem;
   color: #101828;
   background-color: #e4e7ec;
@@ -2166,7 +2167,7 @@ progress {
   border-color: inherit;
   border-style: solid;
   border-width: 0;
-  border-inline-end-width: 1px;
+  border-inline-end-width: 2px;
   border-radius: 0;
   transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
 }
@@ -2182,13 +2183,13 @@ progress {
 .form-control-plaintext {
   display: block;
   width: 100%;
-  padding: 0.625rem 0;
+  padding: 0.5rem 0;
   margin-bottom: 0;
   line-height: 1.5;
   color: #101828;
   background-color: transparent;
   border: solid transparent;
-  border-width: 1px 0;
+  border-width: 2px 0;
 }
 .form-control-plaintext:focus {
   outline: 0;
@@ -2199,7 +2200,7 @@ progress {
 }
 
 .form-control-sm {
-  min-height: calc(1.5em + 0.5rem + 2px);
+  min-height: calc(1.5em + 0.5rem + 4px);
   padding: 0.25rem 0.5rem;
   font-size: 0.875rem;
   border-radius: 0.25rem;
@@ -2211,7 +2212,7 @@ progress {
 }
 
 .form-control-lg {
-  min-height: calc(1.5em + 1rem + 2px);
+  min-height: calc(1.5em + 1rem + 4px);
   padding: 0.5rem 1rem;
   font-size: 1.25rem;
   border-radius: 0.3rem;
@@ -2223,19 +2224,19 @@ progress {
 }
 
 textarea.form-control {
-  min-height: calc(1.5em + 1.25rem + 2px);
+  min-height: calc(1.5em + 1rem + 4px);
 }
 textarea.form-control-sm {
-  min-height: calc(1.5em + 0.5rem + 2px);
+  min-height: calc(1.5em + 0.5rem + 4px);
 }
 textarea.form-control-lg {
-  min-height: calc(1.5em + 1rem + 2px);
+  min-height: calc(1.5em + 1rem + 4px);
 }
 
 .form-control-color {
   width: 3rem;
-  height: calc(1.5em + 1.25rem + 2px);
-  padding: 0.625rem;
+  height: calc(1.5em + 1rem + 4px);
+  padding: 0.5rem;
 }
 .form-control-color:not(:disabled):not([readonly]) {
   cursor: pointer;
@@ -2249,17 +2250,17 @@ textarea.form-control-lg {
   border-radius: 0.375rem;
 }
 .form-control-color.form-control-sm {
-  height: calc(1.5em + 0.5rem + 2px);
+  height: calc(1.5em + 0.5rem + 4px);
 }
 .form-control-color.form-control-lg {
-  height: calc(1.5em + 1rem + 2px);
+  height: calc(1.5em + 1rem + 4px);
 }
 
 .form-select {
   --bs-form-select-bg-img: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%231d2939' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e");
   display: block;
   width: 100%;
-  padding: 0.625rem 3rem 0.625rem 1rem;
+  padding: 0.5rem 3rem 0.5rem 1rem;
   font-size: 1rem;
   font-weight: 400;
   line-height: 1.5;
@@ -2270,7 +2271,7 @@ textarea.form-control-lg {
   background-repeat: no-repeat;
   background-position: right 1rem center;
   background-size: 16px 12px;
-  border: 1px solid #98a2b3;
+  border: 2px solid #d0d5dd;
   border-radius: 0.375rem;
   box-shadow: 0;
   transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
@@ -2281,7 +2282,7 @@ textarea.form-control-lg {
   }
 }
 .form-select:focus {
-  border-color: #8a98c2;
+  border-color: #153084;
   outline: 0;
   box-shadow: 0, 0 0 0 0.25rem rgba(21, 48, 132, 0.25);
 }
@@ -2291,6 +2292,7 @@ textarea.form-control-lg {
 }
 .form-select:disabled {
   background-color: #e4e7ec;
+  border-color: #d0d5dd;
 }
 .form-select:-moz-focusring {
   color: transparent;
@@ -2365,7 +2367,7 @@ textarea.form-control-lg {
   filter: brightness(90%);
 }
 .form-check-input:focus {
-  border-color: #8a98c2;
+  border-color: #153084;
   outline: 0;
   box-shadow: 0 0 0 0.25rem rgba(21, 48, 132, 0.25);
 }
@@ -2412,7 +2414,7 @@ textarea.form-control-lg {
   }
 }
 .form-switch .form-check-input:focus {
-  --bs-form-switch-bg: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%238a98c2'/%3e%3c/svg%3e");
+  --bs-form-switch-bg: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23153084'/%3e%3c/svg%3e");
 }
 .form-switch .form-check-input:checked {
   background-position: right center;
@@ -2458,10 +2460,10 @@ textarea.form-control-lg {
   outline: 0;
 }
 .form-range:focus::-webkit-slider-thumb {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 0.25rem rgba(21, 48, 132, 0.25);
+  box-shadow: 0 0 0 1px #fff;
 }
 .form-range:focus::-moz-range-thumb {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 0.25rem rgba(21, 48, 132, 0.25);
+  box-shadow: 0 0 0 1px #fff;
 }
 .form-range::-moz-focus-outer {
   border: 0;
@@ -2539,8 +2541,8 @@ textarea.form-control-lg {
 .form-floating > .form-control,
 .form-floating > .form-control-plaintext,
 .form-floating > .form-select {
-  height: calc(3.5rem + 2px);
-  min-height: calc(3.5rem + 2px);
+  height: calc(3.5rem + 4px);
+  min-height: calc(3.5rem + 4px);
   line-height: 1.25;
 }
 .form-floating > label {
@@ -2555,7 +2557,7 @@ textarea.form-control-lg {
   text-overflow: ellipsis;
   white-space: nowrap;
   pointer-events: none;
-  border: 1px solid transparent;
+  border: 2px solid transparent;
   transform-origin: 0 0;
   transition: opacity 0.1s ease-in-out, transform 0.1s ease-in-out;
 }
@@ -2611,7 +2613,7 @@ textarea.form-control-lg {
   transform: scale(0.85) translateY(-0.5rem) translateX(0.15rem);
 }
 .form-floating > .form-control-plaintext ~ label {
-  border-width: 1px 0;
+  border-width: 2px 0;
 }
 .form-floating > :disabled ~ label,
 .form-floating > .form-control:disabled ~ label {
@@ -2619,7 +2621,7 @@ textarea.form-control-lg {
 }
 .form-floating > :disabled ~ label::after,
 .form-floating > .form-control:disabled ~ label::after {
-  background-color: #e4e7ec;
+  background-color: #f2f4f7;
 }
 
 .input-group {
@@ -2653,7 +2655,7 @@ textarea.form-control-lg {
 .input-group-text {
   display: flex;
   align-items: center;
-  padding: 0.625rem 1rem;
+  padding: 0.5rem 1rem;
   font-size: 1rem;
   font-weight: 400;
   line-height: 1.5;
@@ -2661,7 +2663,7 @@ textarea.form-control-lg {
   text-align: center;
   white-space: nowrap;
   background-color: #e4e7ec;
-  border: 1px solid #98a2b3;
+  border: 2px solid #d0d5dd;
   border-radius: 0.375rem;
 }
 
@@ -2703,7 +2705,7 @@ textarea.form-control-lg {
   border-bottom-right-radius: 0;
 }
 .input-group > :not(:first-child):not(.dropdown-menu):not(.valid-tooltip):not(.valid-feedback):not(.invalid-tooltip):not(.invalid-feedback) {
-  margin-left: calc(1px * -1);
+  margin-left: calc(2px * -1);
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
 }
@@ -2744,20 +2746,20 @@ textarea.form-control-lg {
 
 .was-validated .form-control:valid, .form-control.is-valid {
   border-color: #3A833A;
-  padding-right: calc(1.5em + 1.25rem);
+  padding-right: calc(1.5em + 1rem);
   background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%233A833A' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
   background-repeat: no-repeat;
-  background-position: right calc(0.375em + 0.3125rem) center;
-  background-size: calc(0.75em + 0.625rem) calc(0.75em + 0.625rem);
+  background-position: right calc(0.375em + 0.25rem) center;
+  background-size: calc(0.75em + 0.5rem) calc(0.75em + 0.5rem);
 }
 .was-validated .form-control:valid:focus, .form-control.is-valid:focus {
   border-color: #3A833A;
-  box-shadow: 0, 0 0 0 0.25rem rgba(58, 131, 58, 0.25);
+  box-shadow: var(--bs-box-shadow-inset), 0 0 0 0.25rem rgba(58, 131, 58, 0.25);
 }
 
 .was-validated textarea.form-control:valid, textarea.form-control.is-valid {
-  padding-right: calc(1.5em + 1.25rem);
-  background-position: top calc(0.375em + 0.3125rem) right calc(0.375em + 0.3125rem);
+  padding-right: calc(1.5em + 1rem);
+  background-position: top calc(0.375em + 0.25rem) right calc(0.375em + 0.25rem);
 }
 
 .was-validated .form-select:valid, .form-select.is-valid {
@@ -2767,7 +2769,7 @@ textarea.form-control-lg {
   --bs-form-select-bg-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%233A833A' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
   padding-right: 5.5rem;
   background-position: right 1rem center, center right 3rem;
-  background-size: 16px 12px, calc(0.75em + 0.625rem) calc(0.75em + 0.625rem);
+  background-size: 16px 12px, calc(0.75em + 0.5rem) calc(0.75em + 0.5rem);
 }
 .was-validated .form-select:valid:focus, .form-select.is-valid:focus {
   border-color: #3A833A;
@@ -2775,7 +2777,7 @@ textarea.form-control-lg {
 }
 
 .was-validated .form-control-color:valid, .form-control-color.is-valid {
-  width: calc(3rem + calc(1.5em + 1.25rem));
+  width: calc(3rem + calc(1.5em + 1rem));
 }
 
 .was-validated .form-check-input:valid, .form-check-input.is-valid {
@@ -2834,20 +2836,20 @@ textarea.form-control-lg {
 
 .was-validated .form-control:invalid, .form-control.is-invalid {
   border-color: #d43f3a;
-  padding-right: calc(1.5em + 1.25rem);
+  padding-right: calc(1.5em + 1rem);
   background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' width='12' height='12' fill='none' stroke='%23d43f3a'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23d43f3a' stroke='none'/%3e%3c/svg%3e");
   background-repeat: no-repeat;
-  background-position: right calc(0.375em + 0.3125rem) center;
-  background-size: calc(0.75em + 0.625rem) calc(0.75em + 0.625rem);
+  background-position: right calc(0.375em + 0.25rem) center;
+  background-size: calc(0.75em + 0.5rem) calc(0.75em + 0.5rem);
 }
 .was-validated .form-control:invalid:focus, .form-control.is-invalid:focus {
   border-color: #d43f3a;
-  box-shadow: 0, 0 0 0 0.25rem rgba(212, 63, 58, 0.25);
+  box-shadow: var(--bs-box-shadow-inset), 0 0 0 0.25rem rgba(212, 63, 58, 0.25);
 }
 
 .was-validated textarea.form-control:invalid, textarea.form-control.is-invalid {
-  padding-right: calc(1.5em + 1.25rem);
-  background-position: top calc(0.375em + 0.3125rem) right calc(0.375em + 0.3125rem);
+  padding-right: calc(1.5em + 1rem);
+  background-position: top calc(0.375em + 0.25rem) right calc(0.375em + 0.25rem);
 }
 
 .was-validated .form-select:invalid, .form-select.is-invalid {
@@ -2857,7 +2859,7 @@ textarea.form-control-lg {
   --bs-form-select-bg-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' width='12' height='12' fill='none' stroke='%23d43f3a'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23d43f3a' stroke='none'/%3e%3c/svg%3e");
   padding-right: 5.5rem;
   background-position: right 1rem center, center right 3rem;
-  background-size: 16px 12px, calc(0.75em + 0.625rem) calc(0.75em + 0.625rem);
+  background-size: 16px 12px, calc(0.75em + 0.5rem) calc(0.75em + 0.5rem);
 }
 .was-validated .form-select:invalid:focus, .form-select.is-invalid:focus {
   border-color: #d43f3a;
@@ -2865,7 +2867,7 @@ textarea.form-control-lg {
 }
 
 .was-validated .form-control-color:invalid, .form-control-color.is-invalid {
-  width: calc(3rem + calc(1.5em + 1.25rem));
+  width: calc(3rem + calc(1.5em + 1rem));
 }
 
 .was-validated .form-check-input:invalid, .form-check-input.is-invalid {
@@ -3077,7 +3079,7 @@ textarea.form-control-lg {
   --bs-btn-disabled-border-color: #d43f3a;
 }
 
-.btn-light, .btn-default {
+.btn-light, .btn-secondary {
   --bs-btn-color: #000;
   --bs-btn-bg: #fff;
   --bs-btn-border-color: #fff;
@@ -11843,10 +11845,10 @@ h6, .h6, h5, .h5, h4, .h4, h3, .h3, h2, .h2, h1, .h1 {
   font-weight: 600;
 }
 
-.btn-light, .btn-default {
+.btn-light, .btn-secondary {
   border: #d0d5dd solid 1px;
 }
-.btn-light:hover, .btn-default:hover {
+.btn-light:hover, .btn-secondary:hover {
   background-color: #d0d5dd !important;
   border-color: #d0d5dd;
 }
@@ -11920,7 +11922,7 @@ a.tag:hover {
   display: block;
 }
 
-.box, .wrapper {
+.box {
   background-color: #fff;
   border: 1px solid #ccc;
   border-radius: 4px;
@@ -13553,9 +13555,7 @@ td.diff_header {
 }
 
 .search-form {
-  margin-bottom: 20px;
   padding-bottom: 25px;
-  border-bottom: 1px dotted #ddd;
 }
 .search-form .search-input {
   position: relative;
@@ -13571,7 +13571,7 @@ td.diff_header {
   display: block;
   position: absolute;
   top: 50%;
-  margin-top: -10px;
+  margin-top: -12px;
   right: 10px;
   height: 20px;
   padding: 0;
@@ -13605,6 +13605,27 @@ td.diff_header {
   font-size: 28px;
   width: 28px;
 }
+.search-form .control-order-by {
+  width: 100%;
+  border-radius: 6px;
+  margin-bottom: 10px;
+  padding: 0 5px 5px;
+  background-color: #fff;
+}
+.search-form .control-order-by label {
+  font-size: 12px;
+  font-weight: 500;
+  color: #667085;
+  padding-left: 8px;
+}
+@media (min-width: 768px) {
+  .search-form .control-order-by {
+    float: right;
+    margin-left: 15px;
+    min-width: 200px;
+    max-width: min-content;
+  }
+}
 .search-form .control-order-by label,
 .search-form .control-order-by select {
   display: inline;
@@ -13612,6 +13633,21 @@ td.diff_header {
 .search-form .control-order-by .form-control {
   width: auto;
 }
+@media (max-width: 767.98px) {
+  .search-form .control-order-by .form-control {
+    width: 100%;
+  }
+}
+.search-form .control-order-by .form-select {
+  border: unset;
+  padding: 2px 3rem 0.5rem 0.5rem;
+  font-weight: 500;
+  background-position: right 1rem top;
+  background-size: 16px 16px;
+}
+.search-form .control-order-by:focus-within {
+  box-shadow: 0 0 0 0.25rem rgba(21, 48, 132, 0.25);
+}
 .search-form .filter-list {
   color: #444;
   line-height: 32px;
@@ -13633,14 +13669,26 @@ td.diff_header {
 .search-form .search-input-group {
   margin-bottom: 1.5rem;
 }
-
-@media (min-width: 768px) {
-  .search-form .control-order-by {
-    float: right;
-    margin-left: 15px;
-    width: auto;
-  }
+.search-form .search-input-group input {
+  padding-right: 45px;
+}
+.search-form .search-input-group button {
+  border: 0;
+  border-radius: 0 3px 3px 0;
+  color: #2f4b91;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 1rem;
+  line-height: 1.56;
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  top: 2px;
+  height: 92%;
+  cursor: pointer;
 }
+
 .group .media-vertical .image {
   margin: 0 -5px 5px;
 }
@@ -13792,9 +13840,10 @@ td.diff_header {
   background-color: #fff;
   border-bottom-color: transparent;
 }
-.page-header .content_action {
+
+.content_action .btn {
   float: right;
-  margin-top: -3px;
+  margin-bottom: 1rem;
 }
 
 .no-nav .page-header {
@@ -13844,36 +13893,6 @@ td.diff_header {
   white-space: nowrap;
 }
 
-.wrapper {
-  position: relative;
-  min-height: 300px;
-  background-color: #fff;
-}
-.wrapper::after {
-  display: block;
-  clear: both;
-  content: "";
-}
-@media (min-width: 768px) {
-  .wrapper:before {
-    content: "";
-    display: block;
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    width: 25%;
-    border-right: 1px solid #ddd;
-    z-index: 1;
-  }
-  .wrapper.no-nav:before {
-    display: none;
-  }
-  .wrapper.no-nav .module > .page-header {
-    margin-top: 0;
-  }
-}
-
 [role=main],
 .main {
   position: relative;
@@ -13881,7 +13900,7 @@ td.diff_header {
 
 .main {
   padding: 20px 0;
-  background: #eee url("../../../base/images/bg.png");
+  background-color: #fff;
 }
 
 .main:after,
@@ -13891,15 +13910,15 @@ td.diff_header {
 }
 
 .main .primary {
+  border-radius: 20px;
+  background-color: #f2f4f7;
   position: relative;
   float: right;
   margin-left: 0;
 }
 
 .main .secondary {
-  padding: 0;
   z-index: 1;
-  padding-right: 1px;
 }
 
 /* Filters modal */
@@ -13917,27 +13936,12 @@ td.diff_header {
 }
 
 @media (max-width: 767.98px) {
-  .wrapper {
-    border-width: 0;
-    box-shadow: 0;
-    border-radius: 0;
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: flex;
-    -webkit-box-orient: vertical;
-    -moz-box-orient: vertical;
-    -webkit-flex-direction: column-reverse;
-    flex-direction: column-reverse;
-    -webkit-box-align: start;
-    -moz-box-align: start;
-    -webkit-align-items: flex-start;
-    align-items: flex-start;
-  }
   .main .secondary {
     -webkit-box-ordinal-group: 2;
     -moz-box-ordinal-group: 2;
     -webkit-order: 2;
     order: 2;
+    margin-top: 1rem;
   }
   .js .main .secondary .filters {
     display: none;
@@ -13994,11 +13998,6 @@ td.diff_header {
   margin-top: 0;
 }
 
-@media (min-width: 576px) {
-  .hero {
-    background: url("../../../base/images/background-tile.png");
-  }
-}
 .hero:after {
   background-color: rgba(0, 0, 0, 0.09);
   background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0));
@@ -14654,7 +14653,8 @@ td.diff_header {
   margin-bottom: 20px;
 }
 
-.input-group .form-control {
+.input-group .form-control,
+.input-group > .form-control:focus {
   z-index: 0;
 }
 
@@ -14662,6 +14662,21 @@ td.diff_header {
   z-index: 0;
 }
 
+.input-group:not(.has-validation) > :not(:last-child):not(.dropdown-toggle):not(.dropdown-menu):not(.form-floating),
+.input-group:not(.has-validation) > .dropdown-toggle:nth-last-child(n+3),
+.input-group:not(.has-validation) > .form-floating:not(:last-child) > .form-control,
+.input-group:not(.has-validation) > .form-floating:not(:last-child) > .form-select {
+  border-top-right-radius: 0.3rem;
+  border-bottom-right-radius: 0.3rem;
+}
+.input-group.has-validation > :nth-last-child(n+3):not(.dropdown-toggle):not(.dropdown-menu):not(.form-floating),
+.input-group.has-validation > .dropdown-toggle:nth-last-child(n+4),
+.input-group.has-validation > .form-floating:nth-last-child(n+3) > .form-control,
+.input-group.has-validation > .form-floating:nth-last-child(n+3) > .form-select {
+  border-top-right-radius: 0.3rem;
+  border-bottom-right-radius: 0.3rem;
+}
+
 .format-label {
   text-indent: -900em;
   background: url("../../../base/images/sprite-resource-icons.png") no-repeat 0 0;
@@ -14913,7 +14928,7 @@ td.diff_header {
   }
 }
 @media (max-width: 767.98px) {
-  .login-main .btn-light, .login-main .btn-default {
+  .login-main .btn-light, .login-main .btn-secondary {
     width: 100%;
     display: block !important;
   }
diff --git a/ckan/public-midnight-blue/base/javascript/modules/confirm-action.js b/ckan/public-midnight-blue/base/javascript/modules/confirm-action.js
index c91dba7f6a0..b1afe2117a1 100644
--- a/ckan/public-midnight-blue/base/javascript/modules/confirm-action.js
+++ b/ckan/public-midnight-blue/base/javascript/modules/confirm-action.js
@@ -43,7 +43,7 @@ this.ckan.module('confirm-action', function (jQuery) {
         '</div>',
         '<div class="modal-body"></div>',
         '<div class="modal-footer">',
-        '<button class="btn btn-default btn-cancel"></button>',
+        '<button class="btn btn-secondary btn-cancel"></button>',
         '<button class="btn btn-primary"></button>',
         '</div>',
         '</div>',
diff --git a/ckan/public-midnight-blue/base/javascript/modules/image-upload.js b/ckan/public-midnight-blue/base/javascript/modules/image-upload.js
index af9cbf2da0c..bb23d093b7f 100644
--- a/ckan/public-midnight-blue/base/javascript/modules/image-upload.js
+++ b/ckan/public-midnight-blue/base/javascript/modules/image-upload.js
@@ -57,7 +57,7 @@ this.ckan.module('image-upload', function($) {
         .appendTo(this.el);
 
       // Button to set the field to be a URL
-      this.button_url = $('<a href="javascript:;" class="btn btn-default">' +
+      this.button_url = $('<a href="javascript:;" class="btn btn-secondary">' +
                           '<i class="fa fa-globe"></i>' +
                           this._('Link') + '</a>')
         .prop('title', this._('Link to a URL on the internet (you can also link to an API)'))
@@ -65,7 +65,7 @@ this.ckan.module('image-upload', function($) {
         .insertAfter(this.input);
 
       // Button to attach local file to the form
-      this.button_upload = $('<a href="javascript:;" class="btn btn-default">' +
+      this.button_upload = $('<a href="javascript:;" class="btn btn-secondary">' +
                              '<i class="fa fa-cloud-upload"></i>' +
                              this._('Upload') + '</a>')
         .insertAfter(this.input);
diff --git a/ckan/public-midnight-blue/base/javascript/modules/resource-reorder.js b/ckan/public-midnight-blue/base/javascript/modules/resource-reorder.js
index 83be73e7833..b0939a9f3ca 100644
--- a/ckan/public-midnight-blue/base/javascript/modules/resource-reorder.js
+++ b/ckan/public-midnight-blue/base/javascript/modules/resource-reorder.js
@@ -10,7 +10,7 @@ this.ckan.module('resource-reorder', function($) {
       title: '<h1></h1>',
       help_text: '<p></p>',
       button: [
-        '<a href="javascript:;" class="btn btn-default">',
+        '<a href="javascript:;" class="btn btn-secondary">',
         '<i class="fa fa-bars"></i>',
         '<span></span>',
         '</a>'
diff --git a/ckan/public-midnight-blue/base/javascript/modules/resource-view-reorder.js b/ckan/public-midnight-blue/base/javascript/modules/resource-view-reorder.js
index 4a62b09e0b4..92a0e2610a6 100644
--- a/ckan/public-midnight-blue/base/javascript/modules/resource-view-reorder.js
+++ b/ckan/public-midnight-blue/base/javascript/modules/resource-view-reorder.js
@@ -8,7 +8,7 @@ this.ckan.module('resource-view-reorder', function($) {
     template: {
       title: '<h1></h1>',
       button: [
-        '<a href="javascript:;" class="btn btn-default">',
+        '<a href="javascript:;" class="btn btn-secondary">',
         '<i class="fa fa-bars"></i>',
         '<span></span>',
         '</a>'
diff --git a/ckan/public-midnight-blue/base/javascript/plugins/jquery.slug-preview.js b/ckan/public-midnight-blue/base/javascript/plugins/jquery.slug-preview.js
index 4a4f78fe25c..f56f80ef98b 100644
--- a/ckan/public-midnight-blue/base/javascript/plugins/jquery.slug-preview.js
+++ b/ckan/public-midnight-blue/base/javascript/plugins/jquery.slug-preview.js
@@ -70,7 +70,7 @@
       '<div class="slug-preview">',
       '<strong></strong>',
       '<span class="slug-preview-prefix"></span><span class="slug-preview-value"></span>',
-      '<button class="btn btn-default btn-xs"></button>',
+      '<button class="btn btn-secondary btn-xs"></button>',
       '</div>'
     ].join('\n')
   };
diff --git a/ckan/public-midnight-blue/base/scss/_bootstrap-variables.scss b/ckan/public-midnight-blue/base/scss/_bootstrap-variables.scss
index 58ba5dcecc1..798aa869d07 100644
--- a/ckan/public-midnight-blue/base/scss/_bootstrap-variables.scss
+++ b/ckan/public-midnight-blue/base/scss/_bootstrap-variables.scss
@@ -700,7 +700,7 @@ $form-label-color:                      null !default;
 // scss-docs-end form-label-variables
 
 // scss-docs-start form-input-variables
-$input-padding-y:                       $input-btn-padding-y !default;
+$input-padding-y:                       .5rem !default;
 $input-padding-x:                       $input-btn-padding-x !default;
 $input-font-family:                     $input-btn-font-family !default;
 $input-font-size:                       $input-btn-font-size !default;
@@ -716,25 +716,25 @@ $input-padding-x-lg:                    $input-btn-padding-x-lg !default;
 $input-font-size-lg:                    $input-btn-font-size-lg !default;
 
 $input-bg:                              $white !default;
-$input-disabled-bg:                     $gray-200 !default;
-$input-disabled-border-color:           null !default;
+$input-disabled-bg:                     $gray-100 !default;
+$input-disabled-border-color:           $gray-300 !default;
 
 $input-color:                           $body-color !default;
-$input-border-color:                    $gray-400 !default;
-$input-border-width:                    $input-btn-border-width !default;
-$input-box-shadow:                      $box-shadow-inset !default;
+$input-border-color:                    $gray-300 !default;
+$input-border-width:                    2px !default;
+$input-box-shadow:                      null;
 
 $input-border-radius:                   $border-radius !default;
 $input-border-radius-sm:                $border-radius-sm !default;
 $input-border-radius-lg:                $border-radius-lg !default;
 
 $input-focus-bg:                        $input-bg !default;
-$input-focus-border-color:              tint-color($component-active-bg, 50%) !default;
+$input-focus-border-color:              $brand-600 !default;
 $input-focus-color:                     $input-color !default;
 $input-focus-width:                     $input-btn-focus-width !default;
-$input-focus-box-shadow:                $input-btn-focus-box-shadow !default;
+$input-focus-box-shadow:                null;
 
-$input-placeholder-color:               $gray-600 !default;
+$input-placeholder-color:               $gray-500 !default;
 $input-plaintext-color:                 $body-color !default;
 
 $input-height-border:                   $input-border-width * 2 !default;
@@ -747,7 +747,7 @@ $input-height:                          add($input-line-height * 1em, add($input
 $input-height-sm:                       add($input-line-height * 1em, add($input-padding-y-sm * 2, $input-height-border, false)) !default;
 $input-height-lg:                       add($input-line-height * 1em, add($input-padding-y-lg * 2, $input-height-border, false)) !default;
 
-$input-transition:                      border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;
+$input-transition:                      null !default;
 // scss-docs-end form-input-variables
 
 // scss-docs-start form-check-variables
diff --git a/ckan/public-midnight-blue/base/scss/_custom.scss b/ckan/public-midnight-blue/base/scss/_custom.scss
index 77ce43618bb..4969ec3a055 100644
--- a/ckan/public-midnight-blue/base/scss/_custom.scss
+++ b/ckan/public-midnight-blue/base/scss/_custom.scss
@@ -4,7 +4,7 @@ h6, .h6, h5, .h5, h4, .h4, h3, .h3, h2, .h2, h1, .h1 {
     font-weight: $font-weight-semibold;
 }
 
-.btn-light, .btn-default {
+.btn-light, .btn-secondary {
     @extend .btn-light;
     border: $table-border-color solid 1px;
     &:hover {
@@ -16,4 +16,4 @@ h6, .h6, h5, .h5, h4, .h4, h3, .h3, h2, .h2, h1, .h1 {
 .alert {
     border: unset;
     border-left: map-get($map: $border-widths, $key: "4") solid;
-}
\ No newline at end of file
+}
diff --git a/ckan/public-midnight-blue/base/scss/_input-groups.scss b/ckan/public-midnight-blue/base/scss/_input-groups.scss
index b59f48b06be..8bdb8c42414 100644
--- a/ckan/public-midnight-blue/base/scss/_input-groups.scss
+++ b/ckan/public-midnight-blue/base/scss/_input-groups.scss
@@ -1,5 +1,6 @@
 .input-group {
-  .form-control {
+  .form-control,
+  > .form-control:focus {
     z-index: 0;
   }
 }
@@ -11,3 +12,23 @@
     }
   }
 }
+
+.input-group {
+  &:not(.has-validation) {
+    > :not(:last-child):not(.dropdown-toggle):not(.dropdown-menu):not(.form-floating),
+    > .dropdown-toggle:nth-last-child(n + 3),
+    > .form-floating:not(:last-child) > .form-control,
+    > .form-floating:not(:last-child) > .form-select {
+      @include border-end-radius($input-border-radius-lg);
+    }
+  }
+
+  &.has-validation {
+    > :nth-last-child(n + 3):not(.dropdown-toggle):not(.dropdown-menu):not(.form-floating),
+    > .dropdown-toggle:nth-last-child(n + 4),
+    > .form-floating:nth-last-child(n + 3) > .form-control,
+    > .form-floating:nth-last-child(n + 3) > .form-select {
+      @include border-end-radius($input-border-radius-lg);
+    }
+  }
+}
\ No newline at end of file
diff --git a/ckan/public-midnight-blue/base/scss/_layout.scss b/ckan/public-midnight-blue/base/scss/_layout.scss
index 2539f543d5b..c1b3a75d2d6 100644
--- a/ckan/public-midnight-blue/base/scss/_layout.scss
+++ b/ckan/public-midnight-blue/base/scss/_layout.scss
@@ -1,42 +1,3 @@
-.wrapper {
-    @include clearfix();
-    @extend .box;
-    position: relative;
-    min-height: 300px;
-    background-color: #fff;
-    @include media-breakpoint-up(md) {
-        &:before {
-            content: '';
-            display: block;
-            position: absolute;
-            top: 0;
-            bottom: 0;
-            left: 0;
-            width: 25%;
-            border-right: 1px solid $genericBorderColor;
-            z-index: 1; // Fixes overlapping .secondary on the Resource view page
-        }
-        &.no-nav {
-            &:before {
-                display: none;
-            }
-            .module {
-                >.page-header {
-                    margin-top: 0;
-                }
-            }
-        }
-    }
-}
-
-// @media (min-width: $screen-md-min) {
-//   .wrapper {
-//     background-position:0px 0px;
-//   }
-// }
-// .wrapper.no-nav {
-//     background-image: none;
-// }
 [role=main],
 .main {
     position: relative;
@@ -44,7 +5,7 @@
 
 .main {
     padding: 20px 0;
-    background: $layoutBackgroundColor url("#{$bgPath}");
+    background-color: $white;
 }
 
 .main:after,
@@ -54,15 +15,15 @@
 }
 
 .main .primary {
+    border-radius: 20px;
+    background-color: $layoutPrimaryBackgroundColor;
     position: relative;
     float: right;
     margin-left: 0; // Remove grid margin.
 }
 
 .main .secondary {
-    padding: 0;
     z-index: 1;
-    padding-right: 1px;
 }
 
 
@@ -82,27 +43,12 @@
 }
 
 @include media-breakpoint-down(md) {
-    .wrapper {
-        border-width: 0;
-        @include box-shadow(0);
-        @include border-radius(0);
-        display: -webkit-box;
-        display: -webkit-flex;
-        display: flex;
-        -webkit-box-orient: vertical;
-        -moz-box-orient: vertical;
-        -webkit-flex-direction: column-reverse;
-        flex-direction: column-reverse;
-        -webkit-box-align: start;
-        -moz-box-align: start;
-        -webkit-align-items: flex-start;
-        align-items: flex-start;
-    }
     .main .secondary {
         -webkit-box-ordinal-group: 2;
         -moz-box-ordinal-group: 2;
         -webkit-order: 2;
         order: 2;
+        margin-top: 1rem;
     }
     .js .main .secondary .filters {
         display: none;
@@ -165,11 +111,6 @@
     }
 }
 
-@include media-breakpoint-up(sm) {
-    .hero {
-        background: url("#{$imagePath}/background-tile.png");
-    }
-}
 
 .hero:after {
     // Need to manually declare this here@mixin  If you pass rgba() through to
diff --git a/ckan/public-midnight-blue/base/scss/_search.scss b/ckan/public-midnight-blue/base/scss/_search.scss
index 88dca383d0c..b0510cade4c 100644
--- a/ckan/public-midnight-blue/base/scss/_search.scss
+++ b/ckan/public-midnight-blue/base/scss/_search.scss
@@ -1,7 +1,5 @@
 .search-form {
-    margin-bottom: 20px;
     padding-bottom: 25px;
-    border-bottom: 1px dotted $genericBorderColor;
     // Normal search box
     .search-input {
         position: relative;
@@ -16,7 +14,7 @@
             display: block;
             position: absolute;
             top: 50%;
-            margin-top: -10px;
+            margin-top: -12px;
             right: 10px;
             height: 20px;
             padding: 0;
@@ -50,12 +48,42 @@
         }
     }
     .control-order-by {
+        width: 100%;
+        border-radius: 6px;
+        margin-bottom: 10px;
+        padding: 0 5px 5px;
+        background-color: $white;
+        label {
+            font-size: 12px;
+            font-weight: 500;
+            color: $gray-500;
+            padding-left: 8px;
+        }
+        @include media-breakpoint-up(md) {
+            float: right;
+            margin-left: 15px;
+            min-width:200px;
+            max-width: min-content;
+        }
         label,
         select {
             display: inline;
         }
         .form-control {
             width: auto;
+            @include media-breakpoint-down(md) {
+                width: 100%;
+            }
+        }
+        .form-select {
+            border: unset;
+            padding: 2px 3rem 0.5rem 0.5rem;
+            font-weight: 500;
+            background-position: right 1rem top;
+            background-size: 16px 16px;
+        }
+        &:focus-within{
+            box-shadow: 0 0 0 0.25rem rgba(21, 48, 132, 0.25);
         }
     }
 
@@ -79,13 +107,24 @@
     }
     .search-input-group {
         margin-bottom: $grid-gutter-width;
+        input {
+            padding-right: 45px;
+        }
+        button {
+            border: 0;
+            border-radius: 0 3px 3px 0;
+            color: $brand-500;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            font-size: 1rem;
+            line-height: 1.56;
+            position: absolute;
+            right: 0;
+            bottom: 0;
+            top: 2px;
+            height: 92%;
+            cursor: pointer;
+        }
     }
-}
-
-@include media-breakpoint-up(md) {
-    .search-form .control-order-by {
-        float: right;
-        margin-left: 15px;
-        width: auto;
-    }
-}
+}
\ No newline at end of file
diff --git a/ckan/public-midnight-blue/base/scss/_toolbar.scss b/ckan/public-midnight-blue/base/scss/_toolbar.scss
index 7f1e0eb42d7..1b6ffe5302c 100644
--- a/ckan/public-midnight-blue/base/scss/_toolbar.scss
+++ b/ckan/public-midnight-blue/base/scss/_toolbar.scss
@@ -110,10 +110,12 @@
             border-bottom-color: transparent;
         }
     }
-    .content_action {
+}
+
+.content_action {
+    .btn {
         float: right;
-        margin-top: -3px;
-        // margin-right: -7px;
+        margin-bottom: 1rem;
     }
 }
 
diff --git a/ckan/public-midnight-blue/base/scss/_variables.scss b/ckan/public-midnight-blue/base/scss/_variables.scss
index 1f0f725e0c9..5a9320274d3 100644
--- a/ckan/public-midnight-blue/base/scss/_variables.scss
+++ b/ckan/public-midnight-blue/base/scss/_variables.scss
@@ -10,6 +10,7 @@ $layoutLinkColor: #187794;
 $layoutBackgroundColor: #eee;
 $layoutTrimBackgroundColor: #fff;
 $layoutTrimBorderColor: #ccc;
+$layoutPrimaryBackgroundColor: $gray-100;
 $logoMaxHeight: 60px;
 
 $navLinkColor: $gray-900;
diff --git a/ckan/public/base/css/main-rtl.css b/ckan/public/base/css/main-rtl.css
index 8ea06039649..0be81db8c4c 100644
--- a/ckan/public/base/css/main-rtl.css
+++ b/ckan/public/base/css/main-rtl.css
@@ -3076,7 +3076,7 @@ textarea.form-control-lg {
   --bs-btn-disabled-border-color: #d43f3a;
 }
 
-.btn-light, .btn-default {
+.btn-light, .btn-secondary {
   --bs-btn-color: #000;
   --bs-btn-bg: #fff;
   --bs-btn-border-color: #fff;
@@ -11842,10 +11842,10 @@ h6, .h6, h5, .h5, h4, .h4, h3, .h3, h2, .h2, h1, .h1 {
   font-weight: 600;
 }
 
-.btn-light, .btn-default {
+.btn-light, .btn-secondary {
   border: #dee2e6 solid 1px;
 }
-.btn-light:hover, .btn-default:hover {
+.btn-light:hover, .btn-secondary:hover {
   background-color: #dee2e6 !important;
   border-color: #dee2e6;
 }
diff --git a/ckan/public/base/css/main.css b/ckan/public/base/css/main.css
index 457f29d2ce4..de4798d2ca0 100644
--- a/ckan/public/base/css/main.css
+++ b/ckan/public/base/css/main.css
@@ -3076,7 +3076,7 @@ textarea.form-control-lg {
   --bs-btn-disabled-border-color: #d43f3a;
 }
 
-.btn-light, .btn-default {
+.btn-light, .btn-secondary {
   --bs-btn-color: #000;
   --bs-btn-bg: #fff;
   --bs-btn-border-color: #fff;
@@ -11842,10 +11842,10 @@ h6, .h6, h5, .h5, h4, .h4, h3, .h3, h2, .h2, h1, .h1 {
   font-weight: 600;
 }
 
-.btn-light, .btn-default {
+.btn-light, .btn-secondary {
   border: #dee2e6 solid 1px;
 }
-.btn-light:hover, .btn-default:hover {
+.btn-light:hover, .btn-secondary:hover {
   background-color: #dee2e6 !important;
   border-color: #dee2e6;
 }
diff --git a/ckan/public/base/javascript/modules/confirm-action.js b/ckan/public/base/javascript/modules/confirm-action.js
index c91dba7f6a0..b1afe2117a1 100644
--- a/ckan/public/base/javascript/modules/confirm-action.js
+++ b/ckan/public/base/javascript/modules/confirm-action.js
@@ -43,7 +43,7 @@ this.ckan.module('confirm-action', function (jQuery) {
         '</div>',
         '<div class="modal-body"></div>',
         '<div class="modal-footer">',
-        '<button class="btn btn-default btn-cancel"></button>',
+        '<button class="btn btn-secondary btn-cancel"></button>',
         '<button class="btn btn-primary"></button>',
         '</div>',
         '</div>',
diff --git a/ckan/public/base/javascript/modules/image-upload.js b/ckan/public/base/javascript/modules/image-upload.js
index af9cbf2da0c..bb23d093b7f 100644
--- a/ckan/public/base/javascript/modules/image-upload.js
+++ b/ckan/public/base/javascript/modules/image-upload.js
@@ -57,7 +57,7 @@ this.ckan.module('image-upload', function($) {
         .appendTo(this.el);
 
       // Button to set the field to be a URL
-      this.button_url = $('<a href="javascript:;" class="btn btn-default">' +
+      this.button_url = $('<a href="javascript:;" class="btn btn-secondary">' +
                           '<i class="fa fa-globe"></i>' +
                           this._('Link') + '</a>')
         .prop('title', this._('Link to a URL on the internet (you can also link to an API)'))
@@ -65,7 +65,7 @@ this.ckan.module('image-upload', function($) {
         .insertAfter(this.input);
 
       // Button to attach local file to the form
-      this.button_upload = $('<a href="javascript:;" class="btn btn-default">' +
+      this.button_upload = $('<a href="javascript:;" class="btn btn-secondary">' +
                              '<i class="fa fa-cloud-upload"></i>' +
                              this._('Upload') + '</a>')
         .insertAfter(this.input);
diff --git a/ckan/public/base/javascript/modules/resource-reorder.js b/ckan/public/base/javascript/modules/resource-reorder.js
index 83be73e7833..b0939a9f3ca 100644
--- a/ckan/public/base/javascript/modules/resource-reorder.js
+++ b/ckan/public/base/javascript/modules/resource-reorder.js
@@ -10,7 +10,7 @@ this.ckan.module('resource-reorder', function($) {
       title: '<h1></h1>',
       help_text: '<p></p>',
       button: [
-        '<a href="javascript:;" class="btn btn-default">',
+        '<a href="javascript:;" class="btn btn-secondary">',
         '<i class="fa fa-bars"></i>',
         '<span></span>',
         '</a>'
diff --git a/ckan/public/base/javascript/modules/resource-view-reorder.js b/ckan/public/base/javascript/modules/resource-view-reorder.js
index 4a62b09e0b4..92a0e2610a6 100644
--- a/ckan/public/base/javascript/modules/resource-view-reorder.js
+++ b/ckan/public/base/javascript/modules/resource-view-reorder.js
@@ -8,7 +8,7 @@ this.ckan.module('resource-view-reorder', function($) {
     template: {
       title: '<h1></h1>',
       button: [
-        '<a href="javascript:;" class="btn btn-default">',
+        '<a href="javascript:;" class="btn btn-secondary">',
         '<i class="fa fa-bars"></i>',
         '<span></span>',
         '</a>'
diff --git a/ckan/public/base/javascript/plugins/jquery.slug-preview.js b/ckan/public/base/javascript/plugins/jquery.slug-preview.js
index 4a4f78fe25c..f56f80ef98b 100644
--- a/ckan/public/base/javascript/plugins/jquery.slug-preview.js
+++ b/ckan/public/base/javascript/plugins/jquery.slug-preview.js
@@ -70,7 +70,7 @@
       '<div class="slug-preview">',
       '<strong></strong>',
       '<span class="slug-preview-prefix"></span><span class="slug-preview-value"></span>',
-      '<button class="btn btn-default btn-xs"></button>',
+      '<button class="btn btn-secondary btn-xs"></button>',
       '</div>'
     ].join('\n')
   };
diff --git a/ckan/public/base/scss/_custom.scss b/ckan/public/base/scss/_custom.scss
index e24b79b1d95..4662c004e54 100644
--- a/ckan/public/base/scss/_custom.scss
+++ b/ckan/public/base/scss/_custom.scss
@@ -4,11 +4,11 @@ h6, .h6, h5, .h5, h4, .h4, h3, .h3, h2, .h2, h1, .h1 {
     font-weight: 600;
 }
 
-.btn-light, .btn-default {
+.btn-light, .btn-secondary {
     @extend .btn-light;
     border: $table-border-color solid 1px;
     &:hover {
         background-color: $gray-300 !important;
         border-color: $gray-300;
     }
-}
\ No newline at end of file
+}
diff --git a/ckan/templates-midnight-blue/development/primer.html b/ckan/templates-midnight-blue/development/primer.html
index fe4ddc8d5b7..1c2d7798150 100644
--- a/ckan/templates-midnight-blue/development/primer.html
+++ b/ckan/templates-midnight-blue/development/primer.html
@@ -31,7 +31,7 @@ <h2 class="module-heading"><i class="fa fa-info-circle"></i> Helper text</h2>
   <div class="input-group input-group-lg search-giant">
     <input type="text" class="search form-control" name="q" value="" autocomplete="off" placeholder="Search something...">
     <span class="input-group-btn">
-        <button class="btn btn-default" type="submit">
+        <button class="btn btn-secondary" type="submit">
           <i class="fa fa-search"></i>
           <span class="sr-only">Search</span>
         </button>
diff --git a/ckan/templates-midnight-blue/development/snippets/actions.html b/ckan/templates-midnight-blue/development/snippets/actions.html
index fe9519c869c..015c74bc862 100644
--- a/ckan/templates-midnight-blue/development/snippets/actions.html
+++ b/ckan/templates-midnight-blue/development/snippets/actions.html
@@ -1,2 +1,2 @@
-<li><a class="btn btn-default" href="#"><i class="fa fa-wrench"></i> Button</a></li>
+<li><a class="btn btn-secondary" href="#"><i class="fa fa-wrench"></i> Button</a></li>
 <li><a class="btn btn-primary" href="#"><i class="fa fa-wrench"></i> Primary Button</a></li>
diff --git a/ckan/templates-midnight-blue/group/edit.html b/ckan/templates-midnight-blue/group/edit.html
index 31dcd29e5e8..3d63608fdc7 100644
--- a/ckan/templates-midnight-blue/group/edit.html
+++ b/ckan/templates-midnight-blue/group/edit.html
@@ -10,3 +10,7 @@
 
 {% block page_heading_class %}hide-heading{% endblock %}
 {% block page_heading %}{{ h.humanize_entity_type('group', group_type, 'edit label') or _('Edit Group') }}{% endblock %}
+
+{% block content_action %}
+  {% link_for _('View'), named_route=group_type+'.read', id=group_dict.name, class_='btn btn-secondary', icon='eye' %}
+{% endblock %}
diff --git a/ckan/templates-midnight-blue/group/edit_base.html b/ckan/templates-midnight-blue/group/edit_base.html
index 8114b27599e..4b7ae0ee05c 100644
--- a/ckan/templates-midnight-blue/group/edit_base.html
+++ b/ckan/templates-midnight-blue/group/edit_base.html
@@ -5,10 +5,6 @@
 
 {% set group = group_dict %}
 
-{% block content_action %}
-  {% link_for _('View'), named_route=group_type+'.read', id=group_dict.name, class_='btn btn-default', icon='eye' %}
-{% endblock %}
-
 {% block content_primary_nav %}
   {{ h.build_nav_icon(group_type + '.edit', _('Edit'), id=group_dict.name, icon='pencil') }}
   {{ h.build_nav_icon(group_type + '.manage_members', _('Members'), id=group_dict.name, icon='users') }}
diff --git a/ckan/templates-midnight-blue/group/manage_members.html b/ckan/templates-midnight-blue/group/manage_members.html
index 585cbab4ac6..f074a40dffc 100644
--- a/ckan/templates-midnight-blue/group/manage_members.html
+++ b/ckan/templates-midnight-blue/group/manage_members.html
@@ -26,7 +26,7 @@ <h3 class="page-heading">{{ _('{0} members'.format(members|length)) }}</h3>
         <td>{{ role }}</td>
         <td>
           <div class="btn-group pull-right">
-            <a class="btn btn-default btn-sm" href="{{ h.url_for(group_type + '.member_new', id=group_dict.id, user=user_id) }}" aria-label="{{ _('Edit role') }}" aria-description="{{ _('Edit the role of the user within the group') }}" data-bs-title="{{ _('Edit role') }}" data-bs-toggle="tooltip">
+            <a class="btn btn-secondary btn-sm" href="{{ h.url_for(group_type + '.member_new', id=group_dict.id, user=user_id) }}" aria-label="{{ _('Edit role') }}" aria-description="{{ _('Edit the role of the user within the group') }}" data-bs-title="{{ _('Edit role') }}" data-bs-toggle="tooltip">
               <i class="fa fa-wrench"></i>
             </a>
             <a class="btn btn-danger btn-sm" href="{{ h.url_for(group_type + '.member_delete', id=group_dict.id, user=user_id) }}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}" aria-label="{{ _('Delete member') }}" aria-description="{{ _('Delete this member from the group') }}" data-bs-title="{{ _('Delete member') }}" data-bs-toggle="tooltip">{% block delete_button_text %}<i class="fa fa-times"></i>{% endblock %}</a>
diff --git a/ckan/templates-midnight-blue/group/member_new.html b/ckan/templates-midnight-blue/group/member_new.html
index bcd3e50b118..7309b167ed3 100644
--- a/ckan/templates-midnight-blue/group/member_new.html
+++ b/ckan/templates-midnight-blue/group/member_new.html
@@ -5,7 +5,7 @@
 {% set user = user_dict %}
 
 {% block primary_content_inner %}
-  {% link_for _('Back to all members'), named_route=group_type+'.manage_members', id=group.name, class_='btn btn-default pull-right', icon='arrow-left' %}
+  {% link_for _('Back to all members'), named_route=group_type+'.manage_members', id=group.name, class_='btn btn-secondary pull-right', icon='arrow-left' %}
   <h1 class="page-heading">
     {% block page_heading %}{{ _('Edit Member') if user else _('Add Member') }}{% endblock %}
   </h1>
diff --git a/ckan/templates-midnight-blue/group/read_base.html b/ckan/templates-midnight-blue/group/read_base.html
index f9a63912e58..3b00aeda367 100644
--- a/ckan/templates-midnight-blue/group/read_base.html
+++ b/ckan/templates-midnight-blue/group/read_base.html
@@ -10,7 +10,7 @@
 
 {% block content_action %}
   {% if h.check_access('group_update', {'id': group_dict.id}) %}
-    {% link_for _('Manage'), named_route=group_type+'.edit', id=group_dict.name, class_='btn btn-default', icon='wrench' %}
+    {% link_for _('Manage'), named_route=group_type+'.edit', id=group_dict.name, class_='btn btn-secondary', icon='wrench' %}
   {% endif %}
 {% endblock %}
 
diff --git a/ckan/templates-midnight-blue/organization/bulk_process.html b/ckan/templates-midnight-blue/organization/bulk_process.html
index 69f0679950c..7ee57043b90 100644
--- a/ckan/templates-midnight-blue/organization/bulk_process.html
+++ b/ckan/templates-midnight-blue/organization/bulk_process.html
@@ -45,11 +45,11 @@ <h3 class="page-heading">
                   <th></th>
                   <th class="table-actions">
                     <div class="btn-group">
-                      <button name="bulk_action.public" value="public" class="btn btn-default" type="submit">
+                      <button name="bulk_action.public" value="public" class="btn btn-secondary" type="submit">
                         <i class="fa fa-eye"></i>
                         {{ _('Make public') }}
                       </button>
-                      <button name="bulk_action.private" value="private" class="btn btn-default" type="submit">
+                      <button name="bulk_action.private" value="private" class="btn btn-secondary" type="submit">
                         <i class="fa fa-eye-slash"></i>
                         {{ _('Make private') }}
                       </button>
diff --git a/ckan/templates-midnight-blue/organization/edit_base.html b/ckan/templates-midnight-blue/organization/edit_base.html
index 69ab2f8de49..91539ae62c1 100644
--- a/ckan/templates-midnight-blue/organization/edit_base.html
+++ b/ckan/templates-midnight-blue/organization/edit_base.html
@@ -6,7 +6,7 @@
 
 {% block content_action %}
   {% if organization and h.check_access('organization_update', {'id': organization.id}) %}
-    {% link_for _('View'), named_route=group_type+'.read', id=organization.name, class_='btn btn-default', icon='eye'%}
+    {% link_for _('View'), named_route=group_type+'.read', id=organization.name, class_='btn btn-secondary', icon='eye'%}
   {% endif %}
 {% endblock %}
 
diff --git a/ckan/templates-midnight-blue/organization/manage_members.html b/ckan/templates-midnight-blue/organization/manage_members.html
index 81d34054fa6..9518d398819 100644
--- a/ckan/templates-midnight-blue/organization/manage_members.html
+++ b/ckan/templates-midnight-blue/organization/manage_members.html
@@ -37,7 +37,7 @@ <h3 class="page-heading">{{ members_count }}</h3>
             <td>
               <div class="btn-group pull-right">
                 {% if can_create_members %}
-                  <a class="btn btn-default btn-sm" href="{{ h.url_for(group_type + '.member_new', id=group_dict.id, user=user_id) }}" aria-label="{{ _('Edit role') }}" aria-description="{{ _('Edit the role of the user within the organization') }}" data-bs-title="{{ _('Edit role') }}" data-bs-toggle="tooltip">
+                  <a class="btn btn-secondary btn-sm" href="{{ h.url_for(group_type + '.member_new', id=group_dict.id, user=user_id) }}" aria-label="{{ _('Edit role') }}" aria-description="{{ _('Edit the role of the user within the organization') }}" data-bs-title="{{ _('Edit role') }}" data-bs-toggle="tooltip">
                     <i class="fa fa-wrench"></i>
                   </a>
                 {% endif %}
diff --git a/ckan/templates-midnight-blue/organization/member_new.html b/ckan/templates-midnight-blue/organization/member_new.html
index dc7b8dd0c95..717fd5d907f 100644
--- a/ckan/templates-midnight-blue/organization/member_new.html
+++ b/ckan/templates-midnight-blue/organization/member_new.html
@@ -7,7 +7,7 @@
 {% block subtitle %}{{ _('Edit Member') if user else _('Add Member') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
 
 {% block primary_content_inner %}
-  {% link_for _('Back to all members'), named_route=group_type+'.manage_members', id=organization.name, class_='btn btn-default pull-right', icon='arrow-left' %}
+  {% link_for _('Back to all members'), named_route=group_type+'.manage_members', id=organization.name, class_='btn btn-secondary pull-right', icon='arrow-left' %}
   <h1 class="page-heading">
     {% block page_heading %}{{ _('Edit Member') if user else _('Add Member') }}{% endblock %}
   </h1>
diff --git a/ckan/templates-midnight-blue/organization/read_base.html b/ckan/templates-midnight-blue/organization/read_base.html
index 67913f17954..9e8b1b9fedb 100644
--- a/ckan/templates-midnight-blue/organization/read_base.html
+++ b/ckan/templates-midnight-blue/organization/read_base.html
@@ -11,7 +11,7 @@
 
 {% block content_action %}
   {% if h.check_access('organization_update', {'id': group_dict.id}) %}
-    {% link_for _('Manage'), named_route=group_type+'.edit', id=group_dict.name, class_='btn btn-default', icon='wrench' %}
+    {% link_for _('Manage'), named_route=group_type+'.edit', id=group_dict.name, class_='btn btn-secondary', icon='wrench' %}
   {% endif %}
 {% endblock %}
 
diff --git a/ckan/templates-midnight-blue/package/base_form_page.html b/ckan/templates-midnight-blue/package/base_form_page.html
index fe2b7d5e1d9..464897c27e9 100644
--- a/ckan/templates-midnight-blue/package/base_form_page.html
+++ b/ckan/templates-midnight-blue/package/base_form_page.html
@@ -1,5 +1,7 @@
 {% extends "package/edit_base.html" %}
 
+{% block content_action %}{% endblock %}
+
 {% block primary_content %}
   <section class="module">
     {% block page_header %}{% endblock %}
diff --git a/ckan/templates-midnight-blue/package/collaborators/collaborator_new.html b/ckan/templates-midnight-blue/package/collaborators/collaborator_new.html
index 7bb1315a87f..53cdbc9b936 100644
--- a/ckan/templates-midnight-blue/package/collaborators/collaborator_new.html
+++ b/ckan/templates-midnight-blue/package/collaborators/collaborator_new.html
@@ -5,7 +5,7 @@
 {% block subtitle %}{{ _('Edit Collaborator') if user else _('Add Collaborator') }} - {{ super() }}{% endblock %}
 
 {% block primary_content_inner %}
-  {% link_for _('Back to all collaborators'), named_route='dataset.collaborators_read', id=pkg_dict.name, class_='btn btn-default pull-right', icon='arrow-left' %}
+  {% link_for _('Back to all collaborators'), named_route='dataset.collaborators_read', id=pkg_dict.name, class_='btn btn-secondary pull-right', icon='arrow-left' %}
   <h1 class="page-heading">
     {% block page_heading %}{{ _('Edit Collaborator') if user else _('Add Collaborator') }}{% endblock %}
   </h1>
diff --git a/ckan/templates-midnight-blue/package/collaborators/collaborators.html b/ckan/templates-midnight-blue/package/collaborators/collaborators.html
index 0f4b8747b21..44489691c43 100644
--- a/ckan/templates-midnight-blue/package/collaborators/collaborators.html
+++ b/ckan/templates-midnight-blue/package/collaborators/collaborators.html
@@ -30,7 +30,7 @@ <h3 class="page-heading">{{ collaborators_count }}</h3>
           <td>{{ capacity }}</td>
           <td>
             <div class="btn-group pull-right">
-                <a class="btn btn-default btn-sm" href="{{ h.url_for('dataset.new_collaborator', id=pkg_dict.name, user_id=user_id) }}" aria-label="{{ _('Edit role') }}" data-bs-title="{{ _('Edit role') }}" data-bs-toggle="tooltip">
+                <a class="btn btn-secondary btn-sm" href="{{ h.url_for('dataset.new_collaborator', id=pkg_dict.name, user_id=user_id) }}" aria-label="{{ _('Edit role') }}" data-bs-title="{{ _('Edit role') }}" data-bs-toggle="tooltip">
                 <i class="fa fa-wrench"></i>
               </a>
               <a class="btn btn-danger btn-sm" href="{{ h.url_for('dataset.collaborator_delete', id=pkg_dict.name, user_id=user_id) }}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this collaborator?') }}" aria-label="{{ _('Delete collaborator') }}" aria-description="{{ _('Delete this collaborator from the dataset') }}" data-bs-title="{{ _('Delete collaborator') }}" data-bs-toggle="tooltip">{% block delete_button_text %}<i class="fa fa-times"></i>{% endblock %}</a>
diff --git a/ckan/templates-midnight-blue/package/edit_base.html b/ckan/templates-midnight-blue/package/edit_base.html
index 134d2297fad..d6d7923987a 100644
--- a/ckan/templates-midnight-blue/package/edit_base.html
+++ b/ckan/templates-midnight-blue/package/edit_base.html
@@ -10,7 +10,7 @@
 {% endblock %}
 
 {% block content_action %}
-    {% link_for h.humanize_entity_type('package', pkg.type, 'view label') or _('View dataset'), named_route=pkg.type ~ '.read', id=pkg.name, class_='btn btn-default', icon='eye' %}
+    {% link_for h.humanize_entity_type('package', pkg.type, 'view label') or _('View dataset'), named_route=pkg.type ~ '.read', id=pkg.name, class_='btn btn-secondary', icon='eye' %}
 {% endblock %}
 
 {% block content_primary_nav %}
diff --git a/ckan/templates-midnight-blue/package/edit_view.html b/ckan/templates-midnight-blue/package/edit_view.html
index 61efd59400d..dbdc61f0c35 100644
--- a/ckan/templates-midnight-blue/package/edit_view.html
+++ b/ckan/templates-midnight-blue/package/edit_view.html
@@ -18,7 +18,7 @@
     {% include 'package/snippets/view_form.html' %}
     <div class="form-actions">
       <button class="btn btn-danger pull-left" name="delete" value="Delete"> {{ _('Delete') }} </button>
-      <button class="btn btn-default {% if not h.resource_view_display_preview(data) %}hide{%endif%}" name="preview" value="True" type="submit">{{ _('Preview') }}</button>
+      <button class="btn btn-secondary {% if not h.resource_view_display_preview(data) %}hide{%endif%}" name="preview" value="True" type="submit">{{ _('Preview') }}</button>
       <button class="btn btn-primary" name="save" value="Save" type="submit">{{ _('Update') }}</button>
     </div>
   </form>
diff --git a/ckan/templates-midnight-blue/package/new_view.html b/ckan/templates-midnight-blue/package/new_view.html
index e5d6ad77bcf..5d42e637d8b 100644
--- a/ckan/templates-midnight-blue/package/new_view.html
+++ b/ckan/templates-midnight-blue/package/new_view.html
@@ -17,7 +17,7 @@
     {{ h.csrf_input() }}
     {% include 'package/snippets/view_form.html' %}
     <div class="form-actions">
-        <button class="btn btn-default {% if not h.resource_view_display_preview(data) %}hide{%endif%}" name="preview" value="True" type="submit">{{ _('Preview') }}</button>
+        <button class="btn btn-secondary {% if not h.resource_view_display_preview(data) %}hide{%endif%}" name="preview" value="True" type="submit">{{ _('Preview') }}</button>
         <button class="btn btn-primary" name="save" value="Save" type="submit">{% block save_button_text %}{{ _('Add') }}{% endblock %}</button>
     </div>
   </form>
diff --git a/ckan/templates-midnight-blue/package/resource_edit_base.html b/ckan/templates-midnight-blue/package/resource_edit_base.html
index fac12bd4215..6fc4f73be92 100644
--- a/ckan/templates-midnight-blue/package/resource_edit_base.html
+++ b/ckan/templates-midnight-blue/package/resource_edit_base.html
@@ -15,7 +15,7 @@
 
 {% block content_action %}
     {% if res %}
-	{% link_for _('View resource'), named_route=pkg.type ~ '_resource.read', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='eye' %}
+	{% link_for _('View resource'), named_route=pkg.type ~ '_resource.read', id=pkg.name, resource_id=res.id, class_='btn btn-secondary', icon='eye' %}
   {% endif %}
 {% endblock %}
 
diff --git a/ckan/templates-midnight-blue/package/resource_read.html b/ckan/templates-midnight-blue/package/resource_read.html
index e16c6f27e15..88f9e978e4e 100644
--- a/ckan/templates-midnight-blue/package/resource_read.html
+++ b/ckan/templates-midnight-blue/package/resource_read.html
@@ -29,9 +29,9 @@
               {% block resource_actions_inner %}
                 {% block action_manage %}
                   {% if h.check_access('package_update', {'id':pkg.id }) %}
-                    <li>{% link_for _('Edit resource'), named_route=pkg.type ~ '_resource.edit', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='pencil' %}</li>
+                    <li>{% link_for _('Edit resource'), named_route=pkg.type ~ '_resource.edit', id=pkg.name, resource_id=res.id, class_='btn btn-secondary', icon='pencil' %}</li>
                     {% block action_manage_inner %}{% endblock %}
-                    <li>{% link_for _('Views'), named_route=pkg.type ~ '_resource.views', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='chart-bar' %}</li>
+                    <li>{% link_for _('Views'), named_route=pkg.type ~ '_resource.views', id=pkg.name, resource_id=res.id, class_='btn btn-secondary', icon='chart-bar' %}</li>
                   {% endif %}
                 {% endblock action_manage %}
             {% if res.url and h.is_url(res.url) %}
diff --git a/ckan/templates-midnight-blue/package/snippets/resource_form.html b/ckan/templates-midnight-blue/package/snippets/resource_form.html
index 494459430d2..9052ff80690 100644
--- a/ckan/templates-midnight-blue/package/snippets/resource_form.html
+++ b/ckan/templates-midnight-blue/package/snippets/resource_form.html
@@ -76,11 +76,11 @@
     {% endblock %}
     {% if stage %}
       {% block previous_button %}
-        <button class="btn btn-default" name="save" value="go-dataset" type="submit">{{ _('Previous') }}</button>
+        <button class="btn btn-secondary" name="save" value="go-dataset" type="submit">{{ _('Previous') }}</button>
       {% endblock %}
     {% endif %}
     {% block again_button %}
-      <button class="btn btn-default" name="save" value="again" type="submit">{{ _('Save & add another') }}</button>
+      <button class="btn btn-secondary" name="save" value="again" type="submit">{{ _('Save & add another') }}</button>
     {% endblock %}
     {% if stage %}
       {% block save_button %}
diff --git a/ckan/templates-midnight-blue/package/snippets/resource_upload_field.html b/ckan/templates-midnight-blue/package/snippets/resource_upload_field.html
index 1fafd5cad4b..11b57e58852 100644
--- a/ckan/templates-midnight-blue/package/snippets/resource_upload_field.html
+++ b/ckan/templates-midnight-blue/package/snippets/resource_upload_field.html
@@ -43,14 +43,14 @@
     <div role="group" aria-labelledby="resource-menu-label">
       {% block url_type_select %}
         {% if is_upload_enabled %}
-          <button type="button" class="btn btn-default" id="resource-upload-button"
+          <button type="button" class="btn btn-secondary" id="resource-upload-button"
             aria-label="{{ _('Upload a file on your computer') }}" data-bs-title="{{ _('Upload a file on your computer') }}" data-bs-toggle="tooltip"
             onclick="
               document.getElementById('resource-url-upload').checked = true;
               document.getElementById('field-resource-upload').click();
             "autofocus="true"><i class="fa fa-cloud-upload"></i>{{ _("Upload") }}</button>
         {% endif %}
-        <button type="button" class="btn btn-default" id="resource-link-button"
+        <button type="button" class="btn btn-secondary" id="resource-link-button"
           aria-label="{{ _('Link to a URL on the internet (you can also link to an API)') }}" data-bs-title="{{ _('Link to a URL on the internet (you can also link to an API)') }}" data-bs-toggle="tooltip"
             onclick="
               document.getElementById('resource-url-link').checked = true;
diff --git a/ckan/templates-midnight-blue/package/snippets/resource_view.html b/ckan/templates-midnight-blue/package/snippets/resource_view.html
index 5eec34a17b9..c94d8281598 100644
--- a/ckan/templates-midnight-blue/package/snippets/resource_view.html
+++ b/ckan/templates-midnight-blue/package/snippets/resource_view.html
@@ -3,14 +3,14 @@
 {% block resource_view %}
   <div id="view-{{ resource_view['id'] }}" class="resource-view" data-id="{{ resource_view['id'] }}" data-title="{{ resource_view['title'] }}" data-description="{{ resource_view['descripion'] }}">
   <div class="actions">
-    <a class="btn btn-default"
+    <a class="btn btn-secondary"
        target="_blank"
        rel="noreferrer"
        href="{{ h.url_for(package['type'] ~ '_resource.view', id=package['name'], resource_id=resource['id'], view_id=resource_view['id'], qualified=True) }}">
       <i class="fa fa-arrows-alt"></i>
       {{ _("Fullscreen") }}
     </a>
-    <a class="btn btn-default"
+    <a class="btn btn-secondary"
        href="#embed-{{ resource_view['id'] }}"
        data-module="resource-view-embed"
        data-module-id="{{ resource_view['id'] }}"
@@ -37,7 +37,7 @@
           </p>
           <p id="data-view-error" class="collapse"></p>
           <p>
-            <a href="{{ resource.url }}" class="btn btn-default btn-lg resource-url-analytics" target="_blank" rel="noreferrer">
+            <a href="{{ resource.url }}" class="btn btn-secondary btn-lg resource-url-analytics" target="_blank" rel="noreferrer">
               <i class="fa fa-lg fa-arrow-circle-down"></i>
               {{ _('Download resource') }}
             </a>
diff --git a/ckan/templates-midnight-blue/package/view_edit_base.html b/ckan/templates-midnight-blue/package/view_edit_base.html
index 2df15f5a488..5f9e96ea2cf 100644
--- a/ckan/templates-midnight-blue/package/view_edit_base.html
+++ b/ckan/templates-midnight-blue/package/view_edit_base.html
@@ -6,10 +6,10 @@
 {% block breadcrumb_edit_selected %}{% endblock %}
 
 {% block content_action %}
-  {% link_for _('All views'), named_route=pkg.type ~ '_resource.views', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='arrow-left' %}
+  {% link_for _('All views'), named_route=pkg.type ~ '_resource.views', id=pkg.name, resource_id=res.id, class_='btn btn-secondary', icon='arrow-left' %}
   {% if res %}
     {% set url = h.url_for(pkg.type ~ '_resource.read', id=pkg.name, resource_id=res.id) ~ '?view_id=' ~ resource_view.id %}
-    <a href="{{ url }}" class="btn btn-default"><i class="fa fa-eye"></i> {{ _('View view') }}</a>
+    <a href="{{ url }}" class="btn btn-secondary"><i class="fa fa-eye"></i> {{ _('View view') }}</a>
   {% endif %}
 {% endblock %}
 
diff --git a/ckan/templates-midnight-blue/page.html b/ckan/templates-midnight-blue/page.html
index 254bc13efe3..c842aee6b5c 100644
--- a/ckan/templates-midnight-blue/page.html
+++ b/ckan/templates-midnight-blue/page.html
@@ -45,16 +45,21 @@
             </div>
           {% endblock %}
 
-          <div class="row wrapper{% block wrapper_class %}{% endblock %}{% if self.secondary()|trim == '' or c.action=='resource_read' %} no-nav{% endif %}">
+          <div class="row {% block wrapper_class %}{% endblock %}{% if self.secondary()|trim == '' or c.action=='resource_read' %} no-nav{% endif %}">
             {#
             The pre_primary block can be used to add content to before the
             rendering of the main content columns of the page.
             #}
             {% block pre_primary %}
+              {% if self.content_action() | trim %}
+                <div class="content_action">
+                  {% block content_action %}{% endblock %}
+                </div>
+              {% endif %}
             {% endblock %}
 
             {% block secondary %}
-              <aside class="secondary col-md-3">
+              <aside class="secondary col-md-4 col-lg-3">
                 {#
                 The secondary_content block can be used to add content to the
                 sidebar of the page. This is the main block that is likely to be
@@ -72,7 +77,7 @@ <h2>A sidebar item</h2>
             {% endblock %}
 
             {% block primary %}
-              <div class="primary col-md-9 col-xs-12" role="main">
+              <div class="primary col-md-8 col-lg-9 col-xs-12" role="main">
                 {#
                 The primary_content block can be used to add content to the page.
                 This is the main block that is likely to be used within a template.
@@ -88,11 +93,6 @@ <h1>My page content</h1>
                   <article class="module">
                     {% block page_header %}
                       <header class="module-content page-header">
-                        {% if self.content_action() | trim %}
-                          <div class="content_action">
-                            {% block content_action %}{% endblock %}
-                          </div>
-                        {% endif %}
                         <ul class="nav nav-pills">
                           {% block content_primary_nav %}{% endblock %}
                         </ul>
diff --git a/ckan/templates-midnight-blue/snippets/language_selector.html b/ckan/templates-midnight-blue/snippets/language_selector.html
index 16c387754ae..3162b19c0ae 100644
--- a/ckan/templates-midnight-blue/snippets/language_selector.html
+++ b/ckan/templates-midnight-blue/snippets/language_selector.html
@@ -1,6 +1,6 @@
 {% set current_lang = request.environ.CKAN_LANG %}
 <form class="lang-select" action="{% url_for 'util.internal_redirect' %}" data-module="select-switch" method="POST">
-  {{ h.csrf_input() }} 
+  {{ h.csrf_input() }}
   <div class="form-group">
     <label for="field-lang-select">{{ _('Language') }}</label>
     <select id="field-lang-select" name="url" data-module="autocomplete" data-module-dropdown-class="lang-dropdown" data-module-container-class="lang-container">
@@ -11,7 +11,7 @@
       {% endfor %}
     </select>
   </div>
-  <button class="btn btn-default d-none " type="submit">{{ _('Go') }}</button>
+  <button class="btn btn-secondary d-none " type="submit">{{ _('Go') }}</button>
 </form>
 
 
diff --git a/ckan/templates-midnight-blue/snippets/search_form.html b/ckan/templates-midnight-blue/snippets/search_form.html
index 1966217465b..003320ae2a2 100644
--- a/ckan/templates-midnight-blue/snippets/search_form.html
+++ b/ckan/templates-midnight-blue/snippets/search_form.html
@@ -13,7 +13,7 @@
       <input aria-label="{% block header_site_search_label %}{{ placeholder }}{% endblock %}" id="field-giant-search" type="text" class="form-control input-lg" name="q" value="{{ query }}" autocomplete="off" placeholder="{{ placeholder }}">
       {% block search_input_button %}
       <span class="input-group-btn">
-        <button class="btn btn-default btn-lg" type="submit" value="search" aria-label="{{_('Submit')}}">
+        <button class="btn btn-secondary btn-lg" type="submit" value="search" aria-label="{{_('Submit')}}">
           <i class="fa fa-search"></i>
         </button>
       </span>
@@ -39,20 +39,20 @@
           {% endfor %}
         </select>
         {% block search_sortby_button %}
-        <button class="btn btn-default js-hide" type="submit">{{ _('Go') }}</button>
+        <button class="btn btn-secondary js-hide" type="submit">{{ _('Go') }}</button>
         {% endblock %}
       </div>
     {% endif %}
   {% endblock %}
 
   {% block search_title %}
-    <h1>
+    <h2>
     {% if not error %}
       {% snippet 'snippets/search_result_text.html', query=query, count=count, type=type %}
     {% else %}
       Error
     {% endif %}
-    </h1>
+    </h2>
   {% endblock %}
 
   {% block search_facets %}
@@ -73,7 +73,7 @@ <h1>
           {% endfor %}
         {% endfor %}
       </p>
-      <a class="show-filters btn btn-default">{{ _('Filter Results') }}</a>
+      <a class="show-filters btn btn-secondary">{{ _('Filter Results') }}</a>
     {% endif %}
   {% endblock %}
 
diff --git a/ckan/templates-midnight-blue/snippets/simple_search.html b/ckan/templates-midnight-blue/snippets/simple_search.html
index 6bc6a53e59c..c1c58ae4bd7 100644
--- a/ckan/templates-midnight-blue/snippets/simple_search.html
+++ b/ckan/templates-midnight-blue/snippets/simple_search.html
@@ -12,6 +12,6 @@
         <option value="{{ item[1] }}"{% if sort==item[1] %} selected="selected"{% endif %}>{{ item[0] }}</option>
       {% endfor %}
     </select>
-    <button class="btn btn-default js-hide" type="submit">{{ _('Go') }}</button>
+    <button class="btn btn-secondary js-hide" type="submit">{{ _('Go') }}</button>
   </span>
 </form>
diff --git a/ckan/templates-midnight-blue/user/dashboard.html b/ckan/templates-midnight-blue/user/dashboard.html
index 25a5eda2c7f..7f49d2fe5b8 100644
--- a/ckan/templates-midnight-blue/user/dashboard.html
+++ b/ckan/templates-midnight-blue/user/dashboard.html
@@ -17,7 +17,7 @@
     {% block page_header %}
       <header class="module-content page-header hug">
         <div class="content_action">
-          {% link_for _('Profile settings'), named_route='user.edit', id=user.name, class_='btn btn-default', icon='cog' %}
+          {% link_for _('Profile settings'), named_route='user.edit', id=user.name, class_='btn btn-secondary', icon='cog' %}
         </div>
       {% block content_primary_nav %}
         <ul class="nav nav-tabs">
diff --git a/ckan/templates-midnight-blue/user/logout_first.html b/ckan/templates-midnight-blue/user/logout_first.html
index b9c7af1147f..8109ca2386e 100644
--- a/ckan/templates-midnight-blue/user/logout_first.html
+++ b/ckan/templates-midnight-blue/user/logout_first.html
@@ -17,5 +17,5 @@
 
 {% block primary_content_inner %}
   <p>{{ _("You need to log out before you can log in with another account.") }}</p>
-  <a class="btn btn-default" href="{{ logout_url }}">{{ _("Log out now") }}</a>
-{% endblock %}
\ No newline at end of file
+  <a class="btn btn-secondary" href="{{ logout_url }}">{{ _("Log out now") }}</a>
+{% endblock %}
diff --git a/ckan/templates-midnight-blue/user/read_base.html b/ckan/templates-midnight-blue/user/read_base.html
index 223ba814351..b5c458f5814 100644
--- a/ckan/templates-midnight-blue/user/read_base.html
+++ b/ckan/templates-midnight-blue/user/read_base.html
@@ -14,7 +14,7 @@
 
 {% block content_action %}
   {% if h.check_access('user_update', user) %}
-    {% link_for _('Manage'), named_route='user.edit', id=user.name, class_='btn btn-default', icon='wrench' %}
+    {% link_for _('Manage'), named_route='user.edit', id=user.name, class_='btn btn-secondary', icon='wrench' %}
   {% endif %}
 {% endblock %}
 
diff --git a/ckan/templates/development/primer.html b/ckan/templates/development/primer.html
index fe4ddc8d5b7..1c2d7798150 100644
--- a/ckan/templates/development/primer.html
+++ b/ckan/templates/development/primer.html
@@ -31,7 +31,7 @@ <h2 class="module-heading"><i class="fa fa-info-circle"></i> Helper text</h2>
   <div class="input-group input-group-lg search-giant">
     <input type="text" class="search form-control" name="q" value="" autocomplete="off" placeholder="Search something...">
     <span class="input-group-btn">
-        <button class="btn btn-default" type="submit">
+        <button class="btn btn-secondary" type="submit">
           <i class="fa fa-search"></i>
           <span class="sr-only">Search</span>
         </button>
diff --git a/ckan/templates/development/snippets/actions.html b/ckan/templates/development/snippets/actions.html
index fe9519c869c..015c74bc862 100644
--- a/ckan/templates/development/snippets/actions.html
+++ b/ckan/templates/development/snippets/actions.html
@@ -1,2 +1,2 @@
-<li><a class="btn btn-default" href="#"><i class="fa fa-wrench"></i> Button</a></li>
+<li><a class="btn btn-secondary" href="#"><i class="fa fa-wrench"></i> Button</a></li>
 <li><a class="btn btn-primary" href="#"><i class="fa fa-wrench"></i> Primary Button</a></li>
diff --git a/ckan/templates/group/edit_base.html b/ckan/templates/group/edit_base.html
index 8114b27599e..d07396de99c 100644
--- a/ckan/templates/group/edit_base.html
+++ b/ckan/templates/group/edit_base.html
@@ -6,7 +6,7 @@
 {% set group = group_dict %}
 
 {% block content_action %}
-  {% link_for _('View'), named_route=group_type+'.read', id=group_dict.name, class_='btn btn-default', icon='eye' %}
+  {% link_for _('View'), named_route=group_type+'.read', id=group_dict.name, class_='btn btn-secondary', icon='eye' %}
 {% endblock %}
 
 {% block content_primary_nav %}
diff --git a/ckan/templates/group/manage_members.html b/ckan/templates/group/manage_members.html
index 585cbab4ac6..f074a40dffc 100644
--- a/ckan/templates/group/manage_members.html
+++ b/ckan/templates/group/manage_members.html
@@ -26,7 +26,7 @@ <h3 class="page-heading">{{ _('{0} members'.format(members|length)) }}</h3>
         <td>{{ role }}</td>
         <td>
           <div class="btn-group pull-right">
-            <a class="btn btn-default btn-sm" href="{{ h.url_for(group_type + '.member_new', id=group_dict.id, user=user_id) }}" aria-label="{{ _('Edit role') }}" aria-description="{{ _('Edit the role of the user within the group') }}" data-bs-title="{{ _('Edit role') }}" data-bs-toggle="tooltip">
+            <a class="btn btn-secondary btn-sm" href="{{ h.url_for(group_type + '.member_new', id=group_dict.id, user=user_id) }}" aria-label="{{ _('Edit role') }}" aria-description="{{ _('Edit the role of the user within the group') }}" data-bs-title="{{ _('Edit role') }}" data-bs-toggle="tooltip">
               <i class="fa fa-wrench"></i>
             </a>
             <a class="btn btn-danger btn-sm" href="{{ h.url_for(group_type + '.member_delete', id=group_dict.id, user=user_id) }}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}" aria-label="{{ _('Delete member') }}" aria-description="{{ _('Delete this member from the group') }}" data-bs-title="{{ _('Delete member') }}" data-bs-toggle="tooltip">{% block delete_button_text %}<i class="fa fa-times"></i>{% endblock %}</a>
diff --git a/ckan/templates/group/member_new.html b/ckan/templates/group/member_new.html
index bcd3e50b118..7309b167ed3 100644
--- a/ckan/templates/group/member_new.html
+++ b/ckan/templates/group/member_new.html
@@ -5,7 +5,7 @@
 {% set user = user_dict %}
 
 {% block primary_content_inner %}
-  {% link_for _('Back to all members'), named_route=group_type+'.manage_members', id=group.name, class_='btn btn-default pull-right', icon='arrow-left' %}
+  {% link_for _('Back to all members'), named_route=group_type+'.manage_members', id=group.name, class_='btn btn-secondary pull-right', icon='arrow-left' %}
   <h1 class="page-heading">
     {% block page_heading %}{{ _('Edit Member') if user else _('Add Member') }}{% endblock %}
   </h1>
diff --git a/ckan/templates/group/read_base.html b/ckan/templates/group/read_base.html
index f9a63912e58..3b00aeda367 100644
--- a/ckan/templates/group/read_base.html
+++ b/ckan/templates/group/read_base.html
@@ -10,7 +10,7 @@
 
 {% block content_action %}
   {% if h.check_access('group_update', {'id': group_dict.id}) %}
-    {% link_for _('Manage'), named_route=group_type+'.edit', id=group_dict.name, class_='btn btn-default', icon='wrench' %}
+    {% link_for _('Manage'), named_route=group_type+'.edit', id=group_dict.name, class_='btn btn-secondary', icon='wrench' %}
   {% endif %}
 {% endblock %}
 
diff --git a/ckan/templates/organization/bulk_process.html b/ckan/templates/organization/bulk_process.html
index 69f0679950c..7ee57043b90 100644
--- a/ckan/templates/organization/bulk_process.html
+++ b/ckan/templates/organization/bulk_process.html
@@ -45,11 +45,11 @@ <h3 class="page-heading">
                   <th></th>
                   <th class="table-actions">
                     <div class="btn-group">
-                      <button name="bulk_action.public" value="public" class="btn btn-default" type="submit">
+                      <button name="bulk_action.public" value="public" class="btn btn-secondary" type="submit">
                         <i class="fa fa-eye"></i>
                         {{ _('Make public') }}
                       </button>
-                      <button name="bulk_action.private" value="private" class="btn btn-default" type="submit">
+                      <button name="bulk_action.private" value="private" class="btn btn-secondary" type="submit">
                         <i class="fa fa-eye-slash"></i>
                         {{ _('Make private') }}
                       </button>
diff --git a/ckan/templates/organization/edit_base.html b/ckan/templates/organization/edit_base.html
index 69ab2f8de49..91539ae62c1 100644
--- a/ckan/templates/organization/edit_base.html
+++ b/ckan/templates/organization/edit_base.html
@@ -6,7 +6,7 @@
 
 {% block content_action %}
   {% if organization and h.check_access('organization_update', {'id': organization.id}) %}
-    {% link_for _('View'), named_route=group_type+'.read', id=organization.name, class_='btn btn-default', icon='eye'%}
+    {% link_for _('View'), named_route=group_type+'.read', id=organization.name, class_='btn btn-secondary', icon='eye'%}
   {% endif %}
 {% endblock %}
 
diff --git a/ckan/templates/organization/manage_members.html b/ckan/templates/organization/manage_members.html
index 81d34054fa6..9518d398819 100644
--- a/ckan/templates/organization/manage_members.html
+++ b/ckan/templates/organization/manage_members.html
@@ -37,7 +37,7 @@ <h3 class="page-heading">{{ members_count }}</h3>
             <td>
               <div class="btn-group pull-right">
                 {% if can_create_members %}
-                  <a class="btn btn-default btn-sm" href="{{ h.url_for(group_type + '.member_new', id=group_dict.id, user=user_id) }}" aria-label="{{ _('Edit role') }}" aria-description="{{ _('Edit the role of the user within the organization') }}" data-bs-title="{{ _('Edit role') }}" data-bs-toggle="tooltip">
+                  <a class="btn btn-secondary btn-sm" href="{{ h.url_for(group_type + '.member_new', id=group_dict.id, user=user_id) }}" aria-label="{{ _('Edit role') }}" aria-description="{{ _('Edit the role of the user within the organization') }}" data-bs-title="{{ _('Edit role') }}" data-bs-toggle="tooltip">
                     <i class="fa fa-wrench"></i>
                   </a>
                 {% endif %}
diff --git a/ckan/templates/organization/member_new.html b/ckan/templates/organization/member_new.html
index dc7b8dd0c95..717fd5d907f 100644
--- a/ckan/templates/organization/member_new.html
+++ b/ckan/templates/organization/member_new.html
@@ -7,7 +7,7 @@
 {% block subtitle %}{{ _('Edit Member') if user else _('Add Member') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
 
 {% block primary_content_inner %}
-  {% link_for _('Back to all members'), named_route=group_type+'.manage_members', id=organization.name, class_='btn btn-default pull-right', icon='arrow-left' %}
+  {% link_for _('Back to all members'), named_route=group_type+'.manage_members', id=organization.name, class_='btn btn-secondary pull-right', icon='arrow-left' %}
   <h1 class="page-heading">
     {% block page_heading %}{{ _('Edit Member') if user else _('Add Member') }}{% endblock %}
   </h1>
diff --git a/ckan/templates/organization/read_base.html b/ckan/templates/organization/read_base.html
index 67913f17954..9e8b1b9fedb 100644
--- a/ckan/templates/organization/read_base.html
+++ b/ckan/templates/organization/read_base.html
@@ -11,7 +11,7 @@
 
 {% block content_action %}
   {% if h.check_access('organization_update', {'id': group_dict.id}) %}
-    {% link_for _('Manage'), named_route=group_type+'.edit', id=group_dict.name, class_='btn btn-default', icon='wrench' %}
+    {% link_for _('Manage'), named_route=group_type+'.edit', id=group_dict.name, class_='btn btn-secondary', icon='wrench' %}
   {% endif %}
 {% endblock %}
 
diff --git a/ckan/templates/package/collaborators/collaborator_new.html b/ckan/templates/package/collaborators/collaborator_new.html
index 7bb1315a87f..53cdbc9b936 100644
--- a/ckan/templates/package/collaborators/collaborator_new.html
+++ b/ckan/templates/package/collaborators/collaborator_new.html
@@ -5,7 +5,7 @@
 {% block subtitle %}{{ _('Edit Collaborator') if user else _('Add Collaborator') }} - {{ super() }}{% endblock %}
 
 {% block primary_content_inner %}
-  {% link_for _('Back to all collaborators'), named_route='dataset.collaborators_read', id=pkg_dict.name, class_='btn btn-default pull-right', icon='arrow-left' %}
+  {% link_for _('Back to all collaborators'), named_route='dataset.collaborators_read', id=pkg_dict.name, class_='btn btn-secondary pull-right', icon='arrow-left' %}
   <h1 class="page-heading">
     {% block page_heading %}{{ _('Edit Collaborator') if user else _('Add Collaborator') }}{% endblock %}
   </h1>
diff --git a/ckan/templates/package/collaborators/collaborators.html b/ckan/templates/package/collaborators/collaborators.html
index 0f4b8747b21..44489691c43 100644
--- a/ckan/templates/package/collaborators/collaborators.html
+++ b/ckan/templates/package/collaborators/collaborators.html
@@ -30,7 +30,7 @@ <h3 class="page-heading">{{ collaborators_count }}</h3>
           <td>{{ capacity }}</td>
           <td>
             <div class="btn-group pull-right">
-                <a class="btn btn-default btn-sm" href="{{ h.url_for('dataset.new_collaborator', id=pkg_dict.name, user_id=user_id) }}" aria-label="{{ _('Edit role') }}" data-bs-title="{{ _('Edit role') }}" data-bs-toggle="tooltip">
+                <a class="btn btn-secondary btn-sm" href="{{ h.url_for('dataset.new_collaborator', id=pkg_dict.name, user_id=user_id) }}" aria-label="{{ _('Edit role') }}" data-bs-title="{{ _('Edit role') }}" data-bs-toggle="tooltip">
                 <i class="fa fa-wrench"></i>
               </a>
               <a class="btn btn-danger btn-sm" href="{{ h.url_for('dataset.collaborator_delete', id=pkg_dict.name, user_id=user_id) }}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this collaborator?') }}" aria-label="{{ _('Delete collaborator') }}" aria-description="{{ _('Delete this collaborator from the dataset') }}" data-bs-title="{{ _('Delete collaborator') }}" data-bs-toggle="tooltip">{% block delete_button_text %}<i class="fa fa-times"></i>{% endblock %}</a>
diff --git a/ckan/templates/package/edit_base.html b/ckan/templates/package/edit_base.html
index 134d2297fad..d6d7923987a 100644
--- a/ckan/templates/package/edit_base.html
+++ b/ckan/templates/package/edit_base.html
@@ -10,7 +10,7 @@
 {% endblock %}
 
 {% block content_action %}
-    {% link_for h.humanize_entity_type('package', pkg.type, 'view label') or _('View dataset'), named_route=pkg.type ~ '.read', id=pkg.name, class_='btn btn-default', icon='eye' %}
+    {% link_for h.humanize_entity_type('package', pkg.type, 'view label') or _('View dataset'), named_route=pkg.type ~ '.read', id=pkg.name, class_='btn btn-secondary', icon='eye' %}
 {% endblock %}
 
 {% block content_primary_nav %}
diff --git a/ckan/templates/package/edit_view.html b/ckan/templates/package/edit_view.html
index 61efd59400d..dbdc61f0c35 100644
--- a/ckan/templates/package/edit_view.html
+++ b/ckan/templates/package/edit_view.html
@@ -18,7 +18,7 @@
     {% include 'package/snippets/view_form.html' %}
     <div class="form-actions">
       <button class="btn btn-danger pull-left" name="delete" value="Delete"> {{ _('Delete') }} </button>
-      <button class="btn btn-default {% if not h.resource_view_display_preview(data) %}hide{%endif%}" name="preview" value="True" type="submit">{{ _('Preview') }}</button>
+      <button class="btn btn-secondary {% if not h.resource_view_display_preview(data) %}hide{%endif%}" name="preview" value="True" type="submit">{{ _('Preview') }}</button>
       <button class="btn btn-primary" name="save" value="Save" type="submit">{{ _('Update') }}</button>
     </div>
   </form>
diff --git a/ckan/templates/package/new_view.html b/ckan/templates/package/new_view.html
index e5d6ad77bcf..5d42e637d8b 100644
--- a/ckan/templates/package/new_view.html
+++ b/ckan/templates/package/new_view.html
@@ -17,7 +17,7 @@
     {{ h.csrf_input() }}
     {% include 'package/snippets/view_form.html' %}
     <div class="form-actions">
-        <button class="btn btn-default {% if not h.resource_view_display_preview(data) %}hide{%endif%}" name="preview" value="True" type="submit">{{ _('Preview') }}</button>
+        <button class="btn btn-secondary {% if not h.resource_view_display_preview(data) %}hide{%endif%}" name="preview" value="True" type="submit">{{ _('Preview') }}</button>
         <button class="btn btn-primary" name="save" value="Save" type="submit">{% block save_button_text %}{{ _('Add') }}{% endblock %}</button>
     </div>
   </form>
diff --git a/ckan/templates/package/resource_edit_base.html b/ckan/templates/package/resource_edit_base.html
index fac12bd4215..6fc4f73be92 100644
--- a/ckan/templates/package/resource_edit_base.html
+++ b/ckan/templates/package/resource_edit_base.html
@@ -15,7 +15,7 @@
 
 {% block content_action %}
     {% if res %}
-	{% link_for _('View resource'), named_route=pkg.type ~ '_resource.read', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='eye' %}
+	{% link_for _('View resource'), named_route=pkg.type ~ '_resource.read', id=pkg.name, resource_id=res.id, class_='btn btn-secondary', icon='eye' %}
   {% endif %}
 {% endblock %}
 
diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html
index 275dd1828eb..e77e198d3e8 100644
--- a/ckan/templates/package/resource_read.html
+++ b/ckan/templates/package/resource_read.html
@@ -29,9 +29,9 @@
               {% block resource_actions_inner %}
                 {% block action_manage %}
                   {% if h.check_access('package_update', {'id':pkg.id }) %}
-                    <li>{% link_for _('Edit resource'), named_route=pkg.type ~ '_resource.edit', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='pencil' %}</li>
+                    <li>{% link_for _('Edit resource'), named_route=pkg.type ~ '_resource.edit', id=pkg.name, resource_id=res.id, class_='btn btn-secondary', icon='pencil' %}</li>
                     {% block action_manage_inner %}{% endblock %}
-                    <li>{% link_for _('Views'), named_route=pkg.type ~ '_resource.views', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='chart-bar' %}</li>
+                    <li>{% link_for _('Views'), named_route=pkg.type ~ '_resource.views', id=pkg.name, resource_id=res.id, class_='btn btn-secondary', icon='chart-bar' %}</li>
                   {% endif %}
                 {% endblock action_manage %}
             {% if res.url and h.is_url(res.url) %}
diff --git a/ckan/templates/package/snippets/resource_form.html b/ckan/templates/package/snippets/resource_form.html
index 494459430d2..9052ff80690 100644
--- a/ckan/templates/package/snippets/resource_form.html
+++ b/ckan/templates/package/snippets/resource_form.html
@@ -76,11 +76,11 @@
     {% endblock %}
     {% if stage %}
       {% block previous_button %}
-        <button class="btn btn-default" name="save" value="go-dataset" type="submit">{{ _('Previous') }}</button>
+        <button class="btn btn-secondary" name="save" value="go-dataset" type="submit">{{ _('Previous') }}</button>
       {% endblock %}
     {% endif %}
     {% block again_button %}
-      <button class="btn btn-default" name="save" value="again" type="submit">{{ _('Save & add another') }}</button>
+      <button class="btn btn-secondary" name="save" value="again" type="submit">{{ _('Save & add another') }}</button>
     {% endblock %}
     {% if stage %}
       {% block save_button %}
diff --git a/ckan/templates/package/snippets/resource_upload_field.html b/ckan/templates/package/snippets/resource_upload_field.html
index 1fafd5cad4b..11b57e58852 100644
--- a/ckan/templates/package/snippets/resource_upload_field.html
+++ b/ckan/templates/package/snippets/resource_upload_field.html
@@ -43,14 +43,14 @@
     <div role="group" aria-labelledby="resource-menu-label">
       {% block url_type_select %}
         {% if is_upload_enabled %}
-          <button type="button" class="btn btn-default" id="resource-upload-button"
+          <button type="button" class="btn btn-secondary" id="resource-upload-button"
             aria-label="{{ _('Upload a file on your computer') }}" data-bs-title="{{ _('Upload a file on your computer') }}" data-bs-toggle="tooltip"
             onclick="
               document.getElementById('resource-url-upload').checked = true;
               document.getElementById('field-resource-upload').click();
             "autofocus="true"><i class="fa fa-cloud-upload"></i>{{ _("Upload") }}</button>
         {% endif %}
-        <button type="button" class="btn btn-default" id="resource-link-button"
+        <button type="button" class="btn btn-secondary" id="resource-link-button"
           aria-label="{{ _('Link to a URL on the internet (you can also link to an API)') }}" data-bs-title="{{ _('Link to a URL on the internet (you can also link to an API)') }}" data-bs-toggle="tooltip"
             onclick="
               document.getElementById('resource-url-link').checked = true;
diff --git a/ckan/templates/package/snippets/resource_view.html b/ckan/templates/package/snippets/resource_view.html
index 5eec34a17b9..c94d8281598 100644
--- a/ckan/templates/package/snippets/resource_view.html
+++ b/ckan/templates/package/snippets/resource_view.html
@@ -3,14 +3,14 @@
 {% block resource_view %}
   <div id="view-{{ resource_view['id'] }}" class="resource-view" data-id="{{ resource_view['id'] }}" data-title="{{ resource_view['title'] }}" data-description="{{ resource_view['descripion'] }}">
   <div class="actions">
-    <a class="btn btn-default"
+    <a class="btn btn-secondary"
        target="_blank"
        rel="noreferrer"
        href="{{ h.url_for(package['type'] ~ '_resource.view', id=package['name'], resource_id=resource['id'], view_id=resource_view['id'], qualified=True) }}">
       <i class="fa fa-arrows-alt"></i>
       {{ _("Fullscreen") }}
     </a>
-    <a class="btn btn-default"
+    <a class="btn btn-secondary"
        href="#embed-{{ resource_view['id'] }}"
        data-module="resource-view-embed"
        data-module-id="{{ resource_view['id'] }}"
@@ -37,7 +37,7 @@
           </p>
           <p id="data-view-error" class="collapse"></p>
           <p>
-            <a href="{{ resource.url }}" class="btn btn-default btn-lg resource-url-analytics" target="_blank" rel="noreferrer">
+            <a href="{{ resource.url }}" class="btn btn-secondary btn-lg resource-url-analytics" target="_blank" rel="noreferrer">
               <i class="fa fa-lg fa-arrow-circle-down"></i>
               {{ _('Download resource') }}
             </a>
diff --git a/ckan/templates/package/view_edit_base.html b/ckan/templates/package/view_edit_base.html
index 2df15f5a488..5f9e96ea2cf 100644
--- a/ckan/templates/package/view_edit_base.html
+++ b/ckan/templates/package/view_edit_base.html
@@ -6,10 +6,10 @@
 {% block breadcrumb_edit_selected %}{% endblock %}
 
 {% block content_action %}
-  {% link_for _('All views'), named_route=pkg.type ~ '_resource.views', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='arrow-left' %}
+  {% link_for _('All views'), named_route=pkg.type ~ '_resource.views', id=pkg.name, resource_id=res.id, class_='btn btn-secondary', icon='arrow-left' %}
   {% if res %}
     {% set url = h.url_for(pkg.type ~ '_resource.read', id=pkg.name, resource_id=res.id) ~ '?view_id=' ~ resource_view.id %}
-    <a href="{{ url }}" class="btn btn-default"><i class="fa fa-eye"></i> {{ _('View view') }}</a>
+    <a href="{{ url }}" class="btn btn-secondary"><i class="fa fa-eye"></i> {{ _('View view') }}</a>
   {% endif %}
 {% endblock %}
 
diff --git a/ckan/templates/snippets/language_selector.html b/ckan/templates/snippets/language_selector.html
index 16c387754ae..3162b19c0ae 100644
--- a/ckan/templates/snippets/language_selector.html
+++ b/ckan/templates/snippets/language_selector.html
@@ -1,6 +1,6 @@
 {% set current_lang = request.environ.CKAN_LANG %}
 <form class="lang-select" action="{% url_for 'util.internal_redirect' %}" data-module="select-switch" method="POST">
-  {{ h.csrf_input() }} 
+  {{ h.csrf_input() }}
   <div class="form-group">
     <label for="field-lang-select">{{ _('Language') }}</label>
     <select id="field-lang-select" name="url" data-module="autocomplete" data-module-dropdown-class="lang-dropdown" data-module-container-class="lang-container">
@@ -11,7 +11,7 @@
       {% endfor %}
     </select>
   </div>
-  <button class="btn btn-default d-none " type="submit">{{ _('Go') }}</button>
+  <button class="btn btn-secondary d-none " type="submit">{{ _('Go') }}</button>
 </form>
 
 
diff --git a/ckan/templates/snippets/search_form.html b/ckan/templates/snippets/search_form.html
index 1966217465b..cdecf171ba1 100644
--- a/ckan/templates/snippets/search_form.html
+++ b/ckan/templates/snippets/search_form.html
@@ -13,7 +13,7 @@
       <input aria-label="{% block header_site_search_label %}{{ placeholder }}{% endblock %}" id="field-giant-search" type="text" class="form-control input-lg" name="q" value="{{ query }}" autocomplete="off" placeholder="{{ placeholder }}">
       {% block search_input_button %}
       <span class="input-group-btn">
-        <button class="btn btn-default btn-lg" type="submit" value="search" aria-label="{{_('Submit')}}">
+        <button class="btn btn-secondary btn-lg" type="submit" value="search" aria-label="{{_('Submit')}}">
           <i class="fa fa-search"></i>
         </button>
       </span>
@@ -39,7 +39,7 @@
           {% endfor %}
         </select>
         {% block search_sortby_button %}
-        <button class="btn btn-default js-hide" type="submit">{{ _('Go') }}</button>
+        <button class="btn btn-secondary js-hide" type="submit">{{ _('Go') }}</button>
         {% endblock %}
       </div>
     {% endif %}
@@ -73,7 +73,7 @@ <h1>
           {% endfor %}
         {% endfor %}
       </p>
-      <a class="show-filters btn btn-default">{{ _('Filter Results') }}</a>
+      <a class="show-filters btn btn-secondary">{{ _('Filter Results') }}</a>
     {% endif %}
   {% endblock %}
 
diff --git a/ckan/templates/snippets/simple_search.html b/ckan/templates/snippets/simple_search.html
index 6bc6a53e59c..c1c58ae4bd7 100644
--- a/ckan/templates/snippets/simple_search.html
+++ b/ckan/templates/snippets/simple_search.html
@@ -12,6 +12,6 @@
         <option value="{{ item[1] }}"{% if sort==item[1] %} selected="selected"{% endif %}>{{ item[0] }}</option>
       {% endfor %}
     </select>
-    <button class="btn btn-default js-hide" type="submit">{{ _('Go') }}</button>
+    <button class="btn btn-secondary js-hide" type="submit">{{ _('Go') }}</button>
   </span>
 </form>
diff --git a/ckan/templates/user/dashboard.html b/ckan/templates/user/dashboard.html
index 25a5eda2c7f..7f49d2fe5b8 100644
--- a/ckan/templates/user/dashboard.html
+++ b/ckan/templates/user/dashboard.html
@@ -17,7 +17,7 @@
     {% block page_header %}
       <header class="module-content page-header hug">
         <div class="content_action">
-          {% link_for _('Profile settings'), named_route='user.edit', id=user.name, class_='btn btn-default', icon='cog' %}
+          {% link_for _('Profile settings'), named_route='user.edit', id=user.name, class_='btn btn-secondary', icon='cog' %}
         </div>
       {% block content_primary_nav %}
         <ul class="nav nav-tabs">
diff --git a/ckan/templates/user/login.html b/ckan/templates/user/login.html
index 432505e97df..097380a2310 100644
--- a/ckan/templates/user/login.html
+++ b/ckan/templates/user/login.html
@@ -27,7 +27,7 @@ <h2 class="module-heading">{{ _('Need an Account?') }}</h2>
         <p>{% trans %}Then sign right up, it only takes a minute.{% endtrans %}</p>
         <p class="action">
         {% block help_register_button %}
-          <a class="btn btn-default" href="{{ h.url_for('user.register') }}">{{ _('Create an Account') }}</a>
+          <a class="btn btn-secondary" href="{{ h.url_for('user.register') }}">{{ _('Create an Account') }}</a>
         {% endblock %}
         </p>
       </div>
@@ -44,7 +44,7 @@ <h2 class="module-heading">{{ _('Forgotten your password?') }}</h2>
       <p>{% trans %}No problem, use our password recovery form to reset it.{% endtrans %}</p>
       <p class="action">
         {% block help_forgotten_button %}
-        <a class="btn btn-default" href="{{ h.url_for('user.request_reset') }}">{{ _('Forgot your password?') }}</a>
+        <a class="btn btn-secondary" href="{{ h.url_for('user.request_reset') }}">{{ _('Forgot your password?') }}</a>
         {% endblock %}
       </p>
     </div>
diff --git a/ckan/templates/user/logout_first.html b/ckan/templates/user/logout_first.html
index 1aacd6fff91..ee8cf307b29 100644
--- a/ckan/templates/user/logout_first.html
+++ b/ckan/templates/user/logout_first.html
@@ -20,7 +20,7 @@
     <h2 class="module-heading">{{ _("You're already logged in") }}</h2>
     <div class="module-content">
       <p>{{ _("You need to log out before you can log in with another account.") }}</p>
-      <p class="action"><a class="btn btn-default" href="{{ logout_url }}">{{ _("Log out now") }}</a></p>
+      <p class="action"><a class="btn btn-secondary" href="{{ logout_url }}">{{ _("Log out now") }}</a></p>
     </div>
   </section>
 {% endblock %}
diff --git a/ckan/templates/user/read_base.html b/ckan/templates/user/read_base.html
index 223ba814351..b5c458f5814 100644
--- a/ckan/templates/user/read_base.html
+++ b/ckan/templates/user/read_base.html
@@ -14,7 +14,7 @@
 
 {% block content_action %}
   {% if h.check_access('user_update', user) %}
-    {% link_for _('Manage'), named_route='user.edit', id=user.name, class_='btn btn-default', icon='wrench' %}
+    {% link_for _('Manage'), named_route='user.edit', id=user.name, class_='btn btn-secondary', icon='wrench' %}
   {% endif %}
 {% endblock %}
 
diff --git a/ckan/views/resource.py b/ckan/views/resource.py
index 608cc358fb8..94a249860e7 100644
--- a/ckan/views/resource.py
+++ b/ckan/views/resource.py
@@ -286,34 +286,33 @@ def get(self,
             data: Optional[dict[str, Any]] = None,
             errors: Optional[dict[str, Any]] = None,
             error_summary: Optional[dict[str, Any]] = None) -> str:
-        # get resources for sidebar
         context: Context = {
             u'user': current_user.name,
             u'auth_user_obj': current_user
         }
-        try:
-            pkg_dict = get_action(u'package_show')(context, {u'id': id})
-        except NotFound:
-            return base.abort(
-                404, _(u'The dataset {id} could not be found.').format(id=id)
-            )
+
         try:
             check_access(
-                u'resource_create', context, {u"package_id": pkg_dict["id"]}
+                u'resource_create', context, {u"package_id": id}
             )
         except NotAuthorized:
             return base.abort(
                 403, _(u'Unauthorized to create a resource for this package')
             )
 
+        try:
+            pkg_dict = get_action(u'package_show')(context, {u'id': id})
+        except NotFound:
+            return base.abort(
+                404, _(u'The dataset {id} could not be found.').format(id=id)
+            )
+
         package_type = pkg_dict[u'type'] or package_type
 
-        errors = errors or {}
-        error_summary = error_summary or {}
         extra_vars: dict[str, Any] = {
             u'data': data,
-            u'errors': errors,
-            u'error_summary': error_summary,
+            u'errors': errors or {},
+            u'error_summary': error_summary or {},
             u'action': u'new',
             u'resource_form_snippet': _get_pkg_template(
                 u'resource_form', package_type
@@ -323,9 +322,11 @@ def get(self,
             u'pkg_dict': pkg_dict
         }
         template = u'package/new_resource_not_draft.html'
+
         if pkg_dict[u'state'].startswith(u'draft'):
             extra_vars[u'stage'] = ['complete', u'active']
             template = u'package/new_resource.html'
+
         return base.render(template, extra_vars)
 
 
diff --git a/ckan/views/user.py b/ckan/views/user.py
index 66cd2bdfdfc..6af630b5563 100644
--- a/ckan/views/user.py
+++ b/ckan/views/user.py
@@ -269,7 +269,7 @@ def post(self, id: str) -> Union[Response, str]:
             u'class': u'fa fa-copy'
         }), {
             u'type': u'button',
-            u'class': u'btn btn-default btn-xs',
+            u'class': u'btn btn-secondary btn-xs',
             u'data-module': u'copy-into-buffer',
             u'data-module-copy-value': ensure_str(token)
         })
diff --git a/ckanext/activity/templates/snippets/pagination.html b/ckanext/activity/templates/snippets/pagination.html
index 855fbfab66a..958e711f96d 100644
--- a/ckanext/activity/templates/snippets/pagination.html
+++ b/ckanext/activity/templates/snippets/pagination.html
@@ -1,5 +1,5 @@
-{% set class_prev = "btn btn-default" if newer_activities_url else "btn disabled" %}
-{% set class_next = "btn btn-default" if older_activities_url else "btn disabled" %}
+{% set class_prev = "btn btn-secondary" if newer_activities_url else "btn disabled" %}
+{% set class_next = "btn btn-secondary" if older_activities_url else "btn disabled" %}
 
 {% if newer_activities_url or older_activities_url %}
     <div hx-boost="true" hx-target="closest .module-content" id="activity_page_buttons" class="activity_buttons" style="margin-top: 25px;">
diff --git a/ckanext/activity/templates/user/snippets/followee_dropdown.html b/ckanext/activity/templates/user/snippets/followee_dropdown.html
index 92a9b69fec7..7ce4f6846fd 100644
--- a/ckanext/activity/templates/user/snippets/followee_dropdown.html
+++ b/ckanext/activity/templates/user/snippets/followee_dropdown.html
@@ -12,7 +12,7 @@
 
 <div id="followee-filter" class="pull-right">
   <div class="dropdown">
-    <a href="#" id="followee-popover" class="btn btn-default dropdown-toggle"
+    <a href="#" id="followee-popover" class="btn btn-secondary dropdown-toggle"
       aria-label="{{ _('Activity from:') }} {{ context.context }}">
       <span>{{ _('Activity from:') }}</span> <strong>{{ context.context }}</strong> <span class="caret"></span>
     </a>
diff --git a/ckanext/datastore/templates/package/resource_read.html b/ckanext/datastore/templates/package/resource_read.html
index d61a1c1b26e..37aec27219f 100644
--- a/ckanext/datastore/templates/package/resource_read.html
+++ b/ckanext/datastore/templates/package/resource_read.html
@@ -46,7 +46,7 @@
 {% block action_manage_inner %}
   {{ super() }}
   {% if res.datastore_active %}
-    <li>{% link_for _('Data Dictionary'), named_route='datastore.dictionary', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='code' %}</li>
+    <li>{% link_for _('Data Dictionary'), named_route='datastore.dictionary', id=pkg.name, resource_id=res.id, class_='btn btn-secondary', icon='code' %}</li>
   {% endif %}
 {% endblock %}
 
diff --git a/ckanext/datatablesview/assets/datatablesview.js b/ckanext/datatablesview/assets/datatablesview.js
index a5e09eaab03..f9580cd9779 100644
--- a/ckanext/datatablesview/assets/datatablesview.js
+++ b/ckanext/datatablesview/assets/datatablesview.js
@@ -419,9 +419,9 @@ this.ckan.module('datatables_view', function (jQuery) {
                 // add clipboard and print buttons to modal record display
                 var data = row.data();
                 return '<span style="font-size:150%;font-weight:bold;">Details:</span>&nbsp;&nbsp;<div class=" dt-buttons btn-group">' +
-                  '<button id="modalcopy-button" class="btn btn-default" title="' + that._('Copy to clipboard') + '" onclick="copyModal(\'' +
+                  '<button id="modalcopy-button" class="btn btn-secondary" title="' + that._('Copy to clipboard') + '" onclick="copyModal(\'' +
                   packagename + '&mdash;' + resourcename + '\')"><i class="fa fa-copy"></i></button>' +
-                  '<button id="modalprint-button" class="btn btn-default" title="' + that._('Print') + '" onclick="printModal(\'' +
+                  '<button id="modalprint-button" class="btn btn-secondary" title="' + that._('Print') + '" onclick="printModal(\'' +
                   packagename + '&mdash;' + resourcename + '\')"><i class="fa fa-print"></i></button>' +
                   '</div>&nbsp;'
               }
@@ -708,7 +708,7 @@ this.ckan.module('datatables_view', function (jQuery) {
           name: 'viewToggleButton',
           text: gcurrentView === 'table' ? '<i class="fa fa-list"></i>' : '<i class="fa fa-table"></i>',
           titleAttr: that._('Table/List toggle'),
-          className: 'btn-default',
+          className: 'btn-secondary',
           action: function (e, dt, node, config) {
             if (gcurrentView === 'list') {
               dt.button('viewToggleButton:name').text('<i class="fa fa-table"></i>')
@@ -728,7 +728,7 @@ this.ckan.module('datatables_view', function (jQuery) {
           extend: 'copy',
           text: '<i class="fa fa-copy"></i>',
           titleAttr: that._('Copy to clipboard'),
-          className: 'btn-default',
+          className: 'btn-secondary',
           title: function () {
             // remove html tags from filterInfo msg
             const filternohtml = filterInfo(datatable, true)
@@ -742,7 +742,7 @@ this.ckan.module('datatables_view', function (jQuery) {
           extend: 'colvis',
           text: '<i class="fa fa-eye-slash"></i>',
           titleAttr: that._('Toggle column visibility'),
-          className: 'btn-default',
+          className: 'btn-secondary',
           columns: 'th:gt(0):not(:contains("colspacer"))',
           collectionLayout: 'fixed',
           postfixButtons: [{
@@ -780,7 +780,7 @@ this.ckan.module('datatables_view', function (jQuery) {
         }, {
           text: '<i class="fa fa-download"></i>',
           titleAttr: that._('Filtered download'),
-          className: 'btn-default',
+          className: 'btn-secondary',
           autoClose: true,
           extend: 'collection',
           buttons: [{
@@ -816,7 +816,7 @@ this.ckan.module('datatables_view', function (jQuery) {
           name: 'resetButton',
           text: '<i class="fa fa-repeat"></i>',
           titleAttr: that._('Reset'),
-          className: 'btn-default resetButton',
+          className: 'btn-secondary resetButton',
           action: function (e, dt, node, config) {
             dt.state.clear()
             $('.resetButton').css('color', 'black')
@@ -827,7 +827,7 @@ this.ckan.module('datatables_view', function (jQuery) {
           extend: 'print',
           text: '<i class="fa fa-print"></i>',
           titleAttr: that._('Print'),
-          className: 'btn-default',
+          className: 'btn-secondary',
           title: packagename + ' — ' + resourcename,
           messageTop: function () {
             return filterInfo(datatable)
@@ -843,7 +843,7 @@ this.ckan.module('datatables_view', function (jQuery) {
           name: 'shareButton',
           text: '<i class="fa fa-share"></i>',
           titleAttr: that._('Share current view'),
-          className: 'btn-default',
+          className: 'btn-secondary',
           action: function (e, dt, node, config) {
             dt.state.save()
             const sharelink = window.location.href + '?state=' + window.btoa(JSON.stringify(dt.state()))
diff --git a/ckanext/datatablesview/templates/datatables/datatables_view.html b/ckanext/datatablesview/templates/datatables/datatables_view.html
index 3e9d1d9781f..214292ed874 100644
--- a/ckanext/datatablesview/templates/datatables/datatables_view.html
+++ b/ckanext/datatablesview/templates/datatables/datatables_view.html
@@ -51,7 +51,7 @@
        <th id="_colspacer">colspacer</th>
       </tr>
       <tr>
-        <th><button id="refit-button" class="btn btn-default" title="{{- _('Refit') -}}" onclick="fitColText()"><i class="fa fa-text-width"></i></button></th>
+        <th><button id="refit-button" class="btn btn-secondary" title="{{- _('Refit') -}}" onclick="fitColText()"><i class="fa fa-text-width"></i></button></th>
         {% for field in datadictionary -%}
           <th id="cdx{{ loop.index }}" class="fhead" data-type="{{ field.type }}">
               {{- field.id -}}
diff --git a/ckanext/tabledesigner/templates/package/snippets/resource_upload_field.html b/ckanext/tabledesigner/templates/package/snippets/resource_upload_field.html
index ac18448ef92..59c940257cf 100644
--- a/ckanext/tabledesigner/templates/package/snippets/resource_upload_field.html
+++ b/ckanext/tabledesigner/templates/package/snippets/resource_upload_field.html
@@ -2,7 +2,7 @@
 
 {% block url_type_select %}
   {{ super() }}
-  <button type="button" class="btn btn-default" id="resource-table-designer-button"
+  <button type="button" class="btn btn-secondary" id="resource-table-designer-button"
     aria-label="{{ _('Create a custom table for your data') }}"
       onclick="
         document.getElementById('resource-url-table-designer').checked = true;
diff --git a/doc/maintaining/datastore.rst b/doc/maintaining/datastore.rst
index 0c4d8a24399..12e3eff6d13 100644
--- a/doc/maintaining/datastore.rst
+++ b/doc/maintaining/datastore.rst
@@ -304,7 +304,7 @@ returns its response in a JSON dictionary. See the :doc:`/api/index` for details
 API reference
 =============
 
-.. note:: Lists can always be expressed in different ways. It is possible to use lists, comma separated strings or single items. These are valid lists: ``['foo', 'bar']``, ``'foo, bar'``, ``"foo", "bar"`` and ``'foo'``. Additionally, there are several ways to define a boolean value. ``True``, ``on`` and ``1`` are all vaid boolean values.
+.. note:: Lists can always be expressed in different ways. It is possible to use lists, comma separated strings or single items. These are valid lists: ``['foo', 'bar']``, ``'foo, bar'``, ``"foo", "bar"`` and ``'foo'``. Additionally, there are several ways to define a boolean value. ``True``, ``on`` and ``1`` are all valid boolean values.
 
 .. note:: The table structure of the DataStore is explained in :ref:`db_internals`.