diff --git a/frontend/src/components/common/account.js b/frontend/src/components/common/account.js
index 080712842b..e05c5ee7e2 100644
--- a/frontend/src/components/common/account.js
+++ b/frontend/src/components/common/account.js
@@ -129,7 +129,7 @@ class Account extends Component {
             </div>
             <div id="space-traffic">
               <div className="item">
-                <p>{gettext('Used')}: {this.state.quotaUsage} / {this.state.quotaTotal}</p>
+                <p>{gettext('Used:')}{' '}{this.state.quotaUsage} / {this.state.quotaTotal}</p>
                 <div id="quota-bar"><span id="quota-usage" className="usage" style={{width: this.state.usageRate}}></span></div>
               </div>
             </div>
diff --git a/frontend/src/components/dialog/list-taggedfiles-dialog.js b/frontend/src/components/dialog/list-taggedfiles-dialog.js
index 789808be04..8e86845418 100644
--- a/frontend/src/components/dialog/list-taggedfiles-dialog.js
+++ b/frontend/src/components/dialog/list-taggedfiles-dialog.js
@@ -50,8 +50,8 @@ class ListTaggedFilesDialog extends React.Component {
           {gettext('Tagged Files')}
         </ModalHeader>
         <ModalBody className="dialog-list-container">
-          <table>
-            <thead className="table-thead-hidden">
+          <table className="table-thead-hidden">
+            <thead>
               <tr>
                 <th width='50%' className="ellipsis">{gettext('Name')}</th>
                 <th width='25%'>{gettext('Size')}</th>
diff --git a/frontend/src/components/shared-repo-list-view/shared-repo-list-view.js b/frontend/src/components/shared-repo-list-view/shared-repo-list-view.js
index b340d166ea..fc5be35bd8 100644
--- a/frontend/src/components/shared-repo-list-view/shared-repo-list-view.js
+++ b/frontend/src/components/shared-repo-list-view/shared-repo-list-view.js
@@ -51,8 +51,8 @@ class SharedRepoListView extends React.Component {
   renderPCUI = () => {
     let isShowTableThread = this.props.isShowTableThread !== undefined ? this.props.isShowTableThread : true;
     return (
-      <table>
-        <thead className={isShowTableThread ? '' : 'table-thead-hidden'}>
+      <table className={isShowTableThread ? '' : 'table-thead-hidden'}>
+        <thead>
           <tr>
             <th width="4%"><span className="sr-only">{gettext("Library Type")}</span></th>
             <th width="40%">{gettext("Name")}
@@ -76,8 +76,8 @@ class SharedRepoListView extends React.Component {
   renderMobileUI = () => {
     let isShowTableThread = this.props.isShowTableThread !== undefined ? this.props.isShowTableThread : true;
     return (
-      <table>
-        <thead className={isShowTableThread ? '' : 'vh'}>
+      <table className={isShowTableThread ? '' : 'table-thead-hidden'}>
+        <thead>
           <tr>
             <th width="18%"><span className="sr-only">{gettext("Library Type")}</span></th>
             <th width="68%">
diff --git a/frontend/src/components/toolbar/groups-toolbar.js b/frontend/src/components/toolbar/groups-toolbar.js
index 2e0ee34315..1418444e57 100644
--- a/frontend/src/components/toolbar/groups-toolbar.js
+++ b/frontend/src/components/toolbar/groups-toolbar.js
@@ -24,7 +24,7 @@ class GroupsToolbar extends React.Component {
         <div className="cur-view-toolbar border-left-show">
           <div className="operation">
             <Button color="btn btn-secondary operation-item" onClick={this.props.toggleAddGroupModal}>
-              <i className="fas fa-plus-square action-icon"></i>{gettext("New Group")}
+              <i className="fas fa-plus-square text-secondary mr-1"></i>{gettext("New Group")}
             </Button>
           </div>
           <span title="Side Nav Menu" onClick={onShowSidePanel}
diff --git a/frontend/src/components/toolbar/repo-view-toobar.js b/frontend/src/components/toolbar/repo-view-toobar.js
index 001e3eb7a0..e991cf345f 100644
--- a/frontend/src/components/toolbar/repo-view-toobar.js
+++ b/frontend/src/components/toolbar/repo-view-toobar.js
@@ -42,8 +42,7 @@ class RepoViewToolbar extends React.Component {
           <span className="sf2-icon-menu side-nav-toggle hidden-md-up d-md-none" title="Side Nav Menu" onClick={this.props.onShowSidePanel}></span>
           <div className="operation">
             <button className="btn btn-secondary operation-item" title={gettext('New Library')} onClick={this.onCreateToggle}>
-              <i className="fas fa-plus-square action-icon"></i>
-              {gettext('New Library')}
+              <i className="fas fa-plus-square text-secondary mr-1"></i>{gettext('New Library')}
             </button>
             {this.props.libraryType !== 'group' && (
               <Dropdown isOpen={this.state.isOpen} toggle={this.toggleMore}>
diff --git a/frontend/src/pages/groups/group-view.js b/frontend/src/pages/groups/group-view.js
index c043b46e2f..2be30c750c 100644
--- a/frontend/src/pages/groups/group-view.js
+++ b/frontend/src/pages/groups/group-view.js
@@ -308,8 +308,7 @@ class GroupView extends React.Component {
             <span className="sf2-icon-menu side-nav-toggle hidden-md-up d-md-none" title="Side Nav Menu" onClick={this.props.onShowSidePanel}></span>
             <div className="operation">
               <button className="btn btn-secondary operation-item" title={gettext('New Library')} onClick={this.onCreateRepoToggle}>
-                <i className="fas fa-plus-square action-icon"></i>
-                {gettext('New Library')}
+                <i className="fas fa-plus-square text-secondary mr-1"></i>{gettext('New Library')}
               </button>
             </div>
           </div>
diff --git a/frontend/src/pages/shared-with-all/public-shared-view.js b/frontend/src/pages/shared-with-all/public-shared-view.js
index 1fe282703d..88d91f7a10 100644
--- a/frontend/src/pages/shared-with-all/public-shared-view.js
+++ b/frontend/src/pages/shared-with-all/public-shared-view.js
@@ -160,8 +160,7 @@ class PublicSharedView extends React.Component {
             <div className="operation">
               <Dropdown isOpen={this.state.isCreateMenuShow} toggle={this.onAddRepoToggle}>
                 <DropdownToggle className='btn btn-secondary operation-item'>
-                  <i className="fas fa-plus-square action-icon"></i>
-                  {gettext('Add Library')}
+                  <i className="fas fa-plus-square text-secondary mr-1"></i>{gettext('Add Library')}
                 </DropdownToggle>
                 <DropdownMenu>
                   <DropdownItem onClick={this.onSelectRepoToggle}>{gettext('Share existing libraries')}</DropdownItem>
diff --git a/frontend/src/pages/wikis/wikis.js b/frontend/src/pages/wikis/wikis.js
index 069591301e..b46a67bb22 100644
--- a/frontend/src/pages/wikis/wikis.js
+++ b/frontend/src/pages/wikis/wikis.js
@@ -123,16 +123,9 @@ class Wikis extends Component {
           <div className="cur-view-toolbar border-left-show">
             <span className="sf2-icon-menu side-nav-toggle hidden-md-up d-md-none" title="Side Nav Menu" onClick={this.props.onShowSidePanel}></span>
             <div className="operation">
-                <Dropdown tag="div" className="btn btn-secondary operation-item" isOpen={this.state.isShowAddWikiMenu} toggle={this.onMenuToggle}>
-                  <DropdownToggle 
-                    tag="i" 
-                    className="fa fa-plus-square action-icon" 
-                    title={gettext('More Operations')}
-                    data-toggle="dropdown" 
-                    aria-expanded={this.state.isShowAddWikiMenu}
-                    onClick={this.clickMenuToggle}
-                  >
-                    {' '}<span className="btn-secondary">{gettext('Add Wiki')}</span>
+                <Dropdown tag="div" isOpen={this.state.isShowAddWikiMenu} toggle={this.onMenuToggle}>
+                  <DropdownToggle className="btn btn-secondary operation-item">
+                    <i className="fa fa-plus-square text-secondary mr-1"></i>{gettext('Add Wiki')}
                   </DropdownToggle>
                   <DropdownMenu>
                     <DropdownItem onClick={this.onCreateToggle}>{gettext('New Wiki')}</DropdownItem>
diff --git a/media/css/seahub_react.css b/media/css/seahub_react.css
index 7f2fa75010..36ad31fb28 100644
--- a/media/css/seahub_react.css
+++ b/media/css/seahub_react.css
@@ -321,7 +321,6 @@ ul,ol,li {
 
 .action-icon,
 .attr-action-icon {
-    margin-right: 0.25rem;
     color:#888;
 }
 
@@ -822,11 +821,11 @@ table {
 
 table tr {
     height: 2.1875rem;
-    border-bottom: 1px solid #eee;
 }
 
 table th, table td {
     padding: 0.3125rem 0.1875rem;
+    border-bottom: 1px solid #eee;
 }
 
 table th {