diff --git a/CHANGELOG.md b/CHANGELOG.md
index ababf83f21f..38d4319c883 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,11 @@ The types of changes are:
 ### Added
 - Adds support for custom get experiences fn and custom patch notices served fn [#4410](https://github.com/ethyca/fides/pull/4410)
 
+### Changed
+- Button ordering in fides.js UI [#4407](https://github.com/ethyca/fides/pull/4407)
+- Add different classnames to consent buttons for easier selection [#4411](https://github.com/ethyca/fides/pull/4411)
+
+
 ### Fixed
 - User preferences from cookie should always override experience preferences [#4405](https://github.com/ethyca/fides/pull/4405)
 
diff --git a/clients/fides-js/src/components/Button.tsx b/clients/fides-js/src/components/Button.tsx
index da774381316..ff588754466 100644
--- a/clients/fides-js/src/components/Button.tsx
+++ b/clients/fides-js/src/components/Button.tsx
@@ -5,17 +5,19 @@ interface ButtonProps {
   buttonType: ButtonType;
   label?: string;
   onClick?: () => void;
+  className?: string;
 }
 
 const Button: FunctionComponent<ButtonProps> = ({
   buttonType,
   label,
   onClick,
+  className = "",
 }) => (
   <button
     type="button"
     id={`fides-banner-button-${buttonType.valueOf()}`}
-    className={`fides-banner-button fides-banner-button-${buttonType.valueOf()}`}
+    className={`fides-banner-button fides-banner-button-${buttonType.valueOf()} ${className}`}
     onClick={onClick}
     data-testid={`${label}-btn`}
   >
diff --git a/clients/fides-js/src/components/ConsentButtons.tsx b/clients/fides-js/src/components/ConsentButtons.tsx
index 9b589774aa2..06e40d9b958 100644
--- a/clients/fides-js/src/components/ConsentButtons.tsx
+++ b/clients/fides-js/src/components/ConsentButtons.tsx
@@ -1,4 +1,4 @@
-import { ComponentChildren, h, VNode } from "preact";
+import { h, VNode } from "preact";
 import Button from "./Button";
 import {
   ButtonType,
@@ -7,27 +7,24 @@ import {
   PrivacyNotice,
   ExperienceConfig,
 } from "../lib/consent-types";
+import PrivacyPolicyLink from "./PrivacyPolicyLink";
 
 export const ConsentButtons = ({
   experienceConfig,
   onManagePreferencesClick,
   firstButton,
-  middleButton,
   onAcceptAll,
   onRejectAll,
-  children,
   isMobile,
+  includePrivacyPolicy,
 }: {
   experienceConfig: ExperienceConfig;
   onManagePreferencesClick?: () => void;
   firstButton?: VNode;
-  /** Used to add a button between the "manage preferences" button and the "accept/reject" buttons */
-  middleButton?: VNode;
   onAcceptAll: () => void;
   onRejectAll: () => void;
-  /** Added as siblings to the button group after the "accept/reject" buttons */
-  children?: ComponentChildren;
   isMobile: boolean;
+  includePrivacyPolicy?: boolean;
 }) => (
   <div id="fides-button-group">
     {onManagePreferencesClick ? (
@@ -36,10 +33,13 @@ export const ConsentButtons = ({
           buttonType={isMobile ? ButtonType.SECONDARY : ButtonType.TERTIARY}
           label={experienceConfig.privacy_preferences_link_label}
           onClick={onManagePreferencesClick}
+          className="fides-manage-preferences-button"
         />
       </div>
     ) : null}
-    {middleButton || null}
+    {includePrivacyPolicy ? (
+      <PrivacyPolicyLink experience={experienceConfig} />
+    ) : null}
     <div
       className={
         firstButton ? "fides-modal-button-group" : "fides-banner-button-group"
@@ -50,14 +50,15 @@ export const ConsentButtons = ({
         buttonType={ButtonType.PRIMARY}
         label={experienceConfig.reject_button_label}
         onClick={onRejectAll}
+        className="fides-reject-all-button"
       />
       <Button
         buttonType={ButtonType.PRIMARY}
         label={experienceConfig.accept_button_label}
         onClick={onAcceptAll}
+        className="fides-accept-all-button"
       />
     </div>
-    {children}
   </div>
 );
 
@@ -70,8 +71,6 @@ interface NoticeConsentButtonProps {
   enabledKeys: NoticeKeys;
   isAcknowledge: boolean;
   isInModal?: boolean;
-  children?: ComponentChildren;
-  middleButton?: VNode;
   isMobile: boolean;
 }
 
@@ -82,8 +81,6 @@ export const NoticeConsentButtons = ({
   enabledKeys,
   isInModal,
   isAcknowledge,
-  children,
-  middleButton,
   isMobile,
 }: NoticeConsentButtonProps) => {
   if (!experience.experience_config || !experience.privacy_notices) {
@@ -118,6 +115,7 @@ export const NoticeConsentButtons = ({
           buttonType={ButtonType.PRIMARY}
           label={config.acknowledge_button_label}
           onClick={handleAcceptAll}
+          className="fides-acknowledge-button"
         />
       </div>
     );
@@ -135,13 +133,12 @@ export const NoticeConsentButtons = ({
             buttonType={ButtonType.SECONDARY}
             label={config.save_button_label}
             onClick={handleSave}
+            className="fides-save-button"
           />
         ) : undefined
       }
-      middleButton={middleButton}
       isMobile={isMobile}
-    >
-      {children}
-    </ConsentButtons>
+      includePrivacyPolicy={!isInModal}
+    />
   );
 };
diff --git a/clients/fides-js/src/components/fides.css b/clients/fides-js/src/components/fides.css
index e1d814e656a..cfe3fceda41 100644
--- a/clients/fides-js/src/components/fides.css
+++ b/clients/fides-js/src/components/fides.css
@@ -67,6 +67,7 @@
   --fides-overlay-container-border-radius: 12px;
   --fides-overlay-component-border-radius: 4px;
   --fides-overlay-banner-offset: 48px;
+  --fides-banner-font-size-title: var(--16px);
 }
 
 div#fides-overlay {
@@ -182,7 +183,7 @@ div#fides-banner-heading {
 }
 
 div#fides-banner-title {
-  font-size: var(--fides-overlay-font-size-title);
+  font-size: var(--fides-banner-font-size-title);
   font-weight: 600;
   line-height: 1.5em;
   min-width: 33%;
@@ -358,6 +359,7 @@ div#fides-modal .fides-modal-header {
 
 div#fides-consent-content {
   overflow: auto;
+  scrollbar-gutter: stable;
 }
 
 div#fides-consent-content .fides-modal-title {
@@ -372,7 +374,6 @@ div#fides-consent-content .fides-modal-body {
   overflow-y: auto;
   padding-inline: var(--fides-overlay-padding);
   height: 100%;
-  scrollbar-gutter: stable;
 }
 
 .fides-modal-footer {
@@ -406,9 +407,8 @@ div#fides-consent-content .fides-modal-description {
 .fides-tcf-banner-container
   div#fides-banner
   div#fides-banner-inner
-  div#fides-button-group
-  .fides-banner-button-group {
-  padding-left: 24px;
+  div#fides-button-group {
+  gap: 12px;
 }
 
 /* Responsive overlay */
@@ -1001,12 +1001,6 @@ div#fides-banner-inner .fides-privacy-policy {
   border-width: 1px 0 0 0;
   padding: 24px 40px 40px 40px;
 }
-.fides-tcf-banner-container
-  div#fides-banner
-  div#fides-banner-inner
-  div#fides-button-group {
-  justify-content: flex-start;
-}
 .fides-tcf-banner-container #fides-privacy-policy-link {
-  margin-left: auto;
+  margin: auto;
 }
diff --git a/clients/fides-js/src/components/notices/NoticeOverlay.tsx b/clients/fides-js/src/components/notices/NoticeOverlay.tsx
index 222979c8eb1..6cfb6a8faa6 100644
--- a/clients/fides-js/src/components/notices/NoticeOverlay.tsx
+++ b/clients/fides-js/src/components/notices/NoticeOverlay.tsx
@@ -159,7 +159,6 @@ const NoticeOverlay: FunctionComponent<OverlayProps> = ({
                 onSave();
               }}
               isAcknowledge={isAllNoticeOnly}
-              middleButton={<PrivacyPolicyLink experience={experienceConfig} />}
               isMobile={isMobile}
             />
           )}
diff --git a/clients/fides-js/src/components/tcf/TcfConsentButtons.tsx b/clients/fides-js/src/components/tcf/TcfConsentButtons.tsx
index 3153339a524..562a661019d 100644
--- a/clients/fides-js/src/components/tcf/TcfConsentButtons.tsx
+++ b/clients/fides-js/src/components/tcf/TcfConsentButtons.tsx
@@ -1,4 +1,4 @@
-import { ComponentChildren, VNode, h } from "preact";
+import { VNode, h } from "preact";
 
 import { PrivacyExperience } from "../../lib/consent-types";
 import { ConsentButtons } from "../ConsentButtons";
@@ -9,8 +9,8 @@ interface TcfConsentButtonProps {
   onManagePreferencesClick?: () => void;
   onSave: (keys: EnabledIds) => void;
   firstButton?: VNode;
-  children?: ComponentChildren;
   isMobile: boolean;
+  includePrivacyPolicy?: boolean;
 }
 
 const getAllIds = (modelList: TcfModels) => {
@@ -25,8 +25,8 @@ export const TcfConsentButtons = ({
   onManagePreferencesClick,
   onSave,
   firstButton,
-  children,
   isMobile,
+  includePrivacyPolicy,
 }: TcfConsentButtonProps) => {
   if (!experience.experience_config) {
     return null;
@@ -71,8 +71,7 @@ export const TcfConsentButtons = ({
       onRejectAll={handleRejectAll}
       firstButton={firstButton}
       isMobile={isMobile}
-    >
-      {children}
-    </ConsentButtons>
+      includePrivacyPolicy={includePrivacyPolicy}
+    />
   );
 };
diff --git a/clients/fides-js/src/components/tcf/TcfOverlay.tsx b/clients/fides-js/src/components/tcf/TcfOverlay.tsx
index 61a65ea529e..5d71d7e3548 100644
--- a/clients/fides-js/src/components/tcf/TcfOverlay.tsx
+++ b/clients/fides-js/src/components/tcf/TcfOverlay.tsx
@@ -366,9 +366,8 @@ const TcfOverlay: FunctionComponent<OverlayProps> = ({
                   onSave();
                 }}
                 isMobile={isMobile}
-              >
-                <PrivacyPolicyLink experience={experienceConfig} />
-              </TcfConsentButtons>
+                includePrivacyPolicy
+              />
             )}
             className="fides-tcf-banner-container"
           >
@@ -409,6 +408,7 @@ const TcfOverlay: FunctionComponent<OverlayProps> = ({
                   buttonType={ButtonType.SECONDARY}
                   label={experience.experience_config?.save_button_label}
                   onClick={() => onSave(draftIds)}
+                  className="fides-save-button"
                 />
               }
               isMobile={isMobile}
diff --git a/clients/privacy-center/cypress/e2e/consent-banner-tcf.cy.ts b/clients/privacy-center/cypress/e2e/consent-banner-tcf.cy.ts
index 65e65497303..37d8b5bacae 100644
--- a/clients/privacy-center/cypress/e2e/consent-banner-tcf.cy.ts
+++ b/clients/privacy-center/cypress/e2e/consent-banner-tcf.cy.ts
@@ -678,44 +678,48 @@ describe("Fides-js TCF", () => {
           });
         });
         // Verify the cookie on save
-        cy.getCookie(CONSENT_COOKIE_NAME).then((cookie) => {
-          const cookieKeyConsent: FidesCookie = JSON.parse(
-            decodeURIComponent(cookie!.value)
-          );
-          [PURPOSE_4.id, PURPOSE_9.id, PURPOSE_6.id, PURPOSE_7.id].forEach(
-            (pid) => {
-              expect(cookieKeyConsent.tcf_consent.purpose_consent_preferences)
-                .property(`${pid}`)
-                .is.eql(false);
-            }
-          );
-          expect(
-            cookieKeyConsent.tcf_consent
-              .purpose_legitimate_interests_preferences
-          )
-            .property(`${PURPOSE_2.id}`)
-            .is.eql(false);
-          expect(cookieKeyConsent.tcf_consent.special_feature_preferences)
-            .property(`${SPECIAL_FEATURE_1.id}`)
-            .is.eql(false);
-          expect(cookieKeyConsent.tcf_consent.vendor_consent_preferences)
-            .property(`${VENDOR_1.id}`)
-            .is.eql(false);
-          expect(
-            cookieKeyConsent.tcf_consent.vendor_legitimate_interests_preferences
-          ).to.eql({});
-          expect(
-            cookieKeyConsent.tcf_consent.system_consent_preferences
-          ).to.eql({});
-          expect(
-            cookieKeyConsent.tcf_consent.system_legitimate_interests_preferences
-          )
-            .property(`${SYSTEM_1.id}`)
-            .is.eql(false);
-          // Confirm vendors_disclosed section
-          expect(
-            cookieKeyConsent.fides_string?.endsWith(expectedEndOfFidesString)
-          ).to.eql(true);
+        cy.waitUntilCookieExists(CONSENT_COOKIE_NAME).then(() => {
+          cy.getCookie(CONSENT_COOKIE_NAME).then((cookie) => {
+            const cookieKeyConsent: FidesCookie = JSON.parse(
+              decodeURIComponent(cookie!.value)
+            );
+            [PURPOSE_4.id, PURPOSE_9.id, PURPOSE_6.id, PURPOSE_7.id].forEach(
+              (pid) => {
+                expect(cookieKeyConsent.tcf_consent.purpose_consent_preferences)
+                  .property(`${pid}`)
+                  .is.eql(false);
+              }
+            );
+            expect(
+              cookieKeyConsent.tcf_consent
+                .purpose_legitimate_interests_preferences
+            )
+              .property(`${PURPOSE_2.id}`)
+              .is.eql(false);
+            expect(cookieKeyConsent.tcf_consent.special_feature_preferences)
+              .property(`${SPECIAL_FEATURE_1.id}`)
+              .is.eql(false);
+            expect(cookieKeyConsent.tcf_consent.vendor_consent_preferences)
+              .property(`${VENDOR_1.id}`)
+              .is.eql(false);
+            expect(
+              cookieKeyConsent.tcf_consent
+                .vendor_legitimate_interests_preferences
+            ).to.eql({});
+            expect(
+              cookieKeyConsent.tcf_consent.system_consent_preferences
+            ).to.eql({});
+            expect(
+              cookieKeyConsent.tcf_consent
+                .system_legitimate_interests_preferences
+            )
+              .property(`${SYSTEM_1.id}`)
+              .is.eql(false);
+            // Confirm vendors_disclosed section
+            expect(
+              cookieKeyConsent.fides_string?.endsWith(expectedEndOfFidesString)
+            ).to.eql(true);
+          });
         });
       });
 
diff --git a/clients/privacy-center/cypress/e2e/consent-notices.cy.ts b/clients/privacy-center/cypress/e2e/consent-notices.cy.ts
index 8748a6e7569..1793020b857 100644
--- a/clients/privacy-center/cypress/e2e/consent-notices.cy.ts
+++ b/clients/privacy-center/cypress/e2e/consent-notices.cy.ts
@@ -118,6 +118,10 @@ describe("Privacy notice driven consent", () => {
         expect(
           preferences.map((p: ConsentOptionCreate) => p.preference)
         ).to.eql(["opt_in", "opt_in", "acknowledge"]);
+        // Wait for toast so that we know cookie is ready to be inspected
+        cy.get("#toast-1-title").contains(
+          "Your consent preferences have been saved"
+        );
         // Should update the cookie
         cy.waitUntilCookieExists(CONSENT_COOKIE_NAME).then(() => {
           cy.getCookie(CONSENT_COOKIE_NAME).then((cookieJson) => {