diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 76961e11c..138e03436 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -18,6 +18,7 @@ default_background.edc \
 default_battery.edc \
 default_border.edc \
 default_clock.edc \
+default_gadman.edc \
 default_ibar.edc \
 default_menu.edc \
 default_pager.edc \
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 0d3637b8a..396feea1b 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -24,12 +24,13 @@ fonts {
 
 collections {
 #include "default_background.edc"
-#include "default_border.edc"
-#include "default_menu.edc"
-#include "default_ibar.edc"
-#include "default_clock.edc"
 #include "default_battery.edc"
-#include "default_temperature.edc"
+#include "default_border.edc"
+#include "default_clock.edc"
+#include "default_gadman.edc"
+#include "default_ibar.edc"
+#include "default_menu.edc"
 #include "default_pager.edc"
+#include "default_temperature.edc"
 }
 
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index 7e6451a03..15f3428e0 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -249,5 +249,7 @@ e17_pager_desk.png \
 e17_pager_window.png \
 e17_temperature_base.png \
 e17_temperature_mid.png \
-e17_temperature_overlay.png
+e17_temperature_overlay.png \
+e17_gadman_indicator.png \
+e17_gadman_overlay.png
 
diff --git a/data/themes/images/e17_gadman_indicator.png b/data/themes/images/e17_gadman_indicator.png
new file mode 100644
index 000000000..305ef6eb6
Binary files /dev/null and b/data/themes/images/e17_gadman_indicator.png differ
diff --git a/data/themes/images/e17_gadman_overlay.png b/data/themes/images/e17_gadman_overlay.png
new file mode 100644
index 000000000..4ef3fe67f
Binary files /dev/null and b/data/themes/images/e17_gadman_overlay.png differ