diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 8ed87f88a..a74c7fc8d 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1576,4 +1576,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: eff4b75123af5d6680139a78c055b44ad37c269b
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.2
diff --git a/src/components/ObsEdit/BottomButtons.tsx b/src/components/ObsEdit/BottomButtons.tsx
index ecc63cda7..51c623ad7 100644
--- a/src/components/ObsEdit/BottomButtons.tsx
+++ b/src/components/ObsEdit/BottomButtons.tsx
@@ -40,18 +40,6 @@ const BottomButtons = ( {
   const isSaving = buttonPressed === "save" && loading;
   const disabled = buttonPressed !== null;
 
-  const saveButton = (
-    <Button
-      className="px-[25px]"
-      onPress={( ) => handlePress( "save" )}
-      testID="ObsEdit.saveButton"
-      text={t( "SAVE" )}
-      level="neutral"
-      loading={isSaving}
-      disabled={disabled}
-    />
-  );
-
   const saveChangesButton = (
     <Button
       className="px-[25px]"
@@ -66,54 +54,37 @@ const BottomButtons = ( {
     />
   );
 
-  // const uploadButton = (
-  //   <Button
-  //     className="ml-3 grow"
-  //     level={showFocusedUploadButton
-  //       ? "focus"
-  //       : "neutral"}
-  //     text={t( "UPLOAD-NOW" )}
-  //     testID="ObsEdit.uploadButton"
-  //     onPress={( ) => handlePress( "upload" )}
-  //     loading={buttonPressed === "upload" && loading}
-  //     disabled={disabled}
-  //   />
-  // );
+  const saveButton = {
+    title: t( "SAVE" ),
+    onPress: ( ) => handlePress( "save" ),
+    isPrimary: false,
+    testID: "ObsEdit.saveButton",
+    disabled,
+    level: "neutral",
+    loading: isSaving,
+    isPrimary: false,
+    className: "px-[25px]"
+  };
 
-  const buttons = [
-    {
-      title: t( "SAVE" ),
-      onPress: ( ) => handlePress( "save" ),
-      isPrimary: false,
-      testID: "ObsEdit.saveButton",
-      disabled,
-      level: "neutral",
-      loading: isSaving,
-      isPrimary: false,
-      className: "px-[25px]"
-    },
-    {
-      title: t( "UPLOAD-NOW" ),
-      onPress: ( ) => handlePress( "upload" ),
-      isPrimary: false,
-      testID: "ObsDetail.cvSuggestionsButton",
-      accessibilityHint: "Shows-identification-suggestions",
-      loading: buttonPressed === "upload" && loading,
-      level: showFocusedUploadButton
-        ? "focus"
-        : "neutral",
-      disabled,
-      isPrimary: true,
-      className: "ml-3 grow"
-    }
-  ];
+  const uploadButton = {
+    title: t( "UPLOAD-NOW" ),
+    onPress: ( ) => handlePress( "upload" ),
+    isPrimary: true,
+    testID: "ObsEdit.uploadButton",
+    loading: buttonPressed === "upload" && loading,
+    level: showFocusedUploadButton
+      ? "focus"
+      : "neutral",
+    disabled,
+    className: "ml-3 grow"
+  };
+
+  const buttonConfiguration = [saveButton, uploadButton];
 
   const renderButtons = ( ) => {
     if ( canSaveOnly ) {
       return (
-        <ButtonBar>
-          {saveButton}
-        </ButtonBar>
+        <ButtonBar buttonConfiguration={[saveButton]} />
       );
     }
     if ( wasSynced ) {
@@ -124,7 +95,7 @@ const BottomButtons = ( {
       );
     }
     return (
-      <ButtonBar buttonConfiguration={buttons} containerClass="p-[15px]" />
+      <ButtonBar buttonConfiguration={buttonConfiguration} containerClass="p-[15px]" />
     );
   };