diff --git a/frontend/src/components/dialog/internal-link-dialog.js b/frontend/src/components/dialog/internal-link-dialog.js
index c353eafa35..a40bafeb4c 100644
--- a/frontend/src/components/dialog/internal-link-dialog.js
+++ b/frontend/src/components/dialog/internal-link-dialog.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { Fragment } from 'react';
 import { Button, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
 import PropTypes from 'prop-types';
 import toaster from '../toast';
@@ -60,8 +60,8 @@ class InternalLinkDialog extends React.Component {
 
   render() {
     return (
-      <span className={'file-internal-link'} title={gettext('Internal Link')}>
-        <i className="fa fa-link" onClick={this.getInternalLink}></i>
+      <Fragment>
+        <i title={gettext('Internal Link')} role="button" tabIndex="0" aria-label={gettext('Internal Link')} className="file-internal-link fa fa-link" onClick={this.getInternalLink}></i>
         <Modal isOpen={this.state.isOpen} toggle={this.toggle}>
           <ModalHeader toggle={this.toggle}>{gettext('Internal Link')}</ModalHeader>
           <ModalBody>
@@ -77,7 +77,7 @@ class InternalLinkDialog extends React.Component {
             <Button color="primary" onClick={this.copyToClipBoard}>{gettext('Copy')}</Button>
           </ModalFooter>
         </Modal>
-      </span>
+      </Fragment>
     );
   }
 }
diff --git a/frontend/src/components/file-view/file-info.js b/frontend/src/components/file-view/file-info.js
index 7a75478134..cfa6d98386 100644
--- a/frontend/src/components/file-view/file-info.js
+++ b/frontend/src/components/file-view/file-info.js
@@ -36,7 +36,8 @@ class FileInfo extends React.PureComponent {
           <a className={`file-star ${isStarred ? 'fa' : 'far'} fa-star`}
             href="#"
             title={starredText}
-            aria-label={starredText}
+            role="button"
+            aria-label={isStarred ? gettext('Unstar') : gettext('Star')}
             onClick={this.toggleStar}>
           </a>
           <InternalLinkDialog repoID={repoID} path={filePath} />
diff --git a/frontend/src/components/file-view/file-toolbar.js b/frontend/src/components/file-view/file-toolbar.js
index 3711432e76..f02e81bd80 100644
--- a/frontend/src/components/file-view/file-toolbar.js
+++ b/frontend/src/components/file-view/file-toolbar.js
@@ -194,11 +194,9 @@ class FileToolbar extends React.Component {
                 </DropdownItem>
               )}
               {filePerm == 'rw' && (
-                <DropdownItem>
-                  <a href={`${siteRoot}repo/file_revisions/${repoID}/?p=${encodeURIComponent(filePath)}&referer=${encodeURIComponent(location.href)}`} className="text-inherit">
+                  <a href={`${siteRoot}repo/file_revisions/${repoID}/?p=${encodeURIComponent(filePath)}&referer=${encodeURIComponent(location.href)}`} className="dropdown-item">
                     {gettext('History')}
                   </a>
-                </DropdownItem>
               )}
             </DropdownMenu>
           </ButtonDropdown>