diff --git a/js/ticket_time_tracking.js b/js/ticket_time_tracking.js
index dc0d99c7..f2a7d6fe 100644
--- a/js/ticket_time_tracking.js
+++ b/js/ticket_time_tracking.js
@@ -52,7 +52,7 @@
             }
             timerInterval = setInterval(countTime, 1000);
             isPaused = false;
-            document.getElementById("startStopTimer").innerText = "Pause";
+            document.getElementById("startStopTimer").innerHTML = "<i class='fas fa-pause'></i>";
             localStorage.setItem("ticket-timer-running-" + ticketID, "true");
 
         }
@@ -66,7 +66,7 @@
             localStorage.setItem(getLocalStorageKey("pausedTime"), currentElapsed.toString());
             localStorage.removeItem(getLocalStorageKey("startTime"));
             isPaused = true;
-            document.getElementById("startStopTimer").innerText = "Start";
+            document.getElementById("startStopTimer").innerHTML = "<i class='fas fa-play'></i>";
             localStorage.setItem("ticket-timer-running-" + ticketID, "false");
 
         }
@@ -84,7 +84,7 @@
                 elapsedSecs = 0;
                 clearTimeStorage();
                 displayTime();
-                document.getElementById("startStopTimer").innerText = "Start";
+                document.getElementById("startStopTimer").innerHTML = "<i class='fas fa-play'></i>";
             }
             localStorage.setItem("ticket-timer-running-" + ticketID, "false");
         }
@@ -95,7 +95,7 @@
             elapsedSecs = 0;
             clearTimeStorage();
             displayTime();
-            document.getElementById("startStopTimer").innerText = "Start";
+            document.getElementById("startStopTimer").innerHTML = "<i class='fas fa-play'></i>";
         }
 
         function handleInputFocus() {
diff --git a/ticket.php b/ticket.php
index f03290c1..cad38783 100644
--- a/ticket.php
+++ b/ticket.php
@@ -572,7 +572,7 @@ if (isset($_GET['ticket_id'])) {
                         <input type="hidden" name="client_id" id="client_id" value="<?php echo $client_id; ?>">
 
                         <div class="form-group">
-                            <div class="btn-group btn-group-toggle" data-toggle="buttons">
+                            <div class="btn-group btn-block btn-group-toggle" data-toggle="buttons">
                                 <label class="btn btn-outline-secondary active">
                                     <input type="radio" name="public_reply_type" value="0" checked>Internal Note
                                 </label>
@@ -637,8 +637,8 @@ if (isset($_GET['ticket_id'])) {
                                     </div>
 
                                     <div class="btn-group">
-                                        <button type="button" class="btn btn-success" id="startStopTimer"><i class="fas fa-fw fa-pause"></i></button>
-                                        <button type="button" class="btn btn-danger" id="resetTimer"><i class="fas fa-fw fa-redo-alt"></i></button>
+                                        <button type="button" class="btn btn-light" id="startStopTimer"><i class="fas fa-play"></i></button>
+                                        <button type="button" class="btn btn-light" id="resetTimer"><i class="fas fa-redo-alt"></i></button>
                                     </div>      
                                 </div>
                             </div>