diff --git a/src/widget/capslockindicator.cpp b/src/widget/capslockindicator.cpp
index 0028acd073..6fe4ec917e 100644
--- a/src/widget/capslockindicator.cpp
+++ b/src/widget/capslockindicator.cpp
@@ -3,40 +3,12 @@
 #include "src/platform/capslock.h"
 #endif
 
-CapsLockIndicator::CapsLockIndicator(QWidget *parent) : QToolButton(parent)
+CapsLockIndicator::CapsLockIndicator(QLineEdit *parent) :
+    QAction(parent),
+    parent(parent)
 {
-    cleanInputStyle = parentWidget()->styleSheet();
-
-    QIcon icon = QIcon(":img/caps_lock.svg");
-    setIcon(icon);
-    setCursor(Qt::ArrowCursor);
-    setStyleSheet("border: none; padding: 0; color: white");
+    setIcon(QIcon(":img/caps_lock.svg"));
     setToolTip(tr("CAPS-LOCK ENABLED"));
-    updateSize();
-}
-
-void CapsLockIndicator::updateSize()
-{
-    inputSize = parentWidget()->size();
-    move(inputSize.width() - inputSize.height(), 0);
-
-    int side = inputSize.height() - 5;
-    QSize iconSize(side, side);
-    setIconSize(iconSize);
-}
-
-void CapsLockIndicator::show()
-{
-    QToolButton::show();
-
-    QString style = QString("padding: -3px %1px -3px -6px; color: white").arg(iconSize().width() - 3);
-    parentWidget()->setStyleSheet(style);
-}
-
-void CapsLockIndicator::hide()
-{
-    QToolButton::hide();
-    parentWidget()->setStyleSheet(cleanInputStyle);
 }
 
 void CapsLockIndicator::updateIndicator()
@@ -48,7 +20,7 @@ void CapsLockIndicator::updateIndicator()
 #endif
 
     if (caps)
-        show();
+        parent->addAction(this, QLineEdit::TrailingPosition);
     else
-        hide();
+        parent->removeAction(this);
 }
diff --git a/src/widget/capslockindicator.h b/src/widget/capslockindicator.h
index a01874fa97..d7566464d4 100644
--- a/src/widget/capslockindicator.h
+++ b/src/widget/capslockindicator.h
@@ -1,21 +1,16 @@
 #ifndef CAPSLOCKINDICATOR_H
 #define CAPSLOCKINDICATOR_H
 
-#include <QToolButton>
+#include <QAction>
+#include <QLineEdit>
 
-class CapsLockIndicator : QToolButton
+class CapsLockIndicator : QAction
 {
 public:
-    CapsLockIndicator(QWidget *widget);
+    CapsLockIndicator(QLineEdit *widget);
     void updateIndicator();
-    void updateSize();
 
 private:
-    void show();
-    void hide();
-
-private:
-    QString cleanInputStyle;
-    QSize inputSize;
+    QLineEdit *parent;
 };
 #endif // CAPSLOCKINDICATOR_H
diff --git a/src/widget/loginscreen.cpp b/src/widget/loginscreen.cpp
index 61b10d6d4e..706f32ac5b 100644
--- a/src/widget/loginscreen.cpp
+++ b/src/widget/loginscreen.cpp
@@ -136,8 +136,6 @@ bool LoginScreen::event(QEvent* event)
 void LoginScreen::onNewProfilePageClicked()
 {
     ui->stackedWidget->setCurrentIndex(0);
-    capsIndicator->updateSize();
-    confimCapsIndicator->updateSize();
 }
 
 void LoginScreen::onLoginPageClicked()