diff --git a/views/partials/message-user.html b/views/partials/message-user.html
index ed71200..b58038e 100644
--- a/views/partials/message-user.html
+++ b/views/partials/message-user.html
@@ -22,18 +22,22 @@
                 </div>
             </div>
             <div class="is-flex is-justify-content mt-2">
+                <button id="redo-button-{{ ID }}" class="button is-small is-primary delete-button is-outlined mr-2">
+                    <span class="icon">
+                        <i class="fa-solid fa-arrows-rotate"></i>
+                    </span>
+                </button>
+                <button id="edit-button-{{ ID }}" class="button is-small is-primary delete-button is-outlined mr-2">
+                    <span class="icon">
+                        <i class="fa-solid fa-pen"></i>
+                    </span>
+                </button>
                 <button id="delete-button-{{ ID }}" hx-post="/deleteMessage?id={{ ID }}" hx-swap="outerHTML"
                     hx-target="#chat-container" class="button is-small is-danger delete-button is-outlined mr-2">
                     <span class="icon">
                         <i class="fa-solid fa-trash"></i>
                     </span>
                 </button>
-                <button id="redo-button-{{ ID }}" hx-post="/redoMessage?id={{ ID }}" hx-swap="outerHTML"
-                    hx-target="#chat-container" class="button is-small is-primary delete-button is-outlined">
-                    <span class="icon">
-                        <i class="fa-solid fa-arrows-rotate"></i>
-                    </span>
-                </button>
             </div>
         </div>
     </div>
diff --git a/views/partials/popover-settings.html b/views/partials/popover-settings.html
index 0ff6344..dfc7ca8 100644
--- a/views/partials/popover-settings.html
+++ b/views/partials/popover-settings.html
@@ -41,8 +41,12 @@
                         </div>
                         <div class="field has-addons">
                             <p class="control">
-                                <button {% if not IsLogin %}disabled{% endif %} type="submit"
-                                    class="button is-small">Save</button>
+                                <button {% if not IsLogin %}disabled{% endif %} type="submit" class="button is-small">
+                                    <span class="icon is-small">
+                                        <i class="fas fa-check"></i>
+                                    </span>
+                                    <span>Save</span>
+                                </button>
                             </p>
                         </div>
                     </form>