diff --git a/src/ui/wiimotedevshortcutgrabber.cpp b/src/ui/wiimotedevshortcutgrabber.cpp
index afdbfd44f..f077893d9 100644
--- a/src/ui/wiimotedevshortcutgrabber.cpp
+++ b/src/ui/wiimotedevshortcutgrabber.cpp
@@ -61,7 +61,7 @@ WiimotedevShortcutGrabber::~WiimotedevShortcutGrabber() {
 }
 
 void WiimotedevShortcutGrabber::Timeout(int secs) {
-  if (secs == 0) {
+  if (!secs) {
     emit AddShortcut(wiimotedev_buttons_, ui_->comboBox->currentIndex());
     close();
   }
diff --git a/src/ui/wiimotedevshortcutgrabber.ui b/src/ui/wiimotedevshortcutgrabber.ui
index 146f49236..37a493dbd 100644
--- a/src/ui/wiimotedevshortcutgrabber.ui
+++ b/src/ui/wiimotedevshortcutgrabber.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>418</width>
-    <height>130</height>
+    <height>132</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../../data/data.qrc">
-    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+    <normaloff>:/icons/32x32/wiimotedev.png</normaloff>:/icons/32x32/wiimotedev.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/src/ui/wiimotedevshortcutsconfig.cpp b/src/ui/wiimotedevshortcutsconfig.cpp
index af1836bf8..462f00f00 100644
--- a/src/ui/wiimotedevshortcutsconfig.cpp
+++ b/src/ui/wiimotedevshortcutsconfig.cpp
@@ -121,6 +121,7 @@ WiimotedevShortcutsConfig::WiimotedevShortcutsConfig(QWidget* parent)
 
   connect(ui_->wiimotedev_enable, SIGNAL(clicked(bool)), this, SLOT(WiimotedevEnabledChecked(bool)));
   connect(ui_->list, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)), SLOT(ItemClicked(QTreeWidgetItem*)));
+
   connect(ui_->wiimotedev_add_action, SIGNAL(clicked()), this, SLOT(AddAction()));
   connect(ui_->wiimotedev_delete_action, SIGNAL(clicked()), this, SLOT(DeleteAction()));
   connect(ui_->wiimotedev_reload, SIGNAL(clicked()), this , SLOT(DefaultSettings()));
diff --git a/src/ui/wiimotedevshortcutsconfig.ui b/src/ui/wiimotedevshortcutsconfig.ui
index ad2a147ab..9abe2017f 100644
--- a/src/ui/wiimotedevshortcutsconfig.ui
+++ b/src/ui/wiimotedevshortcutsconfig.ui
@@ -163,17 +163,6 @@
           </property>
          </widget>
         </item>
-        <item>
-         <widget class="QPushButton" name="wiimotedev_edit_action">
-          <property name="text">
-           <string>Edit action</string>
-          </property>
-          <property name="icon">
-           <iconset resource="../../data/data.qrc">
-            <normaloff>:/icons/22x22/configure.png</normaloff>:/icons/22x22/configure.png</iconset>
-          </property>
-         </widget>
-        </item>
         <item>
          <widget class="QPushButton" name="wiimotedev_reload">
           <property name="text">