diff --git a/app/plugins/CoreEnroller/templates/EnrollmentAttributes/columns.inc b/app/plugins/CoreEnroller/templates/EnrollmentAttributes/columns.inc
index 2a4a83c39..a9a955c58 100644
--- a/app/plugins/CoreEnroller/templates/EnrollmentAttributes/columns.inc
+++ b/app/plugins/CoreEnroller/templates/EnrollmentAttributes/columns.inc
@@ -64,7 +64,7 @@ if(empty($attributes)) {
 // Map attributes to icons
 $attributeToIcons =
   [
-    'adHocAttribute' => 'grass',
+    'adHocAttribute' => 'user_attributes',
     'address' => 'home',
     'affiliation_type_id' => 'person_search',
     'cou_id' => 'supervised_user_circle',
@@ -76,7 +76,7 @@ $attributeToIcons =
     'manager_person_id' => 'supervisor_account',
     'name' => 'face',
     'organization' => 'corporate_fare',
-    'pronoun' => 'transgender',
+    'pronoun' => '3p',
     'sponsor_person_id' => 'person',
     'telephoneNumber' => 'call',
     'petition_textarea' => 'text_fields',
@@ -119,7 +119,7 @@ foreach ($attributes as $attr => $hr_name) {
   $action_args['vv_actions'][] = [
     'order' => $actionOrder,
     'icon' => $actionIcon,
-    'iconClass' => '',
+    'iconClass' => 'material-symbols-outlined',
     'url' => $actionUrl,
     'class' => $actionClass ?? '',
     'label' => $actionLabel,
diff --git a/app/templates/ExternalIdentities/fields-nav.inc b/app/templates/ExternalIdentities/fields-nav.inc
index 5e339771e..108b5e3f2 100644
--- a/app/templates/ExternalIdentities/fields-nav.inc
+++ b/app/templates/ExternalIdentities/fields-nav.inc
@@ -127,7 +127,7 @@ $addMenuLinks = [
   [
     'controller' => 'ad_hoc_attributes',
     'action' => 'add',
-    'icon' => 'check_box',
+    'icon' => 'user_attributes',
     'iconClass' => 'material-symbols-outlined'
   ],
   [
@@ -144,7 +144,8 @@ $addMenuLinks = [
   [
     'controller' => 'pronouns',
     'action' => 'add',
-    'icon' => 'transgender'
+    'icon' => '3p',
+    'iconClass' => 'material-symbols-outlined'
   ],
   [
     'controller' => 'telephone_numbers',
diff --git a/app/templates/ExternalIdentityRoles/fields-nav.inc b/app/templates/ExternalIdentityRoles/fields-nav.inc
index dc0e89849..e95652727 100644
--- a/app/templates/ExternalIdentityRoles/fields-nav.inc
+++ b/app/templates/ExternalIdentityRoles/fields-nav.inc
@@ -42,7 +42,7 @@ $addMenuLinks = [
   [
     'controller' => 'ad_hoc_attributes',
     'action' => 'add',
-    'icon' => 'check_box',
+    'icon' => 'user_attributes',
     'iconClass' => 'material-symbols-outlined'
   ],
   [
diff --git a/app/templates/People/fields-nav.inc b/app/templates/People/fields-nav.inc
index 82d25f571..3ed6b7351 100644
--- a/app/templates/People/fields-nav.inc
+++ b/app/templates/People/fields-nav.inc
@@ -127,7 +127,7 @@ $addMenuLinks = [
   [
     'controller' => 'ad_hoc_attributes',
     'action' => 'add',
-    'icon' => 'check_box',
+    'icon' => 'user_attributes',
     'iconClass' => 'material-symbols-outlined'
   ],
   [
@@ -139,7 +139,8 @@ $addMenuLinks = [
   [
     'controller' => 'pronouns',
     'action' => 'add',
-    'icon' => 'transgender'
+    'icon' => '3p',
+    'iconClass' => 'material-symbols-outlined'
   ],
   [
     'controller' => 'telephone_numbers',
diff --git a/app/templates/PersonRoles/fields-nav.inc b/app/templates/PersonRoles/fields-nav.inc
index f720cd874..8e8480c97 100644
--- a/app/templates/PersonRoles/fields-nav.inc
+++ b/app/templates/PersonRoles/fields-nav.inc
@@ -45,7 +45,7 @@ $addMenuLinks = [
   [
     'controller' => 'ad_hoc_attributes',
     'action' => 'add',
-    'icon' => 'check_box',
+    'icon' => 'user_attributes',
     'iconClass' => 'material-symbols-outlined'
   ],
   [