diff --git a/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js b/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js
index 5bdbfc720e7af362efd1eb300249174163eba59d..db92b6daae320701dae726054443ad23ce8a40bb 100644
--- a/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js
@@ -115,7 +115,7 @@ CommentsAdminPanel.prototype.commentToTableRow = function (comment) {
   if (comment.isRemoved()) {
     remove = "YES (" + comment.getRemoveReason() + ")";
   } else {
-    remove = "<button name='removeComment' data='" + comment.getId() + "'>REMOVE</button>";
+    remove = "<button name='removeComment' data='" + comment.getId() + "'><i class='fa fa-trash-o' style='font-size:17px'></button>";
   }
 
   var author = comment.getAuthor();
diff --git a/frontend-js/src/main/js/gui/admin/ConfigurationAdminPanel.js b/frontend-js/src/main/js/gui/admin/ConfigurationAdminPanel.js
index c51164361b92a2c47c32a68ef0c2149a9541a42e..a1270d7f91f70dee80e668693a34439c0788ad0b 100644
--- a/frontend-js/src/main/js/gui/admin/ConfigurationAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/ConfigurationAdminPanel.js
@@ -120,6 +120,11 @@ ConfigurationAdminPanel.prototype.optionToTableRow = function (option, editable)
   var value = option.getValue();
   var row = [];
   var editOption;
+  var disabled = '';
+  if (!editable) {
+    disabled = " disabled ";
+  }
+
   if (option.getValueType() === "STRING" ||
     option.getValueType() === "INTEGER" ||
     option.getValueType() === "DOUBLE" ||
@@ -146,11 +151,7 @@ ConfigurationAdminPanel.prototype.optionToTableRow = function (option, editable)
   }
   row[0] = option.getCommonName();
   row[1] = editOption;
-  if (editable) {
-    row[2] = "<button name='saveOption' data='" + option.getType() + "'>SAVE</button>";
-  } else {
-    row[2] = "<button name='saveOption' data='" + option.getType() + "' disabled>SAVE</button>";
-  }
+  row[2] = "<button name='saveOption' data='" + option.getType() + "' " + disabled + "><i class='fa fa-save' style='font-size:17px'></i></button>";
   return row;
 };
 
diff --git a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
index 7a141871a673228b34f0115451c0cf8418b504f1..1f47623c5f05400b4a91b937e2d4a841b4fe23eb 100644
--- a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
+++ b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
@@ -643,7 +643,7 @@ EditProjectDialog.prototype.userToTableRow = function (user, columns) {
     }
   }
 
-  row.push("<button name='saveUser' data='" + login + "'>SAVE</button>");
+  row.push("<button name='saveUser' data='" + login + "'><i class=\"fa fa-save\" style=\"font-size:17px\"></i></button>");
 
   return row;
 };
@@ -700,8 +700,8 @@ EditProjectDialog.prototype.overlayToTableRow = function (overlay, users) {
   row[4] = defaultOverlayCheckbox;
   row[5] = creatorSelect;
   row[6] = downloadSourceButton;
-  row[7] = "<button name='saveOverlay' data='" + id + "'>SAVE</button>";
-  row[8] = "<button name='removeOverlay' data='" + id + "'>REMOVE</button>";
+  row[7] = "<button name='saveOverlay' data='" + id + "'><i class=\"fa fa-save\" style=\"font-size:17px\"></i></button>";
+  row[8] = "<button name='removeOverlay' data='" + id + "'><i class='fa fa-trash-o' style='font-size:17px'></button>";
 
   return row;
 };
@@ -725,7 +725,7 @@ EditProjectDialog.prototype.mapToTableRow = function (map, users) {
   row[2] = "<input name='defaultCenterX-" + id + "' value='" + centerX + "'/>";
   row[3] = "<input name='defaultCenterY-" + id + "' value='" + centerY + "'/>";
   row[4] = "<input name='defaultZoomLevel-" + id + "' value='" + zoomLevel + "'/>";
-  row[5] = "<button name='saveMap' data='" + id + "'>SAVE</button>";
+  row[5] = "<button name='saveMap' data='" + id + "'><i class=\"fa fa-save\" style=\"font-size:17px\"></i></button>";
 
   return row;
 };
diff --git a/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js b/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
index a9f3d27d3a3274887faa10744f5d054b7e436e5f..49977c5f06a91229d8a867b3ff31786c117f8d49 100644
--- a/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
@@ -181,8 +181,8 @@ MapsAdminPanel.prototype.projectToTableRow = function (project, row) {
   row[3] = organism;
   row[4] = status;
 
-  row[5] = "<button name='showEditDialog' data='" + project.getProjectId() + "'>EDIT</button>";
-  row[6] = "<button name='removeProject' data='" + project.getProjectId() + "'>REMOVE</button>";
+  row[5] = "<button name='showEditDialog' data='" + project.getProjectId() + "'><i class='fa fa-edit' style='font-size:17px'></i></button>";
+  row[6] = "<button name='removeProject' data='" + project.getProjectId() + "'><i class='fa fa-trash-o' style='font-size:17px'></button>";
 
   return row;
 };
diff --git a/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js b/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js
index 1ae7a08d5f71e2f38653b516fa16d5a59620934b..b046e0a9ec877bbc7cccb8608e58067adba008f1 100644
--- a/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js
@@ -235,8 +235,8 @@ UsersAdminPanel.prototype.userToTableRow = function (user, row) {
   row[1] = user.getName();
   row[2] = user.getSurname();
   row[3] = user.getEmail();
-  row[4] = "<button name='showEditDialog' data='" + user.getLogin() + "'>EDIT</button>";
-  row[5] = "<button name='removeUser' data='" + user.getLogin() + "'>REMOVE</button>";
+  row[4] = "<button name='showEditDialog' data='" + user.getLogin() + "'><i class='fa fa-edit' style='font-size:17px'></i></button>";
+  row[5] = "<button name='removeUser' data='" + user.getLogin() + "'><i class='fa fa-trash-o' style='font-size:17px'></i></button>";
 
   return row;
 };