diff --git a/stuff/config/qss/Default/imgs/black/x_lock_off.svg b/stuff/config/qss/Default/imgs/black/x_lock_off.svg
index 07e7232..edd6950 100644
--- a/stuff/config/qss/Default/imgs/black/x_lock_off.svg
+++ b/stuff/config/qss/Default/imgs/black/x_lock_off.svg
@@ -7,10 +7,8 @@
 <style type="text/css">
 	.st0{fill-opacity:0.313;}
 </style>
-<g id="g4491" transform="matrix(0.05555556,0,0,0.05555556,-1.0000008,-1.000001)">
-	<path id="path4509" inkscape:connector-curvature="0" class="st0" d="M171,54c-34.8,0-63,28.2-63,63v9h18v-9c0-24.8,20.2-45,45-45
-		c24.8,0,45,20.1,45,45v9h18v-9C234,82.2,205.8,54,171,54z"/>
+<g id="g4491" transform="matrix(0.0617284,0,0,0.05555556,-2.0555564,-1.000001)">
+    <path id="path4509" inkscape:connector-curvature="0" class="st0" d="m 171,54 c -34.8,0 -63,28.2 -63,63 l 0,9 18,0 0,-9 c 0,-24.8 20.2,-45 45,-45 24.8,0 45,20.1 45,45 l 0,9 18,0 0,-9 C 234,82.2 205.8,54 171,54 Z"/>
 </g>
-<path id="rect845" inkscape:connector-curvature="0" class="st0" d="M4,7v7h9V7H4z M8.5,8C9.3,8,10,8.7,10,9.5c0,0.5-0.3,1-0.8,1.3
-	V13H7.8v-2.2C7.3,10.5,7,10,7,9.5C7,8.7,7.7,8,8.5,8z"/>
-</svg>
+<path id="rect845" inkscape:connector-curvature="0" class="st0" d="m 3.5,7 0,7 10,0 0,-7 -10,0 z m 5,1 c 0.8888889,0 1.666667,0.7 1.666667,1.5 0,0.5 -0.333334,1 -0.8888892,1.3 l 0,2.2 -1.5555556,0 0,-2.2 C 7.1666667,10.5 6.8333333,10 6.8333333,9.5 6.8333333,8.7 7.6111111,8 8.5,8 Z"/>
+</svg>
\ No newline at end of file
diff --git a/stuff/config/qss/Default/imgs/white/x_lock_off.svg b/stuff/config/qss/Default/imgs/white/x_lock_off.svg
index 951cccd..4bd142f 100644
--- a/stuff/config/qss/Default/imgs/white/x_lock_off.svg
+++ b/stuff/config/qss/Default/imgs/white/x_lock_off.svg
@@ -1,18 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1"
-	 id="svg6" inkscape:version="0.91 r13725" sodipodi:docname="x_lock_off.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 17 17"
-	 style="enable-background:new 0 0 17 17;" xml:space="preserve">
+     id="svg6" inkscape:version="0.91 r13725" sodipodi:docname="x_lock_off.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 17 17"
+     style="enable-background:new 0 0 17 17;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:none;}
 	.st1{fill:#BBBBBB;fill-opacity:0.4471;}
 </style>
 <rect id="rect2" x="1.5" y="16" class="st0" width="1" height="1"/>
-<g id="g4491" transform="matrix(0.05555556,0,0,0.05555556,-1.0000008,-1.000001)">
-	<path id="path4509" inkscape:connector-curvature="0" class="st1" d="M216,54c-34.8,0-63,28.2-63,63v9h18v-9c0-24.8,20.2-45,45-45
-		c24.8,0,45,20.1,45,45v9h18v-9C279,82.2,250.8,54,216,54z"/>
+<g id="g4491" transform="matrix(0.0617284,0,0,0.05555556,-4.8333342,-1.000001)">
+    <path id="path4509" inkscape:connector-curvature="0" class="st1" d="m 216,54 c -34.8,0 -63,28.2 -63,63 l 0,9 18,0 0,-9 c 0,-24.8 20.2,-45 45,-45 24.8,0 45,20.1 45,45 l 0,9 18,0 0,-9 C 279,82.2 250.8,54 216,54 Z"/>
 </g>
-<path id="rect845" inkscape:connector-curvature="0" class="st1" d="M6.5,7v7h9V7H6.5z M11,8c0.8,0,1.5,0.7,1.5,1.5
-	c0,0.5-0.3,1-0.8,1.3V13h-1.5v-2.2C9.8,10.5,9.5,10,9.5,9.5C9.5,8.7,10.2,8,11,8z"/>
+<path id="rect845" inkscape:connector-curvature="0" class="st1" d="m 3.5,7 0,7 10,0 0,-7 -10,0 z m 5,1 c 0.8888889,0 1.666667,0.7 1.666667,1.5 0,0.5 -0.3333337,1 -0.8888892,1.3 l 0,2.2 -1.6666667,0 0,-2.2 C 7.1666667,10.5 6.8333333,10 6.8333333,9.5 6.8333333,8.7 7.6111111,8 8.5,8 Z"/>
 </svg>
diff --git a/toonz/sources/toonz/xshcolumnviewer.cpp b/toonz/sources/toonz/xshcolumnviewer.cpp
index 3a63553..0fe6183 100644
--- a/toonz/sources/toonz/xshcolumnviewer.cpp
+++ b/toonz/sources/toonz/xshcolumnviewer.cpp
@@ -1887,6 +1887,9 @@ void ColumnArea::mousePressEvent(QMouseEvent *event) {
       // synchronize the current column and the current fx
       TApp::instance()->getCurrentFx()->setFx(column->getFx());
     } else if (m_col >= 0) {
+		if (m_viewer->getColumnSelection()->isColumnSelected(m_col) &&
+			event->button() == Qt::RightButton)
+			return;
       setDragTool(XsheetGUI::DragTool::makeColumnSelectionTool(m_viewer));
       TApp::instance()->getCurrentFx()->setFx(0);
     }
diff --git a/toonz/sources/toonz/xsheetdragtool.cpp b/toonz/sources/toonz/xsheetdragtool.cpp
index f63366d..fe52e20 100644
--- a/toonz/sources/toonz/xsheetdragtool.cpp
+++ b/toonz/sources/toonz/xsheetdragtool.cpp
@@ -1767,8 +1767,9 @@ public:
     int frameAxis        = o->frameAxis(event->pos());
     if (o->isVerticalTimeline() &&
         !o->flag(PredefinedFlag::VOLUME_AREA_VERTICAL)) {
-      range     = o->layerSide(track);
-      frameAxis = o->layerAxis(event->pos()) - getViewer()->columnToLayerAxis(m_index);
+      range = o->layerSide(track);
+      frameAxis =
+          o->layerAxis(event->pos()) - getViewer()->columnToLayerAxis(m_index);
     }
 
     double v = range.ratio(frameAxis);