diff --git a/lib/www/clarification.php b/lib/www/clarification.php
index 16817c4fc1..2a308063a7 100644
--- a/lib/www/clarification.php
+++ b/lib/www/clarification.php
@@ -588,7 +588,7 @@ function confirmClar() {
     } ?>
 
 <div class="form-group">
-<input type="submit" value="Send" name="submit" class="btn btn-primary" />
+<button type="submit" name="submit" class="btn btn-primary"><i class="fas fa-envelope"></i> Send</button>
 </div>
 </form>
 </div>
diff --git a/lib/www/printing.php b/lib/www/printing.php
index f9720adfa5..bc85349224 100644
--- a/lib/www/printing.php
+++ b/lib/www/printing.php
@@ -70,7 +70,7 @@ function detectLanguage(filename)
     } ?>
     </select>
   </div>
-  <input type="submit" name="submit" value="Print code" class="btn btn-primary" />
+  <button type="submit" name="submit" class="btn btn-primary"><i class="fas fa-print"></i> Print code</button>
 </form>
 </div>
 
diff --git a/www/team/submit.php b/www/team/submit.php
index 99f58d6f58..fe2350def5 100644
--- a/www/team/submit.php
+++ b/www/team/submit.php
@@ -85,7 +85,7 @@
     <input type="text" class="form-control" name="entry_point" id="entry_point" aria-describedby="entrypointhelp">
     <small id="entrypointhelp" class="form-text text-muted">The entry point for your code.</small>
   </div>
-  <input type="submit" name="submit" value="Submit" class="btn btn-primary" />
+  <button type="submit" name="submit" class="btn btn-primary"><i class="fas fa-cloud-upload-alt"></i> Submit</button>
 </form>
     <script type="text/javascript">initFileUploads(<?=$maxfiles?>);</script>
 </div>