diff --git a/frontend/src/components/toolbar/dir-operation-toolbar.js b/frontend/src/components/toolbar/dir-operation-toolbar.js
index 7369ab124e..9a6cf592c6 100644
--- a/frontend/src/components/toolbar/dir-operation-toolbar.js
+++ b/frontend/src/components/toolbar/dir-operation-toolbar.js
@@ -82,6 +82,16 @@ class DirOperationToolbar extends React.Component {
     });
   }
 
+  onUploadFile = (e) => {
+    this.setState({isUploadMenuShow: false});
+    this.props.onUploadFile(e);
+  }
+  
+  onUploadFolder = (e) => {
+    this.setState({isUploadMenuShow: false});
+    this.props.onUploadFolder(e);
+  }
+
   onCreateClick = (e) => {
     this.toggleOperationMenu(e);
     this.setState({
@@ -185,8 +195,8 @@ class DirOperationToolbar extends React.Component {
         </div>
         {this.state.isUploadMenuShow && (
           <ul className="menu dropdown-menu" style={this.state.operationMenuStyle}>
-            <li className="dropdown-item" onClick={this.props.onUploadFile}>{gettext('File Upload')}</li>
-            <li className="dropdown-item" onClick={this.props.onUploadFolder}>{gettext('Folder Upload')}</li>
+            <li className="dropdown-item" onClick={this.onUploadFile}>{gettext('File Upload')}</li>
+            <li className="dropdown-item" onClick={this.onUploadFolder}>{gettext('Folder Upload')}</li>
           </ul>
         )}
         {this.state.isCreateMenuShow && (
diff --git a/frontend/src/css/layout.css b/frontend/src/css/layout.css
index ca465be238..b57785c0b8 100644
--- a/frontend/src/css/layout.css
+++ b/frontend/src/css/layout.css
@@ -193,7 +193,7 @@
 .review .file-feature {
   width: 4.1875rem;
   height: 4.1875rem;
-  font-size: 2rem;
+  font-size: 3rem;
 }
 
 .review-state {
diff --git a/frontend/src/draft-review.js b/frontend/src/draft-review.js
index f49a40ef64..8bae0e96e5 100644
--- a/frontend/src/draft-review.js
+++ b/frontend/src/draft-review.js
@@ -504,7 +504,7 @@ class DraftReview extends React.Component {
         <div id="header" className="header review">
           <div className="cur-file-info">
             <div className="info-item file-feature">
-              <span className="fas fa-code-merge"></span>
+              <span className="sf2-icon-review"></span>
             </div>
             <div className="info-item file-info">
               <React.Fragment>
diff --git a/media/css/seahub_react.css b/media/css/seahub_react.css
index 5b3b96c508..d661f30cab 100644
--- a/media/css/seahub_react.css
+++ b/media/css/seahub_react.css
@@ -78,6 +78,7 @@
 .sf2-icon-user2:before { content:"\e020"; }
 .sf2-icon-grid-view:before { content:"\e025"; }
 .sf2-icon-list-view:before { content:"\e026"; }
+.sf2-icon-plus:before { content: "\e027"; }
 .sf2-icon-copy:before {content:"\e028"}
 .sf2-icon-move:before {content:"\e029"}
 .sf2-icon-reply:before { content:"\e02a"; }
@@ -87,7 +88,7 @@
 .sf2-icon-close:before { content:"\e035"; }
 .sf2-icon-two-columns:before { content:"\e036"; }
 .sf2-icon-tag:before {content:"\e037"}
-.sf2-icon-plus:before { content: "\e027"; }
+.sf2-icon-review:before {content:"\e038"}
 
 /* common class and element style*/
 a { color:#eb8205; }
diff --git a/media/css/sf_font2/seafile-font2.eot b/media/css/sf_font2/seafile-font2.eot
index 8d4c85d39b..720a99b9ad 100644
Binary files a/media/css/sf_font2/seafile-font2.eot and b/media/css/sf_font2/seafile-font2.eot differ
diff --git a/media/css/sf_font2/seafile-font2.svg b/media/css/sf_font2/seafile-font2.svg
index c0d547a2a3..b6c7f20b3b 100644
--- a/media/css/sf_font2/seafile-font2.svg
+++ b/media/css/sf_font2/seafile-font2.svg
@@ -63,4 +63,5 @@
 <glyph glyph-name="11" unicode="&#57398;" d="M149 64l0 320-128 0 0-320z m22 0l320 0 0 320-320 0z m-150 384l470 0c11 0 21-10 21-21l0-363c0-12-10-21-21-21l-470 0c-11 0-21 9-21 21l0 363c0 11 10 21 21 21z m22-128l85 0 0-21-85 0z m170 0l256 0 0-21-256 0z m-170-43l85 0 0-21-85 0z m0-42l85 0 0-22-85 0z m0-43l85 0 0-21-85 0z"/>
 <glyph glyph-name="untitled-font-3-18" unicode="&#57365;" d="M489 325l-63 21c-2 7-5 14-9 21l25 51c3 3 0 7-2 10l-47 46c-2 3-7 3-9 3l-51-26c-7 2-14 7-21 9l-19 54c0 2-4 4-7 4l-63 0c-4 0-7-2-7-4l-18-56c-7-2-14-5-21-9l-51 25c-3 3-7 3-10-2l-46-47c-3 0-3-4 0-7l25-51c-4-7-7-14-9-21l-53-18c-3 0-5-5-5-7l0-66c0-4 2-7 5-7l53-18c2-7 5-14 9-21l-25-51c-3-3 0-7 2-10l47-46c2-3 7-3 9-3l51 26c7-2 14-7 21-9l19-54c0-2 4-4 7-4l65 0c5 0 7 2 7 4l19 54c6 2 13 4 20 9l52-26c2-2 7 0 9 3l47 46c2 3 2 7 2 10l-26 51c3 7 7 14 10 21l53 18c2 0 5 5 5 7l2 66c0 2 0 2-2 4z m-72-81c-3 0-5-3-5-5-2-9-7-16-12-25-2-3-2-5 0-7l24-49-38-38-49 24c-2 2-4 0-7 0-9-5-16-10-25-12-2 0-5-2-5-5l-16-51-56 0-16 51c0 3-3 5-5 5-9 2-16 7-25 12-3 2-5 2-7 0l-49-24-38 38 24 49c2 2 0 4 0 7-5 9-10 16-12 25 0 2-2 5-5 5l-51 16 0 56 51 16c3 0 5 3 5 5 2 9 7 16 12 25 2 3 2 5 0 7l-24 49 38 38 49-24c2-2 4 0 7 0 9 5 16 10 25 12 2 0 5 2 5 5l16 51 54 0 16-51c0-3 2-5 5-5 9-2 16-7 25-12 2-2 5-2 7 0l49 24 37-38-23-49c-2-2 0-4 0-7 5-9 9-16 12-25 0-2 2-5 4-5l56-16 0-54m-184 135c-86 24-163-53-142-142 10-37 42-69 79-79 87-23 163 54 142 142-9 40-39 70-79 79z m-4-202c-73-21-140 46-119 119 7 32 35 60 67 67 75 21 142-46 121-121-9-30-37-58-69-65z m0 0"/>
 <glyph glyph-name="tag111" unicode="&#57399;" d="M278 100l150 151-200 200-146 7c-1 0-1 0-1 0-6-1-11-6-10-11l6-147z m-229 346c-1 17 13 32 31 33 1 0 2 0 3 0l154-7 222-221-181-181-222 221z m123-90c-12-12-33-12-45 0-13 13-13 33 0 45 12 13 33 13 45 0 12-12 12-32 0-45z m-15 15c4 4 4 11 0 15-4 5-11 5-15 0-4-4-4-11 0-15 4-4 11-4 15 0z"/>
+<glyph glyph-name="file-review" unicode="&#57400;" d="M256 107l0-22-139 0c-17 0-32 15-32 32l0 319c0 18 15 32 32 32l278 0c17 0 32-14 32-32l0-201-22 0 0 201c0 6-4 11-10 11l-278 0c-6 0-10-5-10-11l0-319c0-6 4-10 10-10z m-107 256l0 21 214 0 0-21z m0-64l0 21 214 0 0-21z m0-64l0 21 214 0 0-21z m0-64l0 21 128 0 0-21z m235-96c37 0 70 21 86 53-16 32-49 53-86 53-37 0-70-21-86-53 16-32 49-53 86-53z m-108 57c19 43 61 71 108 71 47 0 89-28 108-71l1-4-1-4c-19-43-61-71-108-71-47 0-89 28-108 71l-1 4z m108-36c-18 0-32 14-32 32 0 18 14 32 32 32 18 0 32-14 32-32 0-18-14-32-32-32z m0 21c6 0 11 5 11 11 0 6-5 11-11 11-6 0-11-5-11-11 0-6 5-11 11-11z"/>
 </font></defs></svg>
diff --git a/media/css/sf_font2/seafile-font2.ttf b/media/css/sf_font2/seafile-font2.ttf
index 0ef79d89c1..e07fed0bba 100644
Binary files a/media/css/sf_font2/seafile-font2.ttf and b/media/css/sf_font2/seafile-font2.ttf differ
diff --git a/media/css/sf_font2/seafile-font2.woff b/media/css/sf_font2/seafile-font2.woff
index 4b2fc44526..0ed920ae3c 100644
Binary files a/media/css/sf_font2/seafile-font2.woff and b/media/css/sf_font2/seafile-font2.woff differ