diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.java
index cf866455e5e..2c1150cf855 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.java
@@ -23,19 +23,18 @@
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.data.column.ColumnMenuAction;
+import com.evolveum.midpoint.web.component.data.column.ColumnUtils;
 import com.evolveum.midpoint.web.component.menu.cog.ButtonInlineMenuItem;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItemAction;
 import com.evolveum.midpoint.web.page.admin.PageAdminObjectList;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.model.IModel;
 import org.jetbrains.annotations.NotNull;
 
+import javax.xml.namespace.QName;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -76,7 +75,7 @@ public FocusListInlineMenuHelper(@NotNull Class<F> objectClass, @NotNull PageBas
         this.focusListComponent = focusListComponent;
     }
 
-    public List<InlineMenuItem> createRowActions() {
+    public List<InlineMenuItem> createRowActions(Class<F> objectType) {
         List<InlineMenuItem> menu = new ArrayList<>();
         ButtonInlineMenuItem enableItem = new ButtonInlineMenuItem(parentPage.createStringResource("FocusListInlineMenuHelper.menu.enable")) {
             private static final long serialVersionUID = 1L;
@@ -99,7 +98,7 @@ public void onClick(AjaxRequestTarget target) {
 
             @Override
             public CompositedIconBuilder getIconCompositedBuilder(){
-                return getDefaultCompositedIconBuilder(GuiStyleConstants.CLASS_OBJECT_USER_ICON);
+                return getDefaultCompositedIconBuilder(getEnableActionDefaultIcon(objectType));
             }
 
             @Override
@@ -139,7 +138,7 @@ public IModel<String> getConfirmationMessageModel(){
 
             @Override
             public CompositedIconBuilder getIconCompositedBuilder(){
-                CompositedIconBuilder builder = getDefaultCompositedIconBuilder(GuiStyleConstants.CLASS_OBJECT_USER_ICON);
+                CompositedIconBuilder builder = getDefaultCompositedIconBuilder(getEnableActionDefaultIcon(objectType));
                 builder.appendLayerIcon(WebComponentUtil.createIconType(GuiStyleConstants.CLASS_BAN), IconCssStyle.BOTTOM_RIGHT_STYLE);
                 return builder;            }
 
@@ -207,6 +206,16 @@ public IModel<String> getConfirmationMessageModel(){
         return menu;
     }
 
+    private String getEnableActionDefaultIcon(Class<F> type){
+        String iconClass = "";
+        if (type.equals(RoleType.class)) {
+            iconClass = GuiStyleConstants.CLASS_OBJECT_ROLE_ICON;
+        } else if (type.equals(ServiceType.class)){
+            iconClass = GuiStyleConstants.CLASS_OBJECT_SERVICE_ICON;
+        }
+        return iconClass;
+    }
+
     public void deleteConfirmedPerformed(AjaxRequestTarget target, F selectedObject) {
         List<F> objects = getObjectsToActOn(target, selectedObject);
         if (objects.isEmpty()) {
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
index 4f66dc68808..1290dce31ff 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
@@ -73,7 +73,7 @@ protected IModel<String> getConfirmationMessageModel(ColumnMenuAction action, St
 
     @Override
     protected List<InlineMenuItem> createRowActions() {
-        return listInlineMenuHelper.createRowActions();
+        return listInlineMenuHelper.createRowActions(getType());
     }
 
     @Override
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java
index 66b199293ce..302798684ce 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java
@@ -84,7 +84,7 @@ protected List<IColumn<SelectableBean<ServiceType>, String>> initColumns() {
 
     @Override
     protected List<InlineMenuItem> createRowActions() {
-        return listInlineMenuHelper.createRowActions();
+        return listInlineMenuHelper.createRowActions(getType());
     }
 
     @Override