diff --git a/db/fixtures/miq_product_features.yml b/db/fixtures/miq_product_features.yml
index 6d2b70561aa..af80bfec52b 100644
--- a/db/fixtures/miq_product_features.yml
+++ b/db/fixtures/miq_product_features.yml
@@ -1737,26 +1737,44 @@
       :hidden: true
       :identifier: chargeback_report_only
   - :name: Rates
-    :description: Rates Accordion
+    :description: Everything under Rates
     :feature_type: node
     :identifier: chargeback_rates
     :children:
-    - :name: Add
-      :description: Add a Chargeback Rate
-      :feature_type: admin
-      :identifier: chargeback_rates_new
-    - :name: Copy
-      :description: Copy a Chargeback Rate
-      :feature_type: admin
-      :identifier: chargeback_rates_copy
-    - :name: Delete
-      :description: Delete a Chargeback Rate
-      :feature_type: admin
-      :identifier: chargeback_rates_delete
-    - :name: Edit
-      :description: Edit a Chargeback Rate
+    - :name: View
+      :description: View Chargeback Rates
+      :feature_type: view
+      :identifier: chargeback_rates_view
+      :children:
+      - :name: List
+        :description: Display Lists of Chargeback Rates
+        :feature_type: view
+        :identifier: chargeback_rates_show_list
+      - :name: Show
+        :description: Display Individual Chargeback Rates
+        :feature_type: view
+        :identifier: chargeback_rates_show
+    - :name: Modify
+      :description: Modify Chargeback Rates
       :feature_type: admin
-      :identifier: chargeback_rates_edit
+      :identifier: chargeback_rates_admin
+      :children:
+      - :name: Add
+        :description: Add a Chargeback Rate
+        :feature_type: admin
+        :identifier: chargeback_rates_new
+      - :name: Copy
+        :description: Copy a Chargeback Rate
+        :feature_type: admin
+        :identifier: chargeback_rates_copy
+      - :name: Delete
+        :description: Delete a Chargeback Rate
+        :feature_type: admin
+        :identifier: chargeback_rates_delete
+      - :name: Edit
+        :description: Edit a Chargeback Rate
+        :feature_type: admin
+        :identifier: chargeback_rates_edit
   - :name: Assignments
     :description: Assignments Accordion
     :feature_type: node
@@ -3919,7 +3937,7 @@
         :description: Remove Security Policy Rules
         :feature_type: admin
         :identifier: security_policy_rule_delete
- 
+
 # Floating IP
 - :name: Floating IPs
   :description: Everything under Floating IPs
diff --git a/db/fixtures/miq_shortcuts.yml b/db/fixtures/miq_shortcuts.yml
index bfdc0d948ba..0dcd474b64c 100644
--- a/db/fixtures/miq_shortcuts.yml
+++ b/db/fixtures/miq_shortcuts.yml
@@ -14,10 +14,20 @@
   :url: /utilization
   :rbac_feature_name: utilization
   :startup: true
-- :name: chargeback
-  :description: Overview / Chargeback
-  :url: /chargeback/explorer
-  :rbac_feature_name: chargeback
+- :name: chargeback_reports
+  :description: Overview / Chargeback / Reports
+  :url: /chargeback_reports/explorer
+  :rbac_feature_name: chargeback_reports
+  :startup: true
+- :name: chargeback_rates
+  :description: Overview / Chargeback / Rates
+  :url: /chargeback_rates/show_list
+  :rbac_feature_name: chargeback_rates_show_list
+  :startup: true
+- :name: chargeback_assignments
+  :description: Overview / Chargeback / Assignments
+  :url: /chargeback_assignments/explorer
+  :rbac_feature_name: chargeback_assignments
   :startup: true
 - :name: services
   :description: Services / My Services