diff --git a/gui/res/icons/handle_right_arrow_light.svg b/gui/res/icons/handle_right_arrow_light.svg
new file mode 100644
index 0000000000..417befebf8
--- /dev/null
+++ b/gui/res/icons/handle_right_arrow_light.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="30" height="30" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg">
+ <path transform="matrix(0 1 -1 0 815 -190)" d="m200 801.99 5-4.99 5 4.99-1 1-4-4-4 4z" fill="#101820" fill-opacity="0.94117647" fill-rule="evenodd"/>
+</svg>
diff --git a/gui/res/resources.qrc b/gui/res/resources.qrc
index 5574b45503..a58593984f 100644
--- a/gui/res/resources.qrc
+++ b/gui/res/resources.qrc
@@ -158,6 +158,7 @@
         <file>icons/checkmark_dark.svg</file>
         <file>icons/handle_down_arrow_dark.svg</file>
         <file>icons/handle_down_arrow_light.svg</file>
+        <file>icons/handle_right_arrow_light.svg</file>
         <file>icons/minus.svg</file>
         <file>icons/plus.svg</file>
         <file>icons/unlocked.svg</file>
diff --git a/gui/style/json/Harmonic dark.json b/gui/style/json/Harmonic dark.json
index ba76b9d926..b4d1c94386 100644
--- a/gui/style/json/Harmonic dark.json	
+++ b/gui/style/json/Harmonic dark.json	
@@ -32,6 +32,7 @@
 "color_inverse_hexcode": "000000",
 "svg_checkmark": ":/gui/icons/checkmark_dark.svg",
 "svg_arrow_down": ":/gui/icons/handle_down_arrow_dark.svg",
+"svg_arrow_right": ":/gui/icons/handle_right_arrow.svg",
 "sba_cmb_box_arrow_right": ":/gui/icons/scopy-default/icons/sba_cmb_box_arrow_right.svg",
 "sba_cmb_box_arrow": ":/gui/icons/scopy-default/icons/sba_cmb_box_arrow.svg"
 }
diff --git a/gui/style/json/Harmonic light.json b/gui/style/json/Harmonic light.json
index f7b3d28869..2b88a59be4 100644
--- a/gui/style/json/Harmonic light.json	
+++ b/gui/style/json/Harmonic light.json	
@@ -32,6 +32,7 @@
 "color_inverse_hexcode": "5E6773",
 "svg_checkmark": ":/gui/icons/checkmark_light.svg",
 "svg_arrow_down": ":/gui/icons/handle_down_arrow_light.svg",
+"svg_arrow_right": ":/gui/icons/handle_right_arrow_light.svg",
 "sba_cmb_box_arrow_right": ":/gui/icons/scopy-light/icons/sba_cmb_box_arrow_right.svg",
 "sba_cmb_box_arrow": ":/gui/icons/scopy-light/icons/sba_cmb_box_arrow.svg"
 }
diff --git a/gui/style/json/Scopy.json b/gui/style/json/Scopy.json
index feb40cfa59..d59d39956e 100644
--- a/gui/style/json/Scopy.json
+++ b/gui/style/json/Scopy.json
@@ -32,6 +32,7 @@
 "color_inverse_hexcode": "000000",
 "svg_checkmark": ":/gui/icons/checkmark_dark.svg",
 "svg_arrow_down": ":/gui/icons/handle_down_arrow_dark.svg",
+"svg_arrow_right": ":/gui/icons/handle_right_arrow.svg",
 "sba_cmb_box_arrow_right": ":/gui/icons/scopy-default/icons/sba_cmb_box_arrow_right.svg",
 "sba_cmb_box_arrow": ":/gui/icons/scopy-default/icons/sba_cmb_box_arrow.svg",
 "font_family": "Open Sans",
diff --git a/plugins/debugger/src/iioexplorer/searchbar.cpp b/plugins/debugger/src/iioexplorer/searchbar.cpp
index a7daa8b61e..0bbdf25f41 100644
--- a/plugins/debugger/src/iioexplorer/searchbar.cpp
+++ b/plugins/debugger/src/iioexplorer/searchbar.cpp
@@ -29,21 +29,17 @@ using namespace scopy::debugger;
 SearchBar::SearchBar(QSet<QString> options, QWidget *parent)
 	: QWidget(parent)
 	, m_lineEdit(new QLineEdit(this))
-	, m_label(new QLabel("Filter", this))
 	, m_completer(new QCompleter(options.values(), this))
 {
 	Style::setStyle(m_lineEdit, style::properties::debugger::searchBar);
-	Style::setStyle(m_label, style::properties::label::menuSmall);
 	setFixedHeight(34); // Hardcoded to match similar container
 	m_completer->setCaseSensitivity(Qt::CaseInsensitive);
 	m_completer->setFilterMode(Qt::MatchContains);
 	m_lineEdit->setPlaceholderText("Type to filter");
 	m_lineEdit->setCompleter(m_completer);
 	m_lineEdit->setMinimumHeight(31);
-	m_label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
 
 	setLayout(new QHBoxLayout(this));
-	layout()->addWidget(m_label);
 	layout()->addWidget(m_lineEdit);
 	layout()->setMargin(0);
 }
diff --git a/plugins/debugger/style/qss/properties/debugger/treeView.qss b/plugins/debugger/style/qss/properties/debugger/treeView.qss
index adeaabe855..fd8fb06621 100644
--- a/plugins/debugger/style/qss/properties/debugger/treeView.qss
+++ b/plugins/debugger/style/qss/properties/debugger/treeView.qss
@@ -3,9 +3,20 @@ QTreeView[&&property&&=true] {
 	border-radius: &radius_1&;
 	background-color: &background_primary&;
 	show-decoration-selected: 0;
+	color: &content_default&;
 }
 
 QTreeView::item[&&property&&=true]:selected {
 	background-color: &interactive_primary_idle&;
+	color: &content_default&;
 }
 
+QTreeView::branch:open:has-children:!has-siblings,
+QTreeView::branch:open:has-children:has-siblings  {
+    border-image: url(&svg_arrow_down&);
+}
+
+QTreeView::branch:has-children:!has-siblings:closed,
+QTreeView::branch:closed:has-children:has-siblings {
+    border-image: url(&svg_arrow_right&);
+}