diff --git a/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties b/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
index a844b52c55..dfc2b88324 100644
--- a/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
+++ b/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
@@ -1925,7 +1925,7 @@ user.profile.attribute=Attribute
 user.profile.attribute.name=Name
 user.profile.attribute.name.tooltip=The name of the attribute.
 user.profile.attribute.displayName=Display name
-user.profile.attribute.displayName.tooltip=Display name for the attribute. Supports keys for localized values as well. For example\: ${profile.attribute.phoneNumber}
+user.profile.attribute.displayName.tooltip=Display name for the attribute. Supports keys for localized values as well. For example\: ${profile.attribute.phoneNumber}.
 user.profile.attribute.selector.scopes=Enabled when scope
 user.profile.attribute.selector.scopes.tooltip=Set the attribute as enabled only when a set of one or more scopes are requested by clients. This constraint only applies to flows where clients are able to ask for scopes (e.g.: during login or registration).
 user.profile.attribute.required=Required
@@ -1951,7 +1951,10 @@ user.profile.attribute.annotation=Annotation
 user.profile.attribute.group=Attribute Group
 attribute-groups=Attribute Groups
 user.profile.attributegroup.displayHeader=Display header
+user.profile.attributegroup.displayHeader.tooltip=A user-friendly name for the group that should be used when rendering a group of attributes in user-facing forms. Supports keys for localized values as well. For example\: ${profile.attribute.group.address}.
 user.profile.attributegroup.displayDescription=Display description
+user.profile.attributegroup.displayDescription.tooltip=A text that should be used as a tooltip when rendering user-facing forms.
 user.profile.attributegroup=Attribute Group
 user.profile.attributegroup.name=Name
+user.profile.attributegroup.name.tooltip=A unique name for the group. This name will be used to reference the group when binding an attribute to a group.
 user.profile.attributegroup.annotation=Annotation
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/realm-user-profile.html b/themes/src/main/resources/theme/base/admin/resources/partials/realm-user-profile.html
index f071f3e72f..bae6ba71a4 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/realm-user-profile.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/realm-user-profile.html
@@ -72,8 +72,6 @@
             <tbody>
             <tr ng-repeat="group in config.groups">
                 <td class="kc-sorter">
-                    <button data-ng-hide="flow.builtIn" data-ng-disabled="$first" class="btn btn-default btn-sm" data-ng-click="groupOrderUp($index)"><i class="fa fa-angle-up"></i></button>
-                    <button data-ng-hide="flow.builtIn" data-ng-disabled="$last" class="btn btn-default btn-sm" data-ng-click="groupOrderDown($index)"><i class="fa fa-angle-down"></i></button>
                     <span><a href="" data-ng-click="editAttributeGroup(group)">{{group.name}}</a></span>
                 </td>
                 <td>{{group.displayHeader}}</td>