diff --git a/Info.plist b/Info.plist
new file mode 100644
index 0000000..dc49370
--- /dev/null
+++ b/Info.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>ToDo</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>com.aureliedelhaie.ToDo</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>13</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSSupportsAutomaticGraphicsSwitching</key>
+	<true/>
+        <key>CFBundleIconFile</key>
+        <string>icon.icns</string>
+</dict>
+</plist>
diff --git a/ToDo.pro b/ToDo.pro
index fafadb1..d2fa5dc 100644
--- a/ToDo.pro
+++ b/ToDo.pro
@@ -8,25 +8,18 @@ QMAKE_CXXFLAGS += -Werror
 win32:VERSION = 0.0.1.0 # major.minor.patch.build
 else:VERSION = 0.0.1    # major.minor.patch
 
-DEFINES += APP_VERSION=\"\\\"$${VERSION}\\\"\"
-DEFINES += APP_NAME=\"\\\"ToDo\\\"\"
-
 # remove possible other optimization flags
 win32 {
     message("Build for Windows")
     QMAKE_CXXFLAGS_RELEASE -= -O
     QMAKE_CXXFLAGS_RELEASE -= -O1
     QMAKE_CXXFLAGS_RELEASE *= -O2
-    DEFINES += APP_OS=\"\\\"Windows\\\"\"
-    DEFINES += APP_OS_VERSION=\"\\\"$$system(ver)\\\"\"
     equals(QMAKE_TARGET.arch, arm64) {
         message("CPU Architecture : aarch64")
-        DEFINES += APP_ARCH=\"\\\"arm64\\\"\"
     }
     equals(QMAKE_TARGET.arch, x86_64) {
         message("CPU Architecture : x64")
         QMAKE_CXXFLAGS_RELEASE += -favor:INTEL64
-        DEFINES += APP_ARCH=\"\\\"x64\\\"\"
     }
     RC_ICONS = icon.ico
     QMAKE_TARGET_COMPANY = "Aurelie Delhaie"
@@ -36,31 +29,26 @@ win32 {
 
 macx {
     message("Build for macOS")
-    #ICON = icon.icns
-    #QMAKE_INFO_PLIST = Info.plist
+    ICON = icon.icns
+    QMAKE_INFO_PLIST = Info.plist
     QMAKE_CXXFLAGS_RELEASE -= -O
     QMAKE_CXXFLAGS_RELEASE -= -O1
     QMAKE_CXXFLAGS_RELEASE -= -O2
     QMAKE_CXXFLAGS_RELEASE *= -O3
     QMAKE_APPLE_DEVICE_ARCHS = arm64
-    DEFINES += APP_OS=\"\\\"macOS\\\"\"
-    DEFINES += APP_OS_VERSION=\"\\\"$$system(uname -r)\\\"\"
-    DEFINES += APP_ARCH=\"\\\"universal\\\"\"
+    QMAKE_CXXFLAGS_RELEASE += -march=armv8.6-a+fp16+simd
 }
 
 linux-* {
     message("Build for Linux")
-    DEFINES += APP_OS=\"\\\"$$system(cat /etc/issue | cut -d\' \' -f1)\\\"\"
-    DEFINES += APP_OS_VERSION=\"\\\"$$system(uname -r)\\\"\"
-    DEFINES += APP_ARCH=\"\\\"$$system(uname -m)\\\"\"
-    ARCH = $$system(uname -m)
     equals(ARCH, aarch64) {
         message("CPU Architecture : aarch64")
-        QMAKE_CXXFLAGS_RELEASE += -mtune=cortex-a72
+        QMAKE_CXXFLAGS_RELEASE += -mtune=armv8.6-a+fp16+simd
     }
     equals(ARCH, amd64) {
         message("CPU Architecture : amd64")
-        QMAKE_CXXFLAGS_RELEASE += -march=skylake
+        QMAKE_CXXFLAGS_RELEASE += -march=tigerlake
+        QMAKE_CXXFLAGS_RELEASE += -mtune=intel
     }
     QMAKE_CXXFLAGS_RELEASE *= -O3
 }
diff --git a/icon.icns b/icon.icns
new file mode 100644
index 0000000..469271a
Binary files /dev/null and b/icon.icns differ
diff --git a/icon.ico b/icon.ico
new file mode 100644
index 0000000..b8a12bc
Binary files /dev/null and b/icon.ico differ
diff --git a/icon.png b/icon.png
new file mode 100644
index 0000000..843a235
Binary files /dev/null and b/icon.png differ
diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui
index e6a0568..a625a84 100644
--- a/src/gui/mainwindow.ui
+++ b/src/gui/mainwindow.ui
@@ -22,6 +22,9 @@
   <property name="styleSheet">
    <string notr="true"/>
   </property>
+  <property name="unifiedTitleAndToolBarOnMac">
+   <bool>false</bool>
+  </property>
   <widget class="QWidget" name="centralwidget">
    <property name="styleSheet">
     <string notr="true">background-color: rgb(249, 255, 251);</string>