diff --git a/data/cursors/cursors.otml b/data/cursors/cursors.otml
index 36c1f39..c4f17f1 100644
--- a/data/cursors/cursors.otml
+++ b/data/cursors/cursors.otml
@@ -1,4 +1,7 @@
 Cursors
+  text:
+    image: textcursor
+    hot-spot: 4 9
   target:
     image: targetcursor
     hot-spot: 9 9
@@ -8,6 +11,6 @@ Cursors
   vertical:
     image: verticalcursor
     hot-spot: 4 9
-  text:
-    image: textcursor
-    hot-spot: 4 9
+  pointer:
+    image: pointer
+    hot-spot: 5 0
diff --git a/data/cursors/pointer.png b/data/cursors/pointer.png
new file mode 100644
index 0000000..e41785e
Binary files /dev/null and b/data/cursors/pointer.png differ
diff --git a/data/styles/10-buttons.otui b/data/styles/10-buttons.otui
index 4a81411..408e0c4 100644
--- a/data/styles/10-buttons.otui
+++ b/data/styles/10-buttons.otui
@@ -9,6 +9,8 @@ Button < UIButton
   image-border: 3
   padding: 5 10 5 10
   opacity: 1.0
+  change-cursor-image: true
+  cursor: pointer
 
   $hover !disabled:
     image-clip: 0 23 22 23
@@ -20,6 +22,7 @@ Button < UIButton
   $disabled:
     color: #dfdfdf88
     opacity: 0.8
+    change-cursor-image: false
 
 TabButton < UIButton
   size: 22 23
@@ -30,6 +33,8 @@ TabButton < UIButton
   text-offset: 0 1
   icon-color: #dfdfdf
   color: #dfdfdf
+  change-cursor-image: true
+  cursor: pointer
 
   $hover !on:
     image-clip: 0 23 22 23
@@ -38,6 +43,7 @@ TabButton < UIButton
   $disabled:
     image-color: #dfdfdf66
     icon-color: #dfdfdf
+    change-cursor-image: false
 
   $on:
     image-clip: 0 46 22 23
@@ -49,6 +55,8 @@ NextButton < UIButton
   image-clip: 12 0 12 21
   image-color: #ffffff
   text-offset: 0 1
+  change-cursor-image: true
+  cursor: pointer
 
   $hover !disabled:
     image-clip: 12 21 12 21
@@ -58,6 +66,7 @@ NextButton < UIButton
 
   $disabled:
     image-color: #dfdfdf88
+    change-cursor-image: false
 
 PreviousButton < UIButton
   size: 12 21
@@ -65,6 +74,8 @@ PreviousButton < UIButton
   image-clip: 0 0 12 21
   image-color: #ffffff
   text-offset: 0 1
+  change-cursor-image: true
+  cursor: pointer
 
   $hover !disabled:
     image-clip: 0 21 12 21
@@ -74,12 +85,15 @@ PreviousButton < UIButton
 
   $disabled:
     image-color: #dfdfdf88
+    change-cursor-image: false
 
 AddButton < UIButton
   size: 20 20
   image-source: /images/ui/icon_add
   image-color: #dfdfdfff
   text-offset: 0 1
+  change-cursor-image: true
+  cursor: pointer
 
   $hover !disabled:
     image-color: #dfdfdf99
@@ -89,3 +103,4 @@ AddButton < UIButton
 
   $disabled:
     image-color: #dfdfdf55
+    change-cursor-image: false
diff --git a/data/styles/10-checkboxes.otui b/data/styles/10-checkboxes.otui
index 3edccec..2c527b7 100644
--- a/data/styles/10-checkboxes.otui
+++ b/data/styles/10-checkboxes.otui
@@ -6,6 +6,8 @@ CheckBox < UICheckBox
   image-color: #dfdfdfff
   image-rect: 0 0 15 15
   image-source: /images/ui/checkbox
+  change-cursor-image: true
+  cursor: pointer
 
   $hover !disabled:
     color: #ffffff
@@ -26,6 +28,7 @@ CheckBox < UICheckBox
     image-color: #dfdfdf88
     color: #dfdfdf88
     opacity: 0.8
+    change-cursor-image: false
 
 ColorBox < UICheckBox
   size: 16 16
@@ -48,6 +51,8 @@ ButtonBox < UICheckBox
   image-color: #dfdfdf
   image-clip: 0 0 22 23
   image-border: 3
+  change-cursor-image: true
+  cursor: pointer
 
   $hover !disabled:
     image-clip: 0 23 22 23
@@ -59,6 +64,7 @@ ButtonBox < UICheckBox
   $disabled:
     color: #dfdfdf88
     image-color: #dfdfdf88
+    change-cursor-image: false
 
 ButtonBoxRounded < ButtonBox
   image-source: /images/ui/button_rounded
\ No newline at end of file
diff --git a/data/styles/10-textedits.otui b/data/styles/10-textedits.otui
index b5d09bc..2ec4c1c 100644
--- a/data/styles/10-textedits.otui
+++ b/data/styles/10-textedits.otui
@@ -9,9 +9,11 @@ TextEdit < UITextEdit
   image-border: 1
   selection-color: #272727
   selection-background-color: #cccccc
+  change-cursor-image: true
   $disabled:
     color: #27272788
     opacity: 0.5
+    change-cursor-image: false
 
 PasswordTextEdit < TextEdit
   text-hidden: true
diff --git a/layouts/retro/styles/10-checkboxes.otui b/layouts/retro/styles/10-checkboxes.otui
index 5a51a05..1998acb 100644
--- a/layouts/retro/styles/10-checkboxes.otui
+++ b/layouts/retro/styles/10-checkboxes.otui
@@ -6,6 +6,8 @@ CheckBox < UICheckBox
   image-color: #dfdfdfff
   image-rect: 0 0 12 12
   image-source: /images/ui/checkbox
+  change-cursor-image: true
+  cursor: pointer
 
   $hover !disabled:
     color: #ffffff
@@ -20,6 +22,7 @@ CheckBox < UICheckBox
     image-color: #dfdfdf88
     color: #dfdfdf88
     opacity: 0.8
+    change-cursor-image: false
 
 ColorBox < UICheckBox
   size: 16 16
@@ -42,6 +45,8 @@ ButtonBox < UICheckBox
   image-color: #dfdfdf
   image-clip: 0 0 22 23
   image-border: 3
+  change-cursor-image: true
+  cursor: pointer
 
   $hover !disabled:
     image-clip: 0 23 22 23
@@ -54,6 +59,7 @@ ButtonBox < UICheckBox
   $disabled:
     color: #dfdfdf88
     image-color: #dfdfdf88
+    change-cursor-image: false
 
 ButtonBoxRounded < ButtonBox
   image-source: /images/ui/button_rounded
\ No newline at end of file
diff --git a/layouts/retro/styles/10-textedits.otui b/layouts/retro/styles/10-textedits.otui
index fefa3bc..c0071db 100644
--- a/layouts/retro/styles/10-textedits.otui
+++ b/layouts/retro/styles/10-textedits.otui
@@ -9,9 +9,11 @@ TextEdit < UITextEdit
   image-border: 1
   selection-color: #272727
   selection-background-color: #cccccc
+  change-cursor-image: true
   $disabled:
     color: #27272788
     opacity: 0.5
+    change-cursor-image: false
 
 PasswordTextEdit < TextEdit
   text-hidden: true
diff --git a/otclient_dx.exe b/otclient_dx.exe
index c82b239..804d314 100644
Binary files a/otclient_dx.exe and b/otclient_dx.exe differ
diff --git a/otclient_gl.exe b/otclient_gl.exe
index 28cbfed..6080a5a 100644
Binary files a/otclient_gl.exe and b/otclient_gl.exe differ
diff --git a/otclient_linux b/otclient_linux
index 900f137..9e09691 100644
Binary files a/otclient_linux and b/otclient_linux differ
diff --git a/otclient_mac b/otclient_mac
index 92598e9..1efd3e5 100644
Binary files a/otclient_mac and b/otclient_mac differ
diff --git a/otclientv8.apk b/otclientv8.apk
index efc9e18..40f1722 100644
Binary files a/otclientv8.apk and b/otclientv8.apk differ