diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePagingPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePagingPanel.html
index 7686851fc5a..4c865aafd8e 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePagingPanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePagingPanel.html
@@ -17,7 +17,7 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <ul class="pagination pagination-sm no-margin" style="margin-bottom: 0px;">
+    <ul class="pagination pagination-sm pagination-xs no-margin" style="margin-bottom: 0px;">
         <li wicket:id="first">
             <a wicket:id="firstLink"><wicket:message key="NavigatorPanel.firstLink"/></a>
         </li>
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 e080cd82854..d7a0c569009 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
@@ -1093,6 +1093,21 @@ body .treeview-menu > li > span:hover {
 
 // Orgtree (OrgMemberPanel)
 
+span.tree-content > table {
+  width: 100%;
+  max-width: 100%;
+}
+
+span.tree-content > table tr td:last-child {
+  width: 1%;
+  vertical-align: top;
+}
+
+span.tree-content > table tr td:first-child {
+  width: 1%;
+  vertical-align: top;
+}
+
 .org-tree-container {
   overflow-y: auto;
   margin-bottom: 20px;
@@ -1563,3 +1578,7 @@ th.composited-icon {
 .small-box > .small-box-footer {
 	color: inherit !important;
 }
+
+.pagination-xs>li>a {
+    padding: 0px 5px !important;
+}
