diff --git a/app/views/admin/enterprise_groups/_form_images.html.haml b/app/views/admin/enterprise_groups/_form_images.html.haml
index 49169851c3..1bfffa86d2 100644
--- a/app/views/admin/enterprise_groups/_form_images.html.haml
+++ b/app/views/admin/enterprise_groups/_form_images.html.haml
@@ -2,16 +2,16 @@
   %legend Images
   .row
     .alpha.three.columns
-      = f.label :logo, class: 'with-tip', 'data-powertip' => 'This is the logo'
-      .with-tip{'data-powertip' => 'This is the logo'}
+      = f.label :logo, 'ofn-with-tip' => 'This is the logo for the group'
+      %div{'ofn-with-tip' => 'This is the logo for the group'}
         %a What's this?
     .omega.eight.columns
       = image_tag @object.logo.url if @object.logo.present?
       = f.file_field :logo
   .row
     .alpha.three.columns
-      = f.label :promo_image, class: 'with-tip', 'data-powertip' => 'This image is displayed at the top of the Group profile'
-      .with-tip{'data-powertip' => 'This image is displayed at the top of the Group profile'}
+      = f.label :promo_image, 'ofn-with-tip' => 'This image is displayed at the top of the Group profile'
+      %div{'ofn-with-tip' => 'This image is displayed at the top of the Group profile'}
         %a What's this?
     .omega.eight.columns
       = image_tag @object.promo_image.url if @object.promo_image.present?
diff --git a/app/views/admin/enterprise_groups/_form_users.html.haml b/app/views/admin/enterprise_groups/_form_users.html.haml
index 0a8a5dd635..c4f57da48a 100644
--- a/app/views/admin/enterprise_groups/_form_users.html.haml
+++ b/app/views/admin/enterprise_groups/_form_users.html.haml
@@ -3,7 +3,7 @@
   .row
     .three.columns.alpha
       =f.label :owner_id, 'Owner'
-      .with-tip{'data-powertip' => "The primary user responsible for this group."}
+      %div{'ofn-with-tip' => "The primary user responsible for this group."}
         %a What's this?
     .eight.columns.omega
     - if spree_current_user.admin?