diff --git a/src/app.scss b/src/app.scss
index 69f7eb1..af9f510 100644
--- a/src/app.scss
+++ b/src/app.scss
@@ -13,7 +13,7 @@ h3 {
 }
 
 body, button, input, select, textarea, .content{
-  font-family: "Lato", "Source Sans 3", Fira Sans, sans-serif !important;
+  font-family: sans-serif !important;
   letter-spacing: 0.2px !important;
 }
 
@@ -22,7 +22,7 @@ body, button, input, select, textarea, .content{
 }
 
 code {
-  font-family: "Cascadia Code SemiLight", monospace !important;
+  font-family: monospace !important;
   font-size: 14px !important;
 }
 
@@ -87,10 +87,9 @@ html {
   /* Back-ground */
   --BgColorDark: hsl(228, 10%, 10%);
   --BgColorLight: hsl(0, 0%, 100%);
-  // --BgColorSidebarDark: rgb(28, 30, 36);
   --BgColorSidebarDark: rgb(16, 17, 22);
   --BgColorSidebarLight: hsla(0, 0%, 93%, 0.354);
-  // Tool drawer for messages
+  
   --chatToolDrawerSize: 40px;
   --chatToolDrawerColor: var(--BgColorSidebarLight);
   
@@ -115,10 +114,8 @@ html {
   --BgColor: var(-BgColorLight);
   --running-totals: 0;
 
-}
-
-body, button, input, select, textarea {
-  font-family: "Noto Sans", "Source Sans 3", "Fira Sans", sans-serif !important;
+  --fontMain:   "Noto Sans";
+  --fontCode: "Cascadia Code";
 
 }
 
@@ -317,13 +314,12 @@ select option.is-default {
 }
 
 .content {
-  font-family: "Noto Sans", "Source Sans 3", "Fira Sans", sans-serif !important;
   font-size: 15px;
   line-height: 30px;
 }
 
 .code {
-  font-family: "Monaco", "Hack", monospace !important;
+  font-family: monospace !important;
 }
 /* Style the chat input */
 .chat-input {
diff --git a/src/lib/EditMessage.svelte b/src/lib/EditMessage.svelte
index 39a2d4a..68d37e8 100644
--- a/src/lib/EditMessage.svelte
+++ b/src/lib/EditMessage.svelte
@@ -7,7 +7,7 @@
   import SvelteMarkdown from 'svelte-markdown'
   import type { Message, Model, Chat } from './Types.svelte'
   import Fa from 'svelte-fa/src/fa.svelte'
-  import { faTrash, faDiagramPredecessor, faDiagramNext, faCircleCheck, faPaperPlane, faEye, faEyeSlash, faEllipsis, faDownload, faClipboard, faSquareRootVariable } from '@fortawesome/free-solid-svg-icons/index'
+  import { faTrash, faDiagramPredecessor, faDiagramNext, faCircleCheck, faPaperPlane, faEye, faEyeSlash, faEllipsis, faDownload, faClipboard, faPenToSquare, faSquareRootVariable } from '@fortawesome/free-solid-svg-icons/index'
   import { errorNotice, scrollToMessage } from './Util.svelte'
   import { openModal } from 'svelte-modals'
   import PromptConfirm from './PromptConfirm.svelte'
@@ -348,8 +348,8 @@ const replaceLatexDelimiters = (text: string): string => {
     {:else}
       <div 
         class="message-display" 
-        on:touchend={editOnDoubleTap}
-          on:dblclick|preventDefault={() => edit()}
+          on:touchend={editOnDoubleTap}
+          on:dblclick|preventDefault={() => {if(isUser){edit()}}}
         >
         {#if message.summary && !message.summary.length}
         <p><b>Summarizing...</b></p>
@@ -423,6 +423,18 @@ const replaceLatexDelimiters = (text: string): string => {
       <span class="icon"><Fa icon={faDiagramPredecessor} /></span>
       </a>
       {/if}
+      {#if !isImage}
+        <a
+          href={'#'}
+          title="Edit"
+          class="msg-image button is-small"
+          on:click|preventDefault={() => {
+            edit()
+          }}
+        >
+        <span class="icon"><Fa icon={faPenToSquare} /></span>
+        </a>
+      {/if}
       {#if !message.summarized}
       <a
         href={'#'}