diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.cpp b/src/plugins/coreplugin/actionmanager/commandmappings.cpp
index ecc677eec8e..d24cbe7918c 100644
--- a/src/plugins/coreplugin/actionmanager/commandmappings.cpp
+++ b/src/plugins/coreplugin/actionmanager/commandmappings.cpp
@@ -69,11 +69,11 @@ QWidget *CommandMappings::createPage(QWidget *parent)
     m_page = new Ui_CommandMappings();
     QWidget *w = new QWidget(parent);
     m_page->setupUi(w);
-
-    m_page->resetButton->setIcon(QIcon(Constants::ICON_RESET));
+    m_page->targetEdit->setPixmap(QPixmap(Constants::ICON_RESET));
+    m_page->targetEdit->setSide(Utils::FancyLineEdit::Right);
     m_page->targetEdit->installEventFilter(this);
 
-    connect(m_page->resetButton, SIGNAL(clicked()),
+    connect(m_page->targetEdit, SIGNAL(buttonClicked()),
         this, SLOT(resetTargetIdentifier()));
     connect(m_page->removeButton, SIGNAL(clicked()),
         this, SLOT(removeTargetIdentifier()));
diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.ui b/src/plugins/coreplugin/actionmanager/commandmappings.ui
index 5b862875231..a2d75371508 100644
--- a/src/plugins/coreplugin/actionmanager/commandmappings.ui
+++ b/src/plugins/coreplugin/actionmanager/commandmappings.ui
@@ -27,7 +27,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QLineEdit" name="filterEdit"/>
+         <widget class="Utils::FilterLineEdit" name="filterEdit"/>
         </item>
        </layout>
       </item>
@@ -119,21 +119,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QLineEdit" name="targetEdit"/>
-        </item>
-        <item>
-         <widget class="QToolButton" name="resetButton">
-          <property name="toolTip">
-           <string>Reset</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="../core.qrc">
-            <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
-          </property>
-         </widget>
+         <widget class="Utils::FancyLineEdit" name="targetEdit"/>
         </item>
         <item>
          <widget class="QToolButton" name="removeButton">
@@ -147,6 +133,12 @@
            <iconset resource="../core.qrc">
             <normaloff>:/core/images/clear.png</normaloff>:/core/images/clear.png</iconset>
           </property>
+          <property name="iconSize">
+           <size>
+            <width>16</width>
+            <height>16</height>
+           </size>
+          </property>
          </widget>
         </item>
        </layout>
@@ -163,6 +155,18 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>Utils::FilterLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header location="global">utils/filterlineedit.h</header>
+  </customwidget>
+  <customwidget>
+   <class>Utils::FancyLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header location="global">utils/fancylineedit.h</header>
+  </customwidget>
+ </customwidgets>
  <resources>
   <include location="../core.qrc"/>
  </resources>