diff --git a/pmp-reactjs-ui/src/pages/authenticationServices/ApiKeysList.js b/pmp-reactjs-ui/src/pages/authenticationServices/ApiKeysList.js
index b742fd56f..4518fe5d6 100644
--- a/pmp-reactjs-ui/src/pages/authenticationServices/ApiKeysList.js
+++ b/pmp-reactjs-ui/src/pages/authenticationServices/ApiKeysList.js
@@ -170,17 +170,13 @@ function ApiKeysList() {
             {dataLoaded && (
                 <>
                     {errorMsg && (
-                        <div className={`flex justify-end max-w-7xl mb-5 mt-2 absolute ${isLoginLanguageRTL ? "left-0" : "right-2"}`}>
-                            <div className="flex justify-between items-center max-w-[35rem] min-h-14 min-w-72 bg-[#C61818] rounded-xl p-3 z-10">
-                                <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
-                            </div>
-                        </div>
+                        <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
                     )}
                     <div className="flex-col mt-7">
                         <div className="flex justify-between mb-5">
                             <Title title='authenticationServices.authenticationServices' backLink='/partnermanagement' ></Title>
                             {apiKeysList.length > 0 ?
-                                <button type="button" onClick={generateApiKey} tabIndex="0" onKeyPress={(e)=>onPressEnterKey(e,generateApiKey)}
+                                <button type="button" onClick={generateApiKey} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e, generateApiKey)}
                                     className="h-10 text-sm font-semibold px-7 text-white bg-tory-blue rounded-md">
                                     {t('apiKeysList.generateApiKey')}
                                 </button>
@@ -218,7 +214,7 @@ function ApiKeysList() {
                                     <div className="flex flex-col justify-center">
                                         <img src={rectangleGrid} alt="" />
                                         {activeApiKey &&
-                                            (<button onClick={generateApiKey} type="button" tabIndex="0" onKeyPress={(e)=>onPressEnterKey(e,generateApiKey)}
+                                            (<button onClick={generateApiKey} type="button" tabIndex="0" onKeyPress={(e) => onPressEnterKey(e, generateApiKey)}
                                                 className={`text-white font-semibold mt-8 bg-tory-blue rounded-md text-sm mx-8 py-3`}>
                                                 {t('apiKeysList.generateApiKey')}
                                             </button>)
@@ -273,15 +269,15 @@ function ApiKeysList() {
 
                                                                 <td className="px-2 mx-2">
                                                                     <div className="flex items-center justify-center relative" ref={el => submenuRef.current[index] = el}>
-                                                                        <p onClick={() => setViewApiKeyId(index === viewApiKeyId ? null : index)} className={`font-semibold mb-0.5 cursor-pointer text-[#1447B2]`} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e,()=>setViewApiKeyId(index === viewApiKeyId ? null : index))}>
+                                                                        <p onClick={() => setViewApiKeyId(index === viewApiKeyId ? null : index)} className={`font-semibold mb-0.5 cursor-pointer text-[#1447B2]`} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e, () => setViewApiKeyId(index === viewApiKeyId ? null : index))}>
                                                                             ...</p>
                                                                         {viewApiKeyId === index && (
                                                                             <div className={`absolute w-[7%] ${currentArray.length - 1 === index ? '-bottom-2' : currentArray.length - 2 === index ? '-bottom-2' : 'top-5'} z-50 bg-white text-xs text-start font-semibold rounded-lg shadow-md border min-w-fit ${isLoginLanguageRTL ? "left-[1.5rem] text-right" : "right-[1.5rem] text-left"}`}>
-                                                                                <p onClick={() => onClickView(apiKey)} className={`${isLoginLanguageRTL ? "pl-10" : "pr-10"} py-2 px-4 cursor-pointer text-[#3E3E3E] hover:bg-gray-100`} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e,()=>onClickView(apiKey))}>
+                                                                                <p onClick={() => onClickView(apiKey)} className={`${isLoginLanguageRTL ? "pl-10" : "pr-10"} py-2 px-4 cursor-pointer text-[#3E3E3E] hover:bg-gray-100`} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e, () => onClickView(apiKey))}>
                                                                                     {t('oidcClientsList.view')}
                                                                                 </p>
                                                                                 <hr className="h-px bg-gray-100 border-0 mx-1" />
-                                                                                <p onClick={() => onClickDeactivate(apiKey)} className={`${isLoginLanguageRTL ? "pl-10" : "pr-10"} py-2 px-4 ${apiKey.status === "ACTIVE" ? 'text-crimson-red cursor-pointer' : 'text-[#A5A5A5] cursor-auto'} hover:bg-gray-100`} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e,()=>onClickDeactivate(apiKey))}>
+                                                                                <p onClick={() => onClickDeactivate(apiKey)} className={`${isLoginLanguageRTL ? "pl-10" : "pr-10"} py-2 px-4 ${apiKey.status === "ACTIVE" ? 'text-crimson-red cursor-pointer' : 'text-[#A5A5A5] cursor-auto'} hover:bg-gray-100`} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e, () => onClickDeactivate(apiKey))}>
                                                                                     {t('oidcClientsList.deActivate')}
                                                                                 </p>
                                                                                 {showDeactivatePopup && (
diff --git a/pmp-reactjs-ui/src/pages/authenticationServices/CreateOidcClient.js b/pmp-reactjs-ui/src/pages/authenticationServices/CreateOidcClient.js
index 9f956829b..5ac62917a 100644
--- a/pmp-reactjs-ui/src/pages/authenticationServices/CreateOidcClient.js
+++ b/pmp-reactjs-ui/src/pages/authenticationServices/CreateOidcClient.js
@@ -375,11 +375,7 @@ function CreateOidcClient() {
       {dataLoaded && (
         <>
           {errorMsg && (
-            <div className={`flex justify-end max-w-7xl mb-5 absolute ${isLoginLanguageRTL ? "left-0" : "right-2"}`}>
-              <div className="flex justify-between items-center max-w-[35rem] min-h-14 min-w-72 bg-[#C61818] rounded-xl p-3">
-                <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
-              </div>
-            </div>
+            <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}/>
           )}
           <div className="flex-col mt-7">
             <div className="flex justify-between">
diff --git a/pmp-reactjs-ui/src/pages/authenticationServices/EditOidcClient.js b/pmp-reactjs-ui/src/pages/authenticationServices/EditOidcClient.js
index a6f08fb27..bbd1ce972 100644
--- a/pmp-reactjs-ui/src/pages/authenticationServices/EditOidcClient.js
+++ b/pmp-reactjs-ui/src/pages/authenticationServices/EditOidcClient.js
@@ -265,11 +265,7 @@ function EditOidcClient() {
             {dataLoaded && (
                 <>
                     {errorMsg && (
-                        <div className={`flex justify-end max-w-7xl mb-5 absolute ${isLoginLanguageRTL ? "left-0" : "right-2"}`}>
-                            <div className="flex justify-between items-center max-w-[35rem] min-h-14 min-w-72 bg-[#C61818] rounded-xl p-3">
-                                <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
-                            </div>
-                        </div>
+                        <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
                     )}
                     <div className="flex-col mt-7">
                         <div className="flex justify-between">
diff --git a/pmp-reactjs-ui/src/pages/authenticationServices/GenerateApiKey.js b/pmp-reactjs-ui/src/pages/authenticationServices/GenerateApiKey.js
index 8d7958dd6..b99613729 100644
--- a/pmp-reactjs-ui/src/pages/authenticationServices/GenerateApiKey.js
+++ b/pmp-reactjs-ui/src/pages/authenticationServices/GenerateApiKey.js
@@ -42,7 +42,7 @@ function GenerateApiKey() {
 
     const blocker = useBlocker(
         ({ currentLocation, nextLocation }) => {
-            if (isSubmitClicked || isCancelledClicked ||generateApiKeySuccess) {
+            if (isSubmitClicked || isCancelledClicked || generateApiKeySuccess) {
                 setIsSubmitClicked(false);
                 isCancelledClicked = false;
                 return false;
@@ -221,11 +221,7 @@ function GenerateApiKey() {
             {dataLoaded && (
                 <>
                     {errorMsg && (
-                        <div className={`flex justify-end max-w-7xl sm:max-w-xl mb-5 absolute ${isLoginLanguageRTL ? "left-0" : "right-2"}`}>
-                            <div className="flex justify-between items-center max-w-[35rem] min-h-14 min-w-72 max-[450px]:min-w-40 max-[450px]:min-h-40 bg-[#C61818] rounded-xl p-3">
-                                <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
-                            </div>
-                        </div>
+                        <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
                     )}
                     <div className="flex-col mt-7">
                         <div className="flex justify-between">
@@ -255,7 +251,7 @@ function GenerateApiKey() {
                                                     <label className={`block text-dark-blue text-sm font-semibold mb-1 ${isLoginLanguageRTL ? "mr-1" : "ml-1"}`}>{t('requestPolicy.partnerType')}<span className="text-crimson-red mx-1">*</span></label>
                                                     <button disabled className="flex items-center justify-between w-full h-auto px-2 py-2 border border-[#C1C1C1] rounded-md text-base text-vulcan bg-platinum-gray leading-tight focus:outline-none focus:shadow-outline
                                                 overflow-x-auto whitespace-normal no-scrollbar" type="button">
-                                                        <span className={`w-full break-all break-normal break-words ${partnerType ? 'text-dark-blue':'text-gray-400'} text-wrap text-start`}>{partnerType || t('commons.partnersHelpText')}</span>
+                                                        <span className={`w-full break-all break-normal break-words ${partnerType ? 'text-dark-blue' : 'text-gray-400'} text-wrap text-start`}>{partnerType || t('commons.partnersHelpText')}</span>
                                                         <svg className={`w-3 h-2 ml-3 transform 'rotate-0' text-gray-500 text-base`} xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
                                                             <path stroke="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="m1 1 4 4 4-4" />
                                                         </svg>
diff --git a/pmp-reactjs-ui/src/pages/authenticationServices/OidcClientsList.js b/pmp-reactjs-ui/src/pages/authenticationServices/OidcClientsList.js
index 50405b5b3..05c73870f 100644
--- a/pmp-reactjs-ui/src/pages/authenticationServices/OidcClientsList.js
+++ b/pmp-reactjs-ui/src/pages/authenticationServices/OidcClientsList.js
@@ -200,11 +200,7 @@ function OidcClientsList() {
             {dataLoaded && (
                 <>
                     {errorMsg && (
-                        <div className={`flex justify-end max-w-7xl mb-5 mt-2 absolute ${isLoginLanguageRTL ? "left-0" : "right-2"}`}>
-                            <div className="flex justify-between items-center max-w-[35rem] min-h-14 min-w-72 bg-[#C61818] rounded-xl p-3 z-10">
-                                <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
-                            </div>
-                        </div>
+                        <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}/>
                     )}
                     <div className="flex-col mt-7">
                         <div className="flex justify-between mb-5">
diff --git a/pmp-reactjs-ui/src/pages/certificates/PartnerCertificatesList.js b/pmp-reactjs-ui/src/pages/certificates/PartnerCertificatesList.js
index a436e6b3c..8faca468b 100644
--- a/pmp-reactjs-ui/src/pages/certificates/PartnerCertificatesList.js
+++ b/pmp-reactjs-ui/src/pages/certificates/PartnerCertificatesList.js
@@ -6,7 +6,7 @@ import { isLangRTL } from "../../utils/AppUtils";
 import ErrorMessage from "../common/ErrorMessage";
 import SuccessMessage from "../common/SuccessMessage";
 import LoadingIcon from "../common/LoadingIcon";
-import { formatDate, getPartnerTypeDescription, handleMouseClickForDropdown, getPartnerManagerUrl, getPartnerDomainType} from "../../utils/AppUtils";
+import { formatDate, getPartnerTypeDescription, handleMouseClickForDropdown, getPartnerManagerUrl, getPartnerDomainType } from "../../utils/AppUtils";
 import { useTranslation } from "react-i18next";
 
 import rectangleBox from '../../svg/rectangle_box.svg';
@@ -177,18 +177,10 @@ function PartnerCertificatesList() {
             {dataLoaded && (
                 <>
                     {errorMsg && (
-                        <div className={`flex justify-end max-w-7xl mb-5 absolute ${isLoginLanguageRTL ? "left-0" : "right-0"}`}>
-                            <div className="flex justify-between items-center max-w-[35rem] min-h-14 min-w-72 bg-[#C61818] rounded-xl p-4">
-                                <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
-                            </div>
-                        </div>
+                        <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
                     )}
                     {successMsg && (
-                        <div className={`flex justify-end max-w-7xl mb-5 absolute ${isLoginLanguageRTL ? "left-0" : "right-0"}`}>
-                            <div className="flex justify-between items-center max-w-[35rem] min-h-14 min-w-72 bg-fruit-salad rounded-xl p-4">
-                                <SuccessMessage successMsg={successMsg} clickOnCancel={cancelSuccessMsg}></SuccessMessage>
-                            </div>
-                        </div>
+                        <SuccessMessage successMsg={successMsg} clickOnCancel={cancelSuccessMsg} />
                     )}
                     <div className="flex-col mt-5">
                         <div className="flex justify-between mb-5">
diff --git a/pmp-reactjs-ui/src/pages/certificates/UploadCertificate.js b/pmp-reactjs-ui/src/pages/certificates/UploadCertificate.js
index 01612a216..6cb1d7597 100644
--- a/pmp-reactjs-ui/src/pages/certificates/UploadCertificate.js
+++ b/pmp-reactjs-ui/src/pages/certificates/UploadCertificate.js
@@ -138,9 +138,19 @@ function UploadCertificate({ closePopup, popupData, request }) {
         }
     }, [popupData.isCertificateAvailable, popupData.certificateUploadDateTime, popupData, getPartnerType]);
 
+    const errorcustomStyle = {
+        outerDiv: "!flex !justify-center !inset-0",
+        innerDiv: "!flex !justify-between !items-center !rounded-none !bg-moderate-red !md:w-[25rem] !w-full !min-h-[3.2rem] !h-fit !px-4 !py-[10px]"
+    }
+
+    const successcustomStyle = {
+        outerDiv: "!flex !justify-center !inset-0",
+        innerDiv: "!flex !justify-between !items-center !rounded-none !md:w-[25rem] !w-full !min-h-[3.2rem] !h-fit !px-4 !py-[10px]"
+    }
+
     return (
         <div className="fixed inset-0 flex items-center justify-center bg-black bg-opacity-[30%] z-50">
-            <FocusTrap focusTrapOptions={{ initialFocus: false, allowOutsideClick: true}}>
+            <FocusTrap focusTrapOptions={{ initialFocus: false, allowOutsideClick: true }}>
                 <div className={`bg-white md:w-[25rem] w-[60%] mx-auto ${popupData.isCertificateAvailable ? 'min-h-[28rem]' : 'min-h-[27rem]'} rounded-lg shadow-lg h-fit`}>
                     {!dataLoaded && (
                         <div className="flex items-center h-[30rem]">
@@ -156,18 +166,10 @@ function UploadCertificate({ closePopup, popupData, request }) {
                             <div className="border-gray-200 border-opacity-75 border-t"></div>
                             <div className="relative">
                                 {uploadFailure && errorMsg && (
-                                    <div className="flex justify-center inset-0">
-                                        <div className="bg-moderate-red md:w-[25rem] w-full min-h-[3.2rem] h-fit flex items-center justify-between px-4 py-[10px]">
-                                            <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
-                                        </div>
-                                    </div>
+                                    <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} customStyle={errorcustomStyle} />
                                 )}
                                 {uploadSuccess && successMsg && (
-                                    <div className="flex justify-center inset-0">
-                                        <div className="bg-fruit-salad md:w-[25rem] w-full min-h-[3.2rem] h-fit flex items-center justify-between px-4 py-[10px]">
-                                            <SuccessMessage successMsg={successMsg} clickOnCancel={cancelSuccessMsg}></SuccessMessage>
-                                        </div>
-                                    </div>
+                                    <SuccessMessage successMsg={successMsg} clickOnCancel={cancelSuccessMsg} customStyle={successcustomStyle} />
                                 )}
                                 <div className="px-[4%] py-[2%]">
                                     <form>
diff --git a/pmp-reactjs-ui/src/pages/common/DeactivatePopup.js b/pmp-reactjs-ui/src/pages/common/DeactivatePopup.js
index e32d38236..5bd71ba65 100644
--- a/pmp-reactjs-ui/src/pages/common/DeactivatePopup.js
+++ b/pmp-reactjs-ui/src/pages/common/DeactivatePopup.js
@@ -88,21 +88,22 @@ function DeactivatePopup({ closePopUp, popupData, request, headerMsg, descriptio
         loadingDiv: "!py-[35%]"
     }
 
+    const customStyle = {
+        outerDiv: "!flex !justify-end",
+        innerDiv: "!flex !justify-between !items-center !rounded-xl !w-[55%] !min-h-12 !p-3 !m-1 !-mb-6"
+    }
+
     return (
         <div className="fixed inset-0 flex items-center justify-center bg-black bg-opacity-[50%] z-50 font-inter cursor-default">
             <FocusTrap focusTrapOptions={{ initialFocus: false, allowOutsideClick: true }}>
                 <div className={`bg-white md:w-[390px] w-[55%] mx-auto rounded-lg shadow-lg h-fit`}>
                     {!dataLoaded && (
-                        <LoadingIcon styleSet={styles}></LoadingIcon>
+                        <LoadingIcon styleSet={styles} />
                     )}
                     {dataLoaded && (
                         <div className="relative">
                             {errorMsg && (
-                                <div className="flex justify-end">
-                                    <div className="flex justify-between items-center w-[55%] min-h-14 bg-[#C61818] rounded-xl p-3 m-2 -mb-5">
-                                        <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
-                                    </div>
-                                </div>
+                                <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} customStyle={customStyle} />
                             )}
                             <div className={`p-[8%] flex-col text-center justify-center items-center`}>
                                 {!isLoginLanguageRTL ?
@@ -118,8 +119,8 @@ function DeactivatePopup({ closePopUp, popupData, request, headerMsg, descriptio
                                 </p>
                                 {popupData.isDeactivateSbi &&
                                     (<div className="bg-[#FFF7E5] border-2 break-words border-[#EDDCAF] rounded-md w-full p-[2%] mb-2">
-                                        <p className="text-sm font-inter text-[#8B6105]">{t(formatDeviceCountMessage(popupData.countOfApprovedDevices, t('deactivateSbi.deactivateApprovedDevicesSingular'), t('deactivateSbi.deactivateApprovedDevicesPlural')), {devicesCount: popupData.countOfApprovedDevices})}
-                                            | {t(formatDeviceCountMessage(popupData.countOfPendingDevices, t('deactivateSbi.deactivatePendingDevicesSingular'), t('deactivateSbi.deactivatePendingDevicesPlural')), {devicesCount: popupData.countOfPendingDevices})}
+                                        <p className="text-sm font-inter text-[#8B6105]">{t(formatDeviceCountMessage(popupData.countOfApprovedDevices, t('deactivateSbi.deactivateApprovedDevicesSingular'), t('deactivateSbi.deactivateApprovedDevicesPlural')), { devicesCount: popupData.countOfApprovedDevices })}
+                                            | {t(formatDeviceCountMessage(popupData.countOfPendingDevices, t('deactivateSbi.deactivatePendingDevicesSingular'), t('deactivateSbi.deactivatePendingDevicesPlural')), { devicesCount: popupData.countOfPendingDevices })}
                                         </p>
                                     </div>)
                                 }
diff --git a/pmp-reactjs-ui/src/pages/common/ErrorMessage.js b/pmp-reactjs-ui/src/pages/common/ErrorMessage.js
index af602c192..93d3c04a0 100644
--- a/pmp-reactjs-ui/src/pages/common/ErrorMessage.js
+++ b/pmp-reactjs-ui/src/pages/common/ErrorMessage.js
@@ -1,10 +1,13 @@
 import { useState, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import cancelIcon from '../../svg/cancel_icon.svg';
+import { isLangRTL } from "../../utils/AppUtils";
+import { getUserProfile } from "../../services/UserProfileService";
 
-function ErrorMessage({ errorCode, errorMessage, clickOnCancel }) {
+function ErrorMessage({ errorCode, errorMessage, clickOnCancel, customStyle }) {
     const { t } = useTranslation();
     const [errorMsg, setErrorMsg] = useState();
+    const isLoginLanguageRTL = isLangRTL(getUserProfile().langCode);
 
     useEffect(() => {
         if (errorCode) {
@@ -21,14 +24,18 @@ function ErrorMessage({ errorCode, errorMessage, clickOnCancel }) {
     }, [t, errorCode, errorMessage]);
 
     return (
-        <div className="flex items-center">
-            <div className="h-full mr-8">
-                <p className="text-white text-sm max-[450px]:text-xs/4 break-normal font-inter line-clamp-6">
-                    {errorMsg}
-                </p>
-            </div>
-            <div className="mr-3 ml-5 absolute top-4 right-2 mt-1">
-                <img src={cancelIcon} alt="" className="cursor-pointer max-[450px]:h-3" onClick={clickOnCancel}/>
+        <div className={`${customStyle ? customStyle.outerDiv : `flex justify-end max-w-7xl my-5 absolute ${isLoginLanguageRTL ? "left-0.5" : "right-0.5"}`}`}>
+            <div className={`bg-[#C61818] ${customStyle ? customStyle.innerDiv : 'flex justify-between items-center rounded-xl max-w-[35rem] min-h-14 min-w-72 p-4'}`}>
+                <div className="flex items-center">
+                    <div className={`h-full ${isLoginLanguageRTL ? 'ml-8': 'mr-8'}`}>
+                        <p className="text-white text-sm max-[450px]:text-xs/4 break-normal font-inter line-clamp-6">
+                            {errorMsg}
+                        </p>
+                    </div>
+                    <div className={`${isLoginLanguageRTL ? 'ml-3 mr-5 left-2' : 'mr-3 ml-5 right-2'} absolute top-4  mt-1`}>
+                        <img src={cancelIcon} alt="" className="cursor-pointer max-[450px]:h-3" onClick={clickOnCancel} />
+                    </div>
+                </div>
             </div>
         </div>
     );
diff --git a/pmp-reactjs-ui/src/pages/common/SuccessMessage.js b/pmp-reactjs-ui/src/pages/common/SuccessMessage.js
index 64b1990fe..8b419aa6b 100644
--- a/pmp-reactjs-ui/src/pages/common/SuccessMessage.js
+++ b/pmp-reactjs-ui/src/pages/common/SuccessMessage.js
@@ -1,17 +1,24 @@
+import { getUserProfile } from '../../services/UserProfileService';
 import cancelIcon from '../../svg/cancel_icon.svg';
+import { isLangRTL } from '../../utils/AppUtils';
+
+function SuccessMessage({ successMsg, clickOnCancel, customStyle}) {
+    
+    const isLoginLanguageRTL = isLangRTL(getUserProfile().langCode);
 
-function SuccessMessage({ successMsg, clickOnCancel}) {
     return (
-        <>
-            <div className="mr-6">
-                <p className="text-sm/4 text-white break-words font-inter">
-                    {successMsg}
-                </p>
-            </div>
-            <div className="mr-3 ml-5 absolute top-4 right-2">
-                <img src={cancelIcon} alt="" className="cursor-pointer" onClick={clickOnCancel}></img>
+        <div className={`${customStyle ? customStyle.outerDiv : `flex justify-end max-w-7xl my-5 absolute ${isLoginLanguageRTL ? "left-0.5" : "right-0.5"}`}`}>
+            <div className={` bg-fruit-salad ${customStyle ? customStyle.innerDiv : 'flex justify-between items-center rounded-xl max-w-[35rem] min-h-14 min-w-72 p-4'}`}>
+                <div className={`${isLoginLanguageRTL ? 'ml-6':'mr-6'}`}>
+                    <p className="text-sm/4 text-white break-words font-inter">
+                        {successMsg}
+                    </p>
+                </div>
+                <div className={`${isLoginLanguageRTL ? 'ml-3 mr-5 left-2' : 'mr-3 ml-5 right-2'} absolute top-4 mt-1`}>
+                    <img src={cancelIcon} alt="" className="cursor-pointer" onClick={clickOnCancel}></img>
+                </div>
             </div>
-        </>
+        </div>
     );
 }
 
diff --git a/pmp-reactjs-ui/src/pages/dashboard/ConsentPopup.js b/pmp-reactjs-ui/src/pages/dashboard/ConsentPopup.js
index c6b04f567..086319f31 100644
--- a/pmp-reactjs-ui/src/pages/dashboard/ConsentPopup.js
+++ b/pmp-reactjs-ui/src/pages/dashboard/ConsentPopup.js
@@ -51,6 +51,11 @@ function ConsentPopup() {
         setDataLoaded(true);
     }
 
+    const customStyle = {
+        outerDiv: "!flex !justify-end !absolute !min-h-10 !w-3/5 !mt-1 !px-0.5",
+        innerDiv: "!flex !justify-between !items-center !rounded-xl !min-h-12 !p-3 !w-6/12"
+    }
+
     return (
         <div className="fixed inset-0 w-full flex items-center justify-center bg-black bg-opacity-50 z-50 font-inter">
             <FocusTrap focusTrapOptions={{ initialFocus: false, allowOutsideClick: true }}>
@@ -61,11 +66,7 @@ function ConsentPopup() {
                     {dataLoaded && (
                         <>
                             {errorMsg && (
-                                <div className="flex justify-end absolute w-3/5 mt-2 px-2">
-                                    <div className="flex justify-between items-center min-h-13 bg-[#C61818] rounded-xl p-3 w-6/12">
-                                        <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
-                                    </div>
-                                </div>
+                                <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} customStyle={customStyle} />
                             )}
                             <div className="p-4">
                                 <h3 className="text-base font-bold text-[#333333]">{t('consentPopup.title')}</h3>
diff --git a/pmp-reactjs-ui/src/pages/dashboard/Dashboard.js b/pmp-reactjs-ui/src/pages/dashboard/Dashboard.js
index bb521b241..c8ada0b7d 100644
--- a/pmp-reactjs-ui/src/pages/dashboard/Dashboard.js
+++ b/pmp-reactjs-ui/src/pages/dashboard/Dashboard.js
@@ -26,7 +26,7 @@ function Dashboard() {
   const [showPolicies, setShowPolicies] = useState(false);
   const [showAuthenticationServices, setShowAuthenticationServices] = useState(false);
   const [showDeviceProviderServices, setShowDeviceProviderServices] = useState(false);
-  const [showFtmServices,setShowFtmServices] = useState(false);
+  const [showFtmServices, setShowFtmServices] = useState(false);
   const [showConsentPopup, setShowConsentPopup] = useState(false);
   let isSelectPolicyPopupVisible = false;
   let isUserConsentGiven = false;
@@ -168,11 +168,7 @@ function Dashboard() {
       {dataLoaded && (
         <>
           {errorMsg && (
-            <div className={`flex justify-end max-w-7xl mt-3 absolute ${isLoginLanguageRTL ? "left-2" : "right-2"}`}>
-              <div className="flex justify-between items-center max-w-[35rem] min-h-14 min-w-72 bg-[#C61818] rounded-xl p-4">
-                <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
-              </div>
-            </div>
+            <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}/>
           )}
           <div className="mb-6 mt-5 ml-[2%] text-lg font-semibold tracking-tight text-gray-700">
             <p >
diff --git a/pmp-reactjs-ui/src/pages/dashboard/SelectPolicyPopup.js b/pmp-reactjs-ui/src/pages/dashboard/SelectPolicyPopup.js
index 710fb2fc9..e81c28bee 100644
--- a/pmp-reactjs-ui/src/pages/dashboard/SelectPolicyPopup.js
+++ b/pmp-reactjs-ui/src/pages/dashboard/SelectPolicyPopup.js
@@ -24,7 +24,7 @@ function SelectPolicyPopup() {
     const descriptionText = t('selectPolicyPopup.description');
     const maxWords = 20;
     const displayText = isExpanded ? descriptionText : `${descriptionText.split(' ').slice(0, maxWords).join(' ')}...`;
-    
+
 
     const expandDescription = () => {
         setIsExpanded(!isExpanded);
@@ -46,7 +46,7 @@ function SelectPolicyPopup() {
                         setPolicyGroupList(createDropdownData('name', 'description', false, resData, t));
                         console.log(`Response data: ${resData.length}`);
                     } else {
-                      handleServiceErrors(responseData, setErrorCode, setErrorMsg);
+                        handleServiceErrors(responseData, setErrorCode, setErrorMsg);
                     }
                 } else {
                     setErrorMsg(t('selectPolicyPopup.policyGroupError'));
@@ -70,7 +70,7 @@ function SelectPolicyPopup() {
 
     const clickOnSubmit = async () => {
         setDataLoaded(false);
-        document.body.style.overflow="auto";
+        document.body.style.overflow = "auto";
         const userProfile = getUserProfile();
         const registerUserRequest = createRequest({
             partnerId: userProfile.userName,
@@ -101,6 +101,11 @@ function SelectPolicyPopup() {
         loadingDiv: "!py-[50%]"
     }
 
+    const customStyle = {
+        outerDiv: "!flex !justify-end !absolute !items-center !w-1/3",
+        innerDiv: "!flex !justify-between !items-center !rounded-xl !min-h-14 !p-3"
+    }
+
     return (
         <div className="fixed inset-0 w-full flex items-center justify-center bg-black bg-opacity-50 z-50 font-inter">
             <FocusTrap focusTrapOptions={{ initialFocus: false, allowOutsideClick: true }}>
@@ -111,11 +116,7 @@ function SelectPolicyPopup() {
                     {dataLoaded && (
                         <>
                             {errorMsg && (
-                                <div className="flex justify-end items-center absolute w-1/3">
-                                    <div className="flex justify-between items-center min-h-14 bg-[#C61818] rounded-xl p-3">
-                                        <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
-                                    </div>
-                                </div>
+                                <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} customStyle={customStyle}/>
                             )}
                             <div className="px-4 py-2">
                                 <h3 className="text-base font-bold text-[#333333]">{t('selectPolicyPopup.title')}</h3>
diff --git a/pmp-reactjs-ui/src/pages/deviceProviderServices/AddDevices.js b/pmp-reactjs-ui/src/pages/deviceProviderServices/AddDevices.js
index e6efd2e91..934eecf62 100644
--- a/pmp-reactjs-ui/src/pages/deviceProviderServices/AddDevices.js
+++ b/pmp-reactjs-ui/src/pages/deviceProviderServices/AddDevices.js
@@ -39,9 +39,9 @@ function AddDevices() {
             }
             const checkValuesAreEntered = deviceEntries.some(entry => (
                 (entry.deviceType !== "" ||
-                entry.deviceSubType !== "" ||
-                entry.make !== "" ||
-                entry.model !== "") && !entry.isSubmitted
+                    entry.deviceSubType !== "" ||
+                    entry.make !== "" ||
+                    entry.model !== "") && !entry.isSubmitted
             ));
             return (
                 checkValuesAreEntered &&
@@ -118,7 +118,7 @@ function AddDevices() {
             optionalFilters: [],
             purpose: "REGISTRATION"
         });
-    
+
         try {
             const response = await HttpService.post(getPartnerManagerUrl(`/devicedetail/deviceType/filtervalues`, process.env.NODE_ENV), request);
             if (response) {
@@ -182,7 +182,7 @@ function AddDevices() {
             return [];
         }
     }
-    
+
     async function createEmptyDeviceEntry(deviceTypeData) {
         return {
             deviceType: "",
@@ -242,7 +242,7 @@ function AddDevices() {
         });
         try {
             const response = await HttpService.post(getPartnerManagerUrl(`/devicedetail`, process.env.NODE_ENV), request);
-    
+
             if (response?.data?.response?.id) {
                 inactiveMappingDeviceToSbi(response.data.response.id, index);
             } else {
@@ -256,7 +256,7 @@ function AddDevices() {
         setDataLoaded(true);
         setIsSubmitClicked(false);
     };
-    
+
     const inactiveMappingDeviceToSbi = async (deviceDetailId, index) => {
         const newEntries = [...deviceEntries];
         setDataLoaded(false);
@@ -272,7 +272,7 @@ function AddDevices() {
                     'Content-Type': 'application/json'
                 }
             });
-    
+
             if (response?.data?.response) {
                 newEntries[index].isSubmitted = true;
                 newEntries[index].successMsg = t('addDevices.successMsg');
@@ -287,8 +287,8 @@ function AddDevices() {
             console.error('Error fetching data:', err);
         }
         setDataLoaded(true);
-    };  
-    
+    };
+
     const handleError = (responseData, index, newEntries) => {
         if (responseData && responseData.errors && responseData.errors.length > 0) {
             const errorCode = responseData.errors[0].errorCode;
@@ -316,7 +316,7 @@ function AddDevices() {
 
     const addDeviceEntry = async () => {
         const newEntries = [...deviceEntries];
-        newEntries[deviceEntries.length-1].successMsg = "";
+        newEntries[deviceEntries.length - 1].successMsg = "";
         setDeviceEntries(newEntries);
         const allSubmitted = deviceEntries.every(entry => entry.isSubmitted);
         if (deviceEntries.length === 25 && allSubmitted) {
@@ -378,18 +378,14 @@ function AddDevices() {
             {dataLoaded && (
                 <>
                     {errorMsg && (
-                        <div className={`flex justify-end max-w-7xl mb-5 mt-2 absolute ${isLoginLanguageRTL ? "left-0" : "right-2"}`}>
-                            <div className="flex justify-between items-center max-w-[35rem] min-h-14 min-w-72 bg-[#C61818] rounded-xl p-3 z-10">
-                                <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
-                            </div>
-                        </div>
+                        <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}/>
                     )}
                     <div className="flex-col mt-7">
                         <div className="flex justify-between mb-5">
-                            <Title 
-                                title='addDevices.addDevices' 
-                                subTitle={previousPath.name} 
-                                backLink={previousPath.path} 
+                            <Title
+                                title='addDevices.addDevices'
+                                subTitle={previousPath.name}
+                                backLink={previousPath.path}
                                 status={!unexpectedError ? selectedSbidata.status : ''}
                                 version={!unexpectedError ? selectedSbidata.sbiVersion : ''}
                             />
@@ -497,7 +493,7 @@ function AddDevices() {
                                 <button onClick={clickOnBack} className={`${isLoginLanguageRTL ? "ml-2" : "mr-2"} w-36 h-11 border rounded-md text-sm font-semibold border-[#1447B2] bg-tory-blue text-white`}>
                                     {t('addDevices.backToSBIList')}
                                 </button>
-                            :
+                                :
                                 <button onClick={clickOnBack} className={`${isLoginLanguageRTL ? "ml-2" : "mr-2"} w-36 h-11 border rounded-md text-sm font-semibold border-[#1447B2] bg-tory-blue text-white`}>
                                     {t('addDevices.backToViewDevices')}
                                 </button>
diff --git a/pmp-reactjs-ui/src/pages/deviceProviderServices/AddSbi.js b/pmp-reactjs-ui/src/pages/deviceProviderServices/AddSbi.js
index cc451c52b..f1a9d9c07 100644
--- a/pmp-reactjs-ui/src/pages/deviceProviderServices/AddSbi.js
+++ b/pmp-reactjs-ui/src/pages/deviceProviderServices/AddSbi.js
@@ -211,11 +211,7 @@ function AddSbi() {
             {dataLoaded && (
                 <>
                     {errorMsg && (
-                        <div className={`flex justify-end max-w-7xl sm:max-w-xl mb-5 absolute ${isLoginLanguageRTL ? "left-0" : "right-2"}`}>
-                            <div className="flex justify-between items-center min-h-14 min-w-72 bg-[#C61818] rounded-xl p-3">
-                                <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
-                            </div>
-                        </div>
+                        <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
                     )}
                     <div className="flex-col mt-7 font-inter">
                         <div className="flex justify-between">
diff --git a/pmp-reactjs-ui/src/pages/deviceProviderServices/DevicesList.js b/pmp-reactjs-ui/src/pages/deviceProviderServices/DevicesList.js
index dd4063c30..48d4f61e4 100644
--- a/pmp-reactjs-ui/src/pages/deviceProviderServices/DevicesList.js
+++ b/pmp-reactjs-ui/src/pages/deviceProviderServices/DevicesList.js
@@ -177,7 +177,7 @@ function DevicesList() {
         if (selectedDevice.status === "approved") {
             const request = createRequest({
                 deviceId: selectedDevice.id,
-            },"mosip.pms.deactivate.device.post", true);
+            }, "mosip.pms.deactivate.device.post", true);
             setDeactivateRequest(request);
             setShowDeactivatePopup(true);
             document.body.style.overflow = "hidden";
@@ -197,11 +197,7 @@ function DevicesList() {
             {dataLoaded && (
                 <>
                     {errorMsg && (
-                        <div className={`flex justify-end max-w-7xl mb-5 mt-2 absolute ${isLoginLanguageRTL ? "left-0" : "right-2"}`}>
-                            <div className="flex justify-between items-center max-w-[35rem] min-h-14 min-w-72 bg-[#C61818] rounded-xl p-3 z-10">
-                                <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
-                            </div>
-                        </div>
+                        <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}/>
                     )}
                     <div className="flex-col mt-7">
                         <div className="flex justify-between mb-5">
@@ -322,8 +318,8 @@ function DevicesList() {
                                                                                     tabIndex="0" onKeyPress={(e) => onPressEnterKey(e, () => setViewDeviceId(index === viewDeviceId ? null : index))}>
                                                                                     ...</p>
                                                                                 {viewDeviceId === index && (
-                                                                            <div className={`absolute w-[7%] ${currentArray.length - 1 === index ? '-bottom-2' : currentArray.length - 2 === index ? '-bottom-2' : 'top-5'} z-50 bg-white text-xs text-start font-semibold rounded-lg shadow-md border min-w-fit ${isLoginLanguageRTL ? "left-6 text-right" : "right-6 text-left"}`}>
-                                                                                    <p onClick={() => viewDeviceDetails(device)} className={`py-2 px-4 cursor-pointer text-[#3E3E3E] hover:bg-gray-100 ${isLoginLanguageRTL ? "pl-10" : "pr-10"}`} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e, () => viewDeviceDetails(device))}>
+                                                                                    <div className={`absolute w-[7%] ${currentArray.length - 1 === index ? '-bottom-2' : currentArray.length - 2 === index ? '-bottom-2' : 'top-5'} z-50 bg-white text-xs text-start font-semibold rounded-lg shadow-md border min-w-fit ${isLoginLanguageRTL ? "left-6 text-right" : "right-6 text-left"}`}>
+                                                                                        <p onClick={() => viewDeviceDetails(device)} className={`py-2 px-4 cursor-pointer text-[#3E3E3E] hover:bg-gray-100 ${isLoginLanguageRTL ? "pl-10" : "pr-10"}`} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e, () => viewDeviceDetails(device))}>
                                                                                             {t('devicesList.view')}
                                                                                         </p>
                                                                                         <hr className="h-px bg-gray-100 border-0 mx-1" />
@@ -331,7 +327,7 @@ function DevicesList() {
                                                                                             {t('devicesList.deActivate')}
                                                                                         </p>
                                                                                         {showDeactivatePopup && (
-                                                                                            <DeactivatePopup closePopUp={closeDeactivatePopup} popupData={{...device, isDeactivateDevice:true}} request={deactivateRequest} headerMsg='deactivateDevicePopup.headerMsg' descriptionMsg='deactivateDevicePopup.description' />
+                                                                                            <DeactivatePopup closePopUp={closeDeactivatePopup} popupData={{ ...device, isDeactivateDevice: true }} request={deactivateRequest} headerMsg='deactivateDevicePopup.headerMsg' descriptionMsg='deactivateDevicePopup.description' />
                                                                                         )}
                                                                                     </div>
                                                                                 )}
diff --git a/pmp-reactjs-ui/src/pages/deviceProviderServices/SbiList.js b/pmp-reactjs-ui/src/pages/deviceProviderServices/SbiList.js
index d82060219..b06d73c20 100644
--- a/pmp-reactjs-ui/src/pages/deviceProviderServices/SbiList.js
+++ b/pmp-reactjs-ui/src/pages/deviceProviderServices/SbiList.js
@@ -156,15 +156,11 @@ function SbiList() {
             {dataLoaded && (
                 <>
                     {errorMsg && (
-                        <div className={`flex justify-end max-w-7xl mb-5 mt-2 absolute ${isLoginLanguageRTL ? "left-0" : "right-2"}`}>
-                            <div className="flex justify-between items-center max-w-[35rem] min-h-14 min-w-72 bg-[#C61818] rounded-xl p-3 z-10">
-                                <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
-                            </div>
-                        </div>
+                        <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
                     )}
                     <div className="flex-col mt-7 !mb-4">
                         <div className="flex justify-between mb-5">
-                            <Title title='sbiList.listOfSbi' backLink='/partnermanagement'/>
+                            <Title title='sbiList.listOfSbi' backLink='/partnermanagement' />
                             {sbiList.length > 0 ?
                                 <button type="button" onClick={addSbi}
                                     className="h-10 text-sm font-semibold px-7 text-white bg-tory-blue rounded-md">
@@ -207,13 +203,13 @@ function SbiList() {
                                                             <div className='flex items-center w-fit px-2 mx-1'>
                                                                 <p className="text-xs font-semibold text-[#505E7C]">
                                                                     <span className={`text-xs font-semibold ${sbi.status === "deactivated" ? 'text-[#4F5E7C]' : 'text-tory-blue'} `}>
-                                                                        {sbi.countOfApprovedDevices} {sbi.countOfApprovedDevices <=1 ? t('sbiList.device') : t('sbiList.devices')}
+                                                                        {sbi.countOfApprovedDevices} {sbi.countOfApprovedDevices <= 1 ? t('sbiList.device') : t('sbiList.devices')}
                                                                     </span> {t('sbiList.approved')}
                                                                 </p>
                                                                 <span className='mx-1'>{'|'}</span>
                                                                 <p className="text-xs font-semibold text-[#505E7C]">
                                                                     <span className={`text-xs font-semibold ${sbi.status === "deactivated" ? 'text-[#4F5E7C]' : 'text-[#ba5f04]'} `}>
-                                                                        {sbi.countOfPendingDevices} {sbi.countOfPendingDevices <=1 ? t('sbiList.device') : t('sbiList.devices')}
+                                                                        {sbi.countOfPendingDevices} {sbi.countOfPendingDevices <= 1 ? t('sbiList.device') : t('sbiList.devices')}
                                                                     </span> {t('sbiList.pendingForApprovalContx')}
                                                                 </p>
                                                             </div>
@@ -231,7 +227,7 @@ function SbiList() {
                                                                 {t('sbiList.deactivate')}
                                                             </p>
                                                             {showDeactivatePopup && (
-                                                                <DeactivatePopup closePopUp={() => setShowDeactivatePopup(false)} popupData={{ ...sbi, isDeactivateSbi: true }} request={deactivateRequest} headerMsg='deactivateSbi.headerMsg' descriptionMsg='deactivateSbi.description' headerKeyName={sbi.sbiVersion}/>
+                                                                <DeactivatePopup closePopUp={() => setShowDeactivatePopup(false)} popupData={{ ...sbi, isDeactivateSbi: true }} request={deactivateRequest} headerMsg='deactivateSbi.headerMsg' descriptionMsg='deactivateSbi.description' headerKeyName={sbi.sbiVersion} />
                                                             )}
                                                         </div>
                                                     )}
diff --git a/pmp-reactjs-ui/src/pages/ftmProviderServices/AddFtm.js b/pmp-reactjs-ui/src/pages/ftmProviderServices/AddFtm.js
index d41b60b2c..56f0dd21e 100644
--- a/pmp-reactjs-ui/src/pages/ftmProviderServices/AddFtm.js
+++ b/pmp-reactjs-ui/src/pages/ftmProviderServices/AddFtm.js
@@ -229,11 +229,7 @@ function AddFtm() {
       {dataLoaded && (
         <>
           {errorMsg && (
-            <div className={`flex justify-end max-w-7xl sm:max-w-xl mb-5 absolute ${isLoginLanguageRTL ? "left-0" : "right-2"}`}>
-              <div className="flex justify-between items-center max-w-[35rem] min-h-14 min-w-72 max-[450px]:min-w-40 max-[450px]:min-h-40 bg-[#C61818] rounded-xl p-3">
-                <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
-              </div>
-            </div>
+            <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
           )}
           <div className="flex-col mt-7">
             <div className="flex justify-between">
diff --git a/pmp-reactjs-ui/src/pages/ftmProviderServices/FtmList.js b/pmp-reactjs-ui/src/pages/ftmProviderServices/FtmList.js
index 077c33676..bfe0fcd9e 100644
--- a/pmp-reactjs-ui/src/pages/ftmProviderServices/FtmList.js
+++ b/pmp-reactjs-ui/src/pages/ftmProviderServices/FtmList.js
@@ -80,11 +80,11 @@ function FtmList() {
   const populateCertificateExpiryStatus = (data) => {
     // Updating the status based on the condition
     const updatedData = data.map(item => {
-        if (item['isCertificateExpired'] === true) {
-            return { ...item, certificateExpiryStatus: 'expired' };
-        } else {
-            return { ...item, certificateExpiryStatus: '-' };
-        }
+      if (item['isCertificateExpired'] === true) {
+        return { ...item, certificateExpiryStatus: 'expired' };
+      } else {
+        return { ...item, certificateExpiryStatus: '-' };
+      }
     });
     return updatedData;
   };
@@ -170,7 +170,7 @@ function FtmList() {
     if (selectedFtmData.status === "approved") {
       const request = createRequest({
         ftmId: selectedFtmData.ftmId,
-      },"mosip.pms.deactivate.ftm.post", true);
+      }, "mosip.pms.deactivate.ftm.post", true);
       setDeactivateRequest(request);
       setShowDeactivatePopup(true);
       document.body.style.overflow = "hidden";
@@ -192,7 +192,7 @@ function FtmList() {
   const closeDeactivatePopup = () => {
     setViewFtmId(-1);
     setShowDeactivatePopup(false);
-};
+  };
 
   return (
     <div className={`mt-2 w-[100%] ${isLoginLanguageRTL ? "mr-28 ml-5" : "ml-28 mr-5"} overflow-x-scroll font-inter`}>
@@ -202,11 +202,7 @@ function FtmList() {
       {dataLoaded && (
         <>
           {errorMsg && (
-            <div className={`flex justify-end max-w-7xl mb-5 mt-2 absolute ${isLoginLanguageRTL ? "left-0" : "right-2"}`}>
-              <div className="flex justify-between items-center max-w-[35rem] min-h-14 min-w-72 bg-[#C61818] rounded-xl p-3 z-10">
-                <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
-              </div>
-            </div>
+            <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg} />
           )}
           <div className="flex-col mt-7">
             <div className="flex justify-between mb-5">
@@ -217,7 +213,7 @@ function FtmList() {
                 </button>
               )}
             </div>
-            {ftmList.length === 0 ? 
+            {ftmList.length === 0 ?
               <div className="bg-[#FCFCFC] w-full mt-3 rounded-lg shadow-lg">
                 <div className="flex justify-between py-2 px-2 pt-4 text-sm font-semibold text-[#6F6E6E] overflow-x-scroll no-scrollbar">
                   <div className={`flex w-full justify-between`}>
@@ -308,7 +304,7 @@ function FtmList() {
                                           {t('ftmList.deActivate')}
                                         </p>
                                         {showDeactivatePopup && (
-                                          <DeactivatePopup closePopUp={closeDeactivatePopup} popupData={{...ftm, isDeactivateFtm:true}} request={deactivateRequest} headerMsg='deactivateFtmPopup.headerMsg' descriptionMsg='deactivateFtmPopup.description' />
+                                          <DeactivatePopup closePopUp={closeDeactivatePopup} popupData={{ ...ftm, isDeactivateFtm: true }} request={deactivateRequest} headerMsg='deactivateFtmPopup.headerMsg' descriptionMsg='deactivateFtmPopup.description' />
                                         )}
                                       </div>
                                     )}
diff --git a/pmp-reactjs-ui/src/pages/policies/PoliciesList.js b/pmp-reactjs-ui/src/pages/policies/PoliciesList.js
index 8cedd14dc..f8a26f1d6 100644
--- a/pmp-reactjs-ui/src/pages/policies/PoliciesList.js
+++ b/pmp-reactjs-ui/src/pages/policies/PoliciesList.js
@@ -146,11 +146,7 @@ function PoliciesList() {
       {dataLoaded && (
         <>
           {errorMsg && (
-            <div className={`flex justify-end max-w-7xl mb-5 absolute ${isLoginLanguageRTL ? "left-0" : "right-2"}`}>
-              <div className="flex justify-between items-center max-w-[35rem] min-h-14 min-w-72 bg-[#C61818] rounded-xl p-3 z-10">
-                <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
-              </div>
-            </div>
+            <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}/>
           )}
           <div className="flex-col mt-7">
             <div className="flex justify-between mb-3">
@@ -236,11 +232,11 @@ function PoliciesList() {
                                 </td>
                                 <td className="text-center">
                                   <div ref={el => submenuRef.current[index] = el}>
-                                    <p onClick={() => setViewPolicyId(index === viewPolicyId ? null : index)} className={`${isLoginLanguageRTL ? "ml-9" : "mr-9"} font-semibold mb-0.5 cursor-pointer`} tabIndex="0" onKeyPress={(e)=> onPressEnterKey(e, () => setViewPolicyId(index === viewPolicyId ? null : index))}>
+                                    <p onClick={() => setViewPolicyId(index === viewPolicyId ? null : index)} className={`${isLoginLanguageRTL ? "ml-9" : "mr-9"} font-semibold mb-0.5 cursor-pointer`} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e, () => setViewPolicyId(index === viewPolicyId ? null : index))}>
                                       ...</p>
                                     {
                                       viewPolicyId === index && (
-                                        <div onClick={() => showViewPolicyDetails(partner)} tabIndex="0" onKeyPress={(e)=> onPressEnterKey(e, () => showViewPolicyDetails(partner))}
+                                        <div onClick={() => showViewPolicyDetails(partner)} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e, () => showViewPolicyDetails(partner))}
                                           className={`absolute border bg-white text-xs font-semibold rounded-md shadow-md w-fit p-2 z-20 items-center ${isLoginLanguageRTL ? "mr-16 left-[5.5rem] max-[800px]:left-20 max-[400px]:left-8 text-right" : "right-20 text-left"}`}>
                                           <p className="cursor-pointer">
                                             {t('policies.view')}
diff --git a/pmp-reactjs-ui/src/pages/policies/RequestPolicy.js b/pmp-reactjs-ui/src/pages/policies/RequestPolicy.js
index ddb2e7393..e6667b2df 100644
--- a/pmp-reactjs-ui/src/pages/policies/RequestPolicy.js
+++ b/pmp-reactjs-ui/src/pages/policies/RequestPolicy.js
@@ -246,11 +246,7 @@ function RequestPolicy() {
             {dataLoaded && (
                 <>
                     {errorMsg && (
-                        <div className={`flex justify-end items-center max-w-7xl absolute ${isLoginLanguageRTL ? "left-0" : "right-0"}`}>
-                            <div className="flex justify-between items-center max-w-[35rem] min-h-14 min-w-72 bg-[#C61818] rounded-xl p-3">
-                                <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
-                            </div>
-                        </div>
+                        <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
                     )}
                     <div className="flex-col mt-7">
                         <Title title='requestPolicy.requestPolicy' subTitle='requestPolicy.policies' backLink='/partnermanagement/policies/policiesList'></Title>