diff --git a/backend/src/app.ts b/backend/src/app.ts
index c6c84a95..513cce83 100644
--- a/backend/src/app.ts
+++ b/backend/src/app.ts
@@ -826,6 +826,10 @@ app.put('/api/delete-review/:reviewId', authenticate, async (req, res) => {
 /**
  * Handles saving or removing saved apartments for a user in the database.
  *
+ * @deprecated This endpoint is deprecated and will be removed in future versions.
+ * Use the new folder-based endpoints (`POST /api/folders/:folderId/apartments`
+ * and `DELETE /api/folders/:folderId/apartments/:apartmentId`) instead.
+ *
  * @param add - If true, the apartment is added to the user's saved list. If false, it is removed.
  */
 const saveApartmentHandler =
@@ -871,6 +875,7 @@ const saveApartmentHandler =
 /**
  * Handles saving or removing saved landlords for a user in the database.
  *
+ * @deprecated This endpoint is deprecated and will be removed in future versions.
  * @param add - If true, the landlord is added to the user's saved list. If false, it is removed.
  */
 const saveLandlordHandler =
@@ -913,7 +918,11 @@ const saveLandlordHandler =
     }
   };
 
-// Function to check if a user has an apartment saved or not
+/**
+ *  Function to check if a user has an apartment saved or not
+ * @deprecated This endpoint is deprecated and will be removed in future versions.
+ */
+
 const checkSavedApartment = (): RequestHandler => async (req, res) => {
   try {
     if (!req.user) throw new Error('Not authenticated');
@@ -942,7 +951,10 @@ const checkSavedApartment = (): RequestHandler => async (req, res) => {
   }
 };
 
-// Function to check if a user has an landlord saved or not
+/**
+ * Function to check if a user has an landlord saved or not
+ * @deprecated This endpoint is deprecated and will be removed in future versions.
+ */
 const checkSavedLandlord = (): RequestHandler => async (req, res) => {
   try {
     if (!req.user) throw new Error('Not authenticated');
@@ -971,27 +983,45 @@ const checkSavedLandlord = (): RequestHandler => async (req, res) => {
   }
 };
 
-// Endpoint for checking if an apartment is saved by a user
+/**
+ *
+ * Endpoint for checking if an apartment is saved by a user
+ * @deprecated This endpoint is deprecated and will be removed in future versions.
+ */
 app.post('/api/check-saved-apartment', authenticate, checkSavedApartment());
 // This endpoint uses authentication middleware to ensure that the user is logged in.
 // The checkSavedApartment() function is then called to check if a specific apartment is saved by the user.
 
-// Endpoint for checking if a landlord is saved by a user
+/**
+ *
+ * Endpoint for checking if an landlord is saved by a user
+ * @deprecated This endpoint is deprecated and will be removed in future versions.
+ */
 app.post('/api/check-saved-landlord', authenticate, checkSavedLandlord());
 // Similar to the above endpoint, this one checks if a specific landlord is saved by the user.
 // It also uses authentication to ensure that the request is made by a logged-in user.
 
-// Endpoint for adding a saved apartment for a user
+/**
+ * Endpoint for adding a saved apartment for a user
+ * @deprecated This endpoint is deprecated and will be removed in future versions.
+ */
 app.post('/api/add-saved-apartment', authenticate, saveApartmentHandler(true));
 // This endpoint allows authenticated users to add an apartment to their list of saved apartments.
 // The saveApartmentHandler function is used with a parameter of 'true' to signify adding a save.
 
-// Endpoint for removing a saved apartment for a user
+/**
+ * Endpoint for removing a saved apartment for a user
+ * @deprecated This endpoint is deprecated and will be removed in future versions.
+ */
 app.post('/api/remove-saved-apartment', authenticate, saveApartmentHandler(false));
 // This endpoint allows authenticated users to remove an apartment from their list of saved apartments.
 // The saveApartmentHandler function is used with a parameter of 'false' to signify removing a save.
 
-// Endpoint to get a list of saved apartments for a user
+/**
+ *  Endpoint to get a list of saved apartments for a user
+ *
+ * @deprecated This endpoint is deprecated and will be removed in future versions.
+ */
 app.get('/api/saved-apartments', authenticate, async (req, res) => {
   if (!req.user) throw new Error('Not authenticated');
   const { uid } = req.user; // Extracting user ID from the request
@@ -1012,8 +1042,16 @@ app.get('/api/saved-apartments', authenticate, async (req, res) => {
   return res.status(200).send(data);
 });
 
-// Endpoints for adding and removing saved landlords for a user
+/**
+ * Endpoint for adding a saved landlord for a user
+ * @deprecated This endpoint is deprecated and will be removed in future versions.
+ */
 app.post('/api/add-saved-landlord', authenticate, saveLandlordHandler(true));
+
+/**
+ * Endpoint for removing a saved landlord for a user
+ * @deprecated This endpoint is deprecated and will be removed in future versions.
+ */
 app.post('/api/remove-saved-landlord', authenticate, saveLandlordHandler(false));
 // These endpoints allow for adding and removing landlords to/from a user's saved list.
 // Both endpoints use the saveLandlordHandler function with appropriate boolean parameters.
diff --git a/frontend/src/components/ApartmentCard/ApartmentCard.tsx b/frontend/src/components/ApartmentCard/ApartmentCard.tsx
index 12dfa90e..80a0bfd4 100644
--- a/frontend/src/components/ApartmentCard/ApartmentCard.tsx
+++ b/frontend/src/components/ApartmentCard/ApartmentCard.tsx
@@ -278,10 +278,7 @@ const ApartmentCard = ({
                       onMouseLeave={() => setSavedIsHovered(false)}
                       className={saveRibbonIcon}
                     >
-                      <img
-                        src={savedIsHovered || isSaved ? saved : unsaved}
-                        alt={isSaved ? 'Saved' : 'Unsaved'}
-                      />
+                      <img src={savedIsHovered ? saved : unsaved} alt={'Save'} />
                     </IconButton>
                   </Grid>
                 </Grid>
diff --git a/frontend/src/components/ApartmentCard/LargeApartmentCard.tsx b/frontend/src/components/ApartmentCard/LargeApartmentCard.tsx
index 8aa8f5b3..de29e980 100644
--- a/frontend/src/components/ApartmentCard/LargeApartmentCard.tsx
+++ b/frontend/src/components/ApartmentCard/LargeApartmentCard.tsx
@@ -327,10 +327,7 @@ const NewApartmentCard = ({
                 onMouseLeave={() => setSavedIsHovered(false)}
                 className={saveRibbonIcon}
               >
-                <img
-                  src={savedIsHovered || isSaved ? saved : unsaved}
-                  alt={isSaved ? 'Saved' : 'Unsaved'}
-                />
+                <img src={savedIsHovered ? saved : unsaved} alt={'Save'} />
               </IconButton>
             </div>
             <Typography className={apartmentAddress}>{address}</Typography>
diff --git a/frontend/src/components/ApartmentCard/NewApartmentCard.tsx b/frontend/src/components/ApartmentCard/NewApartmentCard.tsx
index a5510374..2b2e14f8 100644
--- a/frontend/src/components/ApartmentCard/NewApartmentCard.tsx
+++ b/frontend/src/components/ApartmentCard/NewApartmentCard.tsx
@@ -283,10 +283,7 @@ const NewApartmentCard = ({
             onMouseLeave={() => setSavedIsHovered(false)}
             className={saveRibbonIcon}
           >
-            <img
-              src={savedIsHovered || isSaved ? saved : unsaved}
-              alt={isSaved ? 'Saved' : 'Unsaved'}
-            />
+            <img src={savedIsHovered ? saved : unsaved} alt={'Save'} />
           </IconButton>
           <img src={img} alt="apartment" className={apartmentImage} />
         </CardMedia>
diff --git a/frontend/src/pages/ApartmentPage.tsx b/frontend/src/pages/ApartmentPage.tsx
index 69cd0373..c97cf39b 100644
--- a/frontend/src/pages/ApartmentPage.tsx
+++ b/frontend/src/pages/ApartmentPage.tsx
@@ -159,6 +159,7 @@ const ApartmentPage = ({ user, setUser }: Props): ReactElement => {
   const [isSaved, setIsSaved] = useState(false);
   const [mapToggle, setMapToggle] = useState(false);
   const [showSaveSuccess, setShowSaveSuccess] = useState(false);
+  const [isHovered, setIsHovered] = useState(false);
 
   const dummyTravelTimes: LocationTravelTimes = {
     agQuadDriving: -1,
@@ -541,31 +542,20 @@ const ApartmentPage = ({ user, setUser }: Props): ReactElement => {
           )}
 
           <Grid item style={{ marginLeft: 'auto' }}>
-            {/* <IconButton
-              disableRipple
-              onClick={handleSaveToggle}
-              style={{
-                padding: 15,
-                backgroundColor: 'transparent',
-              }}
-            >
-              <img
-                src={isSaved ? saved : unsaved}
-                alt={isSaved ? 'Saved' : 'Unsaved'}
-                style={{ width: '107px', height: '43px' }}
-              />
-            </IconButton> */}
             <Button
               disableRipple
               onClick={handleSaveToggle}
+              onMouseEnter={() => setIsHovered(true)}
+              onMouseLeave={() => setIsHovered(false)}
               className={saveButton}
               color="primary"
               fullWidth
               disableElevation
             >
-              <img src={isSaved ? saved : unsaved} className={bookmarkRibbon} />
-              {isSaved ? 'Saved' : 'Save'}
+              <img src={isHovered ? saved : unsaved} className={bookmarkRibbon} alt="Save" />
+              Save
             </Button>
+
             <Button
               color="primary"
               className={reviewButton}