diff --git a/components/VC/MosipVCItem/MosipVCItemDetails.tsx b/components/VC/MosipVCItem/MosipVCItemDetails.tsx
index 29cd2e33df..014013ade8 100644
--- a/components/VC/MosipVCItem/MosipVCItemDetails.tsx
+++ b/components/VC/MosipVCItem/MosipVCItemDetails.tsx
@@ -21,7 +21,6 @@ import {
 } from '../../../types/VC/EsignetMosipVC/vc';
 import {WalletBindingResponse} from '../../../shared/cryptoutil/cryptoUtil';
 import {logoType} from '../../../machines/issuersMachine';
-import {getMaskedText} from '../../../shared/commonUtil';
 
 const getIssuerLogo = (isOpenId4VCI: boolean, issuerLogo: logoType) => {
   if (isOpenId4VCI) {
@@ -168,7 +167,7 @@ export const MosipVCItemDetails: React.FC<
                       weight="semibold"
                       size="smaller"
                       color={Theme.Colors.Details}>
-                      {getMaskedText(uin)}
+                      {uin}
                     </Text>
                   </Column>
                 ) : null}
@@ -187,7 +186,7 @@ export const MosipVCItemDetails: React.FC<
                       weight="semibold"
                       size="smaller"
                       color={Theme.Colors.Details}>
-                      {getMaskedText(vid)}
+                      {vid}
                     </Text>
                   </Column>
                 ) : null}
diff --git a/components/ui/themes/DefaultTheme.ts b/components/ui/themes/DefaultTheme.ts
index 4c26ec2289..f3de5e23ed 100644
--- a/components/ui/themes/DefaultTheme.ts
+++ b/components/ui/themes/DefaultTheme.ts
@@ -1,5 +1,5 @@
 /* eslint-disable sonarjs/no-duplicate-string */
-import {Dimensions, Platform, StyleSheet, ViewStyle} from 'react-native';
+import {Dimensions, StyleSheet, ViewStyle} from 'react-native';
 import {Spacing} from '../styleUtils';
 import {isIOS} from '../../../shared/constants';
 
@@ -524,7 +524,7 @@ export const DefaultTheme = {
       borderBottomColor: Colors.platinumGrey,
       borderBottomWidth: 1.3,
     },
-    downloadFabIcon: {
+    downloadFabIconContainer: {
       height: 70,
       width: 70,
       borderRadius: 200,
@@ -536,14 +536,14 @@ export const DefaultTheme = {
       bottom: Dimensions.get('window').width * 0.1,
       right: Dimensions.get('window').width * 0.1,
     },
-    fabIconNormal: {
+    downloadFabIconNormal: {
       borderRadius: 200,
       height: 70,
       width: 70,
       justifyContent: 'center',
       position: 'absolute',
     },
-    fabIconPressed: {
+    downloadFabIconPressed: {
       borderRadius: 200,
       height: 70,
       width: 70,
diff --git a/components/ui/themes/PurpleTheme.ts b/components/ui/themes/PurpleTheme.ts
index 39abfa84d2..6d6879037d 100644
--- a/components/ui/themes/PurpleTheme.ts
+++ b/components/ui/themes/PurpleTheme.ts
@@ -1,5 +1,5 @@
 /* eslint-disable sonarjs/no-duplicate-string */
-import {Dimensions, Platform, StyleSheet, ViewStyle} from 'react-native';
+import {Dimensions, StyleSheet, ViewStyle} from 'react-native';
 import {Spacing} from '../styleUtils';
 import {isIOS} from '../../../shared/constants';
 
@@ -526,7 +526,7 @@ export const PurpleTheme = {
       borderBottomColor: Colors.platinumGrey,
       borderBottomWidth: 1.3,
     },
-    downloadFabIcon: {
+    downloadFabIconContainer: {
       height: 70,
       width: 70,
       borderRadius: 200,
@@ -538,14 +538,14 @@ export const PurpleTheme = {
       bottom: Dimensions.get('window').width * 0.1,
       right: Dimensions.get('window').width * 0.1,
     },
-    fabIconNormal: {
+    downloadFabIconNormal: {
       borderRadius: 200,
       height: 70,
       width: 70,
       justifyContent: 'center',
       position: 'absolute',
     },
-    fabIconPressed: {
+    downloadFabIconPressed: {
       borderRadius: 200,
       height: 70,
       width: 70,
diff --git a/screens/Home/HomeScreen.tsx b/screens/Home/HomeScreen.tsx
index 4ac63cfef9..7345b0250a 100644
--- a/screens/Home/HomeScreen.tsx
+++ b/screens/Home/HomeScreen.tsx
@@ -44,13 +44,16 @@ export const HomeScreen: React.FC<HomeRouteProps> = props => {
     return (
       <LinearGradient
         colors={Theme.Colors.gradientBtn}
-        style={Theme.Styles.downloadFabIcon}>
+        style={Theme.Styles.downloadFabIconContainer}>
         <Pressable
           onPress={() => {
             controller.GOTO_ISSUERS();
           }}
+          testID="downloadIcon"
           style={({pressed}) =>
-            pressed ? Theme.Styles.fabIconPressed : Theme.Styles.fabIconNormal
+            pressed
+              ? Theme.Styles.downloadFabIconPressed
+              : Theme.Styles.downloadFabIconNormal
           }>
           {plusIcon}
         </Pressable>