diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
index b6f4fab8051..f4dd921a1cb 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
@@ -96,7 +96,12 @@
                             </a>
                         </li>
                     </ol>
-                    <ul class="nav navbar-nav">
+                        <a wicket:id="cartButton" class="shopping-cart-icon">
+                            <i class="fa fa-shopping-cart fa-2x shopping-cart-icon"></i>
+                            <span wicket:id="itemsCount" class="badge bg-red"
+                                  style="position: absolute; top: 1px; margin-left: 20px;"></span>
+                        </a>
+                    <ul class="nav navbar-nav pull-right">
                         <!-- User Account: style can be found in dropdown.less -->
                         <li class="dropdown user user-menu" wicket:id="rightMenu"/>
                         <li>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
index 45169c7e51c..937c98a5abf 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -127,7 +127,9 @@
 import org.apache.commons.lang.Validate;
 import org.apache.wicket.*;
 import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
+import org.apache.wicket.ajax.AjaxChannel;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.devutils.debugbar.DebugBar;
@@ -193,6 +195,8 @@ public abstract class PageBase extends WebPage implements ModelServiceLocator {
     private static final String ID_FEEDBACK = "feedback";
     private static final String ID_DEBUG_BAR = "debugBar";
     private static final String ID_CLEAR_CACHE = "clearCssCache";
+    private static final String ID_CART_BUTTON = "cartButton";
+    private static final String ID_CART_ITEMS_COUNT = "itemsCount";
     private static final String ID_SIDEBAR_MENU = "sidebarMenu";
     private static final String ID_RIGHT_MENU = "rightMenu";
     private static final String ID_LOCALE = "locale";
@@ -796,6 +800,44 @@ public boolean isVisible() {
             }
         };
         mainHeader.add(breadcrumbs);
+
+        initCartButton(mainHeader);
+    }
+
+    private void initCartButton(WebMarkupContainer mainHeader){
+        AjaxButton cartButton = new AjaxButton(ID_CART_BUTTON) {
+            private static final long serialVersionUID = 1L;
+
+            @Override
+            protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+                attributes.setChannel(new AjaxChannel("blocking", AjaxChannel.Type.ACTIVE));
+            }
+
+            @Override
+            public void onClick(AjaxRequestTarget ajaxRequestTarget) {
+                navigateToNext(new PageAssignmentsList(true));
+            }
+        };
+        cartButton.setOutputMarkupId(true);
+        cartButton.add(createUserStatusBehaviour(true));
+        mainHeader.add(cartButton);
+
+        Label cartItemsCount = new Label(ID_CART_ITEMS_COUNT,  new LoadableModel<String>(true) {
+            private static final long serialVersionUID = 1L;
+
+            @Override
+            public String load(){
+                return Integer.toString(getSessionStorage().getRoleCatalog().getAssignmentShoppingCart().size());
+            }
+        });
+        cartItemsCount.add(new VisibleEnableBehaviour() {
+            @Override
+            public boolean isVisible() {
+                return !(getSessionStorage().getRoleCatalog().getAssignmentShoppingCart().size() == 0);
+            }
+        });
+        cartItemsCount.setOutputMarkupId(true);
+        cartButton.add(cartItemsCount);
     }
 
     private void initLayout() {
@@ -2312,6 +2354,10 @@ protected String determineDataLanguage() {
         }
     }
 
+    protected void reloadShoppingCartIcon(AjaxRequestTarget target){
+        target.add(get(createComponentPath(ID_MAIN_HEADER, ID_NAVIGATION, ID_CART_BUTTON)));
+    }
+
     public AsyncWebProcessManager getAsyncWebProcessManager() {
         return MidPointApplication.get().getAsyncWebProcessManager();
     }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.html
index eb91398cdfc..92b5d4f5e2d 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.html
@@ -31,13 +31,6 @@
                     </div>
                     <div class="col-md-6" wicket:id="targetUserPanel"/>
                 </div>
-                <div class="col-md-1 pull-right">
-                    <a wicket:id="cartButton">
-                        <i class="fa fa-shopping-cart fa-2x"></i>
-                        <span wicket:id="itemsCount" class="badge bg-red"
-                              style="position: absolute; top: -1px; left: 30px;"></span>
-                    </a>
-                </div>
             </div>
             <div wicket:id="relationContainer" class="row">
                 <div class="form-group col-md-3">
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
index 16073fbcf4d..0ffb42a4f85 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
@@ -62,8 +62,6 @@ public class PageAssignmentShoppingCart<R extends AbstractRoleType> extends Page
     private static final long serialVersionUID = 1L;
 
     private static final String ID_MAIN_FORM = "mainForm";
-    private static final String ID_CART_BUTTON = "cartButton";
-    private static final String ID_CART_ITEMS_COUNT = "itemsCount";
     private static final String ID_TARGET_USER_PANEL = "targetUserPanel";
     private static final String ID_VIEWS_TAB_PANEL = "viewsTabPanel";
     private static final String ID_PARAMETERS_PANEL = "parametersPanel";
@@ -102,7 +100,6 @@ protected void onInitialize() {
         mainForm.add(parametersPanel);
 
         initTargetUserSelectionPanel(parametersPanel);
-        initCartButton(parametersPanel);
         initRelationPanel(parametersPanel);
     }
 
@@ -145,7 +142,7 @@ public WebMarkupContainer createPanel(String panelId) {
 
                         @Override
                         protected void assignmentAddedToShoppingCartPerformed(AjaxRequestTarget target){
-                            target.add(getCartButton());
+                            reloadShoppingCartIcon(target);
                         }
 
                         @Override
@@ -174,7 +171,7 @@ protected QName getQueryType() {
 
                     @Override
                     protected void assignmentAddedToShoppingCartPerformed(AjaxRequestTarget target){
-                        target.add(getCartButton());
+                        reloadShoppingCartIcon(target);
                     }
 
                     @Override
@@ -201,7 +198,7 @@ protected QName getQueryType() {
 
                     @Override
                     protected void assignmentAddedToShoppingCartPerformed(AjaxRequestTarget target){
-                        target.add(getCartButton());
+                        reloadShoppingCartIcon(target);
                     }
 
                     @Override
@@ -228,7 +225,7 @@ protected QName getQueryType() {
 
                     @Override
                     protected void assignmentAddedToShoppingCartPerformed(AjaxRequestTarget target){
-                        target.add(getCartButton());
+                        reloadShoppingCartIcon(target);
                     }
 
                     @Override
@@ -250,7 +247,7 @@ public WebMarkupContainer createPanel(String panelId) {
 
                     @Override
                     protected void assignmentAddedToShoppingCartPerformed(AjaxRequestTarget target){
-                        target.add(getCartButton());
+                        reloadShoppingCartIcon(target);
                     }
 
                     @Override
@@ -333,41 +330,6 @@ protected void multipleUsersSelectionPerformed(AjaxRequestTarget target, List<Us
         parametersPanel.add(targetUserPanel);
     }
 
-    private void initCartButton(WebMarkupContainer parametersPanel){
-        AjaxButton cartButton = new AjaxButton(ID_CART_BUTTON) {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
-                attributes.setChannel(new AjaxChannel("blocking", AjaxChannel.Type.ACTIVE));
-            }
-
-            @Override
-            public void onClick(AjaxRequestTarget ajaxRequestTarget) {
-                navigateToNext(new PageAssignmentsList(true));
-            }
-        };
-        cartButton.setOutputMarkupId(true);
-        parametersPanel.add(cartButton);
-
-        Label cartItemsCount = new Label(ID_CART_ITEMS_COUNT,  new LoadableModel<String>(true) {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public String load(){
-                return Integer.toString(getRoleCatalogStorage().getAssignmentShoppingCart().size());
-            }
-        });
-        cartItemsCount.add(new VisibleEnableBehaviour() {
-            @Override
-            public boolean isVisible() {
-                return !(getRoleCatalogStorage().getAssignmentShoppingCart().size() == 0);
-            }
-        });
-        cartItemsCount.setOutputMarkupId(true);
-        cartButton.add(cartItemsCount);
-    }
-
     private void initRelationPanel(WebMarkupContainer parametersPanel){
         WebMarkupContainer relationContainer = new WebMarkupContainer(ID_RELATION_CONTAINER);
         relationContainer.setOutputMarkupId(true);
@@ -378,7 +340,7 @@ private void initRelationPanel(WebMarkupContainer parametersPanel){
     }
 
     private QName getRelationParameterValue(){
-        return getRelationDropDown().getModel().getObject();
+        return getRelationDropDown().getRelationValue();
     }
 
     private RelationDropDownChoicePanel getRelationDropDown(){
@@ -412,9 +374,4 @@ private String getTargetUserSelectionButtonLabel(List<UserType> usersList){
                     usersList.size()).getString();
         }
     }
-
-    private AjaxButton getCartButton(){
-        return (AjaxButton) get(ID_MAIN_FORM).get(ID_PARAMETERS_PANEL).get(ID_CART_BUTTON);
-    }
-
 }
diff --git a/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less b/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
index 31b63b109bc..3ebfd6adfc2 100644
--- a/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
+++ b/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
@@ -1202,6 +1202,12 @@ dd.stacktrace::before {
 	min-height: 460px;
 }
 
+.shopping-cart-icon {
+	color: #f4f4f4;
+	margin-top: 10px;
+	margin-right: 5px;
+}
+
 .shopping-cart-item-box {
 	
 	.inner {