diff --git a/frontend/src/components/file-view/file-toolbar.js b/frontend/src/components/file-view/file-toolbar.js
index 68e80d9a47..215369f516 100644
--- a/frontend/src/components/file-view/file-toolbar.js
+++ b/frontend/src/components/file-view/file-toolbar.js
@@ -172,8 +172,8 @@ class FileToolbar extends React.Component {
         <Dropdown isOpen={this.state.dropdownOpen} toggle={this.toggle} className="d-block d-md-none">
           <ButtonGroup >
             {(canEditFile && !err) &&
-                ( this.props.isSaving ?
-                  <button type={'button'} className={'btn btn-icon btn-secondary btn-active'}>
+                (this.props.isSaving ?
+                  <button type={'button'} aria-label={gettext('Saving...')} className={'btn btn-icon btn-secondary btn-active'}>
                     <i className={'fa fa-spin fa-spinner'}/></button> :
                   (
                     this.props.needSave ?
@@ -192,7 +192,7 @@ class FileToolbar extends React.Component {
                 )}
           </ButtonGroup>
 
-          <DropdownToggle className="sf2-icon-more mx-1">
+          <DropdownToggle className="sf2-icon-more mx-1" aria-label={gettext('More Operations')}>
           </DropdownToggle>
           <DropdownMenu right={true}>
             <DropdownItem>
diff --git a/frontend/src/components/toolbar/markdown-viewer-toolbar.js b/frontend/src/components/toolbar/markdown-viewer-toolbar.js
index c97d4eacf4..ac4a17f6a8 100644
--- a/frontend/src/components/toolbar/markdown-viewer-toolbar.js
+++ b/frontend/src/components/toolbar/markdown-viewer-toolbar.js
@@ -72,7 +72,7 @@ class MoreMenu extends React.PureComponent {
     const isSmall = this.props.isSmallScreen;
     return (
       <Dropdown isOpen={this.state.dropdownOpen} toggle={this.dropdownToggle} direction="down" className="mx-1">
-        <DropdownToggle id="moreButton">
+        <DropdownToggle id="moreButton" aria-label={gettext('More Operations')}>
           <i className="fa fa-ellipsis-v"/>
           <Tooltip toggle={this.tooltipToggle} delay={{show: 0, hide: 0}} target="moreButton" placement='bottom' isOpen={this.state.tooltipOpen}>{gettext('More')}
           </Tooltip>
@@ -179,11 +179,11 @@ class MarkdownViewerToolbar extends React.Component {
                   <IconButton id={'shareBtn'} text={gettext('Share')} icon={'fa fa-share-alt'}
                     onMouseDown={this.props.toggleShareLinkDialog}/>
                 }
-                { saving ?
-                  <button type={'button'} className={'btn btn-icon btn-secondary btn-active'}>
+                {saving ?
+                  <button type={'button'} aria-label={gettext('Saving...')} className={'btn btn-icon btn-secondary btn-active'}>
                     <i className={'fa fa-spin fa-spinner'}/></button>
                   :
-                  <IconButton text={gettext('Save')} id={'saveButton'} icon={'fa fa-save'}  disabled={!contentChanged}
+                  <IconButton text={gettext('Save')} id={'saveButton'} icon={'fa fa-save'} disabled={!contentChanged}
                     onMouseDown={window.seafileEditor && window.seafileEditor.onRichEditorSave} isActive={contentChanged}/>
                 }
                 {canDownloadFile && (
@@ -224,7 +224,7 @@ class MarkdownViewerToolbar extends React.Component {
             <div className="topbar-btn-container">
               <ButtonGroup>
                 {saving ?
-                  <button type={'button'} className={'btn btn-icon btn-secondary btn-active'}>
+                  <button type={'button'} aria-label={gettext('Saving...')} className={'btn btn-icon btn-secondary btn-active'}>
                     <i className={'fa fa-spin fa-spinner'}/></button>
                   :
                   <IconButton text={gettext('Save')} id={'saveButton'} icon={'fa fa-save'}  disabled={!contentChanged}