diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp
index f90c5aa6e..001886b6d 100644
--- a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp
@@ -60,7 +60,7 @@
                                                 key="labels.handler_name"/></label>
                                         <div class="col-sm-10">
                                             <la:errors property="handlerName"/>
-                                            <la:select styleId="handlerName" property="handlerName" size="1"
+                                            <la:select styleId="handlerName" property="handlerName"
                                                        styleClass="form-control">
                                                 <la:option value=""/>
                                                 <c:forEach var="hn" varStatus="s"
diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_edit.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_edit.jsp
index 95038a7df..3c0cd520c 100644
--- a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_edit.jsp
@@ -66,7 +66,7 @@
                                             key="labels.handler_name"/></label>
                                     <div class="col-sm-9">
                                         <la:errors property="handlerName"/>
-                                        <la:select styleId="handlerName" property="handlerName" size="1"
+                                        <la:select styleId="handlerName" property="handlerName"
                                                    styleClass="form-control">
                                             <c:forEach var="hn" varStatus="s"
                                                        items="${handlerNameItems}">
diff --git a/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp b/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp
index 29da51048..4813e3d80 100644
--- a/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp
@@ -117,7 +117,7 @@
                                 <button type="submit" class="btn btn-primary"
                                         name="reloadDocIndex"
                                         value="<la:message key="labels.reload_doc_index_button"/>">
-                                    <em class="fa fa-arrow-circle-right"></em>
+                                    <em class="fa fa-sync"></em>
                                     <la:message key="labels.reload_doc_index_button"/>
                                 </button>
                             </div>
@@ -137,7 +137,7 @@
                                 <button type="submit" class="btn btn-danger"
                                         name="clearCrawlerIndex"
                                         value="<la:message key="labels.clear_crawler_index_button"/>">
-                                    <em class="fa fa-arrow-circle-right"></em>
+                                    <em class="fa fa-trash"></em>
                                     <la:message key="labels.clear_crawler_index_button"/>
                                 </button>
                             </div>
@@ -158,7 +158,7 @@
                             <button type="submit" class="btn btn-primary"
                                     name="downloadLogs"
                                     value="<la:message key="labels.download_diagnostic_logs_button"/>">
-                                <em class="fa fa-arrow-circle-right"></em>
+                                <em class="fa fa-download"></em>
                                 <la:message key="labels.download_diagnostic_logs_button"/>
                             </button>
                         </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/storage/admin_storage.jsp b/src/main/webapp/WEB-INF/view/admin/storage/admin_storage.jsp
index fe0a267cc..2cd2dbfb9 100644
--- a/src/main/webapp/WEB-INF/view/admin/storage/admin_storage.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/storage/admin_storage.jsp
@@ -50,6 +50,7 @@
 								<div class="card-tools">
                                     <a class="btn btn-success btn-xs" data-toggle="modal" data-target="#uploadeFile" href="#">
                                         <em class="fa fa-upload" aria-hidden="true"></em>
+                                        <la:message key="labels.storage_button_upload"/>
                                     </a>
                                 </div>
                             </c:if>
diff --git a/src/main/webapp/WEB-INF/view/common/admin/header.jsp b/src/main/webapp/WEB-INF/view/common/admin/header.jsp
index a3939528d..96f314ac3 100644
--- a/src/main/webapp/WEB-INF/view/common/admin/header.jsp
+++ b/src/main/webapp/WEB-INF/view/common/admin/header.jsp
@@ -17,12 +17,12 @@
 		<c:if test="${eoled}">
 		<li class="nav-item" data-toggle="tooltip" data-placement="left" title="<la:message
 			key="labels.eol_error" />">
-			<a class="nav-link active" href="${eolLink}" target="_olh"><em class="fas fa-times-circle" style="color:yellow;"></em></a></li>
+			<a class="nav-link active" href="${eolLink}" target="_olh"><em class="fas fa-times-circle text-warning"></em></a></li>
 		</c:if>
 		<c:if test="${developmentMode}">
 			<li class="nav-item" data-toggle="tooltip" data-placement="left" title="<la:message
 				key="labels.development_mode_warning" />">
-				<a  class="nav-link active" href="${installationLink}" target="_olh"><em class="fa fa-exclamation-triangle" style="color:yellow;"></em></a></li>
+				<a  class="nav-link active" href="${installationLink}" target="_olh"><em class="fa fa-exclamation-triangle text-warning"></em></a></li>
 		</c:if>
 		<li class="nav-item" ><a class="nav-link" href="${contextPath}/"><em class="fa fa-list-alt"></em></a></li>
 		<c:if test="${fe:permission('admin-scheduler')}">