diff --git a/Nvim/Nvim/AppDelegate.swift b/Nvim/Nvim/AppDelegate.swift
index b06de083..e2270df7 100644
--- a/Nvim/Nvim/AppDelegate.swift
+++ b/Nvim/Nvim/AppDelegate.swift
@@ -11,16 +11,7 @@ import Cocoa
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
 
-
-
   func applicationDidFinishLaunching(_ aNotification: Notification) {
     // Insert code here to initialize your application
   }
-
-  func applicationWillTerminate(_ aNotification: Notification) {
-    // Insert code here to tear down your application
-  }
-
-
 }
-
diff --git a/Nvim/Nvim/Document.swift b/Nvim/Nvim/Document.swift
index b008449b..83ec8101 100644
--- a/Nvim/Nvim/Document.swift
+++ b/Nvim/Nvim/Document.swift
@@ -18,7 +18,6 @@ class Document: NSDocument, NSWindowDelegate {
 
   override init() {
     super.init()
-    // Add your subclass-specific initialization here.
 
     nvimView
       .events
@@ -26,10 +25,10 @@ class Document: NSDocument, NSWindowDelegate {
         switch event {
 
         case .neoVimStopped:
-          self.close()
+          DispatchQueue.main.async { self.close() }
 
         default:
-          Swift.print("other event: \(event)")
+          break
 
         }
       })
diff --git a/VimR/VimR.xcodeproj/xcshareddata/xcschemes/VimR.dev.xcscheme b/VimR/VimR.xcodeproj/xcshareddata/xcschemes/VimR.dev.xcscheme
index fc0ff521..335509f5 100644
--- a/VimR/VimR.xcodeproj/xcshareddata/xcschemes/VimR.dev.xcscheme
+++ b/VimR/VimR.xcodeproj/xcshareddata/xcschemes/VimR.dev.xcscheme
@@ -62,6 +62,16 @@
          </BuildableReference>
       </BuildableProductRunnable>
       <AdditionalOptions>
+         <AdditionalOption
+            key = "MallocStackLogging"
+            value = ""
+            isEnabled = "YES">
+         </AdditionalOption>
+         <AdditionalOption
+            key = "PrefersMallocStackLoggingLite"
+            value = ""
+            isEnabled = "YES">
+         </AdditionalOption>
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
diff --git a/VimR/VimR/HtmlPreviewTool.swift b/VimR/VimR/HtmlPreviewTool.swift
index 9992e232..1caa667c 100644
--- a/VimR/VimR/HtmlPreviewTool.swift
+++ b/VimR/VimR/HtmlPreviewTool.swift
@@ -149,13 +149,22 @@ extension HtmlPreviewTool {
       self.addViews()
     }
 
-    override func repaint(with: Workspace.Theme) {
-
+    override func repaint(with theme: Workspace.Theme) {
+      self.selectHtmlFile.image = NSImage.fontAwesomeIcon(
+        name: .fileCode,
+        style: .solid,
+        textColor: theme.toolbarForeground,
+        dimension: InnerToolBar.iconDimension
+      )
     }
 
     private func addViews() {
       let selectHtmlFile = self.selectHtmlFile
-      InnerToolBar.configureToStandardIconButton(button: selectHtmlFile, iconName: .fileCode, style: .regular)
+      InnerToolBar.configureToStandardIconButton(
+        button: selectHtmlFile,
+        iconName: .fileCode,
+        style: .solid
+      )
       selectHtmlFile.toolTip = "Select the HTML file"
       selectHtmlFile.action = #selector(HtmlPreviewTool.selectHtmlFile)
 
diff --git a/VimR/VimR/Workspace/InnterToolBar.swift b/VimR/VimR/Workspace/InnterToolBar.swift
index 2f051531..08b79aed 100644
--- a/VimR/VimR/Workspace/InnterToolBar.swift
+++ b/VimR/VimR/Workspace/InnterToolBar.swift
@@ -110,7 +110,7 @@ class InnerToolBar: NSView, NSUserInterfaceValidations {
     )
     self.closeButton.image = NSImage.fontAwesomeIcon(
       name: .timesCircle,
-      style: .regular,
+      style: .solid,
       textColor: self.theme.toolbarForeground,
       dimension: InnerToolBar.iconDimension
     )
@@ -173,7 +173,7 @@ class InnerToolBar: NSView, NSUserInterfaceValidations {
     InnerToolBar.configureToStandardIconButton(
       button: close,
       iconName: .timesCircle,
-      style: .regular,
+      style: .solid,
       color: self.theme.toolbarForeground
     )
     close.target = self