diff --git a/app/views/product_drives/_form.html.erb b/app/views/product_drives/_form.html.erb
index 50f38660c7..a01f39d8c5 100644
--- a/app/views/product_drives/_form.html.erb
+++ b/app/views/product_drives/_form.html.erb
@@ -44,7 +44,7 @@
             </div>
             <!-- /.card-body -->
             <div class="card-footer">
-              <%= f.button :submit, :class => 'diaper-drive-submit btn btn-primary', :id => 'product_drive_submit' %>
+              <%= f.button :submit, :class => 'diaper-drive-submit btn btn-success', :id => 'product_drive_submit' %>
             </div>
           </div>
           <!-- /.card -->
diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb
index 38edfc380e..a8dbaec216 100644
--- a/config/initializers/simple_form_bootstrap.rb
+++ b/config/initializers/simple_form_bootstrap.rb
@@ -15,7 +15,6 @@
 # Use this setup block to configure all options available in SimpleForm.
 SimpleForm.setup do |config|
   # Default class for buttons
-  config.button_class = 'btn btn-default'
 
   # Define the default class of the input wrapper of the boolean input.
   config.boolean_label_class = 'form-check-label'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a2232adb78..0a7a736eb6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -38,3 +38,5 @@ en:
         issued_at: "Purchase date"
       distribution:
         issued_at: "Distribution date and time"
+    models:
+      product_drive: "Product Drive"
\ No newline at end of file
diff --git a/spec/system/product_drive_system_spec.rb b/spec/system/product_drive_system_spec.rb
index 6f24b8409a..1b82f7fd90 100644
--- a/spec/system/product_drive_system_spec.rb
+++ b/spec/system/product_drive_system_spec.rb
@@ -62,7 +62,7 @@
         fill_in 'Name', with: 'Normal 1'
         fill_in 'Start Date', with: Time.zone.today
         fill_in 'End Date', with: Time.zone.today + 4.hours
-        click_button 'Create Product drive'
+        click_button 'Create Product Drive'
       end.to change(ProductDrive, :count).by(1)
     end
 
@@ -70,7 +70,7 @@
       fill_in 'Name', with: 'Normal 1'
       fill_in 'Start Date', with: Time.zone.today
       fill_in 'End Date', with: Time.zone.today + 1.day
-      click_button 'Create Product drive'
+      click_button 'Create Product Drive'
 
       expect(ProductDrive.last).to have_attributes({ name: 'Normal 1', start_date: Time.zone.today, end_date: Time.zone.today + 1.day, virtual: false })
     end
@@ -79,7 +79,7 @@
       fill_in 'Name', with: 'Virtual 1'
       fill_in 'Start Date', with: Time.zone.today
       fill_in 'End Date', with: Time.zone.today + 4.hours
-      click_button 'Create Product drive'
+      click_button 'Create Product Drive'
 
       expect(page.find('.alert')).to have_content('added')
     end
@@ -96,7 +96,7 @@
         fill_in 'Start Date', with: Time.zone.today
         fill_in 'End Date', with: Time.zone.today + 4.hours
         check 'virtual'
-        click_button 'Create Product drive'
+        click_button 'Create Product Drive'
       end.to change(ProductDrive, :count).by(1)
     end
 
@@ -105,7 +105,7 @@
       fill_in 'Start Date', with: Time.zone.today
       fill_in 'End Date', with: Time.zone.today + 1.day
       check 'virtual'
-      click_button 'Create Product drive'
+      click_button 'Create Product Drive'
 
       expect(ProductDrive.last).to have_attributes({ name: 'Virtual 1', start_date: Time.zone.today, end_date: Time.zone.today + 1.day, virtual: true })
     end
@@ -115,7 +115,7 @@
       fill_in 'Start Date', with: Time.zone.today
       fill_in 'End Date', with: Time.zone.today + 4.hours
       check 'virtual'
-      click_button 'Create Product drive'
+      click_button 'Create Product Drive'
 
       expect(page.find('.alert')).to have_content('added')
     end