diff --git a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
index 2ee2a44c1f3a6..59640343a7e78 100644
--- a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
+++ b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
@@ -174,7 +174,10 @@ const CreateDiscussion = ({
 						<Controller
 							name='name'
 							control={control}
-							rules={{ required: t('Required_field', { field: t('Name') }) }}
+							rules={{ 
+								required: t('Required_field', { field: t('Name') }),
+								validate: (value) => value.trim().length > 0 || t('Required_field', { field: t('Name') })
+							}}
 							render={({ field }) => (
 								<TextInput
 									id={discussionNameId}
diff --git a/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx b/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
index b88acc2781335..15a85e403b554 100644
--- a/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
+++ b/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
@@ -111,7 +111,7 @@ function UserAvatarEditor({ currentUsername, username, setAvatarObj, name, disab
 					<TextInput
 						id={imageUrlField}
 						flexGrow={0}
-						placeholder={t('Use_url_for_avatar')}
+						placeholder="https://example.com/avatar.png"
 						value={avatarFromUrl}
 						mis={4}
 						onChange={handleAvatarFromUrlChange}
diff --git a/packages/ui-client/src/components/GenericMenu/GenericMenuItem.tsx b/packages/ui-client/src/components/GenericMenu/GenericMenuItem.tsx
index dcf6043d5a23c..e948ef7c2cb95 100644
--- a/packages/ui-client/src/components/GenericMenu/GenericMenuItem.tsx
+++ b/packages/ui-client/src/components/GenericMenu/GenericMenuItem.tsx
@@ -1,4 +1,4 @@
-import { MenuItemColumn, MenuItemContent, MenuItemIcon, MenuItemInput } from '@rocket.chat/fuselage';
+import { Box, MenuItemColumn, MenuItemContent, MenuItemIcon, MenuItemInput } from '@rocket.chat/fuselage'; // 1. Added Box import
 import type { ComponentProps, MouseEvent, ReactNode } from 'react';
 
 export type GenericMenuItemProps = {
@@ -17,13 +17,18 @@ export type GenericMenuItemProps = {
 };
 
 const GenericMenuItem = ({ icon, iconColor, content, addon, status, gap, tooltip }: GenericMenuItemProps) => (
-	<>
-		{gap && <MenuItemColumn />}
-		{icon && <MenuItemIcon name={icon} color={iconColor} />}
-		{status && <MenuItemColumn>{status}</MenuItemColumn>}
-		{content && <MenuItemContent title={tooltip}>{content}</MenuItemContent>}
-		{addon && <MenuItemInput>{addon}</MenuItemInput>}
-	</>
+    <>
+        {gap && <MenuItemColumn />}
+        {/* 2. Wrap the icon in a flexbox container */}
+        {icon && (
+            <Box display='flex' alignItems='center' justifyContent='center' width='x20'>
+                <MenuItemIcon name={icon} color={iconColor} />
+            </Box>
+        )}
+        {status && <MenuItemColumn>{status}</MenuItemColumn>}
+        {content && <MenuItemContent title={tooltip}>{content}</MenuItemContent>}
+        {addon && <MenuItemInput>{addon}</MenuItemInput>}
+    </>
 );
 
-export default GenericMenuItem;
+export default GenericMenuItem;
\ No newline at end of file