diff --git a/src/oscilloscope.cpp b/src/oscilloscope.cpp
index 8b6c53b1cc..9a62068316 100644
--- a/src/oscilloscope.cpp
+++ b/src/oscilloscope.cpp
@@ -111,7 +111,9 @@ Oscilloscope::Oscilloscope(struct iio_context *ctx, Filter *filt,
 	d_displayOneBuffer(true),
 	nb_ref_channels(0),
 	lastFunctionValid(false),
-	import_error("")
+	import_error(""),
+	hCursorsEnabled(true),
+	vCursorsEnabled(true)
 {
 	ui->setupUi(this);
 	int triggers_panel = ui->stackedWidget->insertWidget(-1, &trigger_settings);
@@ -1127,7 +1129,15 @@ void Oscilloscope::cursor_panel_init()
 {
 	cr_ui = new Ui::CursorsSettings;
 	cr_ui->setupUi(ui->cursorsSettings);
+	setDynamicProperty(cr_ui->btnLockHorizontal, "use_icon", true);
+	setDynamicProperty(cr_ui->btnLockVertical, "use_icon", true);
 	//cr_ui->posSelect->setStyleSheet("background-color:red;");
+
+	connect(cr_ui->btnLockHorizontal, &QPushButton::toggled,
+		&plot, &CapturePlot::setHorizCursorsLocked);
+	connect(cr_ui->btnLockVertical, &QPushButton::toggled,
+		&plot, &CapturePlot::setVertCursorsLocked);
+
 	cursorsPositionButton = new CustomPlotPositionButton(cr_ui->posSelect);
 
 	connect(cr_ui->hCursorsEnable, SIGNAL(toggled(bool)),
@@ -1141,6 +1151,8 @@ void Oscilloscope::cursor_panel_init()
 	connect(cr_ui->vCursorsEnable, SIGNAL(toggled(bool)),
 		cursor_readouts_ui->VoltageCursors,
 		SLOT(setVisible(bool)));
+	connect(cr_ui->btnNormalTrack, &QPushButton::toggled,
+		this, &Oscilloscope::toggleCursorsMode);
 
 	cr_ui->horizontalSlider->setMaximum(100);
 	cr_ui->horizontalSlider->setMinimum(0);
@@ -1157,6 +1169,29 @@ void Oscilloscope::cursor_panel_init()
 	});
 }
 
+void Oscilloscope::toggleCursorsMode(bool toggled)
+{
+	cr_ui->hCursorsEnable->setEnabled(toggled);
+	cr_ui->vCursorsEnable->setEnabled(toggled);
+
+	if (toggled) {
+		plot.setVertCursorsEnabled(hCursorsEnabled);
+		plot.setHorizCursorsEnabled(vCursorsEnabled);
+		cursor_readouts_ui->TimeCursors->setVisible(vCursorsEnabled);
+		cursor_readouts_ui->VoltageCursors->setVisible(hCursorsEnabled);
+	} else {
+		hCursorsEnabled = cr_ui->hCursorsEnable->isChecked();
+		vCursorsEnabled = cr_ui->vCursorsEnable->isChecked();
+		plot.setVertCursorsEnabled(true);
+		plot.setHorizCursorsEnabled(true);
+		cursor_readouts_ui->TimeCursors->setVisible(true);
+		cursor_readouts_ui->VoltageCursors->setVisible(true);
+	}
+
+	cr_ui->btnLockVertical->setEnabled(toggled);
+	plot.trackModeEnabled(toggled);
+}
+
 void Oscilloscope::pause(bool paused)
 {
 	if (ui->pushButtonRunStop->isChecked()){
@@ -1853,6 +1888,7 @@ void Oscilloscope::toggle_blockchain_flow(bool en)
 
 void Oscilloscope::runStopToggled(bool checked)
 {
+
 	QPushButton *btn = static_cast<QPushButton *>(QObject::sender());
 	setDynamicProperty(btn, "running", checked);
 
@@ -3683,6 +3719,8 @@ void Oscilloscope::singleCaptureDone()
 	}
 
 	periodicFlowRestart();
+	plot.repositionCursors();
+
 	if(autosetRequested)
 	{
 		bool found = autosetFindFrequency();
diff --git a/src/oscilloscope.hpp b/src/oscilloscope.hpp
index 3ebe15c3b8..704be40e5c 100644
--- a/src/oscilloscope.hpp
+++ b/src/oscilloscope.hpp
@@ -209,6 +209,7 @@ namespace adiscope {
 		void resetStreamingFlag(bool);
 		void onFilledScreen(bool, unsigned int);
 
+		void toggleCursorsMode(bool toggled);
 	public Q_SLOTS:
 		void requestAutoset();
 		void enableLabels(bool);
@@ -308,6 +309,9 @@ namespace adiscope {
 		QList<bool> high_gain_modes;
 		std::vector<double> channel_offset;
 
+		bool hCursorsEnabled;
+		bool vCursorsEnabled;
+
 		std::vector<bool> chnAcCoupled;
 		bool triggerAcCoupled;
 		std::vector<gr::basic_block_sptr> filterBlocks;
diff --git a/ui/cursors_settings.ui b/ui/cursors_settings.ui
index 993179df10..c40b9e92aa 100644
--- a/ui/cursors_settings.ui
+++ b/ui/cursors_settings.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>361</width>
-    <height>508</height>
+    <width>278</width>
+    <height>537</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -86,56 +86,142 @@
     </widget>
    </item>
    <item>
-    <layout class="QGridLayout" name="gridLayout">
+    <layout class="QVBoxLayout" name="verticalLayout_5">
+     <property name="spacing">
+      <number>0</number>
+     </property>
      <property name="sizeConstraint">
       <enum>QLayout::SetDefaultConstraint</enum>
      </property>
-     <property name="horizontalSpacing">
-      <number>0</number>
-     </property>
-     <item row="1" column="1">
-      <widget class="Line" name="line_2">
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>1</height>
-        </size>
+     <item>
+      <spacer name="verticalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
        </property>
-       <property name="maximumSize">
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
         <size>
-         <width>16777215</width>
-         <height>1</height>
+         <width>10</width>
+         <height>25</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">border: 1px solid rgba(255, 255, 255, 70);</string>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
+      </spacer>
      </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">QLabel {
-		font-size: 12px;
-		color: rgba(255, 255, 255, 70);
-	}</string>
-       </property>
-       <property name="text">
-        <string>HORIZONTAL </string>
-       </property>
-      </widget>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_6">
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="adiscope::CustomSwitch" name="btnNormalTrack">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>238</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">QPushButton {
+min-height: 30px;
+max-height: 30px;
+min-width: 238px;
+max-width: 238px;
+background-color: black;
+border-radius: 4px;
+}
+
+QPushButton:disabled {
+background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.501, y2:0, stop:0 #727273, stop:1 #141416);
+}
+
+QWidget#handle {
+min-height: 30px;
+max-height: 30px;
+min-width: 119px;
+max-width: 119px;
+background-color: #4a64ff;
+border-radius: 2px;
+}
+
+QWidget#handle:disabled {
+background-color: #aaaaaa;
+}
+
+QLabel {
+margin-top: 6px;
+background-color: transparent;
+line-height: 19px;
+}
+
+QLabel#on {
+margin-top: 0px;
+min-height:30px;
+max-height:30px;
+min-width:119px;
+max-width:119px;
+qproperty-alignment: AlignCenter AlignCenter;
+margin-left: 0px;
+color: white;
+}
+
+QLabel#on:disabled {
+color: rgba(255,255,255,102);
+}
+
+QLabel#off {
+margin-top: 0px;
+min-height:30px;
+max-height:30px;
+min-width:119px;
+max-width:119px;
+margin-left: 119px;
+color: white;
+qproperty-alignment: AlignCenter AlignCenter;
+}
+
+QLabel#off:disabled {
+color: rgba(255,255,255,51);
+}
+</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+         <property name="flat">
+          <bool>false</bool>
+         </property>
+         <property name="leftText" stdset="0">
+          <string>Normal</string>
+         </property>
+         <property name="rightText" stdset="0">
+          <string>Track</string>
+         </property>
+         <property name="duration_ms" stdset="0">
+          <string>0</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
-     <item row="2" column="0" colspan="2">
-      <spacer name="verticalSpacer_10">
+     <item>
+      <spacer name="verticalSpacer_7">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
@@ -144,14 +230,62 @@
        </property>
        <property name="sizeHint" stdset="0">
         <size>
-         <width>0</width>
+         <width>20</width>
          <height>15</height>
         </size>
        </property>
       </spacer>
      </item>
-     <item row="0" column="0" colspan="2">
-      <spacer name="verticalSpacer_3">
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_4">
+       <property name="topMargin">
+        <number>10</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_2">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">QLabel {
+		font-size: 12px;
+		color: rgba(255, 255, 255, 70);
+	}</string>
+         </property>
+         <property name="text">
+          <string>HORIZONTAL </string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="Line" name="line_2">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>1</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>1</height>
+          </size>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">border: 1px solid rgba(255, 255, 255, 70);</string>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer name="verticalSpacer_10">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
@@ -161,7 +295,7 @@
        <property name="sizeHint" stdset="0">
         <size>
          <width>0</width>
-         <height>25</height>
+         <height>15</height>
         </size>
        </property>
       </spacer>
@@ -169,32 +303,52 @@
     </layout>
    </item>
    <item>
-    <layout class="QGridLayout" name="gridLayout_3">
-     <property name="verticalSpacing">
-      <number>15</number>
+    <layout class="QVBoxLayout" name="verticalLayout_3">
+     <property name="spacing">
+      <number>6</number>
      </property>
-     <item row="0" column="1">
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="0" column="0">
-      <widget class="adiscope::CustomSwitch" name="hCursorsEnable">
-       <property name="checkable">
-        <bool>true</bool>
-       </property>
-       <property name="checked">
-        <bool>true</bool>
-       </property>
-      </widget>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="adiscope::CustomSwitch" name="hCursorsEnable">
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="adiscope::SmallOnOffSwitch" name="btnLockHorizontal">
+         <property name="styleSheet">
+          <string notr="true">QPushButton[use_icon=true]</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
@@ -203,28 +357,6 @@
      <property name="horizontalSpacing">
       <number>0</number>
      </property>
-     <item row="1" column="1">
-      <widget class="Line" name="line_3">
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>1</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>1</height>
-        </size>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">border: 1px solid rgba(255, 255, 255, 70);</string>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_3">
        <property name="sizePolicy">
@@ -276,38 +408,77 @@
        </property>
       </spacer>
      </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QGridLayout" name="gridLayout_4">
-     <property name="horizontalSpacing">
-      <number>6</number>
-     </property>
-     <property name="verticalSpacing">
-      <number>15</number>
-     </property>
-     <item row="0" column="0">
-      <widget class="adiscope::CustomSwitch" name="vCursorsEnable">
-       <property name="checkable">
-        <bool>true</bool>
+     <item row="1" column="1">
+      <widget class="Line" name="line_3">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>1</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>1</height>
+        </size>
        </property>
-       <property name="checked">
-        <bool>true</bool>
+       <property name="styleSheet">
+        <string notr="true">border: 1px solid rgba(255, 255, 255, 70);</string>
        </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <spacer name="horizontalSpacer_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout_4">
+     <property name="spacing">
+      <number>10</number>
+     </property>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="adiscope::CustomSwitch" name="vCursorsEnable">
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="adiscope::SmallOnOffSwitch" name="btnLockVertical">
+         <property name="styleSheet">
+          <string notr="true">QPushButton[use_icon=true]</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
@@ -535,19 +706,6 @@ QSlider::sub-page:horizontal {
           </property>
          </widget>
         </item>
-        <item>
-         <spacer name="horizontalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
        </layout>
       </item>
      </layout>
@@ -572,6 +730,11 @@ QSlider::sub-page:horizontal {
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>adiscope::SmallOnOffSwitch</class>
+   <extends>QPushButton</extends>
+   <header>smallOnOffSwitch.hpp</header>
+  </customwidget>
   <customwidget>
    <class>adiscope::CustomSwitch</class>
    <extends>QPushButton</extends>