diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.tsx
index 78888397da7..24394841c89 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.tsx
@@ -75,7 +75,7 @@ const PopoverContent: FC<Props> = ({
      * if on reply method is undefined then get the panel element
      * and scroll to the bottom
      */
-    if (isUndefined(onReply)) {
+    if (isUndefined(onReply) && isThread) {
       const feedPanel = document.getElementById('feed-panel') as HTMLElement;
       const threadPanel = document.getElementById(
         'thread-panel'
@@ -152,14 +152,16 @@ const PopoverContent: FC<Props> = ({
         </button>
       </Popover>
 
-      <button onClick={handleReply}>
-        <SVGIcons
-          alt="add-reply"
-          icon={Icons.ADD_REPLY}
-          title="Reply"
-          width="20px"
-        />
-      </button>
+      {(onReply || isThread) && (
+        <button onClick={handleReply}>
+          <SVGIcons
+            alt="add-reply"
+            icon={Icons.ADD_REPLY}
+            title="Reply"
+            width="20px"
+          />
+        </button>
+      )}
 
       {deleteButtonCheck ? (
         <button onClick={handleDelete}>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/ProfilePicture/ProfilePicture.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ProfilePicture/ProfilePicture.tsx
index 104297a6484..0b992e3faca 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/ProfilePicture/ProfilePicture.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ProfilePicture/ProfilePicture.tsx
@@ -90,7 +90,7 @@ const ProfilePicture = ({
 
   return profilePic ? (
     <div
-      className={classNames('profile-image', type)}
+      className={classNames('profile-image', type, className)}
       style={{ height: `${height || width}px`, width: `${width}px` }}>
       <img
         alt="user"