diff --git a/module/group/css/browse.css b/module/group/css/browse.css
index c76974e59e..b5b8a32691 100644
--- a/module/group/css/browse.css
+++ b/module/group/css/browse.css
@@ -1,5 +1,6 @@
 .user {display: block; width: 80px; float: left; overflow: hidden;}
 .c-name {width: 130px;}
 .c-desc {width: 300px;}
+.btn-admin {margin-left: 0px !important}
 
 #groupList tbody tr.even td {word-wrap: break-word;}
diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php
index fdcb4183a9..ab349fafe6 100644
--- a/module/group/view/browse.html.php
+++ b/module/group/view/browse.html.php
@@ -42,25 +42,28 @@
         <td title='<?php echo $group->desc?>'><?php echo $group->desc;?></td>
         <td title='<?php echo $users;?>' class="text-ellipsis"><?php echo $users;?></td>
         <td class='c-actions'>
-          <?php $isProjectAdmin = $group->role == 'projectAdmin';?>
-          <?php $disabled       = $isProjectAdmin ? 'disabled' : '';?>
           <?php $lang->group->managepriv = $lang->group->managePrivByGroup;?>
-          <?php common::printIcon('group', 'manageView', "groupID=$group->id", $group, 'list', 'eye', '', $disabled);?>
-          <?php common::printIcon('group', 'managepriv', "type=byGroup&param=$group->id", $group, 'list', 'lock', '', $disabled);?>
           <?php $lang->group->managemember = $lang->group->manageMember;?>
+          <?php $isProjectAdmin = $group->role == 'projectAdmin';?>
           <?php if($isProjectAdmin):?>
+          <?php echo "<button class='btn disabled'><i class='icon icon-eye disabled' title='{$lang->group->manageView}'></i></button>";?>
+          <?php echo "<button class='btn disabled'><i class='icon icon-lock disabled' title='{$lang->group->managepriv}'></i></button>";?>
           <?php common::printIcon('group', 'manageProjectAdmin', "groupID=$group->id", $group, 'list', 'persons');?>
+          <?php echo "<button class='btn disabled'><i class='icon icon-edit disabled' title='{$lang->group->edit}'></i></button>";?>
+          <?php echo "<button class='btn disabled'><i class='icon icon-copy disabled' title='{$lang->group->copy}'></i></button>";?>
           <?php else:?>
+          <?php common::printIcon('group', 'manageView', "groupID=$group->id", $group, 'list', 'eye');?>
+          <?php common::printIcon('group', 'managepriv', "type=byGroup&param=$group->id", $group, 'list', 'lock');?>
           <?php common::printIcon('group', 'manageMember', "groupID=$group->id", $group, 'list', 'persons', '', "iframe", true, "data-width='90%'");?>
+          <?php common::printIcon('group', 'edit', "groupID=$group->id", $group, 'list', '', '', "iframe", true, "data-width='550'");?>
+          <?php common::printIcon('group', 'copy', "groupID=$group->id", $group, 'list', '', '', "iframe", true, "data-width='550'");?>
           <?php endif;?>
-          <?php common::printIcon('group', 'edit', "groupID=$group->id", $group, 'list', '', '', "iframe $disabled", true, "data-width='550'");?>
-          <?php common::printIcon('group', 'copy', "groupID=$group->id", $group, 'list', '', '', "iframe $disabled", true, "data-width='550'");?>
           <?php
           if(common::hasPriv('group', 'delete'))
           {
               if($isProjectAdmin)
               {
-                  echo "<button class='btn disabled'><i class='icon icon-trash disabled' title='{$lang->group->delete}'></i></button>";
+                  echo "<a class='btn btn-admin disabled'><i class='icon icon-trash disabled' title='{$lang->group->delete}'></i></a>";
               }
               else
               {