From 4222382012e7b8175b35fd136cf9f3db472ea417 Mon Sep 17 00:00:00 2001
From: zeppi <jessopb@gmail.com>
Date: Tue, 12 Jul 2022 15:03:00 -0400
Subject: [PATCH] fix master conflicts

---
 .../common/form-components/form-field-area-advanced.jsx        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/component/common/form-components/form-field-area-advanced.jsx b/ui/component/common/form-components/form-field-area-advanced.jsx
index 04d21a1c4..71d0c347f 100644
--- a/ui/component/common/form-components/form-field-area-advanced.jsx
+++ b/ui/component/common/form-components/form-field-area-advanced.jsx
@@ -210,12 +210,11 @@ export class FormFieldAreaAdvanced extends React.PureComponent<Props> {
                   {...inputProps}
                 />
               )}
-
               <div className="form-field__textarea-info">
                 {!noEmojis && openEmoteMenu && (
                   <Button
                     type="alt"
-                    className="button--file-action"
+                    className="button--comment-icons"
                     title="Emotes"
                     onClick={openEmoteMenu}
                     icon={ICONS.EMOJI}