diff --git a/app/assets/stylesheets/admin/openfoodnetwork.css.scss b/app/assets/stylesheets/admin/openfoodnetwork.css.scss
index edbbb5f241..2d4db3e4aa 100644
--- a/app/assets/stylesheets/admin/openfoodnetwork.css.scss
+++ b/app/assets/stylesheets/admin/openfoodnetwork.css.scss
@@ -74,6 +74,9 @@ form.order_cycle {
       margin-bottom: 0.5em;
     }
   }
+  .icon-question-sign {
+    font-size: 18px;
+  }
   table.exchanges {
     tr td.active {
       width: 20px;
diff --git a/app/views/admin/order_cycles/_simple_form.html.haml b/app/views/admin/order_cycles/_simple_form.html.haml
index 15303b1f5d..aa8576dfec 100644
--- a/app/views/admin/order_cycles/_simple_form.html.haml
+++ b/app/views/admin/order_cycles/_simple_form.html.haml
@@ -4,11 +4,13 @@
   .alpha.two.columns
     = label_tag t('.ready_for')
   .six.columns
-    = text_field_tag 'order_cycle_outgoing_exchange_0_pickup_time', '', 'id' => 'order_cycle_outgoing_exchange_0_pickup_time', 'placeholder' => t('.ready_for_placeholder'), 'ng-model' => 'outgoing_exchange.pickup_time', 'size' => 30
+    = text_field_tag 'order_cycle_outgoing_exchange_0_pickup_time', '', 'id' => 'order_cycle_outgoing_exchange_0_pickup_time', 'placeholder' => t('.ready_for_placeholder'), 'ng-model' => 'outgoing_exchange.pickup_time', 'size' => 30, 'maxlength' => 35
+    %span.icon-question-sign{'ofn-with-tip' => "#{t('admin.order_cycles.edit.pickup_time_tip')}"}
   .two.columns
     = label_tag t('.customer_instructions')
   .six.columns.omega
     = text_field_tag 'order_cycle_outgoing_exchange_0_pickup_instructions', '', 'id' => 'order_cycle_outgoing_exchange_0_pickup_instructions', 'placeholder' => t('.customer_instructions_placeholder'), 'ng-model' => 'outgoing_exchange.pickup_instructions', 'size' => 30
+    %span.icon-question-sign{'ofn-with-tip' => "#{t('admin.order_cycles.edit.pickup_instructions_tip')}"}
 
 = label_tag t('.products')
 %table.exchanges
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index d1fde27b6a..f48248ddd7 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -198,9 +198,9 @@ en-GB:
         variants_without_unit_value: "WARNING: Some variants do not have a unit value"
     order_cycles:
       edit:
-        choose_products_from: "Choose Products From:"
-        pickup_time_tip: 'Display name for order cycle delivery, e.g "Monday"'
-        pickup_instructions_tip: 'Additional notes for this selection'
+        choose_products_from: 'Choose Products From:'
+        pickup_time_tip: When orders from this OC will be ready for the customer
+        pickup_instructions_tip: These instructions are shown to customers after they complete an order
     enterprise:
       select_outgoing_oc_products_from: Select outgoing OC products from
     enterprises:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9d544dac9e..44ce0a604a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -275,13 +275,6 @@ en:
         order_error: "Some errors must be resolved before you can update orders.\nAny fields with red borders contain errors."
         variants_without_unit_value: "WARNING: Some variants do not have a unit value"
 
-    order_cycles:
-      edit:
-        choose_products_from: "Choose Products From:"
-        pickup_time_tip: 'Display name for order cycle delivery, e.g "Monday"'
-        pickup_instructions_tip: 'Additional notes for this selection'
-
-
     enterprise:
       select_outgoing_oc_products_from: Select outgoing OC products from
 
@@ -470,6 +463,14 @@ en:
         next_step: Next step
         choose_starting_point: 'Choose your starting point:'
     order_cycles:
+      test:
+        test: testing
+      edit:
+        advanced_settings: Advanced Settings
+        update_and_close: Update and Close
+        choose_products_from: 'Choose Products From:'
+        pickup_time_tip: When orders from this OC will be ready for the customer
+        pickup_instructions_tip: These instructions are shown to customers after they complete an order
       advanced_settings:
         title: Advanced Settings
         choose_product_tip: You can opt to restrict all available products (both incoming and outgoing), to only those in %{inventory}'s inventory.
@@ -488,7 +489,7 @@ en:
         distributor: Distributor
         products: Products
         tags: Tags
-        delivery_detaisl: Pickup / Delivery details
+        delivery_details: Pickup / Delivery details
         debug_info: Debug information
       name_and_timing_form:
         name: Name
@@ -506,9 +507,6 @@ en:
         customer_instructions_placeholder: Pick-up or delivery notes
         products: Products
         fees: Fees
-      edit:
-        advanced_settings: Advanced Settings
-        update_and_close: Update and Close
     producer_properties:
       index:
         title: Producer Properties