diff --git a/data/themes/classic/style.css b/data/themes/classic/style.css
index 1ace5a8e863..cf5c224004a 100644
--- a/data/themes/classic/style.css
+++ b/data/themes/classic/style.css
@@ -320,7 +320,7 @@ TrackOperationsWidget > QPushButton {
 	min-height: 26px;
 	min-width: 26px;
 	background: none;
-	border:none;
+	border: none;
 }
 
 TrackOperationsWidget > QPushButton::menu-indicator {
@@ -328,20 +328,18 @@ TrackOperationsWidget > QPushButton::menu-indicator {
 	subcontrol-origin: padding;
 	subcontrol-position: center;
 	position: relative;
-	top: 2px;
+	top: 1px;
 }
 
 TrackOperationsWidget > QPushButton::menu-indicator:hover {
 	image: url(resources:trackop_h.png);
 }
 
-
 TrackOperationsWidget > QPushButton::menu-indicator:pressed,
-TrackOperationsWidget > QPushButton::menu-indicator:checked
- {
+TrackOperationsWidget > QPushButton::menu-indicator:checked {
 	image: url(resources:trackop_c.png);
 	position: relative;
-	top: 3px;
+	top: 2px;
 }
 
 /* actually has no effect yet so disabled */
diff --git a/data/themes/default/style.css b/data/themes/default/style.css
index dbcb39fa557..695e9b6fd86 100644
--- a/data/themes/default/style.css
+++ b/data/themes/default/style.css
@@ -320,20 +320,14 @@ TrackOperationsWidget > QPushButton::menu-indicator {
 	subcontrol-origin: padding;
 	subcontrol-position: center;
 	position: relative;
-	top: 2px;
-}
-
-TrackOperationsWidget > QPushButton::menu-indicator:hover {
-	image: url(resources:trackop_h.png);
+	top: 1px;
 }
 
-
 TrackOperationsWidget > QPushButton::menu-indicator:pressed,
-TrackOperationsWidget > QPushButton::menu-indicator:checked
- {
-	image: url(resources:trackop_c.png);
+TrackOperationsWidget > QPushButton::menu-indicator:checked {
+	image: url(resources:trackop.png);
 	position: relative;
-	top: 3px;
+	top: 2px;
 }
 
 /* font sizes */
diff --git a/data/themes/default/track_op_grip_c.png b/data/themes/default/track_op_grip_c.png
new file mode 100644
index 00000000000..0faccddabb5
Binary files /dev/null and b/data/themes/default/track_op_grip_c.png differ
diff --git a/data/themes/default/trackop_c.png b/data/themes/default/trackop_c.png
deleted file mode 100644
index b26dd6ef26a..00000000000
Binary files a/data/themes/default/trackop_c.png and /dev/null differ
diff --git a/data/themes/default/trackop_h.png b/data/themes/default/trackop_h.png
deleted file mode 100644
index b26dd6ef26a..00000000000
Binary files a/data/themes/default/trackop_h.png and /dev/null differ
diff --git a/src/core/Track.cpp b/src/core/Track.cpp
index 163e0efd3b3..c2b8be11049 100644
--- a/src/core/Track.cpp
+++ b/src/core/Track.cpp
@@ -1667,12 +1667,6 @@ TrackOperationsWidget::TrackOperationsWidget( TrackView * parent ) :
 	QWidget( parent ),             /*!< The parent widget */
 	m_trackView( parent )          /*!< The parent track view */
 {
-	if( s_grip == NULL )
-	{
-		s_grip = new QPixmap( embed::getIconPixmap(
-							"track_op_grip" ) );
-	}
-
 	ToolTip::add( this, tr( "Press <%1> while clicking on move-grip "
 				"to begin a new drag'n'drop-action." ).arg(
 					#ifdef LMMS_BUILD_APPLE
@@ -1795,14 +1789,17 @@ void TrackOperationsWidget::paintEvent( QPaintEvent * pe )
 
 	if( m_trackView->isMovingTrack() == false )
 	{
+		s_grip = new QPixmap( embed::getIconPixmap(
+							"track_op_grip" ) );
+
 		p.drawPixmap( 2, 2, *s_grip );
-		m_trackOps->show();
-		m_muteBtn->show();
 	}
 	else
 	{
-		m_trackOps->hide();
-		m_muteBtn->hide();
+		s_grip = new QPixmap( embed::getIconPixmap(
+							"track_op_grip_c" ) );
+
+		p.drawPixmap( 2, 2, *s_grip );
 	}
 }
 
@@ -2713,6 +2710,12 @@ void TrackView::dropEvent( QDropEvent * de )
  */
 void TrackView::mousePressEvent( QMouseEvent * me )
 {
+	if( me->x()>10 ) // 10 = The width of the grip + 2 pixels to the left and right.
+	{
+		QWidget::mousePressEvent( me );
+		return;
+	}
+
 	// If previously dragged too small, restore on shift-leftclick
 	if( height() < DEFAULT_TRACK_HEIGHT &&
 		me->modifiers() & Qt::ShiftModifier &&
@@ -2745,7 +2748,7 @@ void TrackView::mousePressEvent( QMouseEvent * me )
 		{
 			m_action = MoveTrack;
 
-			QCursor c( Qt::SizeAllCursor );
+			QCursor c( Qt::SizeVerCursor );
 			QApplication::setOverrideCursor( c );
 			// update because in move-mode, all elements in
 			// track-op-widgets are hidden as a visual feedback