diff --git a/src/plugins/interactive_setup/public/app.scss b/src/plugins/interactive_setup/public/app.scss
index 119a2377dd7d2..837a856610a23 100644
--- a/src/plugins/interactive_setup/public/app.scss
+++ b/src/plugins/interactive_setup/public/app.scss
@@ -9,10 +9,10 @@
 }
 
 .interactiveSetup__logo {
+  margin-bottom: $euiSizeXL;
+
   @include kibanaCircleLogo;
   @include euiBottomShadowMedium;
-
-  margin-bottom: $euiSizeXL;
 }
 
 .interactiveSetup__content {
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.scss b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.scss
index 08e7be248619f..7a9557fb7d8d4 100644
--- a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.scss
+++ b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.scss
@@ -7,9 +7,10 @@
 }
 
 .secAccessAgreementPage__text {
-  @include euiYScrollWithShadows;
   max-height: 400px;
   padding: $euiSize $euiSizeL 0;
+
+  @include euiYScrollWithShadows;
 }
 
 .secAccessAgreementPage__footer {
diff --git a/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.scss b/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.scss
index 3b162dc962400..401e821aa3e76 100644
--- a/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.scss
+++ b/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.scss
@@ -9,10 +9,10 @@
 }
 
 .secAuthenticationStatePage__logo {
+  margin-bottom: $euiSizeXL;
+
   @include kibanaCircleLogo;
   @include euiBottomShadowMedium;
-
-  margin-bottom: $euiSizeXL;
 }
 
 .secAuthenticationStatePage__content {
diff --git a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.scss b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.scss
index 344cde9c7825c..a8607c4048f42 100644
--- a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.scss
+++ b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.scss
@@ -23,11 +23,11 @@
   }
 
   &:focus {
-    @include euiFocusRing;
-
     border-color: transparent;
     border-radius: $euiBorderRadius;
 
+    @include euiFocusRing;
+
     .secLoginCard__title {
       text-decoration: underline;
     }
diff --git a/x-pack/plugins/security/public/authentication/login/login_page.scss b/x-pack/plugins/security/public/authentication/login/login_page.scss
index cdfad55ee064a..8930de1425d85 100644
--- a/x-pack/plugins/security/public/authentication/login/login_page.scss
+++ b/x-pack/plugins/security/public/authentication/login/login_page.scss
@@ -9,10 +9,10 @@
 }
 
 .loginWelcome__logo {
+  margin-bottom: $euiSizeXL;
+
   @include kibanaCircleLogo;
   @include euiBottomShadowMedium;
-
-  margin-bottom: $euiSizeXL;
 }
 
 .loginWelcome__content {
diff --git a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss
index f444b45192f8b..8e14b2876f429 100644
--- a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss
+++ b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss
@@ -3,8 +3,9 @@
 }
 
 .spcMenu__spacesList {
-  @include euiYScrollWithShadows;
   max-height: $euiSizeXL * 10;
+
+  @include euiYScrollWithShadows;
 }
 
 .spcMenu__searchFieldWrapper {
diff --git a/x-pack/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap b/x-pack/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap
index 8dfe89ef172d4..4419707ab45f4 100644
--- a/x-pack/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap
+++ b/x-pack/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap
@@ -8,7 +8,7 @@ exports[`it renders with custom logo 1`] = `
 >
   <EuiPortal>
     <div
-      className="spcSelectorBackground"
+      className="spcSelectorBackground spcSelectorBackground__nonMixinAttributes"
       role="presentation"
     />
   </EuiPortal>
@@ -69,7 +69,7 @@ exports[`it renders without crashing 1`] = `
 >
   <EuiPortal>
     <div
-      className="spcSelectorBackground"
+      className="spcSelectorBackground spcSelectorBackground__nonMixinAttributes"
       role="presentation"
     />
   </EuiPortal>
diff --git a/x-pack/plugins/spaces/public/space_selector/space_selector.scss b/x-pack/plugins/spaces/public/space_selector/space_selector.scss
index 4629e92a201f5..f589347e592ed 100644
--- a/x-pack/plugins/spaces/public/space_selector/space_selector.scss
+++ b/x-pack/plugins/spaces/public/space_selector/space_selector.scss
@@ -4,6 +4,9 @@
 
 .spcSelectorBackground {
   @include kibanaFullScreenGraphics;
+}
+
+.spcSelectorBackground__nonMixinAttributes {
   z-index: -1;
   pointer-events: none;
 }
diff --git a/x-pack/plugins/spaces/public/space_selector/space_selector.tsx b/x-pack/plugins/spaces/public/space_selector/space_selector.tsx
index e90d1c4a10954..3d72392552e38 100644
--- a/x-pack/plugins/spaces/public/space_selector/space_selector.tsx
+++ b/x-pack/plugins/spaces/public/space_selector/space_selector.tsx
@@ -124,7 +124,10 @@ export class SpaceSelector extends Component<Props, State> {
       >
         {/* Portal the fixed background graphic so it doesn't affect page positioning or overlap on top of global banners */}
         <EuiPortal>
-          <div className="spcSelectorBackground" role="presentation" />
+          <div
+            className="spcSelectorBackground spcSelectorBackground__nonMixinAttributes"
+            role="presentation"
+          />
         </EuiPortal>
 
         <KibanaPageTemplate.Section color="transparent" paddingSize="xl">