diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/CheckFormGroup.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/CheckFormGroup.html
index 22ca67a196d..e742235e343 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/CheckFormGroup.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/CheckFormGroup.html
@@ -17,7 +17,10 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <label class="control-label" wicket:id="label"/>
+    <span class="control-label" wicket:id="labelContainer">
+        <label wicket:id="label"/>
+        <i wicket:id="tooltip"/>
+    </span>
 
     <div wicket:id="checkWrapper">
         <div class="checkbox">
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/CheckFormGroup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/CheckFormGroup.java
index 5c5a685bdf5..f3faa6f4204 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/CheckFormGroup.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/CheckFormGroup.java
@@ -17,12 +17,15 @@
 package com.evolveum.midpoint.web.component.form;
 
 import com.evolveum.midpoint.web.component.util.SimplePanel;
+import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
 
 /**
  * @author lazyman
@@ -31,20 +34,44 @@ public class CheckFormGroup extends SimplePanel<Boolean> {
 
     private static final String ID_CHECK = "check";
     private static final String ID_CHECK_WRAPPER = "checkWrapper";
+    private static final String ID_LABEL_CONTAINER = "labelContainer";
     private static final String ID_LABEL = "label";
+    private static final String ID_TOOLTIP = "tooltip";
 
     public CheckFormGroup(String id, IModel<Boolean> value, IModel<String> label, String labelSize, String textSize) {
+        this(id, value, label, null, labelSize, textSize);
+    }
+
+    public CheckFormGroup(String id, IModel<Boolean> value, IModel<String> label, String tooltipKey,
+                          String labelSize, String textSize) {
         super(id, value);
 
-        initLayout(label, labelSize, textSize);
+        initLayout(label, tooltipKey, labelSize, textSize);
     }
 
-    private void initLayout(IModel<String> label, String labelSize, String textSize) {
+    private void initLayout(IModel<String> label, final String tooltipKey, String labelSize, String textSize) {
+        WebMarkupContainer labelContainer = new WebMarkupContainer(ID_LABEL_CONTAINER);
+        add(labelContainer);
         Label l = new Label(ID_LABEL, label);
+
         if (StringUtils.isNotEmpty(labelSize)) {
-            l.add(AttributeAppender.prepend("class", labelSize));
+            labelContainer.add(AttributeAppender.prepend("class", labelSize));
         }
-        add(l);
+        labelContainer.add(l);
+
+        Label tooltipLabel = new Label(ID_TOOLTIP, new Model<>());
+        tooltipLabel.add(new AttributeAppender("data-original-title", getString(tooltipKey)));
+        tooltipLabel.add(new InfoTooltipBehavior());
+        tooltipLabel.add(new VisibleEnableBehaviour(){
+
+            @Override
+            public boolean isVisible() {
+                return tooltipKey != null;
+            }
+        });
+        tooltipLabel.setOutputMarkupId(true);
+        tooltipLabel.setOutputMarkupPlaceholderTag(true);
+        labelContainer.add(tooltipLabel);
 
         WebMarkupContainer checkWrapper = new WebMarkupContainer(ID_CHECK_WRAPPER);
         if (StringUtils.isNotEmpty(textSize)) {
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.html
index ed1e469c622..8603d4e0c32 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.html
@@ -17,7 +17,10 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <label class="control-label" wicket:id="label"/>
+    <span class="control-label" wicket:id="labelContainer">
+        <label wicket:id="label"/>
+        <i wicket:id="tooltip"/>
+    </span>
 
     <div wicket:id="selectWrapper">
         <select class="form-control input-sm" wicket:id="select" />
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
index 430716f1304..476f2e7d6b1 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
@@ -17,6 +17,8 @@
 package com.evolveum.midpoint.web.component.form;
 
 import com.evolveum.midpoint.web.component.util.SimplePanel;
+import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
@@ -26,6 +28,7 @@
 import org.apache.wicket.markup.html.form.IChoiceRenderer;
 import org.apache.wicket.markup.html.panel.FeedbackPanel;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
 
 import java.util.List;
 
@@ -36,23 +39,47 @@ public class DropDownFormGroup<T> extends SimplePanel<T> {
 
     private static final String ID_SELECT = "select";
     private static final String ID_SELECT_WRAPPER = "selectWrapper";
+    private static final String ID_LABEL_CONTAINER = "labelContainer";
     private static final String ID_LABEL = "label";
+    private static final String ID_TOOLTIP = "tooltip";
     private static final String ID_FEEDBACK = "feedback";
 
     public DropDownFormGroup(String id, IModel<T> value, IModel<List<T>> choices, IChoiceRenderer<T> renderer,
                              IModel<String> label, String labelSize, String textSize, boolean required) {
+        this(id, value, choices, renderer, label, null, labelSize, textSize, required);
+    }
+
+    public DropDownFormGroup(String id, IModel<T> value, IModel<List<T>> choices, IChoiceRenderer<T> renderer,
+                             IModel<String> label, String tooltipKey, String labelSize, String textSize, boolean required) {
         super(id, value);
 
-        initLayout(choices, renderer, label, labelSize, textSize, required);
+        initLayout(choices, renderer, label, tooltipKey, labelSize, textSize, required);
     }
 
-    private void initLayout(IModel<List<T>> choices, IChoiceRenderer<T> renderer, IModel<String> label,
+    private void initLayout(IModel<List<T>> choices, IChoiceRenderer<T> renderer, IModel<String> label, final String tooltipKey,
                             String labelSize, String textSize, boolean required) {
+        WebMarkupContainer labelContainer = new WebMarkupContainer(ID_LABEL_CONTAINER);
+        add(labelContainer);
+
         Label l = new Label(ID_LABEL, label);
         if (StringUtils.isNotEmpty(labelSize)) {
-            l.add(AttributeAppender.prepend("class", labelSize));
+            labelContainer.add(AttributeAppender.prepend("class", labelSize));
         }
-        add(l);
+        labelContainer.add(l);
+
+        Label tooltipLabel = new Label(ID_TOOLTIP, new Model<>());
+        tooltipLabel.add(new AttributeAppender("data-original-title", getString(tooltipKey)));
+        tooltipLabel.add(new InfoTooltipBehavior());
+        tooltipLabel.add(new VisibleEnableBehaviour(){
+
+            @Override
+            public boolean isVisible() {
+                return tooltipKey != null;
+            }
+        });
+        tooltipLabel.setOutputMarkupId(true);
+        tooltipLabel.setOutputMarkupPlaceholderTag(true);
+        labelContainer.add(tooltipLabel);
 
         WebMarkupContainer selectWrapper = new WebMarkupContainer(ID_SELECT_WRAPPER);
         if (StringUtils.isNotEmpty(textSize)) {
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextAreaFormGroup.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextAreaFormGroup.html
index 8c92f9522ba..c3834b9d805 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextAreaFormGroup.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextAreaFormGroup.html
@@ -17,7 +17,10 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <label class="control-label" wicket:id="label"/>
+    <span class="control-label" wicket:id="labelContainer">
+        <label wicket:id="label"/>
+        <i wicket:id="tooltip"/>
+    </span>
 
     <div wicket:id="textWrapper">
         <textarea class="form-control input-sm" rows="2" wicket:id="text"></textarea>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextAreaFormGroup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextAreaFormGroup.java
index 3c9e5834b1c..05f36648e2c 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextAreaFormGroup.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextAreaFormGroup.java
@@ -17,15 +17,16 @@
 package com.evolveum.midpoint.web.component.form;
 
 import com.evolveum.midpoint.web.component.util.SimplePanel;
+import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.RequiredTextField;
 import org.apache.wicket.markup.html.form.TextArea;
-import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
 
 /**
  * @author lazyman
@@ -34,7 +35,9 @@ public class TextAreaFormGroup extends SimplePanel<String> {
 
     private static final String ID_TEXT = "text";
     private static final String ID_TEXT_WRAPPER = "textWrapper";
+    private static final String ID_LABEL_CONTAINER = "labelContainer";
     private static final String ID_LABEL = "label";
+    private static final String ID_TOOLTIP = "tooltip";
 
     private static final int DEFAULT_NUMBER_OF_ROWS = 2;
 
@@ -49,17 +52,39 @@ public TextAreaFormGroup(String id, IModel<String> value, IModel<String> label,
 
     public TextAreaFormGroup(String id, IModel<String> value, IModel<String> label, String labelSize, String textSize,
                              boolean required, int rowNumber){
+        this(id, value, label, null, labelSize, textSize, required, rowNumber);
+    }
+
+    public TextAreaFormGroup(String id, IModel<String> value, IModel<String> label, String tooltipKey, String labelSize, String textSize,
+                             boolean required, int rowNumber){
         super(id, value);
 
-        initLayout(label, labelSize, textSize, required, rowNumber);
+        initLayout(label, tooltipKey, labelSize, textSize, required, rowNumber);
     }
 
-    private void initLayout(IModel<String> label, String labelSize, String textSize, boolean required, int rowNumber) {
+    private void initLayout(IModel<String> label, final String tooltipKey, String labelSize, String textSize, boolean required, int rowNumber) {
+        WebMarkupContainer labelContainer = new WebMarkupContainer(ID_LABEL_CONTAINER);
+        add(labelContainer);
+
         Label l = new Label(ID_LABEL, label);
         if (StringUtils.isNotEmpty(labelSize)) {
-            l.add(AttributeAppender.prepend("class", labelSize));
+            labelContainer.add(AttributeAppender.prepend("class", labelSize));
         }
-        add(l);
+        labelContainer.add(l);
+
+        Label tooltipLabel = new Label(ID_TOOLTIP, new Model<>());
+        tooltipLabel.add(new AttributeAppender("data-original-title", getString(tooltipKey)));
+        tooltipLabel.add(new InfoTooltipBehavior());
+        tooltipLabel.add(new VisibleEnableBehaviour(){
+
+            @Override
+            public boolean isVisible() {
+                return tooltipKey != null;
+            }
+        });
+        tooltipLabel.setOutputMarkupId(true);
+        tooltipLabel.setOutputMarkupPlaceholderTag(true);
+        labelContainer.add(tooltipLabel);
 
         WebMarkupContainer textWrapper = new WebMarkupContainer(ID_TEXT_WRAPPER);
         if (StringUtils.isNotEmpty(textSize)) {
@@ -67,7 +92,7 @@ private void initLayout(IModel<String> label, String labelSize, String textSize,
         }
         add(textWrapper);
 
-        TextArea text = new TextArea(ID_TEXT, getModel());
+        TextArea text = new TextArea<>(ID_TEXT, getModel());
         text.add(new AttributeModifier("rows", rowNumber));
         text.setOutputMarkupId(true);
         text.setRequired(required);
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextFormGroup.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextFormGroup.html
index b1df0214953..c89907e6621 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextFormGroup.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextFormGroup.html
@@ -17,7 +17,10 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <label class="control-label" wicket:id="label"/>
+    <span class="control-label" wicket:id="labelContainer">
+        <label wicket:id="label"/>
+        <i wicket:id="tooltip" />
+    </span>
 
     <div wicket:id="textWrapper">
         <input type="text" class="form-control input-sm" wicket:id="text">
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextFormGroup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextFormGroup.java
index 0ba9cf9361c..339667326c3 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextFormGroup.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextFormGroup.java
@@ -17,6 +17,8 @@
 package com.evolveum.midpoint.web.component.form;
 
 import com.evolveum.midpoint.web.component.util.SimplePanel;
+import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
@@ -25,6 +27,7 @@
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.panel.FeedbackPanel;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
 
 /**
  * @author lazyman
@@ -33,22 +36,46 @@ public class TextFormGroup extends SimplePanel<String> {
 
     private static final String ID_TEXT = "text";
     private static final String ID_TEXT_WRAPPER = "textWrapper";
+    private static final String ID_LABEL_CONTAINER = "labelContainer";
     private static final String ID_LABEL = "label";
+    private static final String ID_TOOLTIP = "tooltip";
     private static final String ID_FEEDBACK = "feedback";
 
     public TextFormGroup(String id, IModel<String> value, IModel<String> label, String labelSize, String textSize,
                          boolean required) {
+        this(id, value, label, null, labelSize, textSize, required);
+    }
+
+    public TextFormGroup(String id, IModel<String> value, IModel<String> label, String tooltipKey, String labelSize,
+                         String textSize, boolean required) {
         super(id, value);
 
-        initLayout(label, labelSize, textSize, required);
+        initLayout(label, tooltipKey, labelSize, textSize, required);
     }
 
-    private void initLayout(IModel<String> label, String labelSize, String textSize, boolean required) {
+    private void initLayout(IModel<String> label, final String tooltipKey, String labelSize, String textSize, boolean required) {
+        WebMarkupContainer labelContainer = new WebMarkupContainer(ID_LABEL_CONTAINER);
+        add(labelContainer);
+
         Label l = new Label(ID_LABEL, label);
         if (StringUtils.isNotEmpty(labelSize)) {
-            l.add(AttributeAppender.prepend("class", labelSize));
+            labelContainer.add(AttributeAppender.prepend("class", labelSize));
         }
-        add(l);
+        labelContainer.add(l);
+
+        Label tooltipLabel = new Label(ID_TOOLTIP, new Model<>());
+        tooltipLabel.add(new AttributeAppender("data-original-title", getString(tooltipKey)));
+        tooltipLabel.add(new InfoTooltipBehavior());
+        tooltipLabel.add(new VisibleEnableBehaviour(){
+
+            @Override
+            public boolean isVisible() {
+                return tooltipKey != null;
+            }
+        });
+        tooltipLabel.setOutputMarkupId(true);
+        tooltipLabel.setOutputMarkupPlaceholderTag(true);
+        labelContainer.add(tooltipLabel);
 
         WebMarkupContainer textWrapper = new WebMarkupContainer(ID_TEXT_WRAPPER);
         if (StringUtils.isNotEmpty(textSize)) {
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.html
index aa6a1b3ebf9..bd70a1dc157 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.html
@@ -21,6 +21,7 @@
     <dl class="dl-horizontal">
         <dt>
             <label wicket:id="typeLabel"></label>
+            <i wicket:id="typeTooltip" wicket:message="title:ResourceWizard.expression.tooltip.type"/>
         </dt>
         <dd>
             <select wicket:id="type" class="form-control input-sm"></select>
@@ -30,6 +31,7 @@
     <dl class="dl-horizontal" wicket:id="languageContainer">
         <dt>
             <label><wicket:message key="ExpressionEditorPanel.label.language" /></label>
+            <i wicket:id="languageTooltip" wicket:message="title:ResourceWizard.expression.tooltip.language"/>
         </dt>
         <dd>
             <select wicket:id="language" class="form-control input-sm"></select>
@@ -39,6 +41,7 @@
     <dl class="dl-horizontal" wicket:id="policyRefContainer">
         <dt>
             <label><wicket:message key="ExpressionEditorPanel.label.valuePolicyRef" /></label>
+            <i wicket:id="policyRefTooltip" wicket:message="title:ResourceWizard.expression.tooltip.policyRef"/>
         </dt>
         <dd>
             <select wicket:id="policyRef" class="form-control input-sm"></select>
@@ -48,6 +51,7 @@
     <dl class="dl-horizontal">
         <dt>
             <label wicket:id="expressionLabel"></label>
+            <i wicket:id="expressionTooltip" wicket:message="title:ResourceWizard.expression.tooltip.expression"/>
         </dt>
         <dd>
             <textarea wicket:id="expression" class="form-control input-sm" rows="5"></textarea>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java
index a7057a34987..62127a214a1 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java
@@ -28,13 +28,13 @@
 import com.evolveum.midpoint.web.component.util.SimplePanel;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.util.ExpressionUtil;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ExpressionType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ValuePolicyType;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -67,6 +67,10 @@ public class ExpressionEditorPanel extends SimplePanel<ExpressionType>{
     private static final String ID_BUTTON_UPDATE = "update";
     private static final String ID_LABEL_TYPE = "typeLabel";
     private static final String ID_LABEL_EXPRESSION = "expressionLabel";
+    private static final String ID_T_TYPE = "typeTooltip";
+    private static final String ID_T_LANGUAGE = "languageTooltip";
+    private static final String ID_T_POLICY = "policyRefTooltip";
+    private static final String ID_T_EXPRESSION = "expressionTooltip";
 
     private IModel<ExpressionTypeDto> model;
     private Map<String, String> policyMap = new HashMap<>();
@@ -200,6 +204,22 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
             }
         };
         add(update);
+
+        Label typeTooltip = new Label(ID_T_TYPE);
+        typeTooltip.add(new InfoTooltipBehavior());
+        add(typeTooltip);
+
+        Label languageTooltip = new Label(ID_T_LANGUAGE);
+        languageTooltip.add(new InfoTooltipBehavior());
+        languageContainer.add(languageTooltip);
+
+        Label policyTooltip = new Label(ID_T_POLICY);
+        policyTooltip.add(new InfoTooltipBehavior());
+        policyContainer.add(policyTooltip);
+
+        Label expressionTooltip = new Label(ID_T_EXPRESSION);
+        expressionTooltip.add(new InfoTooltipBehavior());
+        add(expressionTooltip);
     }
 
     private List<ObjectReferenceType> createPasswordPolicyList(){
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.html
index 6fbfa9a6b01..e240f8c8d2d 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.html
@@ -30,6 +30,7 @@
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="SearchFilterPanel.label.filterClause" /></label>
+            <i wicket:id="filterClauseTooltip" wicket:message="title:SchemaHandlingStep.tooltip.filterClause"/>
         </dt>
         <dd>
             <textarea wicket:id="filterClause" class="form-control input-sm" rows="10"></textarea>
@@ -41,7 +42,6 @@
             <label></label>
         </dt>
         <dd>
-            <!--TODO - enable this button when problem with SearchFilterType and RootXNode serialization is fixed-->
             <a wicket:id="update" class="btn btn-success">
                 <span><wicket:message key="SearchFilterPanel.button.update" /></span>
             </a>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.java
index 2779c34763f..95236922232 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.java
@@ -22,9 +22,11 @@
 import com.evolveum.midpoint.web.component.input.dto.SearchFilterTypeDto;
 import com.evolveum.midpoint.web.component.util.LoadableModel;
 import com.evolveum.midpoint.web.component.util.SimplePanel;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.prism.xml.ns._public.query_3.SearchFilterType;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
+import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.TextArea;
 import org.apache.wicket.model.IModel;
@@ -40,6 +42,7 @@ public class SearchFilterPanel<T extends SearchFilterType> extends SimplePanel<T
     private static final String ID_DESCRIPTION = "description";
     private static final String ID_FILTER_CLAUSE = "filterClause";
     private static final String ID_BUTTON_UPDATE = "update";
+    private static final String ID_T_CLAUSE = "filterClauseTooltip";
 
     protected IModel<SearchFilterTypeDto> model;
 
@@ -79,6 +82,10 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
             }
         };
         add(update);
+
+        Label clauseTooltip = new Label(ID_T_CLAUSE);
+        clauseTooltip.add(new InfoTooltipBehavior());
+        add(clauseTooltip);
     }
 
     private void updateClausePerformed(AjaxRequestTarget target){
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.html
index 017d1ce8796..1cd42fc5f12 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.html
@@ -19,26 +19,22 @@
 <body>
 <wicket:panel>
     <div wicket:id="contents">
-        <br/>
-        <table border="1">
+        <table class="table table-striped table-condensed table-bordered" style="width: auto;">
             <tr>
-                <th><b><wicket:message key="ProgressTableHeader.Activity"/></b></th>
-                <th><b><wicket:message key="ProgressTableHeader.Status"/></b></th>
-                <th><b><wicket:message key="ProgressTableHeader.ResourceObject"/></b></th>
+                <th><wicket:message key="ProgressTableHeader.Activity"/></th>
+                <th><wicket:message key="ProgressTableHeader.Status"/></th>
+                <th><wicket:message key="ProgressTableHeader.ResourceObject"/></th>
             </tr>
             <tr wicket:id="progressReportActivities">
-                <td><span wicket:id="description"></span></td>
+                <td><span wicket:id="description"/></td>
                 <td><i wicket:id="status"></i></td>
-                <td><span wicket:id="comment"></span></td>
+                <td><span wicket:id="comment"/></td>
             </tr>
         </table>
-        <br/>
         <span wicket:id="executionTime"/>
-        <br/>
         <span wicket:id="logItems">
             <span wicket:id="logItem">label</span><br/>
         </span>
-        <br/>
     </div>
 </wicket:panel>
 </body>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.properties b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.properties
index 54ab714af24..9e0f2351ea1 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.properties
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.properties
@@ -15,4 +15,141 @@
 #
 
 WizardStep.title=
-SchemaHandlingStep.message.validationError=Inserted objectClass value: '{0}' is not valid. Please provide valid objectClass value.
\ No newline at end of file
+SchemaHandlingStep.message.validationError=Inserted objectClass value: '{0}' is not valid. Please provide valid objectClass value.
+
+SchemaStep.tooltip.kind=Tooltip
+SchemaStep.tooltip.intent=Tooltip
+SchemaStep.tooltip.nativeObjectClass=Tooltip
+SchemaStep.tooltip.isDefault=Tooltip
+SchemaStep.tooltip.isKindDefault=Tooltip
+
+SchemaHandlingStep.tooltip.kind=Tooltip
+SchemaHandlingStep.tooltip.intent=Tooltip
+SchemaHandlingStep.tooltip.default=Tooltip
+SchemaHandlingStep.tooltip.dependency=Tooltip
+SchemaHandlingStep.tooltip.objectClass=Tooltip
+SchemaHandlingStep.tooltip.attributes=Tooltip
+SchemaHandlingStep.tooltip.associations=Tooltip
+SchemaHandlingStep.tooltip.assignmentPolicyRef=Tooltip
+SchemaHandlingStep.tooltip.iteration=Tooltip
+SchemaHandlingStep.tooltip.protected=Tooltip
+SchemaHandlingStep.tooltip.activation=Tooltip
+SchemaHandlingStep.tooltip.credentials=Tooltip
+
+SchemaHandlingStep.dependency.tooltip.order=Tooltip
+SchemaHandlingStep.dependency.tooltip.strictness=Tooltip
+SchemaHandlingStep.dependency.tooltip.kind=Tooltip
+SchemaHandlingStep.dependency.tooltip.intent=Tooltip
+SchemaHandlingStep.dependency.tooltip.resourceRef=Tooltip
+
+SchemaHandlingStep.attribute.tooltip.reference=Tooltip
+SchemaHandlingStep.attribute.tooltip.allow=Tooltip
+SchemaHandlingStep.attribute.tooltip.limitations=Tooltip
+SchemaHandlingStep.attribute.tooltip.exclusiveStrong=Tooltip
+SchemaHandlingStep.attribute.tooltip.tolerant=Tooltip
+SchemaHandlingStep.attribute.tooltip.tolerantVP=Tooltip
+SchemaHandlingStep.attribute.tooltip.intolerantVP=Tooltip
+SchemaHandlingStep.attribute.tooltip.fetchStrategy=Tooltip
+SchemaHandlingStep.attribute.tooltip.matchingRule=Tooltip
+SchemaHandlingStep.attribute.tooltip.outbound=Tooltip
+SchemaHandlingStep.attribute.tooltip.inbound=Tooltip
+
+SchemaHandlingStep.association.tooltip.intent=Tooltip
+SchemaHandlingStep.association.tooltip.direction=Tooltip
+SchemaHandlingStep.association.tooltip.associationAttribute=Tooltip
+SchemaHandlingStep.association.tooltip.valueAttribute=Tooltip
+SchemaHandlingStep.association.tooltip.kind=Tooltip
+SchemaHandlingStep.association.tooltip.explicitRefIntegrity=Tooltip
+
+SchemaHandlingStep.iteration.tooltip.maxIteration=Tooltip
+SchemaHandlingStep.iteration.tooltip.variable=Tooltip
+SchemaHandlingStep.iteration.tooltip.returnMultiplicity=Tooltip
+
+SchemaHandlingStep.activation.tooltip.fetchStrategy=Tooltip
+SchemaHandlingStep.activation.tooltip.outbound=Tooltip
+SchemaHandlingStep.activation.tooltip.inbound=Tooltip
+
+SchemaHandlingStep.credentials.tooltip.fetchStrategy=Tooltip
+SchemaHandlingStep.credentials.tooltip.outbound=Tooltip
+SchemaHandlingStep.credentials.tooltip.inbound=Tooltip
+SchemaHandlingStep.credentials.tooltip.passwordPolicyRef=Tooltip
+
+SchemaHandlingStep.protected.tooltip.name=Tooltip
+SchemaHandlingStep.protected.tooltip.uid=Tooltip
+SchemaHandlingStep.protected.tooltip.filter=Tooltip
+SchemaHandlingStep.tooltip.filterClause=Tooltip
+
+SchemaHandlingStep.limitations.tooltip.layers=Tooltip
+SchemaHandlingStep.limitations.tooltip.propertyAccess=Tooltip
+SchemaHandlingStep.limitations.tooltip.other=Tooltip
+
+SchemaHandlingStep.mapping.tooltip.authoritative=Tooltip
+SchemaHandlingStep.mapping.tooltip.exclusive=Tooltip
+SchemaHandlingStep.mapping.tooltip.strength=Tooltip
+SchemaHandlingStep.mapping.tooltip.channel=Tooltip
+SchemaHandlingStep.mapping.tooltip.exceptChannel=Tooltip
+SchemaHandlingStep.mapping.tooltip.source=Tooltip
+SchemaHandlingStep.mapping.tooltip.target=Tooltip
+SchemaHandlingStep.mapping.tooltip.expressionType=Tooltip
+SchemaHandlingStep.mapping.tooltip.expressionLanguage=Tooltip
+SchemaHandlingStep.mapping.tooltip.expressionValuePolicyRef=Tooltip
+SchemaHandlingStep.mapping.tooltip.expression=Tooltip
+SchemaHandlingStep.mapping.tooltip.conditionType=Tooltip
+SchemaHandlingStep.mapping.tooltip.conditionLanguage=Tooltip
+SchemaHandlingStep.mapping.tooltip.conditionValuePolicyRef=Tooltip
+SchemaHandlingStep.mapping.tooltip.condition=Tooltip
+
+SynchronizationStep.tooltip.kind=Tooltip
+SynchronizationStep.tooltip.intent=Tooltip
+SynchronizationStep.tooltip.objectClass=Tooltip
+SynchronizationStep.tooltip.focus=Tooltip
+SynchronizationStep.tooltip.enabled=Tooltip
+SynchronizationStep.tooltip.condition=Tooltip
+SynchronizationStep.tooltip.confirmation=Tooltip
+SynchronizationStep.tooltip.objectTemplate=Tooltip
+SynchronizationStep.tooltip.reconcile=Tooltip
+SynchronizationStep.tooltip.opportunistic=Tooltip
+SynchronizationStep.tooltip.correlation=Tooltip
+SynchronizationStep.tooltip.reaction=Tooltip
+
+SynchronizationStep.reaction.tooltip.situation=Tooltip
+SynchronizationStep.reaction.tooltip.channel=Tooltip
+SynchronizationStep.reaction.tooltip.synchronize=Tooltip
+SynchronizationStep.reaction.tooltip.reconcile=Tooltip
+SynchronizationStep.reaction.tooltip.objectTemplateRef=Tooltip
+SynchronizationStep.reaction.tooltip.action=Tooltip
+
+ResourceWizard.expression.tooltip.type=Tooltip
+ResourceWizard.expression.tooltip.language=Tooltip
+ResourceWizard.expression.tooltip.policyRef=Tooltip
+ResourceWizard.expression.tooltip.expression=Tooltip
+
+CapabilityStep.capability.read.tooltip=Tooltip
+CapabilityStep.capability.update.tooltip=Tooltip
+CapabilityStep.capability.create.tooltip=Tooltip
+CapabilityStep.capability.delete.tooltip=Tooltip
+CapabilityStep.capability.liveSync.tooltip=Tooltip
+CapabilityStep.capability.testConnection.tooltip=Tooltip
+CapabilityStep.capability.activation.tooltip=Tooltip
+CapabilityStep.capability.credentials.tooltip=Tooltip
+CapabilityStep.capability.script.tooltip=Tooltip
+
+CapabilityStep.activation.tooltip.enabled=Tooltip
+CapabilityStep.activation.tooltip.returnedByDefault=Tooltip
+CapabilityStep.activation.tooltip.ignoreAttribute=Tooltip
+CapabilityStep.activation.tooltip.attributeName=Tooltip
+CapabilityStep.activation.tooltip.enableList=Tooltip
+CapabilityStep.activation.tooltip.disableList=Tooltip
+CapabilityStep.activation.tooltip.validFromEnabled=Tooltip
+CapabilityStep.activation.tooltip.validFromReturned=Tooltip
+CapabilityStep.activation.tooltip.validToEnabled=Tooltip
+CapabilityStep.activation.tooltip.validToReturned=Tooltip
+
+CapabilityStep.script.tooltip.enabled=Tooltip
+CapabilityStep.script.tooltip.onConnector=Tooltip
+CapabilityStep.script.tooltip.onResource=Tooltip
+
+CapabilityStep.credentials.tooltip.enabled=Tooltip
+CapabilityStep.credentials.tooltip.passEnabled=Tooltip
+CapabilityStep.credentials.tooltip.passReturned=Tooltip
+
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.html
index 147de72955a..d9fa3b7f1a0 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.html
@@ -35,6 +35,7 @@
                             <span class="close">&nbsp;</span>
                             <button type="button" class="close"><span aria-hidden="true">&#8627;</span><span class="sr-only">Expand</span></button>
                             <span wicket:id="capabilityName" />
+                            <i wicket:id="tooltip"/>
                         </a>
                     </td>
                 </tr>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java
index 1e82ae5d8bc..2c8cfaec5f1 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java
@@ -30,9 +30,11 @@
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.util.ListDataProvider;
 import com.evolveum.midpoint.web.component.util.LoadableModel;
+import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.component.wizard.WizardStep;
 import com.evolveum.midpoint.web.component.wizard.resource.component.capability.*;
 import com.evolveum.midpoint.web.component.wizard.resource.dto.CapabilityDto;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.web.util.WebModelUtils;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.CapabilityCollectionType;
@@ -44,6 +46,7 @@
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -93,6 +96,7 @@ public class CapabilityStep extends WizardStep {
     private static final String ID_CAPABILITY_DELETE = "capabilityDelete";
     private static final String ID_CAPABILITY_ADD = "capabilityAdd";
     private static final String ID_CAPABILITY_CONFIG = "capabilityConfig";
+    private static final String ID_TOOLTIP = "tooltip";
 
     private static final String DIALOG_SELECT_CAPABILITY = "capabilitySelectPopup";
 
@@ -131,29 +135,29 @@ private List<CapabilityDto> loadCapabilitiesFromResource(ResourceType resource){
             for(Object capability: objects){
                 JAXBElement cap = (JAXBElement)capability;
                 if(cap.getValue() instanceof ReadCapabilityType){
-                    capabilityList.add(new CapabilityDto((ReadCapabilityType)cap.getValue(), "Read", true));
+                    capabilityList.add(new CapabilityDto<>((ReadCapabilityType)cap.getValue(), "Read", true));
                 } else if(cap.getValue() instanceof UpdateCapabilityType){
-                    capabilityList.add(new CapabilityDto((UpdateCapabilityType)cap.getValue(), "Update", true));
+                    capabilityList.add(new CapabilityDto<>((UpdateCapabilityType)cap.getValue(), "Update", true));
                 } else if(cap.getValue() instanceof CreateCapabilityType){
-                    capabilityList.add(new CapabilityDto((CreateCapabilityType)cap.getValue(), "Create", true));
+                    capabilityList.add(new CapabilityDto<>((CreateCapabilityType)cap.getValue(), "Create", true));
                 } else if(cap.getValue() instanceof DeleteCapabilityType){
-                    capabilityList.add(new CapabilityDto((DeleteCapabilityType)cap.getValue(), "Delete", true));
+                    capabilityList.add(new CapabilityDto<>((DeleteCapabilityType)cap.getValue(), "Delete", true));
                 } else if(cap.getValue() instanceof LiveSyncCapabilityType){
-                    capabilityList.add(new CapabilityDto((LiveSyncCapabilityType)cap.getValue(), "Live Sync", true));
+                    capabilityList.add(new CapabilityDto<>((LiveSyncCapabilityType)cap.getValue(), "Live Sync", true));
                 } else if(cap.getValue() instanceof TestConnectionCapabilityType){
-                    capabilityList.add(new CapabilityDto((TestConnectionCapabilityType)cap.getValue(), "Test Connection", true));
+                    capabilityList.add(new CapabilityDto<>((TestConnectionCapabilityType)cap.getValue(), "Test Connection", true));
                 } else if(cap.getValue() instanceof ActivationCapabilityType){
-                    capabilityList.add(new CapabilityDto((ActivationCapabilityType)cap.getValue(), "Activation", true));
+                    capabilityList.add(new CapabilityDto<>((ActivationCapabilityType)cap.getValue(), "Activation", true));
                 } else if(cap.getValue() instanceof CredentialsCapabilityType){
-                    capabilityList.add(new CapabilityDto((CredentialsCapabilityType)cap.getValue(), "Credentials", true));
+                    capabilityList.add(new CapabilityDto<>((CredentialsCapabilityType)cap.getValue(), "Credentials", true));
                 } else if(cap.getValue() instanceof ScriptCapabilityType){
-                    capabilityList.add(new CapabilityDto((ScriptCapabilityType)cap.getValue(), "Script", true));
+                    capabilityList.add(new CapabilityDto<>((ScriptCapabilityType)cap.getValue(), "Script", true));
                 }
             }
 
         } catch (Exception e){
             LoggingUtils.logException(LOGGER, "Couldn't load capabilities", e);
-            getPageBase().error(getString("CapabilityStep.message.cantloadCaps") + e);
+            getPageBase().error(getString("CapabilityStep.message.cantLoadCaps") + e);
         }
 
         return capabilityList;
@@ -188,6 +192,20 @@ public void onClick(AjaxRequestTarget target) {
                 name.add(label);
                 capabilityRow.add(name);
 
+                Label tooltipLabel = new Label(ID_TOOLTIP, new Model<>());
+                tooltipLabel.add(new AttributeAppender("data-original-title", getString(dto.getTooltipKey())));
+                tooltipLabel.add(new InfoTooltipBehavior());
+                tooltipLabel.add(new VisibleEnableBehaviour(){
+
+                    @Override
+                    public boolean isVisible() {
+                        return dto.getTooltipKey() != null;
+                    }
+                });
+                tooltipLabel.setOutputMarkupId(true);
+                tooltipLabel.setOutputMarkupPlaceholderTag(true);
+                name.add(tooltipLabel);
+
 
                 AjaxLink deleteLink = new AjaxLink(ID_CAPABILITY_DELETE) {
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.properties b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.properties
index 94caee2d78f..adb4a7bde98 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.properties
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.properties
@@ -16,4 +16,4 @@
 WizardStep.title=Capabilities
 CapabilityStep.native=Native
 CapabilityStep.configured=Configured
-CapabilityStep.message.cantloadCaps=Couldn't load capabilities
+CapabilityStep.message.cantLoadCaps=Couldn't load capabilities
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html
index 31ba2e30c2a..5d71a33a795 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html
@@ -57,6 +57,7 @@ <h3><span wicket:id="editorName"></span></h3>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="SchemaHandlingStep.label.kind"/></label>
+                    <i wicket:id="kindTooltip" wicket:message="title:SchemaHandlingStep.tooltip.kind"/>
                 </dt>
                 <dd>
                     <select wicket:id="editorKind" class="form-control input-sm"></select>
@@ -66,6 +67,7 @@ <h3><span wicket:id="editorName"></span></h3>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="SchemaHandlingStep.label.intent" /></label>
+                    <i wicket:id="intentTooltip" wicket:message="title:SchemaHandlingStep.tooltip.intent"/>
                 </dt>
                 <dd>
                     <input wicket:id="editorIntent" type="text" class="form-control input-sm"/>
@@ -96,6 +98,7 @@ <h3><span wicket:id="editorName"></span></h3>
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="SchemaHandlingStep.label.default" /></label>
+                            <i wicket:id="defaultTooltip" wicket:message="title:SchemaHandlingStep.tooltip.default"/>
                         </dt>
                         <dd>
                             <input wicket:id="editorDefault" type="checkbox" value="checked"/>
@@ -106,6 +109,7 @@ <h3><span wicket:id="editorName"></span></h3>
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="SchemaHandlingStep.label.dependency" /></label>
+                            <i wicket:id="dependencyTooltip" wicket:message="title:SchemaHandlingStep.tooltip.dependency"/>
                         </dt>
                         <dd>
                             <a wicket:id="editorDependencyButton" class="btn btn-sm btn-primary" title="Edit">
@@ -119,6 +123,7 @@ <h3><span wicket:id="editorName"></span></h3>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="SchemaHandlingStep.label.objectClass" /></label>
+                    <i wicket:id="objectClassTooltip" wicket:message="title:SchemaHandlingStep.tooltip.objectClass"/>
                 </dt>
                 <dd>
                     <input wicket:id="editorObjectClass" type="text" class="form-control input-sm"/>
@@ -129,6 +134,7 @@ <h3><span wicket:id="editorName"></span></h3>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="SchemaHandlingStep.label.attributes" /></label>
+                    <i wicket:id="attributesTooltip" wicket:message="title:SchemaHandlingStep.tooltip.attributes"/>
                 </dt>
                 <div wicket:id="editorAttributes" />
             </dl>
@@ -137,6 +143,7 @@ <h3><span wicket:id="editorName"></span></h3>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="SchemaHandlingStep.label.associations" /></label>
+                    <i wicket:id="associationsTooltip" wicket:message="title:SchemaHandlingStep.tooltip.associations"/>
                 </dt>
                 <div wicket:id="editorAssociations" />
             </dl>
@@ -144,6 +151,7 @@ <h3><span wicket:id="editorName"></span></h3>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="SchemaHandlingStep.label.assignmentPolicyRef" /></label>
+                    <i wicket:id="assignmentPolicyRefTooltip" wicket:message="title:SchemaHandlingStep.tooltip.assignmentPolicyRef"/>
                 </dt>
                 <dd>
                     <select wicket:id="editorAssignmentPolicyRef" class="form-control input-sm"></select>
@@ -156,6 +164,7 @@ <h3><span wicket:id="editorName"></span></h3>
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="SchemaHandlingStep.label.iteration" /></label>
+                            <i wicket:id="iterationTooltip" wicket:message="title:SchemaHandlingStep.tooltip.iteration"/>
                         </dt>
                         <dd>
                             <a wicket:id="editorIterationButton" class="btn btn-sm btn-primary" title="Edit">
@@ -169,6 +178,7 @@ <h3><span wicket:id="editorName"></span></h3>
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="SchemaHandlingStep.label.protected" /></label>
+                            <i wicket:id="protectedTooltip" wicket:message="title:SchemaHandlingStep.tooltip.protected"/>
                         </dt>
                         <dd>
                             <a wicket:id="editorProtectedButton" class="btn btn-sm btn-primary" title="Edit">
@@ -185,6 +195,7 @@ <h3><span wicket:id="editorName"></span></h3>
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="SchemaHandlingStep.label.activation" /></label>
+                            <i wicket:id="activationTooltip" wicket:message="title:SchemaHandlingStep.tooltip.activation"/>
                         </dt>
                         <dd>
                             <a wicket:id="editorActivationButton" class="btn btn-sm btn-primary" title="Edit">
@@ -198,6 +209,7 @@ <h3><span wicket:id="editorName"></span></h3>
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="SchemaHandlingStep.label.credentials" /></label>
+                            <i wicket:id="credentialsTooltip" wicket:message="title:SchemaHandlingStep.tooltip.credentials"/>
                         </dt>
                         <dd>
                             <a wicket:id="editorCredentialsButton" class="btn btn-sm btn-primary" title="Edit">
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
index a66d0c43191..fcf32ed8582 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
@@ -34,6 +34,7 @@
 import com.evolveum.midpoint.web.component.wizard.resource.dto.ResourceObjectTypeDefinitionTypeDto;
 import com.evolveum.midpoint.web.component.wizard.resource.dto.SchemaHandlingDto;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.web.util.WebModelUtils;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -94,6 +95,18 @@ public class SchemaHandlingStep extends WizardStep {
     private static final String ID_EDITOR_BUTTON_CREDENTIALS = "editorCredentialsButton";
     private static final String ID_EDITOR_ATTRIBUTES = "editorAttributes";
     private static final String ID_EDITOR_ASSOCIATIONS = "editorAssociations";
+    private static final String ID_T_KIND = "kindTooltip";
+    private static final String ID_T_INTENT = "intentTooltip";
+    private static final String ID_T_DEFAULT = "defaultTooltip";
+    private static final String ID_T_DEPENDENCY = "dependencyTooltip";
+    private static final String ID_T_OBJECT_CLASS = "objectClassTooltip";
+    private static final String ID_T_ATTRIBUTES = "attributesTooltip";
+    private static final String ID_T_ASSOCIATIONS = "associationsTooltip";
+    private static final String ID_T_ASSIGNMENT_POLICY_REF = "assignmentPolicyRefTooltip";
+    private static final String ID_T_ITERATION = "iterationTooltip";
+    private static final String ID_T_PROTECTED = "protectedTooltip";
+    private static final String ID_T_ACTIVATION = "activationTooltip";
+    private static final String ID_T_CREDENTIALS = "credentialsTooltip";
 
     private static final Integer AUTO_COMPLETE_LIST_SIZE = 10;
 
@@ -490,6 +503,54 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
         };
         addDisabledClassModifier(editorCredentials);
         editor.add(editorCredentials);
+
+        Label kindTooltip = new Label(ID_T_KIND);
+        kindTooltip.add(new InfoTooltipBehavior());
+        editor.add(kindTooltip);
+
+        Label intentTooltip = new Label(ID_T_INTENT);
+        intentTooltip.add(new InfoTooltipBehavior());
+        editor.add(intentTooltip);
+
+        Label defaultTooltip = new Label(ID_T_DEFAULT);
+        defaultTooltip.add(new InfoTooltipBehavior());
+        editor.add(defaultTooltip);
+
+        Label dependencyTooltip = new Label(ID_T_DEPENDENCY);
+        dependencyTooltip.add(new InfoTooltipBehavior());
+        editor.add(dependencyTooltip);
+
+        Label objectClassTooltip = new Label(ID_T_OBJECT_CLASS);
+        objectClassTooltip.add(new InfoTooltipBehavior());
+        editor.add(objectClassTooltip);
+
+        Label attributesTooltip = new Label(ID_T_ATTRIBUTES);
+        attributesTooltip.add(new InfoTooltipBehavior());
+        editor.add(attributesTooltip);
+
+        Label associationsTooltip = new Label(ID_T_ASSOCIATIONS);
+        associationsTooltip.add(new InfoTooltipBehavior());
+        editor.add(associationsTooltip);
+
+        Label assignmentPolicyRefTooltip = new Label(ID_T_ASSIGNMENT_POLICY_REF);
+        assignmentPolicyRefTooltip.add(new InfoTooltipBehavior());
+        editor.add(assignmentPolicyRefTooltip);
+
+        Label iterationTooltip = new Label(ID_T_ITERATION);
+        iterationTooltip.add(new InfoTooltipBehavior());
+        editor.add(iterationTooltip);
+
+        Label protectedTooltip = new Label(ID_T_PROTECTED);
+        protectedTooltip.add(new InfoTooltipBehavior());
+        editor.add(protectedTooltip);
+
+        Label activationTooltip = new Label(ID_T_ACTIVATION);
+        activationTooltip.add(new InfoTooltipBehavior());
+        editor.add(activationTooltip);
+
+        Label credentialsTooltip = new Label(ID_T_CREDENTIALS);
+        credentialsTooltip.add(new InfoTooltipBehavior());
+        editor.add(credentialsTooltip);
     }
 
     private void addDisabledClassModifier(Component component){
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.properties b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.properties
index f3bff8a0828..b014368d0f5 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.properties
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.properties
@@ -27,7 +27,7 @@ SchemaHandlingStep.label.dependency=Dependencies
 SchemaHandlingStep.label.objectClass=Object class
 SchemaHandlingStep.label.attributes=Attributes
 SchemaHandlingStep.label.associations=Associations
-SchemaHandlingStep.label.assignmentPolicyRef=Assignment policy ref.
+SchemaHandlingStep.label.assignmentPolicyRef=Assignment policy
 SchemaHandlingStep.label.iteration=Iteration
 SchemaHandlingStep.label.protected=Protected
 SchemaHandlingStep.label.activation=Activation
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.html
index 86716e776c2..e6b1e5444b5 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.html
@@ -75,6 +75,7 @@ <h3><span wicket:id="editorLabel" /></h3>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="SynchronizationStep.label.kind" /></label>
+                    <i wicket:id="kindTooltip" wicket:message="title:SynchronizationStep.tooltip.kind"/>
                 </dt>
                 <dd>
                     <select wicket:id="editorKind" class="form-control input-sm"></select>
@@ -84,6 +85,7 @@ <h3><span wicket:id="editorLabel" /></h3>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="SynchronizationStep.label.intent" /></label>
+                    <i wicket:id="intentTooltip" wicket:message="title:SynchronizationStep.tooltip.intent"/>
                 </dt>
                 <dd>
                     <input wicket:id="editorIntent" type="text" class="form-control input-sm"/>
@@ -94,6 +96,7 @@ <h3><span wicket:id="editorLabel" /></h3>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="SynchronizationStep.label.objectClass" /></label>
+                    <i wicket:id="objectClassTooltip" wicket:message="title:SynchronizationStep.tooltip.objectClass"/>
                 </dt>
                 <div wicket:id="editorObjectClass" />
             </dl>
@@ -101,6 +104,7 @@ <h3><span wicket:id="editorLabel" /></h3>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="SynchronizationStep.label.focus" /></label>
+                    <i wicket:id="focusTooltip" wicket:message="title:SynchronizationStep.tooltip.focus"/>
                 </dt>
                 <dd>
                     <select wicket:id="editorFocus" class="form-control input-sm"></select>
@@ -110,6 +114,7 @@ <h3><span wicket:id="editorLabel" /></h3>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="SynchronizationStep.label.enabled" /></label>
+                    <i wicket:id="enabledTooltip" wicket:message="title:SynchronizationStep.tooltip.enabled"/>
                 </dt>
                 <dd>
                     <input wicket:id="editorEnabled" type="checkbox" value="checked"/>
@@ -122,6 +127,7 @@ <h3><span wicket:id="editorLabel" /></h3>
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="SynchronizationStep.label.condition" /></label>
+                            <i wicket:id="conditionTooltip" wicket:message="title:SynchronizationStep.tooltip.condition"/>
                         </dt>
                         <dd>
                             <a wicket:id="editorConditionButton" class="btn btn-sm btn-primary" title="Edit">
@@ -135,6 +141,7 @@ <h3><span wicket:id="editorLabel" /></h3>
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="SynchronizationStep.label.confirmation" /></label>
+                            <i wicket:id="confirmationTooltip" wicket:message="title:SynchronizationStep.tooltip.confirmation"/>
                         </dt>
                         <dd>
                             <a wicket:id="editorConfirmationButton" class="btn btn-sm btn-primary" title="Edit">
@@ -148,6 +155,7 @@ <h3><span wicket:id="editorLabel" /></h3>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="SynchronizationStep.label.objectTemplate" /></label>
+                    <i wicket:id="objectTemplateTooltip" wicket:message="title:SynchronizationStep.tooltip.objectTemplate"/>
                 </dt>
                 <dd>
                     <select wicket:id="editorObjectTemplate" class="form-control input-sm"></select>
@@ -160,6 +168,7 @@ <h3><span wicket:id="editorLabel" /></h3>
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="SynchronizationStep.label.reconcile" /></label>
+                            <i wicket:id="reconcileTooltip" wicket:message="title:SynchronizationStep.tooltip.reconcile"/>
                         </dt>
                         <dd>
                             <input wicket:id="editorReconcile" type="checkbox" value="checked"/>
@@ -171,6 +180,7 @@ <h3><span wicket:id="editorLabel" /></h3>
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="SynchronizationStep.label.opportunistic" /></label>
+                            <i wicket:id="opportunisticTooltip" wicket:message="title:SynchronizationStep.tooltip.opportunistic"/>
                         </dt>
                         <dd>
                             <input wicket:id="editorOpportunistic" type="checkbox" value="checked"/>
@@ -183,6 +193,7 @@ <h3><span wicket:id="editorLabel" /></h3>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="SynchronizationStep.label.correlation" /></label>
+                    <i wicket:id="correlationTooltip" wicket:message="title:SynchronizationStep.tooltip.correlation"/>
                 </dt>
                 <div wicket:id="editorCorrelation" />
             </dl>
@@ -191,6 +202,7 @@ <h3><span wicket:id="editorLabel" /></h3>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="SynchronizationStep.label.reaction" /></label>
+                    <i wicket:id="reactionTooltip" wicket:message="title:SynchronizationStep.tooltip.reaction"/>
                 </dt>
                 <div wicket:id="editorReaction" />
             </dl>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
index dec93c3981c..936d7cf4273 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
@@ -39,6 +39,7 @@
 import com.evolveum.midpoint.web.component.wizard.resource.dto.ResourceSynchronizationDto;
 import com.evolveum.midpoint.web.page.admin.resources.PageResources;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.web.util.WebModelUtils;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -102,6 +103,18 @@ public class SynchronizationStep extends WizardStep {
     private static final String ID_EDITOR_OBJECT_CLASS = "editorObjectClass";
     private static final String ID_EDITOR_EDITOR_CORRELATION = "editorCorrelation";
     private static final String ID_EDITOR_REACTION = "editorReaction";
+    private static final String ID_T_KIND = "kindTooltip";
+    private static final String ID_T_INTENT = "intentTooltip";
+    private static final String ID_T_OBJ_CLASS = "objectClassTooltip";
+    private static final String ID_T_FOCUS = "focusTooltip";
+    private static final String ID_T_ENABLED = "enabledTooltip";
+    private static final String ID_T_CONDITION = "conditionTooltip";
+    private static final String ID_T_CONFIRMATION = "confirmationTooltip";
+    private static final String ID_T_OBJ_TEMPLATE = "objectTemplateTooltip";
+    private static final String ID_T_RECONCILE = "reconcileTooltip";
+    private static final String ID_T_OPPORTUNISTIC = "opportunisticTooltip";
+    private static final String ID_T_CORRELATION = "correlationTooltip";
+    private static final String ID_T_REACTION = "reactionTooltip";
 
     private IModel<PrismObject<ResourceType>> resourceModel;
     private IModel<ResourceSynchronizationDto> model;
@@ -512,6 +525,54 @@ protected boolean buttonsDisabled(){
             }
         };
         editor.add(editorReaction);
+
+        Label kindTooltip = new Label(ID_T_KIND);
+        kindTooltip.add(new InfoTooltipBehavior());
+        editor.add(kindTooltip);
+
+        Label intentTooltip = new Label(ID_T_INTENT);
+        intentTooltip.add(new InfoTooltipBehavior());
+        editor.add(intentTooltip);
+
+        Label objClassTooltip = new Label(ID_T_OBJ_CLASS);
+        objClassTooltip.add(new InfoTooltipBehavior());
+        editor.add(objClassTooltip);
+
+        Label focusTooltip = new Label(ID_T_FOCUS);
+        focusTooltip.add(new InfoTooltipBehavior());
+        editor.add(focusTooltip);
+
+        Label enabledTooltip = new Label(ID_T_ENABLED);
+        enabledTooltip.add(new InfoTooltipBehavior());
+        editor.add(enabledTooltip);
+
+        Label conditionTooltip = new Label(ID_T_CONDITION);
+        conditionTooltip.add(new InfoTooltipBehavior());
+        editor.add(conditionTooltip);
+
+        Label confirmationTooltip = new Label(ID_T_CONFIRMATION);
+        confirmationTooltip.add(new InfoTooltipBehavior());
+        editor.add(confirmationTooltip);
+
+        Label objTemplateTooltip = new Label(ID_T_OBJ_TEMPLATE);
+        objTemplateTooltip.add(new InfoTooltipBehavior());
+        editor.add(objTemplateTooltip);
+
+        Label reconcileTooltip = new Label(ID_T_RECONCILE);
+        reconcileTooltip.add(new InfoTooltipBehavior());
+        editor.add(reconcileTooltip);
+
+        Label opportunisticTooltip = new Label(ID_T_OPPORTUNISTIC);
+        opportunisticTooltip.add(new InfoTooltipBehavior());
+        editor.add(opportunisticTooltip);
+
+        Label correlationTooltip = new Label(ID_T_CORRELATION);
+        correlationTooltip.add(new InfoTooltipBehavior());
+        editor.add(correlationTooltip);
+
+        Label reactionTooltip = new Label(ID_T_REACTION);
+        reactionTooltip.add(new InfoTooltipBehavior());
+        editor.add(reactionTooltip);
     }
 
     private IModel<String> createObjectSyncTypeDisplayModel(final ObjectSynchronizationTypeDto syncObject){
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.html
index e621e4890d8..086d3932b6f 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.html
@@ -74,6 +74,7 @@ <h3><wicket:message key="SchemaListPanel.details"/></h3>
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="SchemaListPanel.details.kind" /></label>
+                            <i wicket:id="kindTooltip" wicket:message="title:SchemaStep.tooltip.kind"/>
                         </dt>
                         <dd>
                             <span wicket:id="kind"/>
@@ -83,6 +84,7 @@ <h3><wicket:message key="SchemaListPanel.details"/></h3>
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="SchemaListPanel.details.intent" /></label>
+                            <i wicket:id="intentTooltip" wicket:message="title:SchemaStep.tooltip.intent"/>
                         </dt>
                         <dd>
                             <span wicket:id="intent"/>
@@ -94,6 +96,7 @@ <h3><wicket:message key="SchemaListPanel.details"/></h3>
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="SchemaListPanel.details.nativeObjectClass" /></label>
+                            <i wicket:id="nativeObjectClassTooltip" wicket:message="title:SchemaStep.tooltip.nativeObjectClass"/>
                         </dt>
                         <dd>
                             <span wicket:id="nativeObjectClass"/>
@@ -103,6 +106,7 @@ <h3><wicket:message key="SchemaListPanel.details"/></h3>
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="SchemaListPanel.details.default" /></label>
+                            <i wicket:id="isDefaultTooltip" wicket:message="title:SchemaStep.tooltip.isDefault"/>
                         </dt>
                         <dd>
                             <input wicket:id="isDefault" type="checkbox" />
@@ -112,6 +116,7 @@ <h3><wicket:message key="SchemaListPanel.details"/></h3>
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="SchemaListPanel.details.kindDefault" /></label>
+                            <i wicket:id="isKindDefaultTooltip" wicket:message="title:SchemaStep.tooltip.isKindDefault"/>
                         </dt>
                         <dd>
                             <input wicket:id="isKindDefault" type="checkbox" />
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.java
index 99dd35d9a8f..a210cf595c6 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.java
@@ -19,9 +19,7 @@
 import com.evolveum.midpoint.common.refinery.RefinedObjectClassDefinition;
 import com.evolveum.midpoint.common.refinery.RefinedResourceSchema;
 import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.schema.processor.ObjectClassComplexTypeDefinition;
 import com.evolveum.midpoint.schema.processor.ResourceAttributeDefinition;
-import com.evolveum.midpoint.schema.processor.ResourceSchema;
 import com.evolveum.midpoint.schema.util.ResourceTypeUtil;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
@@ -39,6 +37,7 @@
 import com.evolveum.midpoint.web.component.wizard.resource.dto.ObjectClassDto;
 import com.evolveum.midpoint.web.page.admin.resources.PageResources;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
 
 import org.apache.wicket.AttributeModifier;
@@ -88,6 +87,11 @@ public class SchemaListPanel extends SimplePanel<PrismObject<ResourceType>> {
     private static final String ID_DETAILS_NATIVE_OBJECT_CLASS = "nativeObjectClass";
     private static final String ID_DETAILS_DEFAULT = "isDefault";
     private static final String ID_DETAILS_KIND_DEFAULT = "isKindDefault";
+    private static final String ID_T_KIND = "kindTooltip";
+    private static final String ID_T_INTENT = "intentTooltip";
+    private static final String ID_T_NATIVE_OBJECT_CLASS = "nativeObjectClassTooltip";
+    private static final String ID_T_DEFAULT = "isDefaultTooltip";
+    private static final String ID_T_KIND_DEFAULT = "isKindDefaultTooltip";
 
     private IModel<List<ObjectClassDto>> allClasses;
     private LoadableModel<ObjectClassDetailsDto> detailsModel;
@@ -227,6 +231,26 @@ private void initDetailsPanel(){
         CheckBox idKindDefault = new CheckBox(ID_DETAILS_KIND_DEFAULT, new PropertyModel<Boolean>(detailsModel, ObjectClassDetailsDto.F_IS_KIND_DEFAULT));
         idKindDefault.setEnabled(false);
         detailsContainer.add(idKindDefault);
+
+        Label kindTooltip = new Label(ID_T_KIND);
+        kindTooltip.add(new InfoTooltipBehavior());
+        detailsContainer.add(kindTooltip);
+
+        Label intentTooltip = new Label(ID_T_INTENT);
+        intentTooltip.add(new InfoTooltipBehavior());
+        detailsContainer.add(intentTooltip);
+
+        Label nativeObjClassTooltip = new Label(ID_T_NATIVE_OBJECT_CLASS);
+        nativeObjClassTooltip.add(new InfoTooltipBehavior());
+        detailsContainer.add(nativeObjClassTooltip);
+
+        Label defaultTooltip = new Label(ID_T_DEFAULT);
+        defaultTooltip.add(new InfoTooltipBehavior());
+        detailsContainer.add(defaultTooltip);
+
+        Label kindDefaultTooltip = new Label(ID_T_KIND_DEFAULT);
+        kindDefaultTooltip.add(new InfoTooltipBehavior());
+        detailsContainer.add(kindDefaultTooltip);
     }
 
     private List<IColumn> initColumns() {
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/AddCapabilityDialog.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/AddCapabilityDialog.java
index 9f3ad660f0e..0fc5e20743f 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/AddCapabilityDialog.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/AddCapabilityDialog.java
@@ -15,8 +15,6 @@
  */
 package com.evolveum.midpoint.web.component.wizard.resource.component.capability;
 
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.data.BaseSortableDataProvider;
 import com.evolveum.midpoint.web.component.data.TablePanel;
@@ -24,6 +22,7 @@
 import com.evolveum.midpoint.web.component.util.ListDataProvider;
 import com.evolveum.midpoint.web.component.util.LoadableModel;
 import com.evolveum.midpoint.web.component.util.SelectableBean;
+import com.evolveum.midpoint.web.component.wizard.resource.CapabilityStep;
 import com.evolveum.midpoint.web.component.wizard.resource.dto.CapabilityDto;
 import com.evolveum.midpoint.xml.ns._public.resource.capabilities_3.*;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -86,7 +85,7 @@ private CapabilityStepDto loadModel(IModel<CapabilityStepDto> capabilityModel){
             capabilityClassList.add(cap.getCapability().getClass());
         }
 
-        for(Class<? extends CapabilityType> cap: CapabilityPanel.capabilities){
+        for(Class<? extends CapabilityType> cap: CapabilityStep.capabilities){
             if(!capabilityClassList.contains(cap)){
                 capabilityList.add(createCapabilityDto(cap));
             }
@@ -99,23 +98,23 @@ private CapabilityStepDto loadModel(IModel<CapabilityStepDto> capabilityModel){
 
     private CapabilityDto createCapabilityDto(Class<? extends CapabilityType> capabilityClass){
         if(capabilityClass.equals(ActivationCapabilityType.class)){
-            return new CapabilityDto(new ActivationCapabilityType(), "Activation", true);
+            return new CapabilityDto<>(new ActivationCapabilityType(), "Activation", true);
         } else if(capabilityClass.equals(ScriptCapabilityType.class)){
-            return new CapabilityDto(new ScriptCapabilityType(), "Script", true);
+            return new CapabilityDto<>(new ScriptCapabilityType(), "Script", true);
         } else if(capabilityClass.equals(CredentialsCapabilityType.class)){
-            return new CapabilityDto(new CredentialsCapabilityType(), "Credentials", true);
+            return new CapabilityDto<>(new CredentialsCapabilityType(), "Credentials", true);
         } else if(capabilityClass.equals(DeleteCapabilityType.class)){
-            return new CapabilityDto(new DeleteCapabilityType(), "Delete", true);
+            return new CapabilityDto<>(new DeleteCapabilityType(), "Delete", true);
         } else if(capabilityClass.equals(ReadCapabilityType.class)){
-            return new CapabilityDto(new ReadCapabilityType(), "Read", true);
+            return new CapabilityDto<>(new ReadCapabilityType(), "Read", true);
         } else if(capabilityClass.equals(DeleteCapabilityType.class)){
-            return new CapabilityDto(new CreateCapabilityType(), "Create", true);
+            return new CapabilityDto<>(new CreateCapabilityType(), "Create", true);
         } else if(capabilityClass.equals(UpdateCapabilityType.class)){
-            return new CapabilityDto(new UpdateCapabilityType(), "Update", true);
+            return new CapabilityDto<>(new UpdateCapabilityType(), "Update", true);
         } else if(capabilityClass.equals(TestConnectionCapabilityType.class)){
-            return new CapabilityDto(new TestConnectionCapabilityType(), "Test Connection", true);
+            return new CapabilityDto<>(new TestConnectionCapabilityType(), "Test Connection", true);
         } else {  //if(capabilityClass.equals(LiveSyncCapabilityType.class)){
-            return new CapabilityDto(new LiveSyncCapabilityType(), "Live Sync", true);
+            return new CapabilityDto<>(new LiveSyncCapabilityType(), "Live Sync", true);
         }
     }
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.html
index 436cc546d5a..95158a6fc0f 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.html
@@ -26,6 +26,7 @@ <h4><wicket:message key="capabilityActivationPanel.label.status" /></h4>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="capabilityActivationPanel.label.enabled" /></label>
+                    <i wicket:id="enabledTooltip" wicket:message="title:CapabilityStep.activation.tooltip.enabled"/>
                 </dt>
                 <dd><input wicket:id="statusEnabled" type="checkbox" value="checked"/></dd>
             </dl>
@@ -34,12 +35,14 @@ <h4><wicket:message key="capabilityActivationPanel.label.status" /></h4>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="capabilityActivationPanel.label.returnedByDefault" /></label>
+                    <i wicket:id="returnedByDefaultTooltip" wicket:message="title:CapabilityStep.activation.tooltip.returnedByDefault"/>
                 </dt>
                 <dd><input wicket:id="statusReturnedByDefault" type="checkbox" value="checked"/></dd>
             </dl>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="capabilityActivationPanel.label.ignoreAttribute"/></label>
+                    <i wicket:id="ignoreAttributeTooltip" wicket:message="title:CapabilityStep.activation.tooltip.ignoreAttribute"/>
                 </dt>
                 <dd><input wicket:id="statusIgnoreAttribute" type="checkbox" value="checked"/></dd>
             </dl>
@@ -48,18 +51,21 @@ <h4><wicket:message key="capabilityActivationPanel.label.status" /></h4>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="capabilityActivationPanel.label.attributeName" /></label>
+            <i wicket:id="attributeNameTooltip" wicket:message="title:CapabilityStep.activation.tooltip.attributeName"/>
         </dt>
         <dd><select wicket:id="statusSelect" class="form-control input-sm"></select></dd>
     </dl>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="capabilityActivationPanel.label.enableList" /></label>
+            <i wicket:id="enableListTooltip" wicket:message="title:CapabilityStep.activation.tooltip.enableList"/>
         </dt>
         <div wicket:id="statusEnableList" />
     </dl>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="capabilityActivationPanel.label.disableList" /></label>
+            <i wicket:id="disableListTooltip" wicket:message="title:CapabilityStep.activation.tooltip.disableList"/>
         </dt>
         <div wicket:id="statusDisableList" />
     </dl>
@@ -70,12 +76,14 @@ <h4><wicket:message key="capabilityActivationPanel.label.validFrom" /></h4>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="capabilityActivationPanel.label.enabled" /></label>
+                    <i wicket:id="validFromEnabledTooltip" wicket:message="title:CapabilityStep.activation.tooltip.validFromEnabled"/>
                 </dt>
                 <dd><input wicket:id="validFromEnabled" type="checkbox" value="checked"/></dd>
             </dl>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="capabilityActivationPanel.label.returnedByDefault" /></label>
+                    <i wicket:id="validFromReturnedTooltip" wicket:message="title:CapabilityStep.activation.tooltip.validFromReturned"/>
                 </dt>
                 <dd><input wicket:id="validFromReturned" type="checkbox" value="checked"/></dd>
             </dl>
@@ -85,12 +93,14 @@ <h4><wicket:message key="capabilityActivationPanel.label.validTo" /></h4>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="capabilityActivationPanel.label.enabled" /></label>
+                    <i wicket:id="validToEnabledTooltip" wicket:message="title:CapabilityStep.activation.tooltip.validToEnabled"/>
                 </dt>
                 <dd><input wicket:id="validToEnabled" type="checkbox" value="checked"/></dd>
             </dl>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="capabilityActivationPanel.label.returnedByDefault" /></label>
+                    <i wicket:id="validToReturnedTooltip" wicket:message="title:CapabilityStep.activation.tooltip.validToReturned"/>
                 </dt>
                 <dd><input wicket:id="validToReturned" type="checkbox" value="checked"/></dd>
             </dl>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.java
index 656bec13c3d..e2ade41f0d3 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.java
@@ -18,6 +18,8 @@
 import com.evolveum.midpoint.web.component.form.multivalue.MultiValueTextPanel;
 import com.evolveum.midpoint.web.component.util.SimplePanel;
 import com.evolveum.midpoint.web.component.wizard.resource.dto.CapabilityDto;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
+import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.IChoiceRenderer;
@@ -43,6 +45,16 @@ public class CapabilityActivationPanel extends SimplePanel{
     private static final String ID_STATUS_ENABLE_LIST = "statusEnableList";
     private static final String ID_STATUS_DISABLE_LIST = "statusDisableList";
     private static final String ID_SELECT_STATUS = "statusSelect";
+    private static final String ID_T_ENABLED = "enabledTooltip";
+    private static final String ID_T_RETURNED_BY_DEFAULT = "returnedByDefaultTooltip";
+    private static final String ID_T_IGNORE_ATTR = "ignoreAttributeTooltip";
+    private static final String ID_T_ATTR_NAME = "attributeNameTooltip";
+    private static final String ID_T_ENABLE_LIST = "enableListTooltip";
+    private static final String ID_T_DISABLE_LIST = "disableListTooltip";
+    private static final String ID_T_V_FROM_ENABLED = "validFromEnabledTooltip";
+    private static final String ID_T_V_FROM_RETURN = "validFromReturnedTooltip";
+    private static final String ID_T_V_TO_ENABLED = "validToEnabledTooltip";
+    private static final String ID_T_V_TO_RETURN = "validToReturnedTooltip";
 
     public CapabilityActivationPanel(String componentId, IModel<CapabilityDto> model){
         super(componentId, model);
@@ -98,7 +110,7 @@ protected StringResourceModel createEmptyItemPlaceholder(){
         };
         add(statusDisableList);
 
-        IChoiceRenderer renderer = new IChoiceRenderer<QName>() {
+        IChoiceRenderer<QName> renderer = new IChoiceRenderer<QName>() {
 
             @Override
             public Object getDisplayValue(QName object) {
@@ -111,10 +123,50 @@ public String getIdValue(QName object, int index) {
             }
         };
 
-        DropDownChoice statusChoice = new DropDownChoice(ID_SELECT_STATUS,
+        DropDownChoice statusChoice = new DropDownChoice<>(ID_SELECT_STATUS,
                 new PropertyModel<QName>(getModel(), "capability.status.attribute"),
                 createAttributeChoiceModel(), renderer);
         add(statusChoice);
+
+        Label enabledTooltip = new Label(ID_T_ENABLED);
+        enabledTooltip.add(new InfoTooltipBehavior());
+        add(enabledTooltip);
+
+        Label returnTooltip = new Label(ID_T_RETURNED_BY_DEFAULT);
+        returnTooltip.add(new InfoTooltipBehavior());
+        add(returnTooltip);
+
+        Label ignoreTooltip = new Label(ID_T_IGNORE_ATTR);
+        ignoreTooltip.add(new InfoTooltipBehavior());
+        add(ignoreTooltip);
+
+        Label attributeNameTooltip = new Label(ID_T_ATTR_NAME);
+        attributeNameTooltip.add(new InfoTooltipBehavior());
+        add(attributeNameTooltip);
+
+        Label enableListTooltip = new Label(ID_T_ENABLE_LIST);
+        enableListTooltip.add(new InfoTooltipBehavior());
+        add(enableListTooltip);
+
+        Label disableListTooltip = new Label(ID_T_DISABLE_LIST);
+        disableListTooltip.add(new InfoTooltipBehavior());
+        add(disableListTooltip);
+
+        Label vFromEnabledTooltip = new Label(ID_T_V_FROM_ENABLED);
+        vFromEnabledTooltip.add(new InfoTooltipBehavior());
+        add(vFromEnabledTooltip);
+
+        Label vFromReturnTooltip = new Label(ID_T_V_FROM_RETURN);
+        vFromReturnTooltip.add(new InfoTooltipBehavior());
+        add(vFromReturnTooltip);
+
+        Label vToEnabledTooltip = new Label(ID_T_V_TO_ENABLED);
+        vToEnabledTooltip.add(new InfoTooltipBehavior());
+        add(vToEnabledTooltip);
+
+        Label vToReturnTooltip = new Label(ID_T_V_TO_RETURN);
+        vToReturnTooltip.add(new InfoTooltipBehavior());
+        add(vToReturnTooltip);
     }
 
     public IModel<List<QName>> createAttributeChoiceModel(){
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.html
index 154b8ad90d9..ac12e02f6e1 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.html
@@ -23,6 +23,7 @@ <h3><wicket:message key="capabilityCredentialsPanel.label" /></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="capabilityCredentialsPanel.label.enabled" /></label>
+            <i wicket:id="enabledTooltip" wicket:message="title:CapabilityStep.credentials.tooltip.enabled"/>
         </dt>
         <dd><input wicket:id="enabled" type="checkbox" value="checked"/></dd>
     </dl>
@@ -34,6 +35,7 @@ <h4 wicket:id="password"></h4>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="capabilityCredentialsPanel.label.enabled" /></label>
+                    <i wicket:id="passEnabledTooltip" wicket:message="title:CapabilityStep.credentials.tooltip.passEnabled"/>
                 </dt>
                 <dd><input wicket:id="passEnabled" type="checkbox" value="checked"/></dd>
             </dl>
@@ -42,6 +44,7 @@ <h4 wicket:id="password"></h4>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="capabilityCredentialsPanel.label.returned" /></label>
+                    <i wicket:id="passReturnedTooltip" wicket:message="title:CapabilityStep.credentials.tooltip.passReturned"/>
                 </dt>
                 <dd><input wicket:id="passReturned" type="checkbox" value="checked"/></dd>
             </dl>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.java
index f076f771f32..563e97709ca 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.java
@@ -18,6 +18,7 @@
 
 import com.evolveum.midpoint.web.component.util.SimplePanel;
 import com.evolveum.midpoint.web.component.wizard.resource.dto.CapabilityDto;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.model.IModel;
@@ -32,6 +33,9 @@ public class CapabilityCredentialsPanel extends SimplePanel{
     private static final String ID_LABEL_PASSWORD = "password";
     private static final String ID_PASSWORD_ENABLED = "passEnabled";
     private static final String ID_PASSWORD_RETURNED = "passReturned";
+    private static final String ID_T_ENABLED = "enabledTooltip";
+    private static final String ID_T_PASS_ENABLED = "passEnabledTooltip";
+    private static final String ID_T_PASS_RETURN = "passReturnedTooltip";
 
     public CapabilityCredentialsPanel(String componentId, IModel<CapabilityDto> model){
         super(componentId, model);
@@ -50,5 +54,17 @@ protected void initLayout(){
 
         CheckBox passwordReturned = new CheckBox(ID_PASSWORD_RETURNED, new PropertyModel<Boolean>(getModel(), "capability.password.returnedByDefault"));
         add(passwordReturned);
+
+        Label enabledTooltip = new Label(ID_T_ENABLED);
+        enabledTooltip.add(new InfoTooltipBehavior());
+        add(enabledTooltip);
+
+        Label passEnabledTooltip = new Label(ID_T_PASS_ENABLED);
+        passEnabledTooltip.add(new InfoTooltipBehavior());
+        add(passEnabledTooltip);
+
+        Label passReturnTooltip = new Label(ID_T_PASS_RETURN);
+        passReturnTooltip.add(new InfoTooltipBehavior());
+        add(passReturnTooltip);
     }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.html
deleted file mode 100644
index 83a1b66eca5..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-  ~ Copyright (c) 2010-2013 Evolveum
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<!DOCTYPE html>
-<html xmlns:wicket="http://wicket.apache.org">
-<wicket:panel>
-
-    <div wicket:id="capabilitySelectPopup" />
-
-    <div class="row capability">
-        <div class="col-xs-5 col-sm-4 col-sm-offset-2 col-md-4 col-md-offset-2 col-lg-3 col-lg-offset-3">
-            <h3><wicket:message key="CapabilityPanel.title" /></h3>
-
-            <table class="table table-striped table-condensed">
-                <tbody wicket:id="tableRows">
-                    <tr wicket:id="capabilityRow">
-                        <td class="capability-item">
-                            <a wicket:id="capabilityLink">
-                                <span wicket:id="capabilityName" />
-                            </a>
-                        </td>
-                        <td>
-                            <a wicket:id="capabilityDelete" class="btn btn-danger btn-sm"><i class="fa fa-fw fa-minus" /></a>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-
-            <div class="main-button-bar">
-                <a wicket:id="capabilityAdd" class="btn btn-success"><i class="fa fa-fw fa-plus"/></a>
-                <a class="btn btn-success" wicket:id="saveButton"><i class="fa fa-floppy-o" /></a>
-            </div>
-        </div>
-
-        <div class="col-xs-5 col-sm-4 col-md-4 col-lg-3" wicket:id="capabilityConfig" />
-    </div>
-</wicket:panel>
-</html>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.java
deleted file mode 100644
index 0752a6dcf67..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * Copyright (c) 2010-2014 Evolveum
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.evolveum.midpoint.web.component.wizard.resource.component.capability;
-
-import com.evolveum.midpoint.common.refinery.RefinedResourceSchema;
-import com.evolveum.midpoint.model.api.ModelService;
-import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.prism.delta.ObjectDelta;
-import com.evolveum.midpoint.schema.processor.ObjectClassComplexTypeDefinition;
-import com.evolveum.midpoint.schema.processor.ResourceAttributeDefinition;
-import com.evolveum.midpoint.schema.processor.ResourceSchema;
-import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.schema.util.ResourceTypeUtil;
-import com.evolveum.midpoint.util.logging.LoggingUtils;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.web.component.util.ListDataProvider;
-import com.evolveum.midpoint.web.component.util.LoadableModel;
-import com.evolveum.midpoint.web.component.util.SimplePanel;
-import com.evolveum.midpoint.web.component.wizard.resource.dto.CapabilityDto;
-import com.evolveum.midpoint.web.page.PageTest2;
-import com.evolveum.midpoint.web.util.WebMiscUtil;
-import com.evolveum.midpoint.web.util.WebModelUtils;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-import com.evolveum.midpoint.xml.ns._public.resource.capabilities_3.*;
-
-import com.evolveum.midpoint.xml.ns._public.resource.capabilities_3.ObjectFactory;
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.data.DataView;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.PropertyModel;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-/**
- *  @author shood
- * */
-public class CapabilityPanel extends SimplePanel{
-
-    private static final Trace LOGGER = TraceManager.getTrace(CapabilityPanel.class);
-
-    private static final String DOT_CLASS = CapabilityPanel.class.getName() + ".";
-    private static final String OPERATION_SAVE_CAPABILITIES = DOT_CLASS + "saveCapabilities";
-
-    public static ArrayList<Class<? extends CapabilityType>> capabilities;
-    static{
-        capabilities = new ArrayList<>(Arrays.asList(
-                ActivationCapabilityType.class,
-                ScriptCapabilityType.class,
-                CredentialsCapabilityType.class,
-                ReadCapabilityType.class,
-                CreateCapabilityType.class,
-                UpdateCapabilityType.class,
-                LiveSyncCapabilityType.class,
-                TestConnectionCapabilityType.class,
-                DeleteCapabilityType.class));
-    }
-
-    private static final String ID_CAPABILITY_TABLE = "tableRows";
-    private static final String ID_CAPABILITY_ROW = "capabilityRow";
-    private static final String ID_CAPABILITY_NAME = "capabilityName";
-    private static final String ID_CAPABILITY_LINK = "capabilityLink";
-    private static final String ID_CAPABILITY_DELETE = "capabilityDelete";
-    private static final String ID_CAPABILITY_ADD = "capabilityAdd";
-    private static final String ID_CAPABILITY_CONFIG = "capabilityConfig";
-    private static final String ID_BUTTON_SAVE = "saveButton";
-
-    private static final String DIALOG_SELECT_CAPABILITY = "capabilitySelectPopup";
-
-    private IModel<CapabilityStepDto> model;
-    private IModel<PrismObject<ResourceType>> resourceModel;
-
-    public CapabilityPanel(String componentId, IModel<PrismObject<ResourceType>> prismModel){
-        super(componentId, prismModel);
-    }
-
-    private CapabilityStepDto loadModel(){
-        PrismObject<ResourceType> resourcePrism = (PrismObject<ResourceType>)getModel().getObject();
-        ResourceType resource = resourcePrism.asObjectable();
-        CapabilityStepDto dto = new CapabilityStepDto();
-        List<CapabilityDto> capabilityList = loadCapabilitiesFromResource(resource);
-        dto.setCapabilities(capabilityList);
-        return dto;
-    }
-
-    private List<CapabilityDto> loadCapabilitiesFromResource(ResourceType resource){
-        List<CapabilityDto> capabilityList = new ArrayList<>();
-
-        try {
-            List<Object> objects = ResourceTypeUtil.getEffectiveCapabilities(resource);
-
-            for(Object capability: objects){
-                JAXBElement cap = (JAXBElement)capability;
-                if(cap.getValue() instanceof ReadCapabilityType){
-                    capabilityList.add(new CapabilityDto((ReadCapabilityType)cap.getValue(), "Read", true));
-                } else if(cap.getValue() instanceof UpdateCapabilityType){
-                    capabilityList.add(new CapabilityDto((UpdateCapabilityType)cap.getValue(), "Update", true));
-                } else if(cap.getValue() instanceof CreateCapabilityType){
-                    capabilityList.add(new CapabilityDto((CreateCapabilityType)cap.getValue(), "Create", true));
-                } else if(cap.getValue() instanceof DeleteCapabilityType){
-                    capabilityList.add(new CapabilityDto((DeleteCapabilityType)cap.getValue(), "Delete", true));
-                } else if(cap.getValue() instanceof LiveSyncCapabilityType){
-                    capabilityList.add(new CapabilityDto((LiveSyncCapabilityType)cap.getValue(), "Live Sync", true));
-                } else if(cap.getValue() instanceof TestConnectionCapabilityType){
-                    capabilityList.add(new CapabilityDto((TestConnectionCapabilityType)cap.getValue(), "Test Connection", true));
-                } else if(cap.getValue() instanceof ActivationCapabilityType){
-                    capabilityList.add(new CapabilityDto((ActivationCapabilityType)cap.getValue(), "Activation", true));
-                } else if(cap.getValue() instanceof CredentialsCapabilityType){
-                    capabilityList.add(new CapabilityDto((CredentialsCapabilityType)cap.getValue(), "Credentials", true));
-                } else if(cap.getValue() instanceof ScriptCapabilityType){
-                    capabilityList.add(new CapabilityDto((ScriptCapabilityType)cap.getValue(), "Script", true));
-                }
-            }
-
-        } catch (Exception e){
-            LoggingUtils.logException(LOGGER, "Couldn't load capabilities", e);
-            //TODO - show this error to the user [erik]
-        }
-
-        return capabilityList;
-    }
-
-        @Override
-    protected void initLayout(){
-
-        model = new LoadableModel<CapabilityStepDto>() {
-
-            @Override
-            protected CapabilityStepDto load() {
-                return loadModel();
-            }
-        };
-
-        resourceModel = new LoadableModel<PrismObject<ResourceType>>() {
-
-            @Override
-            protected PrismObject<ResourceType> load() {
-                return (PrismObject<ResourceType>)getModel().getObject();
-            }
-        };
-
-        final ListDataProvider<CapabilityDto> capabilityProvider = new ListDataProvider<>(this,
-                new PropertyModel<List<CapabilityDto>>(model.getObject(), CapabilityStepDto.F_CAPABILITIES));
-
-        WebMarkupContainer tableBody = new WebMarkupContainer(ID_CAPABILITY_TABLE);
-        tableBody.setOutputMarkupId(true);
-        add(tableBody);
-
-        WebMarkupContainer configBody = new WebMarkupContainer(ID_CAPABILITY_CONFIG);
-        configBody.setOutputMarkupId(true);
-        add(configBody);
-
-        DataView<CapabilityDto> capabilityDataView = new DataView<CapabilityDto>(ID_CAPABILITY_ROW, capabilityProvider) {
-
-            @Override
-            protected void populateItem(final Item<CapabilityDto> capabilityRow) {
-                final CapabilityDto dto = capabilityRow.getModelObject();
-
-                AjaxLink name = new AjaxLink(ID_CAPABILITY_LINK) {
-
-                    @Override
-                    public void onClick(AjaxRequestTarget target) {
-                        editCapabilityPerformed(target, dto);
-                    }
-                };
-                Label label = new Label(ID_CAPABILITY_NAME, new PropertyModel<>(dto, CapabilityDto.F_VALUE));
-                name.add(label);
-                capabilityRow.add(name);
-
-
-                AjaxLink deleteLink = new AjaxLink(ID_CAPABILITY_DELETE) {
-
-                    @Override
-                    public void onClick(AjaxRequestTarget target) {
-                        deleteCapabilityPerformed(target, dto);
-                    }
-                };
-                capabilityRow.add(deleteLink);
-
-                capabilityRow.add(AttributeModifier.replace("class", new AbstractReadOnlyModel<Object>() {
-
-                    @Override
-                    public Object getObject() {
-                        if(capabilityRow.getModelObject().isSelected()){
-                            return "success";
-                        }
-
-                        return null;
-                    }
-                }));
-            }
-        };
-        tableBody.add(capabilityDataView);
-
-        AjaxLink addLink = new AjaxLink(ID_CAPABILITY_ADD) {
-            @Override
-            public void onClick(AjaxRequestTarget target) {
-                addCapabilityPerformed(target);
-            }
-        };
-        add(addLink);
-
-        AjaxLink save = new AjaxLink(ID_BUTTON_SAVE) {
-
-            @Override
-            public void onClick(AjaxRequestTarget target) {
-                savePerformed(target);
-            }
-        };
-        add(save);
-
-        ModalWindow dialog = new AddCapabilityDialog(DIALOG_SELECT_CAPABILITY, model){
-
-            @Override
-            protected void addPerformed(AjaxRequestTarget target){
-                addCapabilitiesPerformed(target, getSelectedData());
-            }
-        };
-        add(dialog);
-    }
-
-    private WebMarkupContainer getTable(){
-        return (WebMarkupContainer)get(ID_CAPABILITY_TABLE);
-    }
-
-    private WebMarkupContainer getConfigContainer(){
-        return (WebMarkupContainer)get(ID_CAPABILITY_CONFIG);
-    }
-
-    private void deleteCapabilityPerformed(AjaxRequestTarget target, CapabilityDto rowModel){
-        for(CapabilityDto dto: model.getObject().getCapabilities()){
-            dto.setSelected(false);
-        }
-
-        model.getObject().getCapabilities().remove(rowModel);
-        target.add(getConfigContainer().replaceWith(new WebMarkupContainer(ID_CAPABILITY_CONFIG)));
-        target.add(getTable());
-    }
-
-    private void addCapabilitiesPerformed(AjaxRequestTarget target, List<CapabilityDto> selected){
-        for(CapabilityDto dto: selected){
-            dto.setSelected(false);
-            model.getObject().getCapabilities().add(dto);
-        }
-
-        target.add(getTable());
-        AddCapabilityDialog window = (AddCapabilityDialog)get(DIALOG_SELECT_CAPABILITY);
-        window.close(target);
-    }
-
-    private void addCapabilityPerformed(AjaxRequestTarget target){
-        AddCapabilityDialog window = (AddCapabilityDialog)get(DIALOG_SELECT_CAPABILITY);
-        window.updateTable(target, model);
-        window.show(target);
-    }
-
-    private void editCapabilityPerformed(final AjaxRequestTarget target, CapabilityDto capability){
-        for(CapabilityDto dto: model.getObject().getCapabilities()){
-            dto.setSelected(false);
-        }
-
-        WebMarkupContainer config = getConfigContainer();
-        WebMarkupContainer newConfig;
-        CapabilityType capType = capability.getCapability();
-
-        if(capType instanceof ActivationCapabilityType){
-            newConfig = new CapabilityActivationPanel(ID_CAPABILITY_CONFIG, new Model<>(capability)){
-
-                @Override
-                public IModel<List<QName>> createAttributeChoiceModel(){
-
-                    return new LoadableModel<List<QName>>(false) {
-                        @Override
-                        protected List<QName> load() {
-                            List<QName> choices = new ArrayList<>();
-
-                            PrismObject<ResourceType> resourcePrism = resourceModel.getObject();
-
-                            try {
-                                ResourceSchema schema = RefinedResourceSchema.getResourceSchema(resourcePrism, CapabilityPanel.this.getPageBase().getPrismContext());
-                                ObjectClassComplexTypeDefinition def = schema.findDefaultObjectClassDefinition(ShadowKindType.ACCOUNT);
-
-                                for(ResourceAttributeDefinition attribute: def.getAttributeDefinitions()){
-                                    choices.add(attribute.getName());
-                                }
-
-                            } catch (Exception e){
-                                LoggingUtils.logException(LOGGER, "Couldn't load resource schema attributes.", e);
-                                getPageBase().error("Couldn't load resource schema attributes" + e);
-                                //TODO - show this to the user
-                            }
-                            return choices;
-                        }
-                    };
-                }
-            };
-        } else if(capType instanceof ScriptCapabilityType){
-            newConfig = new CapabilityScriptPanel(ID_CAPABILITY_CONFIG, new Model<>(capability));
-        } else if(capType instanceof CredentialsCapabilityType){
-            newConfig = new CapabilityCredentialsPanel(ID_CAPABILITY_CONFIG, new Model<>(capability));
-        } else {
-            newConfig = new CapabilityValuePanel(ID_CAPABILITY_CONFIG, new Model<>(capability));
-         }
-
-        newConfig.setOutputMarkupId(true);
-        config.replaceWith(newConfig);
-
-        target.add(newConfig);
-        capability.setSelected(true);
-        target.add(getTable());
-    }
-
-    private void savePerformed(AjaxRequestTarget target){
-        PrismObject<ResourceType> oldResource;
-        PrismObject<ResourceType> newResource = (PrismObject<ResourceType>)getModel().getObject();
-        OperationResult result = new OperationResult(OPERATION_SAVE_CAPABILITIES);
-        ModelService modelService = getPageBase().getModelService();
-        ObjectDelta delta = null;
-
-        try{
-            ResourceType resource = newResource.asObjectable();
-            JAXBElement<? extends CapabilityType> jaxbCapability;
-            ObjectFactory capabilityFactory = new ObjectFactory();
-
-            List<CapabilityDto> oldCapabilities = loadCapabilitiesFromResource(((PrismObject<ResourceType>) getModel().getObject()).asObjectable());
-            List<CapabilityDto> newCapabilities = new ArrayList<>();
-
-            for(CapabilityDto dto: model.getObject().getCapabilities()){
-                if(!oldCapabilities.contains(dto)){
-                    newCapabilities.add(dto);
-                }
-            }
-
-            for(CapabilityDto dto: newCapabilities){
-                jaxbCapability = createJAXBCapability(dto.getCapability(), capabilityFactory);
-
-                if(jaxbCapability != null){
-                    resource.getCapabilities().getConfigured().getAny().add(jaxbCapability);
-                }
-
-            }
-
-            oldResource = WebModelUtils.loadObject(ResourceType.class, newResource.getOid(), result, getPageBase());
-            if(oldResource != null){
-                delta = oldResource.diff(newResource);
-            }
-
-            if(delta != null){
-
-                if(LOGGER.isTraceEnabled()){
-                    LOGGER.trace(delta.debugDump());
-                }
-
-                Collection<ObjectDelta<? extends ObjectType>> deltas = WebMiscUtil.createDeltaCollection(delta);
-                modelService.executeChanges(deltas, null, getPageBase().createSimpleTask(OPERATION_SAVE_CAPABILITIES), result);
-            }
-
-        } catch (Exception e){
-            LoggingUtils.logException(LOGGER, "Couldn't save capabilities", e);
-            result.recordFatalError("Couldn't save capabilities", e);
-        } finally {
-            result.computeStatusIfUnknown();
-        }
-
-        if(WebMiscUtil.isSuccessOrHandledError(result)){
-            getPageBase().showResultInSession(result);
-            setResponsePage(PageTest2.class);
-        } else {
-            getPageBase().showResult(result);
-            target.add(getPageBase().getFeedbackPanel());
-        }
-
-    }
-
-    private JAXBElement<? extends CapabilityType> createJAXBCapability(CapabilityType capability, ObjectFactory factory){
-        if(capability instanceof CreateCapabilityType){
-            return factory.createCreate((CreateCapabilityType)capability);
-        } else if(capability instanceof DeleteCapabilityType){
-            return factory.createDelete((DeleteCapabilityType)capability);
-        } else if(capability instanceof UpdateCapabilityType){
-            return factory.createUpdate((UpdateCapabilityType)capability);
-        } else if(capability instanceof ReadCapabilityType){
-            return factory.createRead((ReadCapabilityType)capability);
-        } else if(capability instanceof LiveSyncCapabilityType){
-            return factory.createLiveSync((LiveSyncCapabilityType)capability);
-        } else if(capability instanceof TestConnectionCapabilityType){
-            return factory.createTestConnection((TestConnectionCapabilityType)capability);
-        } else if(capability instanceof CredentialsCapabilityType){
-            return factory.createCredentials((CredentialsCapabilityType)capability);
-        } else if(capability instanceof ScriptCapabilityType){
-            return factory.createScript((ScriptCapabilityType)capability);
-        } else if(capability instanceof ActivationCapabilityType){
-            return factory.createActivation((ActivationCapabilityType)capability);
-        }
-
-        return null;
-    }
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.properties b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.properties
deleted file mode 100644
index 32eea0992b1..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright (c) 2010-2013 Evolveum
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-CapabilityPanel.title=Capabilities
\ No newline at end of file
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.html
index 0bddcc35264..3ec70f49c5b 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.html
@@ -23,18 +23,21 @@ <h3><wicket:message key="capabilityScriptPanel.label" /></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="capabilityScriptPanel.label.enabled" /></label>
+            <i wicket:id="enabledTooltip" wicket:message="title:CapabilityStep.script.tooltip.enabled"/>
         </dt>
         <dd><input wicket:id="enabled" type="checkbox" value="checked"/></dd>
     </dl>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="capabilityScriptPanel.label.onConnector" /></label>
+            <i wicket:id="onConnectorTooltip" wicket:message="title:CapabilityStep.script.tooltip.onConnector"/>
         </dt>
         <div wicket:id="onConnectorValue" />
     </dl>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="capabilityScriptPanel.label.onResource" /></label>
+            <i wicket:id="onResourceTooltip" wicket:message="title:CapabilityStep.script.tooltip.onResource"/>
         </dt>
         <div wicket:id="onResourceValue" />
     </dl>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.java
index 7e4a89a524d..77712c24ad2 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.java
@@ -19,8 +19,10 @@
 import com.evolveum.midpoint.web.component.form.multivalue.MultiValueTextPanel;
 import com.evolveum.midpoint.web.component.util.SimplePanel;
 import com.evolveum.midpoint.web.component.wizard.resource.dto.CapabilityDto;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ProvisioningScriptHostType;
 import com.evolveum.midpoint.xml.ns._public.resource.capabilities_3.ScriptCapabilityType;
+import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
@@ -37,6 +39,9 @@ public class CapabilityScriptPanel extends SimplePanel {
     private static final String ID_ENABLED = "enabled";
     private static final String ID_ON_CONNECTOR = "onConnectorValue";
     private static final String ID_ON_RESOURCE = "onResourceValue";
+    private static final String ID_T_ENABLED = "enabledTooltip";
+    private static final String ID_T_ON_CONNECTOR = "onConnectorTooltip";
+    private static final String ID_T_ON_RESOURCE = "onResourceTooltip";
 
     public CapabilityScriptPanel(String componentId, IModel<CapabilityDto> model){
         super(componentId, model);
@@ -52,6 +57,18 @@ protected void initLayout(){
 
         MultiValueTextPanel onResource = new MultiValueTextPanel(ID_ON_RESOURCE, Model.of(prepareOnResourceModel()));
         add(onResource);
+
+        Label enabledTooltip = new Label(ID_T_ENABLED);
+        enabledTooltip.add(new InfoTooltipBehavior());
+        add(enabledTooltip);
+
+        Label onConnectorTooltip = new Label(ID_T_ON_CONNECTOR);
+        onConnectorTooltip.add(new InfoTooltipBehavior());
+        add(onConnectorTooltip);
+
+        Label onResourceTooltip = new Label(ID_T_ON_RESOURCE);
+        onResourceTooltip.add(new InfoTooltipBehavior());
+        add(onResourceTooltip);
     }
 
     private IModel prepareOnConnectorModel(){
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.html
index 19e86649ecb..6c35308268e 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.html
@@ -38,6 +38,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceActivationEditor.label.fetchStrategy" /></label>
+                            <i wicket:id="existenceFetchStrategyTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.fetchStrategy"/>
                         </dt>
                         <dd>
                             <select wicket:id="existenceFetchStrategy" class="form-control input-sm"></select>
@@ -48,6 +49,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceActivationEditor.label.outbound" /></label>
+                            <i wicket:id="existenceOutboundTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.outbound"/>
                         </dt>
                         <div wicket:id="existenceOutbound" />
                     </dl>
@@ -56,6 +58,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceActivationEditor.label.inbound" /></label>
+                            <i wicket:id="existenceInboundTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.inbound"/>
                         </dt>
                         <div wicket:id="existenceInbound" />
                     </dl>
@@ -79,6 +82,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceActivationEditor.label.fetchStrategy" /></label>
+                            <i wicket:id="admStatusFetchStrategyTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.fetchStrategy"/>
                         </dt>
                         <dd>
                             <select wicket:id="admStatusFetchStrategy" class="form-control input-sm"></select>
@@ -89,6 +93,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceActivationEditor.label.outbound" /></label>
+                            <i wicket:id="admStatusOutboundTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.outbound"/>
                         </dt>
                         <div wicket:id="admStatusOutbound" />
                     </dl>
@@ -97,6 +102,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceActivationEditor.label.inbound" /></label>
+                            <i wicket:id="admStatusInboundTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.inbound"/>
                         </dt>
                         <div wicket:id="admStatusInbound" />
                     </dl>
@@ -121,6 +127,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceActivationEditor.label.fetchStrategy" /></label>
+                            <i wicket:id="validFromFetchStrategyTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.fetchStrategy"/>
                         </dt>
                         <dd>
                             <select wicket:id="validFromFetchStrategy" class="form-control input-sm"></select>
@@ -131,6 +138,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceActivationEditor.label.outbound" /></label>
+                            <i wicket:id="validFromOutboundTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.outbound"/>
                         </dt>
                         <div wicket:id="validFromOutbound" />
                     </dl>
@@ -139,6 +147,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceActivationEditor.label.inbound" /></label>
+                            <i wicket:id="validFromInboundTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.inbound"/>
                         </dt>
                         <div wicket:id="validFromInbound" />
                     </dl>
@@ -163,6 +172,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceActivationEditor.label.fetchStrategy" /></label>
+                            <i wicket:id="validToFetchStrategyTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.fetchStrategy"/>
                         </dt>
                         <dd>
                             <select wicket:id="validToFetchStrategy" class="form-control input-sm"></select>
@@ -173,6 +183,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceActivationEditor.label.outbound" /></label>
+                            <i wicket:id="validToOutboundTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.outbound"/>
                         </dt>
                         <div wicket:id="validToOutbound" />
                     </dl>
@@ -181,6 +192,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceActivationEditor.label.inbound" /></label>
+                            <i wicket:id="validToInboundTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.inbound"/>
                         </dt>
                         <div wicket:id="validToInbound" />
                     </dl>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
index 3f2f8174b8a..e9bd0cf350f 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
@@ -22,6 +22,7 @@
 import com.evolveum.midpoint.web.component.util.SimplePanel;
 import com.evolveum.midpoint.web.component.wizard.resource.component.schemahandling.modal.MappingEditorDialog;
 import com.evolveum.midpoint.web.component.wizard.resource.dto.MappingTypeDto;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AttributeFetchStrategyType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.MappingType;
@@ -29,6 +30,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceBidirectionalMappingType;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
+import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.EnumChoiceRenderer;
 import org.apache.wicket.model.IModel;
@@ -57,6 +59,18 @@ public class ResourceActivationEditor extends SimplePanel<ResourceActivationDefi
     private static final String ID_VALID_TO_OUT = "validToOutbound";
     private static final String ID_VALID_TO_IN = "validToInbound";
     private static final String ID_MODAL_MAPPING = "mappingEditor";
+    private static final String ID_T_EX_FETCH = "existenceFetchStrategyTooltip";
+    private static final String ID_T_EX_OUT = "existenceOutboundTooltip";
+    private static final String ID_T_EX_IN = "existenceInboundTooltip";
+    private static final String ID_T_ADM_FETCH = "admStatusFetchStrategyTooltip";
+    private static final String ID_T_ADM_OUT = "admStatusOutboundTooltip";
+    private static final String ID_T_ADM_IN = "admStatusInboundTooltip";
+    private static final String ID_T_VALID_F_FETCH = "validFromFetchStrategyTooltip";
+    private static final String ID_T_VALID_F_OUT = "validFromOutboundTooltip";
+    private static final String ID_T_VALID_F_IN = "validFromInboundTooltip";
+    private static final String ID_T_VALID_T_FETCH = "validToFetchStrategyTooltip";
+    private static final String ID_T_VALID_T_OUT = "validToOutboundTooltip";
+    private static final String ID_T_VALID_T_IN = "validToInboundTooltip";
 
     public ResourceActivationEditor(String id, IModel<ResourceActivationDefinitionType> model){
         super(id, model);
@@ -105,6 +119,54 @@ protected void initLayout(){
         prepareActivationPanelBody(ResourceActivationDefinitionType.F_VALID_TO.getLocalPart(), ID_VALID_TO_FS,
                 ID_VALID_TO_OUT, ID_VALID_TO_IN);
 
+        Label exFetchTooltip = new Label(ID_T_EX_FETCH);
+        exFetchTooltip.add(new InfoTooltipBehavior());
+        add(exFetchTooltip);
+
+        Label exOutTooltip = new Label(ID_T_EX_OUT);
+        exOutTooltip.add(new InfoTooltipBehavior());
+        add(exOutTooltip);
+
+        Label exInTooltip = new Label(ID_T_EX_IN);
+        exInTooltip.add(new InfoTooltipBehavior());
+        add(exInTooltip);
+
+        Label admFetchTooltip = new Label(ID_T_ADM_FETCH);
+        admFetchTooltip.add(new InfoTooltipBehavior());
+        add(admFetchTooltip);
+
+        Label admOutTooltip = new Label(ID_T_ADM_OUT);
+        admOutTooltip.add(new InfoTooltipBehavior());
+        add(admOutTooltip);
+
+        Label admInTooltip = new Label(ID_T_ADM_IN);
+        admInTooltip.add(new InfoTooltipBehavior());
+        add(admInTooltip);
+
+        Label validFromFetchTooltip = new Label(ID_T_VALID_F_FETCH);
+        validFromFetchTooltip.add(new InfoTooltipBehavior());
+        add(validFromFetchTooltip);
+
+        Label validFromOutTooltip = new Label(ID_T_VALID_F_OUT);
+        validFromOutTooltip.add(new InfoTooltipBehavior());
+        add(validFromOutTooltip);
+
+        Label validFromInTooltip = new Label(ID_T_VALID_F_IN);
+        validFromInTooltip.add(new InfoTooltipBehavior());
+        add(validFromInTooltip);
+
+        Label validToFetchTooltip = new Label(ID_T_VALID_T_FETCH);
+        validToFetchTooltip.add(new InfoTooltipBehavior());
+        add(validToFetchTooltip);
+
+        Label validToOutTooltip = new Label(ID_T_VALID_T_OUT);
+        validToOutTooltip.add(new InfoTooltipBehavior());
+        add(validToOutTooltip);
+
+        Label validToInTooltip = new Label(ID_T_VALID_T_IN);
+        validToInTooltip.add(new InfoTooltipBehavior());
+        add(validToInTooltip);
+
         initModals();
     }
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html
index 014b49c143f..e5ef60546b2 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html
@@ -41,6 +41,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceAssociationEditor.label.kind" /></label>
+                            <i wicket:id="kindTooltip" wicket:message="title:SchemaHandlingStep.association.tooltip.kind"/>
                         </dt>
                         <dd>
                             <select wicket:id="kind" class="form-control input-sm"></select>
@@ -51,6 +52,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceAssociationEditor.label.intent" /></label>
+                            <i wicket:id="intentTooltip" wicket:message="title:SchemaHandlingStep.association.tooltip.intent"/>
                         </dt>
                         <div wicket:id="intent" />
                     </dl>
@@ -58,6 +60,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceAssociationEditor.label.direction" /></label>
+                            <i wicket:id="directionTooltip" wicket:message="title:SchemaHandlingStep.association.tooltip.direction"/>
                         </dt>
                         <dd>
                             <select wicket:id="direction" class="form-control input-sm"></select>
@@ -67,6 +70,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceAssociationEditor.label.associationAttribute" /></label>
+                            <i wicket:id="associationAttributeTooltip" wicket:message="title:SchemaHandlingStep.association.tooltip.associationAttribute"/>
                         </dt>
                         <dd>
                             <select wicket:id="associationAttribute" class="form-control input-sm"></select>
@@ -76,6 +80,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceAssociationEditor.label.valueAttribute" /></label>
+                            <i wicket:id="valueAttributeTooltip" wicket:message="title:SchemaHandlingStep.association.tooltip.valueAttribute"/>
                         </dt>
                         <dd>
                             <select wicket:id="valueAttribute" class="form-control input-sm"></select>
@@ -85,6 +90,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceAssociationEditor.label.explicitRefIntegrity" /></label>
+                            <i wicket:id="explicitRefIntegrityTooltip" wicket:message="title:SchemaHandlingStep.association.tooltip.explicitRefIntegrity"/>
                         </dt>
                         <dd>
                             <input wicket:id="explicitRefIntegrity" type="checkbox" value="checked"/>
@@ -112,6 +118,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceAssociationEditor.label.reference" /></label>
+                            <i wicket:id="referenceTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.reference"/>
                         </dt>
                         <dd>
                             <select wicket:id="referenceSelect" class="form-control input-sm"></select>
@@ -122,6 +129,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceAssociationEditor.label.allow" /></label>
+                            <i wicket:id="allowTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.allow"/>
                         </dt>
                         <dd>
                             <input wicket:id="allowRef" type="checkbox" value="checked"/>
@@ -149,6 +157,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceAssociationEditor.label.limitations" /></label>
+                            <i wicket:id="limitationsTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.limitations"/>
                         </dt>
                         <dd>
                             <a wicket:id="buttonLimitations" class="btn btn-sm btn-primary" title="Edit">
@@ -163,6 +172,7 @@ <h4 class="panel-title">
                             <dl class="dl-horizontal">
                                 <dt>
                                     <label><wicket:message key="ResourceAssociationEditor.label.exclusiveStrong" /></label>
+                                    <i wicket:id="exclusiveStrongTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.exclusiveStrong"/>
                                 </dt>
                                 <dd>
                                     <input wicket:id="exclusiveStrong" type="checkbox" value="checked"/>
@@ -174,6 +184,7 @@ <h4 class="panel-title">
                             <dl class="dl-horizontal">
                                 <dt>
                                     <label><wicket:message key="ResourceAssociationEditor.label.tolerant" /></label>
+                                    <i wicket:id="tolerantTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.tolerant"/>
                                 </dt>
                                 <dd>
                                     <input wicket:id="tolerant" type="checkbox" value="checked"/>
@@ -186,6 +197,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceAssociationEditor.label.tolerantVP" /></label>
+                            <i wicket:id="tolerantVPTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.tolerantVP"/>
                         </dt>
                         <div wicket:id="tolerantValuePattern" />
                     </dl>
@@ -194,6 +206,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceAssociationEditor.label.intolerantVP" /></label>
+                            <i wicket:id="intolerantVPTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.intolerantVP"/>
                         </dt>
                         <div wicket:id="intolerantValuePattern" />
                     </dl>
@@ -201,6 +214,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceAssociationEditor.label.fetchStrategy" /></label>
+                            <i wicket:id="fetchStrategyTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.fetchStrategy"/>
                         </dt>
                         <dd>
                             <select wicket:id="fetchStrategy" class="form-control input-sm"></select>
@@ -210,6 +224,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceAssociationEditor.label.matchingRule" /></label>
+                            <i wicket:id="matchingRuleTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.matchingRule"/>
                         </dt>
                         <dd>
                             <select wicket:id="matchingRule" class="form-control input-sm"></select>
@@ -220,6 +235,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceAssociationEditor.label.outbound" /></label>
+                            <i wicket:id="outboundTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.outbound"/>
                         </dt>
                         <dd class="cap-dl-multivalue">
                             <div class="input-group">
@@ -237,6 +253,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceAssociationEditor.label.inbound" /></label>
+                            <i wicket:id="inboundTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.inbound"/>
                         </dt>
                         <div wicket:id="inbound" />
                     </dl>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
index 4f2e25bc41d..bad45d9d9bf 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
@@ -33,6 +33,7 @@
 import com.evolveum.midpoint.web.component.wizard.resource.component.schemahandling.modal.MappingEditorDialog;
 import com.evolveum.midpoint.web.component.wizard.resource.dto.MappingTypeDto;
 import com.evolveum.midpoint.web.page.admin.resources.PageResources;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import org.apache.wicket.RestartResponseException;
@@ -86,6 +87,24 @@ public class ResourceAssociationEditor extends SimplePanel<ResourceObjectAssocia
     private static final String ID_MODAL_LIMITATIONS = "limitationsEditor";
     private static final String ID_MODAL_MAPPING = "mappingEditor";
 
+    private static final String ID_T_REF = "referenceTooltip";
+    private static final String ID_T_ALLOW = "allowTooltip";
+    private static final String ID_T_LIMITATIONS = "limitationsTooltip";
+    private static final String ID_T_EXCLUSIVE_STRONG = "exclusiveStrongTooltip";
+    private static final String ID_T_TOLERANT = "tolerantTooltip";
+    private static final String ID_T_TOLERANT_VP = "tolerantVPTooltip";
+    private static final String ID_T_INTOLERANT_VP = "intolerantVPTooltip";
+    private static final String ID_T_FETCH = "fetchStrategyTooltip";
+    private static final String ID_T_MATCHING_RULE = "matchingRuleTooltip";
+    private static final String ID_T_OUTBOUND = "outboundTooltip";
+    private static final String ID_T_INBOUND = "inboundTooltip";
+    private static final String ID_T_KIND = "kindTooltip";
+    private static final String ID_T_INTENT = "intentTooltip";
+    private static final String ID_T_DIRECTION = "directionTooltip";
+    private static final String ID_T_ASSOCIATION_ATTRIBUTE = "associationAttributeTooltip";
+    private static final String ID_T_VALUE_ATTRIBUTE = "valueAttributeTooltip";
+    private static final String ID_T_EXPLICIT_REF_INTEGRITY = "explicitRefIntegrityTooltip";
+
     private PrismObject<ResourceType> resource;
     private ResourceObjectTypeDefinitionType objectType;
     private boolean nonSchemaRefValueAllowed = false;
@@ -353,6 +372,74 @@ protected void editPerformed(AjaxRequestTarget target, MappingType object){
         inbound.setOutputMarkupId(true);
         add(inbound);
 
+        Label kindTooltip = new Label(ID_T_KIND);
+        kindTooltip.add(new InfoTooltipBehavior());
+        add(kindTooltip);
+
+        Label intentTooltip = new Label(ID_T_INTENT);
+        intentTooltip.add(new InfoTooltipBehavior());
+        add(intentTooltip);
+
+        Label directionTooltip = new Label(ID_T_DIRECTION);
+        directionTooltip.add(new InfoTooltipBehavior());
+        add(directionTooltip);
+
+        Label assAttributeTooltip = new Label(ID_T_ASSOCIATION_ATTRIBUTE);
+        assAttributeTooltip.add(new InfoTooltipBehavior());
+        add(assAttributeTooltip);
+
+        Label valueAttributeTooltip = new Label(ID_T_VALUE_ATTRIBUTE);
+        valueAttributeTooltip.add(new InfoTooltipBehavior());
+        add(valueAttributeTooltip);
+
+        Label integrityTooltip = new Label(ID_T_EXPLICIT_REF_INTEGRITY);
+        integrityTooltip.add(new InfoTooltipBehavior());
+        add(integrityTooltip);
+
+        Label refTooltip = new Label(ID_T_REF);
+        refTooltip.add(new InfoTooltipBehavior());
+        add(refTooltip);
+
+        Label allowTooltip = new Label(ID_T_ALLOW);
+        allowTooltip.add(new InfoTooltipBehavior());
+        add(allowTooltip);
+
+        Label limitationsTooltip = new Label(ID_T_LIMITATIONS);
+        limitationsTooltip.add(new InfoTooltipBehavior());
+        add(limitationsTooltip);
+
+        Label exclusiveStrongTooltip = new Label(ID_T_EXCLUSIVE_STRONG);
+        exclusiveStrongTooltip.add(new InfoTooltipBehavior());
+        add(exclusiveStrongTooltip);
+
+        Label tolerantTooltip = new Label(ID_T_TOLERANT);
+        tolerantTooltip.add(new InfoTooltipBehavior());
+        add(tolerantTooltip);
+
+        Label tolerantVPTooltip = new Label(ID_T_TOLERANT_VP);
+        tolerantVPTooltip.add(new InfoTooltipBehavior());
+        add(tolerantVPTooltip);
+
+        Label intolerantVPTooltip = new Label(ID_T_INTOLERANT_VP);
+        intolerantVPTooltip.add(new InfoTooltipBehavior());
+        add(intolerantVPTooltip);
+
+        Label fetchTooltip = new Label(ID_T_FETCH);
+        fetchTooltip.add(new InfoTooltipBehavior());
+        add(fetchTooltip);
+
+        Label matchingRuleTooltip = new Label(ID_T_MATCHING_RULE);
+        matchingRuleTooltip.add(new InfoTooltipBehavior());
+        add(matchingRuleTooltip);
+
+        Label outboundTooltip = new Label(ID_T_OUTBOUND);
+        outboundTooltip.add(new InfoTooltipBehavior());
+        add(outboundTooltip);
+
+        Label inboundTooltip = new Label(ID_T_INBOUND);
+        inboundTooltip.add(new InfoTooltipBehavior());
+        add(inboundTooltip);
+
         initModals();
     }
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.properties b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.properties
index 7d0cadcec86..bd12f241798 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.properties
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.properties
@@ -25,14 +25,14 @@ ResourceAssociationEditor.label.association=Association specific attributes
 ResourceAssociationEditor.label.resourceItem=ResourceItem specific attributes
 
 ResourceAssociationEditor.label.reference=Ref.
-ResourceAssociationEditor.label.allow=Allow non-schema ref.
+ResourceAssociationEditor.label.allow=Non-schema ref.
 ResourceAssociationEditor.label.displayName=Display name
 ResourceAssociationEditor.label.description=Description
 ResourceAssociationEditor.label.limitations=Limitations
 ResourceAssociationEditor.label.exclusiveStrong=Exclusive strong
 ResourceAssociationEditor.label.tolerant=Tolerant
-ResourceAssociationEditor.label.tolerantVP=Tolerant value pattern
-ResourceAssociationEditor.label.intolerantVP=Intolerant value pattern
+ResourceAssociationEditor.label.tolerantVP=Tolerant VP
+ResourceAssociationEditor.label.intolerantVP=Intolerant VP
 ResourceAssociationEditor.label.fetchStrategy=Fetch Strategy
 ResourceAssociationEditor.label.matchingRule=Matching rule
 ResourceAssociationEditor.label.outbound=Outbound
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.html
index 3e7ef03d8dd..992a537fee7 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.html
@@ -24,6 +24,7 @@ <h3><span wicket:id="label"></span></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="ResourceAttributeEditor.label.reference" /></label>
+            <i wicket:id="referenceTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.reference"/>
         </dt>
         <dd>
             <select wicket:id="referenceSelect" class="form-control input-sm"></select>
@@ -34,6 +35,7 @@ <h3><span wicket:id="label"></span></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="ResourceAttributeEditor.label.allow" /></label>
+            <i wicket:id="allowTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.allow"/>
         </dt>
         <dd>
             <input wicket:id="allowRef" type="checkbox" value="checked"/>
@@ -61,6 +63,7 @@ <h3><span wicket:id="label"></span></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="ResourceAttributeEditor.label.limitations" /></label>
+            <i wicket:id="limitationsTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.limitations"/>
         </dt>
         <dd>
             <a wicket:id="buttonLimitations" class="btn btn-sm btn-primary" title="Edit">
@@ -75,6 +78,7 @@ <h3><span wicket:id="label"></span></h3>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="ResourceAttributeEditor.label.exclusiveStrong" /></label>
+                    <i wicket:id="exclusiveStrongTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.exclusiveStrong"/>
                 </dt>
                 <dd>
                     <input wicket:id="exclusiveStrong" type="checkbox" value="checked"/>
@@ -86,6 +90,7 @@ <h3><span wicket:id="label"></span></h3>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="ResourceAttributeEditor.label.tolerant" /></label>
+                    <i wicket:id="tolerantTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.tolerant"/>
                 </dt>
                 <dd>
                     <input wicket:id="tolerant" type="checkbox" value="checked"/>
@@ -98,6 +103,7 @@ <h3><span wicket:id="label"></span></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="ResourceAttributeEditor.label.tolerantVP" /></label>
+            <i wicket:id="tolerantVPTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.tolerantVP"/>
         </dt>
         <div wicket:id="tolerantValuePattern" />
     </dl>
@@ -106,6 +112,7 @@ <h3><span wicket:id="label"></span></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="ResourceAttributeEditor.label.intolerantVP" /></label>
+            <i wicket:id="intolerantVPTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.intolerantVP"/>
         </dt>
         <div wicket:id="intolerantValuePattern" />
     </dl>
@@ -113,6 +120,7 @@ <h3><span wicket:id="label"></span></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="ResourceAttributeEditor.label.fetchStrategy" /></label>
+            <i wicket:id="fetchStrategyTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.fetchStrategy"/>
         </dt>
         <dd>
             <select wicket:id="fetchStrategy" class="form-control input-sm"></select>
@@ -122,6 +130,7 @@ <h3><span wicket:id="label"></span></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="ResourceAttributeEditor.label.matchingRule" /></label>
+            <i wicket:id="matchingRuleTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.matchingRule"/>
         </dt>
         <dd>
             <select wicket:id="matchingRule" class="form-control input-sm"></select>
@@ -132,6 +141,7 @@ <h3><span wicket:id="label"></span></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="ResourceAttributeEditor.label.outbound" /></label>
+            <i wicket:id="outboundTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.outbound"/>
         </dt>
         <dd class="cap-dl-multivalue">
             <div class="input-group">
@@ -149,6 +159,7 @@ <h3><span wicket:id="label"></span></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="ResourceAttributeEditor.label.inbound" /></label>
+            <i wicket:id="inboundTooltip" wicket:message="title:SchemaHandlingStep.attribute.tooltip.inbound"/>
         </dt>
         <div wicket:id="inbound" />
     </dl>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
index d29b54f28dd..c9daf072516 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
@@ -31,6 +31,7 @@
 import com.evolveum.midpoint.web.component.wizard.resource.component.schemahandling.modal.MappingEditorDialog;
 import com.evolveum.midpoint.web.component.wizard.resource.dto.MappingTypeDto;
 import com.evolveum.midpoint.web.page.admin.resources.PageResources;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import org.apache.wicket.RestartResponseException;
@@ -77,6 +78,17 @@ public class ResourceAttributeEditor extends SimplePanel<ResourceAttributeDefini
     private static final String ID_BUTTON_LIMITATIONS = "buttonLimitations";
     private static final String ID_MODAL_LIMITATIONS = "limitationsEditor";
     private static final String ID_MODAL_MAPPING = "mappingEditor";
+    private static final String ID_T_REF = "referenceTooltip";
+    private static final String ID_T_ALLOW = "allowTooltip";
+    private static final String ID_T_LIMITATIONS = "limitationsTooltip";
+    private static final String ID_T_EXCLUSIVE_STRONG = "exclusiveStrongTooltip";
+    private static final String ID_T_TOLERANT = "tolerantTooltip";
+    private static final String ID_T_TOLERANT_VP = "tolerantVPTooltip";
+    private static final String ID_T_INTOLERANT_VP = "intolerantVPTooltip";
+    private static final String ID_T_FETCH = "fetchStrategyTooltip";
+    private static final String ID_T_MATCHING_RULE = "matchingRuleTooltip";
+    private static final String ID_T_OUTBOUND = "outboundTooltip";
+    private static final String ID_T_INBOUND = "inboundTooltip";
 
     private PrismObject<ResourceType> resource;
     private ResourceObjectTypeDefinitionType objectType;
@@ -277,6 +289,50 @@ protected void editPerformed(AjaxRequestTarget target, MappingType object){
         inbound.setOutputMarkupId(true);
         add(inbound);
 
+        Label refTooltip = new Label(ID_T_REF);
+        refTooltip.add(new InfoTooltipBehavior());
+        add(refTooltip);
+
+        Label allowTooltip = new Label(ID_T_ALLOW);
+        allowTooltip.add(new InfoTooltipBehavior());
+        add(allowTooltip);
+
+        Label limitationsTooltip = new Label(ID_T_LIMITATIONS);
+        limitationsTooltip.add(new InfoTooltipBehavior());
+        add(limitationsTooltip);
+
+        Label exclusiveStrongTooltip = new Label(ID_T_EXCLUSIVE_STRONG);
+        exclusiveStrongTooltip.add(new InfoTooltipBehavior());
+        add(exclusiveStrongTooltip);
+
+        Label tolerantTooltip = new Label(ID_T_TOLERANT);
+        tolerantTooltip.add(new InfoTooltipBehavior());
+        add(tolerantTooltip);
+
+        Label tolerantVPTooltip = new Label(ID_T_TOLERANT_VP);
+        tolerantVPTooltip.add(new InfoTooltipBehavior());
+        add(tolerantVPTooltip);
+
+        Label intolerantVPTooltip = new Label(ID_T_INTOLERANT_VP);
+        intolerantVPTooltip.add(new InfoTooltipBehavior());
+        add(intolerantVPTooltip);
+
+        Label fetchTooltip = new Label(ID_T_FETCH);
+        fetchTooltip.add(new InfoTooltipBehavior());
+        add(fetchTooltip);
+
+        Label matchingRuleTooltip = new Label(ID_T_MATCHING_RULE);
+        matchingRuleTooltip.add(new InfoTooltipBehavior());
+        add(matchingRuleTooltip);
+
+        Label outboundTooltip = new Label(ID_T_OUTBOUND);
+        outboundTooltip.add(new InfoTooltipBehavior());
+        add(outboundTooltip);
+
+        Label inboundTooltip = new Label(ID_T_INBOUND);
+        inboundTooltip.add(new InfoTooltipBehavior());
+        add(inboundTooltip);
+
         initModals();
     }
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.properties b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.properties
index 97567cd18a9..2521a5a211b 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.properties
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.properties
@@ -16,14 +16,14 @@
 ResourceAttributeEditor.label.edit=Edit '{0}' Attribute
 ResourceAttributeEditor.label.new=Create new attribute
 ResourceAttributeEditor.label.reference=Ref.
-ResourceAttributeEditor.label.allow=Allow non-schema ref.
+ResourceAttributeEditor.label.allow=Non-schema ref.
 ResourceAttributeEditor.label.displayName=Display name
 ResourceAttributeEditor.label.description=Description
 ResourceAttributeEditor.label.limitations=Limitations
 ResourceAttributeEditor.label.exclusiveStrong=Exclusive strong
 ResourceAttributeEditor.label.tolerant=Tolerant
-ResourceAttributeEditor.label.tolerantVP=Tolerant value pattern
-ResourceAttributeEditor.label.intolerantVP=Intolerant value pattern
+ResourceAttributeEditor.label.tolerantVP=Tolerant VP
+ResourceAttributeEditor.label.intolerantVP=Intolerant VP
 ResourceAttributeEditor.label.fetchStrategy=Fetch Strategy
 ResourceAttributeEditor.label.matchingRule=Matching rule
 ResourceAttributeEditor.label.outbound=Outbound
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.html
index 333102e84bb..59231f5191f 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.html
@@ -24,6 +24,7 @@ <h3><wicket:message key="ResourceCredentialsEditor.label" /></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="ResourceCredentialsEditor.label.fetchStrategy" /></label>
+            <i wicket:id="fetchStrategyTooltip" wicket:message="title:SchemaHandlingStep.credentials.tooltip.fetchStrategy"/>
         </dt>
         <dd>
             <select wicket:id="fetchStrategy" class="form-control input-sm"></select>
@@ -34,6 +35,7 @@ <h3><wicket:message key="ResourceCredentialsEditor.label" /></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="ResourceCredentialsEditor.label.outbound" /></label>
+            <i wicket:id="outboundTooltip" wicket:message="title:SchemaHandlingStep.credentials.tooltip.outbound"/>
         </dt>
         <dd>
             <div class="input-group">
@@ -51,6 +53,7 @@ <h3><wicket:message key="ResourceCredentialsEditor.label" /></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="ResourceCredentialsEditor.label.inbound" /></label>
+            <i wicket:id="inboundTooltip" wicket:message="title:SchemaHandlingStep.credentials.tooltip.inbound"/>
         </dt>
         <div wicket:id="inbound" />
     </dl>
@@ -58,6 +61,7 @@ <h3><wicket:message key="ResourceCredentialsEditor.label" /></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="ResourceCredentialsEditor.label.passwordPolicyRef" /></label>
+            <i wicket:id="passwordPolicyRefTooltip" wicket:message="title:SchemaHandlingStep.credentials.tooltip.passwordPolicyRef"/>
         </dt>
         <dd>
             <select wicket:id="passPolicy" class="form-control input-sm"></select>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
index f4dfe75fcd8..530b3956426 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
@@ -27,11 +27,13 @@
 import com.evolveum.midpoint.web.component.util.SimplePanel;
 import com.evolveum.midpoint.web.component.wizard.resource.component.schemahandling.modal.MappingEditorDialog;
 import com.evolveum.midpoint.web.component.wizard.resource.dto.MappingTypeDto;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
+import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.*;
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
@@ -59,6 +61,10 @@ public class ResourceCredentialsEditor extends SimplePanel<ResourceCredentialsDe
     private static final String ID_INBOUND = "inbound";
     private static final String ID_PASS_POLICY = "passPolicy";
     private static final String ID_MODAL_MAPPING = "mappingEditor";
+    private static final String ID_T_FETCH = "fetchStrategyTooltip";
+    private static final String ID_T_OUT = "outboundTooltip";
+    private static final String ID_T_IN = "inboundTooltip";
+    private static final String ID_T_PASS_POLICY = "passwordPolicyRefTooltip";
 
     private Map<String, String> passPolicyMap = new HashMap<>();
 
@@ -167,6 +173,22 @@ public String getIdValue(ObjectReferenceType object, int index) {
         });
         add(passwordPolicy);
 
+        Label fetchTooltip = new Label(ID_T_FETCH);
+        fetchTooltip.add(new InfoTooltipBehavior());
+        add(fetchTooltip);
+
+        Label outTooltip = new Label(ID_T_OUT);
+        outTooltip.add(new InfoTooltipBehavior());
+        add(outTooltip);
+
+        Label inTooltip = new Label(ID_T_IN);
+        inTooltip.add(new InfoTooltipBehavior());
+        add(inTooltip);
+
+        Label passPolicyTooltip = new Label(ID_T_PASS_POLICY);
+        passPolicyTooltip.add(new InfoTooltipBehavior());
+        add(passPolicyTooltip);
+
         initModals();
     }
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.html
index 27c2852eb5c..145dfa5eed6 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.html
@@ -43,6 +43,7 @@ <h4 class="panel-title">
                         <dl class="dl-horizontal">
                             <dt>
                                 <label><wicket:message key="ResourceDependencyEditor.label.order" /></label>
+                                <i wicket:id="orderTooltip" wicket:message="title:SchemaHandlingStep.dependency.tooltip.order"/>
                             </dt>
                             <dd>
                                 <input wicket:id="order" class="form-control input-sm" />
@@ -52,6 +53,7 @@ <h4 class="panel-title">
                         <dl class="dl-horizontal">
                             <dt>
                                 <label><wicket:message key="ResourceDependencyEditor.label.strictness" /></label>
+                                <i wicket:id="strictnessTooltip" wicket:message="title:SchemaHandlingStep.dependency.tooltip.strictness"/>
                             </dt>
                             <dd>
                                 <select wicket:id="strictness" class="form-control input-sm"></select>
@@ -61,6 +63,7 @@ <h4 class="panel-title">
                         <dl class="dl-horizontal">
                             <dt>
                                 <label><wicket:message key="ResourceDependencyEditor.label.kind" /></label>
+                                <i wicket:id="kindTooltip" wicket:message="title:SchemaHandlingStep.dependency.tooltip.kind"/>
                             </dt>
                             <dd>
                                 <select wicket:id="kind" class="form-control input-sm"></select>
@@ -70,6 +73,7 @@ <h4 class="panel-title">
                         <dl class="dl-horizontal">
                             <dt>
                                 <label><wicket:message key="ResourceDependencyEditor.label.intent" /></label>
+                                <i wicket:id="intentTooltip" wicket:message="title:SchemaHandlingStep.dependency.tooltip.intent"/>
                             </dt>
                             <dd>
                                 <input wicket:id="intent" type="text" class="form-control input-sm" value=""/>
@@ -79,6 +83,7 @@ <h4 class="panel-title">
                         <dl class="dl-horizontal">
                             <dt>
                                 <label><wicket:message key="ResourceDependencyEditor.label.resourceRef" /></label>
+                                <i wicket:id="resourceRefTooltip" wicket:message="title:SchemaHandlingStep.dependency.tooltip.resourceRef"/>
                             </dt>
                             <dd class="cap-dl-multivalue">
                                 <select wicket:id="resourceRef" class="form-control input-sm"></select>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java
index a1d7184a44d..2aa84a271ac 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java
@@ -24,6 +24,7 @@
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.util.SimplePanel;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import org.apache.wicket.AttributeModifier;
@@ -73,6 +74,11 @@ private static enum ChangeState{
     private static final String ID_REF = "resourceRef";
     private static final String ID_ADD_BUTTON = "addButton";
     private static final String ID_DELETE_BUTTON = "deleteDependency";
+    private static final String ID_T_ORDER = "orderTooltip";
+    private static final String ID_T_STRICTNESS = "strictnessTooltip";
+    private static final String ID_T_KIND = "kindTooltip";
+    private static final String ID_T_INTENT = "intentTooltip";
+    private static final String ID_T_RESOURCE_REF = "resourceRefTooltip";
 
     private ChangeState changeState = ChangeState.FIRST;
     private Map<String, String> resourceMap = new HashMap<>();
@@ -81,10 +87,6 @@ public ResourceDependencyEditor(String id, IModel<List<ResourceObjectTypeDepende
         super(id, model);
     }
 
-    public List<ResourceObjectTypeDependencyType> getDependencyList(){
-        return getModel().getObject();
-    }
-
     @Override
     public IModel<List<ResourceObjectTypeDependencyType>> getModel(){
         IModel<List<ResourceObjectTypeDependencyType>> model = super.getModel();
@@ -189,6 +191,26 @@ public String getIdValue(ObjectReferenceType object, int index) {
                 });
                 resource.add(prepareAjaxOnComponentTagUpdateBehavior());
                 dependencyBody.add(resource);
+
+                Label orderTooltip = new Label(ID_T_ORDER);
+                orderTooltip.add(new InfoTooltipBehavior());
+                dependencyBody.add(orderTooltip);
+
+                Label strictnessTooltip = new Label(ID_T_STRICTNESS);
+                strictnessTooltip.add(new InfoTooltipBehavior());
+                dependencyBody.add(strictnessTooltip);
+
+                Label kindTooltip = new Label(ID_T_KIND);
+                kindTooltip.add(new InfoTooltipBehavior());
+                dependencyBody.add(kindTooltip);
+
+                Label intentTooltip = new Label(ID_T_INTENT);
+                intentTooltip.add(new InfoTooltipBehavior());
+                dependencyBody.add(intentTooltip);
+
+                Label resourceRefTooltip = new Label(ID_T_RESOURCE_REF);
+                resourceRefTooltip.add(new InfoTooltipBehavior());
+                dependencyBody.add(resourceRefTooltip);
             }
         };
         repeater.setOutputMarkupId(true);
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.html
index 4aadd3c2096..3b13133968e 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.html
@@ -24,6 +24,7 @@ <h3><wicket:message key="ResourceIterationEditor.label" /></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="ResourceIterationEditor.label.maxIteration" /></label>
+            <i wicket:id="maxIterationTooltip" wicket:message="title:SchemaHandlingStep.iteration.tooltip.maxIteration"/>
         </dt>
         <dd>
             <input wicket:id="maxIteration" type="text" class="form-control input-sm" value=""/>
@@ -58,6 +59,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceIterationEditor.label.variable" /></label>
+                            <i wicket:id="tokenVariableTooltip" wicket:message="title:SchemaHandlingStep.iteration.tooltip.variable"/>
                         </dt>
                         <div wicket:id="tokenVariableList" />
                     </dl>
@@ -65,6 +67,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceIterationEditor.label.returnMultiplicity" /></label>
+                            <i wicket:id="tokenReturnMultiplicityTooltip" wicket:message="title:SchemaHandlingStep.iteration.tooltip.returnMultiplicity"/>
                         </dt>
                         <dd>
                             <select wicket:id="tokenReturnMultiplicity" class="form-control input-sm"></select>
@@ -140,6 +143,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceIterationEditor.label.variable" /></label>
+                            <i wicket:id="preVariableTooltip" wicket:message="title:SchemaHandlingStep.iteration.tooltip.variable"/>
                         </dt>
                         <div wicket:id="preVariableList" />
                     </dl>
@@ -147,6 +151,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceIterationEditor.label.returnMultiplicity" /></label>
+                            <i wicket:id="preReturnMultiplicityTooltip" wicket:message="title:SchemaHandlingStep.iteration.tooltip.returnMultiplicity"/>
                         </dt>
                         <dd>
                             <select wicket:id="preReturnMultiplicity" class="form-control input-sm"></select>
@@ -222,6 +227,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceIterationEditor.label.variable" /></label>
+                            <i wicket:id="postVariableTooltip" wicket:message="title:SchemaHandlingStep.iteration.tooltip.variable"/>
                         </dt>
                         <div wicket:id="postVariableList" />
                     </dl>
@@ -229,6 +235,7 @@ <h4 class="panel-title">
                     <dl class="dl-horizontal">
                         <dt>
                             <label><wicket:message key="ResourceIterationEditor.label.returnMultiplicity" /></label>
+                            <i wicket:id="postReturnMultiplicityTooltip" wicket:message="title:SchemaHandlingStep.iteration.tooltip.returnMultiplicity"/>
                         </dt>
                         <dd>
                             <select wicket:id="postReturnMultiplicity" class="form-control input-sm"></select>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.java
index 755e1f00bfc..cdbd7e57cbf 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.java
@@ -27,10 +27,12 @@
 import com.evolveum.midpoint.web.component.util.SimplePanel;
 import com.evolveum.midpoint.web.component.wizard.resource.component.schemahandling.modal.ExpressionVariableEditorDialog;
 import com.evolveum.midpoint.web.component.wizard.resource.dto.IterationSpecificationTypeDto;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
+import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.*;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
@@ -80,6 +82,13 @@ public class ResourceIterationEditor extends SimplePanel<IterationSpecificationT
     private static final String ID_PRE_POLICY_CONTAINER = "prePolicyContainer";
     private static final String ID_POST_LANG_CONTAINER = "postLanguageContainer";
     private static final String ID_POST_POLICY_CONTAINER = "postPolicyContainer";
+    private static final String ID_T_MAX_ITERATION = "maxIterationTooltip";
+    private static final String ID_T_TOKEN_VAR = "tokenVariableTooltip";
+    private static final String ID_T_TOKEN_MUL = "tokenReturnMultiplicityTooltip";
+    private static final String ID_T_PRE_VAR = "preVariableTooltip";
+    private static final String ID_T_PRE_MUL = "preReturnMultiplicityTooltip";
+    private static final String ID_T_POST_VAR = "postVariableTooltip";
+    private static final String ID_T_POST_MUL = "postReturnMultiplicityTooltip";
 
     private Map<String, String> policyMap = new HashMap<>();
     private IModel<IterationSpecificationTypeDto> model;
@@ -149,6 +158,34 @@ protected void initLayout(){
                 ID_POST_EXPR_LANG, ID_POST_EXPR_POLICY, IterationSpecificationTypeDto.POST_EXPRESSION_PREFIX,
                 ID_POST_LANG_CONTAINER, ID_POST_POLICY_CONTAINER);
 
+        Label maxItTooltip = new Label(ID_T_MAX_ITERATION);
+        maxItTooltip.add(new InfoTooltipBehavior());
+        add(maxItTooltip);
+
+        Label tokenVarTooltip = new Label(ID_T_TOKEN_VAR);
+        tokenVarTooltip.add(new InfoTooltipBehavior());
+        add(tokenVarTooltip);
+
+        Label tokenMulTooltip = new Label(ID_T_TOKEN_MUL);
+        tokenMulTooltip.add(new InfoTooltipBehavior());
+        add(tokenMulTooltip);
+
+        Label preVarTooltip = new Label(ID_T_PRE_VAR);
+        preVarTooltip.add(new InfoTooltipBehavior());
+        add(preVarTooltip);
+
+        Label preMulTooltip = new Label(ID_T_PRE_MUL);
+        preMulTooltip.add(new InfoTooltipBehavior());
+        add(preMulTooltip);
+
+        Label postVarTooltip = new Label(ID_T_POST_VAR);
+        postVarTooltip.add(new InfoTooltipBehavior());
+        add(postVarTooltip);
+
+        Label postMulTooltip = new Label(ID_T_POST_MUL);
+        postMulTooltip.add(new InfoTooltipBehavior());
+        add(postMulTooltip);
+
         initModals();
     }
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.html
index f7b26d8c30f..b936459c909 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.html
@@ -42,6 +42,7 @@ <h4 class="panel-title">
                         <dl class="dl-horizontal">
                             <dt>
                                 <label><wicket:message key="ResourceProtectedEditor.label.name" /></label>
+                                <i wicket:id="nameTooltip" wicket:message="title:SchemaHandlingStep.protected.tooltip.name"/>
                             </dt>
                             <dd>
                                 <input wicket:id="name" type="text" class="form-control input-sm" value="first"/>
@@ -51,13 +52,18 @@ <h4 class="panel-title">
                         <dl class="dl-horizontal">
                             <dt>
                                 <label><wicket:message key="ResourceProtectedEditor.label.uid" /></label>
+                                <i wicket:id="uidTooltip" wicket:message="title:SchemaHandlingStep.protected.tooltip.uid"/>
                             </dt>
                             <dd>
                                 <input wicket:id="uid" type="text" class="form-control input-sm" value=""/>
                             </dd>
                         </dl>
 
-                        <h4><wicket:message key="ResourceProtectedEditor.label.filter" /></h4>
+                        <h4>
+                            <wicket:message key="ResourceProtectedEditor.label.filter" />
+                            <i wicket:id="filterTooltip" wicket:message="title:SchemaHandlingStep.protected.tooltip.filter"/>
+                        </h4>
+
                         <div wicket:id="filterClause" />
                     </div>
                 </div>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java
index 9394eec29a4..70cdba0fb93 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java
@@ -18,6 +18,7 @@
 
 import com.evolveum.midpoint.web.component.input.SearchFilterPanel;
 import com.evolveum.midpoint.web.component.util.SimplePanel;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceObjectPatternType;
 import com.evolveum.prism.xml.ns._public.query_3.SearchFilterType;
 import org.apache.wicket.AttributeModifier;
@@ -55,6 +56,9 @@ private static enum ChangeState{
     private static final String ID_FILTER_EDITOR = "filterClause";
     private static final String ID_BUTTON_ADD = "addButton";
     private static final String ID_BUTTON_DELETE = "deleteAccount";
+    private static final String ID_T_NAME = "nameTooltip";
+    private static final String ID_T_UID = "uidTooltip";
+    private static final String ID_T_FILTER = "filterTooltip";
 
     private ChangeState changeState = ChangeState.FIRST;
 
@@ -153,6 +157,18 @@ public String getObject() {
                 SearchFilterPanel searchFilterPanel = new SearchFilterPanel<>(ID_FILTER_EDITOR,
                         new PropertyModel<SearchFilterType>(item.getModelObject(), "filter"));
                 accountBody.add(searchFilterPanel);
+
+                Label nameTooltip = new Label(ID_T_NAME);
+                nameTooltip.add(new InfoTooltipBehavior());
+                accountBody.add(nameTooltip);
+
+                Label uidTooltip = new Label(ID_T_UID);
+                uidTooltip.add(new InfoTooltipBehavior());
+                accountBody.add(uidTooltip);
+
+                Label filterTooltip = new Label(ID_T_FILTER);
+                filterTooltip.add(new InfoTooltipBehavior());
+                accountBody.add(filterTooltip);
             }
         };
         repeater.setOutputMarkupId(true);
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.html
index 96ace2c24d3..d52585adeea 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.html
@@ -52,17 +52,26 @@ <h4 class="panel-title">
 
                     <div wicket:id="accountBodyContainer" id="collapseOne" class="panel-collapse collapse">
                         <div style=".dl-horizontal{margin-bottom: 15px;}" class="panel-body">
-                            <h4><wicket:message key="LimitationsEditorDialog.label.layers" /></h4>
+                            <h4>
+                                <wicket:message key="LimitationsEditorDialog.label.layers" />
+                                <i wicket:id="layersTooltip" wicket:message="title:SchemaHandlingStep.limitations.tooltip.layers"/>
+                            </h4>
                             <div class="form-group" wicket:id="layerSchema" />
                             <div class="form-group" wicket:id="layerModel" />
                             <div class="form-group" wicket:id="layerPresentation" />
 
-                            <h4><wicket:message key="LimitationsEditorDialog.label.propertyAccess" /></h4>
+                            <h4>
+                                <wicket:message key="LimitationsEditorDialog.label.propertyAccess" />
+                                <i wicket:id="propertyAccessTooltip" wicket:message="title:SchemaHandlingStep.limitations.tooltip.propertyAccess"/>
+                            </h4>
                             <div class="form-group" wicket:id="addAccess" />
                             <div class="form-group" wicket:id="readAccess" />
                             <div class="form-group" wicket:id="modifyAccess" />
 
-                            <h4><wicket:message key="LimitationsEditorDialog.label.other" /></h4>
+                            <h4>
+                                <wicket:message key="LimitationsEditorDialog.label.other" />
+                                <i wicket:id="otherTooltip" wicket:message="title:SchemaHandlingStep.limitations.tooltip.other"/>
+                            </h4>
                             <div class="form-group" wicket:id="minOccurs" />
                             <div class="form-group" wicket:id="maxOccurs" />
                             <div class="form-group" wicket:id="ignore" />
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java
index d99debd3b40..f9c62f995a1 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java
@@ -20,6 +20,7 @@
 import com.evolveum.midpoint.web.component.form.TextFormGroup;
 import com.evolveum.midpoint.web.component.util.LoadableModel;
 import com.evolveum.midpoint.web.component.wizard.resource.dto.PropertyLimitationsTypeDto;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.LayerType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.PropertyAccessType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.PropertyLimitationsType;
@@ -68,6 +69,9 @@ private static enum ChangeState{
     private static final String ID_BUTTON_SAVE = "saveButton";
     private static final String ID_BUTTON_CANCEL = "cancelButton";
     private static final String ID_MAIN_FORM = "mainForm";
+    private static final String ID_T_LAYERS = "layersTooltip";
+    private static final String ID_T_PROPERTY = "propertyAccessTooltip";
+    private static final String ID_T_OTHER = "otherTooltip";
 
     private static final String ID_LABEL_SIZE = "col-md-4";
     private static final String ID_INPUT_SIZE = "col-md-8";
@@ -242,20 +246,31 @@ private void initLimitationBody(WebMarkupContainer body, ListItem<PropertyLimita
         body.add(modify);
 
         TextFormGroup minOccurs = new TextFormGroup(ID_MIN_OCCURS, new PropertyModel<String>(item.getModelObject(), PropertyLimitationsTypeDto.F_LIMITATION + ".minOccurs"),
-                createStringResource("LimitationsEditorDialog.label.minOccurs"), ID_LABEL_SIZE, ID_INPUT_SIZE, false);
+                createStringResource("LimitationsEditorDialog.label.minOccurs"), "SchemaHandlingStep.limitations.tooltip.minOccurs", ID_LABEL_SIZE, ID_INPUT_SIZE, false);
         minOccurs.getField().add(prepareAjaxOnComponentTagUpdateBehavior());
         body.add(minOccurs);
 
         TextFormGroup maxOccurs = new TextFormGroup(ID_MAX_OCCURS, new PropertyModel<String>(item.getModelObject(), PropertyLimitationsTypeDto.F_LIMITATION + ".maxOccurs"),
-                createStringResource("LimitationsEditorDialog.label.maxOccurs"), ID_LABEL_SIZE, ID_INPUT_SIZE, false);
+                createStringResource("LimitationsEditorDialog.label.maxOccurs"), "SchemaHandlingStep.limitations.tooltip.maxOccurs", ID_LABEL_SIZE, ID_INPUT_SIZE, false);
         maxOccurs.getField().add(prepareAjaxOnComponentTagUpdateBehavior());
         body.add(maxOccurs);
 
         CheckFormGroup ignore = new CheckFormGroup(ID_IGNORE, new PropertyModel<Boolean>(item.getModelObject(), PropertyLimitationsTypeDto.F_LIMITATION + ".ignore"),
-                createStringResource("LimitationsEditorDialog.label.ignore"), ID_LABEL_SIZE, ID_INPUT_SIZE);
+                createStringResource("LimitationsEditorDialog.label.ignore"), "SchemaHandlingStep.limitations.tooltip.ignore", ID_LABEL_SIZE, ID_INPUT_SIZE);
         ignore.getCheck().add(prepareAjaxOnComponentTagUpdateBehavior());
         body.add(ignore);
 
+        Label layersTooltip = new Label(ID_T_LAYERS);
+        layersTooltip.add(new InfoTooltipBehavior());
+        body.add(layersTooltip);
+
+        Label propertyTooltip = new Label(ID_T_PROPERTY);
+        propertyTooltip.add(new InfoTooltipBehavior());
+        body.add(propertyTooltip);
+
+        Label otherTooltip = new Label(ID_T_OTHER);
+        otherTooltip.add(new InfoTooltipBehavior());
+        body.add(otherTooltip);
     }
 
     private AjaxFormComponentUpdatingBehavior prepareAjaxOnComponentTagUpdateBehavior(){
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.html
index 0be2da9f5e9..93646f4e3d8 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.html
@@ -29,6 +29,7 @@
             <div class="form-group">
                 <label class="col-md-4 control-label">
                     <wicket:message key="MappingEditorDialog.label.channel" />
+                    <i wicket:id="channelTooltip" wicket:message="title:SchemaHandlingStep.mapping.tooltip.channel"/>
                 </label>
 
                 <div class="col-md-8">
@@ -40,6 +41,7 @@
             <div class="form-group">
                 <label class="col-md-4 control-label">
                     <wicket:message key="MappingEditorDialog.label.exceptChannel" />
+                    <i wicket:id="exceptChannelTooltip" wicket:message="title:SchemaHandlingStep.mapping.tooltip.exceptChannel"/>
                 </label>
 
                 <div class="col-md-8">
@@ -55,6 +57,7 @@
             <div class="form-group">
                 <label class="col-md-4 control-label">
                     <wicket:message key="MappingEditorDialog.label.source" />
+                    <i wicket:id="sourceTooltip" wicket:message="title:SchemaHandlingStep.mapping.tooltip.source"/>
                 </label>
 
                 <div class="col-md-8">
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java
index 68b970fb8c2..1c66639092b 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java
@@ -35,6 +35,7 @@
 import com.evolveum.midpoint.web.component.wizard.resource.dto.MappingTypeDto;
 import com.evolveum.midpoint.web.page.PageBase;
 import com.evolveum.midpoint.web.util.ExpressionUtil;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.MappingStrengthType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.MappingType;
@@ -44,6 +45,7 @@
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
 import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.EnumChoiceRenderer;
 import org.apache.wicket.markup.html.form.Form;
@@ -83,11 +85,15 @@ public class MappingEditorDialog extends ModalWindow{
     private static final String ID_CONDITION = "condition";
     private static final String ID_CONDITION_LANG = "conditionLanguage";
     private static final String ID_CONDITION_POLICY_REF = "conditionValuePolicyRef";
-    private static final String ID_TIME_FROM = "timeFrom";
-    private static final String ID_TIME_TO = "timeTo";
+//    private static final String ID_TIME_FROM = "timeFrom";
+//    private static final String ID_TIME_TO = "timeTo";
     private static final String ID_BUTTON_SAVE = "saveButton";
     private static final String ID_BUTTON_CANCEL = "cancelButton";
 
+    private static final String ID_T_CHANNEL = "channelTooltip";
+    private static final String ID_T_EXCEPT_CHANNEL = "exceptChannelTooltip";
+    private static final String ID_T_SOURCE = "sourceTooltip";
+
     private static final String ID_LABEL_SIZE = "col-md-4";
     private static final String ID_INPUT_SIZE = "col-md-8";
 
@@ -176,18 +182,19 @@ public void initLayout(WebMarkupContainer content){
         form.add(description);
 
         CheckFormGroup authoritative = new CheckFormGroup(ID_AUTHORITATIVE, new PropertyModel<Boolean>(model, MappingTypeDto.F_MAPPING + ".authoritative"),
-                createStringResource("MappingEditorDialog.label.authoritative"), ID_LABEL_SIZE, ID_INPUT_SIZE);
+                createStringResource("MappingEditorDialog.label.authoritative"), "SchemaHandlingStep.mapping.tooltip.authoritative",
+                ID_LABEL_SIZE, ID_INPUT_SIZE);
         form.add(authoritative);
 
         CheckFormGroup exclusive = new CheckFormGroup(ID_EXCLUSIVE, new PropertyModel<Boolean>(model, MappingTypeDto.F_MAPPING + ".exclusive"),
-                createStringResource("MappingEditorDialog.label.exclusive"), ID_LABEL_SIZE, ID_INPUT_SIZE);
+                createStringResource("MappingEditorDialog.label.exclusive"), "SchemaHandlingStep.mapping.tooltip.exclusive", ID_LABEL_SIZE, ID_INPUT_SIZE);
         form.add(exclusive);
 
         DropDownFormGroup strength = new DropDownFormGroup<>(ID_STRENGTH,
                 new PropertyModel<MappingStrengthType>(model, MappingTypeDto.F_MAPPING + ".strength"),
                 WebMiscUtil.createReadonlyModelFromEnum(MappingStrengthType.class),
                 new EnumChoiceRenderer<MappingStrengthType>(this), createStringResource("MappingEditorDialog.label.strength"),
-                ID_LABEL_SIZE, ID_INPUT_SIZE, false);
+                "SchemaHandlingStep.mapping.tooltip.strength", ID_LABEL_SIZE, ID_INPUT_SIZE, false);
         form.add(strength);
 
         MultiValueDropDownPanel channel = new MultiValueDropDownPanel<String>(ID_CHANNEL,
@@ -279,14 +286,15 @@ public String getIdValue(String object, int index) {
 
         //TODO - create some nice ItemPathType editor in near future
         TextFormGroup target = new TextFormGroup(ID_TARGET, new PropertyModel<String>(model, MappingTypeDto.F_TARGET),
-                createStringResource("MappingEditorDialog.label.target"), ID_LABEL_SIZE, ID_INPUT_SIZE, false);
+                createStringResource("MappingEditorDialog.label.target"), "SchemaHandlingStep.mapping.tooltip.target", ID_LABEL_SIZE, ID_INPUT_SIZE, false);
         form.add(target);
 
         DropDownFormGroup<ExpressionUtil.ExpressionEvaluatorType> expressionType = new DropDownFormGroup<ExpressionUtil.ExpressionEvaluatorType>(ID_EXPRESSION_TYPE,
                 new PropertyModel<ExpressionUtil.ExpressionEvaluatorType>(model, MappingTypeDto.F_EXPRESSION_TYPE),
                 WebMiscUtil.createReadonlyModelFromEnum(ExpressionUtil.ExpressionEvaluatorType.class),
                 new EnumChoiceRenderer<ExpressionUtil.ExpressionEvaluatorType>(this),
-                createStringResource("MappingEditorDialog.label.expressionType"), ID_LABEL_SIZE, ID_INPUT_SIZE, false){
+                createStringResource("MappingEditorDialog.label.expressionType"), "SchemaHandlingStep.mapping.tooltip.expressionType",
+                ID_LABEL_SIZE, ID_INPUT_SIZE, false){
 
             @Override
             protected DropDownChoice createDropDown(String id, IModel<List<ExpressionUtil.ExpressionEvaluatorType>> choices,
@@ -310,7 +318,8 @@ protected void onUpdate(AjaxRequestTarget target) {
                 new PropertyModel<ExpressionUtil.Language>(model, MappingTypeDto.F_EXPRESSION_LANG),
                 WebMiscUtil.createReadonlyModelFromEnum(ExpressionUtil.Language.class),
                 new EnumChoiceRenderer<ExpressionUtil.Language>(this),
-                createStringResource("MappingEditorDialog.label.language"), ID_LABEL_SIZE, ID_INPUT_SIZE, false);
+                createStringResource("MappingEditorDialog.label.language"), "SchemaHandlingStep.mapping.tooltip.expressionLanguage",
+                ID_LABEL_SIZE, ID_INPUT_SIZE, false);
         expressionLanguage.setOutputMarkupId(true);
         expressionLanguage.setOutputMarkupPlaceholderTag(true);
         expressionLanguage.add(new VisibleEnableBehaviour(){
@@ -351,7 +360,8 @@ public Object getDisplayValue(ObjectReferenceType object) {
             public String getIdValue(ObjectReferenceType object, int index) {
                 return Integer.toString(index);
             }
-        }, createStringResource("MappingEditorDialog.label.passPolicyRef"), ID_LABEL_SIZE, ID_INPUT_SIZE, false){
+        }, createStringResource("MappingEditorDialog.label.passPolicyRef"), "SchemaHandlingStep.mapping.tooltip.expressionValuePolicyRef",
+                ID_LABEL_SIZE, ID_INPUT_SIZE, false){
 
             @Override
             protected DropDownChoice createDropDown(String id, IModel<List<ObjectReferenceType>> choices,
@@ -379,7 +389,8 @@ protected void onUpdate(AjaxRequestTarget target) {
         form.add(expressionGeneratePolicy);
 
         TextAreaFormGroup expression = new TextAreaFormGroup(ID_EXPRESSION, new PropertyModel<String>(model, MappingTypeDto.F_EXPRESSION),
-                createStringResource("MappingEditorDialog.label.expression"), ID_LABEL_SIZE, ID_INPUT_SIZE, false, CODE_ROW_COUNT);
+                createStringResource("MappingEditorDialog.label.expression"), "SchemaHandlingStep.mapping.tooltip.expression", ID_LABEL_SIZE, ID_INPUT_SIZE,
+                false, CODE_ROW_COUNT);
         expression.setOutputMarkupId(true);
         form.add(expression);
 
@@ -387,7 +398,8 @@ protected void onUpdate(AjaxRequestTarget target) {
                 new PropertyModel<ExpressionUtil.ExpressionEvaluatorType>(model, MappingTypeDto.F_CONDITION_TYPE),
                 WebMiscUtil.createReadonlyModelFromEnum(ExpressionUtil.ExpressionEvaluatorType.class),
                 new EnumChoiceRenderer<ExpressionUtil.ExpressionEvaluatorType>(this),
-                createStringResource("MappingEditorDialog.label.conditionType"), ID_LABEL_SIZE, ID_INPUT_SIZE, false){
+                createStringResource("MappingEditorDialog.label.conditionType"), "SchemaHandlingStep.mapping.tooltip.conditionType",
+                ID_LABEL_SIZE, ID_INPUT_SIZE, false){
 
             @Override
             protected DropDownChoice createDropDown(String id, IModel<List<ExpressionUtil.ExpressionEvaluatorType>> choices,
@@ -412,7 +424,8 @@ protected void onUpdate(AjaxRequestTarget target) {
                 new PropertyModel<ExpressionUtil.Language>(model, MappingTypeDto.F_CONDITION_LANG),
                 WebMiscUtil.createReadonlyModelFromEnum(ExpressionUtil.Language.class),
                 new EnumChoiceRenderer<ExpressionUtil.Language>(this),
-                createStringResource("MappingEditorDialog.label.language"), ID_LABEL_SIZE, ID_INPUT_SIZE, false);
+                createStringResource("MappingEditorDialog.label.language"), "SchemaHandlingStep.mapping.tooltip.conditionLanguage",
+                ID_LABEL_SIZE, ID_INPUT_SIZE, false);
         conditionLanguage.setOutputMarkupId(true);
         conditionLanguage.setOutputMarkupPlaceholderTag(true);
         conditionLanguage.add(new VisibleEnableBehaviour(){
@@ -452,7 +465,8 @@ public Object getDisplayValue(ObjectReferenceType object) {
                     public String getIdValue(ObjectReferenceType object, int index) {
                         return Integer.toString(index);
                     }
-                }, createStringResource("MappingEditorDialog.label.passPolicyRef"), ID_LABEL_SIZE, ID_INPUT_SIZE, false){
+                }, createStringResource("MappingEditorDialog.label.passPolicyRef"), "SchemaHandlingStep.mapping.tooltip.conditionValuePolicyRef",
+                ID_LABEL_SIZE, ID_INPUT_SIZE, false){
 
             @Override
             protected DropDownChoice createDropDown(String id, IModel<List<ObjectReferenceType>> choices,
@@ -481,10 +495,23 @@ protected void onUpdate(AjaxRequestTarget target) {
         form.add(conditionGeneratePolicy);
 
         TextAreaFormGroup condition = new TextAreaFormGroup(ID_CONDITION, new PropertyModel<String>(model, MappingTypeDto.F_CONDITION),
-                createStringResource("MappingEditorDialog.label.condition"), ID_LABEL_SIZE, ID_INPUT_SIZE, false, CODE_ROW_COUNT);
+                createStringResource("MappingEditorDialog.label.condition"), "SchemaHandlingStep.mapping.tooltip.condition", ID_LABEL_SIZE, ID_INPUT_SIZE,
+                false, CODE_ROW_COUNT);
         condition.setOutputMarkupId(true);
         form.add(condition);
 
+        Label channelTooltip = new Label(ID_T_CHANNEL);
+        channelTooltip.add(new InfoTooltipBehavior());
+        form.add(channelTooltip);
+
+        Label exceptChannelTooltip = new Label(ID_T_EXCEPT_CHANNEL);
+        exceptChannelTooltip.add(new InfoTooltipBehavior());
+        form.add(exceptChannelTooltip);
+
+        Label sourceTooltip = new Label(ID_T_SOURCE);
+        sourceTooltip.add(new InfoTooltipBehavior());
+        form.add(sourceTooltip);
+
         AjaxSubmitButton cancel = new AjaxSubmitButton(ID_BUTTON_CANCEL,
                 createStringResource("MappingEditorDialog.button.cancel")) {
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationActionEditorDialog.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationActionEditorDialog.java
index 7f68a65585c..2e87241160b 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationActionEditorDialog.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationActionEditorDialog.java
@@ -129,7 +129,7 @@ private void initLayout(WebMarkupContainer content){
                 new PropertyModel<SynchronizationActionTypeDto.HandlerUriActions>(model, SynchronizationActionTypeDto.F_HANDLER_URI),
                 WebMiscUtil.createReadonlyModelFromEnum(SynchronizationActionTypeDto.HandlerUriActions.class),
                 new EnumChoiceRenderer<SynchronizationActionTypeDto.HandlerUriActions>(this), createStringResource("SynchronizationActionEditorDialog.label.handlerUri"),
-                ID_LABEL_SIZE, ID_INPUT_SIZE, false){
+                "SynchronizationStep.action.tooltip.handlerUri", ID_LABEL_SIZE, ID_INPUT_SIZE, false){
 
             @Override
             protected DropDownChoice createDropDown(String id, IModel<List<SynchronizationActionTypeDto.HandlerUriActions>> choices,
@@ -144,7 +144,7 @@ protected DropDownChoice createDropDown(String id, IModel<List<SynchronizationAc
 
         DropDownFormGroup<BeforeAfterType> order = new DropDownFormGroup<BeforeAfterType>(ID_ORDER, new PropertyModel<BeforeAfterType>(model, SynchronizationActionTypeDto.F_ACTION_OBJECT + ".order"),
                 WebMiscUtil.createReadonlyModelFromEnum(BeforeAfterType.class), new EnumChoiceRenderer<BeforeAfterType>(this),
-                createStringResource("SynchronizationActionEditorDialog.label.order"), ID_LABEL_SIZE, ID_INPUT_SIZE, false){
+                createStringResource("SynchronizationActionEditorDialog.label.order"), "SynchronizationStep.action.tooltip.order", ID_LABEL_SIZE, ID_INPUT_SIZE, false){
 
             @Override
             protected DropDownChoice createDropDown(String id, IModel<List<BeforeAfterType>> choices, IChoiceRenderer<BeforeAfterType> renderer, boolean required){
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.html
index 2b6b5d76b41..7eea127cbb7 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.html
@@ -41,6 +41,7 @@ <h3><span wicket:id="label" /></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="SynchronizationReactionEditor.label.situation" /></label>
+            <i wicket:id="situationTooltip" wicket:message="title:SynchronizationStep.reaction.tooltip.situation"/>
         </dt>
         <dd>
             <select wicket:id="situation" class="form-control input-sm"></select>
@@ -51,6 +52,7 @@ <h3><span wicket:id="label" /></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="SynchronizationReactionEditor.label.channel" /></label>
+            <i wicket:id="channelTooltip" wicket:message="title:SynchronizationStep.reaction.tooltip.channel"/>
         </dt>
         <div wicket:id="channel" />
     </dl>
@@ -61,6 +63,7 @@ <h3><span wicket:id="label" /></h3>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="SynchronizationReactionEditor.label.synchronize" /></label>
+                    <i wicket:id="synchronizeTooltip" wicket:message="title:SynchronizationStep.reaction.tooltip.synchronize"/>
                 </dt>
                 <dd>
                     <input wicket:id="synchronize" type="checkbox" value="checked"/>
@@ -72,6 +75,7 @@ <h3><span wicket:id="label" /></h3>
             <dl class="dl-horizontal">
                 <dt>
                     <label><wicket:message key="SynchronizationReactionEditor.label.reconcile" /></label>
+                    <i wicket:id="reconcileTooltip" wicket:message="title:SynchronizationStep.reaction.tooltip.reconcile"/>
                 </dt>
                 <dd>
                     <input wicket:id="reconcile" type="checkbox" value="checked"/>
@@ -83,6 +87,7 @@ <h3><span wicket:id="label" /></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="SynchronizationReactionEditor.label.objectTemplateRef" /></label>
+            <i wicket:id="objectTemplateRefTooltip" wicket:message="title:SynchronizationStep.reaction.tooltip.objectTemplateRef"/>
         </dt>
         <dd>
             <select wicket:id="objectTemplateRef" class="form-control input-sm"></select>
@@ -93,6 +98,7 @@ <h3><span wicket:id="label" /></h3>
     <dl class="dl-horizontal">
         <dt>
             <label><wicket:message key="SynchronizationReactionEditor.label.action" /></label>
+            <i wicket:id="actionTooltip" wicket:message="title:SynchronizationStep.reaction.tooltip.action"/>
         </dt>
         <div wicket:id="action" />
     </dl>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java
index b37986e963e..d3f5ee9aec8 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java
@@ -26,6 +26,7 @@
 import com.evolveum.midpoint.web.component.form.multivalue.MultiValueDropDownPanel;
 import com.evolveum.midpoint.web.component.form.multivalue.MultiValueTextEditPanel;
 import com.evolveum.midpoint.web.component.util.SimplePanel;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -62,6 +63,12 @@ public class SynchronizationReactionEditor extends SimplePanel<SynchronizationRe
     private static final String ID_OBJECT_TEMPLATE_REF = "objectTemplateRef";
     private static final String ID_ACTION = "action";
     private static final String ID_ACTION_MODAL = "actionModal";
+    private static final String ID_T_SITUATION = "situationTooltip";
+    private static final String ID_T_CHANNEL = "channelTooltip";
+    private static final String ID_T_SYNCHRONIZE = "synchronizeTooltip";
+    private static final String ID_T_RECONCILE = "reconcileTooltip";
+    private static final String ID_T_OBJ_TEMPLATE = "objectTemplateRefTooltip";
+    private static final String ID_T_ACTION = "actionTooltip";
 
     private Map<String, String> objectTemplateMap = new HashMap<>();
 
@@ -80,7 +87,8 @@ public String getObject() {
                 if(reaction.getName() == null && reaction.getSituation() == null){
                     return getString("SynchronizationReactionEditor.label.new");
                 } else {
-                    return getString("SynchronizationReactionEditor.label.edit", reaction.getName());
+                    return getString("SynchronizationReactionEditor.label.edit",
+                            reaction.getName() != null ? reaction.getName() : getString("MultiValueField.nameNotSpecified"));
                 }
             }
         });
@@ -201,6 +209,30 @@ protected void editPerformed(AjaxRequestTarget target, SynchronizationActionType
         action.setOutputMarkupId(true);
         add(action);
 
+        Label situationTooltip = new Label(ID_T_SITUATION);
+        situationTooltip.add(new InfoTooltipBehavior());
+        add(situationTooltip);
+
+        Label channelTooltip = new Label(ID_T_CHANNEL);
+        channelTooltip.add(new InfoTooltipBehavior());
+        add(channelTooltip);
+
+        Label synchronizeTooltip = new Label(ID_T_SYNCHRONIZE);
+        synchronizeTooltip.add(new InfoTooltipBehavior());
+        add(synchronizeTooltip);
+
+        Label reconcileTooltip = new Label(ID_T_RECONCILE);
+        reconcileTooltip.add(new InfoTooltipBehavior());
+        add(reconcileTooltip);
+
+        Label objTemplateTooltip = new Label(ID_T_OBJ_TEMPLATE);
+        objTemplateTooltip.add(new InfoTooltipBehavior());
+        add(objTemplateTooltip);
+
+        Label actionTooltip = new Label(ID_T_ACTION);
+        actionTooltip.add(new InfoTooltipBehavior());
+        add(actionTooltip);
+
         initModals();
     }
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/CapabilityDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/CapabilityDto.java
index 35f36a7d7eb..03a58094c0d 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/CapabilityDto.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/CapabilityDto.java
@@ -16,7 +16,7 @@
 
 package com.evolveum.midpoint.web.component.wizard.resource.dto;
 
-import com.evolveum.midpoint.xml.ns._public.resource.capabilities_3.CapabilityType;
+import com.evolveum.midpoint.xml.ns._public.resource.capabilities_3.*;
 
 import java.io.Serializable;
 
@@ -33,12 +33,40 @@ public class CapabilityDto<T extends CapabilityType> implements Serializable {
     private boolean selected = false;
     private boolean nativeCapability;
     private String value;
+    private String tooltipKey;
     private T capability;
 
     public CapabilityDto(T capability, String value, boolean nativeCapability) {
-        this.nativeCapability = nativeCapability;
-        this.value = value;
         this.capability = capability;
+        this.value = value;
+        this.nativeCapability = nativeCapability;
+        this.tooltipKey = determineTooltipKey();
+    }
+
+    private String determineTooltipKey(){
+        if(capability != null){
+            if(capability instanceof ReadCapabilityType){
+                return "CapabilityStep.capability.read.tooltip";
+            } else if (capability instanceof UpdateCapabilityType){
+                return "CapabilityStep.capability.update.tooltip";
+            } else if (capability instanceof CreateCapabilityType){
+                return "CapabilityStep.capability.create.tooltip";
+            } else if (capability instanceof DeleteCapabilityType){
+                return "CapabilityStep.capability.delete.tooltip";
+            } else if (capability instanceof LiveSyncCapabilityType){
+                return "CapabilityStep.capability.liveSync.tooltip";
+            } else if (capability instanceof TestConnectionCapabilityType){
+                return "CapabilityStep.capability.testConnection.tooltip";
+            } else if (capability instanceof ActivationCapabilityType){
+                return "CapabilityStep.capability.activation.tooltip";
+            } else if (capability instanceof CredentialsCapabilityType){
+                return "CapabilityStep.capability.credentials.tooltip";
+            } else if (capability instanceof ScriptCapabilityType){
+                return "CapabilityStep.capability.script.tooltip";
+            }
+        }
+
+        return null;
     }
 
     public boolean isNativeCapability() {
@@ -73,24 +101,26 @@ public void setSelected(boolean selected) {
         this.selected = selected;
     }
 
+    public String getTooltipKey() {
+        return tooltipKey;
+    }
+
+    public void setTooltipKey(String tooltipKey) {
+        this.tooltipKey = tooltipKey;
+    }
+
     @Override
     public boolean equals(Object o) {
-        if (this == o)
-            return true;
-
-        if (!(o instanceof CapabilityDto))
-            return false;
+        if (this == o) return true;
+        if (!(o instanceof CapabilityDto)) return false;
 
         CapabilityDto that = (CapabilityDto) o;
 
-        if (nativeCapability != that.nativeCapability)
-            return false;
-        if (selected != that.selected)
-            return false;
-        if (!capability.equals(that.capability))
-            return false;
-        if (!value.equals(that.value))
-            return false;
+        if (nativeCapability != that.nativeCapability) return false;
+        if (selected != that.selected) return false;
+        if (capability != null ? !capability.equals(that.capability) : that.capability != null) return false;
+        if (tooltipKey != null ? !tooltipKey.equals(that.tooltipKey) : that.tooltipKey != null) return false;
+        if (value != null ? !value.equals(that.value) : that.value != null) return false;
 
         return true;
     }
@@ -99,8 +129,9 @@ public boolean equals(Object o) {
     public int hashCode() {
         int result = (selected ? 1 : 0);
         result = 31 * result + (nativeCapability ? 1 : 0);
-        result = 31 * result + value.hashCode();
-        result = 31 * result + capability.hashCode();
+        result = 31 * result + (value != null ? value.hashCode() : 0);
+        result = 31 * result + (tooltipKey != null ? tooltipKey.hashCode() : 0);
+        result = 31 * result + (capability != null ? capability.hashCode() : 0);
         return result;
     }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest2.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest2.java
deleted file mode 100644
index ab06869a7a7..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest2.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2010-2014 Evolveum
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.evolveum.midpoint.web.page;
-
-import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.security.api.AuthorizationConstants;
-import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.web.application.AuthorizationAction;
-import com.evolveum.midpoint.web.application.PageDescriptor;
-import com.evolveum.midpoint.web.component.util.LoadableModel;
-import com.evolveum.midpoint.web.component.wizard.resource.component.capability.CapabilityPanel;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
-
-import org.apache.wicket.model.IModel;
-
-/**
- *  TODO - this is just a testing page for testing CapabilityEditor during development, it should be removed before release
- *
- *  @author shood
- */
-@PageDescriptor(url = "/capability", action = {@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_NO_ACCESS_URL)})
-public class PageTest2 extends PageBase {
-
-    private static final String ID_CAPABILITY = "capability";
-
-    private static final String OID_RESOURCE_CSV_LIVESYNC = "ef2bc95b-76e0-48e2-86d6-3d4f02d3fafe";
-
-
-    private IModel<PrismObject<ResourceType>> model;
-
-    public PageTest2(){
-        model = new LoadableModel<PrismObject<ResourceType>>(false) {
-
-            @Override
-            protected PrismObject<ResourceType> load() {
-                return loadModel();
-            }
-        };
-
-        initLayout();
-    }
-
-    private PrismObject<ResourceType> loadModel(){
-
-        OperationResult result = new OperationResult("loadResource");
-        PrismObject<ResourceType> resource = null;
-
-        try{
-            Task task = getTaskManager().createTaskInstance("loadResource");
-            resource = getModelService().getObject(ResourceType.class, OID_RESOURCE_CSV_LIVESYNC,
-                    null, task, result);
-
-            result.recordSuccess();
-        } catch (Exception e){
-            result.recordFatalError(e.getMessage(), e);
-        }
-
-        if (!result.isSuccess()) {
-            showResult(result);
-        }
-
-        return resource;
-    }
-
-    private void initLayout(){
-        model.getObject();
-        add(new CapabilityPanel(ID_CAPABILITY, model));
-    }
-
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
index 266d9c4c52a..ba13c5ba457 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
@@ -540,4 +540,28 @@ operation.com.evolveum.midpoint.common.crypto.CryptoUtil.securitySelfTest=Securi
 
 MappingType.label.placeholder=Create new mapping
 TextField.universal.placeholder=Insert value
-MultiValueField.nameNotSpecified=(Name not specified)
\ No newline at end of file
+MultiValueField.nameNotSpecified=(Name not specified)
+
+#Resourse Wizard Tooltips. TODO - define proper tooltip texts
+SchemaHandlingStep.mapping.tooltip.authoritative=Tooltip
+SchemaHandlingStep.mapping.tooltip.exclusive=Tooltip
+SchemaHandlingStep.mapping.tooltip.strength=Tooltip
+SchemaHandlingStep.mapping.tooltip.channel=Tooltip
+SchemaHandlingStep.mapping.tooltip.exceptChannel=Tooltip
+SchemaHandlingStep.mapping.tooltip.source=Tooltip
+SchemaHandlingStep.mapping.tooltip.target=Tooltip
+SchemaHandlingStep.mapping.tooltip.expressionType=Tooltip
+SchemaHandlingStep.mapping.tooltip.expressionLanguage=Tooltip
+SchemaHandlingStep.mapping.tooltip.expressionValuePolicyRef=Tooltip
+SchemaHandlingStep.mapping.tooltip.expression=Tooltip
+SchemaHandlingStep.mapping.tooltip.conditionType=Tooltip
+SchemaHandlingStep.mapping.tooltip.conditionLanguage=Tooltip
+SchemaHandlingStep.mapping.tooltip.conditionValuePolicyRef=Tooltip
+SchemaHandlingStep.mapping.tooltip.condition=Tooltip
+
+SchemaHandlingStep.limitations.tooltip.minOccurs=Tooltip
+SchemaHandlingStep.limitations.tooltip.maxOccurs=Tooltip
+SchemaHandlingStep.limitations.tooltip.ignore=Tooltip
+
+SynchronizationStep.action.tooltip.handlerUri=Tooltip
+SynchronizationStep.action.tooltip.order=Tooltip
\ No newline at end of file
