diff --git a/components/GridRep/index.tsx b/components/GridRep/index.tsx
index cffdd1b0..8b40b8eb 100644
--- a/components/GridRep/index.tsx
+++ b/components/GridRep/index.tsx
@@ -244,11 +244,14 @@ const GridRep = (props: Props) => {
           !props.user) ? (
           <Link href="#">
             <Button
-              className="Save"
+              className={classNames({
+                save: true,
+                saved: props.favorited,
+              })}
               leftAccessoryIcon={<SaveIcon className="stroke" />}
               active={props.favorited}
-              contained={true}
-              buttonSize="small"
+              bound={true}
+              size="small"
               onClick={sendSaveData}
             />
           </Link>
diff --git a/components/party/PartyHeader/index.tsx b/components/party/PartyHeader/index.tsx
index 02ee3344..fe34d2f4 100644
--- a/components/party/PartyHeader/index.tsx
+++ b/components/party/PartyHeader/index.tsx
@@ -340,8 +340,8 @@ const PartyHeader = (props: Props) => {
         <Button
           leftAccessoryIcon={<SaveIcon />}
           className={classNames({
-            Save: true,
-            Saved: partySnapshot.favorited,
+            save: true,
+            saved: partySnapshot.favorited,
           })}
           text={
             appState.party.favorited ? t('buttons.saved') : t('buttons.save')
@@ -377,10 +377,10 @@ const PartyHeader = (props: Props) => {
               {party.remix && party.sourceParty ? (
                 <Tooltip content={t('tooltips.source')}>
                   <Button
-                    className="IconButton"
                     blended={true}
                     leftAccessoryIcon={<RemixIcon />}
                     text={t('tokens.remix')}
+                    size="icon"
                     onClick={() => goTo(party.sourceParty?.shortcode)}
                   />
                 </Tooltip>