diff --git a/app/services/forms.py b/app/services/forms.py
index ac3f3d84..d3ee9166 100644
--- a/app/services/forms.py
+++ b/app/services/forms.py
@@ -19,7 +19,7 @@ class NewNLPJobForm(FlaskForm):
                                     ('pt', 'Portuguese'),
                                     ('es', 'Spanish')],
                            validators=[DataRequired()])
-    submit = SubmitField('Submit')
+    submit = SubmitField()
     title = StringField('Title', validators=[DataRequired(), Length(1, 32)])
     version = SelectField('Version',
                           choices=[('2.1.0', 'Latest (2.1.0)'),
@@ -52,7 +52,7 @@ class NewOCRJobForm(FlaskForm):
                                     ('spa', 'Spanish; Castilian')],
                            validators=[DataRequired()])
     split = BooleanField('Split')
-    submit = SubmitField('Submit')
+    submit = SubmitField()
     title = StringField('Title', validators=[DataRequired(), Length(1, 32)])
     version = SelectField('Version',
                           choices=[('latest', 'Latest')],
diff --git a/app/templates/main/dashboard.html.j2 b/app/templates/main/dashboard.html.j2
index f6033efe..02454ec6 100644
--- a/app/templates/main/dashboard.html.j2
+++ b/app/templates/main/dashboard.html.j2
@@ -116,7 +116,7 @@
         </div>
       </div>
       <div class="modal-footer">
-        {{ create_corpus_form.submit(class='btn') }}
+        <button class="btn waves-effect waves-light" id="submit" name="submit" type="submit">Submit<i class="material-icons right">send</i></button>
       </div>
     </form>
   </div>
diff --git a/app/templates/services/nlp.html.j2 b/app/templates/services/nlp.html.j2
index 521296cf..077ea64b 100644
--- a/app/templates/services/nlp.html.j2
+++ b/app/templates/services/nlp.html.j2
@@ -116,7 +116,7 @@
         </div>
       </div>
       <div class="card-action right-align">
-        {{ new_job_form.submit(class='btn') }}
+        <button class="btn waves-effect waves-light" id="submit" name="submit" type="submit">Submit<i class="material-icons right">send</i></button>
       </div>
     </form>
   </div>
diff --git a/app/templates/services/ocr.html.j2 b/app/templates/services/ocr.html.j2
index 68887f83..fe89cc6d 100644
--- a/app/templates/services/ocr.html.j2
+++ b/app/templates/services/ocr.html.j2
@@ -204,7 +204,7 @@
         </div>
       </div>
       <div class="card-action right-align">
-        {{ new_job_form.submit(class='btn') }}
+        <button class="btn waves-effect waves-light" id="submit" name="submit" type="submit">Submit<i class="material-icons right">send</i></button>
       </div>
     </form>
   </div>