diff --git a/Client-Side Components/UI Macros/JSON Formatter and Viewer/README.md b/Client-Side Components/UI Macros/JSON Formatter and Viewer/README.md
new file mode 100644
index 0000000000..a331ad0cd1
--- /dev/null
+++ b/Client-Side Components/UI Macros/JSON Formatter and Viewer/README.md	
@@ -0,0 +1,9 @@
+This solution provides a significant User Experience (UX) enhancement for fields that store complex data in JSON format (e.g., integration payloads, configuration properties, or setup data). 
+
+Instead of forcing users (developers, administrators) to read or edit raw, unformatted JSON in a plain text area, this macro adds a "JSON Viewer" button next to the field
+
+Name	json_formatter_macro	
+Active	true	
+Type	XML
+
+Navigate to **System UI > UI** Macros and create a new record named json_formatter_macro , Use XML Attached File as Script
diff --git a/Client-Side Components/UI Macros/JSON Formatter and Viewer/json_formatter.xml b/Client-Side Components/UI Macros/JSON Formatter and Viewer/json_formatter.xml
new file mode 100644
index 0000000000..124a507e27
--- /dev/null
+++ b/Client-Side Components/UI Macros/JSON Formatter and Viewer/json_formatter.xml	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<j:jelly trim="false" xmlns:j="jelly:core" xmlns:g="glide" xmlns:j2="jelly:html" xmlns:g2="glide.ui">
+    
+    <g:evaluate var="jvar_field_name" expression="RP.getWindowProperties().get('fieldName')" />
+
+    <button type="button" 
+            onclick="openJsonViewer('${jvar_field_name}');" 
+            title="View and Format JSON" 
+            class="btn btn-default btn-sm">
+        <span class="icon-code"></span> JSON Viewer
+    </button>
+    
+    <script>
+        function openJsonViewer(fieldName) {
+            var jsonValue = g_form.getValue(fieldName);
+            var gm = new GlideModal('json_viewer_ui_page', false); // Replace 'json_viewer_ui_page' with your actual UI Page or Widget ID
+            gm.setTitle('JSON Data Viewer & Formatter for Field: ' + fieldName);
+            gm.setPreference('json_data', jsonValue);
+            gm.setSize(900);
+            gm.render();
+        }
+    </script>
+</j:jelly>