diff --git a/editor.cpp b/editor.cpp
index a3652d10..1afbf783 100755
--- a/editor.cpp
+++ b/editor.cpp
@@ -1484,11 +1484,15 @@ void MapPixmapItem::updateCurHoveredTile(QPointF pos) {
 
 void MapPixmapItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) {
     updateCurHoveredTile(event->pos());
-    setCursor(editor->cursor);
+    if (editor->ui->actionBetter_Cursors->isChecked()){
+        setCursor(editor->cursor);
+    }
 }
 void MapPixmapItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) {
     map->clearHoveredTile();
-    unsetCursor();
+    if (editor->ui->actionBetter_Cursors->isChecked()){
+        unsetCursor();
+    }
 }
 void MapPixmapItem::mousePressEvent(QGraphicsSceneMouseEvent *event) {
     QPointF pos = event->pos();
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 65c36747..85dd6403 100755
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -54,6 +54,10 @@ MainWindow::MainWindow(QWidget *parent) :
             openProject(default_dir);
         }
     }
+
+    if (settings.contains("cursor_mode") && settings.value("cursor_mode") == "0") {
+        ui->actionBetter_Cursors->setChecked(false);
+    }
 }
 
 MainWindow::~MainWindow()
@@ -600,6 +604,11 @@ void MainWindow::on_actionZoom_Out_triggered() {
     scaleMapView(-1);
 }
 
+void MainWindow::on_actionBetter_Cursors_triggered() {
+    QSettings settings;
+    settings.setValue("cursor_mode", QString::number(ui->actionBetter_Cursors->isChecked()));
+}
+
 void MainWindow::scaleMapView(int s) {
     editor->map->scale_exp += s;
 
diff --git a/mainwindow.h b/mainwindow.h
index d6509a50..b8f9169d 100755
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -62,6 +62,7 @@ private slots:
 
     void on_actionZoom_In_triggered();
     void on_actionZoom_Out_triggered();
+    void on_actionBetter_Cursors_triggered();
 
     void on_toolButton_deleteObject_clicked();
 
diff --git a/mainwindow.ui b/mainwindow.ui
index ad6b7925..160b223c 100755
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -2076,6 +2076,7 @@
     </property>
     <addaction name="actionZoom_In"/>
     <addaction name="actionZoom_Out"/>
+    <addaction name="actionBetter_Cursors"/>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menuEdit"/>
@@ -2154,6 +2155,20 @@
     <string>-</string>
    </property>
   </action>
+  <action name="actionBetter_Cursors">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Better Cursors</string>
+   </property>
+   <property name="toolTip">
+    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use reticule-styled cursors with icon showing currently selected tool.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>