diff --git a/app/settings/generic/generictools.cpp b/app/settings/generic/generictools.cpp
index fae07f609..df8f54ed9 100644
--- a/app/settings/generic/generictools.cpp
+++ b/app/settings/generic/generictools.cpp
@@ -301,9 +301,9 @@ void drawIcon(QPainter *painter, const QStyleOption &option, const QString &icon
     QRect target;
 
     if (curalign == Qt::AlignLeft) {
-        target = QRect(option.rect.x() + lenmargin, option.rect.y(), iconsize, iconsize);
+        target = QRect(option.rect.x() + lenmargin, option.rect.y() + thickmargin, iconsize, iconsize);
     } else {
-        target = QRect(option.rect.x() + option.rect.width() - total + lenmargin, option.rect.y(), iconsize, iconsize);
+        target = QRect(option.rect.x() + option.rect.width() - total + lenmargin, option.rect.y() + thickmargin, iconsize, iconsize);
     }
 
     painter->drawPixmap(target, QIcon::fromTheme(icon).pixmap(target.height(), target.height(), mode));
diff --git a/app/settings/settingsdialog/delegates/layoutnamedelegate.cpp b/app/settings/settingsdialog/delegates/layoutnamedelegate.cpp
index 4fe4efc12..4c622aaf2 100644
--- a/app/settings/settingsdialog/delegates/layoutnamedelegate.cpp
+++ b/app/settings/settingsdialog/delegates/layoutnamedelegate.cpp
@@ -113,24 +113,24 @@ void LayoutName::paint(QPainter *painter, const QStyleOptionViewItem &option, co
     myOptions.rect = remainedrect;
 
     if (hasErrors || hasWarnings) {
-        remainedrect = Latte::remainedFromIcon(myOptions, Qt::AlignRight);
+        remainedrect = Latte::remainedFromIcon(myOptions, Qt::AlignRight, -1, 2);
         if (hasErrors) {
-            Latte::drawIcon(painter, myOptions, "data-error", Qt::AlignRight);
+            Latte::drawIcon(painter, myOptions, "data-error", Qt::AlignRight, -1, 2);
         } else if (hasWarnings) {
-            Latte::drawIcon(painter, myOptions, "data-warning", Qt::AlignRight);
+            Latte::drawIcon(painter, myOptions, "data-warning", Qt::AlignRight, -1, 2);
         }
         myOptions.rect = remainedrect;
     }
 
     if (isConsideredActive) {
-        remainedrect = Latte::remainedFromIcon(myOptions, Qt::AlignRight);
-        Latte::drawIcon(painter, myOptions, "favorites", Qt::AlignRight);
+        remainedrect = Latte::remainedFromIcon(myOptions, Qt::AlignRight, -1, 1);
+        Latte::drawIcon(painter, myOptions, "favorites", Qt::AlignRight, -1, 1);
         myOptions.rect = remainedrect;
     }
 
     if (isLocked) {
-        remainedrect = Latte::remainedFromIcon(myOptions, Qt::AlignRight);
-        Latte::drawIcon(painter, myOptions, "object-locked", Qt::AlignRight);
+        remainedrect = Latte::remainedFromIcon(myOptions, Qt::AlignRight, -1, 1);
+        Latte::drawIcon(painter, myOptions, "object-locked", Qt::AlignRight, -1, 1);
         myOptions.rect = remainedrect;
     }
 
diff --git a/app/settings/viewsdialog/delegates/namedelegate.cpp b/app/settings/viewsdialog/delegates/namedelegate.cpp
index aec6df0d5..a531ae663 100644
--- a/app/settings/viewsdialog/delegates/namedelegate.cpp
+++ b/app/settings/viewsdialog/delegates/namedelegate.cpp
@@ -93,11 +93,11 @@ void NameDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
 
     // draw errors/warnings
     if (hasErrors || hasWarnings) {
-        remainedrect = Latte::remainedFromIcon(myOptions, Qt::AlignRight);
+        remainedrect = Latte::remainedFromIcon(myOptions, Qt::AlignRight, -1, 2);
         if (hasErrors) {
-            Latte::drawIcon(painter, myOptions, "data-error", Qt::AlignRight);
+            Latte::drawIcon(painter, myOptions, "data-error", Qt::AlignRight, -1, 2);
         } else if (hasWarnings) {
-            Latte::drawIcon(painter, myOptions, "data-warning", Qt::AlignRight);
+            Latte::drawIcon(painter, myOptions, "data-warning", Qt::AlignRight, -1, 2);
         }
         myOptions.rect = remainedrect;
     }