diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/ellipse.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/ellipse.png
old mode 100755
new mode 100644
index ce5466bfe0..d58b3f79fe
Binary files a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/ellipse.png and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/ellipse.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/line.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/line.png
old mode 100755
new mode 100644
index e0abedeaae..bd1fa8bcb6
Binary files a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/line.png and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/line.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/pencil.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/pencil.png
index f5d0f34e12..b2b4c883b1 100644
Binary files a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/pencil.png and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/pencil.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/square.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/square.png
old mode 100755
new mode 100644
index bdceb2e474..5d3df5eac3
Binary files a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/square.png and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/square.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/text.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/text.png
old mode 100755
new mode 100644
index 819b580392..7b49878d92
Binary files a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/text.png and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/text.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/triangle.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/triangle.png
old mode 100755
new mode 100644
index 0530c3deb6..f2b9fb82dd
Binary files a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/triangle.png and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/triangle.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml
index 6188e8721a..e6012b5aef 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml
@@ -211,16 +211,16 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				} else if(toolType == DrawObject.RECTANGLE) {
 					CursorManager.setCursor(rectangle_icon);
 				} else if(toolType == DrawObject.TRIANGLE) {
-					CursorManager.setCursor(triangle_icon, 2, -7, 0);
+					CursorManager.setCursor(triangle_icon);
 				} else if(toolType == DrawObject.PENCIL) {
-					CursorManager.setCursor(pencil_icon, 2, 0, -16);
+					CursorManager.setCursor(pencil_icon, 2, -1, -21);
 				} else if(toolType == DrawObject.LINE) {
-					CursorManager.setCursor(line_icon, 2, 0, -14);
+					CursorManager.setCursor(line_icon);
 				} else if(toolType == DrawObject.HIGHLIGHTER) {
 					CursorManager.setCursor(highlighter_icon);
 				} else if(toolType == DrawObject.ERASER) {
 					CursorManager.setCursor(eraser_icon);
-				} else if(toolType == TextObject.TEXT_TOOL) {
+				} else if(toolType == DrawObject.TEXT) {
 					CursorManager.setCursor(text_icon);
 //				} else if(toolType == SelectObject.SELECT_TOOL) {
 //					CursorManager.setCursor(select_icon);