diff --git a/modules/client_options/graphics.otui b/modules/client_options/graphics.otui
index 3f1221f..dd75962 100644
--- a/modules/client_options/graphics.otui
+++ b/modules/client_options/graphics.otui
@@ -31,6 +31,10 @@ OptionPanel
     !text: tr('Fullscreen')
     tooltip: Ctrl+Shift+F
 
+  OptionCheckBox
+    id: antialiasing
+    !text: tr('Antialiasing')
+
   Label
     margin-top: 12
     id: optimizationLevelLabel
diff --git a/modules/client_options/options.lua b/modules/client_options/options.lua
index 325eb1b..8c68c23 100644
--- a/modules/client_options/options.lua
+++ b/modules/client_options/options.lua
@@ -66,7 +66,9 @@ local defaultOptions = {
 
   actionbarLock = false,
 
-  profile = 1
+  profile = 1,
+  
+  antialiasing = true
 }
 
 local optionsWindow
@@ -348,6 +350,8 @@ function setOption(key, value, force)
     generalPanel:getChildById('walkTeleportDelayLabel'):setText(tr('Walk delay after teleport: %s ms', value))  
   elseif key == 'walkCtrlTurnDelay' then
     generalPanel:getChildById('walkCtrlTurnDelayLabel'):setText(tr('Walk delay after ctrl turn: %s ms', value))  
+  elseif key == "antialiasing" then
+    g_app.setSmooth(value)
   end
 
   -- change value for keybind updates
@@ -408,6 +412,7 @@ end
 
 function online()
   setLightOptionsVisibility(not g_game.getFeature(GameForceLight))
+  g_app.setSmooth(g_settings.getBoolean("antialiasing"))
 end
 
 function offline()
diff --git a/otclient_dx.exe b/otclient_dx.exe
index e8533ac..84ce084 100644
Binary files a/otclient_dx.exe and b/otclient_dx.exe differ
diff --git a/otclient_gl.exe b/otclient_gl.exe
index 8db9be7..cfd5217 100644
Binary files a/otclient_gl.exe and b/otclient_gl.exe differ
diff --git a/otclient_linux b/otclient_linux
index aa54b72..36c295f 100644
Binary files a/otclient_linux and b/otclient_linux differ
diff --git a/otclient_mac b/otclient_mac
index 3435ee6..a0d5a37 100644
Binary files a/otclient_mac and b/otclient_mac differ
diff --git a/otclientv8.apk b/otclientv8.apk
index 4407fbf..36c541d 100644
Binary files a/otclientv8.apk and b/otclientv8.apk differ