diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/back.png b/MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/back.png
deleted file mode 100644
index 3d2734b6..00000000
Binary files a/MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/back.png and /dev/null differ
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/back@2x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/back@2x.png
deleted file mode 100644
index 1d64be8b..00000000
Binary files a/MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/back@2x.png and /dev/null differ
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/back@3x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/back@3x.png
deleted file mode 100644
index 147e2c6a..00000000
Binary files a/MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/back@3x.png and /dev/null differ
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/closeXBlack.png b/MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/closeXBlack.png
deleted file mode 100644
index 5f31bd28..00000000
Binary files a/MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/closeXBlack.png and /dev/null differ
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/closeXBlack@2x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/closeXBlack@2x.png
deleted file mode 100644
index d966cb74..00000000
Binary files a/MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/closeXBlack@2x.png and /dev/null differ
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/closeXBlack@3x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/closeXBlack@3x.png
deleted file mode 100644
index 59847565..00000000
Binary files a/MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/closeXBlack@3x.png and /dev/null differ
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/Contents.json b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Contents.json
similarity index 70%
rename from MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/Contents.json
rename to MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Contents.json
index 3bad3d0c..65a64dfd 100644
--- a/MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/Contents.json
+++ b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Contents.json
@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "back.png",
+      "filename" : "nav_back.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "back@2x.png",
+      "filename" : "nav_back@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "back@3x.png",
+      "filename" : "nav_back@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back.png
new file mode 100644
index 00000000..2592ddda
Binary files /dev/null and b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back.png differ
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@2x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@2x.png
new file mode 100644
index 00000000..077a411d
Binary files /dev/null and b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@2x.png differ
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@3x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@3x.png
new file mode 100644
index 00000000..f2ac8c73
Binary files /dev/null and b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@3x.png differ
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/Contents.json b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Contents.json
similarity index 69%
rename from MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/Contents.json
rename to MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Contents.json
index d7771f8a..d328ed8e 100644
--- a/MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/Contents.json
+++ b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Contents.json
@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "closeXBlack.png",
+      "filename" : "nav_close.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "closeXBlack@2x.png",
+      "filename" : "nav_close@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "closeXBlack@3x.png",
+      "filename" : "nav_close@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close.png
new file mode 100644
index 00000000..e04a9996
Binary files /dev/null and b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close.png differ
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@2x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@2x.png
new file mode 100644
index 00000000..f8876428
Binary files /dev/null and b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@2x.png differ
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@3x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@3x.png
new file mode 100644
index 00000000..b2e9d7df
Binary files /dev/null and b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@3x.png differ
diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift
index cf1603bb..d1173250 100644
--- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift
+++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift
@@ -13,7 +13,7 @@ public extension MVMCoreUICommonViewsUtility {
     /// Add the close button (x) to the top right of the view. TODO: update this logic.
     @objc static func addCloseButton(to view: UIView, action: @escaping ButtonAction, centeredVertically: Bool = false) -> Button {
         let button = Button()
-        if let image = MVMCoreUIUtility.imageNamed("closeXBlack")?.withRenderingMode(.alwaysTemplate) {
+        if let image = MVMCoreUIUtility.imageNamed("nav_close")?.withRenderingMode(.alwaysTemplate) {
             button.setImage(image, for: .normal)
         }
         button.tintColor = .black