diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/Contents.json
deleted file mode 100644
index 0d217ddc..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/Contents.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "icnFire.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnFireDark.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "icnFire@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnFireDark@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "icnFire@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnFireDark@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/icnFire.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/icnFire.png
deleted file mode 100644
index 90b112b9..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/icnFire.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/icnFire@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/icnFire@2x.png
deleted file mode 100644
index 70a74c76..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/icnFire@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/icnFire@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/icnFire@3x.png
deleted file mode 100644
index fe2f6fcf..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/icnFire@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/icnFireDark.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/icnFireDark.png
deleted file mode 100644
index 79d3688d..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/icnFireDark.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/icnFireDark@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/icnFireDark@2x.png
deleted file mode 100644
index 506ea1e5..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/icnFireDark@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/icnFireDark@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/icnFireDark@3x.png
deleted file mode 100644
index 4d87fb44..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFire.imageset/icnFireDark@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/Contents.json
deleted file mode 100644
index 00b651f1..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/Contents.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "icnHeart.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnHeartDark.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "icnHeart@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnHeartDark@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "icnHeart@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnHeartDark@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/icnHeart.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/icnHeart.png
deleted file mode 100644
index f8830844..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/icnHeart.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/icnHeart@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/icnHeart@2x.png
deleted file mode 100644
index 9df2cd93..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/icnHeart@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/icnHeart@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/icnHeart@3x.png
deleted file mode 100644
index 4058daa7..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/icnHeart@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/icnHeartDark.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/icnHeartDark.png
deleted file mode 100644
index f45ff9ac..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/icnHeartDark.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/icnHeartDark@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/icnHeartDark@2x.png
deleted file mode 100644
index 9261f5b2..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/icnHeartDark@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/icnHeartDark@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/icnHeartDark@3x.png
deleted file mode 100644
index 4586cffa..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHeart.imageset/icnHeartDark@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/Contents.json
deleted file mode 100644
index 6417b76a..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/Contents.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "icnHoverRandom.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnHoverRandom 1.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "icnHoverRandom@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnHoverRandom@2x 1.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "icnHoverRandom@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnHoverRandom@3x 1.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/icnHoverRandom 1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/icnHoverRandom 1.png
deleted file mode 100644
index 080f83e1..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/icnHoverRandom 1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/icnHoverRandom.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/icnHoverRandom.png
deleted file mode 100644
index 53759ee5..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/icnHoverRandom.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/icnHoverRandom@2x 1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/icnHoverRandom@2x 1.png
deleted file mode 100644
index 36e749fb..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/icnHoverRandom@2x 1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/icnHoverRandom@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/icnHoverRandom@2x.png
deleted file mode 100644
index 8b2dccaa..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/icnHoverRandom@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/icnHoverRandom@3x 1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/icnHoverRandom@3x 1.png
deleted file mode 100644
index d3e40545..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/icnHoverRandom@3x 1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/icnHoverRandom@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/icnHoverRandom@3x.png
deleted file mode 100644
index a9a386c7..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnHoverRandom.imageset/icnHoverRandom@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/Contents.json
deleted file mode 100644
index 0b34a2fb..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/Contents.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "icnLabel.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnLabelDark.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "icnLabel@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnLabelDark@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "icnLabel@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnLabelDark@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/icnLabel.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/icnLabel.png
deleted file mode 100644
index 25ac3c26..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/icnLabel.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/icnLabel@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/icnLabel@2x.png
deleted file mode 100644
index 366a0f53..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/icnLabel@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/icnLabel@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/icnLabel@3x.png
deleted file mode 100644
index 714707cf..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/icnLabel@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/icnLabelDark.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/icnLabelDark.png
deleted file mode 100644
index d571a098..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/icnLabelDark.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/icnLabelDark@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/icnLabelDark@2x.png
deleted file mode 100644
index e82ac61b..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/icnLabelDark@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/icnLabelDark@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/icnLabelDark@3x.png
deleted file mode 100644
index adb0e114..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnLabel.imageset/icnLabelDark@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/Contents.json
deleted file mode 100644
index 7596f57d..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/Contents.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "icnNote 1.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnNote.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "icnNote@2x 1.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnNote@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "icnNote@3x 1.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnNote@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/icnNote 1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/icnNote 1.png
deleted file mode 100644
index a9955539..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/icnNote 1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/icnNote.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/icnNote.png
deleted file mode 100644
index d57fd9e0..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/icnNote.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/icnNote@2x 1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/icnNote@2x 1.png
deleted file mode 100644
index ca1501e1..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/icnNote@2x 1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/icnNote@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/icnNote@2x.png
deleted file mode 100644
index bf583107..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/icnNote@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/icnNote@3x 1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/icnNote@3x 1.png
deleted file mode 100644
index 2c14118d..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/icnNote@3x 1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/icnNote@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/icnNote@3x.png
deleted file mode 100644
index e80edb05..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNote.imageset/icnNote@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/Contents.json
deleted file mode 100644
index 92689c5b..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/Contents.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "icnSmile.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnSmileDark.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "icnSmile@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnSmileDark@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "icnSmile@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnSmileDark@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/icnSmile.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/icnSmile.png
deleted file mode 100644
index 2f2e1457..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/icnSmile.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/icnSmile@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/icnSmile@2x.png
deleted file mode 100644
index 8fec70cd..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/icnSmile@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/icnSmile@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/icnSmile@3x.png
deleted file mode 100644
index 0eefcff1..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/icnSmile@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/icnSmileDark.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/icnSmileDark.png
deleted file mode 100644
index 075f1506..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/icnSmileDark.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/icnSmileDark@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/icnSmileDark@2x.png
deleted file mode 100644
index f6e40be8..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/icnSmileDark@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/icnSmileDark@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/icnSmileDark@3x.png
deleted file mode 100644
index 97994718..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSmile.imageset/icnSmileDark@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/Contents.json
deleted file mode 100644
index 14dd6652..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/Contents.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "icnSun.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnSunDark.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "icnSun@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnSunDark@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "icnSun@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "icnSunDark@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/icnSun.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/icnSun.png
deleted file mode 100644
index d34256a2..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/icnSun.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/icnSun@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/icnSun@2x.png
deleted file mode 100644
index 4246fd21..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/icnSun@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/icnSun@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/icnSun@3x.png
deleted file mode 100644
index fcbc6d19..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/icnSun@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/icnSunDark.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/icnSunDark.png
deleted file mode 100644
index 48dd9c83..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/icnSunDark.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/icnSunDark@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/icnSunDark@2x.png
deleted file mode 100644
index 1f40c64b..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/icnSunDark@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/icnSunDark@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/icnSunDark@3x.png
deleted file mode 100644
index 23686b56..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnSun.imageset/icnSunDark@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/Contents.json
new file mode 100644
index 00000000..73c00596
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnFire.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnFire.imageset/Contents.json
new file mode 100644
index 00000000..2418347f
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnFire.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "icnFire.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "icnFireDark.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnFire.imageset/icnFire.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnFire.imageset/icnFire.svg
new file mode 100644
index 00000000..d8616b03
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnFire.imageset/icnFire.svg
@@ -0,0 +1,4 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="14" cy="14" r="13" fill="#fff"/>
+    <path d="M20.234 14.292c-1.308-3.4-5.967-3.584-4.842-8.525a.42.42 0 0 0-.625-.459c-3.025 1.784-5.2 5.359-3.375 10.042.15.383-.3.742-.625.492-1.508-1.142-1.666-2.784-1.533-3.959.05-.433-.517-.641-.758-.283-.567.867-1.142 2.267-1.142 4.375.317 4.667 4.258 6.1 5.675 6.283 2.025.259 4.217-.116 5.792-1.558 1.733-1.608 2.366-4.175 1.433-6.408zm-7.733 4.191c1.2-.291 1.816-1.158 1.983-1.925.275-1.191-.8-2.358-.075-4.241.275 1.558 2.725 2.533 2.725 4.233.067 2.108-2.217 3.917-4.633 1.933z" fill="#4886DB"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnFire.imageset/icnFireDark.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnFire.imageset/icnFireDark.svg
new file mode 100644
index 00000000..5f09c292
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnFire.imageset/icnFireDark.svg
@@ -0,0 +1,4 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="14" cy="14" r="13" fill="#131416"/>
+    <path d="M20.234 14.292c-1.308-3.4-5.967-3.584-4.842-8.525a.42.42 0 0 0-.625-.459c-3.025 1.784-5.2 5.359-3.375 10.042.15.383-.3.742-.625.492-1.508-1.142-1.666-2.784-1.533-3.959.05-.433-.517-.641-.758-.283-.567.867-1.142 2.267-1.142 4.375.317 4.667 4.258 6.1 5.675 6.283 2.025.259 4.217-.116 5.792-1.558 1.733-1.608 2.366-4.175 1.433-6.408zm-7.733 4.191c1.2-.291 1.816-1.158 1.983-1.925.275-1.191-.8-2.358-.075-4.241.275 1.558 2.725 2.533 2.725 4.233.067 2.108-2.217 3.917-4.633 1.933z" fill="#4886DB" fill-opacity=".7"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnHeart.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnHeart.imageset/Contents.json
new file mode 100644
index 00000000..fc9dc1c0
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnHeart.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "icnHeart.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "icnHeart 1.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnHeart.imageset/icnHeart 1.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnHeart.imageset/icnHeart 1.svg
new file mode 100644
index 00000000..0c607439
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnHeart.imageset/icnHeart 1.svg	
@@ -0,0 +1,11 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="14" cy="14" r="13" fill="#131416"/>
+    <g opacity=".7" clip-path="url(#pujtaceh7a)">
+        <path d="M15.125 21.775a1.663 1.663 0 0 1-2.241-.008l-.092-.084c-4.375-3.958-7.233-6.55-7.125-9.783.05-1.417.775-2.775 1.95-3.575 2.2-1.5 4.917-.8 6.383.917 1.467-1.717 4.184-2.425 6.384-.917 1.175.8 1.9 2.158 1.95 3.575.116 3.233-2.75 5.825-7.125 9.8l-.084.075z" fill="#FE5888"/>
+    </g>
+    <defs>
+        <clipPath id="pujtaceh7a">
+            <path fill="#fff" transform="translate(4 5)" d="M0 0h20v20H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnHeart.imageset/icnHeart.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnHeart.imageset/icnHeart.svg
new file mode 100644
index 00000000..0ecd1d7a
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnHeart.imageset/icnHeart.svg
@@ -0,0 +1,11 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="14" cy="14" r="13" fill="#fff"/>
+    <g clip-path="url(#owvub9db9a)">
+        <path d="M15.125 21.775a1.663 1.663 0 0 1-2.241-.008l-.092-.084c-4.375-3.958-7.233-6.55-7.125-9.783.05-1.417.775-2.775 1.95-3.575 2.2-1.5 4.917-.8 6.383.917 1.467-1.717 4.184-2.425 6.384-.917 1.175.8 1.9 2.158 1.95 3.575.116 3.233-2.75 5.825-7.125 9.8l-.084.075z" fill="#FE5888"/>
+    </g>
+    <defs>
+        <clipPath id="owvub9db9a">
+            <path fill="#fff" transform="translate(4 5)" d="M0 0h20v20H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnLabel.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnLabel.imageset/Contents.json
new file mode 100644
index 00000000..0575b89d
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnLabel.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "icnLabel.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "icnLabel 1.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnLabel.imageset/icnLabel 1.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnLabel.imageset/icnLabel 1.svg
new file mode 100644
index 00000000..58021fd5
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnLabel.imageset/icnLabel 1.svg	
@@ -0,0 +1,4 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="14" cy="14" r="13" fill="#131416"/>
+    <path d="m21.058 14.685-6.75-6.75A1.49 1.49 0 0 0 13.25 7.5H8c-.825 0-1.5.675-1.5 1.5v5.25c0 .412.165.787.442 1.065l6.75 6.75c.27.27.646.435 1.058.435.412 0 .787-.165 1.057-.442l5.25-5.25c.278-.27.443-.645.443-1.058 0-.412-.172-.795-.442-1.065zM9.125 11.25A1.123 1.123 0 0 1 8 10.125C8 9.502 8.502 9 9.125 9s1.125.502 1.125 1.125-.502 1.125-1.125 1.125z" fill="#7384A0" opacity=".7"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnLabel.imageset/icnLabel.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnLabel.imageset/icnLabel.svg
new file mode 100644
index 00000000..6a9522a7
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnLabel.imageset/icnLabel.svg
@@ -0,0 +1,4 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="14" cy="14" r="13" fill="#fff"/>
+    <path d="m21.058 14.685-6.75-6.75A1.49 1.49 0 0 0 13.25 7.5H8c-.825 0-1.5.675-1.5 1.5v5.25c0 .412.165.787.442 1.065l6.75 6.75c.27.27.646.435 1.058.435.412 0 .787-.165 1.057-.442l5.25-5.25c.278-.27.443-.645.443-1.058 0-.412-.172-.795-.442-1.065zM9.125 11.25A1.123 1.123 0 0 1 8 10.125C8 9.502 8.502 9 9.125 9s1.125.502 1.125 1.125-.502 1.125-1.125 1.125z" fill="#7384A0"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnNote.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnNote.imageset/Contents.json
new file mode 100644
index 00000000..91e9af0f
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnNote.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "icnNote.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "icnNote 1.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnNote.imageset/icnNote 1.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnNote.imageset/icnNote 1.svg
new file mode 100644
index 00000000..c22719fa
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnNote.imageset/icnNote 1.svg	
@@ -0,0 +1,4 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="14" cy="14" r="13" fill="#131416"/>
+    <path d="M14 8.167v7.125c-.783-.45-1.75-.625-2.774-.267-1.117.4-1.975 1.392-2.175 2.558a3.34 3.34 0 0 0 3.825 3.875c1.633-.258 2.791-1.758 2.791-3.416V9.833h1.667c.917 0 1.667-.75 1.667-1.666 0-.917-.75-1.667-1.667-1.667h-1.667c-.916 0-1.666.75-1.666 1.667z" fill="#9599F9" fill-opacity=".6"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnNote.imageset/icnNote.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnNote.imageset/icnNote.svg
new file mode 100644
index 00000000..91a2e718
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnNote.imageset/icnNote.svg
@@ -0,0 +1,4 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="14" cy="14" r="13" fill="#fff"/>
+    <path d="M14 8.167v7.125c-.783-.45-1.75-.625-2.774-.267-1.117.4-1.975 1.392-2.175 2.558a3.34 3.34 0 0 0 3.825 3.875c1.633-.258 2.791-1.758 2.791-3.416V9.833h1.667c.917 0 1.667-.75 1.667-1.666 0-.917-.75-1.667-1.667-1.667h-1.667c-.916 0-1.666.75-1.666 1.667z" fill="#9599F9"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnSmile.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnSmile.imageset/Contents.json
new file mode 100644
index 00000000..106a3ee1
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnSmile.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "icnSmile.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "icnSmileDark.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnSmile.imageset/icnSmile.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnSmile.imageset/icnSmile.svg
new file mode 100644
index 00000000..09bf1900
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnSmile.imageset/icnSmile.svg
@@ -0,0 +1,4 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="14" cy="14" r="13" fill="#fff"/>
+    <path d="M13.991 5.667c-4.6 0-8.325 3.733-8.325 8.333s3.725 8.333 8.325 8.333c4.608 0 8.342-3.733 8.342-8.333s-3.734-8.333-8.342-8.333zm-2.908 5c.691 0 1.25.558 1.25 1.25 0 .691-.559 1.25-1.25 1.25-.692 0-1.25-.559-1.25-1.25 0-.692.558-1.25 1.25-1.25zm6.841 5.6C17.166 17.892 15.7 19 14 19c-1.7 0-3.166-1.108-3.925-2.733a.418.418 0 0 1 .375-.6h7.1c.309 0 .509.325.375.6zm-1.008-3.1c-.692 0-1.25-.559-1.25-1.25 0-.692.558-1.25 1.25-1.25s1.25.558 1.25 1.25c0 .691-.558 1.25-1.25 1.25z" fill="#119A79"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnSmile.imageset/icnSmileDark.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnSmile.imageset/icnSmileDark.svg
new file mode 100644
index 00000000..ef7cf74c
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnSmile.imageset/icnSmileDark.svg
@@ -0,0 +1,4 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="14" cy="14" r="13" fill="#131416"/>
+    <path d="M13.991 5.667c-4.6 0-8.325 3.733-8.325 8.333s3.725 8.333 8.325 8.333c4.608 0 8.342-3.733 8.342-8.333s-3.734-8.333-8.342-8.333zm-2.908 5c.691 0 1.25.558 1.25 1.25 0 .691-.559 1.25-1.25 1.25-.692 0-1.25-.559-1.25-1.25 0-.692.558-1.25 1.25-1.25zm6.841 5.6C17.166 17.892 15.7 19 14 19c-1.7 0-3.166-1.108-3.925-2.733a.418.418 0 0 1 .375-.6h7.1c.309 0 .509.325.375.6zm-1.008-3.1c-.692 0-1.25-.559-1.25-1.25 0-.692.558-1.25 1.25-1.25s1.25.558 1.25 1.25c0 .691-.558 1.25-1.25 1.25z" fill="#119A79" opacity=".7"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnSun.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnSun.imageset/Contents.json
new file mode 100644
index 00000000..bad91186
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnSun.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "icnSun.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "icnSunDark.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnSun.imageset/icnSun.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnSun.imageset/icnSun.svg
new file mode 100644
index 00000000..796e38e5
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnSun.imageset/icnSun.svg
@@ -0,0 +1,11 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="14" cy="14" r="13" fill="#fff"/>
+    <g clip-path="url(#4s8gxdz7ra)">
+        <path d="m9.042 7.45-.325-.325a.827.827 0 0 0-1.166 0l-.009.008a.82.82 0 0 0 0 1.167l.325.325a.82.82 0 0 0 1.167 0l.008-.008a.82.82 0 0 0 0-1.167zm-2.533 5.3h-.85a.822.822 0 0 0-.825.825v.008c0 .459.367.825.825.825h.842a.811.811 0 0 0 .833-.816v-.009a.823.823 0 0 0-.825-.833zm7.5-8.292h-.008a.823.823 0 0 0-.834.825v.8c0 .459.367.825.825.825h.009a.811.811 0 0 0 .833-.816v-.809a.822.822 0 0 0-.825-.825zm6.45 2.675a.838.838 0 0 0-1.175-.008l-.325.325a.82.82 0 0 0 0 1.167l.008.008a.82.82 0 0 0 1.167 0l.325-.325a.82.82 0 0 0 0-1.167zm-1.508 12.584.325.325a.83.83 0 1 0 1.175-1.175l-.325-.325a.827.827 0 0 0-1.167 0 .823.823 0 0 0-.008 1.175zm1.716-6.142v.008c0 .459.367.825.825.825h.842a.822.822 0 0 0 .825-.825v-.008a.822.822 0 0 0-.825-.825h-.842a.822.822 0 0 0-.825.825zm-6.666-4.992c-2.759 0-5 2.242-5 5 0 2.759 2.241 5 5 5 2.758 0 5-2.241 5-5 0-2.758-2.242-5-5-5zm-.009 14.125h.009a.822.822 0 0 0 .825-.825v-.8a.822.822 0 0 0-.825-.825h-.009a.822.822 0 0 0-.825.825v.8c0 .459.367.825.825.825zm-6.45-2.675a.83.83 0 0 0 1.175 0l.325-.325a.827.827 0 0 0 0-1.166l-.008-.009a.83.83 0 0 0-1.175 0l-.325.325a.838.838 0 0 0 .008 1.175z" fill="#FCB74F"/>
+    </g>
+    <defs>
+        <clipPath id="4s8gxdz7ra">
+            <path fill="#fff" transform="translate(4 4)" d="M0 0h20v20H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnSun.imageset/icnSunDark.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnSun.imageset/icnSunDark.svg
new file mode 100644
index 00000000..9fbafecb
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnTagFeat/icnSun.imageset/icnSunDark.svg
@@ -0,0 +1,11 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="14" cy="14" r="13" fill="#131416"/>
+    <g opacity=".7" clip-path="url(#wohj56z7ea)">
+        <path d="m9.042 7.45-.325-.325a.827.827 0 0 0-1.166 0l-.009.008a.82.82 0 0 0 0 1.167l.325.325a.82.82 0 0 0 1.167 0l.008-.008a.82.82 0 0 0 0-1.167zm-2.533 5.3h-.85a.822.822 0 0 0-.825.825v.008c0 .459.367.825.825.825h.842a.811.811 0 0 0 .833-.816v-.009a.823.823 0 0 0-.825-.833zm7.5-8.292h-.008a.823.823 0 0 0-.834.825v.8c0 .459.367.825.825.825h.009a.811.811 0 0 0 .833-.816v-.809a.822.822 0 0 0-.825-.825zm6.45 2.675a.838.838 0 0 0-1.175-.008l-.325.325a.82.82 0 0 0 0 1.167l.008.008a.82.82 0 0 0 1.167 0l.325-.325a.82.82 0 0 0 0-1.167zm-1.508 12.584.325.325a.83.83 0 1 0 1.175-1.175l-.325-.325a.827.827 0 0 0-1.167 0 .823.823 0 0 0-.008 1.175zm1.716-6.142v.008c0 .459.367.825.825.825h.842a.822.822 0 0 0 .825-.825v-.008a.822.822 0 0 0-.825-.825h-.842a.822.822 0 0 0-.825.825zm-6.666-4.992c-2.759 0-5 2.242-5 5 0 2.759 2.241 5 5 5 2.758 0 5-2.241 5-5 0-2.758-2.242-5-5-5zm-.009 14.125h.009a.822.822 0 0 0 .825-.825v-.8a.822.822 0 0 0-.825-.825h-.009a.822.822 0 0 0-.825.825v.8c0 .459.367.825.825.825zm-6.45-2.675a.83.83 0 0 0 1.175 0l.325-.325a.827.827 0 0 0 0-1.166l-.008-.009a.83.83 0 0 0-1.175 0l-.325.325a.838.838 0 0 0 .008 1.175z" fill="#B6863E"/>
+    </g>
+    <defs>
+        <clipPath id="wohj56z7ea">
+            <path fill="#fff" transform="translate(4 4)" d="M0 0h20v20H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/Contents.json
index 7815ca21..d1b68f54 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/Contents.json
@@ -1,9 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "iconAdd.png",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename" : "iconAdd.svg",
+      "idiom" : "universal"
     },
     {
       "appearances" : [
@@ -12,41 +11,8 @@
           "value" : "dark"
         }
       ],
-      "filename" : "iconAdd-1.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "iconAdd@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "iconAdd@2x-1.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "iconAdd@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "iconAdd@3x-1.png",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "iconAdd 1.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd 1.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd 1.svg
new file mode 100644
index 00000000..ad05d715
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd 1.svg	
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M19.5 13.25h-6.25v6.25c0 .688-.563 1.25-1.25 1.25-.688 0-1.25-.563-1.25-1.25v-6.25H4.5c-.688 0-1.25-.563-1.25-1.25 0-.688.563-1.25 1.25-1.25h6.25V4.5c0-.688.563-1.25 1.25-1.25.688 0 1.25.563 1.25 1.25v6.25h6.25c.688 0 1.25.563 1.25 1.25 0 .688-.563 1.25-1.25 1.25z" fill="#F1F3F5"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd-1.png
deleted file mode 100644
index e21184db..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd-1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd.png
deleted file mode 100644
index 601ad310..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd.svg
new file mode 100644
index 00000000..827ca802
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd.svg
@@ -0,0 +1,3 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M22.5 16.25h-6.25v6.25c0 .688-.563 1.25-1.25 1.25-.688 0-1.25-.563-1.25-1.25v-6.25H7.5c-.688 0-1.25-.563-1.25-1.25 0-.688.563-1.25 1.25-1.25h6.25V7.5c0-.688.563-1.25 1.25-1.25.688 0 1.25.563 1.25 1.25v6.25h6.25c.688 0 1.25.563 1.25 1.25 0 .688-.563 1.25-1.25 1.25z" fill="#2B2D31"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@2x-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@2x-1.png
deleted file mode 100644
index 2fa34047..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@2x-1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@2x.png
deleted file mode 100644
index f29e85ae..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@3x-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@3x-1.png
deleted file mode 100644
index 0bc0f690..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@3x-1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@3x.png
deleted file mode 100644
index 7fa7fc55..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/Contents.json
index cb88c785..cc37d502 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/Contents.json
@@ -1,23 +1,12 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "iconAddPhoto.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "iconAddPhoto@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "iconAddPhoto@3x.png",
-      "scale" : "3x",
+      "filename" : "iconAddPhoto.svg",
       "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto.png
deleted file mode 100644
index 33be0bb9..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto.svg
new file mode 100644
index 00000000..5254ab17
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#fddf48u52a)">
+        <path d="M21.02 5H19V2.98c0-.54-.44-.98-.98-.98h-.03c-.55 0-.99.44-.99.98V5h-2.01c-.54 0-.98.44-.99.98v.03c0 .55.44.99.99.99H17v2.01c0 .54.44.99.99.98h.03c.54 0 .98-.44.98-.98V7h2.02c.54 0 .98-.44.98-.98v-.04c0-.54-.44-.98-.98-.98zM16 9.01V8h-1.01c-.53 0-1.03-.21-1.41-.58-.37-.38-.58-.88-.58-1.44 0-.36.1-.69.27-.98H5c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2v-8.28c-.3.17-.64.28-1.02.28A2 2 0 0 1 16 9.01zM15.96 19H6a.5.5 0 0 1-.4-.8l1.98-2.63c.21-.28.62-.26.82.02L10 18l2.61-3.48c.2-.26.59-.27.79-.01l2.95 3.68c.26.33.03.81-.39.81z" fill="#fff"/>
+    </g>
+    <defs>
+        <clipPath id="fddf48u52a">
+            <path fill="#fff" d="M0 0h24v24H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto@2x.png
deleted file mode 100644
index 6c46f776..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto@3x.png
deleted file mode 100644
index 309d6455..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/Contents.json
index 69394fb8..73d8d8aa 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/Contents.json
@@ -1,9 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "iconArrow.png",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename" : "iconArrow.svg",
+      "idiom" : "universal"
     },
     {
       "appearances" : [
@@ -12,41 +11,8 @@
           "value" : "dark"
         }
       ],
-      "filename" : "iconArrow-1.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "iconArrow@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "iconArrow@2x-1.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "iconArrow@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "iconArrow@3x-1.png",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "iconArrow 1.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow 1.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow 1.svg
new file mode 100644
index 00000000..0f2535b8
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow 1.svg	
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M16.39 5.39c-.52-.52-1.36-.52-1.88 0l-6.12 6.12c-.52.52-.52 1.36 0 1.88l6.12 6.12c.52.52 1.36.52 1.88 0 .52-.52.52-1.36 0-1.88l-5.173-5.187L16.39 7.27a1.34 1.34 0 0 0 0-1.88z" fill="#F1F3F5"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow-1.png
deleted file mode 100644
index b6363df3..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow-1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow.png
deleted file mode 100644
index 7afc0c59..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow.svg
new file mode 100644
index 00000000..fafad5e1
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M16.39 5.39c-.52-.52-1.36-.52-1.88 0l-6.12 6.12c-.52.52-.52 1.36 0 1.88l6.12 6.12c.52.52 1.36.52 1.88 0 .52-.52.52-1.36 0-1.88l-5.173-5.187L16.39 7.27a1.34 1.34 0 0 0 0-1.88z" fill="#2B2D31"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@2x-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@2x-1.png
deleted file mode 100644
index bba0af03..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@2x-1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@2x.png
deleted file mode 100644
index b7b5a240..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@3x-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@3x-1.png
deleted file mode 100644
index 53a17b1e..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@3x-1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@3x.png
deleted file mode 100644
index ca80e69a..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconBirthday.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconBirthday.imageset/Contents.json
index c6f4800f..3c40f38e 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconBirthday.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconBirthday.imageset/Contents.json
@@ -1,23 +1,12 @@
 {
   "images" : [
     {
-      "filename" : "iconBirthday.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "iconBirthday@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "scale" : "3x",
-      "filename" : "iconBirthday@3x.png",
+      "filename" : "iconBirthday.svg",
       "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconBirthday.imageset/iconBirthday.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconBirthday.imageset/iconBirthday.png
deleted file mode 100644
index 4315414b..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconBirthday.imageset/iconBirthday.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconBirthday.imageset/iconBirthday.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconBirthday.imageset/iconBirthday.svg
new file mode 100644
index 00000000..f7af73ff
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconBirthday.imageset/iconBirthday.svg
@@ -0,0 +1,10 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#n0fsl9nwla)">
+        <path d="M9.51 4.41c.525-.18.915-.675.975-1.23a1.464 1.464 0 0 0-.21-.952L9.315.563a.38.38 0 0 0-.652 0l-.96 1.665A1.56 1.56 0 0 0 7.5 3c0 .99.975 1.763 2.01 1.41zm2.888 7.53-.75-.75-.81.803c-.975.975-2.685.982-3.668 0l-.803-.803-.817.803a2.576 2.576 0 0 1-1.83.757c-.548 0-1.05-.172-1.47-.457V15c0 .825.675 1.5 1.5 1.5h10.5c.825 0 1.5-.675 1.5-1.5v-2.707a2.602 2.602 0 0 1-2.055.39c-.495-.105-.938-.383-1.297-.743zM13.5 6.75H9.75V6A.752.752 0 0 0 9 5.25a.752.752 0 0 0-.75.75v.75H4.5A2.247 2.247 0 0 0 2.25 9v1.095c0 .638.375 1.253.982 1.455.548.18 1.14.045 1.523-.345L6.36 9.608l1.597 1.597c.57.57 1.508.57 2.078 0l1.605-1.597 1.598 1.597c.322.323.772.473 1.237.413.742-.098 1.268-.795 1.268-1.545V9.008A2.238 2.238 0 0 0 13.5 6.75z" fill="#fff"/>
+    </g>
+    <defs>
+        <clipPath id="n0fsl9nwla">
+            <path fill="#fff" d="M0 0h18v18H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconBirthday.imageset/iconBirthday@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconBirthday.imageset/iconBirthday@2x.png
deleted file mode 100644
index 4b9d5b4f..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconBirthday.imageset/iconBirthday@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconBirthday.imageset/iconBirthday@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconBirthday.imageset/iconBirthday@3x.png
deleted file mode 100644
index 94a42e72..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconBirthday.imageset/iconBirthday@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/Contents.json
index 8ddcbb84..38a9cc96 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/Contents.json
@@ -1,23 +1,12 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "iconCards.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "iconCards@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "iconCards@3x.png",
-      "scale" : "3x"
+      "filename" : "iconCards.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards.png
deleted file mode 100644
index a4bc47b2..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards.svg
new file mode 100644
index 00000000..46605e71
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards.svg
@@ -0,0 +1,11 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#4xpqt9x81a)" fill="#2B2D31">
+        <path d="M13.302 12.016a1.681 1.681 0 0 0-1.207-.516H7.7c-.935 0-1.692.787-1.692 1.75L6 23.75c0 .962.765 1.75 1.7 1.75h13.6c.935 0 1.7-.788 1.7-1.75V15c0-.963-.765-1.75-1.7-1.75h-6.8l-1.198-1.234z"/>
+        <path fill-rule="evenodd" clip-rule="evenodd" d="M10 5.5a2 2 0 0 0-2 2v3.157c.213-.1.45-.157.7-.157h4.395c.45 0 .883.184 1.207.516L15.5 12.25H19V7.5a2 2 0 0 0-2-2h-7zM20 12.25h1.258l.835-3.119a2 2 0 0 0-1.414-2.449L20 6.5v5.75z"/>
+    </g>
+    <defs>
+        <clipPath id="4xpqt9x81a">
+            <path fill="#fff" d="M0 0h30v30H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards@2x.png
deleted file mode 100644
index 6c6f40d4..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards@3x.png
deleted file mode 100644
index fc1dd675..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMine.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMine.imageset/Contents.json
index 0a26c8eb..8692c053 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMine.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMine.imageset/Contents.json
@@ -1,23 +1,12 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "iconCardsMine.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "iconCardsMine@2x.png"
-    },
-    {
-      "filename" : "iconCardsMine@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "iconCardsMine.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMine.imageset/iconCardsMine.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMine.imageset/iconCardsMine.png
deleted file mode 100644
index febd8af3..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMine.imageset/iconCardsMine.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMine.imageset/iconCardsMine.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMine.imageset/iconCardsMine.svg
new file mode 100644
index 00000000..585e6cf6
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMine.imageset/iconCardsMine.svg
@@ -0,0 +1,11 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#qig34dx6wa)" fill="#2B2D31">
+        <path fill-rule="evenodd" clip-rule="evenodd" d="M12 4a2 2 0 0 0-2 2h9a2 2 0 0 1 2 2v14a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2h-9z"/>
+        <rect x="7" y="7" width="13" height="18" rx="2"/>
+    </g>
+    <defs>
+        <clipPath id="qig34dx6wa">
+            <path fill="#fff" d="M0 0h30v30H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMine.imageset/iconCardsMine@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMine.imageset/iconCardsMine@2x.png
deleted file mode 100644
index fe9c2ab0..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMine.imageset/iconCardsMine@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMine.imageset/iconCardsMine@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMine.imageset/iconCardsMine@3x.png
deleted file mode 100644
index fcb1c9ff..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMine.imageset/iconCardsMine@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMineSelected.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMineSelected.imageset/Contents.json
index 9697319d..5d0b16c0 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMineSelected.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMineSelected.imageset/Contents.json
@@ -1,23 +1,12 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "iconCardsMineSelected.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "iconCardsMineSelected@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "scale" : "3x",
-      "filename" : "iconCardsMineSelected@3x.png",
+      "filename" : "iconCardsSelected.svg",
       "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMineSelected.imageset/iconCardsMineSelected.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMineSelected.imageset/iconCardsMineSelected.png
deleted file mode 100644
index 4f74394a..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMineSelected.imageset/iconCardsMineSelected.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMineSelected.imageset/iconCardsMineSelected@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMineSelected.imageset/iconCardsMineSelected@2x.png
deleted file mode 100644
index edca4c4e..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMineSelected.imageset/iconCardsMineSelected@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMineSelected.imageset/iconCardsMineSelected@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMineSelected.imageset/iconCardsMineSelected@3x.png
deleted file mode 100644
index eb5318cb..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMineSelected.imageset/iconCardsMineSelected@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMineSelected.imageset/iconCardsSelected.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMineSelected.imageset/iconCardsSelected.svg
new file mode 100644
index 00000000..d9896e16
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsMineSelected.imageset/iconCardsSelected.svg
@@ -0,0 +1,12 @@
+<svg width="30" height="35" viewBox="0 0 30 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="15" cy="2" r="2" fill="#F67066"/>
+    <g clip-path="url(#a17f386iia)" fill="#F67066">
+        <path fill-rule="evenodd" clip-rule="evenodd" d="M10.075 10.742c.085-.01.17-.016.258-.016h8.942a2 2 0 0 1 2 2v14.117c0 .088-.006.174-.017.258A2 2 0 0 0 23 25.118V11a2 2 0 0 0-2-2H12.06a2 2 0 0 0-1.984 1.742z"/>
+        <rect x="7" y="12" width="13" height="18" rx="2"/>
+    </g>
+    <defs>
+        <clipPath id="a17f386iia">
+            <path fill="#fff" transform="translate(0 5)" d="M0 0h30v30H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/Contents.json
index 56cf9999..5d0b16c0 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/Contents.json
@@ -1,23 +1,12 @@
 {
   "images" : [
     {
-      "scale" : "1x",
-      "idiom" : "universal",
-      "filename" : "iconCardsSelected.png"
-    },
-    {
-      "filename" : "iconCardsSelected@2x.png",
-      "scale" : "2x",
-      "idiom" : "universal"
-    },
-    {
-      "filename" : "iconCardsSelected@3x.png",
-      "scale" : "3x",
+      "filename" : "iconCardsSelected.svg",
       "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected.png
deleted file mode 100644
index 4e632eb2..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected.svg
new file mode 100644
index 00000000..a06ecdd1
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected.svg
@@ -0,0 +1,12 @@
+<svg width="30" height="35" viewBox="0 0 30 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="15" cy="2" r="2" fill="#F67066"/>
+    <g clip-path="url(#k48iv0xdba)" fill="#F67066">
+        <path d="M13.302 17.016a1.681 1.681 0 0 0-1.207-.516H7.7c-.935 0-1.692.788-1.692 1.75L6 28.75c0 .962.765 1.75 1.7 1.75h13.6c.935 0 1.7-.788 1.7-1.75V20c0-.962-.765-1.75-1.7-1.75h-6.8l-1.198-1.234z"/>
+        <path fill-rule="evenodd" clip-rule="evenodd" d="M10 10.5a2 2 0 0 0-2 2v3.157c.213-.1.45-.157.7-.157h4.395c.45 0 .883.184 1.207.516L15.5 17.25H19V12.5a2 2 0 0 0-2-2h-7zM20 17.25h1.258l.835-3.118a2 2 0 0 0-1.414-2.45L20 11.5v5.75z"/>
+    </g>
+    <defs>
+        <clipPath id="k48iv0xdba">
+            <path fill="#fff" transform="translate(0 5)" d="M0 0h30v30H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected@2x.png
deleted file mode 100644
index 4bb9cd44..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected@3x.png
deleted file mode 100644
index f2214460..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/Contents.json
index 370d30dd..674dad9f 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/Contents.json
@@ -1,9 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "iconClear-1.png",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename" : "iconClear.svg",
+      "idiom" : "universal"
     },
     {
       "appearances" : [
@@ -12,41 +11,8 @@
           "value" : "dark"
         }
       ],
-      "filename" : "iconClear.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "iconClear@2x-1.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "iconClear@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "iconClear@3x-1.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "iconClear@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "iconClear 1.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear 1.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear 1.svg
new file mode 100644
index 00000000..e26220c4
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear 1.svg	
@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#51gtv3sara)">
+        <path d="M18.3 5.71a.996.996 0 0 0-1.41 0L12 10.59 7.11 5.7A.996.996 0 1 0 5.7 7.11L10.59 12 5.7 16.89a.996.996 0 1 0 1.41 1.41L12 13.41l4.89 4.89a.996.996 0 1 0 1.41-1.41L13.41 12l4.89-4.89c.38-.38.38-1.02 0-1.4z" fill="#F1F3F5"/>
+    </g>
+    <defs>
+        <clipPath id="51gtv3sara">
+            <path fill="#fff" d="M0 0h24v24H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear-1.png
deleted file mode 100644
index 413ba9bf..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear-1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear.png
deleted file mode 100644
index 26b12e7b..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear.svg
new file mode 100644
index 00000000..a9142392
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#npige9xgpa)">
+        <path d="M18.3 5.71a.996.996 0 0 0-1.41 0L12 10.59 7.11 5.7A.996.996 0 1 0 5.7 7.11L10.59 12 5.7 16.89a.996.996 0 1 0 1.41 1.41L12 13.41l4.89 4.89a.996.996 0 1 0 1.41-1.41L13.41 12l4.89-4.89c.38-.38.38-1.02 0-1.4z" fill="#2B2D31"/>
+    </g>
+    <defs>
+        <clipPath id="npige9xgpa">
+            <path fill="#fff" d="M0 0h24v24H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear@2x-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear@2x-1.png
deleted file mode 100644
index 282721a3..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear@2x-1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear@2x.png
deleted file mode 100644
index 178fa3ca..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear@3x-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear@3x-1.png
deleted file mode 100644
index 2e1bb3cd..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear@3x-1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear@3x.png
deleted file mode 100644
index 2a88d187..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/Contents.json
index 95d381b9..b2d49b49 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/Contents.json
@@ -1,23 +1,12 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "iconDone.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "iconDone@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "iconDone@3x.png",
-      "scale" : "3x"
+      "filename" : "iconDone.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone.png
deleted file mode 100644
index be049b70..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone.svg
new file mode 100644
index 00000000..49615804
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#raveo2w00a)">
+        <path d="M6 10.8 3.666 8.467a.656.656 0 0 0-.933 0 .656.656 0 0 0 0 .933l2.793 2.793c.26.26.68.26.94 0l7.067-7.06a.656.656 0 0 0 0-.933.656.656 0 0 0-.933 0L6 10.8z" fill="#83888F"/>
+    </g>
+    <defs>
+        <clipPath id="raveo2w00a">
+            <path fill="#fff" d="M0 0h16v16H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone@2x.png
deleted file mode 100644
index 292b9ffc..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone@3x.png
deleted file mode 100644
index 7da06c7a..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/Contents.json
index 06f9a943..09eaadd0 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/Contents.json
@@ -1,9 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "iconHome.png",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename" : "iconHome.svg",
+      "idiom" : "universal"
     },
     {
       "appearances" : [
@@ -12,41 +11,8 @@
           "value" : "dark"
         }
       ],
-      "filename" : "iconHome-1.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "iconHome@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "iconHome@2x-1.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "iconHome@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "iconHome@3x-1.png",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "iconHome 1.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome 1.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome 1.svg
new file mode 100644
index 00000000..718d6760
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome 1.svg	
@@ -0,0 +1,10 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#nwnwl4tkwa)">
+        <path d="M12.5 23.75V17.5h5v6.25c0 .687.563 1.25 1.25 1.25h3.75c.688 0 1.25-.563 1.25-1.25V15h2.125c.575 0 .85-.713.413-1.088L15.838 4.5a1.26 1.26 0 0 0-1.675 0l-10.45 9.412C3.288 14.287 3.55 15 4.125 15H6.25v8.75c0 .687.563 1.25 1.25 1.25h3.75c.688 0 1.25-.563 1.25-1.25z" fill="#F1F3F5"/>
+    </g>
+    <defs>
+        <clipPath id="nwnwl4tkwa">
+            <path fill="#fff" d="M0 0h30v30H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome-1.png
deleted file mode 100644
index 17847f49..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome-1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome.png
deleted file mode 100644
index 3fe6a4d2..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome.svg
new file mode 100644
index 00000000..8ea10c29
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome.svg
@@ -0,0 +1,10 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#ebemin9qra)">
+        <path d="M12.5 23.75V17.5h5v6.25c0 .687.563 1.25 1.25 1.25h3.75c.688 0 1.25-.563 1.25-1.25V15h2.125c.575 0 .85-.713.413-1.088L15.838 4.5a1.26 1.26 0 0 0-1.675 0l-10.45 9.412C3.288 14.287 3.55 15 4.125 15H6.25v8.75c0 .687.563 1.25 1.25 1.25h3.75c.688 0 1.25-.563 1.25-1.25z" fill="#2B2D31"/>
+    </g>
+    <defs>
+        <clipPath id="ebemin9qra">
+            <path fill="#fff" d="M0 0h30v30H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome@2x-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome@2x-1.png
deleted file mode 100644
index 6cccf545..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome@2x-1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome@2x.png
deleted file mode 100644
index e8c985e3..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome@3x-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome@3x-1.png
deleted file mode 100644
index 92ace4a6..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome@3x-1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome@3x.png
deleted file mode 100644
index e13f9522..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHome.imageset/iconHome@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/Contents.json
index a482d8be..cc1c3c83 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/Contents.json
@@ -1,23 +1,12 @@
 {
   "images" : [
     {
-      "scale" : "1x",
-      "idiom" : "universal",
-      "filename" : "iconHomeSelected.png"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "iconHomeSelected@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "iconHomeSelected@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "iconHomeSelected.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected.png
deleted file mode 100644
index 6b2495bb..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected.svg
new file mode 100644
index 00000000..3dec2c32
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected.svg
@@ -0,0 +1,11 @@
+<svg width="30" height="35" viewBox="0 0 30 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#ui07ezgbpa)">
+        <path d="M12.5 28.75V22.5h5v6.25c0 .687.563 1.25 1.25 1.25h3.75c.688 0 1.25-.563 1.25-1.25V20h2.125c.575 0 .85-.713.413-1.088L15.838 9.5a1.26 1.26 0 0 0-1.675 0l-10.45 9.412C3.288 19.287 3.55 20 4.125 20H6.25v8.75c0 .687.563 1.25 1.25 1.25h3.75c.688 0 1.25-.563 1.25-1.25z" fill="#F67066"/>
+    </g>
+    <circle cx="15" cy="2" r="2" fill="#F67066"/>
+    <defs>
+        <clipPath id="ui07ezgbpa">
+            <path fill="#fff" transform="translate(0 5)" d="M0 0h30v30H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected@2x.png
deleted file mode 100644
index ea4a4204..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected@3x.png
deleted file mode 100644
index e32e19bb..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/Contents.json
index 8e74c20a..8b670212 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/Contents.json
@@ -1,23 +1,12 @@
 {
   "images" : [
     {
-      "scale" : "1x",
-      "filename" : "iconInstagram.png",
+      "filename" : "iconInstagram.svg",
       "idiom" : "universal"
-    },
-    {
-      "filename" : "iconInstagram@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "scale" : "3x",
-      "idiom" : "universal",
-      "filename" : "iconInstagram@3x.png"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram.png
deleted file mode 100644
index e3eda38a..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram.svg
new file mode 100644
index 00000000..22a1f53b
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M12.002 21.04c-2.46 0-2.75-.012-3.71-.054a6.583 6.583 0 0 1-2.185-.45 4.62 4.62 0 0 1-2.63-2.631 6.591 6.591 0 0 1-.419-2.187c-.056-.958-.056-1.272-.056-3.713 0-2.467.013-2.755.056-3.71a6.59 6.59 0 0 1 .419-2.184A4.61 4.61 0 0 1 6.11 3.479a6.533 6.533 0 0 1 2.184-.42c.955-.054 1.269-.054 3.708-.054 2.48 0 2.765.013 3.71.054.748.014 1.49.156 2.19.42a4.615 4.615 0 0 1 2.633 2.632c.267.71.41 1.46.421 2.217.056.958.056 1.27.056 3.71s-.014 2.76-.056 3.708a6.603 6.603 0 0 1-.42 2.189 4.624 4.624 0 0 1-2.634 2.632c-.7.262-1.439.404-2.186.419-.955.055-1.268.055-3.714.055zm-.034-16.452c-2.446 0-2.7.012-3.655.055a4.989 4.989 0 0 0-1.67.31 2.989 2.989 0 0 0-1.718 1.713c-.2.54-.305 1.11-.311 1.687-.053.969-.053 1.223-.053 3.652 0 2.4.009 2.69.053 3.654.009.57.114 1.135.311 1.67.306.787.93 1.409 1.719 1.71a4.92 4.92 0 0 0 1.669.312c.968.056 1.223.056 3.655.056 2.453 0 2.707-.012 3.654-.056a4.967 4.967 0 0 0 1.67-.311 3 3 0 0 0 1.71-1.71c.2-.54.305-1.11.311-1.687h.011c.043-.956.043-1.211.043-3.654 0-2.443-.011-2.7-.054-3.655a5.06 5.06 0 0 0-.311-1.668 3 3 0 0 0-1.71-1.712c-.535-.2-1.1-.305-1.67-.311-.967-.055-1.22-.055-3.654-.055zm.034 12.036A4.623 4.623 0 1 1 16.622 12a4.63 4.63 0 0 1-4.62 4.624zm0-7.626a3 3 0 1 0 3 3 3.007 3.007 0 0 0-3-3zm4.8-.713a1.078 1.078 0 1 1 .008-2.156 1.078 1.078 0 0 1-.008 2.156z" fill="#fff"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram@2x.png
deleted file mode 100644
index 95344825..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram@3x.png
deleted file mode 100644
index 782e81c3..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagramSelected.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagramSelected.imageset/Contents.json
index a2c0d2e2..49b23670 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagramSelected.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagramSelected.imageset/Contents.json
@@ -1,23 +1,12 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "iconInstagramSelected.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "iconInstagramSelected@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "iconInstagramSelected@3x.png"
+      "filename" : "iconInstagramSelected.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagramSelected.imageset/iconInstagramSelected.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagramSelected.imageset/iconInstagramSelected.png
deleted file mode 100644
index 10cc4b2d..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagramSelected.imageset/iconInstagramSelected.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagramSelected.imageset/iconInstagramSelected.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagramSelected.imageset/iconInstagramSelected.svg
new file mode 100644
index 00000000..2d90895e
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagramSelected.imageset/iconInstagramSelected.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M12.002 21.04c-2.46 0-2.75-.012-3.71-.054a6.583 6.583 0 0 1-2.185-.45 4.62 4.62 0 0 1-2.63-2.631 6.591 6.591 0 0 1-.419-2.187c-.056-.958-.056-1.272-.056-3.713 0-2.467.013-2.755.056-3.71a6.59 6.59 0 0 1 .419-2.184A4.61 4.61 0 0 1 6.11 3.479a6.533 6.533 0 0 1 2.184-.42c.955-.054 1.269-.054 3.708-.054 2.48 0 2.765.013 3.71.054.748.014 1.49.156 2.19.42a4.615 4.615 0 0 1 2.633 2.632c.267.71.41 1.46.421 2.217.056.958.056 1.27.056 3.71s-.014 2.76-.056 3.708a6.603 6.603 0 0 1-.42 2.189 4.624 4.624 0 0 1-2.634 2.632c-.7.262-1.439.404-2.186.419-.955.055-1.268.055-3.714.055zm-.034-16.452c-2.446 0-2.7.012-3.655.055a4.989 4.989 0 0 0-1.67.31 2.989 2.989 0 0 0-1.718 1.713c-.2.54-.305 1.11-.311 1.687-.053.969-.053 1.223-.053 3.652 0 2.4.009 2.69.053 3.654.009.57.114 1.135.311 1.67.306.787.93 1.409 1.719 1.71a4.92 4.92 0 0 0 1.669.312c.968.056 1.223.056 3.655.056 2.453 0 2.707-.012 3.654-.056a4.967 4.967 0 0 0 1.67-.311 3 3 0 0 0 1.71-1.71c.2-.54.305-1.11.311-1.687h.011c.043-.956.043-1.211.043-3.654 0-2.443-.011-2.7-.054-3.655a5.06 5.06 0 0 0-.311-1.668 3 3 0 0 0-1.71-1.712c-.535-.2-1.1-.305-1.67-.311-.967-.055-1.22-.055-3.654-.055zm.034 12.036A4.623 4.623 0 1 1 16.622 12a4.63 4.63 0 0 1-4.62 4.624zm0-7.626a3 3 0 1 0 3 3 3.007 3.007 0 0 0-3-3zm4.8-.713a1.078 1.078 0 1 1 .008-2.156 1.078 1.078 0 0 1-.008 2.156z" fill="#F67066"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagramSelected.imageset/iconInstagramSelected@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagramSelected.imageset/iconInstagramSelected@2x.png
deleted file mode 100644
index b92fe795..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagramSelected.imageset/iconInstagramSelected@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagramSelected.imageset/iconInstagramSelected@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagramSelected.imageset/iconInstagramSelected@3x.png
deleted file mode 100644
index 0aa60c70..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagramSelected.imageset/iconInstagramSelected@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/Contents.json
index 571117ab..e1a69d3d 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/Contents.json
@@ -1,9 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "iconList.png",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename" : "iconList.svg",
+      "idiom" : "universal"
     },
     {
       "appearances" : [
@@ -12,41 +11,8 @@
           "value" : "dark"
         }
       ],
-      "filename" : "iconList-1.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "iconList@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "iconList@2x-1.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "iconList@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "iconList@3x-1.png",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "iconList 1.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList 1.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList 1.svg
new file mode 100644
index 00000000..5d58c8e7
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList 1.svg	
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M2.222 13.2c.672 0 1.222-.54 1.222-1.2 0-.66-.55-1.2-1.222-1.2C1.55 10.8 1 11.34 1 12c0 .66.55 1.2 1.222 1.2zm0 4.8c.672 0 1.222-.54 1.222-1.2 0-.66-.55-1.2-1.222-1.2C1.55 15.6 1 16.14 1 16.8c0 .66.55 1.2 1.222 1.2zm0-9.6c.672 0 1.222-.54 1.222-1.2 0-.66-.55-1.2-1.222-1.2C1.55 6 1 6.54 1 7.2c0 .66.55 1.2 1.222 1.2zm4.89 4.8h14.666C22.45 13.2 23 12.66 23 12c0-.66-.55-1.2-1.222-1.2H7.11c-.672 0-1.222.54-1.222 1.2 0 .66.55 1.2 1.222 1.2zm0 4.8h14.666C22.45 18 23 17.46 23 16.8c0-.66-.55-1.2-1.222-1.2H7.11c-.672 0-1.222.54-1.222 1.2 0 .66.55 1.2 1.222 1.2zM5.888 7.2c0 .66.55 1.2 1.222 1.2h14.667C22.45 8.4 23 7.86 23 7.2c0-.66-.55-1.2-1.222-1.2H7.11C6.44 6 5.89 6.54 5.89 7.2zm-3.667 6c.672 0 1.222-.54 1.222-1.2 0-.66-.55-1.2-1.222-1.2C1.55 10.8 1 11.34 1 12c0 .66.55 1.2 1.222 1.2zm0 4.8c.672 0 1.222-.54 1.222-1.2 0-.66-.55-1.2-1.222-1.2C1.55 15.6 1 16.14 1 16.8c0 .66.55 1.2 1.222 1.2zm0-9.6c.672 0 1.222-.54 1.222-1.2 0-.66-.55-1.2-1.222-1.2C1.55 6 1 6.54 1 7.2c0 .66.55 1.2 1.222 1.2zm4.89 4.8h14.666C22.45 13.2 23 12.66 23 12c0-.66-.55-1.2-1.222-1.2H7.11c-.672 0-1.222.54-1.222 1.2 0 .66.55 1.2 1.222 1.2zm0 4.8h14.666C22.45 18 23 17.46 23 16.8c0-.66-.55-1.2-1.222-1.2H7.11c-.672 0-1.222.54-1.222 1.2 0 .66.55 1.2 1.222 1.2zM5.888 7.2c0 .66.55 1.2 1.222 1.2h14.667C22.45 8.4 23 7.86 23 7.2c0-.66-.55-1.2-1.222-1.2H7.11C6.44 6 5.89 6.54 5.89 7.2z" fill="#F1F3F5"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList-1.png
deleted file mode 100644
index 7b4928be..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList-1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList.png
deleted file mode 100644
index ff324b37..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList.svg
new file mode 100644
index 00000000..84cfc937
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList.svg
@@ -0,0 +1,3 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M5 16.25c.688 0 1.25-.563 1.25-1.25 0-.688-.563-1.25-1.25-1.25-.688 0-1.25.563-1.25 1.25 0 .688.563 1.25 1.25 1.25zm0 5c.688 0 1.25-.563 1.25-1.25 0-.688-.563-1.25-1.25-1.25-.688 0-1.25.563-1.25 1.25 0 .688.563 1.25 1.25 1.25zm0-10c.688 0 1.25-.563 1.25-1.25 0-.688-.563-1.25-1.25-1.25-.688 0-1.25.563-1.25 1.25 0 .688.563 1.25 1.25 1.25zm5 5h15c.688 0 1.25-.563 1.25-1.25 0-.688-.563-1.25-1.25-1.25H10c-.688 0-1.25.563-1.25 1.25 0 .688.563 1.25 1.25 1.25zm0 5h15c.688 0 1.25-.563 1.25-1.25 0-.688-.563-1.25-1.25-1.25H10c-.688 0-1.25.563-1.25 1.25 0 .688.563 1.25 1.25 1.25zM8.75 10c0 .688.563 1.25 1.25 1.25h15c.688 0 1.25-.563 1.25-1.25 0-.688-.563-1.25-1.25-1.25H10c-.688 0-1.25.563-1.25 1.25zM5 16.25c.688 0 1.25-.563 1.25-1.25 0-.688-.563-1.25-1.25-1.25-.688 0-1.25.563-1.25 1.25 0 .688.563 1.25 1.25 1.25zm0 5c.688 0 1.25-.563 1.25-1.25 0-.688-.563-1.25-1.25-1.25-.688 0-1.25.563-1.25 1.25 0 .688.563 1.25 1.25 1.25zm0-10c.688 0 1.25-.563 1.25-1.25 0-.688-.563-1.25-1.25-1.25-.688 0-1.25.563-1.25 1.25 0 .688.563 1.25 1.25 1.25zm5 5h15c.688 0 1.25-.563 1.25-1.25 0-.688-.563-1.25-1.25-1.25H10c-.688 0-1.25.563-1.25 1.25 0 .688.563 1.25 1.25 1.25zm0 5h15c.688 0 1.25-.563 1.25-1.25 0-.688-.563-1.25-1.25-1.25H10c-.688 0-1.25.563-1.25 1.25 0 .688.563 1.25 1.25 1.25zM8.75 10c0 .688.563 1.25 1.25 1.25h15c.688 0 1.25-.563 1.25-1.25 0-.688-.563-1.25-1.25-1.25H10c-.688 0-1.25.563-1.25 1.25z" fill="#2B2D31"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@2x-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@2x-1.png
deleted file mode 100644
index 76a853db..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@2x-1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@2x.png
deleted file mode 100644
index a40e5db9..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@3x-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@3x-1.png
deleted file mode 100644
index e0b3a0ae..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@3x-1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@3x.png
deleted file mode 100644
index 2fb9cac2..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/Contents.json
index 4a397b7b..63284aa5 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/Contents.json
@@ -1,9 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "iconMoreHoriz.png",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename" : "iconMoreHoriz.svg",
+      "idiom" : "universal"
     },
     {
       "appearances" : [
@@ -12,41 +11,8 @@
           "value" : "dark"
         }
       ],
-      "filename" : "iconMoreHoriz-1.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "iconMoreHoriz@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "iconMoreHoriz@2x-1.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "iconMoreHoriz@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "iconMoreHoriz@3x-1.png",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "iconMoreHoriz 1.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz 1.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz 1.svg
new file mode 100644
index 00000000..1a98ad26
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz 1.svg	
@@ -0,0 +1,10 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#np66mc40fa)">
+        <path d="M7.5 12.5A2.507 2.507 0 0 0 5 15c0 1.375 1.125 2.5 2.5 2.5S10 16.375 10 15s-1.125-2.5-2.5-2.5zm15 0A2.507 2.507 0 0 0 20 15c0 1.375 1.125 2.5 2.5 2.5S25 16.375 25 15s-1.125-2.5-2.5-2.5zm-7.5 0a2.507 2.507 0 0 0-2.5 2.5c0 1.375 1.125 2.5 2.5 2.5s2.5-1.125 2.5-2.5-1.125-2.5-2.5-2.5z" fill="#F1F3F5"/>
+    </g>
+    <defs>
+        <clipPath id="np66mc40fa">
+            <path fill="#fff" d="M0 0h30v30H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz-1.png
deleted file mode 100644
index 520ed7e1..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz-1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz.png
deleted file mode 100644
index d0f86605..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz.svg
new file mode 100644
index 00000000..92a2f038
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz.svg
@@ -0,0 +1,10 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#hxy7ibxzra)">
+        <path d="M7.5 12.5A2.507 2.507 0 0 0 5 15c0 1.375 1.125 2.5 2.5 2.5S10 16.375 10 15s-1.125-2.5-2.5-2.5zm15 0A2.507 2.507 0 0 0 20 15c0 1.375 1.125 2.5 2.5 2.5S25 16.375 25 15s-1.125-2.5-2.5-2.5zm-7.5 0a2.507 2.507 0 0 0-2.5 2.5c0 1.375 1.125 2.5 2.5 2.5s2.5-1.125 2.5-2.5-1.125-2.5-2.5-2.5z" fill="#2B2D31"/>
+    </g>
+    <defs>
+        <clipPath id="hxy7ibxzra">
+            <path fill="#fff" d="M0 0h30v30H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz@2x-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz@2x-1.png
deleted file mode 100644
index 1e3c631f..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz@2x-1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz@2x.png
deleted file mode 100644
index cb534e49..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz@3x-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz@3x-1.png
deleted file mode 100644
index 4774c842..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz@3x-1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz@3x.png
deleted file mode 100644
index 78e21402..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/Contents.json
index 3531fc4c..78d40657 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/Contents.json
@@ -1,23 +1,12 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "iconMoreHorizSelected.png",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "iconMoreHorizSelected@2x.png",
-      "scale" : "2x",
+      "filename" : "iconMoreHorizSelected.svg",
       "idiom" : "universal"
-    },
-    {
-      "scale" : "3x",
-      "idiom" : "universal",
-      "filename" : "iconMoreHorizSelected@3x.png"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected.png
deleted file mode 100644
index 5bac4085..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected.svg
new file mode 100644
index 00000000..863c4375
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected.svg
@@ -0,0 +1,11 @@
+<svg width="30" height="35" viewBox="0 0 30 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#sid0jb3dea)">
+        <path d="M7.5 16.5A2.507 2.507 0 0 0 5 19c0 1.375 1.125 2.5 2.5 2.5S10 20.375 10 19s-1.125-2.5-2.5-2.5zm15 0A2.507 2.507 0 0 0 20 19c0 1.375 1.125 2.5 2.5 2.5S25 20.375 25 19s-1.125-2.5-2.5-2.5zm-7.5 0a2.507 2.507 0 0 0-2.5 2.5c0 1.375 1.125 2.5 2.5 2.5s2.5-1.125 2.5-2.5-1.125-2.5-2.5-2.5z" fill="#F67066"/>
+    </g>
+    <circle cx="15" cy="2" r="2" fill="#F67066"/>
+    <defs>
+        <clipPath id="sid0jb3dea">
+            <path fill="#fff" transform="translate(0 4)" d="M0 0h30v30H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected@2x.png
deleted file mode 100644
index 4c26e271..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected@3x.png
deleted file mode 100644
index 0ce2d481..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/Contents.json
index 7ab5d68a..045b61f1 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/Contents.json
@@ -1,23 +1,12 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "iconShare.png"
-    },
-    {
-      "scale" : "2x",
-      "idiom" : "universal",
-      "filename" : "iconShare@2x.png"
-    },
-    {
-      "filename" : "iconShare@3x.png",
-      "scale" : "3x",
+      "filename" : "iconShare.svg",
       "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare.png
deleted file mode 100644
index 7b4637c8..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare.svg
new file mode 100644
index 00000000..2f6f0044
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M18 16.08c-.76 0-1.44.3-1.96.77L8.91 12.7c.05-.23.09-.46.09-.7 0-.24-.04-.47-.09-.7l7.05-4.11c.54.5 1.25.81 2.04.81 1.66 0 3-1.34 3-3s-1.34-3-3-3-3 1.34-3 3c0 .24.04.47.09.7L8.04 9.81C7.5 9.31 6.79 9 6 9c-1.66 0-3 1.34-3 3s1.34 3 3 3c.79 0 1.5-.31 2.04-.81l7.12 4.16c-.05.21-.08.43-.08.65 0 1.61 1.31 2.92 2.92 2.92 1.61 0 2.92-1.31 2.92-2.92 0-1.61-1.31-2.92-2.92-2.92z" fill="#E9ECEF"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare@2x.png
deleted file mode 100644
index d4ed3227..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare@3x.png
deleted file mode 100644
index 4d07cf5a..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTag.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTag.imageset/Contents.json
index b106c25f..79c2c5bb 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTag.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTag.imageset/Contents.json
@@ -1,23 +1,12 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "iconTag.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "iconTag@2x.png"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "iconTag@3x.png",
-      "scale" : "3x"
+      "filename" : "iconTag.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTag.imageset/iconTag.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTag.imageset/iconTag.png
deleted file mode 100644
index de967cbe..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTag.imageset/iconTag.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTag.imageset/iconTag.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTag.imageset/iconTag.svg
new file mode 100644
index 00000000..18141b72
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTag.imageset/iconTag.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#7hw2yqa4sa)">
+        <path d="m21.41 11.58-9-9C12.05 2.22 11.55 2 11 2H4c-1.1 0-2 .9-2 2v7c0 .55.22 1.05.59 1.42l9 9c.36.36.86.58 1.41.58.55 0 1.05-.22 1.41-.59l7-7c.37-.36.59-.86.59-1.41 0-.55-.23-1.06-.59-1.42zM5.5 7C4.67 7 4 6.33 4 5.5S4.67 4 5.5 4 7 4.67 7 5.5 6.33 7 5.5 7z" fill="#fff"/>
+    </g>
+    <defs>
+        <clipPath id="7hw2yqa4sa">
+            <path fill="#fff" d="M0 0h24v24H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTag.imageset/iconTag@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTag.imageset/iconTag@2x.png
deleted file mode 100644
index 7487cc94..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTag.imageset/iconTag@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTag.imageset/iconTag@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTag.imageset/iconTag@3x.png
deleted file mode 100644
index 293c1132..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTag.imageset/iconTag@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitter.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitter.imageset/Contents.json
index 93eaa967..6c3122b0 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitter.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitter.imageset/Contents.json
@@ -1,23 +1,12 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "iconTwitter.png",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "iconTwitter@2x.png",
-      "scale" : "2x",
-      "idiom" : "universal"
-    },
-    {
-      "filename" : "iconTwitter@3x.png",
-      "scale" : "3x",
+      "filename" : "iconTwitter.svg",
       "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitter.imageset/iconTwitter.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitter.imageset/iconTwitter.png
deleted file mode 100644
index 753035e7..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitter.imageset/iconTwitter.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitter.imageset/iconTwitter.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitter.imageset/iconTwitter.svg
new file mode 100644
index 00000000..8ea2a007
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitter.imageset/iconTwitter.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M3.625 16.61c.804.444 6.621 3.797 10.758 1.213 4.137-2.585 3.909-7.038 3.909-9.079.375-.785 1.166-1.184 1.166-3.31-.777.72-1.55.964-2.318.734-.753-1.147-1.789-1.655-3.107-1.522-1.977.198-2.701 2.138-2.488 4.648-3.05 1.542-5.44-1.117-6.672-3.126-.412 1.582-.81 3.481 0 5.582.539 1.4 1.835 2.584 3.888 3.552-2.08 1.128-3.793 1.563-5.136 1.307z" fill="#A8ACB3"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M17.515 5.613c-.398-.547-.877-.97-1.441-1.247-.638-.313-1.346-.418-2.103-.342-1.223.123-2.077.804-2.565 1.805-.417.855-.562 1.926-.512 3.073-1.138.44-2.14.202-3.03-.366C6.846 7.886 6 6.81 5.405 5.84a.625.625 0 0 0-1.137.17c-.417 1.6-.863 3.667.021 5.963.507 1.316 1.571 2.41 3.1 3.312-1.52.681-2.724.885-3.647.71a.625.625 0 0 0-.42 1.16c.02.01.042.023.066.037.5.277 2.151 1.197 4.2 1.761 2.135.588 4.837.83 7.127-.602 4.245-2.652 4.217-7.148 4.203-9.289v-.166c.058-.102.132-.209.226-.344l.014-.019c.122-.174.272-.388.41-.65.3-.566.515-1.3.515-2.45a.625.625 0 0 0-1.049-.458c-.585.54-1.078.7-1.519.637zm-1.992-.125c-.398-.195-.867-.277-1.427-.22-.755.075-1.252.463-1.566 1.109-.333.682-.464 1.668-.362 2.865a.625.625 0 0 1-.34.61c-1.76.89-3.355.556-4.637-.262C6.4 9.084 5.722 8.394 5.17 7.69c-.21 1.19-.24 2.468.286 3.834.458 1.19 1.59 2.278 3.571 3.211a.625.625 0 0 1 .031 1.115c-1.078.585-2.092 1.006-3.032 1.24.562.234 1.204.468 1.894.658 2.01.554 4.285.698 6.132-.457 3.638-2.273 3.624-6.095 3.616-8.263l-.001-.285c0-.093.02-.185.061-.27.118-.247.266-.457.389-.633l.004-.006c.13-.184.24-.343.342-.535.087-.165.172-.365.238-.626a2.56 2.56 0 0 1-1.74.093.625.625 0 0 1-.344-.256c-.327-.498-.694-.827-1.094-1.023z" fill="#A8ACB3"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitter.imageset/iconTwitter@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitter.imageset/iconTwitter@2x.png
deleted file mode 100644
index 1d5522db..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitter.imageset/iconTwitter@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitter.imageset/iconTwitter@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitter.imageset/iconTwitter@3x.png
deleted file mode 100644
index 5ccec4fa..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitter.imageset/iconTwitter@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitterSelected.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitterSelected.imageset/Contents.json
index 2ad8ece9..518c2543 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitterSelected.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitterSelected.imageset/Contents.json
@@ -1,23 +1,12 @@
 {
   "images" : [
     {
-      "filename" : "iconTwitterSelected.png",
-      "scale" : "1x",
-      "idiom" : "universal"
-    },
-    {
-      "filename" : "iconTwitterSelected@2x.png",
-      "scale" : "2x",
-      "idiom" : "universal"
-    },
-    {
-      "filename" : "iconTwitterSelected@3x.png",
-      "scale" : "3x",
+      "filename" : "iconTwitterSelected.svg",
       "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitterSelected.imageset/iconTwitterSelected.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitterSelected.imageset/iconTwitterSelected.png
deleted file mode 100644
index 2e89b09b..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitterSelected.imageset/iconTwitterSelected.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitterSelected.imageset/iconTwitterSelected.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitterSelected.imageset/iconTwitterSelected.svg
new file mode 100644
index 00000000..2b5ffd97
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitterSelected.imageset/iconTwitterSelected.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M3.625 16.61c.804.444 6.621 3.797 10.758 1.213 4.137-2.585 3.909-7.038 3.909-9.079.375-.785 1.166-1.184 1.166-3.31-.777.72-1.55.964-2.318.734-.753-1.147-1.789-1.655-3.107-1.522-1.977.198-2.701 2.138-2.488 4.648-3.05 1.542-5.44-1.117-6.672-3.126-.412 1.582-.81 3.481 0 5.582.539 1.4 1.835 2.584 3.888 3.552-2.08 1.128-3.793 1.563-5.136 1.307z" fill="#F67066"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M17.515 5.613c-.398-.547-.877-.97-1.441-1.247-.638-.313-1.346-.418-2.103-.342-1.223.123-2.077.804-2.565 1.805-.417.855-.562 1.926-.512 3.073-1.138.44-2.14.202-3.03-.366C6.846 7.886 6 6.81 5.405 5.84a.625.625 0 0 0-1.137.17c-.417 1.6-.863 3.667.021 5.963.507 1.316 1.571 2.41 3.1 3.312-1.52.681-2.724.885-3.647.71a.625.625 0 0 0-.42 1.16c.02.01.042.023.066.037.5.277 2.151 1.197 4.2 1.761 2.135.588 4.837.83 7.127-.602 4.245-2.652 4.217-7.148 4.203-9.289v-.166c.058-.102.132-.209.226-.344l.014-.019c.122-.174.272-.388.41-.65.3-.566.515-1.3.515-2.45a.625.625 0 0 0-1.049-.458c-.585.54-1.078.7-1.519.637zm-1.992-.125c-.398-.195-.867-.277-1.427-.22-.755.075-1.252.463-1.566 1.109-.333.682-.464 1.668-.362 2.865a.625.625 0 0 1-.34.61c-1.76.89-3.355.556-4.637-.262C6.4 9.084 5.722 8.394 5.17 7.69c-.21 1.19-.24 2.468.286 3.834.458 1.19 1.59 2.278 3.571 3.211a.625.625 0 0 1 .031 1.115c-1.078.585-2.092 1.006-3.032 1.24.562.234 1.204.468 1.894.658 2.01.554 4.285.698 6.132-.457 3.638-2.273 3.624-6.095 3.616-8.263l-.001-.285c0-.093.02-.185.061-.27.118-.247.266-.457.389-.633l.004-.006c.13-.184.24-.343.342-.535.087-.165.172-.365.238-.626a2.56 2.56 0 0 1-1.74.093.625.625 0 0 1-.344-.256c-.327-.498-.694-.827-1.094-1.023z" fill="#F67066"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitterSelected.imageset/iconTwitterSelected@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitterSelected.imageset/iconTwitterSelected@2x.png
deleted file mode 100644
index 308a8b2e..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitterSelected.imageset/iconTwitterSelected@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitterSelected.imageset/iconTwitterSelected@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitterSelected.imageset/iconTwitterSelected@3x.png
deleted file mode 100644
index 8aa30e0c..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTwitterSelected.imageset/iconTwitterSelected@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/Contents.json
index aa19a4eb..9028f394 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/Contents.json
@@ -1,23 +1,12 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "iconUrl.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "iconUrl@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "iconUrl@3x.png",
-      "scale" : "3x",
+      "filename" : "iconUrl.svg",
       "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl.png
deleted file mode 100644
index ee278642..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl.svg
new file mode 100644
index 00000000..c2c7135e
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M16.2 6a1 1 0 0 1 1-1c.637 0 1.262.128 1.871.372.663.265 1.173.658 1.636 1.12.463.464.856.974 1.121 1.637.244.609.372 1.234.372 1.871s-.128 1.262-.372 1.871c-.261.655-.648 1.16-1.104 1.619l-.984 1.083a.967.967 0 0 1-.033.034l-3.2 3.2c-.463.463-.973.856-1.636 1.122A5.012 5.012 0 0 1 13 19.3a5.012 5.012 0 0 1-1.871-.372c-.663-.265-1.173-.658-1.636-1.12-.463-.464-.856-.974-1.121-1.637A5.145 5.145 0 0 1 8 14.2c0-.637.128-1.262.372-1.871.265-.663.658-1.173 1.12-1.636l1.1-1.1a1 1 0 1 1 1.415 1.414l-1.1 1.1c-.337.337-.544.627-.678.964A3.014 3.014 0 0 0 10 14.2c0 .476.077.85.229 1.229.134.337.341.627.678.964.337.337.627.544.964.678.391.157.766.229 1.129.229s.738-.072 1.129-.229c.337-.134.627-.341.964-.678l3.183-3.183.984-1.083a.967.967 0 0 1 .033-.034c.337-.337.544-.627.678-.964.157-.391.229-.766.229-1.129s-.072-.738-.229-1.129c-.134-.337-.341-.627-.678-.964-.337-.337-.627-.544-.964-.679A3.014 3.014 0 0 0 17.2 7a1 1 0 0 1-1-1zm-4.9 1.5c-.363 0-.738.072-1.129.228-.337.135-.627.342-.964.68L5.924 11.69l-.984 1.083-.033.034c-.337.337-.544.627-.679.964A3.014 3.014 0 0 0 4 14.9c0 .363.072.738.228 1.129.135.337.342.627.68.964.336.337.626.544.963.679.391.156.766.228 1.129.228a1 1 0 1 1 0 2 5.011 5.011 0 0 1-1.871-.371c-.663-.266-1.173-.659-1.636-1.122-.463-.463-.856-.973-1.121-1.636A5.012 5.012 0 0 1 2 14.9c0-.637.128-1.262.372-1.871.261-.655.648-1.16 1.104-1.619l.984-1.083.033-.034 3.3-3.3c.463-.463.973-.856 1.636-1.121A5.012 5.012 0 0 1 11.3 5.5c.637 0 1.262.128 1.871.372.663.265 1.173.658 1.636 1.12.463.464.856.974 1.121 1.637.244.609.372 1.234.372 1.871s-.128 1.262-.372 1.871c-.262.655-.649 1.162-1.105 1.62l-1.086 1.185a1 1 0 0 1-1.474-1.352l1.1-1.2.03-.031c.337-.337.544-.627.678-.964.157-.391.229-.766.229-1.129s-.072-.738-.229-1.129c-.134-.337-.341-.627-.678-.964-.337-.337-.627-.544-.964-.679A3.014 3.014 0 0 0 11.3 7.5z" fill="#fff"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl@2x.png
deleted file mode 100644
index b153b452..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl@3x.png
deleted file mode 100644
index 2c3343f0..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/phoneEnabled.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/phoneEnabled.imageset/Contents.json
index e9b67545..fb15a258 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/phoneEnabled.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/phoneEnabled.imageset/Contents.json
@@ -1,23 +1,12 @@
 {
   "images" : [
     {
-      "filename" : "phoneEnabled.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "phoneEnabled@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "phoneEnabled@3x.png"
+      "filename" : "phoneEnabled.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/phoneEnabled.imageset/phoneEnabled.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/phoneEnabled.imageset/phoneEnabled.png
deleted file mode 100644
index 8e39944a..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/phoneEnabled.imageset/phoneEnabled.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/phoneEnabled.imageset/phoneEnabled.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/phoneEnabled.imageset/phoneEnabled.svg
new file mode 100644
index 00000000..9f5ce0bd
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/phoneEnabled.imageset/phoneEnabled.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#nzh6kop8ha)">
+        <path d="m18.428 14.91-2.262-.257a1.773 1.773 0 0 0-1.46.507l-1.64 1.64a13.4 13.4 0 0 1-5.87-5.87l1.649-1.648c.383-.383.57-.918.507-1.461l-.258-2.244A1.783 1.783 0 0 0 7.322 4H5.78c-1.007 0-1.844.837-1.782 1.844.472 7.606 6.556 13.68 14.153 14.153 1.007.062 1.844-.775 1.844-1.782v-1.54a1.765 1.765 0 0 0-1.568-1.764z" fill="#fff"/>
+    </g>
+    <defs>
+        <clipPath id="nzh6kop8ha">
+            <path fill="#fff" transform="matrix(-1 0 0 1 24 0)" d="M0 0h24v24H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/phoneEnabled.imageset/phoneEnabled@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/phoneEnabled.imageset/phoneEnabled@2x.png
deleted file mode 100644
index e64455d4..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/phoneEnabled.imageset/phoneEnabled@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/phoneEnabled.imageset/phoneEnabled@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/phoneEnabled.imageset/phoneEnabled@3x.png
deleted file mode 100644
index ee310aa6..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/phoneEnabled.imageset/phoneEnabled@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/secondhandIcon.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/secondhandIcon.imageset/Contents.json
index 3a32abe5..69eb4e21 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/secondhandIcon.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/secondhandIcon.imageset/Contents.json
@@ -1,14 +1,14 @@
 {
   "images" : [
     {
-      "scale" : "1x",
       "idiom" : "universal",
-      "filename" : "invalidName.png"
+      "filename" : "invalidName.png",
+      "scale" : "1x"
     },
     {
+      "idiom" : "universal",
       "filename" : "invalidName@2x.png",
-      "scale" : "2x",
-      "idiom" : "universal"
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/subtract.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/subtract.imageset/Contents.json
index 55fd977f..16af3e69 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/subtract.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/subtract.imageset/Contents.json
@@ -1,23 +1,12 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "subtract.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "subtract@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "scale" : "3x",
-      "idiom" : "universal",
-      "filename" : "subtract@3x.png"
+      "filename" : "subtract.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/subtract.imageset/subtract.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/subtract.imageset/subtract.png
deleted file mode 100644
index 9c356568..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/subtract.imageset/subtract.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/subtract.imageset/subtract.svg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/subtract.imageset/subtract.svg
new file mode 100644
index 00000000..39a86ff2
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/subtract.imageset/subtract.svg
@@ -0,0 +1,3 @@
+<svg width="327" height="327" viewBox="0 0 327 327" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M275 327h22c16.569 0 30-13.431 30-30v-23h-10v23c0 11.046-8.954 20-20 20h-22v10zm0-317h22c11.046 0 20 8.954 20 20v23h10V30c0-16.569-13.431-30-30-30h-22v10zM54 0v10H30c-11.046 0-20 8.954-20 20v23H0V30C0 13.431 13.431 0 30 0h24zm0 317v10H30c-16.569 0-30-13.431-30-30v-23h10v23c0 11.046 8.954 20 20 20h24z" fill="#fff"/>
+</svg>
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/subtract.imageset/subtract@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/subtract.imageset/subtract@2x.png
deleted file mode 100644
index ae06e8cf..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/subtract.imageset/subtract@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/subtract.imageset/subtract@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/subtract.imageset/subtract@3x.png
deleted file mode 100644
index 4d6a654f..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/subtract.imageset/subtract@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.swift
index d8dee0c1..ce8d4ae6 100644
--- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.swift
+++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.swift
@@ -77,7 +77,6 @@ extension BackCardCreationCollectionViewCell {
         
         refreshButton.setTitle("", for: .normal)
         refreshButton.setBackgroundImage(UIImage(named: "icnRandom"), for: .normal)
-        refreshButton.setBackgroundImage(UIImage(named: "icnHoverRandom"), for: .highlighted)
         
         optionalInfoTextLabel.text = "나의 재밌는 TMI를 알려주세요."
         optionalInfoTextLabel.textColor = .secondary