diff --git a/frontend/src/pages/PresetsManager/MessagesEditor.tsx b/frontend/src/pages/PresetsManager/MessagesEditor.tsx
index 48b2bcc..f2ec380 100644
--- a/frontend/src/pages/PresetsManager/MessagesEditor.tsx
+++ b/frontend/src/pages/PresetsManager/MessagesEditor.tsx
@@ -122,7 +122,7 @@ export const MessagesEditor: FC = observer(() => {
                             }}>
                             <Option value="user">{t('user')!}</Option>
                             <Option value="assistant">{t('assistant')!}</Option>
-                            <Option value="system">{t('system')!}</Option>
+                            {/* TODO <Option value="system">{t('system')!}</Option>*/}
                           </Dropdown>
                           <Textarea resize="vertical" className="grow" value={item.content}
                             style={{ minWidth: 0, borderRadius: 0 }}
diff --git a/frontend/src/pages/PresetsManager/PresetsButton.tsx b/frontend/src/pages/PresetsManager/PresetsButton.tsx
index 2fe1ec0..659c87a 100644
--- a/frontend/src/pages/PresetsManager/PresetsButton.tsx
+++ b/frontend/src/pages/PresetsManager/PresetsButton.tsx
@@ -248,10 +248,9 @@ export const ChatPresetEditor: FC<{
                     name: data.value
                   });
                 }} />
-                <ToolTipButton desc={!editingMessages ? t('Edit Messages') : t('Go Back')}
-                  icon={!editingMessages ? <Chat20Regular /> : <Dismiss20Regular />} onClick={() => {
+                <Button onClick={() => {
                   setEditingMessages(!editingMessages);
-                }} />
+                }}>{!editingMessages ? t('Edit Messages') : t('Go Back')}</Button>
               </div>
             } />
           {