diff --git a/ts/components/ReactionPickerPicker.dom.tsx b/ts/components/ReactionPickerPicker.dom.tsx
index abd14c72355..b1b22e55e5d 100644
--- a/ts/components/ReactionPickerPicker.dom.tsx
+++ b/ts/components/ReactionPickerPicker.dom.tsx
@@ -35,19 +35,21 @@ export const ReactionPickerPickerEmojiButton = forwardRef<
     return null;
   }
 
+  const label = title ?? emoji;
+
   return (
     <Button
       ref={ref}
       className={classNames(
         'module-ReactionPickerPicker__button',
-        'module-ReactionPickerPicker__button--emoji',
-        isSelected && 'module-ReactionPickerPicker__button--selected'
+        isSelected && 'module-ReactionPickerPicker__button--is-selected'
       )}
       onPress={onClick}
+      aria-label={label}
+      aria-pressed={isSelected}
     >
       <FunStaticEmoji
-        role="img"
-        aria-label={title ?? ''}
+        role="presentation"
         size={48}
         emoji={emoji}
       />
diff --git a/ts/components/fun/panels/FunPanelEmojis.dom.tsx b/ts/components/fun/panels/FunPanelEmojis.dom.tsx
index 634038be810..88ef1c83b66 100644
--- a/ts/components/fun/panels/FunPanelEmojis.dom.tsx
+++ b/ts/components/fun/panels/FunPanelEmojis.dom.tsx
@@ -685,13 +685,17 @@ const Cell = memo(function Cell(props: CellProps): JSX.Element {
         <FunItemButton
           ref={popoverTriggerRef}
           excludeFromTabOrder={!props.isTabbable}
-          aria-label={emojiDisplayLabel}
+          aria-label={emoji}
           onClick={handleClick}
-          onLongPress={handleLongPress}
+          {...(emojiHasSkinToneVariants
+            ? {
+                onLongPress: handleLongPress,
+                longPressAccessibilityDescription: i18n(
+                  'icu:FunPanelEmojis__SkinTonePicker__LongPressAccessibilityDescription'
+                ),
+              }
+            : {})}
           onContextMenu={handleContextMenu}
-          longPressAccessibilityDescription={i18n(
-            'icu:FunPanelEmojis__SkinTonePicker__LongPressAccessibilityDescription'
-          )}
         >
           <FunStaticEmoji role="presentation" size={32} emoji={emoji} />
         </FunItemButton>