                                   (om/get-shared owner :track-event)))
               (when (feature/enabled? "top-bar-beta-button")
                 [:div.topbar-toggle
-                 (when (and has-topbar? (not om-next-page?))
-                   [:span.feedback
-                    (button/link {:fixed? true
-                                  :kind :primary
-                                  :size :small
-                                  :target "_blank"
-                                  :href "mailto:beta+ui@circleci.com?Subject=Topbar%20UI%20Feedback"
-                                  :on-click #((om/get-shared owner :track-event) {:event-type :feedback-clicked
-                                                                                  :properties {:component "topbar"
-                                                                                               :treatment "top-bar-beta"}})}
-                      "Give Topbar UI Feedback")])])
-
-              (when (and (false? om-next-page?)
-                         (false? show-nux-experience?))
-                (button/link {:fixed? true
-                              :kind (if has-topbar?
-                                      :secondary
-                                      :primary)
-                              :size :small
-                              :href (if has-topbar?
-                                      "/dashboard"
-                                      (routes/org-centric-path {:nav-point (:nav-point topbar-beta)
-                                                                :current-org (:org topbar-beta)}))
-                              :on-click #(do
-                                           (raise! owner [:preferences-updated {state/user-betas-key [toggle-topbar]}])
-                                           ((om/get-shared owner :track-event) {:event-type :topbar-toggled
-                                                                                :properties {:toggle-topbar-text toggle-topbar-text
-                                                                                             :has-topbar has-topbar?
-                                                                                             :toggled-topbar-on (boolean toggle-topbar)}}))}
-                  toggle-topbar-text))
+                 (om/build top-bar-feedback-button {:show-button? (and has-topbar?
+                                                                       (not om-next-page?))})
+                 (om/build new-ui-button {:show-button? (and (false? om-next-page?)
+                                                             (false? show-nux-experience?))
+                                          :has-topbar? has-topbar?
+                                          :topbar-beta topbar-beta})])
               actions]]))))))
 
 (dc/do

     :placement :bottom}
    (engine-2)))

(defn header
  "The page header.


  [{:keys [crumbs actions logged-out? platform topbar-beta show-nux-experience?]} owner]
  (let [crumbs-login (map #(assoc % :logged-out? logged-out?) crumbs)
        has-topbar? (feature/enabled? "top-bar-ui-v-1")
        om-next-page? (-> topbar-beta :nav-point routes/om-next-nav-point?)]
    (reify
      om/IDisplayName (display-name [_] "User Header")
