diff --git a/MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift b/MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift
index 8f8ca005..c6eaade3 100644
--- a/MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift
+++ b/MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift
@@ -28,7 +28,7 @@ open class ModalMoleculeListTemplate: MoleculeListTemplate {
     override open func handleNewData() {
         super.handleNewData()
         
-        closeButton = MVMCoreUICommonViewsUtility.addCloseButton(to: view, action: { [weak self] _ in
+        closeButton = MVMCoreUICommonViewsUtility.addCloseButton(to: view, tintColor: self.pageModel?.navigationBar?.tintColor.uiColor, action: { [weak self] _ in
             guard let self = self else { return }
             let closeAction = (self.templateModel as? ModalListPageTemplateModel)?.closeAction ??
                 ActionBackModel()
diff --git a/MVMCoreUI/Atomic/Templates/ModalMoleculeStackTemplate.swift b/MVMCoreUI/Atomic/Templates/ModalMoleculeStackTemplate.swift
index 97aced2a..ea8139ec 100644
--- a/MVMCoreUI/Atomic/Templates/ModalMoleculeStackTemplate.swift
+++ b/MVMCoreUI/Atomic/Templates/ModalMoleculeStackTemplate.swift
@@ -25,7 +25,8 @@ open class ModalMoleculeStackTemplate: MoleculeStackTemplate {
     
     override open func handleNewData() {
         super.handleNewData()
-        _ = MVMCoreUICommonViewsUtility.addCloseButton(to: view, action: { [weak self] _ in
+        
+        _ = MVMCoreUICommonViewsUtility.addCloseButton(to: view, tintColor: self.pageModel?.navigationBar?.tintColor.uiColor, action: { [weak self] _ in
             guard let self = self else { return }
             let closeAction = (self.templateModel as? ModalStackPageTemplateModel)?.closeAction ??
                 ActionBackModel()
diff --git a/MVMCoreUI/Atomic/Templates/ModalSectionListTemplate.swift b/MVMCoreUI/Atomic/Templates/ModalSectionListTemplate.swift
index a328dac4..1a637d90 100644
--- a/MVMCoreUI/Atomic/Templates/ModalSectionListTemplate.swift
+++ b/MVMCoreUI/Atomic/Templates/ModalSectionListTemplate.swift
@@ -23,7 +23,7 @@ open class ModalSectionListTemplate: SectionListTemplate {
     
     override open func updateUI(for molecules: [MoleculeModelProtocol]? = nil) {
         super.updateUI(for: molecules)
-        _ = MVMCoreUICommonViewsUtility.addCloseButton(to: view, action: { [weak self] _ in
+        _ = MVMCoreUICommonViewsUtility.addCloseButton(to: view, tintColor: self.pageModel?.navigationBar?.tintColor.uiColor, action: { [weak self] _ in
             guard let self = self else { return }
             let closeAction = (self.templateModel as? ModalSectionListTemplateModel)?.closeAction ??
                 ActionBackModel()
diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift
index 60e57d75..ba7e9d26 100644
--- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift
+++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift
@@ -11,12 +11,12 @@ import Foundation
 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 {
+    @objc static func addCloseButton(to view: UIView, tintColor: UIColor? = .black, action: @escaping ButtonAction, centeredVertically: Bool = false) -> Button {
         let button = Button()
         if let image = MVMCoreUIUtility.imageNamed("nav_close")?.withRenderingMode(.alwaysTemplate) {
             button.setImage(image, for: .normal)
         }
-        button.tintColor = .black
+        button.tintColor = tintColor
         button.accessibilityLabel = MVMCoreUIUtility.hardcodedString(withKey: "AccCloseButton")
         button.addActionBlock(event: .touchUpInside, action)