diff --git a/assets/js/ticket.js b/assets/js/ticket.js
index 5454997..cb7e0d6 100644
--- a/assets/js/ticket.js
+++ b/assets/js/ticket.js
@@ -636,7 +636,7 @@ function renderDependencies(dependencies) {
                         <span style="margin-left: 0.5rem;">${lt.escHtml(dep.title)}</span>
                         <span class="status-badge ${statusClass}" style="margin-left: 0.5rem; font-size: 0.8rem;">${lt.escHtml(dep.status)}</span>
                     </div>
-                    <button data-action="remove-dependency" data-dependency-id="${dep.dependency_id}" class="btn btn-small" style="padding: 0.25rem 0.5rem; font-size: 0.8rem;">Remove</button>
+                    <button data-action="remove-dependency" data-dependency-id="${dep.dependency_id}" class="btn btn-small" style="padding: 0.25rem 0.5rem; font-size: 0.8rem;">REMOVE</button>
                 </div>`;
             });
 
@@ -1275,8 +1275,8 @@ function editComment(commentId) {
                 Markdown
             </label>
             <div class="comment-edit-buttons">
-                <button type="button" class="btn btn-small" data-action="save-edit-comment" data-comment-id="${commentId}">Save</button>
-                <button type="button" class="btn btn-secondary btn-small" data-action="cancel-edit-comment" data-comment-id="${commentId}">Cancel</button>
+                <button type="button" class="btn btn-small" data-action="save-edit-comment" data-comment-id="${commentId}">SAVE</button>
+                <button type="button" class="btn btn-secondary btn-small" data-action="cancel-edit-comment" data-comment-id="${commentId}">CANCEL</button>
             </div>
         </div>
     `;
@@ -1442,7 +1442,7 @@ function showReplyForm(commentId, userName) {
         <div class="reply-form-container" data-parent-id="${commentId}">
             <div class="reply-header">
                 <span>Replying to <span class="replying-to">@${userName}</span></span>
-                <button type="button" class="close-reply-btn" data-action="close-reply">Cancel</button>
+                <button type="button" class="close-reply-btn" data-action="close-reply">CANCEL</button>
             </div>
             <textarea id="replyText" placeholder="Write your reply..."></textarea>
             <div class="reply-actions">
@@ -1451,7 +1451,7 @@ function showReplyForm(commentId, userName) {
                     <span>Markdown</span>
                 </label>
                 <div class="reply-buttons">
-                    <button type="button" class="btn btn-small" data-action="submit-reply" data-parent-id="${commentId}">Reply</button>
+                    <button type="button" class="btn btn-small" data-action="submit-reply" data-parent-id="${commentId}">REPLY</button>
                 </div>
             </div>
         </div>
diff --git a/views/CreateTicketView.php b/views/CreateTicketView.php
index 621a694..d5e4798 100644
--- a/views/CreateTicketView.php
+++ b/views/CreateTicketView.php
@@ -258,8 +258,8 @@ $nonce = SecurityHeadersMiddleware::getNonce();
             <div class="ascii-content">
                 <div class="ascii-frame-inner">
                     <div class="ticket-footer">
-                        <button type="submit" class="btn primary">Create Ticket</button>
-                        <button type="button" data-action="navigate" data-url="<?php echo $GLOBALS['config']['BASE_URL']; ?>/" class="btn back-btn">Cancel</button>
+                        <button type="submit" class="btn primary">CREATE TICKET</button>
+                        <button type="button" data-action="navigate" data-url="<?php echo $GLOBALS['config']['BASE_URL']; ?>/" class="btn back-btn">CANCEL</button>
                     </div>
                 </div>
             </div>
diff --git a/views/DashboardView.php b/views/DashboardView.php
index 07e8bda..832897a 100644
--- a/views/DashboardView.php
+++ b/views/DashboardView.php
@@ -187,8 +187,8 @@ $nonce = SecurityHeadersMiddleware::getNonce();
                     <?php endforeach; ?>
                 </div>
 
-                <button id="apply-filters-btn" class="btn">Apply Filters</button>
-                <button id="clear-filters-btn" class="btn btn-secondary">Clear All</button>
+                <button id="apply-filters-btn" class="btn">APPLY FILTERS</button>
+                <button id="clear-filters-btn" class="btn btn-secondary">CLEAR ALL</button>
             </div>
             </div>
         </aside>
@@ -276,7 +276,7 @@ $nonce = SecurityHeadersMiddleware::getNonce();
                     placeholder="&gt; Search tickets..."
                     class="search-box"
                     value="<?php echo isset($_GET['search']) ? htmlspecialchars($_GET['search']) : ''; ?>">
-                <button type="submit" class="btn search-btn">Search</button>
+                <button type="submit" class="btn search-btn">SEARCH</button>
                 <button type="button" class="btn btn-secondary" data-action="open-advanced-search" title="Advanced Search">FILTER</button>
                 <?php if (isset($_GET['search']) && !empty($_GET['search'])): ?>
                     <a href="?" class="clear-search-btn" aria-label="Clear search">[ X ]</a>
@@ -292,7 +292,7 @@ $nonce = SecurityHeadersMiddleware::getNonce();
             </div>
             <button data-action="navigate" data-url="<?php echo $GLOBALS['config']['BASE_URL']; ?>/ticket/create" class="btn create-ticket">+ NEW TICKET</button>
             <div class="export-dropdown" id="exportDropdown" style="display: none;">
-                <button class="btn" data-action="toggle-export-menu" aria-label="Export selected tickets" aria-haspopup="true" aria-expanded="false">Export Selected (<span id="exportCount">0</span>)</button>
+                <button class="btn" data-action="toggle-export-menu" aria-label="Export selected tickets" aria-haspopup="true" aria-expanded="false">EXPORT SELECTED (<span id="exportCount">0</span>)</button>
                 <div class="export-dropdown-content" id="exportDropdownContent">
                     <a href="#" data-action="export-tickets" data-format="csv">CSV</a>
                     <a href="#" data-action="export-tickets" data-format="json">JSON</a>
@@ -352,10 +352,10 @@ $nonce = SecurityHeadersMiddleware::getNonce();
                 <?php if ($GLOBALS['currentUser']['is_admin'] ?? false): ?>
                 <div class="bulk-actions-inline" style="display: none;">
                     <span id="selected-count">0</span> tickets selected
-                    <button data-action="bulk-status" class="btn btn-bulk">Change Status</button>
-                    <button data-action="bulk-assign" class="btn btn-bulk">Assign</button>
-                    <button data-action="bulk-priority" class="btn btn-bulk">Priority</button>
-                    <button data-action="clear-selection" class="btn btn-secondary">Clear</button>
+                    <button data-action="bulk-status" class="btn btn-bulk">CHANGE STATUS</button>
+                    <button data-action="bulk-assign" class="btn btn-bulk">ASSIGN</button>
+                    <button data-action="bulk-priority" class="btn btn-bulk">PRIORITY</button>
+                    <button data-action="clear-selection" class="btn btn-secondary">CLEAR</button>
                 </div>
                 <?php endif; ?>
 
@@ -398,7 +398,7 @@ $nonce = SecurityHeadersMiddleware::getNonce();
                         </span>
                         <?php endforeach; ?>
                     </div>
-                    <button type="button" class="btn btn-secondary btn-sm" data-action="clear-all-filters">Clear All</button>
+                    <button type="button" class="btn btn-secondary btn-sm" data-action="clear-all-filters">CLEAR ALL</button>
                 </div>
                 <?php endif; ?>