diff --git a/View/Elements/Components/subscriberList.ctp b/View/Elements/Components/subscriberList.ctp
index 4930d29..e06de8c 100644
--- a/View/Elements/Components/subscriberList.ctp
+++ b/View/Elements/Components/subscriberList.ctp
@@ -24,33 +24,35 @@
                 <p>You do not have access to view memberships.</p>
             </div>
             <div class="modal-body subs">
+                <?php if ($addSubscribers) : ?>
+                    <div class="d-flex mb-4">
+                        <?php echo $this->Form->create(false, array(
+                            'url' => array('controller' => 'grouper_groups', 'action' => 'groupSubscribers'),
+                            'class' => 'add-user-form w-100',
+                            'id' => 'add-user-form',
+                        )); ?>
+                        <label class="sr-only" for="addUser"><?php echo _txt('pl.grouperlite.search.tags.text'); ?></label>
+                        <div class="input-group">
+                            <?php echo $this->Form->input("addUser", array('label' => false, 'class' => 'form-control', 'value' => isset($searchcriteria) ? $searchcriteria : '')) ?>
+                            <!--<input type="text" name="search" class="form-control" value="<?php echo isset($searchcriteria) ? $searchcriteria : ''; ?>" /> -->
+
+                            <div class="input-group-append">
+                                <button id="addUserbutton" class=" btn btn-grouper btn-primary px-4" type="submit" value="Submit">
+                                    <em class="material-icons lg" aria-hidden="true">add</em>
+                                    <span class="ml-2"><?php echo _txt('pl.grouperlite.action.add-user'); ?></span>
+                                </button>
+                            </div>
 
-                <div class="d-flex mb-4">
-                    <?php echo $this->Form->create(false, array(
-                        'url' => array('controller' => 'grouper_groups', 'action' => 'groupSubscribers'),
-                        'class' => 'add-user-form w-100',
-                        'id' => 'add-user-form',
-                    )); ?>
-                    <label class="sr-only" for="addUser"><?php echo _txt('pl.grouperlite.search.tags.text'); ?></label>
-                    <div class="input-group">
-                        <?php echo $this->Form->input("addUser", array('label' => false, 'class' => 'form-control', 'value' => isset($searchcriteria) ? $searchcriteria : '')) ?>
-                        <!--<input type="text" name="search" class="form-control" value="<?php echo isset($searchcriteria) ? $searchcriteria : ''; ?>" /> -->
-                        <div class="input-group-append">
-                            <button id="addUserbutton" class=" btn btn-grouper btn-primary px-4" type="submit" value="Submit">
-                                <em class="material-icons lg" aria-hidden="true">add</em>
-                                <span class="ml-2"><?php echo _txt('pl.grouperlite.action.add-user'); ?></span>
-                            </button>
                         </div>
+                        <?php echo $this->Form->end(); ?>
+                    </div>
+                    <div>
+                        <p class="alert alert-danger error"></p>
                     </div>
-                    <?php echo $this->Form->end(); ?>
-                </div>
-                <div>
-                    <p class="alert alert-danger error"></p>
-                </div>
+                <?php endif; ?>
                 <table class="table table-striped">
                     <tbody id="sub-body"></tbody>
                 </table>
-
             </div>
             <div class="modal-footer d-flex justify-content-end">
                 <button type="button" class="btn btn-grouper btn-link" data-dismiss="modal"><?php echo _txt('pl.grouperlite.action.close'); ?></button>
@@ -208,9 +210,11 @@
                             "class" => "remove-user-form",
                             "id" => "remove-user-form"
                         )); ?>',
+                    <?php if ($addSubscribers) : ?>
                     '<button data-user="' + item.id + '" class="btn btn-grouper btn-block btn-primary btn-sm m-1 text-nowrap member-del-btn">',
                     '<?php echo _txt('pl.grouperlite.action.remove-user'); ?>',
                     '</button>',
+                    <?php endif; ?>
                     '<?php echo $this->Form->end(); ?>',
                     '</td>',
                     '</tr>'
diff --git a/View/GrouperGroups/base.ctp b/View/GrouperGroups/base.ctp
index 0c879d3..07f2ec5 100644
--- a/View/GrouperGroups/base.ctp
+++ b/View/GrouperGroups/base.ctp
@@ -39,14 +39,14 @@ $this->Html->addCrumb(_txt('pl.grouperlite.crumb.root'), array('controller' => '
     $('.grouper-table .collapse-btn').on('click', function(ev) {
         var btn = $(ev.currentTarget);
         if (btn.hasClass('collapsed')) {
-            btn.find('em.material-icons').text('arrow_right');
-        } else {
             btn.find('em.material-icons').text('arrow_drop_down');
+        } else {
+            btn.find('em.material-icons').text('arrow_right');
         }
     });
 
     $('.collapse-wg-working-group-parent').on('hide.bs.collapse', function(ev) {
         $(this).siblings('.collapse-wg-working-group').collapse('hide');
-        $(this).parent().find('.collapse-btn .material-icons').text('arrow_drop_down');
+        $(this).parent().find('.collapse-btn .material-icons').text('arrow_right');
     });
 </script>
\ No newline at end of file
diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp
index 33859eb..ca78267 100644
--- a/View/GrouperGroups/groupmember.ctp
+++ b/View/GrouperGroups/groupmember.ctp
@@ -42,7 +42,7 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false;
                     <td colspan="<?php echo $numColumns; ?>">
                         <button type="button" class="btn btn-link btn-text collapse-btn <?php echo $collapsed ? 'collapsed' : ''; ?> fw-bold m-0" data-toggle="collapse" data-target=".collapse-adhoc-group-parent" role="button" aria-expanded="<?php echo $collapsed ? 'false' : 'true'; ?>">
                             <?php echo $config['adHocHeading'] ?? 'Ad-hoc groups'; ?>
-                            <em class="material-icons mt-0" aria-hidden="true"><?php echo $collapsed ? 'arrow_drop_down' : 'arrow_right' ?></em>
+                            <em class="material-icons mt-0" aria-hidden="true"><?php echo $collapsed ? 'arrow_right' : 'arrow_drop_down' ?></em>
                         </button>
                     </td>
                 </tr>
@@ -79,7 +79,7 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false;
                     <td colspan="<?php echo $numColumns; ?>">
                         <button type="button" class="btn btn-link btn-text <?php echo $collapsed ? 'collapsed' : ''; ?>  collapse-btn fw-bold m-0 work-group-heading-btn" data-toggle="collapse" data-target=".collapse-wg-working-group-parent" role="button" aria-expanded="<?php echo $collapsed ? 'false' : 'true'; ?>">
                             <?php echo $config['wgHeading'] ?? 'Working groups'; ?>
-                            <em class="material-icons mt-0" aria-hidden="true"><?php echo $collapsed ? 'arrow_drop_down' : 'arrow_right' ?></em>
+                            <em class="material-icons mt-0" aria-hidden="true"><?php echo $collapsed ? 'arrow_right' : 'arrow_drop_down' ?></em>
                         </button>
                     </td>
                 </tr>
@@ -95,7 +95,7 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false;
                                 <?php $name = $wggroup['workingGroupId']; ?>
                                 <span class="grpr-popover-toggle" data-container="body" data-toggle="popover" data-placement="top" data-content="<?php echo substr($name, 0, strrpos($name, ':')); ?>" data-trigger="click">
                                     <?php echo $wggroup['WGShowName'] ?? "No Name"; ?>
-                                    <em class="material-icons mt-0" aria-hidden="true"><?php echo $collapsed ? 'arrow_drop_down' : 'arrow_right' ?></em>
+                                    <em class="material-icons mt-0" aria-hidden="true"><?php echo $collapsed ? 'arrow_right' : 'arrow_drop_down' ?></em>
                                 </span>
                             </button>
                         </td>
@@ -143,5 +143,5 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false;
     </div>
 <?php endif; ?>
 
-<?php echo $this->element('Components/subscriberList'); ?>
+<?php echo $this->element('Components/subscriberList', array('addSubscribers' => false)); ?>
 <!--/nocache-->
\ No newline at end of file
diff --git a/View/GrouperGroups/groupoptin.ctp b/View/GrouperGroups/groupoptin.ctp
index de618d2..09adf70 100644
--- a/View/GrouperGroups/groupoptin.ctp
+++ b/View/GrouperGroups/groupoptin.ctp
@@ -42,7 +42,7 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false;
           <td colspan="<?php echo $numColumns; ?>">
             <button type="button" class="btn btn-link btn-text collapse-btn <?php echo $collapsed ? 'collapsed' : ''; ?> fw-bold m-0" data-toggle="collapse" data-target=".collapse-adhoc-group-parent" role="button" aria-expanded="<?php echo $collapsed ? 'false' : 'true'; ?>">
               <?php echo $config['adHocHeading'] ?? 'Ad-hoc groups'; ?>
-              <em class="material-icons mt-0" aria-hidden="true"><?php echo $collapsed ? 'arrow_drop_down' : 'arrow_right' ?></em>
+              <em class="material-icons mt-0" aria-hidden="true"><?php echo $collapsed ? 'arrow_right' : 'arrow_drop_down' ?></em>
             </button>
           </td>
         </tr>
diff --git a/View/GrouperGroups/groupowner.ctp b/View/GrouperGroups/groupowner.ctp
index 06e0f9c..e2cb35a 100644
--- a/View/GrouperGroups/groupowner.ctp
+++ b/View/GrouperGroups/groupowner.ctp
@@ -42,7 +42,7 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false;
           <td colspan="<?php echo $numColumns; ?>">
             <button type="button" class="btn btn-link btn-text collapse-btn <?php echo $collapsed ? 'collapsed' : ''; ?> fw-bold m-0" data-toggle="collapse" data-target=".collapse-adhoc-group-parent" role="button" aria-expanded="<?php echo $collapsed ? 'false' : 'true'; ?>">
               <?php echo $config['adHocHeading'] ?? 'Ad-hoc groups'; ?>
-              <em class="material-icons mt-0" aria-hidden="true"><?php echo $collapsed ? 'arrow_drop_down' : 'arrow_right' ?></em>
+              <em class="material-icons mt-0" aria-hidden="true"><?php echo $collapsed ? 'arrow_right' : 'arrow_drop_down' ?></em>
             </button>
           </td>
         </tr>
@@ -115,5 +115,5 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false;
     <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.groups.zero-state'); ?></p>
   </div>
 <?php endif; ?>
-<?php echo $this->element('Components/subscriberList'); ?>
+<?php echo $this->element('Components/subscriberList', array('addSubscribers' => true)); ?>
 <!--/nocache-->
\ No newline at end of file