diff --git a/scss/civicrm/administer/customize-data/_customize-data.scss b/scss/civicrm/administer/customize-data/_customize-data.scss
index b5bca72f..4c570553 100644
--- a/scss/civicrm/administer/customize-data/_customize-data.scss
+++ b/scss/civicrm/administer/customize-data/_customize-data.scss
@@ -1,3 +1,4 @@
+//stylelint-disable selector-max-compound-selectors, max-nesting-depth, selector-max-id
 &#{civi-page('admin-custom-group')} {
   #options table td:last-of-type {
     width: 250px;
@@ -141,12 +142,6 @@
     tr {
       padding: 0;
 
-      &:first-child {
-        td {
-          padding-top: 20px;
-        }
-      }
-
       &:last-child {
         td {
           padding-bottom: 20px;
diff --git a/scss/civicrm/administer/settings/_option-groups.scss b/scss/civicrm/administer/settings/_option-groups.scss
index 82fcf490..81870f95 100644
--- a/scss/civicrm/administer/settings/_option-groups.scss
+++ b/scss/civicrm/administer/settings/_option-groups.scss
@@ -22,10 +22,6 @@
       }
     }
 
-    .form-layout {
-      margin: 0 0 10px;
-    }
-
     h3 + .description {
       padding: 20px;
     }
diff --git a/scss/civicrm/administer/settings/_resource-urls.scss b/scss/civicrm/administer/settings/_resource-urls.scss
index 89e2c894..b25b434e 100644
--- a/scss/civicrm/administer/settings/_resource-urls.scss
+++ b/scss/civicrm/administer/settings/_resource-urls.scss
@@ -1,3 +1,5 @@
+//stylelint-disable selector-max-compound-selectors,  max-nesting-depth
+
 &#{civi-page('admin-setting-url')},
 &#{civi-page('admin-setting-mapping')},
 &#{civi-page('admin-setting-path')},
@@ -7,6 +9,8 @@
     @include civicrm-table;
 
     table:not(.form-layout-compressed) {
+      border-top: 0;
+
       tr {
         > td {
           vertical-align: top;
diff --git a/scss/civicrm/common/_accordions.scss b/scss/civicrm/common/_accordions.scss
index 48fcdf35..53aec0b3 100644
--- a/scss/civicrm/common/_accordions.scss
+++ b/scss/civicrm/common/_accordions.scss
@@ -2,25 +2,16 @@
   border-radius: 0 !important;
 }
 
-.crm-accordion-header {
+.crm-accordion-header,
+.crm-accordion-bold > summary {
   @include accordion-header;
 
   &:not(.crm-master-accordion-header) {
     border-bottom: 1px solid $crm-grayblue-dark;
     font-size: $font-size-base !important;
     font-weight: $crm-font-weight-h3;
-  }
-
-  &.crm-master-accordion-header {
-    background: $brand-primary !important;
-    border-radius: $border-radius-base $border-radius-base 0 0 !important;
-    color: $crm-white !important;
-    font-size: $font-size-h2;
-    font-weight: $crm-font-weight-h3 !important;
+    padding: 16px 20px !important;
 
-    &::before {
-      color: $crm-white;
-    }
   }
 
   .crm-close-accordion {
@@ -41,6 +32,15 @@
     }
   }
 }
+// stylelint-disable-next-line selector-no-qualifying-type
+details.crm-accordion-bold > .crm-accordion-body {
+  border: 0;
+}
+
+// stylelint-disable-next-line selector-no-qualifying-type
+details[class*='-accordion'] {
+  margin-top: 0;
+}
 
 .crm-accordion-wrapper {
   border-radius: 0;
@@ -67,11 +67,49 @@
   }
 }
 
-.crm-master-accordion-header + .crm-accordion-body {
+// repeats above pattern for new markup
+
+details {
+  border-radius: 0;
+  margin-bottom: 0;
+
+  [open] {
+    summary {
+      &::before {
+        content: '\f107';
+      }
+    }
+  }
+
+  &:not([open]) {
+    summary {
+      &::before {
+        content: '\f105';
+      }
+    }
+  }
+
+  // stylelint-disable-next-line selector-no-qualifying-type
+  &.crm-accordion-light:not([open]) {
+    summary {
+      border-radius: $border-radius-base !important;
+    }
+  }
+}
+
+// Remove padding for accordions in accordions
+// stylelint-disable selector-no-qualifying-type, selector-max-compound-selectors
+details details {
+  padding: 0;
+}
+
+.crm-master-accordion-header + .crm-accordion-body,
+.crm-accordion-light > .crm-accordion-body {
   border-radius: 0 0 $border-radius-base $border-radius-base !important;
 }
 
-.crm-accordion-header:not(.crm-master-accordion-header) + .crm-accordion-body {
+.crm-accordion-header:not(.crm-master-accordion-header) + .crm-accordion-body,
+.crm-accordion-bold > .crm-accordion-body {
   box-shadow: $crm-box-shadow-inset;
   padding: 15px !important;
 
@@ -92,6 +130,8 @@
   }
 }
 
+// stylelint-enable
+
 .crm-accordion-body {
   @extend %no-border-radius;
   background: $crm-white;
@@ -124,6 +164,7 @@
     opacity: 1;
   }
 
+  // stylelint-disable selector-no-qualifying-type
   span,
   div {
     &.description {
@@ -131,4 +172,10 @@
       line-height: 1.5em;
     }
   }
+
+  table.crm-info-panel {
+    border: 0;
+  }
+
+  // stylelint-enable
 }
diff --git a/scss/civicrm/common/_modals.scss b/scss/civicrm/common/_modals.scss
index 50f4a0f1..0f80bd1f 100644
--- a/scss/civicrm/common/_modals.scss
+++ b/scss/civicrm/common/_modals.scss
@@ -44,6 +44,13 @@
           padding: $crm-table-form-cell-padding;
         }
       }
+
+      td,
+      th {
+        &:not(.label) {
+          padding: 4px;
+        }
+      }
     }
 
     &.no-border {
@@ -98,6 +105,11 @@
     width: calc(100% + #{$crm-standard-gap * 2});
   }
 
+  details[class*='crm-accordion'] > summary {
+    margin: 0 -20px;
+  }
+
+  details[class*='crm-accordion'] > summary +.crm-accordion-body,
   .crm-accordion-header:not(.crm-master-accordion-header)+.crm-accordion-body {
     box-shadow: none;
     padding: 20px 0 !important;
diff --git a/scss/civicrm/common/_tables.scss b/scss/civicrm/common/_tables.scss
index 592aedb8..10b53907 100644
--- a/scss/civicrm/common/_tables.scss
+++ b/scss/civicrm/common/_tables.scss
@@ -4,6 +4,8 @@ table {
   }
 }
 
+// stylelint-disable selector-max-compound-selectors, selector-max-id, selector-no-qualifying-type
+
 %crm-table {
   $border-color: $table-border-color;
   border: 0;
@@ -184,10 +186,22 @@ table {
     table {
       box-shadow: none !important;
 
-      &.form-layout-compressed {
-        tr td {
-          line-height: initial;
-        }
+      &.form-layout-compressed tr td {
+        line-height: initial;
+      }
+    }
+  }
+
+  .crm-form-block {
+    display: inline-block;
+    width: 100%;
+
+    > .form-layout,
+    > .form-layout-compressed {
+      clear: both;
+
+      &:first-child {
+        margin-top: 20px;
       }
     }
   }
diff --git a/scss/civicrm/contact/_detail.scss b/scss/civicrm/contact/_detail.scss
index 8b7b2a21..48df8360 100644
--- a/scss/civicrm/contact/_detail.scss
+++ b/scss/civicrm/contact/_detail.scss
@@ -14,7 +14,7 @@
   padding-top: 10px !important;
 
   // Remove the space from the angular's container
-  > div:not(.messages.status) {
+  > div:not(.messages.status):not(.help) {
     padding: 0 !important;
   }