diff --git a/src/commands/fx/cmd_convolution_matrix.cpp b/src/commands/fx/cmd_convolution_matrix.cpp
index 787784d23..91685dcf0 100644
--- a/src/commands/fx/cmd_convolution_matrix.cpp
+++ b/src/commands/fx/cmd_convolution_matrix.cpp
@@ -22,7 +22,7 @@
 
 #include "base/bind.h"
 #include "gui/jbox.h"
-#include "gui/jbutton.h"
+#include "gui/button.h"
 #include "gui/jhook.h"
 #include "gui/jlabel.h"
 #include "gui/jlist.h"
diff --git a/src/commands/fx/cmd_despeckle.cpp b/src/commands/fx/cmd_despeckle.cpp
index 9b8827f7d..859e99af3 100644
--- a/src/commands/fx/cmd_despeckle.cpp
+++ b/src/commands/fx/cmd_despeckle.cpp
@@ -22,7 +22,7 @@
 
 #include "base/bind.h"
 #include "gui/jbox.h"
-#include "gui/jbutton.h"
+#include "gui/button.h"
 #include "gui/jentry.h"
 #include "gui/jhook.h"
 #include "gui/jwidget.h"
diff --git a/src/commands/fx/cmd_invert_color.cpp b/src/commands/fx/cmd_invert_color.cpp
index 6dcb0fe35..14f57f229 100644
--- a/src/commands/fx/cmd_invert_color.cpp
+++ b/src/commands/fx/cmd_invert_color.cpp
@@ -20,7 +20,7 @@
 
 #include "base/bind.h"
 #include "gui/jbox.h"
-#include "gui/jbutton.h"
+#include "gui/button.h"
 #include "gui/jhook.h"
 #include "gui/jlabel.h"
 #include "gui/jslider.h"
diff --git a/src/dialogs/maskcol.cpp b/src/dialogs/maskcol.cpp
index 2e9ab3b68..13b23a77f 100644
--- a/src/dialogs/maskcol.cpp
+++ b/src/dialogs/maskcol.cpp
@@ -20,7 +20,7 @@
 
 #include "base/bind.h"
 #include "gui/jbox.h"
-#include "gui/jbutton.h"
+#include "gui/button.h"
 #include "gui/jhook.h"
 #include "gui/jlabel.h"
 #include "gui/jslider.h"
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 9e66e7cd8..2339da160 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -2,13 +2,13 @@
 # Copyright (C) 2001-2010  David Capello
 
 add_library(gui-lib
+  button.cpp
   component.cpp
   event.cpp
   frame.cpp
   jaccel.cpp
   jalert.cpp
   jbox.cpp
-  jbutton.cpp
   jclipboard.cpp
   jcombobox.cpp
   jcustom_label.cpp
diff --git a/src/gui/jbutton.cpp b/src/gui/button.cpp
similarity index 99%
rename from src/gui/jbutton.cpp
rename to src/gui/button.cpp
index d43afa9b5..c82242345 100644
--- a/src/gui/jbutton.cpp
+++ b/src/gui/button.cpp
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <queue>
 
-#include "gui/jbutton.h"
+#include "gui/button.h"
 #include "gui/jlist.h"
 #include "gui/jmanager.h"
 #include "gui/jmessage.h"
diff --git a/src/gui/jbutton.h b/src/gui/button.h
similarity index 96%
rename from src/gui/jbutton.h
rename to src/gui/button.h
index c1db8fced..b5fa6920e 100644
--- a/src/gui/jbutton.h
+++ b/src/gui/button.h
@@ -4,8 +4,8 @@
 // This source file is ditributed under a BSD-like license, please
 // read LICENSE.txt for more information.
 
-#ifndef GUI_JBUTTON_H_INCLUDED
-#define GUI_JBUTTON_H_INCLUDED
+#ifndef GUI_BUTTON_H_INCLUDED
+#define GUI_BUTTON_H_INCLUDED
 
 #include "base/signal.h"
 #include "gui/jwidget.h"
diff --git a/src/gui/jinete.h b/src/gui/jinete.h
index f4a3db507..8235bb8ec 100644
--- a/src/gui/jinete.h
+++ b/src/gui/jinete.h
@@ -11,7 +11,7 @@
 #include "gui/jalert.h"
 #include "gui/jbase.h"
 #include "gui/jbox.h"
-#include "gui/jbutton.h"
+#include "gui/button.h"
 #include "gui/jclipboard.h"
 #include "gui/jcombobox.h"
 #include "gui/jcustom_label.h"
diff --git a/src/widgets/color_button.h b/src/widgets/color_button.h
index c797d80f8..5cf7926f3 100644
--- a/src/widgets/color_button.h
+++ b/src/widgets/color_button.h
@@ -20,7 +20,7 @@
 #define WIDGETS_COLOR_BUTTON_H_INCLUDED
 
 #include "app/color.h"
-#include "gui/jbutton.h"
+#include "gui/button.h"
 
 class Frame;
 
diff --git a/src/widgets/groupbut.cpp b/src/widgets/groupbut.cpp
index 34f6fa1a3..f4791a27a 100644
--- a/src/widgets/groupbut.cpp
+++ b/src/widgets/groupbut.cpp
@@ -23,7 +23,7 @@
 
 #include "base/bind.h"
 #include "gui/jbox.h"
-#include "gui/jbutton.h"
+#include "gui/button.h"
 #include "gui/jhook.h"
 #include "gui/jlist.h"
 #include "gui/jsystem.h"
diff --git a/src/widgets/target.cpp b/src/widgets/target.cpp
index ec726fff9..df94ca29f 100644
--- a/src/widgets/target.cpp
+++ b/src/widgets/target.cpp
@@ -25,7 +25,7 @@
 #include "core/cfg.h"
 #include "effect/effect.h"
 #include "gui/jbox.h"
-#include "gui/jbutton.h"
+#include "gui/button.h"
 #include "gui/jhook.h"
 #include "gui/jtheme.h"
 #include "gui/jwidget.h"