diff --git a/qad/widgets/ecombobox.cpp b/qad/widgets/ecombobox.cpp
index 00935c7..9da0df3 100644
--- a/qad/widgets/ecombobox.cpp
+++ b/qad/widgets/ecombobox.cpp
@@ -3,6 +3,7 @@
 #include <QDebug>
 #include <QHeaderView>
 #include "ecombobox.h"
+#include "qad_types.h"
 
 
 class EModel: public QStandardItemModel {
@@ -36,6 +37,8 @@ EComboBox::EComboBox(QWidget * parent): QComboBox(parent) {
 	iv.setDragDropMode(QAbstractItemView::InternalMove);
 	iv.setMinimumHeight(100);
 	icon.setPixmap(QPixmap(":/icons/edit-find.png"));
+	icon.setScaledContents(true);
+	icon.setFixedSize(QSize(fontHeight(), fontHeight()));
 	ifont = nfont = font();
 	ifont.setItalic(true);
 #if QT_VERSION >= 0x040700
diff --git a/qad/widgets/qcodeedit.cpp b/qad/widgets/qcodeedit.cpp
index 973f499..1659b36 100644
--- a/qad/widgets/qcodeedit.cpp
+++ b/qad/widgets/qcodeedit.cpp
@@ -10,6 +10,7 @@
 #include <QAction>
 #include <QApplication>
 #include <QHeaderView>
+#include "qad_types.h"
 
 
 QCodeEdit::QCodeEdit(QWidget * parent): QWidget(parent) {
@@ -65,6 +66,7 @@ QCodeEdit::QCodeEdit(QWidget * parent): QWidget(parent) {
 	textCode->setFrameShape(QFrame::NoFrame);
 	textCode->setLineWrapMode(QPlainTextEdit::NoWrap);
 	textCode->setTabChangesFocus(false);
+	textCode->setCursorWidth(qMax<int>(qRound(fontHeight() / 10.), 1));
 	textLines->setFrameShadow(QFrame::Plain);
 	textLines->setFrameShape(QFrame::NoFrame);
 	textLines->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
@@ -795,7 +797,7 @@ void QCodeEdit::raiseHelp(QTextCursor tc, int arg) {
 	tc.movePosition(QTextCursor::Left, QTextCursor::MoveAnchor, st.size());
 	lbl_help[0]->setFont(font());
 	widget_help->resize(widget_help->sizeHint());
-	widget_help->move(textCode->mapToGlobal(textCode->cursorRect(tc).topLeft() - QPoint(0, widget_help->height() + 8)));
+	widget_help->move(textCode->viewport()->mapToGlobal(textCode->cursorRect(tc).topLeft()/* - QPoint(0, widget_help->height() + 8)*/));
 	widget_help->show();
 	cursor_scope = scope.first;
 	cursor_scope << scope.second;
diff --git a/qad/widgets/qvariantedit.cpp b/qad/widgets/qvariantedit.cpp
index bbb8148..9150f9a 100644
--- a/qad/widgets/qvariantedit.cpp
+++ b/qad/widgets/qvariantedit.cpp
@@ -104,9 +104,10 @@ PathEdit::PathEdit(QWidget * parent): QWidget(parent), lay(QBoxLayout::LeftToRig
 	is_dir = is_abs = false;
 	filter = tr("All files(*)");
 	line = new CLineEdit(this);
+	line->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
 	butt_select = new QPushButton(this);
 	//butt_select->setIconSize(QSize(16, 16));
-	butt_select->setMaximumWidth(line->height());
+	butt_select->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
 	butt_select->setIcon(QIcon(":/icons/document-open.png"));
 	butt_select->setToolTip(tr("Choose") + " ...");
 	lay.setContentsMargins(0, 0, 0, 0);
diff --git a/qad/widgets/qvariantedit.h b/qad/widgets/qvariantedit.h
index 5ec352e..d371050 100644
--- a/qad/widgets/qvariantedit.h
+++ b/qad/widgets/qvariantedit.h
@@ -9,6 +9,7 @@
 #include "qpointedit.h"
 #include "evalspinbox.h"
 #include <QCheckBox>
+#include <QPushButton>
 #include <QDoubleSpinBox>