diff --git a/css/cwd.css b/css/cwd.css
index a0f6c8357..35519c7f6 100644
--- a/css/cwd.css
+++ b/css/cwd.css
@@ -258,7 +258,7 @@
 .elfinder-cwd .elfinder-navbar-root-network.elfinder-droppable-active .elfinder-cwd-icon,
 .elfinder-cwd-view-list .elfinder-navbar-root-network td .elfinder-cwd-icon  {
 	background-image:url("../img/toolbar.png");
-	background-position: 0 76.8%; /* Don't forget change % when toolbar.png edited */
+	background-position: 0 75.45%; /* Don't forget change % when toolbar.png edited */
 	background-size: cover;
 }
 .elfinder-cwd .elfinder-navbar-root-network.elfinder-droppable-active .elfinder-cwd-icon {
diff --git a/css/toolbar.css b/css/toolbar.css
index 8a3b4179b..6ddfd42b0 100644
--- a/css/toolbar.css
+++ b/css/toolbar.css
@@ -161,6 +161,7 @@
 .elfinder-button-icon-undo      { background-position: 0 -864px; }
 .elfinder-button-icon-redo      { background-position: 0 -880px; }
 .elfinder-button-icon-preference { background-position: 0 -896px; }
+.elfinder-button-icon-mkdirin   { background-position: 0 -912px; }
 
 /* button with dropdown menu*/
 .elfinder .elfinder-menubutton { overflow:visible; }
diff --git a/elfinder.playground.html b/elfinder.playground.html
index 283a63ed9..8b7e478ef 100644
--- a/elfinder.playground.html
+++ b/elfinder.playground.html
@@ -59,7 +59,6 @@
 	<script src="js/ui/cwd.js"></script>
 	<script src="js/ui/dialog.js"></script>
 	<script src="js/ui/fullscreenbutton.js"></script>
-	<script src="js/ui/mkdirbutton.js"></script>
 	<script src="js/ui/navbar.js"></script>
 	<script src="js/ui/overlay.js"></script>
 	<script src="js/ui/panel.js"></script>
diff --git a/elfinder.src.html b/elfinder.src.html
index 35383317f..0e46b5b9a 100644
--- a/elfinder.src.html
+++ b/elfinder.src.html
@@ -51,7 +51,6 @@
 	<script src="js/ui/cwd.js"></script>
 	<script src="js/ui/dialog.js"></script>
 	<script src="js/ui/fullscreenbutton.js"></script>
-	<script src="js/ui/mkdirbutton.js"></script>
 	<script src="js/ui/navbar.js"></script>
 	<script src="js/ui/overlay.js"></script>
 	<script src="js/ui/panel.js"></script>
diff --git a/img/src/toolbar.xcf b/img/src/toolbar.xcf
index acfe817c0..cc9f4742a 100644
Binary files a/img/src/toolbar.xcf and b/img/src/toolbar.xcf differ
diff --git a/img/toolbar.png b/img/toolbar.png
index f4269a1bc..fb1eb8ded 100644
Binary files a/img/toolbar.png and b/img/toolbar.png differ
diff --git a/js/commands/mkdir.js b/js/commands/mkdir.js
index 5c3f73fdc..fe305f73e 100644
--- a/js/commands/mkdir.js
+++ b/js/commands/mkdir.js
@@ -30,15 +30,21 @@ elFinder.prototype.commands.mkdir = function() {
 
 	this.init = function() {
 		if (this.options.intoNewFolderToolbtn) {
-			this.options.ui = 'mkdirbutton';
+			this.syncTitleOnChange = true;
 		}
 	}
 	
 	fm.bind('select', function(e) {
 		var sel = (e.data && e.data.selected)? e.data.selected : [];
-			
+		
+		self.className = 'mkdir';
 		curOrg = sel.length? (e.data.origin || '') : '';
-		self.title = (sel.length && (curOrg !== 'navbar'))? fm.i18n('cmdmkdirin') : fm.i18n('cmdmkdir');
+		if (sel.length && (curOrg !== 'navbar')) {
+			self.title = fm.i18n('cmdmkdirin');
+			self.className += ' elfinder-button-icon-mkdirin';
+		} else {
+			self.title = fm.i18n('cmdmkdir');
+		}
 		self.update(void(0), self.title);
 	});
 	
diff --git a/js/ui/mkdirbutton.js b/js/ui/mkdirbutton.js
deleted file mode 100644
index db4ff8b76..000000000
--- a/js/ui/mkdirbutton.js
+++ /dev/null
@@ -1,15 +0,0 @@
-"use strict";
-/**
- * @class  elFinder toolbar button to switch mkdir mode.
- *
- * @author Naoki Sawada
- **/
-$.fn.elfindermkdirbutton = function(cmd) {
-	return this.each(function() {
-		var button = $(this).elfinderbutton(cmd);
-
-		cmd.change(function() {
-			button.attr('title', cmd.value);
-		});
-	});
-};