diff --git a/common/res/font b/common/res/font
new file mode 100644
index 0000000..e10cafb
Binary files /dev/null and b/common/res/font differ
diff --git a/swing/src/lie/mac.kt b/swing/src/lie/mac.kt
index f72d14a..7615e20 100644
--- a/swing/src/lie/mac.kt
+++ b/swing/src/lie/mac.kt
@@ -1,35 +1,37 @@
 package org.ice1000.devkt.lie
 
-import com.apple.eawt.*
-import com.apple.eawt.Application.getApplication
 import org.ice1000.devkt.config.GlobalSettings
 import org.ice1000.devkt.ui.swing.DevKtFrame
 import org.jetbrains.kotlin.com.intellij.openapi.util.SystemInfo
+import java.awt.Desktop.getDesktop
+import java.awt.Taskbar.getTaskbar
+import java.awt.desktop.*
 import java.awt.event.KeyEvent
 
 val ctrlOrMeta = if (SystemInfo.isMac) KeyEvent.META_DOWN_MASK else KeyEvent.CTRL_DOWN_MASK
 
-object MacSpecific : AboutHandler, PreferencesHandler, QuitHandler {
+object MacSpecific : AboutHandler, PreferencesHandler, QuitHandler  {
 	init {
 		// if System is Mac, make sure set this property before setLookAndFeel
 		System.getProperties()["apple.laf.useScreenMenuBar"] = "true"
 	}
 
 	fun init() {
-		getApplication().let { app ->
+		getDesktop().let { app ->
 			app.setPreferencesHandler(this)
 			app.setQuitHandler(this)
 			app.setAboutHandler(this)
-			app.dockIconImage = GlobalSettings.windowIcon.second
 		}
+		getTaskbar().iconImage = GlobalSettings.windowIcon.second
 	}
 
 	private val ui
 		get() = DevKtFrame.instance.ui
 
-	override fun handlePreferences(event: AppEvent.PreferencesEvent) = ui.settings()
+	override fun handlePreferences(e: PreferencesEvent?) = ui.settings()
+
 	// TODO About
-	override fun handleAbout(event: AppEvent.AboutEvent) = Unit
+	override fun handleAbout(e: AboutEvent?) = Unit
 
-	override fun handleQuitRequestWith(event: AppEvent.QuitEvent, quitResponse: QuitResponse) = ui.exit()
+	override fun handleQuitRequestWith(e: QuitEvent?, response: QuitResponse?) = ui.exit()
 }