diff --git a/admin/app/components/solidus_admin/adjustment_reasons/index/component.yml b/admin/app/components/solidus_admin/adjustment_reasons/index/component.yml
deleted file mode 100644
index 54418702ad3..00000000000
--- a/admin/app/components/solidus_admin/adjustment_reasons/index/component.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-en:
-  add: 'Add new'
-  batch_actions:
-    delete: 'Delete'
diff --git a/admin/app/components/solidus_admin/payment_methods/index/component.yml b/admin/app/components/solidus_admin/payment_methods/index/component.yml
index 34acf86bda7..65d0eea8ab9 100644
--- a/admin/app/components/solidus_admin/payment_methods/index/component.yml
+++ b/admin/app/components/solidus_admin/payment_methods/index/component.yml
@@ -1,5 +1,4 @@
 en:
-  add: 'Add new'
   "yes": "Yes"
   "no": "No"
   status:
@@ -11,5 +10,3 @@ en:
     admin: Admin
     storefront: Storefront
     all: All
-  batch_actions:
-    delete: 'Delete'
diff --git a/admin/app/components/solidus_admin/products/index/component.yml b/admin/app/components/solidus_admin/products/index/component.yml
index 8ae8270bd25..c533d4319a7 100644
--- a/admin/app/components/solidus_admin/products/index/component.yml
+++ b/admin/app/components/solidus_admin/products/index/component.yml
@@ -1,8 +1,6 @@
 en:
   image: 'Image'
-  add: 'Add new'
   batch_actions:
-    delete: 'Delete'
     discontinue: 'Discontinue'
     activate: 'Activate'
   filters:
diff --git a/admin/app/components/solidus_admin/promotion_categories/index/component.yml b/admin/app/components/solidus_admin/promotion_categories/index/component.yml
deleted file mode 100644
index fe07d079a52..00000000000
--- a/admin/app/components/solidus_admin/promotion_categories/index/component.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-en:
-  batch_actions:
-    delete: 'Delete'
-  add: 'Add new'
diff --git a/admin/app/components/solidus_admin/promotions/index/component.yml b/admin/app/components/solidus_admin/promotions/index/component.yml
index cdb40f9455b..7ba70160390 100644
--- a/admin/app/components/solidus_admin/promotions/index/component.yml
+++ b/admin/app/components/solidus_admin/promotions/index/component.yml
@@ -1,8 +1,4 @@
 en:
-  promotion_image: 'Image'
-  add: 'Add new'
-  batch_actions:
-    delete: 'Delete'
   scopes:
     active: Active
     draft: Draft
diff --git a/admin/app/components/solidus_admin/properties/index/component.yml b/admin/app/components/solidus_admin/properties/index/component.yml
deleted file mode 100644
index 54418702ad3..00000000000
--- a/admin/app/components/solidus_admin/properties/index/component.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-en:
-  add: 'Add new'
-  batch_actions:
-    delete: 'Delete'
diff --git a/admin/app/components/solidus_admin/refund_reasons/index/component.yml b/admin/app/components/solidus_admin/refund_reasons/index/component.yml
deleted file mode 100644
index 54418702ad3..00000000000
--- a/admin/app/components/solidus_admin/refund_reasons/index/component.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-en:
-  add: 'Add new'
-  batch_actions:
-    delete: 'Delete'
diff --git a/admin/app/components/solidus_admin/reimbursement_types/index/component.yml b/admin/app/components/solidus_admin/reimbursement_types/index/component.yml
deleted file mode 100644
index 54418702ad3..00000000000
--- a/admin/app/components/solidus_admin/reimbursement_types/index/component.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-en:
-  add: 'Add new'
-  batch_actions:
-    delete: 'Delete'
diff --git a/admin/app/components/solidus_admin/return_reasons/index/component.yml b/admin/app/components/solidus_admin/return_reasons/index/component.yml
deleted file mode 100644
index 54418702ad3..00000000000
--- a/admin/app/components/solidus_admin/return_reasons/index/component.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-en:
-  add: 'Add new'
-  batch_actions:
-    delete: 'Delete'
diff --git a/admin/app/components/solidus_admin/shipping_categories/index/component.yml b/admin/app/components/solidus_admin/shipping_categories/index/component.yml
deleted file mode 100644
index 54418702ad3..00000000000
--- a/admin/app/components/solidus_admin/shipping_categories/index/component.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-en:
-  add: 'Add new'
-  batch_actions:
-    delete: 'Delete'
diff --git a/admin/app/components/solidus_admin/shipping_methods/index/component.yml b/admin/app/components/solidus_admin/shipping_methods/index/component.yml
deleted file mode 100644
index 54418702ad3..00000000000
--- a/admin/app/components/solidus_admin/shipping_methods/index/component.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-en:
-  add: 'Add new'
-  batch_actions:
-    delete: 'Delete'
diff --git a/admin/app/components/solidus_admin/stock_locations/index/component.yml b/admin/app/components/solidus_admin/stock_locations/index/component.yml
index 72183961309..746dbf1ffec 100644
--- a/admin/app/components/solidus_admin/stock_locations/index/component.yml
+++ b/admin/app/components/solidus_admin/stock_locations/index/component.yml
@@ -1,6 +1,3 @@
 en:
   active: 'Active'
   inactive: 'Inactive'
-  add: 'Add new'
-  batch_actions:
-    delete: 'Delete'
diff --git a/admin/app/components/solidus_admin/store_credit_reasons/index/component.yml b/admin/app/components/solidus_admin/store_credit_reasons/index/component.yml
deleted file mode 100644
index 54418702ad3..00000000000
--- a/admin/app/components/solidus_admin/store_credit_reasons/index/component.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-en:
-  add: 'Add new'
-  batch_actions:
-    delete: 'Delete'
diff --git a/admin/app/components/solidus_admin/stores/index/component.yml b/admin/app/components/solidus_admin/stores/index/component.yml
deleted file mode 100644
index 54418702ad3..00000000000
--- a/admin/app/components/solidus_admin/stores/index/component.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-en:
-  add: 'Add new'
-  batch_actions:
-    delete: 'Delete'
diff --git a/admin/app/components/solidus_admin/tax_categories/index/component.rb b/admin/app/components/solidus_admin/tax_categories/index/component.rb
index 897a585e672..235d64d69ae 100644
--- a/admin/app/components/solidus_admin/tax_categories/index/component.rb
+++ b/admin/app/components/solidus_admin/tax_categories/index/component.rb
@@ -47,9 +47,9 @@ def columns
         header: :is_default,
         data: ->(tax_category) {
           if tax_category.is_default?
-            component('ui/badge').new(name: t('.yes'), color: :green)
+            component('ui/badge').yes
           else
-            component('ui/badge').new(name: t('.no'), color: :graphite_light)
+            component('ui/badge').no
           end
         },
       },
diff --git a/admin/app/components/solidus_admin/tax_categories/index/component.yml b/admin/app/components/solidus_admin/tax_categories/index/component.yml
deleted file mode 100644
index faff41bc439..00000000000
--- a/admin/app/components/solidus_admin/tax_categories/index/component.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-en:
-  "yes": "Yes"
-  "no": "No"
-  add: 'Add new'
-  batch_actions:
-    delete: 'Delete'
diff --git a/admin/app/components/solidus_admin/tax_rates/index/component.yml b/admin/app/components/solidus_admin/tax_rates/index/component.yml
deleted file mode 100644
index 54418702ad3..00000000000
--- a/admin/app/components/solidus_admin/tax_rates/index/component.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-en:
-  add: 'Add new'
-  batch_actions:
-    delete: 'Delete'
diff --git a/admin/app/components/solidus_admin/taxonomies/index/component.yml b/admin/app/components/solidus_admin/taxonomies/index/component.yml
deleted file mode 100644
index fe07d079a52..00000000000
--- a/admin/app/components/solidus_admin/taxonomies/index/component.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-en:
-  batch_actions:
-    delete: 'Delete'
-  add: 'Add new'
diff --git a/admin/app/components/solidus_admin/option_types/index/component.yml b/admin/app/components/solidus_admin/ui/pages/index/component.yml
similarity index 100%
rename from admin/app/components/solidus_admin/option_types/index/component.yml
rename to admin/app/components/solidus_admin/ui/pages/index/component.yml
diff --git a/admin/app/components/solidus_admin/users/index/component.yml b/admin/app/components/solidus_admin/users/index/component.yml
index 6a7fa4eaab4..ba63d2d41f6 100644
--- a/admin/app/components/solidus_admin/users/index/component.yml
+++ b/admin/app/components/solidus_admin/users/index/component.yml
@@ -1,8 +1,5 @@
 en:
-  promotion_image: 'Image'
-  add: 'Add new'
   batch_actions:
-    delete: 'Delete'
     discontinue: 'Discontinue'
     activate: 'Activate'
   filters:
diff --git a/admin/app/components/solidus_admin/zones/index/component.yml b/admin/app/components/solidus_admin/zones/index/component.yml
deleted file mode 100644
index 54418702ad3..00000000000
--- a/admin/app/components/solidus_admin/zones/index/component.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-en:
-  add: 'Add new'
-  batch_actions:
-    delete: 'Delete'