diff --git a/app/containers/Avatar/index.tsx b/app/containers/Avatar/index.tsx
index 40ea31cc4..965639185 100644
--- a/app/containers/Avatar/index.tsx
+++ b/app/containers/Avatar/index.tsx
@@ -124,7 +124,7 @@ const AvatarContainer = ({
 				<Button
 					title={I18n.t('Edit')}
 					type='secondary'
-					backgroundColor={colors.passcodeButtonActive}
+					backgroundColor={colors.editAndUploadButtonAvatar}
 					onPress={handleEdit}
 					testID='avatar-edit-button'
 					style={styles.editAvatarButton}
diff --git a/app/lib/constants/colors.ts b/app/lib/constants/colors.ts
index 5e4ed5509..4ec5ece63 100644
--- a/app/lib/constants/colors.ts
+++ b/app/lib/constants/colors.ts
@@ -58,6 +58,7 @@ export const colors = {
 		buttonText: '#ffffff',
 		passcodeBackground: '#EEEFF1',
 		passcodeButtonActive: '#E4E7EA',
+		editAndUploadButtonAvatar: '#E4E7EA',
 		passcodeLockIcon: '#6C727A',
 		passcodePrimary: '#2F343D',
 		passcodeSecondary: '#6C727A',
@@ -127,6 +128,7 @@ export const colors = {
 		buttonText: '#ffffff',
 		passcodeBackground: '#030C1B',
 		passcodeButtonActive: '#0B182C',
+		editAndUploadButtonAvatar: '#0B182C',
 		passcodeLockIcon: '#6C727A',
 		passcodePrimary: '#FFFFFF',
 		passcodeSecondary: '#CBCED1',
@@ -196,6 +198,7 @@ export const colors = {
 		buttonText: '#ffffff',
 		passcodeBackground: '#000000',
 		passcodeButtonActive: '#0E0D0D',
+		editAndUploadButtonAvatar: '#0E0D0D',
 		passcodeLockIcon: '#6C727A',
 		passcodePrimary: '#FFFFFF',
 		passcodeSecondary: '#CBCED1',
diff --git a/app/views/ChangeAvatarView/AvatarSuggestion.tsx b/app/views/ChangeAvatarView/AvatarSuggestion.tsx
index cf7d9b31e..6e4fd70fd 100644
--- a/app/views/ChangeAvatarView/AvatarSuggestion.tsx
+++ b/app/views/ChangeAvatarView/AvatarSuggestion.tsx
@@ -42,7 +42,9 @@ const AvatarSuggestion = ({
 	resetAvatar?: () => void;
 }) => {
 	const [avatarSuggestions, setAvatarSuggestions] = useState<IAvatar[]>([]);
-
+	
+	const { colors } = useTheme();
+	
 	const getAvatarSuggestion = async () => {
 		const result = await Services.getAvatarSuggestion();
 		const suggestions = Object.keys(result).map(service => {
@@ -63,7 +65,7 @@ const AvatarSuggestion = ({
 
 	return (
 		<View style={{ flex: 1 }}>
-			<Text style={styles.itemLabel}>{I18n.t('Images_uploaded')}</Text>
+			<Text style={[styles.itemLabel, { color: colors.titleText }]}>{I18n.t('Images_uploaded')}</Text>
 			<View style={styles.containerAvatarSuggestion}>
 				{user?.username && resetAvatar ? (
 					<Item text={`@${user.username}`} testID={`reset-avatar-suggestion`} onPress={resetAvatar} />
diff --git a/app/views/ChangeAvatarView/index.tsx b/app/views/ChangeAvatarView/index.tsx
index fdd8b04c8..62312cb79 100644
--- a/app/views/ChangeAvatarView/index.tsx
+++ b/app/views/ChangeAvatarView/index.tsx
@@ -165,7 +165,7 @@ const ChangeAvatarView = () => {
 						title={I18n.t('Upload_image')}
 						type='secondary'
 						disabled={saving}
-						backgroundColor={colors.chatComponentBackground}
+						backgroundColor={colors.editAndUploadButtonAvatar}
 						onPress={pickImage}
 						testID='change-avatar-view-logout-other-locations'
 					/>