diff --git a/widgets/lineedit.cpp b/widgets/lineedit.cpp
index ed9e9599e..b30cb72e4 100644
--- a/widgets/lineedit.cpp
+++ b/widgets/lineedit.cpp
@@ -64,14 +64,14 @@ LineEdit::~LineEdit()
     delete d;
 }
 
-void LineEdit::paintWidget(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+void LineEdit::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    QStyleOptionFrameV2 panel;
-    panel.initFrom(widget);
-    panel.state = option->state;
-    panel.rect = boundingRect().toRect();
+    if (d->styled && widget) {
+        QStyleOptionFrameV2 panel;
+        panel.initFrom(widget);
+        panel.state = option->state;
+        panel.rect = boundingRect().toRect();
 
-    if(d->styled) {
         widget->style()->drawPrimitive(QStyle::PE_PanelLineEdit, &panel, painter, widget);
         widget->style()->drawPrimitive(QStyle::PE_FrameLineEdit, &panel, painter, widget);
     }
@@ -115,12 +115,9 @@ void LineEdit::setStyled(bool style)
     d->styled = style;
 
     if (style) {
-        QColor textColor = KColorScheme(QPalette::Active, KColorScheme::Window,
-                                        Plasma::Theme::self()->colors()).foreground().color();
-        
-        setDefaultTextColor(textColor);
-    } else {
         setDefaultTextColor(kapp->palette().color(QPalette::Text));
+    } else {
+        setDefaultTextColor(Plasma::Theme::self()->textColor());
     }
 }
 
diff --git a/widgets/lineedit.h b/widgets/lineedit.h
index ded391453..43b836972 100644
--- a/widgets/lineedit.h
+++ b/widgets/lineedit.h
@@ -49,7 +49,7 @@ class PLASMA_EXPORT LineEdit : public QGraphicsTextItem, public LayoutItem
         explicit LineEdit(QGraphicsItem *parent = 0);
         ~LineEdit();
 
-        void paintWidget(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+        void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
 
         Qt::Orientations expandingDirections() const;