diff --git a/pmp-revamp-ui/src/pages/admin/authenticationServices/ViewAdminOidcClientDetails.js b/pmp-revamp-ui/src/pages/admin/authenticationServices/ViewAdminOidcClientDetails.js
index d957f359..ae2436ee 100644
--- a/pmp-revamp-ui/src/pages/admin/authenticationServices/ViewAdminOidcClientDetails.js
+++ b/pmp-revamp-ui/src/pages/admin/authenticationServices/ViewAdminOidcClientDetails.js
@@ -123,14 +123,12 @@ function ViewAdminOidcClientDetails() {
                                     <div role='button' id="oidc_client_details_copy_id" className={`${oidcClientDetails.status === "ACTIVE" ? 'bg-[#F0F5FF] border-[#BED3FF] cursor-pointer hover:shadow-md' : 'bg-gray-200 border-gray-400'}  border h-[4%] w-[15%] max-[450px]:w-[40%] max-[800px]:w-[25%] ${isLoginLanguageRTL ? "pr-[3%] pl-[1.5%]" : "pl-[3%] pr-[1%]"} py-[0.5%] rounded-md text-right`}
                                         tabIndex={oidcClientDetails.status === "ACTIVE" && "0"} onKeyDown={(e) => onPressEnterKey(e, () => copyClientId(selectedClientData, selectedClientData.clientId, setCopied))}>
                                         <p className="text-sm font-semibold text-[#333333]">{t('viewOidcClientDetails.oidcClientId')}</p>
-                                        <div className="flex space-x-1 items-center">
+                                        <div id="oidc_client_details_copy_id_button" onClick={() => copyClientId(selectedClientData, selectedClientData.clientId, setCopied)} className="flex space-x-1 items-center">
                                             <p className={`text-md font-bold ${selectedClientData.status === "ACTIVE" ? 'text-[#1447B2]' : 'text-gray-400'} truncate`}>
                                                 {selectedClientData.clientId}
                                             </p>
                                             {selectedClientData.status === "ACTIVE" ? (
-                                                <button id="oidc_client_details_copy_id_button" onClick={() => copyClientId(selectedClientData, selectedClientData.clientId, setCopied)}>
-                                                    <img src={content_copy_icon} alt="" />
-                                                </button>
+                                                <img src={content_copy_icon} alt="" />
                                             ) : (
                                                 <img src={disabled_copy_icon} alt="" />
                                             )}
diff --git a/pmp-revamp-ui/src/pages/admin/deviceProviderServices/DeviceProviderServicesTab.js b/pmp-revamp-ui/src/pages/admin/deviceProviderServices/DeviceProviderServicesTab.js
index ffc064de..93221543 100644
--- a/pmp-revamp-ui/src/pages/admin/deviceProviderServices/DeviceProviderServicesTab.js
+++ b/pmp-revamp-ui/src/pages/admin/deviceProviderServices/DeviceProviderServicesTab.js
@@ -18,16 +18,18 @@ function DeviceProviderServiceTab({ activeSbi, sbiListPath, activeDevice, device
     return (
         <div className='flex text-xs bg-[#FCFCFC] font-bold space-x-16 items-start rounded-lg px-[1.5%] pt-[2%]'>
             <div className={`flex-col items-center`}>
-                <button id='sbi_tab' onClick={changeToSbi} className={`${activeSbi ? "text-[#1447b2]" : "text-[#031640]"} mb-[0.6rem] cursor-pointer text-sm`}>
+                <div role='button' id='sbi_tab' onClick={changeToSbi} className={`${activeSbi ? "text-[#1447b2]" : "text-[#031640]"} mb-[0.6rem] cursor-pointer text-sm text-center`}
+                    tabIndex="0" onKeyDown={(e) => onPressEnterKey(e, changeToSbi)}>
                     <h6> {t('deviceProviderServices.sbiDetails')} </h6>
-                </button>
+                </div>
 
                 <div className={`h-1 w-20 ${activeSbi ? "bg-tory-blue" : "bg-transparent"}  rounded-t-md`}></div>
             </div>
             <div className={`flex-col justify-center`}>
-                <button id='devices_tab' onClick={changeToDevice} className={`${activeDevice ? "text-[#1447b2]" : "text-[#031640]"} mb-[12%] cursor-pointer text-sm text-center`}>
+                <div role='button' id='devices_tab' onClick={changeToDevice} className={`${activeDevice ? "text-[#1447b2]" : "text-[#031640]"} mb-[12%] cursor-pointer text-sm text-center`}
+                    tabIndex="0" onKeyDown={(e) => onPressEnterKey(e, changeToDevice)}>
                     <h6> {t('deviceProviderServices.deviceDetails')} </h6>
-                </button>
+                </div>
 
                 <div className={`h-1 w-20 ${activeDevice ? "bg-tory-blue" : "bg-transparent"} rounded-t-md`}></div>
             </div>
diff --git a/pmp-revamp-ui/src/pages/partner/authenticationServices/ViewOidcClientDetails.js b/pmp-revamp-ui/src/pages/partner/authenticationServices/ViewOidcClientDetails.js
index f0e6b4b3..f15d75f9 100644
--- a/pmp-revamp-ui/src/pages/partner/authenticationServices/ViewOidcClientDetails.js
+++ b/pmp-revamp-ui/src/pages/partner/authenticationServices/ViewOidcClientDetails.js
@@ -68,14 +68,12 @@ function ViewOidcClientDetails() {
                         <div role='button' id="oidc_client_details_copy_id" className={`${oidcClientDetails.status === "ACTIVE" ? 'bg-[#F0F5FF] border-[#BED3FF] cursor-pointer hover:shadow-md' : 'bg-gray-200 border-gray-400'}  border h-[4%] w-[15%] max-[450px]:w-[40%] max-[800px]:w-[25%] ${isLoginLanguageRTL ? "pr-[3%] pl-[1.5%]" : "pl-[3%] pr-[1%]"} py-[0.5%] rounded-md text-right`}
                             tabIndex="0" onKeyDown={(e) => onPressEnterKey(e, () => copyClientId(oidcClientDetails, oidcClientDetails.clientId, setCopied))}>
                             <p className="text-sm font-semibold text-[#333333]">{t('viewOidcClientDetails.oidcClientId')}</p>
-                            <div className="flex space-x-1 items-center">
+                            <div role="button" id="oidc_client_details_copy_id_icon" onClick={() => copyClientId(oidcClientDetails, oidcClientDetails.clientId, setCopied)} className="flex space-x-1 items-center">
                                 <p className={`text-md font-bold ${oidcClientDetails.status === "ACTIVE" ? 'text-[#1447B2]' : 'text-gray-400'} truncate`}>
                                     {oidcClientDetails.clientId}
                                 </p>
                                 {oidcClientDetails.status === "ACTIVE" ? (
-                                    <button id="oidc_client_details_copy_id_icon" onClick={() => copyClientId(oidcClientDetails, oidcClientDetails.clientId, setCopied)} >
-                                        <img  src={content_copy_icon} alt="" />
-                                    </button>
+                                    <img src={content_copy_icon} alt="" />
                                 ) : (
                                     <img src={disabled_copy_icon} alt="" />
                                 )}
diff --git a/pmp-revamp-ui/src/svg/content_copy_icon.svg b/pmp-revamp-ui/src/svg/content_copy_icon.svg
index 9b90b236..66e738b8 100644
--- a/pmp-revamp-ui/src/svg/content_copy_icon.svg
+++ b/pmp-revamp-ui/src/svg/content_copy_icon.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="57.808" height="60.481" viewBox="0 0 13.808 16.481">
+<svg xmlns="http://www.w3.org/2000/svg" width="13.808" height="16.481" viewBox="0 0 13.808 16.481">
   <path id="content_copy_FILL0_wght300_GRAD0_opsz24" d="M154.728-846.637a1.555,1.555,0,0,1-1.143-.468,1.555,1.555,0,0,1-.468-1.143V-858.39a1.554,1.554,0,0,1,.468-1.143,1.554,1.554,0,0,1,1.143-.468H162.2a1.554,1.554,0,0,1,1.143.468,1.555,1.555,0,0,1,.468,1.143v10.142a1.555,1.555,0,0,1-.468,1.143,1.555,1.555,0,0,1-1.143.468Zm0-1.336H162.2a.261.261,0,0,0,.188-.086.261.261,0,0,0,.086-.188V-858.39a.261.261,0,0,0-.086-.188.261.261,0,0,0-.188-.086h-7.469a.261.261,0,0,0-.188.086.261.261,0,0,0-.086.188v10.142a.261.261,0,0,0,.086.188A.261.261,0,0,0,154.728-847.974Zm-3.118,4.454a1.555,1.555,0,0,1-1.143-.468A1.555,1.555,0,0,1,150-845.13v-11.478h1.336v11.478a.261.261,0,0,0,.086.188.261.261,0,0,0,.188.086h8.806v1.336Zm2.844-4.454v0Z" transform="translate(-150 860)" fill="#1447b2"/>
 </svg>