diff --git a/CA-PIN_IOS/CA-PIN_IOS.xcodeproj/project.pbxproj b/CA-PIN_IOS/CA-PIN_IOS.xcodeproj/project.pbxproj
index c93eafd..1589555 100644
--- a/CA-PIN_IOS/CA-PIN_IOS.xcodeproj/project.pbxproj
+++ b/CA-PIN_IOS/CA-PIN_IOS.xcodeproj/project.pbxproj
@@ -1519,7 +1519,7 @@
 				BASE_URL = "http://3.37.75.200:6000";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = VTJLBZ2Q3F;
 				INFOPLIST_FILE = "CA-PIN_IOS/Supports/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -1545,7 +1545,7 @@
 				BASE_URL = "http://3.37.75.200:6000";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = VTJLBZ2Q3F;
 				INFOPLIST_FILE = "CA-PIN_IOS/Supports/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Configuration/KeyChainStorage.swift b/CA-PIN_IOS/CA-PIN_IOS/Configuration/KeyChainStorage.swift
index 8fb3ed0..c6a97e0 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Configuration/KeyChainStorage.swift
+++ b/CA-PIN_IOS/CA-PIN_IOS/Configuration/KeyChainStorage.swift
@@ -18,4 +18,8 @@ enum KeychainStorage {
   static var userCafeTI: String {
     return "userCafeTI"
   }
+    
+    static var nickname: String {
+        return "nickname"
+    }
 }
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeDetail/Cells/DetailReviewTableViewCell.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeDetail/Cells/DetailReviewTableViewCell.swift
index 1460ad5..873df3e 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeDetail/Cells/DetailReviewTableViewCell.swift
+++ b/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeDetail/Cells/DetailReviewTableViewCell.swift
@@ -9,6 +9,7 @@ import UIKit
 
 import SnapKit
 import Then
+import SwiftKeychainWrapper
 
 // MARK: - DetailReviewTableViewCell
 class DetailReviewTableViewCell: UITableViewCell {
@@ -64,6 +65,7 @@ class DetailReviewTableViewCell: UITableViewCell {
   override func prepareForReuse() {
     super.prepareForReuse()
     profileImageView.image = nil
+      reviewModel = nil
   }
 }
 
@@ -208,10 +210,57 @@ extension DetailReviewTableViewCell {
   
   // 서현이가 썼어요 ~
   @objc func editButtonClicked() {
-    let reportPopUpVC = ReportReviewPopUpViewController()
-    reportPopUpVC.modalPresentationStyle = .overCurrentContext
-    reportPopUpVC.reviewId = self.reviewId
-    self.rootViewController?.present(reportPopUpVC, animated: translatesAutoresizingMaskIntoConstraints, completion: nil)
+      if let model = reviewModel {
+          if model.writer.nickname == KeychainWrapper.standard.string(forKey: KeychainStorage.nickname) {
+              let alertController: UIAlertController
+              alertController = UIAlertController(title: "리뷰 편집", message: nil, preferredStyle: .actionSheet)
+
+              let editAction: UIAlertAction
+              editAction = UIAlertAction(title: "리뷰 수정", style: UIAlertAction.Style.default, handler: { (action: UIAlertAction) in
+                /// 리뷰 수정 뷰로 이동
+                let writeVC = WriteReviewViewController()
+                writeVC.titleContent = "리뷰수정하기"
+                writeVC.confirmTitle = "리뷰수정하기"
+                writeVC.content = (self.reviewModel?.content)!
+                writeVC.ratingValue = self.reviewModel!.rating
+                writeVC.reviewId = self.reviewModel!.id
+                if self.reviewModel?.imgs == [] {
+                  for imagePath in (self.reviewModel!.imgs)! {
+                    let image = UIImageView()
+                    image.setImage(from: imagePath, UIImage(named: "capinLogo")!)
+                    writeVC.canAccessImages.append((image.image)!)
+                  }
+                }
+                writeVC.recommend = self.reviewModel?.recommend ?? []
+                  self.rootViewController?.navigationController?.pushViewController(writeVC, animated: false)
+              })
+              let deleteAction: UIAlertAction
+              deleteAction = UIAlertAction(title: "리뷰 삭제", style: .destructive, handler: { (action: UIAlertAction) in
+                let deleteReviewVC = DeleteReviewViewController()
+                deleteReviewVC.modalPresentationStyle = .overCurrentContext
+                deleteReviewVC.reviewId = self.reviewModel?.id ?? ""
+                  self.rootViewController?.present(deleteReviewVC, animated: false, completion: nil)
+              })
+
+              let cancelAction: UIAlertAction
+              cancelAction = UIAlertAction(title: "취소", style: UIAlertAction.Style.cancel, handler: nil)
+
+              alertController.addAction(editAction)
+              alertController.addAction(deleteAction)
+              alertController.addAction(cancelAction)
+              
+              alertController.view.tintColor = .maincolor1
+
+              self.rootViewController?.present(alertController, animated: true, completion: nil)
+            
+          }
+          else {
+              let reportPopUpVC = ReportReviewPopUpViewController()
+              reportPopUpVC.modalPresentationStyle = .overCurrentContext
+              reportPopUpVC.reviewId = self.reviewId
+              self.rootViewController?.present(reportPopUpVC, animated: translatesAutoresizingMaskIntoConstraints, completion: nil)
+          }
+      }
   }
   
   // MARK: - General Helpers
@@ -226,7 +275,11 @@ extension DetailReviewTableViewCell {
   
   func reviewDataBind(nickName: String, date: String, rating: Float, content: String, profileImg: String) {
     titleLabel.setupLabel(text: nickName, color: .black, font: .notoSansKRMediumFont(fontSize: 12))
-    dateLabel.setupLabel(text: date, color: .gray4, font: .notoSansKRRegularFont(fontSize: 12))
+      
+      let dateStringArray = date.split(separator: "T")
+      let dateString = String(dateStringArray[0])
+      let dateResult = dateString.replacingOccurrences(of: "-", with: ".")
+    dateLabel.setupLabel(text: dateResult, color: .gray4, font: .notoSansKRRegularFont(fontSize: 12))
     ratingLabel.setupLabel(text: "\(rating)",
                            color: .pointcolorYellow,
                            font: .notoSansKRRegularFont(fontSize: 12))
@@ -331,7 +384,7 @@ extension DetailReviewTableViewCell: UICollectionViewDataSource {
       photoCell.dataBind(imageName: reviewModel?.imgs?[indexPath.item], moreNumber: moreNumber)
       photoCell.awakeFromNib()
       if indexPath.item == 2 && moreNumber > 0 {
-        photoCell.photoImageView.isHidden = true
+          photoCell.alphaView.isHidden = false
         photoCell.moreLabel.isHidden = false
       }
       return photoCell
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeDetail/Cells/PhotoCollectionViewCell.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeDetail/Cells/PhotoCollectionViewCell.swift
index ddfb3ef..faea3f8 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeDetail/Cells/PhotoCollectionViewCell.swift
+++ b/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeDetail/Cells/PhotoCollectionViewCell.swift
@@ -17,8 +17,12 @@ class PhotoCollectionViewCell: UICollectionViewCell {
   // MARK: - Components
   let containerView = UIView()
   let photoImageView = UIImageView()
-  let alphaView = UIView()
-  let moreLabel = UILabel()
+    let alphaView = UIView().then {
+        $0.isHidden = true
+    }
+    let moreLabel = UILabel().then {
+        $0.isHidden = true
+    }
   
   var rootViewController: UIViewController?
   
@@ -28,6 +32,12 @@ class PhotoCollectionViewCell: UICollectionViewCell {
     self.backgroundColor = .clear
     layout()
   }
+    
+    override func prepareForReuse() {
+        super.prepareForReuse()
+        alphaView.isHidden = true
+        moreLabel.isHidden = true
+    }
   
 }
 
@@ -37,6 +47,7 @@ extension PhotoCollectionViewCell {
     contentView.backgroundColor = .clear
     layoutContainerView()
     layoutPhotoImageView()
+      layoutAlphaView()
     layoutMoreLabel()
   }
   func layoutContainerView() {
@@ -58,7 +69,6 @@ extension PhotoCollectionViewCell {
   }
   func layoutAlphaView() {
     containerView.add(alphaView) {
-      $0.isHidden = true
       $0.backgroundColor = .photoCover
       $0.setRounded(radius: 5)
       $0.snp.makeConstraints {
@@ -68,7 +78,6 @@ extension PhotoCollectionViewCell {
   }
   func layoutMoreLabel() {
     alphaView.add(moreLabel) {
-      $0.isHidden = true
       $0.snp.makeConstraints {
         $0.center.equalToSuperview()
       }
@@ -81,7 +90,7 @@ extension PhotoCollectionViewCell {
       photoImageView.imageFromUrl(image, defaultImgPath: "")
     }
     moreLabel.setupLabel(text: "+\(moreNumber)",
-                         color: .gray3,
+                         color: .white,
                          font: .notoSansKRRegularFont(fontSize: 14))
   }
   func updateLayout() {
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeDetail/ViewControllers/CafeDetailViewController.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeDetail/ViewControllers/CafeDetailViewController.swift
index f65e1a5..3b7df93 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeDetail/ViewControllers/CafeDetailViewController.swift
+++ b/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeDetail/ViewControllers/CafeDetailViewController.swift
@@ -28,7 +28,10 @@ class CafeDetailViewController: UIViewController {
     let cafeTitleLabel = UILabel()
     let starImageView = UIImageView()
     let starRatingLabel = UILabel()
-    let addressLabel = UILabel()
+    let addressLabel = UILabel().then {
+        $0.isUserInteractionEnabled = true
+    }
+    
     let tagCollectionView: UICollectionView = {
         let layout = CollectionViewCenteredFlowLayout()
         layout.scrollDirection = .vertical
@@ -100,6 +103,16 @@ class CafeDetailViewController: UIViewController {
         )
     }
     
+    private let emptyLabel = UILabel().then {
+        $0.setupLabel(
+            text: "아직 등록된 리뷰가 없어요.\n가장 먼저 리뷰를 작성해보세요.",
+            color: .gray4,
+            font: .notoSansKRRegularFont(fontSize: 14)
+        )
+        $0.isHidden = true
+        $0.numberOfLines = 2
+    }
+    
     let gradationBlackColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0.3)
     let gradationWhiteColor = UIColor(red: 1, green: 1, blue: 1, alpha: 0.3)
     
@@ -108,7 +121,7 @@ class CafeDetailViewController: UIViewController {
     var threshold = true
     
     let disposeBag = DisposeBag()
-    let reviewProvider = MoyaProvider<ReviewService>()
+    let reviewProvider = MoyaProvider<ReviewService>(plugins: [NetworkLoggerPlugin(verbose: true)])
     let userProvider = MoyaProvider<UserService>(plugins: [NetworkLoggerPlugin(verbose: true)])
     var cafeModel: CafeServerDetail?
     var reviewModel: [ServerReview]?
@@ -127,6 +140,7 @@ class CafeDetailViewController: UIViewController {
     var count160 = 0
     var count218 = 0
     var count240 = 0
+    var isInit = true
     
     
     // MARK: - LifeCycles
@@ -154,6 +168,14 @@ class CafeDetailViewController: UIViewController {
         super.updateViewConstraints()
         self.reviewTableView.heightConstraint?.constant = self.reviewTableView.contentSize.height
     }
+    
+    override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+        if isInit {
+            bottomView.layer.applyShadow(color: 0xC5C5C5.color, alpha: 0.1, x: 0, y: -4, blur: 4)
+            isInit = false
+        }
+    }
 }
 
 // MARK: - Extensions
@@ -587,6 +609,15 @@ extension CafeDetailViewController {
         }
     }
     
+    func layoutEmptyLabel() {
+        cafeScrollContainerView.add(emptyLabel) {
+            $0.snp.makeConstraints {
+                $0.centerX.equalToSuperview()
+                $0.top.equalTo(self.reviewTitleLabel.snp.bottom).offset(63)
+            }
+        }
+    }
+    
     // MARK: - General Helpers
     func dataBind() {
         if self.cafeModel?.img == nil {
@@ -599,7 +630,7 @@ extension CafeDetailViewController {
         self.cafeTitleLabel.setupLabel(text: self.cafeModel?.name ?? "", color: .black, font: .notoSansKRMediumFont(fontSize: 26))
         self.starRatingLabel.setupLabel(text: "\(self.cafeModel?.rating ?? 0)", color: .pointcolorYellow, font: .notoSansKRMediumFont(fontSize: 20))
         self.addressLabel.setupLabel(text: self.cafeModel?.address ?? "", color: .gray4, font: .notoSansKRRegularFont(fontSize: 12))
-        self.instagramLabel.setupLabel(text: "@\(self.cafeModel?.instagram ?? "")", color: .gray4, font: .notoSansKRRegularFont(fontSize: 14))
+        self.instagramLabel.setupLabel(text: "\(self.cafeModel?.instagram ?? "")", color: .gray4, font: .notoSansKRRegularFont(fontSize: 14))
         if let model = cafeModel {
             var offdayString = ""
             if let offday = model.offday {
@@ -628,6 +659,10 @@ extension CafeDetailViewController {
                 )
             }
         }
+        validateIsSaved()
+    }
+    
+    func validateIsSaved() {
         if let isSaved = isSaved {
             if isSaved {
                 savePinView.backgroundColor = .pointcolor1
@@ -652,6 +687,10 @@ extension CafeDetailViewController {
         let reviewGesutre = UITapGestureRecognizer()
         reviewGesutre.addTarget(self, action: #selector(clickedWriteReviewButton))
         reviewView.addGestureRecognizer(reviewGesutre)
+        
+        let addressGesture = UITapGestureRecognizer()
+        addressGesture.addTarget(self, action: #selector(touchupAddressLabel))
+        addressLabel.addGestureRecognizer(addressGesture)
     }
     
     func register() {
@@ -680,13 +719,18 @@ extension CafeDetailViewController {
     }
     @objc func clickedEntireReviewButton() {
         let entireVC = EntireReviewViewController()
-        entireVC.reviewModel = self.reviewModel!
-        self.navigationController?.pushViewController(entireVC, animated: false)
+        if let reviewModel = reviewModel {
+            entireVC.reviewModel = self.reviewModel!
+            self.navigationController?.pushViewController(entireVC, animated: false)
+        }
+        else {
+            showGrayToast(message: "리뷰가 없습니다.")
+        }
     }
     @objc func clickedAddPinButton() {
         if let isSaved = isSaved {
             if isSaved {
-                showGrayToast(message: "이미 저장된 카페입니다.")
+                setupCategory()
             }
             else {
                 setupCategory()
@@ -698,6 +742,15 @@ extension CafeDetailViewController {
         writeReviewVC.cafeId = (self.cafeModel?.id)!
         self.navigationController?.pushViewController(writeReviewVC, animated: false)
     }
+    
+    @objc
+    private func touchupAddressLabel() {
+        if let text = addressLabel.text {
+            UIPasteboard.general.string = text
+            showGreenToast(message: "주소가 복사되었습니다.")
+        }
+    }
+    
     func setupReviewData(cafeId: String) {
         reviewProvider.rx.request(.reviewList(cafeId: cafeId))
             .asObservable()
@@ -714,12 +767,21 @@ extension CafeDetailViewController {
                             self.reviewIdArray.append(self.reviewModel![i].id)
                         }
                         self.layout()
+                        if let review = data.reviews {
+                            self.emptyLabel.isHidden = true
+                            self.reviewTableView.separatorStyle = .singleLine
+                        }
                         self.tagCollectionView.reloadData()
                         self.reviewTableView.reloadData()
                     } catch {
                         print(error)
                     }
                 }
+                if response.statusCode == 204 {
+                    self.emptyLabel.isHidden = false
+                    self.layoutEmptyLabel()
+                    self.reviewTableView.separatorStyle = .none
+                }
             }, onError: { error in
                 print(error)
             }, onCompleted: {
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/Login/ViewControllers/LoginViewController.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/Login/ViewControllers/LoginViewController.swift
index a818208..3fd38e0 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Screens/Login/ViewControllers/LoginViewController.swift
+++ b/CA-PIN_IOS/CA-PIN_IOS/Screens/Login/ViewControllers/LoginViewController.swift
@@ -98,6 +98,9 @@ extension LoginViewController {
             let decoder = JSONDecoder()
             let data = try decoder.decode(ResponseType<LoginData>.self,
                                           from: response.data)
+              if let loginData = data.loginData {
+                  KeychainWrapper.standard.set(loginData.nickname, forKey: "nickname")
+              }
             KeychainWrapper.standard.set(emailText, forKey: "loginEmail")
             KeychainWrapper.standard.set(passwordText, forKey: "loginPassword")
             KeychainWrapper.standard.set(data.loginData!.tokenAccess, forKey: "tokenAccess")
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/Login/ViewControllers/SplashViewController.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/Login/ViewControllers/SplashViewController.swift
index 97df5e8..891859b 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Screens/Login/ViewControllers/SplashViewController.swift
+++ b/CA-PIN_IOS/CA-PIN_IOS/Screens/Login/ViewControllers/SplashViewController.swift
@@ -82,6 +82,9 @@ extension SplashViewController {
                 let decoder = JSONDecoder()
                 let data = try decoder.decode(ResponseType<LoginData>.self,
                                               from: response.data)
+                  if let loginData = data.loginData {
+                      KeychainWrapper.standard.set(loginData.nickname, forKey: "nickname")
+                  }
                 KeychainWrapper.standard.set(ID, forKey: "loginEmail")
                 KeychainWrapper.standard.set(PW, forKey: "loginPassword")
                 KeychainWrapper.standard.set(data.loginData!.tokenAccess, forKey: "tokenAccess")
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/Cells/PinPopupTableViewCell.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/Cells/PinPopupTableViewCell.swift
index 8692b6b..28c62ef 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/Cells/PinPopupTableViewCell.swift
+++ b/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/Cells/PinPopupTableViewCell.swift
@@ -29,6 +29,11 @@ class PinPopupTableViewCell: UITableViewCell {
     layout()
   }
 
+    
+    override func prepareForReuse() {
+        super.prepareForReuse()
+        selectbutton.isHidden = false
+    }
 }
 
 // MARK: - Extensions
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/Cells/TermsGeneralTableViewCell.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/Cells/TermsGeneralTableViewCell.swift
index a4b1b18..b73914f 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/Cells/TermsGeneralTableViewCell.swift
+++ b/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/Cells/TermsGeneralTableViewCell.swift
@@ -17,7 +17,9 @@ class TermsGeneralTableViewCell: UITableViewCell {
   // MARK: - Components
   let containerView = UIView()
   let titleLabel = UILabel()
-  let nextButton = UIButton()
+    let nextButton = UIButton().then {
+        $0.isUserInteractionEnabled = false
+    }
   
   var titleText: String?
   
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/ViewControllers/CreateCategoryViewController.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/ViewControllers/CreateCategoryViewController.swift
index 8f4dc9d..0615b23 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/ViewControllers/CreateCategoryViewController.swift
+++ b/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/ViewControllers/CreateCategoryViewController.swift
@@ -239,7 +239,7 @@ extension CreateCategoryViewController {
             }
             if let pinVC = self.navigationController?.children[0] as? PinPopupViewController {
               self.navigationController?.popToViewController(pinVC, animated: false)
-              pinVC.categoryTableView.reloadData()
+                pinVC.setupCategory()
               pinVC.showGreenToast(message: "카테고리가 추가되었습니다.")
             }
           
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/ViewControllers/MapViewController.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/ViewControllers/MapViewController.swift
index 59f3ad3..48ca3f6 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/ViewControllers/MapViewController.swift
+++ b/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/ViewControllers/MapViewController.swift
@@ -507,23 +507,23 @@ extension MapViewController {
         else {
             switch colorCode {
             case "C12D62":
-                return "pinInactiveCate1"
-            case "E57D3A":
                 return "pinInactiveCate2"
-            case "FFC24B":
+            case "E57D3A":
                 return "pinInactiveCate3"
-            case "8ABE56":
+            case "FFC24B":
                 return "pinInactiveCate4"
-            case "49A48F":
+            case "8ABE56":
                 return "pinInactiveCate5"
-            case "51BAE0":
+            case "49A48F":
                 return "pinInactiveCate6"
-            case "1E73BE":
+            case "51BAE0":
                 return "pinInactiveCate7"
-            case "754593":
+            case "1E73BE":
                 return "pinInactiveCate8"
-            case "EBEAEF":
+            case "754593":
                 return "pinInactiveCate9"
+            case "EBEAEF":
+                return "pinInactiveCate10"
             case "A77145":
                 return "pinInactiveCate10"
             default:
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/ViewControllers/PinPopupViewController.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/ViewControllers/PinPopupViewController.swift
index 70482ff..173ff81 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/ViewControllers/PinPopupViewController.swift
+++ b/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/ViewControllers/PinPopupViewController.swift
@@ -30,6 +30,7 @@ class PinPopupViewController: UIViewController {
   var selectedIndex: Int?
   var cafeId = ""
   
+    let userProvider = MoyaProvider<UserService>(plugins: [NetworkLoggerPlugin(verbose: true)])
   let categoryProvier = MoyaProvider<CategoryService>(plugins: [NetworkLoggerPlugin(verbose: true)])
   let disposeBag = DisposeBag()
   
@@ -124,7 +125,7 @@ extension PinPopupViewController {
       $0.setupButton(title: "완료",
                      color: .white,
                      font: .notoSansKRMediumFont(fontSize: 16),
-                     backgroundColor: 0xA98E7A.color,
+                     backgroundColor: 0xA77145.color,
                      state: .normal,
                      radius: 24)
       $0.addTarget(self,
@@ -210,9 +211,13 @@ extension PinPopupViewController {
             do {
               let index = (self.navigationController?.presentingViewController?.children.count)! - 1
               let mapVC = self.navigationController?.presentingViewController?.children[index] as? MapViewController
+                let detailVC = self.navigationController?.presentingViewController?.children[index] as? CafeDetailViewController
               self.dismiss(animated: false) {
                 mapVC?.showGreenToast(message: "카테고리에 저장되었습니다.")
                   mapVC?.setupCafeInformation(cafeId: self.cafeId)
+                  detailVC?.showGreenToast(message: "카테고리에 저장되었습니다.")
+                  detailVC?.isSaved = true
+                  detailVC?.validateIsSaved()
               }
             } catch {
               print(error)
@@ -224,27 +229,55 @@ extension PinPopupViewController {
         }).disposed(by: disposeBag)
     }
   }
+    
+    func setupCategory() {
+        userProvider.rx.request(.categoryList)
+            .asObservable()
+            .subscribe(onNext: { response in
+                if response.statusCode == 200 {
+                    do {
+                        let decoder = JSONDecoder()
+                        let data = try decoder.decode(CategoryResponseArrayType<MyCategoryList>.self,
+                                                      from: response.data)
+                        if let list = data.myCategoryList {
+                            self.categoryArray = list
+                        }
+                        self.categoryTableView.reloadData()
+                    } catch {
+                        print(error)
+                    }
+                }
+                else {
+                    
+                }
+            }, onError: { error in
+                print(error)
+            }, onCompleted: {
+                
+            }).disposed(by: disposeBag)
+    }
+    
   func colorViewImage(colorCode: String) -> String {
     switch colorCode {
-    case "6492F5":
+    case "C12D62":
       return "colorchip1"
-    case "6BBC9A":
+    case "E57D3A":
       return "colorchip2"
     case "FFC24B":
       return "colorchip3"
-    case "816F7C":
+    case "8ABE56":
       return "colorchip4"
-    case "FFC2D5":
+    case "49A48F":
       return "colorchip5"
-    case "C9D776":
+    case "51BAE0":
       return "colorchip6"
-    case "B2B9E5":
+    case "1E73BE":
       return "colorchip7"
-    case "FF8E8E":
+    case "754593":
       return "colorchip8"
     case "EBEAEF":
       return "colorchip9"
-    case "9DC5E8":
+    case "A77145":
       return "colorchip10"
     default:
       return "colorchip1"
@@ -275,7 +308,7 @@ extension PinPopupViewController: UITableViewDataSource {
     }
     else {
       categoryCell.rootViewController = self
-      if (selectedIndex ?? 100) == indexPath.row {
+      if (selectedIndex ?? 100) == indexPath.row  {
         categoryCell.selectbutton.isSelected = true
       }
       else {
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/ViewControllers/TermsViewController.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/ViewControllers/TermsViewController.swift
index e10d94c..1cd1852 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/ViewControllers/TermsViewController.swift
+++ b/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/ViewControllers/TermsViewController.swift
@@ -64,7 +64,7 @@ extension TermsViewController {
       $0.setBackgroundImage(UIImage(named: "iconBackBlack"), for: .normal)
       $0.addTarget(self, action: #selector(self.clickedBackButton), for: .touchUpInside)
       $0.snp.makeConstraints {
-        $0.bottom.equalTo(self.topView.snp.bottom)
+          $0.top.equalTo(self.view.snp.top).offset(51)
         $0.leading.equalTo(self.topView.snp.leading).offset(20)
         $0.width.height.equalTo(28)
       }
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/Views/CafeDetailPopupView.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/Views/CafeDetailPopupView.swift
index 4614d71..627777c 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/Views/CafeDetailPopupView.swift
+++ b/CA-PIN_IOS/CA-PIN_IOS/Screens/Map/Views/CafeDetailPopupView.swift
@@ -222,6 +222,9 @@ extension CafeDetailPopupView {
             if !isSaved {
                 rootVC.setupCategory()
             }
+            else {
+                rootVC.setupCategory()
+            }
         }
     }
 }
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/Tag/ViewControllers/TagViewController.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/Tag/ViewControllers/TagViewController.swift
index 8928ccd..54f77b9 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Screens/Tag/ViewControllers/TagViewController.swift
+++ b/CA-PIN_IOS/CA-PIN_IOS/Screens/Tag/ViewControllers/TagViewController.swift
@@ -50,6 +50,12 @@ class TagViewController: UIViewController {
     self.tagTableView.dataSource = self
     NotificationCenter.default.addObserver(self, selector: #selector(self.pop), name: NSNotification.Name("pop"), object: nil)
   }
+    
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        guard let gesture = self.navigationController?.interactivePopGestureRecognizer else { return }
+        self.navigationController?.view.removeGestureRecognizer(gesture)
+    }
 }
 
 // MARK: - Extensions
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/WriteReview/Cells/NewReviewPhotoCollectionViewCell.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/WriteReview/Cells/NewReviewPhotoCollectionViewCell.swift
index 7ccf4bc..d128b62 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Screens/WriteReview/Cells/NewReviewPhotoCollectionViewCell.swift
+++ b/CA-PIN_IOS/CA-PIN_IOS/Screens/WriteReview/Cells/NewReviewPhotoCollectionViewCell.swift
@@ -36,7 +36,7 @@ extension NewReviewPhotoCollectionViewCell {
   func layoutAddPhotoView() {
     self.contentView.add(addPhotoView) {
       $0.setRounded(radius: 5)
-      $0.backgroundColor = .pointcolor1
+      $0.backgroundColor = .maincolor1
       $0.snp.makeConstraints {
         $0.edges.equalToSuperview()
       }
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/WriteReview/ViewControllers/WriteReviewViewController.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/WriteReview/ViewControllers/WriteReviewViewController.swift
index d2e291c..a6816f7 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Screens/WriteReview/ViewControllers/WriteReviewViewController.swift
+++ b/CA-PIN_IOS/CA-PIN_IOS/Screens/WriteReview/ViewControllers/WriteReviewViewController.swift
@@ -72,6 +72,7 @@ class WriteReviewViewController: UIViewController {
     $0.settings.emptyImage = UIImage(named: "starInactive")
     $0.settings.starSize = 34
     $0.settings.starMargin = 14.7
+      $0.settings.minTouchRating = 0.5
     $0.settings.starPoints = [CGPoint(x: 100, y: 91.176)]
   }
   let writereviewButton = UIButton()
@@ -83,7 +84,7 @@ class WriteReviewViewController: UIViewController {
   
   final let maxLength = 150
   var nameCount = 0
-  var ratingValue = 2.5
+    var ratingValue = 0.0
   
   var fetchResult: PHFetchResult<PHAsset>?
   var canAccessImages: [UIImage] = []
@@ -488,7 +489,7 @@ extension WriteReviewViewController {
     else {
       self.reviewTextView.textColor = .black
     }
-    self.writereviewButton.setupButton(title: confirmTitle, color: .white, font: .notoSansKRMediumFont(fontSize: 16), backgroundColor: .pointcolor1, state: .normal, radius: 24.5)
+    self.writereviewButton.setupButton(title: confirmTitle, color: .white, font: .notoSansKRMediumFont(fontSize: 16), backgroundColor: .maincolor1, state: .normal, radius: 24.5)
     self.ratingView.rating = self.ratingValue
     if self.recommend == [0] {
       self.tasteButton.isSelected = true
@@ -504,7 +505,7 @@ extension WriteReviewViewController {
   @objc func tasteButtonClicked() {
     tasteButton.isSelected.toggle()
     if tasteButton.isSelected == true {
-      tasteButton.backgroundColor = .pointcolor1
+      tasteButton.backgroundColor = .maincolor1
       tasteButton.setTitleColor(.white, for: .normal)
     }
     else {
@@ -515,7 +516,7 @@ extension WriteReviewViewController {
   @objc func feelButtonClicked() {
     feelButton.isSelected.toggle()
     if feelButton.isSelected == true {
-      feelButton.backgroundColor = .pointcolor1
+      feelButton.backgroundColor = .maincolor1
       feelButton.setTitleColor(.white, for: .normal)
       
     }
@@ -627,9 +628,11 @@ extension WriteReviewViewController {
         }
       }
       self.reviewphotoCollectionView.reloadData()
+        self.topcontainerview.isHidden = false
       picker.dismiss(animated: true, completion: nil)
     }
-    picker.modalPresentationStyle = .overCurrentContext
+    picker.modalPresentationStyle = .overFullScreen
+      self.topcontainerview.isHidden = true
     self.present(picker, animated: true, completion: nil)
   }
   
@@ -646,6 +649,7 @@ extension WriteReviewViewController {
           do {
             let index = (self.navigationController?.children.count)! - 2
             let detailVC = self.navigationController?.children[index] as? CafeDetailViewController
+              
             self.navigationController?.popViewController(animated: false) {
               detailVC?.setupReviewData(cafeId: self.cafeId)
               detailVC?.showGreenToast(message: "리뷰 등록이 완료되었습니다.")
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxActive.imageset/Contents.json b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxActive.imageset/Contents.json
index 1c5d1c9..136fdb0 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxActive.imageset/Contents.json
+++ b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxActive.imageset/Contents.json
@@ -2,8 +2,8 @@
   "images" : [
     {
       "filename" : "checkboxActive.png",
-      "scale" : "1x",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
@@ -11,9 +11,9 @@
       "filename" : "checkboxActive@2x.png"
     },
     {
-      "scale" : "3x",
+      "idiom" : "universal",
       "filename" : "checkboxActive@3x.png",
-      "idiom" : "universal"
+      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxActive.imageset/checkboxActive.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxActive.imageset/checkboxActive.png
index 876a5b1..73a5daa 100644
Binary files a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxActive.imageset/checkboxActive.png and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxActive.imageset/checkboxActive.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxActive.imageset/checkboxActive@2x.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxActive.imageset/checkboxActive@2x.png
index 35ca27b..27d4a7a 100644
Binary files a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxActive.imageset/checkboxActive@2x.png and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxActive.imageset/checkboxActive@2x.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxActive.imageset/checkboxActive@3x.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxActive.imageset/checkboxActive@3x.png
index c113efe..0c0a85f 100644
Binary files a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxActive.imageset/checkboxActive@3x.png and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxActive.imageset/checkboxActive@3x.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxInactive.imageset/Contents.json b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxInactive.imageset/Contents.json
index 1fdce55..39069de 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxInactive.imageset/Contents.json
+++ b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxInactive.imageset/Contents.json
@@ -2,8 +2,8 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "checkboxInactive.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "filename" : "checkboxInactive.png"
     },
     {
       "scale" : "2x",
@@ -11,9 +11,9 @@
       "filename" : "checkboxInactive@2x.png"
     },
     {
-      "scale" : "3x",
       "idiom" : "universal",
-      "filename" : "checkboxInactive@3x.png"
+      "filename" : "checkboxInactive@3x.png",
+      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxInactive.imageset/checkboxInactive.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxInactive.imageset/checkboxInactive.png
index b13983b..b445f9f 100644
Binary files a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxInactive.imageset/checkboxInactive.png and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxInactive.imageset/checkboxInactive.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxInactive.imageset/checkboxInactive@2x.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxInactive.imageset/checkboxInactive@2x.png
index 3095183..f11505f 100644
Binary files a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxInactive.imageset/checkboxInactive@2x.png and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxInactive.imageset/checkboxInactive@2x.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxInactive.imageset/checkboxInactive@3x.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxInactive.imageset/checkboxInactive@3x.png
index 1506a2a..7e5fc7b 100644
Binary files a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxInactive.imageset/checkboxInactive@3x.png and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/checkboxInactive.imageset/checkboxInactive@3x.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/colorchipSelected2.imageset/Contents.json b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/colorchipSelected2.imageset/Contents.json
index 4b752e4..557a2e1 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/colorchipSelected2.imageset/Contents.json
+++ b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/colorchipSelected2.imageset/Contents.json
@@ -1,19 +1,19 @@
 {
   "images" : [
     {
+      "filename" : "colorchipSelected2.png",
       "scale" : "1x",
-      "idiom" : "universal",
-      "filename" : "colorchipSelected2.png"
+      "idiom" : "universal"
     },
     {
+      "idiom" : "universal",
       "filename" : "colorchipSelected2@2x.png",
-      "scale" : "2x",
-      "idiom" : "universal"
+      "scale" : "2x"
     },
     {
-      "filename" : "colorchipSelected2@3x.png",
+      "idiom" : "universal",
       "scale" : "3x",
-      "idiom" : "universal"
+      "filename" : "colorchipSelected2@3x.png"
     }
   ],
   "info" : {
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/colorchipSelected2.imageset/colorchipSelected2.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/colorchipSelected2.imageset/colorchipSelected2.png
index 08cc4f8..4cf83f8 100644
Binary files a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/colorchipSelected2.imageset/colorchipSelected2.png and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/colorchipSelected2.imageset/colorchipSelected2.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/colorchipSelected2.imageset/colorchipSelected2@2x.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/colorchipSelected2.imageset/colorchipSelected2@2x.png
index 37e4970..197d88f 100644
Binary files a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/colorchipSelected2.imageset/colorchipSelected2@2x.png and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/colorchipSelected2.imageset/colorchipSelected2@2x.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/colorchipSelected2.imageset/colorchipSelected2@3x.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/colorchipSelected2.imageset/colorchipSelected2@3x.png
index f8e469d..fbf5032 100644
Binary files a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/colorchipSelected2.imageset/colorchipSelected2@3x.png and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/colorchipSelected2.imageset/colorchipSelected2@3x.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/ellipse24.imageset/Contents.json b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/ellipse24.imageset/Contents.json
new file mode 100644
index 0000000..58b76d8
--- /dev/null
+++ b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/ellipse24.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "ellipse24.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ellipse24@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ellipse24@3x.png",
+      "scale" : "3x",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/ellipse24.imageset/ellipse24.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/ellipse24.imageset/ellipse24.png
new file mode 100644
index 0000000..2b3d1e5
Binary files /dev/null and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/ellipse24.imageset/ellipse24.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/ellipse24.imageset/ellipse24@2x.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/ellipse24.imageset/ellipse24@2x.png
new file mode 100644
index 0000000..2ef324d
Binary files /dev/null and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/ellipse24.imageset/ellipse24@2x.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/ellipse24.imageset/ellipse24@3x.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/ellipse24.imageset/ellipse24@3x.png
new file mode 100644
index 0000000..bb93c13
Binary files /dev/null and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/ellipse24.imageset/ellipse24@3x.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconCafeMenu.imageset/Contents.json b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconCafeMenu.imageset/Contents.json
index ec0b52e..2901b00 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconCafeMenu.imageset/Contents.json
+++ b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconCafeMenu.imageset/Contents.json
@@ -1,19 +1,19 @@
 {
   "images" : [
     {
-      "scale" : "1x",
       "idiom" : "universal",
-      "filename" : "iconCafeMenu.png"
+      "filename" : "iconCafeMenu.png",
+      "scale" : "1x"
     },
     {
       "filename" : "iconCafeMenu@2x.png",
-      "scale" : "2x",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "2x"
     },
     {
+      "idiom" : "universal",
       "filename" : "iconCafeMenu@3x.png",
-      "scale" : "3x",
-      "idiom" : "universal"
+      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconCafeMenu.imageset/iconCafeMenu.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconCafeMenu.imageset/iconCafeMenu.png
index 402fa9e..c828eb6 100644
Binary files a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconCafeMenu.imageset/iconCafeMenu.png and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconCafeMenu.imageset/iconCafeMenu.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconCafeMenu.imageset/iconCafeMenu@2x.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconCafeMenu.imageset/iconCafeMenu@2x.png
index 02a6631..7106360 100644
Binary files a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconCafeMenu.imageset/iconCafeMenu@2x.png and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconCafeMenu.imageset/iconCafeMenu@2x.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconCafeMenu.imageset/iconCafeMenu@3x.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconCafeMenu.imageset/iconCafeMenu@3x.png
index a7f479c..d35017a 100644
Binary files a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconCafeMenu.imageset/iconCafeMenu@3x.png and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconCafeMenu.imageset/iconCafeMenu@3x.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconInsta.imageset/Contents.json b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconInsta.imageset/Contents.json
index 78701c5..ab0b2e1 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconInsta.imageset/Contents.json
+++ b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconInsta.imageset/Contents.json
@@ -2,18 +2,18 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "iconInsta.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "filename" : "iconInsta.png"
     },
     {
+      "idiom" : "universal",
       "scale" : "2x",
-      "filename" : "iconInsta@2x.png",
-      "idiom" : "universal"
+      "filename" : "iconInsta@2x.png"
     },
     {
+      "idiom" : "universal",
       "filename" : "iconInsta@3x.png",
-      "scale" : "3x",
-      "idiom" : "universal"
+      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconInsta.imageset/iconInsta.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconInsta.imageset/iconInsta.png
index a9fa212..6d2cd53 100644
Binary files a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconInsta.imageset/iconInsta.png and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconInsta.imageset/iconInsta.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconInsta.imageset/iconInsta@2x.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconInsta.imageset/iconInsta@2x.png
index d8d0b68..8309e86 100644
Binary files a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconInsta.imageset/iconInsta@2x.png and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconInsta.imageset/iconInsta@2x.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconInsta.imageset/iconInsta@3x.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconInsta.imageset/iconInsta@3x.png
index d64331d..17362c0 100644
Binary files a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconInsta.imageset/iconInsta@3x.png and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconInsta.imageset/iconInsta@3x.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconTime.imageset/Contents.json b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconTime.imageset/Contents.json
index 789a579..ade7c6f 100644
--- a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconTime.imageset/Contents.json
+++ b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconTime.imageset/Contents.json
@@ -1,18 +1,18 @@
 {
   "images" : [
     {
+      "filename" : "iconTime.png",
       "scale" : "1x",
-      "idiom" : "universal",
-      "filename" : "iconTime.png"
+      "idiom" : "universal"
     },
     {
+      "scale" : "2x",
       "idiom" : "universal",
-      "filename" : "iconTime@2x.png",
-      "scale" : "2x"
+      "filename" : "iconTime@2x.png"
     },
     {
-      "idiom" : "universal",
       "scale" : "3x",
+      "idiom" : "universal",
       "filename" : "iconTime@3x.png"
     }
   ],
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconTime.imageset/iconTime.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconTime.imageset/iconTime.png
index 31e5fe3..eea5102 100644
Binary files a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconTime.imageset/iconTime.png and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconTime.imageset/iconTime.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconTime.imageset/iconTime@2x.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconTime.imageset/iconTime@2x.png
index c83bf0a..f57a7d6 100644
Binary files a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconTime.imageset/iconTime@2x.png and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconTime.imageset/iconTime@2x.png differ
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconTime.imageset/iconTime@3x.png b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconTime.imageset/iconTime@3x.png
index 5896d97..da844ea 100644
Binary files a/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconTime.imageset/iconTime@3x.png and b/CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/iconTime.imageset/iconTime@3x.png differ