diff --git a/app/views/traces/edit.html.erb b/app/views/traces/edit.html.erb
index c17660db3..2deae8ac2 100644
--- a/app/views/traces/edit.html.erb
+++ b/app/views/traces/edit.html.erb
@@ -50,6 +50,6 @@
 
 </div>
 
-<%= submit_tag t ".save_button" %>
+<%= f.submit %>
 
 <% end %>
diff --git a/app/views/traces/new.html.erb b/app/views/traces/new.html.erb
index 51cd16308..fc6a9f1a9 100644
--- a/app/views/traces/new.html.erb
+++ b/app/views/traces/new.html.erb
@@ -27,7 +27,7 @@
       </div>
     </fieldset>
 
-    <%= submit_tag t(".upload_button") %>
+    <%= f.submit %>
     <span class="form-help deemphasize"><a href="<%= t ".help_url" %>"><%= t ".help" %></a></span>
   </div>
 <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c835df967..d7127a4e9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -22,6 +22,9 @@ en:
       redaction:
         create: Create redaction
         update: Save redaction
+      trace:
+        create: Upload
+        update: Save Changes
       user_block:
         create: Create block
         update: Update block
@@ -1758,7 +1761,6 @@ en:
       visibility: "Visibility:"
       visibility_help: "what does this mean?"
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-      upload_button: "Upload"
       help: "Help"
       help_url: "https://wiki.openstreetmap.org/wiki/Upload"
     create:
@@ -1782,7 +1784,6 @@ en:
       description: "Description:"
       tags: "Tags:"
       tags_help: "comma delimited"
-      save_button: "Save Changes"
       visibility: "Visibility:"
       visibility_help: "what does this mean?"
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"