diff --git a/style/adwaitastyle.cpp b/style/adwaitastyle.cpp

index aeeb8ae..6d2860e 100644

--- a/style/adwaitastyle.cpp

+++ b/style/adwaitastyle.cpp

@@ -392,6 +392,10 @@ void Style::polish(QWidget *widget)

     } else if (widget->inherits("QTipLabel")) {

         setTranslucentBackground(widget);

     } else if (QLineEdit *lineEdit = qobject_cast<QLineEdit *>(widget)) {

+        // Do not use additional margin if the QLineEdit is really small

+        const bool useMarginWidth = lineEdit->width() > lineEdit->fontMetrics().width("#####");

+        const int marginWidth = useMarginWidth ? Metrics::LineEdit_MarginWidth : 0;

+        lineEdit->setTextMargins(marginWidth, Metrics::LineEdit_MarginHeight, marginWidth, Metrics::LineEdit_MarginHeight);

         lineEdit->setTextMargins(Metrics::LineEdit_MarginWidth, Metrics::LineEdit_MarginHeight, Metrics::LineEdit_MarginWidth, Metrics::LineEdit_MarginHeight);

     } else if (QSpinBox *spinBox = qobject_cast<QSpinBox *>(widget)) {

         if (!spinBox->isEnabled()) {

@@ -4844,7 +4848,7 @@ bool Style::drawMenuBarItemControl(const QStyleOption *option, QPainter *painter

     QRect textRect = option->fontMetrics.boundingRect(rect, textFlags, menuItemOption->text);

     // render text

-    const QPalette::ColorRole role = (useStrongFocus && sunken) ? QPalette::Highlight : QPalette::WindowText;

+    const QPalette::ColorRole role = (useStrongFocus && sunken) ? QPalette::Link : QPalette::WindowText;

     drawItemText(painter, textRect, textFlags, palette, enabled, menuItemOption->text, role);

     return true;