diff --git a/app/settings/delegates/activitycmbboxdelegate.cpp b/app/settings/delegates/activitycmbboxdelegate.cpp
index 592493e6e..0c6864230 100644
--- a/app/settings/delegates/activitycmbboxdelegate.cpp
+++ b/app/settings/delegates/activitycmbboxdelegate.cpp
@@ -187,12 +187,36 @@ void ActivityCmbBoxDelegate::paint(QPainter *painter, const QStyleOptionViewItem
         QPalette palette;
         QPen pen(Qt::DashDotDotLine);
 
-        pen.setWidth(2); pen.setColor(palette.linkVisited().color());
-        int ver = option.rect.y()+option.rect.height()/2;
+        pen.setWidth(2); pen.setColor(palette.text().color());
+        int y = option.rect.y()+option.rect.height()/2;
+
+        int space = option.rect.height() / 2;
 
         painter->setPen(pen);
-        painter->drawLine(option.rect.x(), ver,
-                          option.rect.x()+option.rect.width(), ver);
+
+        if (qApp->layoutDirection() == Qt::LeftToRight) {
+            painter->drawLine(option.rect.x(), y,
+                              option.rect.x()+option.rect.width() - space, y);
+
+            int xm = option.rect.x() + option.rect.width() - space;
+            int thick = option.rect.height() / 2;
+            int ym = option.rect.y() + ((option.rect.height() - thick) / 2);
+
+            pen.setStyle(Qt::SolidLine);
+            painter->setPen(pen);
+            painter->drawLine(xm, ym, xm, ym + thick);
+        } else {
+            painter->drawLine(option.rect.x() + space, y,
+                              option.rect.x() + option.rect.width(), y);
+
+            int xm = option.rect.x() + space;
+            int thick = option.rect.height() / 2;
+            int ym = option.rect.y() + ((option.rect.height() - thick) / 2);
+
+            pen.setStyle(Qt::SolidLine);
+            painter->setPen(pen);
+            painter->drawLine(xm, ym, xm, ym + thick);
+        }
     }
 }
 
diff --git a/app/settings/delegates/checkboxdelegate.cpp b/app/settings/delegates/checkboxdelegate.cpp
index d5eb58132..ca256c8b7 100644
--- a/app/settings/delegates/checkboxdelegate.cpp
+++ b/app/settings/delegates/checkboxdelegate.cpp
@@ -19,6 +19,9 @@
 
 #include "checkboxdelegate.h"
 
+// local
+#include "../settingsdialog.h"
+
 // Qt
 #include <QApplication>
 #include <QDebug>
@@ -33,6 +36,11 @@ const int HIDDENTEXTCOLUMN = 1;
 CheckBoxDelegate::CheckBoxDelegate(QObject *parent)
     : QStyledItemDelegate(parent)
 {
+    auto *settingsDialog = qobject_cast<Latte::SettingsDialog *>(parent);
+
+    if (settingsDialog) {
+        m_settingsDialog = settingsDialog;
+    }
 }
 
 void CheckBoxDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
@@ -51,12 +59,42 @@ void CheckBoxDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
         QPalette palette;
         QPen pen(Qt::DashDotDotLine);
 
-        pen.setWidth(2); pen.setColor(palette.linkVisited().color());
-        int ver = option.rect.y()+option.rect.height()/2;
+        pen.setWidth(2); pen.setColor(palette.text().color());
+        int y = option.rect.y()+option.rect.height()/2;
+
+        bool inMenu = m_settingsDialog->isMenuCell(index.column());
+        int space = inMenu ? option.rect.height() / 2 : 0;
 
         painter->setPen(pen);
-        painter->drawLine(option.rect.x(), ver,
-                          option.rect.x()+option.rect.width(), ver);
+
+        if (qApp->layoutDirection() == Qt::LeftToRight) {
+            painter->drawLine(option.rect.x() + space, y,
+                              option.rect.x() + option.rect.width(), y);
+
+            if (inMenu) {
+                int xm = option.rect.x() + space;
+                int thick = option.rect.height() / 2;
+                int ym = option.rect.y() + ((option.rect.height() - thick) / 2);
+
+                pen.setStyle(Qt::SolidLine);
+                painter->setPen(pen);
+                painter->drawLine(xm, ym, xm, ym + thick);
+            }
+
+        } else {
+            painter->drawLine(option.rect.x(), y,
+                              option.rect.x()+option.rect.width() - space, y);
+
+            if (inMenu) {
+                int xm = option.rect.x() + option.rect.width() - space;
+                int thick = option.rect.height() / 2;
+                int ym = option.rect.y() + ((option.rect.height() - thick) / 2);
+
+                pen.setStyle(Qt::SolidLine);
+                painter->setPen(pen);
+                painter->drawLine(xm, ym, xm, ym + thick);
+            }
+        }
     }
 }
 
diff --git a/app/settings/delegates/checkboxdelegate.h b/app/settings/delegates/checkboxdelegate.h
index 50ac225d1..3565af5c8 100644
--- a/app/settings/delegates/checkboxdelegate.h
+++ b/app/settings/delegates/checkboxdelegate.h
@@ -23,6 +23,10 @@
 // Qt
 #include <QStyledItemDelegate>
 
+namespace Latte {
+class SettingsDialog;
+}
+
 class CheckBoxDelegate : public QStyledItemDelegate
 {
 public:
@@ -30,6 +34,9 @@ public:
 
     void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
     virtual bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index);
+
+private:
+    Latte::SettingsDialog *m_settingsDialog{nullptr};
 };
 
 #endif
diff --git a/app/settings/settingsdialog.cpp b/app/settings/settingsdialog.cpp
index d05c37400..9fd10b414 100644
--- a/app/settings/settingsdialog.cpp
+++ b/app/settings/settingsdialog.cpp
@@ -1630,6 +1630,11 @@ bool SettingsDialog::nameExistsInModel(QString name)
     return false;
 }
 
+bool SettingsDialog::isMenuCell(int column) const
+{
+    return column == MENUCOLUMN;
+}
+
 bool SettingsDialog::isShared(int row) const
 {
     if (row >=0 ) {
diff --git a/app/settings/settingsdialog.h b/app/settings/settingsdialog.h
index 027517d49..34d5195b4 100644
--- a/app/settings/settingsdialog.h
+++ b/app/settings/settingsdialog.h
@@ -58,6 +58,7 @@ public:
     void setCurrentPage(Types::LatteConfigPage page);
 
     bool isShared(int row) const;
+    bool isMenuCell(int column) const;
 
     QStringList activities();
     QStringList availableActivities();