diff --git a/gui/include/Catalogue/CatalogueTreeWidgetItem.h b/gui/include/Catalogue/CatalogueTreeWidgetItem.h
index e4771dc..95be5d6 100644
--- a/gui/include/Catalogue/CatalogueTreeWidgetItem.h
+++ b/gui/include/Catalogue/CatalogueTreeWidgetItem.h
@@ -14,8 +14,11 @@ public:
     QVariant data(int column, int role) const override;
     void setData(int column, int role, const QVariant &value) override;
 
+    /// Returns the catalogue represented by the item
     DBCatalogue catalogue() const;
 
+    void setHasChanges(bool value);
+
 private:
     class CatalogueTreeWidgetItemPrivate;
     spimpl::unique_impl_ptr<CatalogueTreeWidgetItemPrivate> impl;
diff --git a/gui/resources/icones/discard.png b/gui/resources/icones/discard.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfc6b097e9fa0c1093924faeca285fd4cf9c262d
GIT binary patch
literal 1864
zc$@)92e<f%P)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00004b3#c}2nYxW
zd<bNS00009a7bBm000XU000XU0RWnu7ytkU>PbXFRCt{2omr?=RUF2D`<y#9nWkoz
z7!`$KR5q#2qxo77Jp@4nK@dR@S(Z5!1ws)vPijSlVe_mIL=c)eWZEQ+RHRvYt+bc2
zhkX~`dpyHF`>eJ8Yx>}O@G9Kz+uzT7&pG?-eLz-M0?z?m!Z{?A0rP;l!a2lr74R>x
z2Utp65UBC@40x_+8UbAm{Kwt{5EBHo<15dR3}sW-u<!V>K+tIXXdt+j#^pnYpw;-n
zLvS6f%ZCa<(eagM%fvLN>nUD7Gzi)qKR5_(p#AcpK#&3RDc|3F2yUc&dEX)EbbRGI
zYzNn+o9Mi}uMp@O-&+V~ps&1d5a=FXd6vx*ooFWd%liU>sqwvmU>4@eyAFZr@tucY
z4(7|d3W2Thm2bCGtC-3@&kY3v+v7V0K?dA~{qn9rkO6nr$rS|z8E{XXP_aNDJ-+g7
zri<271}rEMHWUb48D9i~47k@o311*^ZG7dKCQB=2!2JT{T!FyV@vT6R0Sg@{DFuP+
z;~Ryb0zBkEIVlKy8DIHUjoqmLk2+9F3IgB8*9t)ec*21)QV>YL&LIjx1$fGV5>gQO
zKECoTCAw1umN*bz3W89^F9ksrc*cRyQV@hTzVeI$-RUB~R7*On6a=A;UkHLO-~|Ul
zN<k3%_)Q_`23~X^oD>AHjIVt2pzd@7%Nz(L1wm}%4}qXMF#hGlr-{G>U=l*7RE2d3
zu&WFBPCAL8u8<BOtjnsv3Sby8RX9wNU9AMBR|o#EoCHBkS_Mo8c2);{aXD}>FhwL%
zk}a(QE(Q7_e-JoW34*ZoF@wg3eF1<Rg5e|xLepw$#)tX<0K7+nASA5@rU5%@|Dq89
zkRS*}pU_}@Xbu465R3pOYYvrUM{8&@KC}h^5(K_#4f(5m+nfEPA^<=R!676Fe9>A8
zj1R>D0C<-Kfe%_o!STx|10F#BOjdGzuO<IaYE%gVH@yxE<11yrgN6$ww>SRCri&R+
zg1`;0M__!V48JZJ3(cPbqgt+HSP6oN$5+aLhmk)hv3LUxjjxm-us8nbf}2=Zg21dl
z!{PCjDkKO@cq4FV8#{=q0z88JK?}uRjjxm-(Bn;bIKGmvcNcNRn}9KGA9cr+ASmb0
z31EDs3h)^62h|sU0UTE9NIR?qLB!)LRe;BlKgh27OJHp2qw9$h1QCy~<ooUCbo(nJ
z8eb_vuy_2!J3N-9RgwC}<mI;tet%cA4%i|c!nR_)ElVRmO?&Uq_F8HDh#^ShM+`w4
zKVk^d_z^>p#*Y|+G=9Vor12w$z}Jsian(!k2!b?z#1N$MBZeT2A29@J{D>h)<3|iZ
z8b4wP()ez82?7vg!2AwEC+qcMEJBdRchgoNNaMS0qY$L={jd=T()fN^D+FnLKdl9V
zG``>N2!b?z7%l}t2F!CHe6k)dqK%7y()eMz5Cm!bu-z1bG=3be3qcw`E)RhqjUT5M
z0hQ{&__IlhO_PA}74n||v1%LnhhfF4Gav`xZsdO?+4eTzM4%gZ$$>n!J>))w8L+^C
zP`1ZciVcFgx1!5{`y2>o+P?!Q)s`oR;AIE$nRe3~Qf0tG2SS=0|KvvH2_J&5DR4uo
zP(K6c5AsL8t<*!95NrmHD9|4W?*`9B$5-kBUU49|E`I}zYokAqL-3>n;dP9EO1tF=
z2ZC>b@g@2LIRuLxC{fniDL1}S5Ado3J<9rf;K&a81NoZ?o^_y1nek8Uv^@So@B?s^
zhW<bf!SfE3YG?e@bd|?H2z~^P*4Q6_E?}tx<yv_MddFAl0bX;UUn~Cv9AltAkUvje
z=0M3t?gvgcRUY>t_!&6XSo;BW<L0B|eg;l%7*-GPx<J2H{slPBVDBMv?I836lZ`eW
zD%bk|3QRECxQ=>(w>k{2!#jZ~hP&2NFK$4v1vuVt*M{mNKc61k_)5LN8+CHo@>XD?
z@s=&LAFu+M@uyno*Gf_l{05w0p<f~G54?}P@_zznT4`2Hy}+B;>tFkR1}Ag?@B#6S
zuVf2?R;RQ@bs+E|=F0yCoMo*|`!Wqd*%Mn<brA3oX2w6;Vvn*i_3TL3xeY5C2CPKy
z_~%${(3x~YumiKNa2nBYU^RNiKi6`09qL051h!w~(y9@_TFRII8$ZWa>I2@Ue1GZJ
zIkadbu%2?`pC^!4x5`4`>a(3v8U<{iz46bN2x>@uz&o_}YtM%VylrVTu#wi~cM;b3
zN<|^?{nuVojUm4(rP=rwh@~^HRuF^={}7EOzdEJ1{BGbv!Cbb~=mc6U{ek=fh0P2t
zf01Y+yQ+m?H*m3NA_0vfzhEKC^6Z7+A7GkPi2ng4RV#XARMfcu0000<MNUMnLSTZN
CZ9%gD

literal 0
Hc$@<O00001

diff --git a/gui/resources/icones/save.png b/gui/resources/icones/save.png
new file mode 100644
index 0000000000000000000000000000000000000000..37b0c2113dd6a28d47bdf0d2174fd65ce5736796
GIT binary patch
literal 1334
zc$}?N|3A}t9DnbNSu|WOB-HAfSn1387F`~z$%ZsN5I5X<aIPzi=8;yoZPglT)peXO
z370}czLnPcxRLHQvlfz=&(*^a%OvHYS+^c{|G+&S_k28`ujk|WdOTmhzH(_{K{yLX
z3jhF)N+BOGIp?#m7}J#PIwUt4nzfr6fi)oun<y~lWoeWc766vEpM?O$r4FXfAeBst
zI8mw_*>^ZD(BaYSPZf5_OEv3wUBQ)b&`MHXK`I$d{5JM(INEJOY4L=YQAr?u;iGQO
zYft|T4yJjoi&ly9^We6A!p;7I)n==|^6u<vrZpTJ-I4i5!s`8KU_4GzDo*vXj|C{d
z`N2c*FDO`B=ho+78uJFx3a0X+JT*qN9ajbgLH1Db(ZI7hAiV7I%Mkp2eS`JgD!DSX
z$BMD)lgLk~+XAy;-t+^F05=ivko*yMm&h9R`77Lz8Gmg^DjAt!B0h-*+Pq6xK$4yR
z$!aR0q{kN{7QTGgv^bQcJJ)d$sd{Qt8kbgA&F#g!dyblR_Z?r`&Do*8KjR?=Nt}Ir
zDGN%6cfkV+c2by8)H5u0lz+_`d(|W7rw6x0!o`PN-cjin=0wH?CPp(wn@i@NYziGH
zYpB=&Q@H6;M2>P;%Yx(KT!k*_rW0?MIim%RcJ)hc!YEKrufB-Hk*=Xsd8a*{kY?q=
zq&?-J?`b0TOHO;SB^OB>CBd_bl)ZLHGpHNkxQvU0t8;BO0_m`+x4^=2kt#mQSL7W9
zhPGYYW4daMur}?=#Q2Gf>$i}q8y@%*h{3D=mys$lo59q2*Q3VAlgmMKN&p)_NY;j!
z%F<z*P}J(%qLrN4OSZf@PEZ|+2wo)w=&KrMWDd-wgW!=oA3Dd+d4_mK$3&QtqyBv3
zjHoay+X{*?>-MXLqh)@f?bBJ8QVKg3oj7ji_n$@$qmw<hhEZo67DHn&?(Cz{M+wxa
zcRS4u!6z3L+em);{VT<_XX<g;9(R`ajRO#CC3zXwi8UllRPIM?kJf>VdtFCj>rU9K
z0(D?hR9XFvN{v}YxId^KaC}`-&-qT0KT&ZU6moprdt+p!nTR;HWLYU;gf(hkk7S;*
ze^L+xj3CwAYKJ0D?XKUXFUrKr^nTWQ|H;_-FgOR^tA18=o4&r^=r;MfWKEWQRoQrM
zxtH39UdU`qBxkJK=xet2zp<CdBTxhIA3z$aLDOhwEr))E=#aT*&b_Q#*Dm;vZHH}T
zMd3quSbct}O}<t8p^&>X9_c}FHoS1sruI8S-O$+<*Y{W`1ZuIGYfUBom;%)tF^7-9
z9e=WfS4N-$FV{L}&V6F9Pb%T@sV!d3Lx`=L=_`gKy<BUZInsK{f#2JUuS}9@X`78f
zQcH<8u2V3L&*n4t<|7tzjhZckeI4cx&}XUv`hVfUx5{!If40@((bb9$|HBq;^9xKj
znkB<<fvt8VMKbAy*PS~WR^-Pcc}*C&lTv#rJi0OC4u+8~*xh+<vM2_nH`<&PTr>-D
zohpImp-f1t9HZ<Dsrr80=+gIOad|`NV!_N9KJRBg;T2&&bb7SwxZ1)+6H;3vy0;nm
z!Z-tqa_2X|8RJOn%L9gzinldUZ`Tm3P!ECR4}ozmko*r46-$=45?0-5U(Yv~9v`3v
LhLOd)8N9y%!!=w!

literal 0
Hc$@<O00001

diff --git a/gui/resources/sqpguiresources.qrc b/gui/resources/sqpguiresources.qrc
index 76f0625..60a79a6 100644
--- a/gui/resources/sqpguiresources.qrc
+++ b/gui/resources/sqpguiresources.qrc
@@ -25,5 +25,7 @@
 		<file>icones/allEvents.png</file>
 		<file>icones/trash.png</file>
 		<file>icones/database.png</file>
+		<file>icones/save.png</file>
+		<file>icones/discard.png</file>
     </qresource>
 </RCC>
diff --git a/gui/src/Catalogue/CatalogueSideBarWidget.cpp b/gui/src/Catalogue/CatalogueSideBarWidget.cpp
index af2aa46..68d6659 100644
--- a/gui/src/Catalogue/CatalogueSideBarWidget.cpp
+++ b/gui/src/Catalogue/CatalogueSideBarWidget.cpp
@@ -35,6 +35,11 @@ CatalogueSideBarWidget::CatalogueSideBarWidget(QWidget *parent)
     ui->setupUi(this);
     impl->configureTreeWidget(ui->treeWidget);
 
+    ui->treeWidget->setColumnCount(2);
+    ui->treeWidget->header()->setStretchLastSection(false);
+    ui->treeWidget->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+    ui->treeWidget->header()->setSectionResizeMode(0, QHeaderView::Stretch);
+
     auto emitSelection = [this]() {
 
         auto selectedItems = ui->treeWidget->selectedItems();
@@ -145,7 +150,6 @@ void CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::configureTreeWidget(
 
     auto separator = new QFrame{treeWidget};
     separator->setFrameShape(QFrame::HLine);
-
     auto separatorItem = new QTreeWidgetItem{};
     separatorItem->setFlags(Qt::NoItemFlags);
     treeWidget->addTopLevelItem(separatorItem);
diff --git a/gui/src/Catalogue/CatalogueTreeWidgetItem.cpp b/gui/src/Catalogue/CatalogueTreeWidgetItem.cpp
index 9a11ea6..8bffae8 100644
--- a/gui/src/Catalogue/CatalogueTreeWidgetItem.cpp
+++ b/gui/src/Catalogue/CatalogueTreeWidgetItem.cpp
@@ -1,5 +1,12 @@
 #include "Catalogue/CatalogueTreeWidgetItem.h"
 
+#include <memory>
+
+#include <QBoxLayout>
+#include <QToolButton>
+
+const auto VALIDATION_BUTTON_ICON_SIZE = 12;
+
 struct CatalogueTreeWidgetItem::CatalogueTreeWidgetItemPrivate {
 
     DBCatalogue m_Catalogue;
@@ -17,12 +24,14 @@ CatalogueTreeWidgetItem::CatalogueTreeWidgetItem(DBCatalogue catalogue, int type
 
 QVariant CatalogueTreeWidgetItem::data(int column, int role) const
 {
-    switch (role) {
-        case Qt::EditRole: // fallthrough
-        case Qt::DisplayRole:
-            return impl->m_Catalogue.getName();
-        default:
-            break;
+    if (column == 0) {
+        switch (role) {
+            case Qt::EditRole: // fallthrough
+            case Qt::DisplayRole:
+                return impl->m_Catalogue.getName();
+            default:
+                break;
+        }
     }
 
     return QTreeWidgetItem::data(column, role);
@@ -32,8 +41,11 @@ void CatalogueTreeWidgetItem::setData(int column, int role, const QVariant &valu
 {
     if (role == Qt::EditRole && column == 0) {
         auto newName = value.toString();
-        setText(0, newName);
-        impl->m_Catalogue.setName(newName);
+        if (newName != impl->m_Catalogue.getName()) {
+            setText(0, newName);
+            impl->m_Catalogue.setName(newName);
+            setHasChanges(true);
+        }
     }
     else {
         QTreeWidgetItem::setData(column, role, value);
@@ -44,3 +56,35 @@ DBCatalogue CatalogueTreeWidgetItem::catalogue() const
 {
     return impl->m_Catalogue;
 }
+
+void CatalogueTreeWidgetItem::setHasChanges(bool value)
+{
+    if (value) {
+        auto widet = new QWidget{treeWidget()};
+
+        auto layout = new QHBoxLayout{widet};
+        layout->setContentsMargins(0, 0, 0, 0);
+        layout->setSpacing(0);
+
+        auto btnValid = new QToolButton{widet};
+        btnValid->setIcon(QIcon{":/icones/save"});
+        btnValid->setIconSize(QSize{VALIDATION_BUTTON_ICON_SIZE, VALIDATION_BUTTON_ICON_SIZE});
+        btnValid->setAutoRaise(true);
+        QObject::connect(btnValid, &QToolButton::clicked, [this]() { setHasChanges(false); });
+        layout->addWidget(btnValid);
+
+        auto btnDiscard = new QToolButton{widet};
+        btnDiscard->setIcon(QIcon{":/icones/discard"});
+        btnDiscard->setIconSize(QSize{VALIDATION_BUTTON_ICON_SIZE, VALIDATION_BUTTON_ICON_SIZE});
+        btnDiscard->setAutoRaise(true);
+        QObject::connect(btnDiscard, &QToolButton::clicked, [this]() { setHasChanges(false); });
+        layout->addWidget(btnDiscard);
+
+        treeWidget()->setItemWidget(this, 1, {widet});
+        treeWidget()->resizeColumnToContents(1);
+    }
+    else {
+        // Note: the widget is destroyed
+        treeWidget()->setItemWidget(this, 1, nullptr);
+    }
+}