diff --git a/include/button-png.h b/include/button/button-png.h
similarity index 100%
rename from include/button-png.h
rename to include/button/button-png.h
diff --git a/src/button-png.c b/src/button/button-png.c
similarity index 98%
rename from src/button-png.c
rename to src/button/button-png.c
index 8602391c..399f988b 100644
--- a/src/button-png.c
+++ b/src/button/button-png.c
@@ -11,7 +11,7 @@
 #include <sys/stat.h>
 #include <wlr/util/log.h>
 #include "buffer.h"
-#include "button-png.h"
+#include "button/button-png.h"
 #include "common/dir.h"
 #include "labwc.h"
 #include "theme.h"
diff --git a/src/button/meson.build b/src/button/meson.build
index cf7b3d1f..4d738895 100644
--- a/src/button/meson.build
+++ b/src/button/meson.build
@@ -1,3 +1,4 @@
 labwc_sources += files(
+  'button-png.c',
   'button-xbm.c',
 )
diff --git a/src/meson.build b/src/meson.build
index 292eb675..58dfacf3 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -15,7 +15,6 @@ labwc_sources = files(
   'node.c',
   'osd.c',
   'output.c',
-  'button-png.c',
   'regions.c',
   'resistance.c',
   'seat.c',
diff --git a/src/theme.c b/src/theme.c
index 3ff96f67..30d50ebe 100644
--- a/src/theme.c
+++ b/src/theme.c
@@ -24,7 +24,7 @@
 #include "common/match.h"
 #include "common/string-helpers.h"
 #include "config/rcxml.h"
-#include "button-png.h"
+#include "button/button-png.h"
 #include "button/button-xbm.h"
 #include "theme.h"
 #include "buffer.h"